Merge branch 'release-37' into aosp/master
Test: ./updatecldrdata.py
Change-Id: I5301aaa05fe04551610677a4bd5b3eadef75bce9
diff --git a/common/annotations/af.xml b/common/annotations/af.xml
index 0c6eb8d..a5e0a53 100644
--- a/common/annotations/af.xml
+++ b/common/annotations/af.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">medium-donker velkleur</annotation>
<annotation cp="🏿">donker velkleur | kleur | vel | velkleur | veltipe 6</annotation>
<annotation cp="🏿" type="tts">donker velkleur</annotation>
+ <annotation cp="–">en | en-streep | streep</annotation>
+ <annotation cp="–" type="tts">en-streep</annotation>
+ <annotation cp="—">em | em-streep | streep</annotation>
+ <annotation cp="—" type="tts">em-streep</annotation>
+ <annotation cp="·">interpunkt | kol | middel | middelkol</annotation>
+ <annotation cp="·" type="tts">middelkol</annotation>
+ <annotation cp="«">chevron | hakes | hoek | inlastekens | links | links-guillemet | quote</annotation>
+ <annotation cp="«" type="tts">links-guillemet</annotation>
+ <annotation cp="»">aanhaling | chevron | hakies | hoek | inlastekens | regs | regs-guillemet</annotation>
+ <annotation cp="»" type="tts">regs-guillemet</annotation>
+ <annotation cp="§">afdeling | deel | paragraaf | silcrow</annotation>
+ <annotation cp="§" type="tts">afdeling</annotation>
+ <annotation cp="†">dolk | dolkteken | obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">dolkteken</annotation>
+ <annotation cp="‡">dolk | dubbel | dubbeldolkteken | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">dubbeldolkteken</annotation>
+ <annotation cp="•">kol</annotation>
+ <annotation cp="•" type="tts">kol</annotation>
+ <annotation cp="°">graad | proef | uur</annotation>
+ <annotation cp="°" type="tts">graad</annotation>
+ <annotation cp="℗">klank | kopiereg | kopiereg vir klankopname | opname</annotation>
+ <annotation cp="℗" type="tts">kopiereg vir klankopname</annotation>
+ <annotation cp="←">links | linkswysende pyltjie | pyltjie</annotation>
+ <annotation cp="←" type="tts">linkswysende pyltjie</annotation>
+ <annotation cp="→">pyltjie | regs | regswysende pyltjie</annotation>
+ <annotation cp="→" type="tts">regswysende pyltjie</annotation>
+ <annotation cp="↑">op | opwysende pyltjie | pyltjie</annotation>
+ <annotation cp="↑" type="tts">opwysende pyltjie</annotation>
+ <annotation cp="↓">af | afwysende pyltjie | pyltjie</annotation>
+ <annotation cp="↓" type="tts">afwysende pyltjie</annotation>
+ <annotation cp="⇅">af | op | opwysende en afwysende pyltjies | pyltjie</annotation>
+ <annotation cp="⇅" type="tts">opwysende en afwysende pyltjies</annotation>
+ <annotation cp="⇆">links | linkswysende oor regswysende pyltjies | pyltjie | regs</annotation>
+ <annotation cp="⇆" type="tts">linkswysende oor regswysende pyltjies</annotation>
+ <annotation cp="∆">driehoek | vermeerdering</annotation>
+ <annotation cp="∆" type="tts">vermeerdering</annotation>
+ <annotation cp="∇">driehoek | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">bevat | element | element van | lidmaatskap | stel</annotation>
+ <annotation cp="∈" type="tts">element van</annotation>
+ <annotation cp="÷">deel | deelteken | deling | obelus</annotation>
+ <annotation cp="÷" type="tts">deelteken</annotation>
+ <annotation cp="×">maal | vermenigvuldig | vermenigvuldiging | vermenigvuldigteken</annotation>
+ <annotation cp="×" type="tts">vermenigvuldigteken</annotation>
+ <annotation cp="⁻">boskrif | boskrifminus | minus</annotation>
+ <annotation cp="⁻" type="tts">boskrifminus</annotation>
+ <annotation cp="√">radikaal | vierkant | vierkantswortel | wortel | wortelgetal | wortelvorm</annotation>
+ <annotation cp="√" type="tts">vierkantswortel</annotation>
+ <annotation cp="∞">oneindigheid | oneindigheidsteken</annotation>
+ <annotation cp="∞" type="tts">oneindigheidsteken</annotation>
+ <annotation cp="∩">interseksie | stel</annotation>
+ <annotation cp="∩" type="tts">interseksie</annotation>
+ <annotation cp="∪">stel | unie | versameling</annotation>
+ <annotation cp="∪" type="tts">unie</annotation>
+ <annotation cp="≡">driemaal | identies | identies aan | presies</annotation>
+ <annotation cp="≡" type="tts">identies aan</annotation>
+ <annotation cp="⊂">stel | substel | substel van</annotation>
+ <annotation cp="⊂" type="tts">substel van</annotation>
+ <annotation cp="▲">driehoek | gevul | gevulde opwysende driehoek | op | pyltjie</annotation>
+ <annotation cp="▲" type="tts">gevulde opwysende driehoek</annotation>
+ <annotation cp="▼">af | driehoek | gevul | gevulde afwysende driehoek | pyltjie</annotation>
+ <annotation cp="▼" type="tts">gevulde afwysende driehoek</annotation>
+ <annotation cp="◊">diamant | rombus | ruit</annotation>
+ <annotation cp="◊" type="tts">ruit</annotation>
+ <annotation cp="○">leë sirkel | ring | sirkel</annotation>
+ <annotation cp="○" type="tts">leë sirkel</annotation>
+ <annotation cp="●">gevulde sirkel | sirkel</annotation>
+ <annotation cp="●" type="tts">gevulde sirkel</annotation>
+ <annotation cp="◯">groot leë sirkel | ring | sirkel</annotation>
+ <annotation cp="◯" type="tts">groot leë sirkel</annotation>
<annotation cp="⚧">transgender | transgendersimbool</annotation>
<annotation cp="⚧" type="tts">transgendersimbool</annotation>
<annotation cp="🤌">beklemtoon | handgebaar | ondervraging | sarkasties | vingerpunte saamgedruk | vingers</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">reënboogvlag</annotation>
<annotation cp="🏴☠">Jolly Roger | plunder | seerower | seerowervlag | skat</annotation>
<annotation cp="🏴☠" type="tts">seerowervlag</annotation>
+ <annotation cp="£">EGP | GBP | geldeenheid | pond</annotation>
+ <annotation cp="£" type="tts">pond</annotation>
+ <annotation cp="¥">CNY | geldeenheid | JPY | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | geldeenheid</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">geldeenheid | indiese roepee | roepee</annotation>
+ <annotation cp="₹" type="tts">indiese roepee</annotation>
+ <annotation cp="₽">geldeenheid | roebel</annotation>
+ <annotation cp="₽" type="tts">roebel</annotation>
+ <annotation cp="¹">boskrif | boskrif-een | een</annotation>
+ <annotation cp="¹" type="tts">boskrif-een</annotation>
+ <annotation cp="²">boskrif | twee | vierkant</annotation>
+ <annotation cp="²" type="tts">boskrif twee</annotation>
+ <annotation cp="³">boskrif | boskrifdrie | drie | gekubeer</annotation>
+ <annotation cp="³" type="tts">boskrifdrie</annotation>
+ <annotation cp="µ">mate | mikroteken</annotation>
+ <annotation cp="µ" type="tts">mikroteken</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/am.xml b/common/annotations/am.xml
index 20b5605..f243753 100644
--- a/common/annotations/am.xml
+++ b/common/annotations/am.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">የቆዳ ዓይነት-5</annotation>
<annotation cp="🏿">ስሜት ገላጭ አሻሻይ | ቆዳ | የቆዳ ዓይነት-6 | ድምፀት</annotation>
<annotation cp="🏿" type="tts">የቆዳ ዓይነት-6</annotation>
+ <annotation cp="–">ሰረዝ | ኢኤን</annotation>
+ <annotation cp="–" type="tts">ኢኤን ሰረዝ</annotation>
+ <annotation cp="—">ሰረዝ | ኢኤም</annotation>
+ <annotation cp="—" type="tts">ኢኤም ሰረዝ</annotation>
+ <annotation cp="·">ማእከላዊ | ማእከላዊ ነጥበ | ማእከላዊነጥብ | ማዕከላዊምልክት | ነጥብ</annotation>
+ <annotation cp="·" type="tts">ማእከላዊ ነጥበ</annotation>
+ <annotation cp="«">ምእዘን | ቅንፎች | ትእምርተ ቅጥያ | ድፋቶች | ግራ | ግራ ጥቅስ ምልክት | ጥቅስ</annotation>
+ <annotation cp="«" type="tts">ግራ ጥቅስ ምልክት</annotation>
+ <annotation cp="»">ምእዘን | ቀኝ | ቀኝ ጥቅስ ምልክት | ቅንፎች | ትእምርተ ቅጥያ | ድፋቶች | ጥቅስ</annotation>
+ <annotation cp="»" type="tts">ቀኝ ጥቅስ ምልክት</annotation>
+ <annotation cp="§">ሲልክሮውን | አንቀጽ | ክፍል | ጉርድ</annotation>
+ <annotation cp="§" type="tts">ጉርድ</annotation>
+ <annotation cp="†">ሓወልት | መስቀለኛ | መስቀል | የመስቀል ምልክት</annotation>
+ <annotation cp="†" type="tts">የመስቀል ምልክት</annotation>
+ <annotation cp="‡">ሓወልት | መስቀለኛ | መስቀል | ድርብ | ድርብ መስቀል ምልክት</annotation>
+ <annotation cp="‡" type="tts">ድርብ መስቀል ምልክት</annotation>
+ <annotation cp="•">ነጥበ | ነጥበ ምልክት</annotation>
+ <annotation cp="•" type="tts">ነጥበ ምልክት</annotation>
+ <annotation cp="°">ማስረጃ | ሰዓት | ዲግሪ</annotation>
+ <annotation cp="°" type="tts">ዲግሪ</annotation>
+ <annotation cp="℗">ቀረጻ | ቅጂ መብት | የድምጽ ቀረጻ ቅጂ መብት | ድምጽ</annotation>
+ <annotation cp="℗" type="tts">የድምጽ ቀረጻ ቅጂ መብት</annotation>
+ <annotation cp="←">ቀስት | ወደ ግራ የሚያመለክት ቀስት | ግራ</annotation>
+ <annotation cp="←" type="tts">ወደ ግራ የሚያመለክት ቀስት</annotation>
+ <annotation cp="→">ቀስት | ቀኝ | ወደ ቀኝ የሚያመለክት ቀስት</annotation>
+ <annotation cp="→" type="tts">ወደ ቀኝ የሚያመለክት ቀስት</annotation>
+ <annotation cp="↑">ላይ | ቀስት | ወደ ላይ የሚያመለክት ቀስት</annotation>
+ <annotation cp="↑" type="tts">ወደ ላይ የሚያመለክት ቀስት</annotation>
+ <annotation cp="↓">ቀስት | ታች | ወደ ታች የሚያመለክት ቀስት</annotation>
+ <annotation cp="↓" type="tts">ወደ ታች የሚያመለክት ቀስት</annotation>
+ <annotation cp="⇅">ቀስት | ወደ ላይ | ወደ ላይ የሚያመለክት ቀስት እና ወደ ታች የሚያመለክቱ ቀስቶች | ወደ ላይ የሚያመለክት ቀስት እና ወደ ታች የሚያመለክት ቀስት | ወደ ታች</annotation>
+ <annotation cp="⇅" type="tts">ወደ ላይ የሚያመለክት ቀስት እና ወደ ታች የሚያመለክት ቀስት</annotation>
+ <annotation cp="⇆">ቀስት | ቀኝ | ወደ ግራ የሚያመለክት ቀስት በወደ ቀኝ የሚያመለክት ቀስት ላይ | ግራ</annotation>
+ <annotation cp="⇆" type="tts">ወደ ግራ የሚያመለክት ቀስት በወደ ቀኝ የሚያመለክት ቀስት ላይ</annotation>
+ <annotation cp="∆">ሶስት ማአዘን | ጭማሪ</annotation>
+ <annotation cp="∆" type="tts">ጭማሪ</annotation>
+ <annotation cp="∇">ሶስት ማአዘን | ናብላ</annotation>
+ <annotation cp="∇" type="tts">ናብላ</annotation>
+ <annotation cp="∈">አባልነት | አካል | አካል ነው | አዘጋጅ | ይዟል</annotation>
+ <annotation cp="∈" type="tts">አካል ነው</annotation>
+ <annotation cp="÷">መስቀለኛ | ማካፈል | አካፍል | የማካፈል ምልክት</annotation>
+ <annotation cp="÷" type="tts">የማካፈል ምልክት</annotation>
+ <annotation cp="×">ማባዛት | አባዛ | የማባዛት ምልክት | ጊዜ</annotation>
+ <annotation cp="×" type="tts">የማባዛት ምልክት</annotation>
+ <annotation cp="⁻">መቀነስ | ራስጌ ምልክት | ራስጌ ምልክት መቀነስ</annotation>
+ <annotation cp="⁻" type="tts">ራስጌ ምልክት መቀነስ</annotation>
+ <annotation cp="√">ራዲካል | ራዲክስ | ዋልታ | ዘር | ዳግም</annotation>
+ <annotation cp="√" type="tts">ራዲካል</annotation>
+ <annotation cp="∞">ማለቂያ የሌለው | ማለቂያ የሌለው ምልክት</annotation>
+ <annotation cp="∞" type="tts">ማለቂያ የሌለው ምልክት</annotation>
+ <annotation cp="∩">መገናኛ | ስብስብ</annotation>
+ <annotation cp="∩" type="tts">መገናኛ</annotation>
+ <annotation cp="∪">ህብረት | ስብስብ | ጥርቅም</annotation>
+ <annotation cp="∪" type="tts">ህብረት</annotation>
+ <annotation cp="≡">ሶስቴ | በትክክል | ተመሳሳይ | ተመሳሳይ ነው</annotation>
+ <annotation cp="≡" type="tts">ተመሳሳይ ነው</annotation>
+ <annotation cp="⊂">ስብስብ | ንዑስ ስብስብ | ንዑስ ስብስብ ነው</annotation>
+ <annotation cp="⊂" type="tts">ንዑስ ስብስብ ነው</annotation>
+ <annotation cp="▲">ሶስት ማእዘን | ቀስት | የተሞላ | የተሞላ ወደላይ የሚጠቁም ሶስት ማእዘን</annotation>
+ <annotation cp="▲" type="tts">የተሞላ ወደላይ የሚጠቁም ሶስት ማእዘን</annotation>
+ <annotation cp="▼">ሶስት ማእዘን | ቀስት | ወደ ታች | የተሞላ | የተሞላ ወደታች የሚጠቁም ሶስት ማእዘን</annotation>
+ <annotation cp="▼" type="tts">የተሞላ ወደታች የሚጠቁም ሶስት ማእዘን</annotation>
+ <annotation cp="◊">ሉል ቅርጽ | ሮምበስ | አልማዝ</annotation>
+ <annotation cp="◊" type="tts">ሉል ቅርጽ</annotation>
+ <annotation cp="○">ቀለበት | ባዶ ክብ | ክብ</annotation>
+ <annotation cp="○" type="tts">ባዶ ክብ</annotation>
+ <annotation cp="●">ክብ | የተሞላ ክብ</annotation>
+ <annotation cp="●" type="tts">የተሞላ ክብ</annotation>
+ <annotation cp="◯">ቀለበት | ትልቅ ባዶ ክብ | ክብ</annotation>
+ <annotation cp="◯" type="tts">ትልቅ ባዶ ክብ</annotation>
<annotation cp="⚧" draft="contributed">የትራንስጀንደር ምልክት</annotation>
<annotation cp="⚧" type="tts" draft="contributed">የትራንስጀንደር ምልክት</annotation>
<annotation cp="🤌" draft="contributed">የቆነጠጡ ጣቶች</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">የቀስተ ደመና ባንዲራ</annotation>
<annotation cp="🏴☠">ማዕድን | ምርኮ | የባሕር ወንበዴ | የባሕር ወንበዴ ሰንደቅ | ጆሊ ሮጀር</annotation>
<annotation cp="🏴☠" type="tts">የባሕር ወንበዴ ሰንደቅ</annotation>
+ <annotation cp="£">ኢግፓ | ገንዘብ | ግብፓ | ፓውንድ</annotation>
+ <annotation cp="£" type="tts">ፓውንድ</annotation>
+ <annotation cp="¥">ሲኤንዋይ | የን | ዩኣን | ጄፒዋይ | ገንዘብ</annotation>
+ <annotation cp="¥" type="tts">የን</annotation>
+ <annotation cp="€">ዩሮ | ገንዘብ</annotation>
+ <annotation cp="€" type="tts">ዩሮ</annotation>
+ <annotation cp="₹">ሩፒ | የህንድ ሩፒ | ገንዘብ</annotation>
+ <annotation cp="₹" type="tts">የህንድ ሩፒ</annotation>
+ <annotation cp="₽">ሩብለ | ሩብል | ገንዘብ</annotation>
+ <annotation cp="₽" type="tts">ሩብል</annotation>
+ <annotation cp="¹">ራስጌ ምልክት | ራስጌ ምልክት አንድ | አንድ</annotation>
+ <annotation cp="¹" type="tts">ራስጌ ምልክት አንድ</annotation>
+ <annotation cp="²">ሁለት | ራስጌ ምልክት | ራስጌ ምልክት ሁለት | ስኴርድ</annotation>
+ <annotation cp="²" type="tts">ራስጌ ምልክት ሁለት</annotation>
+ <annotation cp="³">ራስጌ ምልክት | ራስጌ ምልክት ሶስት | ሳልስ ርቢ | ሶስት</annotation>
+ <annotation cp="³" type="tts">ራስጌ ምልክት ሶስት</annotation>
+ <annotation cp="µ">መለኪያ | ማይክሮ ምልክት | የማይክሮ ምልክት</annotation>
+ <annotation cp="µ" type="tts">የማይክሮ ምልክት</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ar.xml b/common/annotations/ar.xml
index 46e35a3..a1f878b 100644
--- a/common/annotations/ar.xml
+++ b/common/annotations/ar.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">بشرة بلون معتدل مائل للغامق</annotation>
<annotation cp="🏿">بشرة بلون غامق | تعديل | جلد | رمز | لون | نوع جلد 6</annotation>
<annotation cp="🏿" type="tts">بشرة بلون غامق</annotation>
+ <annotation cp="–">شرطة | قصيرة</annotation>
+ <annotation cp="–" type="tts">شرطة قصيرة</annotation>
+ <annotation cp="—">شرطة | طويلة</annotation>
+ <annotation cp="—" type="tts">شرطة طويلة</annotation>
+ <annotation cp="·">متوسط | نقطة | نقطة متوسطة | وسط</annotation>
+ <annotation cp="·" type="tts">نقطة متوسطة</annotation>
+ <annotation cp="«">أقواس معقوفة | اقتباس | تنصيص | شارة رتبة | علامة اقتباس يسرى | نهاية الاقتباس</annotation>
+ <annotation cp="«" type="tts">علامة اقتباس يسرى</annotation>
+ <annotation cp="»">أقواس معقوفة | اقتباس | بداية الاقتباس | تنصيص | شارة رتبة | علامة اقتباس يمنى</annotation>
+ <annotation cp="»" type="tts">علامة اقتباس يمنى</annotation>
+ <annotation cp="§">جزء | قسم | مقطع</annotation>
+ <annotation cp="§" type="tts">قسم</annotation>
+ <annotation cp="†">إيضاح | حاشية | خنجر | رمز الخنجر</annotation>
+ <annotation cp="†" type="tts">رمز الخنجر</annotation>
+ <annotation cp="‡">إيضاح | حاشية | خنجر مزدوج | رمز الخنجر المزدوج</annotation>
+ <annotation cp="‡" type="tts">رمز الخنجر المزدوج</annotation>
+ <annotation cp="•">تعداد | نقطة</annotation>
+ <annotation cp="•" type="tts">نقطة تعداد</annotation>
+ <annotation cp="°">حرارة | درجة | ساعة</annotation>
+ <annotation cp="°" type="tts">درجة</annotation>
+ <annotation cp="℗">تسجيل | حقوق الطبع والنشر | حقوق الطبع والنشر لتسجيل صوتي | صوت</annotation>
+ <annotation cp="℗" type="tts">حقوق الطبع والنشر لتسجيل صوتي</annotation>
+ <annotation cp="←">اتجاه لليسار | سهم | سهم متّجه لليسار | يسار</annotation>
+ <annotation cp="←" type="tts">سهم متّجه لليسار</annotation>
+ <annotation cp="→">اتجاه لليمين | سهم | سهم متّجه لليمين | يمين</annotation>
+ <annotation cp="→" type="tts">سهم متّجه لليمين</annotation>
+ <annotation cp="↑">أعلى | اتجاه للأعلى | سهم | سهم متّجه للأعلى</annotation>
+ <annotation cp="↑" type="tts">سهم متّجه للأعلى</annotation>
+ <annotation cp="↓">أسفل | اتجاه للأسفل | سهم | سهم متّجه للأسفل</annotation>
+ <annotation cp="↓" type="tts">سهم متّجه للأسفل</annotation>
+ <annotation cp="⇅">أسفل | أعلى | سهم | سهم للأعلى وسهم للأسفل | سهم متّجه للأعلى وآخر للأسفل</annotation>
+ <annotation cp="⇅" type="tts">سهم متّجه للأعلى وآخر للأسفل</annotation>
+ <annotation cp="⇆">سهم | سهم لليسار فوق سهم لليمين | سهم متّجه لليسار وتحته سهم متّجه لليمين | يسار | يمين</annotation>
+ <annotation cp="⇆" type="tts">سهم متّجه لليسار وتحته سهم متّجه لليمين</annotation>
+ <annotation cp="∆">زيادة | مثلث</annotation>
+ <annotation cp="∆" type="tts">زيادة</annotation>
+ <annotation cp="∇">دل | مؤثر دل | مثلث | نابلا</annotation>
+ <annotation cp="∇" type="tts">مؤثر دل</annotation>
+ <annotation cp="∈">انتماء | علاقة | عنصر | مجموعة | ينتمي</annotation>
+ <annotation cp="∈" type="tts">ينتمي</annotation>
+ <annotation cp="÷">علامة القسمة | عملية حسابية | قسم | قسمة</annotation>
+ <annotation cp="÷" type="tts">علامة القسمة</annotation>
+ <annotation cp="×">ضرب | علامة الضرب | عملية حسابية | مضروب</annotation>
+ <annotation cp="×" type="tts">علامة الضرب</annotation>
+ <annotation cp="⁻">علامة ناقص علوية | علوي | ناقص</annotation>
+ <annotation cp="⁻" type="tts">علامة ناقص علوية</annotation>
+ <annotation cp="√">أساس | أصم | جذر | جذر تربيعي | عدد جذري | مربع</annotation>
+ <annotation cp="√" type="tts">جذر تربيعي</annotation>
+ <annotation cp="∞">علامة اللانهاية | لانهاية</annotation>
+ <annotation cp="∞" type="tts">علامة اللانهاية</annotation>
+ <annotation cp="∩">تقاطع | عناصر مشتركة | مجموعة</annotation>
+ <annotation cp="∩" type="tts">تقاطع</annotation>
+ <annotation cp="∪">اتحاد | دمج | مجموعة</annotation>
+ <annotation cp="∪" type="tts">اتحاد</annotation>
+ <annotation cp="≡">علامة التساوي | مطابق | معامل ثلاثي المساواة | مماثل | يساوي</annotation>
+ <annotation cp="≡" type="tts">يساوي</annotation>
+ <annotation cp="⊂">جزء | مجموعة | مجموعة فرعية | يحتوي</annotation>
+ <annotation cp="⊂" type="tts">يحتوي</annotation>
+ <annotation cp="▲">أعلى | سهم | مثلث | مثلث ممتلئ متّجه للأعلى | ممتلئ</annotation>
+ <annotation cp="▲" type="tts">مثلث ممتلئ متّجه للأعلى</annotation>
+ <annotation cp="▼">أسفل | سهم | مثلث | مثلث ممتلئ متّجه للأسفل | ممتلئ</annotation>
+ <annotation cp="▼" type="tts">مثلث ممتلئ متّجه للأسفل</annotation>
+ <annotation cp="◊">شكل رباعي | شكل هندسي | معيّن</annotation>
+ <annotation cp="◊" type="tts">معيّن</annotation>
+ <annotation cp="○">حلقة | دائرة | مجوّفة | مفرغة</annotation>
+ <annotation cp="○" type="tts">دائرة مفرغة</annotation>
+ <annotation cp="●">دائرة | ممتلئة</annotation>
+ <annotation cp="●" type="tts">دائرة ممتلئة</annotation>
+ <annotation cp="◯">حلقة | دائرة | كبيرة | مجوّفة | مفرغة</annotation>
+ <annotation cp="◯" type="tts">دائرة مفرغة كبيرة</annotation>
<annotation cp="⚧">رمز المتحوّلين جنسيًا | متحوّل جنسيًا | متحوّلة جنسيًا</annotation>
<annotation cp="⚧" type="tts">رمز المتحوّلين جنسيًا</annotation>
<annotation cp="🤌">أصابع | أصابع مضمومة | إيماءة باليد | تهكّم | ضم</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">علم ألوان طيف</annotation>
<annotation cp="🏴☠">جولي روجر | علم قراصنة | قراصنة | قرصنة | كنز | كنوز</annotation>
<annotation cp="🏴☠" type="tts">علم قراصنة</annotation>
+ <annotation cp="£">باوند | جنيه | جنيه إسترليني | جنيه مصري | عملة</annotation>
+ <annotation cp="£" type="tts">جنيه</annotation>
+ <annotation cp="¥">الصين | اليابان | رنمينبي | عملة | ين | يوان</annotation>
+ <annotation cp="¥" type="tts">ين</annotation>
+ <annotation cp="€">أوروبا | عملة | يورو</annotation>
+ <annotation cp="€" type="tts">يورو</annotation>
+ <annotation cp="₹">روبيه | عملة | هندي</annotation>
+ <annotation cp="₹" type="tts">روبيه هندي</annotation>
+ <annotation cp="₽">روبل | عملة</annotation>
+ <annotation cp="₽" type="tts">روبل</annotation>
+ <annotation cp="¹">رقم واحد علوي | علوي | واحد</annotation>
+ <annotation cp="¹" type="tts">رقم واحد علوي</annotation>
+ <annotation cp="²">اثنان | رقم اثنين علوي | علوي | مربع</annotation>
+ <annotation cp="²" type="tts">رقم اثنين علوي</annotation>
+ <annotation cp="³">ثلاثة | رقم ثلاثة علوي | علوي | مكعب</annotation>
+ <annotation cp="³" type="tts">رقم ثلاثة علوي</annotation>
+ <annotation cp="µ">رمز وحدة الميكرو | قياس | ميكرو</annotation>
+ <annotation cp="µ" type="tts">رمز وحدة الميكرو</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ar_SA.xml b/common/annotations/ar_SA.xml
index 8160b69..4abcbc0 100644
--- a/common/annotations/ar_SA.xml
+++ b/common/annotations/ar_SA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/as.xml b/common/annotations/as.xml
index af322d1..e2a8188 100644
--- a/common/annotations/as.xml
+++ b/common/annotations/as.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">মধ্যমীয়া-ক’লা ছালৰ ৰং</annotation>
<annotation cp="🏿">ক’লা ছালৰ ৰং | ছালৰ ৰং | প্ৰকাৰ ৬</annotation>
<annotation cp="🏿" type="tts">ক’লা ছালৰ ৰং</annotation>
+ <annotation cp="–">এন | ডেছ</annotation>
+ <annotation cp="–" type="tts">এন ডেছ</annotation>
+ <annotation cp="—">এম | ডেছ</annotation>
+ <annotation cp="—" type="tts">এম ডেছ</annotation>
+ <annotation cp="·">আন্তঃবিৰাম চিহ্ন | বিন্দু | মাজবিন্দু | মাজৰ</annotation>
+ <annotation cp="·" type="tts">মাজৰ বিন্দু</annotation>
+ <annotation cp="«">উদ্ধৃতি | কাৰেট | কোণ | বন্ধনী | বৰ-বন্ধনী | বাওঁ | বাওঁ গিলেমেট</annotation>
+ <annotation cp="«" type="tts">বাওঁ গিলেমেট</annotation>
+ <annotation cp="»">উদ্ধৃতি | কাৰেট | কোণ | বন্ধনী | বৰ-বন্ধনী | সোঁ | সোঁ গিলেমেট</annotation>
+ <annotation cp="»" type="tts">সোঁ গিলেমেট</annotation>
+ <annotation cp="§">চিলক্ৰো‘ | দফা | ভাগ | শাখা</annotation>
+ <annotation cp="§" type="tts">শাখা</annotation>
+ <annotation cp="†">অবেলাচ | অবেলিস্ক | ডেগাৰ | ডেগাৰ চিহ্ন</annotation>
+ <annotation cp="†" type="tts">ডেগাৰ চিহ্ন</annotation>
+ <annotation cp="‡">অবেলাচ | অবেলিস্ক | ডেগাৰ | দ্বৈত | দ্বৈত ডেগাৰ চিহ্ন</annotation>
+ <annotation cp="‡" type="tts">দ্বৈত ডেগাৰ চিহ্ন</annotation>
+ <annotation cp="•">বিন্দু | বুলেট</annotation>
+ <annotation cp="•" type="tts">বুলেট</annotation>
+ <annotation cp="°">ঘণ্টা | ডিগ্ৰী | প্ৰমাণ</annotation>
+ <annotation cp="°" type="tts">ডিগ্ৰী</annotation>
+ <annotation cp="℗">কপিৰাইট | ধ্বনি | ধ্বনি ৰেকৰ্ড কৰাৰ কপিৰাইট | ৰেকৰ্ড কৰা</annotation>
+ <annotation cp="℗" type="tts">ধ্বনি ৰেকৰ্ড কৰাৰ কপিৰাইট</annotation>
+ <annotation cp="←">কাঁড় | বাওঁ | বাওঁফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="←" type="tts">বাওঁফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="→">কাঁড় | সোঁ | সোঁফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="→" type="tts">সোঁফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="↑">ওপৰ | ওপৰফালে দেখুওৱা কাঁড় | কাঁড়</annotation>
+ <annotation cp="↑" type="tts">ওপৰফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="↓">কাঁড় | তল | তলফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="↓" type="tts">তলফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="⇅">ওপৰ | ওপৰফালে দেখুওৱা আৰু তলফালে দেখুওৱা কাঁড় | কাঁড় | তল</annotation>
+ <annotation cp="⇅" type="tts">ওপৰফালে দেখুওৱা আৰু তলফালে দেখুওৱা কাঁড়</annotation>
+ <annotation cp="⇆">কাঁড় | বাওঁ | সোঁ | সোঁফালে আৰু বাওঁফাল দেখুওৱা কাঁড়</annotation>
+ <annotation cp="⇆" type="tts">সোঁফালে আৰু বাওঁফাল দেখুওৱা কাঁড়</annotation>
+ <annotation cp="∆">ত্ৰিভূজ | বৃদ্ধি</annotation>
+ <annotation cp="∆" type="tts">বৃদ্ধি</annotation>
+ <annotation cp="∇">ত্ৰিভূজ | নাবলা</annotation>
+ <annotation cp="∇" type="tts">নাবলা</annotation>
+ <annotation cp="∈">ইয়াত থকা | ইয়াৰ উপাদান | উপাদান | সদস্যতা | সংহতি</annotation>
+ <annotation cp="∈" type="tts">ইয়াৰ উপাদান</annotation>
+ <annotation cp="÷">অবেলাচ | হৰণ | হৰণ কৰা | হৰণ চিহ্ন</annotation>
+ <annotation cp="÷" type="tts">হৰণ চিহ্ন</annotation>
+ <annotation cp="×">গুণ | পূৰণ | পূৰণ কৰা | পূৰণ চিহ্ন</annotation>
+ <annotation cp="×" type="tts">পূৰণ চিহ্ন</annotation>
+ <annotation cp="⁻">ছুপাৰস্ক্ৰিপ্ট | বিয়োগ</annotation>
+ <annotation cp="⁻" type="tts">ছুপাৰস্ক্ৰিপ্ট বিয়োগ</annotation>
+ <annotation cp="√">কৰণী | বৰ্গ | বৰ্গমূল | মূল | মূলক | মূলাংক</annotation>
+ <annotation cp="√" type="tts">বৰ্গমূল</annotation>
+ <annotation cp="∞">অসীম | অসীম চিহ্ন</annotation>
+ <annotation cp="∞" type="tts">অসীম চিহ্ন</annotation>
+ <annotation cp="∩">ছেদন | সংহতি</annotation>
+ <annotation cp="∩" type="tts">ছেদন</annotation>
+ <annotation cp="∪">ইউনিয়ন | সংগ্ৰহ | সংহতি</annotation>
+ <annotation cp="∪" type="tts">ইউনিয়ন</annotation>
+ <annotation cp="≡">অনুৰূপ | ইয়াৰ অনুৰূপ | একে | তিনিগুণ</annotation>
+ <annotation cp="≡" type="tts">ইয়াৰ অনুৰূপ</annotation>
+ <annotation cp="⊂">ইয়াৰ উপসংহতি | উপসংহতি | সংহতি</annotation>
+ <annotation cp="⊂" type="tts">ইয়াৰ উপসংহতি</annotation>
+ <annotation cp="▲">ওপৰ | ওপৰফালে দেখুওৱা ৰং ভৰি থকা ত্ৰিভূজ | কাঁড় | ত্ৰিভূজ | ৰং ভৰি থকা</annotation>
+ <annotation cp="▲" type="tts">ওপৰফালে দেখুওৱা ৰং ভৰি থকা ত্ৰিভূজ</annotation>
+ <annotation cp="▼">কাঁড় | তল | তলফালে দেখুওৱা ৰং ভৰি থকা ত্ৰিভূজ | ত্ৰিভূজ | ৰং ভৰি থকা</annotation>
+ <annotation cp="▼" type="tts">তলফালে দেখুওৱা ৰং ভৰি থকা ত্ৰিভূজ</annotation>
+ <annotation cp="◊">চতুৰ্ভুজ | ৰম্বাচ | হীৰা</annotation>
+ <annotation cp="◊" type="tts">চতুৰ্ভুজ</annotation>
+ <annotation cp="○">ফোঁপোলা বৃত্ত | বৃত্ত | ৰিং</annotation>
+ <annotation cp="○" type="tts">ফোঁপোলা বৃত্ত</annotation>
+ <annotation cp="●">বৃত্ত | ৰং ভৰি থকা বৃত্ত</annotation>
+ <annotation cp="●" type="tts">ৰং ভৰি থকা বৃত্ত</annotation>
+ <annotation cp="◯">ডাঙৰ ফোঁপোলা বৃত্ত | বৃত্ত | ৰিং</annotation>
+ <annotation cp="◯" type="tts">ডাঙৰ ফোঁপোলা বৃত্ত</annotation>
<annotation cp="⚧">ট্ৰাণ্সজেণ্ডাৰ | ট্ৰাণ্সজেণ্ডাৰ চিহ্ন</annotation>
<annotation cp="⚧" type="tts">ট্ৰাণ্সজেণ্ডাৰ চিহ্ন</annotation>
<annotation cp="🤌">আঙুলি | জিজ্ঞাসা | টিপা মাৰি ৰখা | টিপা মাৰি ৰখা আঙুলি | ব্যঙ্গ | হাতৰ ভঙ্গিমা</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ৰামধেনু পতাকা</annotation>
<annotation cp="🏴☠">গুপ্তধনৰ ভঁৰাল | জ’লী ৰ’জাৰ | জলদস্যু | জলদস্যুৰ পতাকা | লুটপাট</annotation>
<annotation cp="🏴☠" type="tts">জলদস্যুৰ পতাকা</annotation>
+ <annotation cp="£">ইজিপি | জিবিপি | পাউণ্ড | মুদ্ৰা</annotation>
+ <annotation cp="£" type="tts">পাউণ্ড</annotation>
+ <annotation cp="¥">আইপিৱায় | চিএনৱায় | মুদ্ৰা | য়ুয়ান | য়েন</annotation>
+ <annotation cp="¥" type="tts">য়েন</annotation>
+ <annotation cp="€">ইইউআৰ | ইউৰো | মুদ্ৰা</annotation>
+ <annotation cp="€" type="tts">ইউৰো</annotation>
+ <annotation cp="₹">টকা | ভাৰতীয় টকা | মুদ্ৰা</annotation>
+ <annotation cp="₹" type="tts">ভাৰতীয় টকা</annotation>
+ <annotation cp="₽">মুদ্ৰা | ৰুবল</annotation>
+ <annotation cp="₽" type="tts">ৰুবল</annotation>
+ <annotation cp="¹">এক | ছুপাৰস্ক্ৰিপ্ট</annotation>
+ <annotation cp="¹" type="tts">ছুপাৰস্ক্ৰিপ্ট এক</annotation>
+ <annotation cp="²">ছুপাৰস্ক্ৰিপ্ট | দুই | বৰ্গক্ষেত্ৰ</annotation>
+ <annotation cp="²" type="tts">ছুপাৰস্ক্ৰিপ্ট দুই</annotation>
+ <annotation cp="³">ঘনাঙ্ক | ছুপাৰস্ক্ৰিপ্ট | তিনি</annotation>
+ <annotation cp="³" type="tts">ছুপাৰস্ক্ৰিপ্ট তিনি</annotation>
+ <annotation cp="µ">পৰিমাপ | মাইক্ৰ’ চিহ্ন</annotation>
+ <annotation cp="µ" type="tts">মাইক্ৰ’ চিহ্ন</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ast.xml b/common/annotations/ast.xml
index d0b6319..a791bf6 100644
--- a/common/annotations/ast.xml
+++ b/common/annotations/ast.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/az.xml b/common/annotations/az.xml
index c7565dd..94e07da 100644
--- a/common/annotations/az.xml
+++ b/common/annotations/az.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">orta-tünd dəri tonu</annotation>
<annotation cp="🏿">emoji modifikatoru | növ 6 | tünd dəri tonu</annotation>
<annotation cp="🏿" type="tts">tünd dəri tonu</annotation>
+ <annotation cp="–">en | qısa tire | tire</annotation>
+ <annotation cp="–" type="tts">qısa tire</annotation>
+ <annotation cp="—">em | tire | uzun tire</annotation>
+ <annotation cp="—" type="tts">uzun tire</annotation>
+ <annotation cp="·">interpunkt | middot | nöqtə | orta</annotation>
+ <annotation cp="·" type="tts">orta nöqtə</annotation>
+ <annotation cp="«">bucaq | dırnaq işarəsi | düzbucaqlı mötərizə | redaktə kursoru | şevron | sol | sol dırnaq işarəsi</annotation>
+ <annotation cp="«" type="tts">sol dırnaq işarəsi</annotation>
+ <annotation cp="»">bucaq | dırnaq işarəsi | düzbucaqlı mötərizə | redaktə kursoru | sağ | sağ dırnaq işarəsi | şevron</annotation>
+ <annotation cp="»" type="tts">sağ dırnaq işarəsi</annotation>
+ <annotation cp="§">bölmə | bölmə işarəsi | hissə | paraqraf | paraqraf işarəsi</annotation>
+ <annotation cp="§" type="tts">paraqraf işarəsi</annotation>
+ <annotation cp="†">kiçik xaç | obelisk | xəncər | xəncər-xaç işarəsi</annotation>
+ <annotation cp="†" type="tts">xəncər-xaç işarəsi</annotation>
+ <annotation cp="‡">ikiqat | ikixaçlı xəncər işarəsi | kiçik xaç | obelisk | xəncər</annotation>
+ <annotation cp="‡" type="tts">ikixaçlı xəncər işarəsi</annotation>
+ <annotation cp="•">böyük nöqtə | nöqtə</annotation>
+ <annotation cp="•" type="tts">böyük nöqtə</annotation>
+ <annotation cp="°">dərəcə | isbat | saat</annotation>
+ <annotation cp="°" type="tts">dərəcə</annotation>
+ <annotation cp="℗">müəllif hüququ | səs | səs yazma üzrə müəllif hüququ | yazma</annotation>
+ <annotation cp="℗" type="tts">səs yazma üzrə müəllif hüququ</annotation>
+ <annotation cp="←">ox | sol | sola yönəlmiş ox</annotation>
+ <annotation cp="←" type="tts">sola yönəlmiş ox</annotation>
+ <annotation cp="→">ox | sağ | sağa yönəlmiş ox</annotation>
+ <annotation cp="→" type="tts">sağa yönəlmiş ox</annotation>
+ <annotation cp="↑">ox | yuxarı | yuxarıya yönəlmiş ox</annotation>
+ <annotation cp="↑" type="tts">yuxarıya yönəlmiş ox</annotation>
+ <annotation cp="↓">aşağı | aşağı yönəlmiş ox | ox</annotation>
+ <annotation cp="↓" type="tts">aşağı yönəlmiş ox</annotation>
+ <annotation cp="⇅">aşağı | ox | yuxarı | yuxarı və aşağı yönəlmiş oxlar</annotation>
+ <annotation cp="⇅" type="tts">yuxarı və aşağı yönəlmiş oxlar</annotation>
+ <annotation cp="⇆">ox | sağ | sağa yönəlmiş oxlar üzəri sola yönəlmiş | sağa yönəlmiş oxlar üzərindən sola yönəlmiş | sol</annotation>
+ <annotation cp="⇆" type="tts">sağa yönəlmiş oxlar üzəri sola yönəlmiş</annotation>
+ <annotation cp="∆">delta | üçbucaq</annotation>
+ <annotation cp="∆" type="tts">delta</annotation>
+ <annotation cp="∇">nabla | üçbucaq</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">daxildir | dəst | element | elementi | üzvlük</annotation>
+ <annotation cp="∈" type="tts">elementi</annotation>
+ <annotation cp="÷">bölmə | bölmə işarəsi | bölmək | kiçik xaç</annotation>
+ <annotation cp="÷" type="tts">bölmə işarəsi</annotation>
+ <annotation cp="×">dəfə | vurma | vurma işarəsi | vurma şarəsi | vurmaq</annotation>
+ <annotation cp="×" type="tts">vurma işarəsi</annotation>
+ <annotation cp="⁻">minus | üstdə minus | üstdə yazılan</annotation>
+ <annotation cp="⁻" type="tts">üstdə minus</annotation>
+ <annotation cp="√">əsas | irrasional | kök | kökaltı | kvadrat | radikal</annotation>
+ <annotation cp="√" type="tts">kökaltı</annotation>
+ <annotation cp="∞">sonsuzluq | sonsuzluq işarəsi</annotation>
+ <annotation cp="∞" type="tts">sonsuzluq işarəsi</annotation>
+ <annotation cp="∩">dəst | kəsişmə</annotation>
+ <annotation cp="∩" type="tts">kəsişmə</annotation>
+ <annotation cp="∪">birləşmə | cəm | dəst</annotation>
+ <annotation cp="∪" type="tts">birləşmə</annotation>
+ <annotation cp="≡">bərabər | bərabərdir | dəqiq | üçqat</annotation>
+ <annotation cp="≡" type="tts">bərabərdir</annotation>
+ <annotation cp="⊂">altçoxluğu | altçoxluq | dəst</annotation>
+ <annotation cp="⊂" type="tts">altçoxluğu</annotation>
+ <annotation cp="▲">dolu | ox | üçbucaq | yuxarı | yuxarı yönəlmiş dolu üçbucaq</annotation>
+ <annotation cp="▲" type="tts">yuxarı yönəlmiş dolu üçbucaq</annotation>
+ <annotation cp="▼">aşağı | aşağı yönəlmiş dolu üçbucaq | dolu | ox | üçbucaq</annotation>
+ <annotation cp="▼" type="tts">aşağı yönəlmiş dolu üçbucaq</annotation>
+ <annotation cp="◊">romb | rombşəkilli fiqur</annotation>
+ <annotation cp="◊" type="tts">rombşəkilli fiqur</annotation>
+ <annotation cp="○">boş dairə | dairə | halqa</annotation>
+ <annotation cp="○" type="tts">boş dairə</annotation>
+ <annotation cp="●">dairə | dolu dairə</annotation>
+ <annotation cp="●" type="tts">dolu dairə</annotation>
+ <annotation cp="◯">böyük boş dairə | dairə | halqa</annotation>
+ <annotation cp="◯" type="tts">böyük boş dairə</annotation>
<annotation cp="⚧">transgender | transgender simvolu</annotation>
<annotation cp="⚧" type="tts">transgender simvolu</annotation>
<annotation cp="🤌">barmaqlar | çimdik | əl jesti | sarkastik | sorğu-sual</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">göy qurşağı bayrağı</annotation>
<annotation cp="🏴☠">cəvahirat | pirat | quldur | quldur bayrağı | Şən Roger</annotation>
<annotation cp="🏴☠" type="tts">quldur bayrağı</annotation>
+ <annotation cp="£">EGP | funt | GBP | valyuta</annotation>
+ <annotation cp="£" type="tts">funt</annotation>
+ <annotation cp="¥">CNY | JPY | valyuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">avro | EUR | valyuta</annotation>
+ <annotation cp="€" type="tts">avro</annotation>
+ <annotation cp="₹">Hindistan rupisi | rupi | valyuta</annotation>
+ <annotation cp="₹" type="tts">Hindistan rupisi</annotation>
+ <annotation cp="₽">rubl | valyuta</annotation>
+ <annotation cp="₽" type="tts">rubl</annotation>
+ <annotation cp="¹">bir | üstdə bir | üstdə yazılan</annotation>
+ <annotation cp="¹" type="tts">üstdə bir</annotation>
+ <annotation cp="²">iki | kvadrata yüksəlmiş | üstdə iki | üstdə yazılan</annotation>
+ <annotation cp="²" type="tts">üstdə iki</annotation>
+ <annotation cp="³">kuba yüksəlmiş | üç | üstdə üç | üstdə yazılan</annotation>
+ <annotation cp="³" type="tts">üstdə üç</annotation>
+ <annotation cp="µ">mikro işarəsi | mkro işarəsi | ölçü</annotation>
+ <annotation cp="µ" type="tts">mikro işarəsi</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/be.xml b/common/annotations/be.xml
index 62b687e..f7cfd65 100644
--- a/common/annotations/be.xml
+++ b/common/annotations/be.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">сярэдняцёмны тон скуры</annotation>
<annotation cp="🏿">колер скуры | тып 6 | цёмны тон скуры</annotation>
<annotation cp="🏿" type="tts">цёмны тон скуры</annotation>
+ <annotation cp="–">кароткі | працяжнік</annotation>
+ <annotation cp="–" type="tts">кароткі працяжнік</annotation>
+ <annotation cp="—">доўгі | працяжнік</annotation>
+ <annotation cp="—" type="tts">доўгі працяжнік</annotation>
+ <annotation cp="·">інтэрпункт | кропка | сярэдняя</annotation>
+ <annotation cp="·" type="tts">сярэдняя кропка</annotation>
+ <annotation cp="«">вугалкі | вуглавое | двукоссе | елачка | левае двукоссе | левае французскае двукоссе | улева | французскае | шаўрон | ялінка</annotation>
+ <annotation cp="«" type="tts">левае французскае двукоссе</annotation>
+ <annotation cp="»">вугалкі | вуглавое | двукоссе | елачка | правае двукоссе | правае французскае двукоссе | управа | французскае | шаўрон | ялінка</annotation>
+ <annotation cp="»" type="tts">правае французскае двукоссе</annotation>
+ <annotation cp="§">глава | параграф | раздзел | частка</annotation>
+ <annotation cp="§" type="tts">параграф</annotation>
+ <annotation cp="†">абеліск | друкарскі крыжык | кінжал | крыжык</annotation>
+ <annotation cp="†" type="tts">друкарскі крыжык</annotation>
+ <annotation cp="‡">абеліск | двайны | двайны друкарскі крыжык | кінжал | крыжык</annotation>
+ <annotation cp="‡" type="tts">двайны друкарскі крыжык</annotation>
+ <annotation cp="•">кропка | маркер</annotation>
+ <annotation cp="•" type="tts">маркер</annotation>
+ <annotation cp="°">вугал | градус | мацунак</annotation>
+ <annotation cp="°" type="tts">градус</annotation>
+ <annotation cp="℗">аўдыя | аўтарскае права | аўтарскае права на аўдыязапіс | гук | запіс</annotation>
+ <annotation cp="℗" type="tts">аўтарскае права на аўдыязапіс</annotation>
+ <annotation cp="←">стрэлка | стрэлка, скіраваная ўлева | улева</annotation>
+ <annotation cp="←" type="tts">стрэлка, скіраваная ўлева</annotation>
+ <annotation cp="→">стрэлка | стрэлка, скіраваная ўправа | управа</annotation>
+ <annotation cp="→" type="tts">стрэлка, скіраваная ўправа</annotation>
+ <annotation cp="↑">стрэлка | стрэлка, скіраваная ўверх | уверх</annotation>
+ <annotation cp="↑" type="tts">стрэлка, скіраваная ўверх</annotation>
+ <annotation cp="↓">стрэлка | стрэлка, скіраваная ўніз | уніз</annotation>
+ <annotation cp="↓" type="tts">стрэлка, скіраваная ўніз</annotation>
+ <annotation cp="⇅">стрэлка | стрэлка ўверх і стрэлка ўніз | уверх | уніз</annotation>
+ <annotation cp="⇅" type="tts">стрэлка ўверх і стрэлка ўніз</annotation>
+ <annotation cp="⇆">стрэлка ўлева над стрэлкай управа | улева | управа</annotation>
+ <annotation cp="⇆" type="tts">стрэлка ўлева над стрэлкай управа</annotation>
+ <annotation cp="∆">дэльта | трохвугольнік</annotation>
+ <annotation cp="∆" type="tts">дэльта</annotation>
+ <annotation cp="∇">набла | трохвугольнік</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">змяшчае | мноства | набор | прыналежыць да | элемент</annotation>
+ <annotation cp="∈" type="tts">элемент</annotation>
+ <annotation cp="÷">дзяленне | дзяліць | знак дзялення</annotation>
+ <annotation cp="÷" type="tts">дзяленне</annotation>
+ <annotation cp="×">знак множання | множанне | памнажаць | разы</annotation>
+ <annotation cp="×" type="tts">множанне</annotation>
+ <annotation cp="⁻">верхні індэкс | мінус | надрадковы</annotation>
+ <annotation cp="⁻" type="tts">надрадковы мінус</annotation>
+ <annotation cp="√">квадратны | корань | радыкал</annotation>
+ <annotation cp="√" type="tts">квадратны корань</annotation>
+ <annotation cp="∞">бясконцасць | знак бясконцасці</annotation>
+ <annotation cp="∞" type="tts">знак бясконцасці</annotation>
+ <annotation cp="∩">мноства | перасячэнне</annotation>
+ <annotation cp="∩" type="tts">перасячэнне</annotation>
+ <annotation cp="∪">аб’яднанне | злучэнне | мноства</annotation>
+ <annotation cp="∪" type="tts">аб’яднанне</annotation>
+ <annotation cp="≡">дакладны | ідэнтычны | тоесны | трайны</annotation>
+ <annotation cp="≡" type="tts">тоесны</annotation>
+ <annotation cp="⊂">мноства | падмноства</annotation>
+ <annotation cp="⊂" type="tts">падмноства</annotation>
+ <annotation cp="▲">запоўнены | зафарбаваны | стрэлка | трохвугольнік | уверх</annotation>
+ <annotation cp="▲" type="tts">зафарбаваны трохвугольнік уверх</annotation>
+ <annotation cp="▼">запоўнены | зафарбаваны | стрэлка | трохвугольнік | уніз</annotation>
+ <annotation cp="▼" type="tts">зафарбаваны трохвугольнік уніз</annotation>
+ <annotation cp="◊">бубны | звонкі | ромб</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">кольца | круг | незафарбаваны круг</annotation>
+ <annotation cp="○" type="tts">кольца</annotation>
+ <annotation cp="●">зафарбаваны круг | круг</annotation>
+ <annotation cp="●" type="tts">зафарбаваны круг</annotation>
+ <annotation cp="◯">вялікае кольца | вялікі незафарбаваны круг | кольца | круг</annotation>
+ <annotation cp="◯" type="tts">вялікае кольца</annotation>
<annotation cp="⚧">сімвал трансгендара | трансгендар</annotation>
<annotation cp="⚧" type="tts">сімвал трансгендара</annotation>
<annotation cp="🤌">жэст рукі | зведзеныя | пальцы | пытанне | сарказм | шчыпок</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">вясёлкавы сцяг</annotation>
<annotation cp="🏴☠">Вясёлы Роджар | пірат | пірацкі сцяг | разбой | скарбы</annotation>
<annotation cp="🏴☠" type="tts">пірацкі сцяг</annotation>
+ <annotation cp="£">EGP | GBP | валюта | стэрлінгаў | фунт</annotation>
+ <annotation cp="£" type="tts">фунт</annotation>
+ <annotation cp="¥">CNY | JPY | валюта | іена | юань</annotation>
+ <annotation cp="¥" type="tts">іена</annotation>
+ <annotation cp="€">EUR | валюта | еўра</annotation>
+ <annotation cp="€" type="tts">еўра</annotation>
+ <annotation cp="₹">валюта | індыйская рупія | рупія</annotation>
+ <annotation cp="₹" type="tts">індыйская рупія</annotation>
+ <annotation cp="₽">валюта | расійскі | рубель</annotation>
+ <annotation cp="₽" type="tts">расійскі рубель</annotation>
+ <annotation cp="¹">адзінка | верхні індэкс | надрадковая</annotation>
+ <annotation cp="¹" type="tts">надрадковая адзінка</annotation>
+ <annotation cp="²">верхні індэкс | двойка | надрадковая | у квадраце</annotation>
+ <annotation cp="²" type="tts">надрадковая двойка</annotation>
+ <annotation cp="³">верхні індэкс | надрадковая | тройка | у кубе</annotation>
+ <annotation cp="³" type="tts">надрадковая тройка</annotation>
+ <annotation cp="µ">вымярэнне | знак «мікра»</annotation>
+ <annotation cp="µ" type="tts">знак «мікра»</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/bg.xml b/common/annotations/bg.xml
index c465421..c6df5f3 100644
--- a/common/annotations/bg.xml
+++ b/common/annotations/bg.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">средно тъмна кожа</annotation>
<annotation cp="🏿">кожа от тип 6 | тъмна кожа | цвят на кожата</annotation>
<annotation cp="🏿" type="tts">тъмна кожа</annotation>
+ <annotation cp="–">средно | тире</annotation>
+ <annotation cp="–" type="tts">средно тире</annotation>
+ <annotation cp="—">дълго | тире</annotation>
+ <annotation cp="—" type="tts">дълго тире</annotation>
+ <annotation cp="·">интерпункт | средна | точка</annotation>
+ <annotation cp="·" type="tts">средна точка</annotation>
+ <annotation cp="«">кавичка | кавички | карета | лява френска кавичка | ляво | шеврон | ъгъл</annotation>
+ <annotation cp="«" type="tts">лява френска кавичка</annotation>
+ <annotation cp="»">дясна френска кавичка | дясно | кавичка | кавички | карета | шеврон | ъгъл</annotation>
+ <annotation cp="»" type="tts">дясна френска кавичка</annotation>
+ <annotation cp="§">параграф | подразделение | секция | част</annotation>
+ <annotation cp="§" type="tts">параграф</annotation>
+ <annotation cp="†">кръст | обел | обелиск</annotation>
+ <annotation cp="†" type="tts">обелиск</annotation>
+ <annotation cp="‡">двоен | кръст | обел | обелиск</annotation>
+ <annotation cp="‡" type="tts">двоен обелиск</annotation>
+ <annotation cp="•">водещ символ | точка</annotation>
+ <annotation cp="•" type="tts">водещ символ</annotation>
+ <annotation cp="°">градус | час</annotation>
+ <annotation cp="°" type="tts">градус</annotation>
+ <annotation cp="℗">авторско право | авторско право за звукозапис | запис | звук</annotation>
+ <annotation cp="℗" type="tts">авторско право за звукозапис</annotation>
+ <annotation cp="←">наляво | стрелка | стрелка, сочеща наляво</annotation>
+ <annotation cp="←" type="tts">стрелка, сочеща наляво</annotation>
+ <annotation cp="→">надясно | стрелка | стрелка, сочеща надясно</annotation>
+ <annotation cp="→" type="tts">стрелка, сочеща надясно</annotation>
+ <annotation cp="↑">нагоре | стрелка | стрелка, сочеща нагоре</annotation>
+ <annotation cp="↑" type="tts">стрелка, сочеща нагоре</annotation>
+ <annotation cp="↓">надолу | стрелка | стрелка, сочеща надолу</annotation>
+ <annotation cp="↓" type="tts">стрелка, сочеща надолу</annotation>
+ <annotation cp="⇅">нагоре | надолу | стрелка | стрелки, сочещи нагоре и надолу</annotation>
+ <annotation cp="⇅" type="tts">стрелки, сочещи нагоре и надолу</annotation>
+ <annotation cp="⇆">надясно | наляво | сочеща наляво стрелка над сочеща надясно стрелка | стрелка</annotation>
+ <annotation cp="⇆" type="tts">сочеща наляво стрелка над сочеща надясно стрелка</annotation>
+ <annotation cp="∆">промяна | триъгълник</annotation>
+ <annotation cp="∆" type="tts">промяна</annotation>
+ <annotation cp="∇">набла | триъгълник</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">елемент | елемент на | множество | принадлежност | съдържа</annotation>
+ <annotation cp="∈" type="tts">елемент на</annotation>
+ <annotation cp="÷">деление | делено | знак за деление | обелос</annotation>
+ <annotation cp="÷" type="tts">знак за деление</annotation>
+ <annotation cp="×">знак за умножение | по | умножение | умножено</annotation>
+ <annotation cp="×" type="tts">знак за умножение</annotation>
+ <annotation cp="⁻">горен индекс | горен минус | минус</annotation>
+ <annotation cp="⁻" type="tts">горен минус</annotation>
+ <annotation cp="√">ирационално число | квадратен корен | корен | на квадрат | радикал | радикс</annotation>
+ <annotation cp="√" type="tts">квадратен корен</annotation>
+ <annotation cp="∞">безкрайност | знак за безкрайност</annotation>
+ <annotation cp="∞" type="tts">знак за безкрайност</annotation>
+ <annotation cp="∩">множество | пресичане</annotation>
+ <annotation cp="∩" type="tts">пресичане</annotation>
+ <annotation cp="∪">множество | обединение | съвкупност</annotation>
+ <annotation cp="∪" type="tts">обединение</annotation>
+ <annotation cp="≡">еквивалентно на | идентично | точно | три черти</annotation>
+ <annotation cp="≡" type="tts">еквивалентно на</annotation>
+ <annotation cp="⊂">множество | подмножество | подмножество на</annotation>
+ <annotation cp="⊂" type="tts">подмножество на</annotation>
+ <annotation cp="▲">запълнен триъгълник, сочещ нагоре | запълнено | нагоре | стрелка | триъгълник</annotation>
+ <annotation cp="▲" type="tts">запълнен триъгълник, сочещ нагоре</annotation>
+ <annotation cp="▼">запълнен триъгълник, сочещ надолу | запълнено | надолу | стрелка | триъгълник</annotation>
+ <annotation cp="▼" type="tts">запълнен триъгълник, сочещ надолу</annotation>
+ <annotation cp="◊">диамант | ромб | ромбовиден</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">кръг | незапълнен кръг | празен кръг</annotation>
+ <annotation cp="○" type="tts">празен кръг</annotation>
+ <annotation cp="●">запълнен кръг | кръг</annotation>
+ <annotation cp="●" type="tts">запълнен кръг</annotation>
+ <annotation cp="◯">голям незапълнен кръг | кръг | празен кръг</annotation>
+ <annotation cp="◯" type="tts">голям незапълнен кръг</annotation>
<annotation cp="⚧">символ за трансджендър | трансджендър</annotation>
<annotation cp="⚧" type="tts">символ за трансджендър</annotation>
<annotation cp="🤌">въпрос | жест с ръка | пръсти | саркастично | събрани</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">флагът на дъгата</annotation>
<annotation cp="🏴☠">Веселия Роджър | грабежи | пират | пиратски флаг | съкровище</annotation>
<annotation cp="🏴☠" type="tts">пиратски флаг</annotation>
+ <annotation cp="£">валута | лира | паунд</annotation>
+ <annotation cp="£" type="tts">лира</annotation>
+ <annotation cp="¥">валута | йена | юан</annotation>
+ <annotation cp="¥" type="tts">йена</annotation>
+ <annotation cp="€">валута | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валута | индийска рупия | рупия</annotation>
+ <annotation cp="₹" type="tts">индийска рупия</annotation>
+ <annotation cp="₽">валута | рубла</annotation>
+ <annotation cp="₽" type="tts">рубла</annotation>
+ <annotation cp="¹">горен индекс | едно | първа степен</annotation>
+ <annotation cp="¹" type="tts">първа степен</annotation>
+ <annotation cp="²">втора степен | горен индекс | две | на квадрат</annotation>
+ <annotation cp="²" type="tts">втора степен</annotation>
+ <annotation cp="³">горен индекс | на куб | трета степен | три</annotation>
+ <annotation cp="³" type="tts">трета степен</annotation>
+ <annotation cp="µ">знак за микро- | мярка</annotation>
+ <annotation cp="µ" type="tts">знак за микро-</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/bn.xml b/common/annotations/bn.xml
index 457f817..6217d33 100644
--- a/common/annotations/bn.xml
+++ b/common/annotations/bn.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">মাঝারি-কালো ত্বকের রঙ</annotation>
<annotation cp="🏿">কালো ত্বকের রঙ | টোন | ত্বক | ত্বকের ধরন-6</annotation>
<annotation cp="🏿" type="tts">কালো ত্বকের রঙ</annotation>
+ <annotation cp="–">এন ড্যাশ | ড্যাশ । এন</annotation>
+ <annotation cp="–" type="tts">এন ড্যাশ</annotation>
+ <annotation cp="—">এম ড্যাশ | ড্যাশ । এম</annotation>
+ <annotation cp="—" type="tts">এম ড্যাশ</annotation>
+ <annotation cp="·">বিন্দু । আন্তঃযতিচিহ্ন । মধ্য । মধ্যবিন্দু | মধ্য বিন্দু</annotation>
+ <annotation cp="·" type="tts">মধ্য বিন্দু</annotation>
+ <annotation cp="«">কোণ ! বন্ধনী । ক্যারেট । শেভ্রন । উদ্ধৃতি চিহ্ন । বাম । বাম উদ্ধৃতি চিহ্ন | বাম উদ্ধৃতি চিহ্ন</annotation>
+ <annotation cp="«" type="tts">বাম উদ্ধৃতি চিহ্ন</annotation>
+ <annotation cp="»">কোণ ! বন্ধনী । ক্যারেট । শেভ্রন । উদ্ধৃতি চিহ্ন । ডান । ডান উদ্ধৃতি চিহ্ন | ডান উদ্ধৃতি চিহ্ন</annotation>
+ <annotation cp="»" type="tts">ডান উদ্ধৃতি চিহ্ন</annotation>
+ <annotation cp="§">অনুচ্ছেদ । অংশ । বিভাগ । সিলক্রো | বিভাগ</annotation>
+ <annotation cp="§" type="tts">বিভাগ</annotation>
+ <annotation cp="†">ছোরা । ওবেলিস্ক । ওবেলাস | ছোরার চিহ্ন</annotation>
+ <annotation cp="†" type="tts">ছোরার চিহ্ন</annotation>
+ <annotation cp="‡">ছোরা । দুবার । ওবেলিস্ক । ওবেলিস | দুটি ছোরার চিহ্ন</annotation>
+ <annotation cp="‡" type="tts">দুটি ছোরার চিহ্ন</annotation>
+ <annotation cp="•">বুলেট | বুলেট । বিন্দু</annotation>
+ <annotation cp="•" type="tts">বুলেট</annotation>
+ <annotation cp="°">ডিগ্রি | ডিগ্রি । ঘন্টা । প্রুফ</annotation>
+ <annotation cp="°" type="tts">ডিগ্রি</annotation>
+ <annotation cp="℗">কপিরাইট | রেকর্ডিং | সাউন্ড</annotation>
+ <annotation cp="℗" type="tts">সাউন্ড রেকর্ডিং কপিরাইট</annotation>
+ <annotation cp="←">তীর | বাঁ | বাঁ-দিকে তাক করা তীর</annotation>
+ <annotation cp="←" type="tts">বাঁ-দিকে তাক করা তীর</annotation>
+ <annotation cp="→">ডান | ডান-দিকে তাক করা তীর | ডান-দিকে পয়েন্ট করা তীর | তীর</annotation>
+ <annotation cp="→" type="tts">ডান-দিকে পয়েন্ট করা তীর</annotation>
+ <annotation cp="↑">উপরে | উপরের-দিকে তাক করা তীর | তীর</annotation>
+ <annotation cp="↑" type="tts">উপরের-দিকে তাক করা তীর</annotation>
+ <annotation cp="↓">তীর | নিচে | নিচের-দিকে তাক করা তীর</annotation>
+ <annotation cp="↓" type="tts">নিচের-দিকে তাক করা তীর</annotation>
+ <annotation cp="⇅">উপরে | উপরে-তাক করা ও নিচে-তাক করা তীর | উপরের- দিকে ও নিচের দিকে তাক করা তীর | তীর | নিচে</annotation>
+ <annotation cp="⇅" type="tts">উপরের- দিকে ও নিচের দিকে তাক করা তীর</annotation>
+ <annotation cp="⇆">ডান দিক | ডান দিকের উপর তাক করা বাঁ-দিকের তীর | তীর | বাঁ | বাঁ-দিকের উপর ডান-দিকে তাক করা তীর</annotation>
+ <annotation cp="⇆" type="tts">বাঁ-দিকের উপর ডান-দিকে তাক করা তীর</annotation>
+ <annotation cp="∆">বৃদ্ধি | বৃদ্ধি । ত্রিভুজ</annotation>
+ <annotation cp="∆" type="tts">বৃদ্ধি</annotation>
+ <annotation cp="∇">ন্যাবলা | ন্যাবলা । ত্রিভুজ</annotation>
+ <annotation cp="∇" type="tts">ন্যাবলা</annotation>
+ <annotation cp="∈">এতে রয়েছে । উপাদান । এর উপাদান । সদস্যতা । সেট | এর উপাদান</annotation>
+ <annotation cp="∈" type="tts">এর উপাদান</annotation>
+ <annotation cp="÷">ভাগ করুন । ভাগ । ভাগ চিহ্ন । ওবেলাস | ভাগ চিহ্ন</annotation>
+ <annotation cp="÷" type="tts">ভাগ চিহ্ন</annotation>
+ <annotation cp="×">গুণ । গুণ চিহ্ন । গুণ করা । বার | গুণচিহ্ন</annotation>
+ <annotation cp="×" type="tts">গুণচিহ্ন</annotation>
+ <annotation cp="⁻">মাইনাস । সুপারস্ক্রিপ্ট | সুপারস্ক্রিপ্ট মাইনাস</annotation>
+ <annotation cp="⁻" type="tts">সুপারস্ক্রিপ্ট মাইনাস</annotation>
+ <annotation cp="√">করণী | বর্গ | বর্গমূল | রুট | রেডিক্স | র্যাডিক্যাল</annotation>
+ <annotation cp="√" type="tts">বর্গমূল</annotation>
+ <annotation cp="∞">অসীম | অসীম চিহ্ন</annotation>
+ <annotation cp="∞" type="tts">অসীম চিহ্ন</annotation>
+ <annotation cp="∩">ছেদ | ছেদ । সেট</annotation>
+ <annotation cp="∩" type="tts">ছেদ</annotation>
+ <annotation cp="∪">ইউনিয়ন | সংগ্রহ । সেট । ইউনিয়ন</annotation>
+ <annotation cp="∪" type="tts">ইউনিয়ন</annotation>
+ <annotation cp="≡">এর সাথে সমান | সমান। সমতুল । এর সাথে সমান । তিনগুণ</annotation>
+ <annotation cp="≡" type="tts">এর সাথে সমান</annotation>
+ <annotation cp="⊂">এর উপসেট | সেট । উপসেট । এর উপসেট</annotation>
+ <annotation cp="⊂" type="tts">এর উপসেট</annotation>
+ <annotation cp="▲">উর্ধ্বমুখী কোণযুক্ত ভরাট ত্রিভুজ | তীর ! নীচে । উর্ধ্বমুখী কোণযুক্ত ভরাট ত্রিভুজ । ত্রিভুজ</annotation>
+ <annotation cp="▲" type="tts">উর্ধ্বমুখী কোণযুক্ত ভরাট ত্রিভুজ</annotation>
+ <annotation cp="▼">তীর । নীচে । ভরাট । নিম্নমুখী কোণযুক্ত ভরাট ত্রিভুজ । ত্রিভুজ | নিম্নমুখী কোণযুক্ত ভরাট ত্রিভুজ</annotation>
+ <annotation cp="▼" type="tts">নিম্নমুখী কোণযুক্ত ভরাট ত্রিভুজ</annotation>
+ <annotation cp="◊">ডায়মন্ড । ডায়মন্ড আকার । রম্বস | ডায়মন্ড আকার</annotation>
+ <annotation cp="◊" type="tts">ডায়মন্ড আকার</annotation>
+ <annotation cp="○">ফাঁকা বৃত্ত | বৃত্ত । ফাঁকা বৃত্ত । রিং</annotation>
+ <annotation cp="○" type="tts">ফাঁকা বৃত্ত</annotation>
+ <annotation cp="●">বৃত্ত । ভরাট বৃত্ত | ভরাট বৃত্ত</annotation>
+ <annotation cp="●" type="tts">ভরাট বৃত্ত</annotation>
+ <annotation cp="◯">বড় ফাঁকা বৃত্ত | বৃত্ত । বড় ফাঁকা বৃত্ত । রিং</annotation>
+ <annotation cp="◯" type="tts">বড় ফাঁকা বৃত্ত</annotation>
<annotation cp="⚧">রূপান্তরিত লিঙ্গ | রূপান্তরিত লিঙ্গ চিহ্ন</annotation>
<annotation cp="⚧" type="tts">রূপান্তরিত লিঙ্গ চিহ্ন</annotation>
<annotation cp="🤌">অল্প একটু | আঙ্গুল | চিমটিকাটা | জিজ্ঞেস করা | বিদ্রুপপূর্ণ | হাতের অঙ্গিভঙ্গি</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">রামধনু পতাকা</annotation>
<annotation cp="🏴☠">জলদস্যু | জলদস্যু পতাকা | জলি রজার | ধন | লুণ্ঠন</annotation>
<annotation cp="🏴☠" type="tts">জলদস্যু পতাকা</annotation>
+ <annotation cp="£">EGP | GBP | পাউন্ড | মুদ্রা</annotation>
+ <annotation cp="£" type="tts">পাউন্ড</annotation>
+ <annotation cp="¥">CNY | JPY | ইউয়ান | ইয়েন | মুদ্রা</annotation>
+ <annotation cp="¥" type="tts">ইয়েন</annotation>
+ <annotation cp="€">৳ । EUR । ইউরো | ইউরো</annotation>
+ <annotation cp="€" type="tts">ইউরো</annotation>
+ <annotation cp="₹">ভারতীয় টাকা | মুদ্রা । ভারতীয় টাকা । টাকা</annotation>
+ <annotation cp="₹" type="tts">ভারতীয় টাকা</annotation>
+ <annotation cp="₽">মুদ্রা । রুবল | রুবল</annotation>
+ <annotation cp="₽" type="tts">রুবল</annotation>
+ <annotation cp="¹">ওয়ান । সুপারস্ক্রিপ্ট | সুপারস্ক্রিপ্ট ওয়ান</annotation>
+ <annotation cp="¹" type="tts">সুপারস্ক্রিপ্ট ওয়ান</annotation>
+ <annotation cp="²">বর্গাকার । সুপারস্ক্রিপ্ট । দুই | সুপারস্ক্রিপ্ট টু</annotation>
+ <annotation cp="²" type="tts">সুপারস্ক্রিপ্ট টু</annotation>
+ <annotation cp="³">ঘন । সুপারস্ক্রিপ্ট । তিন | সুপারস্ক্রিপ্ট থ্রি</annotation>
+ <annotation cp="³" type="tts">সুপারস্ক্রিপ্ট থ্রি</annotation>
+ <annotation cp="µ">মাইক্রো সাইন | মাপা</annotation>
+ <annotation cp="µ" type="tts">মাইক্রো সাইন</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/bs.xml b/common/annotations/bs.xml
index 0026ee1..41acb1c 100644
--- a/common/annotations/bs.xml
+++ b/common/annotations/bs.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">umjereno tamna boja kože</annotation>
<annotation cp="🏿">boja kože | tamna boja kože | tip 6</annotation>
<annotation cp="🏿" type="tts">tamna boja kože</annotation>
+ <annotation cp="–">crtica | povlaka</annotation>
+ <annotation cp="–" type="tts">crtica</annotation>
+ <annotation cp="—">crta | povlaka</annotation>
+ <annotation cp="—" type="tts">crta</annotation>
+ <annotation cp="·">interpunkt | sredina | srednja tačka | tačka</annotation>
+ <annotation cp="·" type="tts">srednja tačka</annotation>
+ <annotation cp="«">karet | lijevi uglasti navodnik | lijevo | navod | ševron | ugao | zagrade</annotation>
+ <annotation cp="«" type="tts">lijevi uglasti navodnik</annotation>
+ <annotation cp="»">desni uglasti navodnik | desno | karet | navod | ševron | ugao | zagrade</annotation>
+ <annotation cp="»" type="tts">desni uglasti navodnik</annotation>
+ <annotation cp="§">dio | odlomak | paragraf</annotation>
+ <annotation cp="§" type="tts">odlomak</annotation>
+ <annotation cp="†">obelisk | znak za bodež</annotation>
+ <annotation cp="†" type="tts">znak za bodež</annotation>
+ <annotation cp="‡">bodež | dvostruki | dvostruki znak za bodež | obelisk</annotation>
+ <annotation cp="‡" type="tts">dvostruki znak za bodež</annotation>
+ <annotation cp="•">tačka | znak za isticanje</annotation>
+ <annotation cp="•" type="tts">znak za isticanje</annotation>
+ <annotation cp="°">jačine | sati | stepen</annotation>
+ <annotation cp="°" type="tts">stepen</annotation>
+ <annotation cp="℗">autorsko pravo | autorsko pravo za zvučni snimak | snimak | zvuk</annotation>
+ <annotation cp="℗" type="tts">autorsko pravo za zvučni snimak</annotation>
+ <annotation cp="←">lijevo | strelica | strelica prema lijevo</annotation>
+ <annotation cp="←" type="tts">strelica prema lijevo</annotation>
+ <annotation cp="→">desno | strelica | strelica prema desno</annotation>
+ <annotation cp="→" type="tts">strelica prema desno</annotation>
+ <annotation cp="↑">gore | strelica | strelica prema gore</annotation>
+ <annotation cp="↑" type="tts">strelica prema gore</annotation>
+ <annotation cp="↓">dolje | strelica | strelica prema dolje</annotation>
+ <annotation cp="↓" type="tts">strelica prema dolje</annotation>
+ <annotation cp="⇅">dolje | gore | strelica | strelice prema gore i prema dolje</annotation>
+ <annotation cp="⇅" type="tts">strelice prema gore i prema dolje</annotation>
+ <annotation cp="⇆">desno | lijevo | strelica | strelica gore preko strelice dolje | strelica prema gore preko strelice prema dolje | strelice</annotation>
+ <annotation cp="⇆" type="tts">strelica gore preko strelice dolje</annotation>
+ <annotation cp="∆">inkrement | trougao</annotation>
+ <annotation cp="∆" type="tts">inkrement</annotation>
+ <annotation cp="∇">nabla | trougao</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">članstvo | element | element od | sadrži | skup</annotation>
+ <annotation cp="∈" type="tts">element od</annotation>
+ <annotation cp="÷">dijeljenje | obelus | podijeliti | znak za dijeljenje</annotation>
+ <annotation cp="÷" type="tts">znak za dijeljenje</annotation>
+ <annotation cp="×">množenje | pomnožiti | puta | znak za množenje</annotation>
+ <annotation cp="×" type="tts">znak za množenje</annotation>
+ <annotation cp="⁻">eksponent | eksponentni minus | minus</annotation>
+ <annotation cp="⁻" type="tts">eksponentni minus</annotation>
+ <annotation cp="√">iracionalan | korijen | kvadratni | radikal | radikand</annotation>
+ <annotation cp="√" type="tts">kvadratni korijen</annotation>
+ <annotation cp="∞">beskonačnost | znak za beskonačnost</annotation>
+ <annotation cp="∞" type="tts">znak za beskonačnost</annotation>
+ <annotation cp="∩">presjek | skup</annotation>
+ <annotation cp="∩" type="tts">presjek</annotation>
+ <annotation cp="∪">skup | unija | zbirka</annotation>
+ <annotation cp="∪" type="tts">unija</annotation>
+ <annotation cp="≡">identično | tačno | trostruko</annotation>
+ <annotation cp="≡" type="tts">identično</annotation>
+ <annotation cp="⊂">podskup | skup</annotation>
+ <annotation cp="⊂" type="tts">podskup</annotation>
+ <annotation cp="▲">gore | ispunjeni trougao prema gore | ispunjeno | strelica | trougao</annotation>
+ <annotation cp="▲" type="tts">ispunjeni trougao prema gore</annotation>
+ <annotation cp="▼">dolje | ispunjeni trougao prema dolje | ispunjeno | strelica | trougao</annotation>
+ <annotation cp="▼" type="tts">ispunjeni trougao prema dolje</annotation>
+ <annotation cp="◊">dijamant | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">krug | prazni krug | prsten</annotation>
+ <annotation cp="○" type="tts">prazni krug</annotation>
+ <annotation cp="●">ispunjeni krug | krug</annotation>
+ <annotation cp="●" type="tts">ispunjeni krug</annotation>
+ <annotation cp="◯">krug | prsten | veliki prazni krug</annotation>
+ <annotation cp="◯" type="tts">veliki prazni krug</annotation>
<annotation cp="⚧">simbol transrodnih osoba | transrodna osoba</annotation>
<annotation cp="⚧" type="tts">simbol transrodnih osoba</annotation>
<annotation cp="🤌">gest rukom | ispitivanje | prsti | sarkastično | skupljeni prsti | uštinuti</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">zastava duginih boja</annotation>
<annotation cp="🏴☠">blago | jolly roger | pirati | piratska zastava | pljačka</annotation>
<annotation cp="🏴☠" type="tts">piratska zastava</annotation>
+ <annotation cp="£">EGP | funta | GBP | valuta</annotation>
+ <annotation cp="£" type="tts">funta</annotation>
+ <annotation cp="¥">CNY | jen | JPY | juan | valuta</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">Indijska rupija | rupija | valuta</annotation>
+ <annotation cp="₹" type="tts">Indijska rupija</annotation>
+ <annotation cp="₽">rublja | valuta</annotation>
+ <annotation cp="₽" type="tts">rublja</annotation>
+ <annotation cp="¹">eksponent | jedan | jedan eksponentno</annotation>
+ <annotation cp="¹" type="tts">jedan eksponentno</annotation>
+ <annotation cp="²">dva | dva eksponentno | eksponent | na kvadrat</annotation>
+ <annotation cp="²" type="tts">dva eksponentno</annotation>
+ <annotation cp="³">eksponent | kubni | tri | tri eksponentno</annotation>
+ <annotation cp="³" type="tts">tri eksponentno</annotation>
+ <annotation cp="µ">mjera | znak za mikro</annotation>
+ <annotation cp="µ" type="tts">znak za mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ca.xml b/common/annotations/ca.xml
index 2ac64de..7aa1d54 100644
--- a/common/annotations/ca.xml
+++ b/common/annotations/ca.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">pell fosca</annotation>
<annotation cp="🏿">fosca | pell | pell molt fosca</annotation>
<annotation cp="🏿" type="tts">pell molt fosca</annotation>
+ <annotation cp="–">guió | guió mitjà</annotation>
+ <annotation cp="–" type="tts">guió mitjà</annotation>
+ <annotation cp="—">guió | guió llarg</annotation>
+ <annotation cp="—" type="tts">guió llarg</annotation>
+ <annotation cp="·">meitat | punt | punt alçat | punt volat</annotation>
+ <annotation cp="·" type="tts">punt volat</annotation>
+ <annotation cp="«">angle | cometa | cometa llatina esquerra | esquerra | galó | parèntesi | signe d’inserció</annotation>
+ <annotation cp="«" type="tts">cometa llatina esquerra</annotation>
+ <annotation cp="»">angle | cometa | cometa llatina dreta | dreta | galó | parèntesi | signe d’inserció</annotation>
+ <annotation cp="»" type="tts">cometa llatina dreta</annotation>
+ <annotation cp="§">paràgraf | part | secció</annotation>
+ <annotation cp="§" type="tts">secció</annotation>
+ <annotation cp="†">diesi | obelisc | obelos | signe d’obelisc</annotation>
+ <annotation cp="†" type="tts">signe d’obelisc</annotation>
+ <annotation cp="‡">diesi | dos | obelisc | obelos | signe d’obelisc de dos braços</annotation>
+ <annotation cp="‡" type="tts">signe d’obelisc de dos braços</annotation>
+ <annotation cp="•">pic | punt | punt de llista</annotation>
+ <annotation cp="•" type="tts">punt de llista</annotation>
+ <annotation cp="°">grau | hora | prova</annotation>
+ <annotation cp="°" type="tts">grau</annotation>
+ <annotation cp="℗">copyright | enregistrament | enregistrament de so amb copyright | so</annotation>
+ <annotation cp="℗" type="tts">enregistrament de so amb copyright</annotation>
+ <annotation cp="←">esquerra | fletxa | fletxa que apunta cap a l’esquerra</annotation>
+ <annotation cp="←" type="tts">fletxa que apunta cap a l’esquerra</annotation>
+ <annotation cp="→">dreta | fletxa | fletxa que apunta cap a la dreta</annotation>
+ <annotation cp="→" type="tts">fletxa que apunta cap a la dreta</annotation>
+ <annotation cp="↑">amunt | fletxa | fletxa que apunta cap amunt</annotation>
+ <annotation cp="↑" type="tts">fletxa que apunta cap amunt</annotation>
+ <annotation cp="↓">avall | fletxa | fletxa que apunta cap avall</annotation>
+ <annotation cp="↓" type="tts">fletxa que apunta cap avall</annotation>
+ <annotation cp="⇅">amunt | avall | fletxa | fletxes que apunten cap amunt i cap avall</annotation>
+ <annotation cp="⇅" type="tts">fletxes que apunten cap amunt i cap avall</annotation>
+ <annotation cp="⇆">dreta | esquerra | fletxa | fletxa que apunta cap a l’esquerra sobre una fletxa que apunta cap a la dreta | fletxes cap a l’esquerra i la dreta</annotation>
+ <annotation cp="⇆" type="tts">fletxes cap a l’esquerra i la dreta</annotation>
+ <annotation cp="∆">increment | triangle</annotation>
+ <annotation cp="∆" type="tts">increment</annotation>
+ <annotation cp="∇">nabla | triangle</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">conjunt | conté | element | element de | pertany a</annotation>
+ <annotation cp="∈" type="tts">element de</annotation>
+ <annotation cp="÷">dividir | divisió | divisor | signe de divisió</annotation>
+ <annotation cp="÷" type="tts">signe de divisió</annotation>
+ <annotation cp="×">multiplicació | multiplicador | multiplicar | signe de multiplicació</annotation>
+ <annotation cp="×" type="tts">signe de multiplicació</annotation>
+ <annotation cp="⁻">resta | superíndex</annotation>
+ <annotation cp="⁻" type="tts">superíndex resta</annotation>
+ <annotation cp="√">arrel | arrel quadrada | quadrat | radical | signe d’arrel</annotation>
+ <annotation cp="√" type="tts">arrel quadrada</annotation>
+ <annotation cp="∞">infinit | signe d’infinit</annotation>
+ <annotation cp="∞" type="tts">signe d’infinit</annotation>
+ <annotation cp="∩">conjunt | intersecció</annotation>
+ <annotation cp="∩" type="tts">intersecció</annotation>
+ <annotation cp="∪">col·lecció | conjunt | unió</annotation>
+ <annotation cp="∪" type="tts">unió</annotation>
+ <annotation cp="≡">exacte | idèntic | idèntic a | triple</annotation>
+ <annotation cp="≡" type="tts">idèntic a</annotation>
+ <annotation cp="⊂">conjunt | subconjunt | subconjunt de</annotation>
+ <annotation cp="⊂" type="tts">subconjunt de</annotation>
+ <annotation cp="▲">amunt | fletxa | ple | triangle | triangle ple que apunta cap amunt</annotation>
+ <annotation cp="▲" type="tts">triangle ple que apunta cap amunt</annotation>
+ <annotation cp="▼">avall | fletxa | ple | triangle | triangle ple que apunta cap avall</annotation>
+ <annotation cp="▼" type="tts">triangle ple que apunta cap avall</annotation>
+ <annotation cp="◊">diamant | píndola | rombe</annotation>
+ <annotation cp="◊" type="tts">rombe</annotation>
+ <annotation cp="○">anell | cercle | cercle buit</annotation>
+ <annotation cp="○" type="tts">cercle buit</annotation>
+ <annotation cp="●">cercle | cercle ple</annotation>
+ <annotation cp="●" type="tts">cercle ple</annotation>
+ <annotation cp="◯">anell | cercle | cercle buit gran</annotation>
+ <annotation cp="◯" type="tts">cercle buit gran</annotation>
<annotation cp="⚧">símbol transgènere | trans | transgènere</annotation>
<annotation cp="⚧" type="tts">símbol transgènere</annotation>
<annotation cp="🤌">dits | dits junts | gest de la mà | interrogació | sarcàstic</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bandera de l’arc de Sant Martí</annotation>
<annotation cp="🏴☠">bandera pirata | botí | Jolly Roger | pirata | tresor</annotation>
<annotation cp="🏴☠" type="tts">bandera pirata</annotation>
+ <annotation cp="£">divisa | EGP | esterlina | GBP | lliura | moneda</annotation>
+ <annotation cp="£" type="tts">lliura</annotation>
+ <annotation cp="¥">CNY | ien | iuan | JPY | moneda</annotation>
+ <annotation cp="¥" type="tts">ien</annotation>
+ <annotation cp="€">divisa | EUR | euro | moneda</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">moneda | rupia | rupia índia</annotation>
+ <annotation cp="₹" type="tts">rupia índia</annotation>
+ <annotation cp="₽">moneda | ruble</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">superíndex | u</annotation>
+ <annotation cp="¹" type="tts">superíndex u</annotation>
+ <annotation cp="²">al quadrat | dos | superíndex</annotation>
+ <annotation cp="²" type="tts">superíndex dos</annotation>
+ <annotation cp="³">al cub | superíndex | tres</annotation>
+ <annotation cp="³" type="tts">superíndex tres</annotation>
+ <annotation cp="µ">mesura | signe de micró</annotation>
+ <annotation cp="µ" type="tts">signe de micró</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ccp.xml b/common/annotations/ccp.xml
index 8aa7173..92b269f 100644
--- a/common/annotations/ccp.xml
+++ b/common/annotations/ccp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/ceb.xml b/common/annotations/ceb.xml
index bdd56da..84767cb 100644
--- a/common/annotations/ceb.xml
+++ b/common/annotations/ceb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/chr.xml b/common/annotations/chr.xml
index 858dd4d..55a3946 100644
--- a/common/annotations/chr.xml
+++ b/common/annotations/chr.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">ᎠᏲᏟᎨ-ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
<annotation cp="🏿">ᎢᏳᏍᏗ 6 | ᎣᏁᎦᎸ ᏄᏍᏛᎢ | ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
<annotation cp="🏿" type="tts">ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
+ <annotation cp="–">ᎡᏂ | ᎡᏂ ᏍᏆᎳ ᎠᏍᏓᏅᏅ | ᏍᏆᎳ ᎠᏍᏓᏅᏅ</annotation>
+ <annotation cp="–" type="tts">ᎡᏂ ᏍᏆᎳ ᎠᏍᏓᏅᏅ</annotation>
+ <annotation cp="—">ᎡᎻ | ᎡᎻ ᏍᏆᎳ ᎠᏍᏓᏅᏅ | ᏍᏆᎳ ᎠᏍᏓᏅᏅ</annotation>
+ <annotation cp="—" type="tts">ᎡᎻ ᏍᏆᎳ ᎠᏍᏓᏅᏅ</annotation>
+ <annotation cp="·">ᎠᏰᏟ | ᎤᏓᏓᎸ | ᎭᏫᏂ ᏗᏜ ᎤᏓᏓᎸ</annotation>
+ <annotation cp="·" type="tts">ᎤᏓᏓᎸ ᎠᏰᏟ</annotation>
+ <annotation cp="«">ᎠᎦᏍᎦᏂ | ᎠᎦᏍᎦᏂ ᎩᎺ | ᎧᏁᎢᏍᏙᏗ | ᏓᏍᏓᏅᏅ ᏚᎷᏨ | ᏔᎵ ᏗᎭᏰᎳᏍᏗ | ᏕᎦᏂᏴᏛ | ᏤᏫᎳᏂ</annotation>
+ <annotation cp="«" type="tts">ᎠᎦᏍᎦᏂ ᎩᎺ</annotation>
+ <annotation cp="»">ᎠᎦᏘᏏ | ᎠᎦᏘᏏ ᎩᎺ | ᎧᏁᎢᏍᏙᏗ | ᏓᏍᏓᏅᏅ ᏚᎷᏨ | ᏔᎵ ᏗᎭᏰᎳᏍᏗ | ᏕᎦᏂᏴᏛ | ᏤᏫᎳᏂ</annotation>
+ <annotation cp="»" type="tts">ᎠᎦᏘᏏ ᎩᎺ</annotation>
+ <annotation cp="§">ᎢᎦᏓ | ᎾᎿ ᎨᏒ | ᎾᎿ ᎨᏒ ᎪᏪᎶᏗ | ᏗᎧᏁᏍᏗ</annotation>
+ <annotation cp="§" type="tts">ᎾᎿ ᎨᏒ</annotation>
+ <annotation cp="†">ᎣᏇᎵᏍᎩ | ᎣᏇᎷᏏ | ᎭᏰᎳᏍᏗ | ᎭᏰᎳᏍᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="†" type="tts">ᎭᏰᎳᏍᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="‡">ᎣᏇᎵᏍᎩ | ᎣᏇᎷᏏ | ᎭᏰᎳᏍᏗ | ᏔᎵ | ᏔᎵ ᏗᎭᏰᎳᏍᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="‡" type="tts">ᏔᎵ ᏗᎭᏰᎳᏍᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="•">ᎤᏓᏓᎸ | ᎦᏂ</annotation>
+ <annotation cp="•" type="tts">ᎦᏂ</annotation>
+ <annotation cp="°">ᎢᎦᎢ ᎢᎦᏘ | ᎢᏳᏟᎶᏓ | ᎪᎯᏳᏙᏗ</annotation>
+ <annotation cp="°" type="tts">ᎢᎦᎢ ᎢᎦᏘ</annotation>
+ <annotation cp="℗">ᎤᏃᏴᎬ | ᎤᏃᏴᎬ ᎤᏤᎵᎢ ᎤᎯᏴᎢ | ᎤᏤᎵᎢ ᎤᎯᏴᎢ | ᏧᏃᏴᎬ</annotation>
+ <annotation cp="℗" type="tts">ᎤᏃᏴᎬ ᎤᏤᎵᎢ ᎤᎯᏴᎢ</annotation>
+ <annotation cp="←">ᎠᎦᏍᎦᏂ | ᎠᎦᏍᎦᏂ-ᎦᏝᏗ | ᎦᏝᏗ</annotation>
+ <annotation cp="←" type="tts">ᎠᎦᏍᎦᏂ-ᎦᏝᏗ</annotation>
+ <annotation cp="→">ᎠᎦᏘᏏ | ᎠᎦᏘᏏ-ᎦᏝᏗ | ᎦᏝᏗ</annotation>
+ <annotation cp="→" type="tts">ᎠᎦᏘᏏ-ᎦᏝᏗ</annotation>
+ <annotation cp="↑">ᎦᎸᎳᏗ | ᎦᎸᎳᏗ-ᎦᏝᏗ | ᎦᏝᏗ</annotation>
+ <annotation cp="↑" type="tts">ᎦᎸᎳᏗ-ᎦᏝᏗ</annotation>
+ <annotation cp="↓">ᎡᎳᏗ | ᎡᎳᏗ-ᎦᏝᏗ | ᎦᏝᏗ</annotation>
+ <annotation cp="↓" type="tts">ᎡᎳᏗ-ᎦᏝᏗ</annotation>
+ <annotation cp="⇅">ᎡᎳᏗ | ᎦᎸᎳᏗ | ᎦᎸᎳᏗ-ᎦᏝᏗ ᎠᎴ ᎡᎳᏗ-ᎦᏝᏗ | ᎦᏝᏗ</annotation>
+ <annotation cp="⇅" type="tts">ᎦᎸᎳᏗ-ᎦᏝᏗ ᎠᎴ ᎡᎳᏗ-ᎦᏝᏗ</annotation>
+ <annotation cp="⇆">ᎠᎦᏍᎦᏂ-ᎦᏝᏗ ᎦᎸᎳᏗ ᎠᎦᏘᏏ-ᎦᏝᏗ | ᎠᎦᏍᎦᏄ | ᎠᎦᏘᏏ | ᎦᏝᏗ</annotation>
+ <annotation cp="⇆" type="tts">ᎠᎦᏍᎦᏂ-ᎦᏝᏗ ᎦᎸᎳᏗ ᎠᎦᏘᏏ-ᎦᏝᏗ</annotation>
+ <annotation cp="∆">ᎤᏁᏉᏍᏗ | ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="∆" type="tts">ᎤᏁᏉᏍᏗ</annotation>
+ <annotation cp="∇">ᎠᏲᎱᎯᏍᏗ | ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="∇" type="tts">ᎠᏲᎱᎯᏍᏗ</annotation>
+ <annotation cp="∈">ᎠᏁᎳ ᎤᎾᏓᏡᎬ | ᎢᎦᎢ ᎨᏐ | ᎤᏙᏣᎵ | ᎤᏙᏣᎵ ᎾᎿ | ᏧᏓᏂᏝᏅ</annotation>
+ <annotation cp="∈" type="tts">ᎤᏙᏣᎵ ᎾᎿ</annotation>
+ <annotation cp="÷">ᎢᎦᏓ | ᎢᎦᏛ ᎪᏪᎶᏗ | ᎢᏓᏛ | ᎣᏇᎷᏏ</annotation>
+ <annotation cp="÷" type="tts">ᎢᎦᏛ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="×">ᎠᏴᎦᎴᏫᏒᎯ | ᎢᏳᏩᎦᏗ | ᎢᏳᏩᎪᏗ | ᎢᏳᏩᎬᏗ | ᎪᏪᎶᏗ</annotation>
+ <annotation cp="×" type="tts">ᎢᏳᏩᎪᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="⁻">ᎠᎩᏲᎳᏗᏍᏗ | ᎤᏍᏗ ᎦᎸᎳᏗ | ᎤᏍᏗ ᎦᎸᎳᏗ ᎠᎩᏲᎳᏗᏍᏗ</annotation>
+ <annotation cp="⁻" type="tts">ᎤᏍᏗ ᎦᎸᎳᏗ ᎠᎩᏲᎳᏗᏍᏗ</annotation>
+ <annotation cp="√">ᎤᎾᏍᏕᎵ | ᏄᎬᏫᏳᏒ | ᏄᎬᏫᏳᏒᏕᎩ | ᏅᎩ ᏧᏅᏏᏯ | ᏅᎩ ᏧᏅᏏᏯ ᎤᎾᏍᏕᎵ | ᏙᏄᏛᎿ</annotation>
+ <annotation cp="√" type="tts">ᏅᎩ ᏧᏅᏏᏯ ᎤᎾᏍᏕᎵ</annotation>
+ <annotation cp="∞">ᎢᎪᎯᏓ ᎨᏒ | ᎢᎪᎯᏓ ᎨᏒ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="∞" type="tts">ᎢᎪᎯᏓ ᎨᏒ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="∩">ᏧᏓᏂᏝᏅ | ᏧᏠᎯᏍᏗ</annotation>
+ <annotation cp="∩" type="tts">ᏧᏠᎯᏍᏗ</annotation>
+ <annotation cp="∪">ᎤᏓᏂᏝᏅ | ᏌᏊ ᎤᎾᎵᎪᎯ | ᏧᏓᏂᏝᏅ</annotation>
+ <annotation cp="∪" type="tts">ᏌᏊ ᎤᎾᎵᎪᎯ</annotation>
+ <annotation cp="≡">ᎤᏠᏱ | ᏦᎢ ᎢᏳᏩᎪᏗ | ᏧᏠᏱ | ᏧᏠᏱ ᎾᎿ</annotation>
+ <annotation cp="≡" type="tts">ᏧᏠᏱ ᎾᎿ</annotation>
+ <annotation cp="⊂">ᎢᎦᏓᏊ | ᎢᎦᏓᏊ ᎾᎿ | ᏧᏓᏂᏝᏅ</annotation>
+ <annotation cp="⊂" type="tts">ᎢᎦᏓᏊ ᎾᎿ</annotation>
+ <annotation cp="▲">ᎠᎧᎵᎸᎯ | ᎠᎧᎵᎸᎯ ᎦᎸᎳᏗ-ᏦᎢ ᏧᏅᏏᏯ | ᎦᎸᎳᏗ | ᎦᏝᏗ | ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="▲" type="tts">ᎠᎧᎵᎸᎯ ᎦᎸᎳᏗ-ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="▼">ᎠᎧᎵᎸᎯ | ᎠᎧᎵᎸᎯ ᎡᎳᏗ-ᏦᎢ ᏧᏅᏏᏯ | ᎦᏝᏗ | ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="▼" type="tts">ᎠᎧᎵᎸᎯ ᎡᎳᏗ-ᏦᎢ ᏧᏅᏏᏯ</annotation>
+ <annotation cp="◊">ᎤᏙᏢᏒ | ᎪᏍᏓᏯ | ᎪᏍᏓᏱ</annotation>
+ <annotation cp="◊" type="tts">ᎪᏍᏓᏱ</annotation>
+ <annotation cp="○">ᎠᎵᏰᏑᏍᏔᏬ | ᎤᏒᏙᏂ ᎦᏐᏆᎳ | ᎦᏐᏆᎳ</annotation>
+ <annotation cp="○" type="tts">ᎤᏒᏙᏂ ᎦᏐᏆᎳ</annotation>
+ <annotation cp="●">ᎠᎧᎵᎸᎯ ᎦᏐᏆᎳ | ᎦᏐᏆᎳ</annotation>
+ <annotation cp="●" type="tts">ᎠᎧᎵᎸᎯ ᎦᏐᏆᎳ</annotation>
+ <annotation cp="◯">RᏆ ᎤᏒᏙᏂ ᎦᏐᏆᎳ | ᎠᎵᏰᏑᏍᏔᏬ | ᎡᏆ ᎤᏒᏙᏂ ᎦᏐᏆᎳ | ᎦᏐᏆᎳ</annotation>
+ <annotation cp="◯" type="tts">RᏆ ᎤᏒᏙᏂ ᎦᏐᏆᎳ</annotation>
<annotation cp="⚧">ᏄᏬᎵᏍᏛᎾ | ᏄᏬᎵᏍᏛᎾ ᎪᏟᏍᏙᏗ</annotation>
<annotation cp="⚧" type="tts">ᏄᏬᎵᏍᏛᎾ ᎪᏟᏍᏙᏗ</annotation>
<annotation cp="🤌">ᎠᏓᎵᏍᎦᎾᏁᎯ | ᎠᏛᏛᎲᏍᎩ | ᎤᏬᏰᏂ ᎠᏌᎳᏙᏗ | ᏕᎦᏰᏌᏛ | ᏗᏓᏇᏄᎩᏍᏗ</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">ᎤᏅᎪᎳᏛ ᎦᏓᏘ</annotation>
<annotation cp="🏴☠">ᎠᏓᎩᎡᏗ | ᎤᎵᎦᎵᏍᏗ ᎳᏥ | ᏥᏳᎡᏙᎯ ᎠᏓᏌᎲᏍᎩ | ᏥᏳᎡᏙᎯ ᎠᏓᏌᎲᏍᎩ ᎦᏓᏗ | ᏧᎬᏩᎶᏗ ᎠᏍᏆᏂᎪᏛ</annotation>
<annotation cp="🏴☠" type="tts">ᏥᏳᎡᏙᎯ ᎠᏓᏌᎲᏍᎩ ᎦᏓᏗ</annotation>
+ <annotation cp="£">EGP | GBP | ᎠᏕᎳ | ᎩᎵᏏᏲ ᎠᏕᎳ</annotation>
+ <annotation cp="£" type="tts">ᎩᎵᏏᏲ ᎠᏕᎳ</annotation>
+ <annotation cp="¥">CNY | JPY | ᎠᏕᎳ | ᏓᎶᏂᎨᏍᏛ ᎠᏕᎳ | ᏣᏩᏂᏏ ᎠᏕᎳ</annotation>
+ <annotation cp="¥" type="tts">ᏣᏩᏂᏏ ᎠᏕᎳ</annotation>
+ <annotation cp="€">EUR | ᎠᏕᎳ | ᏳᎳᏈ ᎠᏕᎳ</annotation>
+ <annotation cp="€" type="tts">ᏳᎳᏈ ᎠᏕᎳ</annotation>
+ <annotation cp="₹">ᎠᏕᎳ | ᎠᏕᎸ | ᎢᏂᏗᎢᎠ ᎠᏕᎳ</annotation>
+ <annotation cp="₹" type="tts">ᎢᏂᏗᎢᎠ ᎠᏕᎳ</annotation>
+ <annotation cp="₽">ᎠᏕᎳ | ᏲᏅᎯ ᎠᏕᎳ</annotation>
+ <annotation cp="₽" type="tts">ᏲᏅᎯ ᎠᏕᎳ</annotation>
+ <annotation cp="¹">ᎤᏍᏗ ᎦᎸᎳᏗ | ᎤᏍᏗ ᎦᎸᎳᏗ ᏌᏊ | ᏌᏊ</annotation>
+ <annotation cp="¹" type="tts">ᎤᏍᏗ ᎦᎸᎳᏗ ᏌᏊ</annotation>
+ <annotation cp="²">ᎤᏍᏗ ᎦᎸᎳᏗ | ᎤᏍᏗ ᎦᎸᎳᏗ ᏔᎵ | ᏔᎵ</annotation>
+ <annotation cp="²" type="tts">ᎤᏍᏗ ᎦᎸᎳᏗ ᏔᎵ</annotation>
+ <annotation cp="³">ᎤᏍᏗ ᎦᎸᎳᏗ | ᎤᏍᏗ ᎦᎸᎳᏗ ᏦᎢ | ᏦᎢ</annotation>
+ <annotation cp="³" type="tts">ᎤᏍᏗ ᎦᎸᎳᏗ ᏦᎢ</annotation>
+ <annotation cp="µ">ᎢᏳᏟᎶᏓ | ᎤᏍᏗ ᎪᏪᎶᏗ</annotation>
+ <annotation cp="µ" type="tts">ᎤᏍᏗ ᎪᏪᎶᏗ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/cs.xml b/common/annotations/cs.xml
index d2c60c3..e421cc1 100644
--- a/common/annotations/cs.xml
+++ b/common/annotations/cs.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">středně tmavý odstín pleti</annotation>
<annotation cp="🏿">barva | kůže | pleť | tmavý odstín pleti | typ 6</annotation>
<annotation cp="🏿" type="tts">tmavý odstín pleti</annotation>
+ <annotation cp="–">en-pomlčka | krátká | pomlčka | půlčtverčíková pomlčka</annotation>
+ <annotation cp="–" type="tts">krátká pomlčka</annotation>
+ <annotation cp="—">čtverčíková pomlčka | dlouhá | em-pomlčka | pomlčka</annotation>
+ <annotation cp="—" type="tts">dlouhá pomlčka</annotation>
+ <annotation cp="·">odrážka | puntík | střední | tečka</annotation>
+ <annotation cp="·" type="tts">střední puntík</annotation>
+ <annotation cp="«">boční uvozovky | boční uvozovky mířící doleva | lomené uvozovky | uvozovky</annotation>
+ <annotation cp="«" type="tts">boční uvozovky mířící doleva</annotation>
+ <annotation cp="»">boční uvozovky | boční uvozovky mířící doprava | lomené uvozovky | uvozovky</annotation>
+ <annotation cp="»" type="tts">boční uvozovky mířící doprava</annotation>
+ <annotation cp="§">část | oddíl | odstavec | paragraf | sekce</annotation>
+ <annotation cp="§" type="tts">paragraf</annotation>
+ <annotation cp="†">dýka | kříž | křížek | obelisk | obelus | znak křížku</annotation>
+ <annotation cp="†" type="tts">znak křížku</annotation>
+ <annotation cp="‡">dvojitá | dvojitý | dýka | kříž | křížek | obelisk | obelus | znak dvojitého křížku</annotation>
+ <annotation cp="‡" type="tts">znak dvojitého křížku</annotation>
+ <annotation cp="•">bod | odrážka | puntík</annotation>
+ <annotation cp="•" type="tts">puntík</annotation>
+ <annotation cp="°">stupeň | stupňovitost</annotation>
+ <annotation cp="°" type="tts">stupeň</annotation>
+ <annotation cp="℗">copyright | nahrávka | znak práv ke zvukovému záznamu | zvuková</annotation>
+ <annotation cp="℗" type="tts">znak práv ke zvukovému záznamu</annotation>
+ <annotation cp="←">doleva | šipka | šipka ukazující doleva | šipka ukazující vlevo | vlevo</annotation>
+ <annotation cp="←" type="tts">šipka ukazující doleva</annotation>
+ <annotation cp="→">doprava | šipka | šipka ukazující doprava | šipka ukazující vpravo | vpravo</annotation>
+ <annotation cp="→" type="tts">šipka ukazující doprava</annotation>
+ <annotation cp="↑">nahoru | šipka | šipka ukazující nahoru | šipka ukazující vzhůru | vzhůru</annotation>
+ <annotation cp="↑" type="tts">šipka ukazující nahoru</annotation>
+ <annotation cp="↓">dolů | šipka | šipka ukazující dolů</annotation>
+ <annotation cp="↓" type="tts">šipka ukazující dolů</annotation>
+ <annotation cp="⇅">dolů | nahoru | šipky | šipky nahoru a dolů</annotation>
+ <annotation cp="⇅" type="tts">šipky nahoru a dolů</annotation>
+ <annotation cp="⇆">doleva | doprava | šipka | šipka doleva nad šipkou doprava</annotation>
+ <annotation cp="⇆" type="tts">šipka doleva nad šipkou doprava</annotation>
+ <annotation cp="∆">delta | přírůstek | trojúhelník</annotation>
+ <annotation cp="∆" type="tts">delta</annotation>
+ <annotation cp="∇">nabla | trojúhelník</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">členství | je prvkem | množina | obsahuje | prvek | prvek množiny</annotation>
+ <annotation cp="∈" type="tts">prvek množiny</annotation>
+ <annotation cp="÷">dělení | děleno | dělit | symbol dělení | znak</annotation>
+ <annotation cp="÷" type="tts">symbol dělení</annotation>
+ <annotation cp="×">krát | násobení | násobit | symbol násobení</annotation>
+ <annotation cp="×" type="tts">symbol násobení</annotation>
+ <annotation cp="⁻">horní index | minus | minus jako horní index</annotation>
+ <annotation cp="⁻" type="tts">minus jako horní index</annotation>
+ <annotation cp="√">druhá odmocnina | kořen | odmocnina | odmocnítko</annotation>
+ <annotation cp="√" type="tts">druhá odmocnina</annotation>
+ <annotation cp="∞">nekonečno | znak nekonečna</annotation>
+ <annotation cp="∞" type="tts">znak nekonečna</annotation>
+ <annotation cp="∩">množina | průnik</annotation>
+ <annotation cp="∩" type="tts">průnik</annotation>
+ <annotation cp="∪">množina | sjednocení</annotation>
+ <annotation cp="∪" type="tts">sjednocení</annotation>
+ <annotation cp="≡">identita | kongruence | kongruentní | shodný | shoduje se | stejný | trojitý</annotation>
+ <annotation cp="≡" type="tts">shoduje se</annotation>
+ <annotation cp="⊂">je podmnožinou | množina | podmnožina</annotation>
+ <annotation cp="⊂" type="tts">podmnožina</annotation>
+ <annotation cp="▲">nahoru | plný | šipka | trojúhelník | vyplněný trojúhelník směřující nahoru</annotation>
+ <annotation cp="▲" type="tts">vyplněný trojúhelník směřující nahoru</annotation>
+ <annotation cp="▼">dolů | plný | šipka | trojúhelník | vyplněný trojúhelník směřující dolů</annotation>
+ <annotation cp="▼" type="tts">vyplněný trojúhelník směřující dolů</annotation>
+ <annotation cp="◊">diamant | káry | kosočtverec</annotation>
+ <annotation cp="◊" type="tts">kosočtverec</annotation>
+ <annotation cp="○">kroužek | kruh | kružnice | prázdný kroužek | prázdný kruh | prstenec</annotation>
+ <annotation cp="○" type="tts">prázdný kroužek</annotation>
+ <annotation cp="●">kroužek | kruh | plný kroužek | plný kruh | vyplněná kružnice | vyplněný kroužek | vyplněný kruh</annotation>
+ <annotation cp="●" type="tts">plný kroužek</annotation>
+ <annotation cp="◯">kroužek | kruh | kružnice | prázdný kruh | prstenec | velká kružnice | velký prázdný kruh</annotation>
+ <annotation cp="◯" type="tts">prázdný kruh</annotation>
<annotation cp="⚧">symbol pro transgender osoby | transgender</annotation>
<annotation cp="⚧" type="tts">symbol pro transgender osoby</annotation>
<annotation cp="🤌">gesto rukou | ironie | italské sarkastické gesto | otázka | prsty | sarkasmus | sevřené | špetka z pěti prstů</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">duhová vlajka</annotation>
<annotation cp="🏴☠">hnáty | lebka | pirát | pirátská vlajka | poklad</annotation>
<annotation cp="🏴☠" type="tts">pirátská vlajka</annotation>
+ <annotation cp="£">EGP | GBP | libra | měna</annotation>
+ <annotation cp="£" type="tts">libra</annotation>
+ <annotation cp="¥">CNY | jen | JPY | juan | jüan | měna</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | měna</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indická rupie | měna | rupie | rupie indická</annotation>
+ <annotation cp="₹" type="tts">indická rupie</annotation>
+ <annotation cp="₽">měna | rubl | ruský rubl</annotation>
+ <annotation cp="₽" type="tts">rubl</annotation>
+ <annotation cp="¹">číslice jedna jako horní index | exponent | horní index | jedna | jednička | na první</annotation>
+ <annotation cp="¹" type="tts">číslice jedna jako horní index</annotation>
+ <annotation cp="²">číslice dvě jako horní index | čtvereční | dvě | dvojka | exponent | horní index | na druhou</annotation>
+ <annotation cp="²" type="tts">číslice dvě jako horní index</annotation>
+ <annotation cp="³">číslice tři jako horní index | exponent | horní index | krychlový | na třetí | tři | trojka</annotation>
+ <annotation cp="³" type="tts">číslice tři jako horní index</annotation>
+ <annotation cp="µ">mikro | míra | znak mikro</annotation>
+ <annotation cp="µ" type="tts">znak mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/cy.xml b/common/annotations/cy.xml
index 65be5e3..fffdd5e 100644
--- a/common/annotations/cy.xml
+++ b/common/annotations/cy.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">arlliw croen canolig-tywyll</annotation>
<annotation cp="🏿">arlliw croen tywyll | lliw croen</annotation>
<annotation cp="🏿" type="tts">arlliw croen tywyll</annotation>
+ <annotation cp="–">en | llinell doriad | llinell doriad en</annotation>
+ <annotation cp="–" type="tts">llinell doriad en</annotation>
+ <annotation cp="—">em | llinell doriad | llinell doriad em</annotation>
+ <annotation cp="—" type="tts">llinell doriad em</annotation>
+ <annotation cp="·">canol | dot</annotation>
+ <annotation cp="·" type="tts">dot canol</annotation>
+ <annotation cp="«">bracedi | caretau | chevron | dyfyniad | dyfynodau saethau dwbl i’r chwith | dyfynodau saethau i’r chwith | i’r chwith | ongl</annotation>
+ <annotation cp="«" type="tts">dyfynodau saethau dwbl i’r chwith</annotation>
+ <annotation cp="»">bracedi | caretau | chevron | dyfyniad | dyfynodau saethau dwbl i’r dde | dyfynodau saethau i’r dde | i’r dde | ongl</annotation>
+ <annotation cp="»" type="tts">dyfynodau saethau dwbl i’r dde</annotation>
+ <annotation cp="§">adran | arwydd adran | paragraff | rhan</annotation>
+ <annotation cp="§" type="tts">adran</annotation>
+ <annotation cp="†">arwydd dager | dager | obelisg | obelws</annotation>
+ <annotation cp="†" type="tts">arwydd dager</annotation>
+ <annotation cp="‡">arwydd dager dwbl | dager | dwbl | obelisg | obelws</annotation>
+ <annotation cp="‡" type="tts">arwydd dager dwbl</annotation>
+ <annotation cp="•">bwled | dot</annotation>
+ <annotation cp="•" type="tts">bwled</annotation>
+ <annotation cp="°">awr | gradd | prawf</annotation>
+ <annotation cp="°" type="tts">gradd</annotation>
+ <annotation cp="℗">hawlfraint | recordio | sain</annotation>
+ <annotation cp="℗" type="tts">hawlfraint recordio sain</annotation>
+ <annotation cp="←">i’r chwith | saeth | saeth yn pwyntio i’r chwith</annotation>
+ <annotation cp="←" type="tts">saeth yn pwyntio i’r chwith</annotation>
+ <annotation cp="→">i’r dde | saeth | saeth yn pwyntio i’r dde</annotation>
+ <annotation cp="→" type="tts">saeth yn pwyntio i’r dde</annotation>
+ <annotation cp="↑">i fyny | saeth | saeth yn pwyntio i fyny</annotation>
+ <annotation cp="↑" type="tts">saeth yn pwyntio i fyny</annotation>
+ <annotation cp="↓">i lawr | saeth | saeth yn pwyntio i lawr</annotation>
+ <annotation cp="↓" type="tts">saeth yn pwyntio i lawr</annotation>
+ <annotation cp="⇅">i fyny | i lawr | saeth | saethau yn pwyntio i fyny ac i lawr</annotation>
+ <annotation cp="⇅" type="tts">saethau yn pwyntio i fyny ac i lawr</annotation>
+ <annotation cp="⇆">chwith | i’r dde | saeth | saethau i’r chwith dros ben saethau i’r dde | saethau yn pwyntio i’r chwith dros ben saethau yn pwyntio i’r dde</annotation>
+ <annotation cp="⇆" type="tts">saethau i’r chwith dros ben saethau i’r dde</annotation>
+ <annotation cp="∆">cynyddran | triongl</annotation>
+ <annotation cp="∆" type="tts">cynyddran</annotation>
+ <annotation cp="∇">nabla | triongl</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">aelodaeth | elfen | elfen o | set | yn cynnwys</annotation>
+ <annotation cp="∈" type="tts">elfen o</annotation>
+ <annotation cp="÷">arwydd rhannu | obelws | rhaniad | rhannu</annotation>
+ <annotation cp="÷" type="tts">arwydd rhannu</annotation>
+ <annotation cp="×">arwydd lluosi | lluosi | lluosiad</annotation>
+ <annotation cp="×" type="tts">arwydd lluosi</annotation>
+ <annotation cp="⁻">minws | uwchysgrifen</annotation>
+ <annotation cp="⁻" type="tts">uwchysgrifen minws</annotation>
+ <annotation cp="√">ail isradd | gwreiddyn | isradd | radical | sgwâr | swrd</annotation>
+ <annotation cp="√" type="tts">ail isradd</annotation>
+ <annotation cp="∞">anfeidredd | arwydd anfeidredd</annotation>
+ <annotation cp="∞" type="tts">arwydd anfeidredd</annotation>
+ <annotation cp="∩">croestoriad | set</annotation>
+ <annotation cp="∩" type="tts">croestoriad</annotation>
+ <annotation cp="∪">casgliad | set | uno</annotation>
+ <annotation cp="∪" type="tts">uno</annotation>
+ <annotation cp="≡">triphlyg | union | union yr un fath | union yr un fath â</annotation>
+ <annotation cp="≡" type="tts">union yr un fath â</annotation>
+ <annotation cp="⊂">is-set | is-set o | set</annotation>
+ <annotation cp="⊂" type="tts">is-set o</annotation>
+ <annotation cp="▲">i fyny | saeth | triongl | triongl wedi’i lenwi yn pwyntio i fyny | wedi’i lenwi</annotation>
+ <annotation cp="▲" type="tts">triongl wedi’i lenwi yn pwyntio i fyny</annotation>
+ <annotation cp="▼">i lawr | saeth | triongl | triongl wedi’i lenwi yn pwyntio i lawr | wedi’i lenwi</annotation>
+ <annotation cp="▼" type="tts">triongl wedi’i lenwi yn pwyntio i lawr</annotation>
+ <annotation cp="◊">diemwnt | losen | rhombws</annotation>
+ <annotation cp="◊" type="tts">losen</annotation>
+ <annotation cp="○">cylch | cylch gwag | cylchyn</annotation>
+ <annotation cp="○" type="tts">cylch gwag</annotation>
+ <annotation cp="●">cylch | cylch wedi’i lenwi</annotation>
+ <annotation cp="●" type="tts">cylch wedi’i lenwi</annotation>
+ <annotation cp="◯">cylch | cylch gwag mawr | cylchyn</annotation>
+ <annotation cp="◯" type="tts">cylch gwag mawr</annotation>
<annotation cp="⚧">symbol trawsryweddol | trawsryweddol</annotation>
<annotation cp="⚧" type="tts">symbol trawsryweddol</annotation>
<annotation cp="🤌">arwydd â llaw | bysedd | bysedd wedi’u pinsio | holi | sarcastig | wedi pinsio</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">baner enfys</annotation>
<annotation cp="🏴☠">baner môr-leidr | Jolly Roger | môr-leidr | trysor | ysbeilio</annotation>
<annotation cp="🏴☠" type="tts">baner môr-leidr</annotation>
+ <annotation cp="£">arian cyfredol | EGP | GBP | punt</annotation>
+ <annotation cp="£" type="tts">punt</annotation>
+ <annotation cp="¥">arian cyfredol | CNY | ien | iwan | JPY</annotation>
+ <annotation cp="¥" type="tts">ien</annotation>
+ <annotation cp="€">arian cyfredol | EUR | ewro</annotation>
+ <annotation cp="€" type="tts">ewro</annotation>
+ <annotation cp="₹">arian cyfredol | rwpî | rwpî indiaidd</annotation>
+ <annotation cp="₹" type="tts">rwpî indiaidd</annotation>
+ <annotation cp="₽">arian cyfredol | rwbl</annotation>
+ <annotation cp="₽" type="tts">rwbl</annotation>
+ <annotation cp="¹">un | uwchysgrifen</annotation>
+ <annotation cp="¹" type="tts">uwchysgrifen un</annotation>
+ <annotation cp="²">dau | sgwâr | uwchysgrifen</annotation>
+ <annotation cp="²" type="tts">uwchysgrifen dau</annotation>
+ <annotation cp="³">ciwbiedig | tri | uwchysgrifen</annotation>
+ <annotation cp="³" type="tts">uwchysgrifen tri</annotation>
+ <annotation cp="µ">arwydd micro | mesur</annotation>
+ <annotation cp="µ" type="tts">arwydd micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/da.xml b/common/annotations/da.xml
index f0969b2..50b1440 100644
--- a/common/annotations/da.xml
+++ b/common/annotations/da.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">medium til mørk teint</annotation>
<annotation cp="🏿">hudfarve | mørk teint | type 6</annotation>
<annotation cp="🏿" type="tts">mørk teint</annotation>
+ <annotation cp="–">en dash | kort | n-tankestreg | tankestreg</annotation>
+ <annotation cp="–" type="tts">tankestreg</annotation>
+ <annotation cp="—">em dash | lang | m-tankestreg | tankestreg</annotation>
+ <annotation cp="—" type="tts">lang tankestreg</annotation>
+ <annotation cp="·">mellem | prik | punkttegn | underordnet</annotation>
+ <annotation cp="·" type="tts">underordnet punkttegn</annotation>
+ <annotation cp="«">anførselstegn | citattegn | indskudstegn | parentes | venstre | venstre fransk anførselstegn | vinkel</annotation>
+ <annotation cp="«" type="tts">venstre fransk anførselstegn</annotation>
+ <annotation cp="»">anførselstegn | citattegn | højre | højre fransk anførselstegn | indskudstegn | parentes | vinkel</annotation>
+ <annotation cp="»" type="tts">højre fransk anførselstegn</annotation>
+ <annotation cp="§">jura | lov | paragraf | paragraftegn | punkt</annotation>
+ <annotation cp="§" type="tts">paragraf</annotation>
+ <annotation cp="†">daggert | kors | korstegn | skak</annotation>
+ <annotation cp="†" type="tts">kors</annotation>
+ <annotation cp="‡">daggert | dobbelt | dobbeltkors | kors | mat | skakmat</annotation>
+ <annotation cp="‡" type="tts">dobbelt kors</annotation>
+ <annotation cp="•">prik | punkttegn</annotation>
+ <annotation cp="•" type="tts">punkttegn</annotation>
+ <annotation cp="°">grader | gradtegn | time</annotation>
+ <annotation cp="°" type="tts">gradtegn</annotation>
+ <annotation cp="℗">copyright | copyright på lydoptagelse | lyd | lydoptagelse | optagelse</annotation>
+ <annotation cp="℗" type="tts">copyright på lydoptagelse</annotation>
+ <annotation cp="←">pil | pil til venstre | venstre | venstrepil</annotation>
+ <annotation cp="←" type="tts">venstrepil</annotation>
+ <annotation cp="→">højre | højrepil | pil | pil til højre</annotation>
+ <annotation cp="→" type="tts">højrepil</annotation>
+ <annotation cp="↑">op | opadgående pil | pil</annotation>
+ <annotation cp="↑" type="tts">pil op</annotation>
+ <annotation cp="↓">ned | nedadgående pil | pil ned</annotation>
+ <annotation cp="↓" type="tts">pil ned</annotation>
+ <annotation cp="⇅">ned | op | pil | pil op og pil ned</annotation>
+ <annotation cp="⇅" type="tts">pil op og pil ned</annotation>
+ <annotation cp="⇆">højre | pil | venstre | venstrepil over højrepil</annotation>
+ <annotation cp="⇆" type="tts">venstrepil over højrepil</annotation>
+ <annotation cp="∆">optælling | trekant</annotation>
+ <annotation cp="∆" type="tts">optælling</annotation>
+ <annotation cp="∇">nabla | trekant</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">element | element i | indeholder | mængde | medlem | medlem af | medlemskab</annotation>
+ <annotation cp="∈" type="tts">element i</annotation>
+ <annotation cp="÷">dele | dividere | division | divisionstegn</annotation>
+ <annotation cp="÷" type="tts">division</annotation>
+ <annotation cp="×">gange | gangetegn | multiplicere | multiplikation | multiplikationstegn</annotation>
+ <annotation cp="×" type="tts">gangetegn</annotation>
+ <annotation cp="⁻">hævet | minus | minustegn</annotation>
+ <annotation cp="⁻" type="tts">hævet minus</annotation>
+ <annotation cp="√">kvadrat | kvadratrod | kvadratrodstegn | rod | rodtegn</annotation>
+ <annotation cp="√" type="tts">kvadratrod</annotation>
+ <annotation cp="∞">uendelighedstegn | uendeligt</annotation>
+ <annotation cp="∞" type="tts">uendelighedstegn</annotation>
+ <annotation cp="∩">fællesmængde | mængde</annotation>
+ <annotation cp="∩" type="tts">fællesmængde</annotation>
+ <annotation cp="∪">forening | foreningsmængde | mængde | samling</annotation>
+ <annotation cp="∪" type="tts">foreningsmængde</annotation>
+ <annotation cp="≡">eksakt | identisk | identisk med | nøjagtigt | tredobbelt | tredobbelt lighedstegn</annotation>
+ <annotation cp="≡" type="tts">identisk med</annotation>
+ <annotation cp="⊂">delmængde | delmængde af | mængde</annotation>
+ <annotation cp="⊂" type="tts">delmængde af</annotation>
+ <annotation cp="▲">op | pil | trekant | udfyldt | udfyldt opadvendt trekant</annotation>
+ <annotation cp="▲" type="tts">udfyldt opadvendt trekant</annotation>
+ <annotation cp="▼">ned | nedadvendt trekant | pil | trekant | udfyldt | udfyldt nedadvendt trekant</annotation>
+ <annotation cp="▼" type="tts">udfyldt nedadvendt trekant</annotation>
+ <annotation cp="◊">firkant | rombe | ruder</annotation>
+ <annotation cp="◊" type="tts">rombe</annotation>
+ <annotation cp="○">cirkel | hul cirkel | ring</annotation>
+ <annotation cp="○" type="tts">hul cirkel</annotation>
+ <annotation cp="●">cirkel | udfyldt cirkel</annotation>
+ <annotation cp="●" type="tts">udfyldt cirkel</annotation>
+ <annotation cp="◯">cirkel | ring | stor hul cirkel</annotation>
+ <annotation cp="◯" type="tts">stor hul cirkel</annotation>
<annotation cp="⚧">symbol for transkønnethed | transkønnet</annotation>
<annotation cp="⚧" type="tts">symbol for transkønnethed</annotation>
<annotation cp="🤌">fingre | gestus | håndtegn | samlede fingre | sammenknebne | sarkastisk | udspørge</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">regnbueflag</annotation>
<annotation cp="🏴☠">pirat | piratflag | plyndre | skat | sørøver | sørøverflag</annotation>
<annotation cp="🏴☠" type="tts">piratflag</annotation>
+ <annotation cp="£">EGP | GBP | pund | sterling | valuta</annotation>
+ <annotation cp="£" type="tts">pund</annotation>
+ <annotation cp="¥">CNY | JPY | valuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indisk rupee | rupee | valuta</annotation>
+ <annotation cp="₹" type="tts">indisk rupee</annotation>
+ <annotation cp="₽">rubel | valuta</annotation>
+ <annotation cp="₽" type="tts">rubel</annotation>
+ <annotation cp="¹">en | et | ettal | hævet</annotation>
+ <annotation cp="¹" type="tts">hævet ettal</annotation>
+ <annotation cp="²">anden potens | hævet | kvadrat | to | total</annotation>
+ <annotation cp="²" type="tts">hævet total</annotation>
+ <annotation cp="³">hævet | kubik | tre | tredje potens | tretal</annotation>
+ <annotation cp="³" type="tts">hævet tretal</annotation>
+ <annotation cp="µ">mål | mikrosymbol | mikrotegn | my | my-symbol</annotation>
+ <annotation cp="µ" type="tts">mikrotegn</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/de.xml b/common/annotations/de.xml
index 9610a31..fa3f520 100644
--- a/common/annotations/de.xml
+++ b/common/annotations/de.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">mitteldunkle Hautfarbe</annotation>
<annotation cp="🏿">dunkle Hautfarbe | Hautfarbe | Hauttyp 6</annotation>
<annotation cp="🏿" type="tts">dunkle Hautfarbe</annotation>
+ <annotation cp="–">Halbgeviertstrich | Langstrich | N-Dash | Strich</annotation>
+ <annotation cp="–" type="tts">Halbgeviertstrich</annotation>
+ <annotation cp="—">Geviertstrich | Strich</annotation>
+ <annotation cp="—" type="tts">Geviertstrich</annotation>
+ <annotation cp="·">Halbhochpunkt | Mittelpunkt | Punkt</annotation>
+ <annotation cp="·" type="tts">Mittelpunkt</annotation>
+ <annotation cp="«">Anführungszeichen | Caret | Chevron | Klammer | links | nach links weisendes Guillemet | Spitzzeichen</annotation>
+ <annotation cp="«" type="tts">nach links weisendes Guillemet</annotation>
+ <annotation cp="»">Anführungszeichen | Caret | Chevron | Klammer | nach rechts weisendes Guillemet | rechts | Spitzzeichen</annotation>
+ <annotation cp="»" type="tts">nach rechts weisendes Guillemet</annotation>
+ <annotation cp="§">Absatz | Abschnitt | Paragraf | Paragraph</annotation>
+ <annotation cp="§" type="tts">Paragraph</annotation>
+ <annotation cp="†">Dagger | Dolch | Kreuz | Langkreuz | Obeliscus | Obelisk</annotation>
+ <annotation cp="†" type="tts">Langkreuz</annotation>
+ <annotation cp="‡">Dagger | Doppelkreuz | doppeltes Kreuz | Kreuz | Obeliscus | Obelisk | Zweibalkenkreuz</annotation>
+ <annotation cp="‡" type="tts">Zweibalkenkreuz</annotation>
+ <annotation cp="•">Aufzählungspunkt | Aufzählungszeichen | Blickfangpunkt | Bullet | Punkt</annotation>
+ <annotation cp="•" type="tts">Aufzählungspunkt</annotation>
+ <annotation cp="°">Grad | Grad Alkohol | Proof | Stunde | Volumenprozent</annotation>
+ <annotation cp="°" type="tts">Grad Alkohol</annotation>
+ <annotation cp="℗">Audio | Audioaufnahme | Audioaufzeichnung | Aufnahme | Aufzeichnung | Copyright | Copyrightzeichen | Copyrightzeichen für Audioaufnahme</annotation>
+ <annotation cp="℗" type="tts">Copyrightzeichen für Audioaufnahme</annotation>
+ <annotation cp="←">links | nach links weisend | nach links weisender Pfeil | Pfeil</annotation>
+ <annotation cp="←" type="tts">nach links weisender Pfeil</annotation>
+ <annotation cp="→">nach rechts weisend | nach rechts weisender Pfeil | Pfeil | rechts</annotation>
+ <annotation cp="→" type="tts">nach rechts weisender Pfeil</annotation>
+ <annotation cp="↑">aufwärts | nach oben weisend | nach oben weisender Pfeil | Pfeil</annotation>
+ <annotation cp="↑" type="tts">nach oben weisender Pfeil</annotation>
+ <annotation cp="↓">abwärts | nach unten weisend | nach unten weisender Pfeil | Pfeil</annotation>
+ <annotation cp="↓" type="tts">nach unten weisender Pfeil</annotation>
+ <annotation cp="⇅">abwärts | aufwärts | nach oben und nach unten weisende Pfeile | nach oben weisend | nach unten weisend | Pfeil</annotation>
+ <annotation cp="⇅" type="tts">nach oben und nach unten weisende Pfeile</annotation>
+ <annotation cp="⇆">links | Linkspfeil über Rechtspfeil | nach links weisender über nach rechts weisendem Pfeil | Pfeil | rechts</annotation>
+ <annotation cp="⇆" type="tts">Linkspfeil über Rechtspfeil</annotation>
+ <annotation cp="∆">Dreieck | Erhöhung | Inkrement | Schrittweite | Wertzuwachs | Zuwachs</annotation>
+ <annotation cp="∆" type="tts">Inkrement</annotation>
+ <annotation cp="∇">Dreieck | Nabla</annotation>
+ <annotation cp="∇" type="tts">Nabla</annotation>
+ <annotation cp="∈">Element | Element von | enthält | Menge | Zugehörigkeit</annotation>
+ <annotation cp="∈" type="tts">Element</annotation>
+ <annotation cp="÷">dividieren | Division | Divisionszeichen | Geteiltzeichen | teilen | teilen durch</annotation>
+ <annotation cp="÷" type="tts">Division</annotation>
+ <annotation cp="×">mal | malnehmen | Malzeichen | Multiplikation | Multiplikationszeichen | multiplizieren</annotation>
+ <annotation cp="×" type="tts">Multiplikation</annotation>
+ <annotation cp="⁻">hochgestellt | hochgestelltes Minuszeichen | Minus | Minuszeichen</annotation>
+ <annotation cp="⁻" type="tts">hochgestelltes Minuszeichen</annotation>
+ <annotation cp="√">Basiszahl | Grundzahl | irrationale Zahl | Quadratwurzel | Quadratzahl | Radikal | Wurzel</annotation>
+ <annotation cp="√" type="tts">Quadratwurzel</annotation>
+ <annotation cp="∞">unendlich | Unendlichkeit | Unendlichkeitszeichen</annotation>
+ <annotation cp="∞" type="tts">Unendlichkeitszeichen</annotation>
+ <annotation cp="∩">Menge | Schnitt | Schnittmenge</annotation>
+ <annotation cp="∩" type="tts">Schnittmenge</annotation>
+ <annotation cp="∪">Menge | Vereinigung | Vereinigungsmenge</annotation>
+ <annotation cp="∪" type="tts">Vereinigungsmenge</annotation>
+ <annotation cp="≡">dreifach | dreifacher Strich | exakt | identisch | identisch mit</annotation>
+ <annotation cp="≡" type="tts">identisch</annotation>
+ <annotation cp="⊂">Menge | Teilmenge | Teilmenge von | Untermenge | Untermenge von</annotation>
+ <annotation cp="⊂" type="tts">Teilmenge</annotation>
+ <annotation cp="▲">aufwärts | Dreieck | gefüllt | gefülltes nach oben weisendes Dreieck | Pfeil</annotation>
+ <annotation cp="▲" type="tts">gefülltes nach oben weisendes Dreieck</annotation>
+ <annotation cp="▼">abwärts | Dreieck | gefüllt | gefülltes nach unten weisendes Dreieck | Pfeil</annotation>
+ <annotation cp="▼" type="tts">gefülltes nach unten weisendes Dreieck</annotation>
+ <annotation cp="◊">Raute | Rhombus</annotation>
+ <annotation cp="◊" type="tts">Raute</annotation>
+ <annotation cp="○">hohler Kreis | Kreis | Ring</annotation>
+ <annotation cp="○" type="tts">hohler Kreis</annotation>
+ <annotation cp="●">gefüllter Kreis | Kreis</annotation>
+ <annotation cp="●" type="tts">gefüllter Kreis</annotation>
+ <annotation cp="◯">großer hohler Kreis | Kreis | Ring</annotation>
+ <annotation cp="◯" type="tts">großer hohler Kreis</annotation>
<annotation cp="⚧">Symbol für Transgender | Transgender</annotation>
<annotation cp="⚧" type="tts">Symbol für Transgender</annotation>
<annotation cp="🤌">Finger | Handgeste | sarkastisch | zusammengedrückt | zusammengedrückte Finger</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">Regenbogenflagge</annotation>
<annotation cp="🏴☠">Jolly Roger | Pirat | Piratenfahne | Piratenflagge | Schatz</annotation>
<annotation cp="🏴☠" type="tts">Piratenflagge</annotation>
+ <annotation cp="£">britisches Pfund | EGP | GBP | Pfund | Pfund Sterling | Währung</annotation>
+ <annotation cp="£" type="tts">Pfund Sterling</annotation>
+ <annotation cp="¥">CNY | JPY | Renminbi | Währung | Yen | Yuan</annotation>
+ <annotation cp="¥" type="tts">Yen</annotation>
+ <annotation cp="€">EUR | Euro | Währung</annotation>
+ <annotation cp="€" type="tts">Euro</annotation>
+ <annotation cp="₹">Indische Rupie | INR | Rupie | Währung</annotation>
+ <annotation cp="₹" type="tts">Indische Rupie</annotation>
+ <annotation cp="₽">Rubel | Währung</annotation>
+ <annotation cp="₽" type="tts">Rubel</annotation>
+ <annotation cp="¹">eins | Eins | hochgestellt | hochgestellte Eins</annotation>
+ <annotation cp="¹" type="tts">hochgestellte Eins</annotation>
+ <annotation cp="²">hoch zwei | hochgestellt | hochgestellte Zwei | im Quadrat | Quadrat | zwei | Zwei</annotation>
+ <annotation cp="²" type="tts">hochgestellte Zwei</annotation>
+ <annotation cp="³">drei | Drei | hoch drei | hochgestellt | hochgestellte Drei</annotation>
+ <annotation cp="³" type="tts">hochgestellte Drei</annotation>
+ <annotation cp="µ">Maßeinheit | Mikro-Zeichen | My</annotation>
+ <annotation cp="µ" type="tts">Mikro-Zeichen</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/de_CH.xml b/common/annotations/de_CH.xml
index 2535d1d..2402565 100644
--- a/common/annotations/de_CH.xml
+++ b/common/annotations/de_CH.xml
@@ -12,6 +12,10 @@
<territory type="CH"/>
</identity>
<annotations>
+ <annotation cp="§">Paragraph</annotation>
+ <annotation cp="§" type="tts">Paragraph</annotation>
+ <annotation cp="◯">grosser hohler Kreis</annotation>
+ <annotation cp="◯" type="tts">grosser hohler Kreis</annotation>
<annotation cp="🥷">Ninja</annotation>
<annotation cp="🥸">Brille | Gesicht | Gesicht mit Maske | incognito | Maske | Nase</annotation>
<annotation cp="🥸" type="tts">Gesicht mit Maske</annotation>
@@ -209,5 +213,6 @@
<annotation cp="🏳" type="tts">Wehende weisse Fahne</annotation>
<annotation cp="🏳⚧">Flagge | hellblau | pink | Transgender | Transgenderflagge | weiss</annotation>
<annotation cp="🏳⚧" type="tts">Transgenderflagge</annotation>
+ <annotation cp="µ">Mikro-Zeichen</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/el.xml b/common/annotations/el.xml
index e3a4c20..56bd530 100644
--- a/common/annotations/el.xml
+++ b/common/annotations/el.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">μεσαίος-σκούρος τόνος δέρματος</annotation>
<annotation cp="🏿">fitzpatrick | σκούρος τόνος δέρματος | τόνος δέρματος | τύπου 6</annotation>
<annotation cp="🏿" type="tts">σκούρος τόνος δέρματος</annotation>
+ <annotation cp="–">μικρή | παύλα</annotation>
+ <annotation cp="–" type="tts">μικρή παύλα</annotation>
+ <annotation cp="—">μεγάλη | παύλα</annotation>
+ <annotation cp="—" type="tts">μεγάλη παύλα</annotation>
+ <annotation cp="·">άνω τελεία | μέση | μέση στιγμή | τελεία | τελεία διαχωρισμού</annotation>
+ <annotation cp="·" type="tts">άνω τελεία</annotation>
+ <annotation cp="«">αγκύλες | αριστερά γωνιακά εισαγωγικά | αριστερό | γωνία | διάσημα | εισαγωγικό | καρέ</annotation>
+ <annotation cp="«" type="tts">αριστερά γωνιακά εισαγωγικά</annotation>
+ <annotation cp="»">αγκύλες | γωνία | δεξί | δεξιά γωνιακά εισαγωγικά | διάσημα | εισαγωγικό | καρέ</annotation>
+ <annotation cp="»" type="tts">δεξιά γωνιακά εισαγωγικά</annotation>
+ <annotation cp="§">ενότητα | μέρος | παράγραφος | σύμβολο ενότητας</annotation>
+ <annotation cp="§" type="tts">ενότητα</annotation>
+ <annotation cp="†">δια | οβελίσκος | σταυρός στίξης | σύμβολο σταυρού στίξης</annotation>
+ <annotation cp="†" type="tts">σύμβολο σταυρού στίξης</annotation>
+ <annotation cp="‡">δια | διπλός | οβελίσκος | σταυρός στίξης | σύμβολο διπλού σταυρού στίξης</annotation>
+ <annotation cp="‡" type="tts">σύμβολο διπλού σταυρού στίξης</annotation>
+ <annotation cp="•">κουκκίδα | τελεία</annotation>
+ <annotation cp="•" type="tts">κουκκίδα</annotation>
+ <annotation cp="°">αλκοολικός βαθμός | βαθμός | ώρα</annotation>
+ <annotation cp="°" type="tts">βαθμός</annotation>
+ <annotation cp="℗">εγγραφή | ήχος | πνευματικά δικαιώματα | πνευματικά δικαιώματα ηχογράφησης</annotation>
+ <annotation cp="℗" type="tts">πνευματικά δικαιώματα ηχογράφησης</annotation>
+ <annotation cp="←">αριστερά | βέλος | βέλος προς τα αριστερά</annotation>
+ <annotation cp="←" type="tts">βέλος προς τα αριστερά</annotation>
+ <annotation cp="→">βέλος | βέλος προς τα δεξιά | δεξιά</annotation>
+ <annotation cp="→" type="tts">βέλος προς τα δεξιά</annotation>
+ <annotation cp="↑">βέλος | βέλος προς τα επάνω | επάνω</annotation>
+ <annotation cp="↑" type="tts">βέλος προς τα επάνω</annotation>
+ <annotation cp="↓">βέλος | βέλος προς τα κάτω | κάτω</annotation>
+ <annotation cp="↓" type="tts">βέλος προς τα κάτω</annotation>
+ <annotation cp="⇅">βέλος | βέλος προς τα επάνω και βέλος προς τα κάτω | επάνω | κάτω</annotation>
+ <annotation cp="⇅" type="tts">βέλος προς τα επάνω και βέλος προς τα κάτω</annotation>
+ <annotation cp="⇆">αριστερά | βέλος | βέλος προς αριστερά πάνω από βέλος προς δεξιά | δεξιά</annotation>
+ <annotation cp="⇆" type="tts">βέλος προς αριστερά πάνω από βέλος προς δεξιά</annotation>
+ <annotation cp="∆">προσαύξηση | τρίγωνο</annotation>
+ <annotation cp="∆" type="tts">προσαύξηση</annotation>
+ <annotation cp="∇">ανάδελτα | τρίγωνο</annotation>
+ <annotation cp="∇" type="tts">ανάδελτα</annotation>
+ <annotation cp="∈">ανήκει | μέλος | περιέχει | στοιχείο | σύνολο</annotation>
+ <annotation cp="∈" type="tts">ανήκει</annotation>
+ <annotation cp="÷">δια | διαίρεση | διαιρώ | σύμβολο διαίρεσης</annotation>
+ <annotation cp="÷" type="tts">σύμβολο διαίρεσης</annotation>
+ <annotation cp="×">πολλαπλασιάζω | πολλαπλασιασμός | σύμβολο πολλαπλασιασμού | φορές</annotation>
+ <annotation cp="×" type="tts">σύμβολο πολλαπλασιασμού</annotation>
+ <annotation cp="⁻">εκθέτης | μείον | πλην</annotation>
+ <annotation cp="⁻" type="tts">εκθέτης πλην</annotation>
+ <annotation cp="√">βάση | ρίζα | ριζικό | ριζικός | τετραγωνική ρίζα | τετράγωνο</annotation>
+ <annotation cp="√" type="tts">τετραγωνική ρίζα</annotation>
+ <annotation cp="∞">άπειρο | σύμβολο απείρου</annotation>
+ <annotation cp="∞" type="tts">σύμβολο απείρου</annotation>
+ <annotation cp="∩">σύνολο | τομή</annotation>
+ <annotation cp="∩" type="tts">τομή</annotation>
+ <annotation cp="∪">ένωση | συλλογή | σύνολο</annotation>
+ <annotation cp="∪" type="tts">ένωση</annotation>
+ <annotation cp="≡">ακριβές | ταυτόσημο | ταυτόσημο του | τριπλό</annotation>
+ <annotation cp="≡" type="tts">ταυτόσημο του</annotation>
+ <annotation cp="⊂">σύνολο | υποσύνολο | υποσύνολο του</annotation>
+ <annotation cp="⊂" type="tts">υποσύνολο του</annotation>
+ <annotation cp="▲">βέλος | γεμάτο | γεμάτο τρίγωνο προς τα επάνω | επάνω | τρίγωνο</annotation>
+ <annotation cp="▲" type="tts">γεμάτο τρίγωνο προς τα επάνω</annotation>
+ <annotation cp="▼">βέλος | γεμάτο | γεμάτο τρίγωνο προς τα κάτω | κάτω | τρίγωνο</annotation>
+ <annotation cp="▼" type="tts">γεμάτο τρίγωνο προς τα κάτω</annotation>
+ <annotation cp="◊">διαμάντι | ρόμβος</annotation>
+ <annotation cp="◊" type="tts">ρόμβος</annotation>
+ <annotation cp="○">δακτύλιος | κενός κύκλος | κύκλος</annotation>
+ <annotation cp="○" type="tts">κενός κύκλος</annotation>
+ <annotation cp="●">γεμάτος κύκλος | κύκλος</annotation>
+ <annotation cp="●" type="tts">γεμάτος κύκλος</annotation>
+ <annotation cp="◯">δακτύλιος | κύκλος | μεγάλος κενός κύκλος</annotation>
+ <annotation cp="◯" type="tts">μεγάλος κενός κύκλος</annotation>
<annotation cp="⚧">διεμφυλικός | σύμβολο της διεμφυλικότητας</annotation>
<annotation cp="⚧" type="tts">σύμβολο της διεμφυλικότητας</annotation>
<annotation cp="🤌">ανάκριση | δάχτυλα | δάχτυλα που κλείνουν | κίνηση χεριών | κλειστά | σαρκαστικό</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">σημαία ουράνιου τόξου</annotation>
<annotation cp="🏴☠">θησαυρός | λάφυρα | πειρατής | πειρατική σημαία | Τζόλι Ρότζερ</annotation>
<annotation cp="🏴☠" type="tts">πειρατική σημαία</annotation>
+ <annotation cp="£">EGP | GBP | λίρα | λίρα Αγγλίας | λίρα Αιγύπτου | νόμισμα</annotation>
+ <annotation cp="£" type="tts">λίρα</annotation>
+ <annotation cp="¥">CNY | JPY | γιεν | γιουάν | Ιαπωνικό γιεν | Κινεζικό γιουάν | νόμισμα</annotation>
+ <annotation cp="¥" type="tts">γιεν</annotation>
+ <annotation cp="€">EUR | ευρώ | νόμισμα</annotation>
+ <annotation cp="€" type="tts">ευρώ</annotation>
+ <annotation cp="₹">νόμισμα | ρουπία | ρουπία Ινδίας</annotation>
+ <annotation cp="₹" type="tts">ρουπία Ινδίας</annotation>
+ <annotation cp="₽">νόμισμα | ρούβλι</annotation>
+ <annotation cp="₽" type="tts">ρούβλι</annotation>
+ <annotation cp="¹">εκθέτης | ένα</annotation>
+ <annotation cp="¹" type="tts">εκθέτης ένα</annotation>
+ <annotation cp="²">δύο | εκθέτης | στο τετράγωνο</annotation>
+ <annotation cp="²" type="tts">εκθέτης δύο</annotation>
+ <annotation cp="³">εκθέτης | στον κύβο | τρία</annotation>
+ <annotation cp="³" type="tts">εκθέτης τρία</annotation>
+ <annotation cp="µ">μέτρηση | σύμβολο του μικρόν</annotation>
+ <annotation cp="µ" type="tts">σύμβολο του μικρόν</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en.xml b/common/annotations/en.xml
index b704aad..ed2ebeb 100644
--- a/common/annotations/en.xml
+++ b/common/annotations/en.xml
@@ -26,6 +26,76 @@
<annotation cp="🏾" type="tts">medium-dark skin tone</annotation>
<annotation cp="🏿">dark skin tone | skin tone | type 6</annotation>
<annotation cp="🏿" type="tts">dark skin tone</annotation>
+ <annotation cp="–">dash | en</annotation>
+ <annotation cp="–" type="tts">en dash</annotation>
+ <annotation cp="—">dash | em</annotation>
+ <annotation cp="—" type="tts">em dash</annotation>
+ <annotation cp="·">dot | interpunct | middle | middot</annotation>
+ <annotation cp="·" type="tts">middle dot</annotation>
+ <annotation cp="«">angle | brackets | carets | chevron | left | left guillemet | quote</annotation>
+ <annotation cp="«" type="tts">left guillemet</annotation>
+ <annotation cp="»">angle | brackets | carets | chevron | quote | right | right guillemet</annotation>
+ <annotation cp="»" type="tts">right guillemet</annotation>
+ <annotation cp="§">paragraph | part | section | silcrow</annotation>
+ <annotation cp="§" type="tts">section</annotation>
+ <annotation cp="†">dagger | dagger sign | obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">dagger sign</annotation>
+ <annotation cp="‡">dagger | double | double dagger sign | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">double dagger sign</annotation>
+ <annotation cp="•">bullet | dot</annotation>
+ <annotation cp="•" type="tts">bullet</annotation>
+ <annotation cp="°">degree | hour | proof</annotation>
+ <annotation cp="°" type="tts">degree</annotation>
+ <annotation cp="℗">copyright | recording | sound</annotation>
+ <annotation cp="℗" type="tts">sound recording copyright</annotation>
+ <annotation cp="←">arrow | left | left-pointing arrow</annotation>
+ <annotation cp="←" type="tts">left-pointing arrow</annotation>
+ <annotation cp="→">arrow | right | right-pointing arrow</annotation>
+ <annotation cp="→" type="tts">right-pointing arrow</annotation>
+ <annotation cp="↑">arrow | up | up-pointing arrow</annotation>
+ <annotation cp="↑" type="tts">up-pointing arrow</annotation>
+ <annotation cp="↓">arrow | down | down-pointing arrow</annotation>
+ <annotation cp="↓" type="tts">down-pointing arrow</annotation>
+ <annotation cp="⇅">arrow | down | up | up-pointing and down-pointing arrows</annotation>
+ <annotation cp="⇅" type="tts">up-pointing and down-pointing arrows</annotation>
+ <annotation cp="⇆">arrow | left | left-pointing over right-pointing arrows | right</annotation>
+ <annotation cp="⇆" type="tts">left-pointing over right-pointing arrows</annotation>
+ <annotation cp="∆">increment | triangle</annotation>
+ <annotation cp="∆" type="tts">increment</annotation>
+ <annotation cp="∇">nabla | triangle</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">contains | element | element of | membership | set</annotation>
+ <annotation cp="∈" type="tts">element of</annotation>
+ <annotation cp="÷">divide | division | division sign | obelus</annotation>
+ <annotation cp="÷" type="tts">division sign</annotation>
+ <annotation cp="×">multiplication | multiplication sign | multiply | times</annotation>
+ <annotation cp="×" type="tts">multiplication sign</annotation>
+ <annotation cp="⁻">minus | superscript</annotation>
+ <annotation cp="⁻" type="tts">superscript minus</annotation>
+ <annotation cp="√">radical | radix | root | square | surd</annotation>
+ <annotation cp="√" type="tts">square root</annotation>
+ <annotation cp="∞">infinity | infinity sign</annotation>
+ <annotation cp="∞" type="tts">infinity sign</annotation>
+ <annotation cp="∩">intersection | set</annotation>
+ <annotation cp="∩" type="tts">intersection</annotation>
+ <annotation cp="∪">collection | set | union</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">exact | identical | identical to | triple</annotation>
+ <annotation cp="≡" type="tts">identical to</annotation>
+ <annotation cp="⊂">set | subset | subset of</annotation>
+ <annotation cp="⊂" type="tts">subset of</annotation>
+ <annotation cp="▲">arrow | filled | filled up-pointing triangle | triangle | up</annotation>
+ <annotation cp="▲" type="tts">filled up-pointing triangle</annotation>
+ <annotation cp="▼">arrow | down | filled | filled down-pointing triangle | triangle</annotation>
+ <annotation cp="▼" type="tts">filled down-pointing triangle</annotation>
+ <annotation cp="◊">diamond | lozenge | rhombus</annotation>
+ <annotation cp="◊" type="tts">lozenge</annotation>
+ <annotation cp="○">circle | hollow circle | ring</annotation>
+ <annotation cp="○" type="tts">hollow circle</annotation>
+ <annotation cp="●">circle | filled circle</annotation>
+ <annotation cp="●" type="tts">filled circle</annotation>
+ <annotation cp="◯">circle | large hollow circle | ring</annotation>
+ <annotation cp="◯" type="tts">large hollow circle</annotation>
<annotation cp="⚧">transgender | transgender symbol</annotation>
<annotation cp="⚧" type="tts">transgender symbol</annotation>
<annotation cp="🤌">fingers | hand gesture | interrogation | pinched | sarcastic</annotation>
@@ -3011,5 +3081,23 @@
<annotation cp="🏳🌈" type="tts">rainbow flag</annotation>
<annotation cp="🏴☠">Jolly Roger | pirate | pirate flag | plunder | treasure</annotation>
<annotation cp="🏴☠" type="tts">pirate flag</annotation>
+ <annotation cp="£">currency | EGP | GBP | pound</annotation>
+ <annotation cp="£" type="tts">pound</annotation>
+ <annotation cp="¥">CNY | currency | JPY | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">currency | EUR | euro</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">currency | indian rupee | rupee</annotation>
+ <annotation cp="₹" type="tts">indian rupee</annotation>
+ <annotation cp="₽">currency | ruble</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">one | superscript</annotation>
+ <annotation cp="¹" type="tts">superscript one</annotation>
+ <annotation cp="²">squared | superscript | two</annotation>
+ <annotation cp="²" type="tts">superscript two</annotation>
+ <annotation cp="³">cubed | superscript | three</annotation>
+ <annotation cp="³" type="tts">superscript three</annotation>
+ <annotation cp="µ">measure | micro sign</annotation>
+ <annotation cp="µ" type="tts">micro sign</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en_001.xml b/common/annotations/en_001.xml
index 6e84e5c..4fce974 100644
--- a/common/annotations/en_001.xml
+++ b/common/annotations/en_001.xml
@@ -14,6 +14,10 @@
<territory type="001"/>
</identity>
<annotations>
+ <annotation cp="†">dagger | dagger sign | dagger symbol | obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">dagger symbol</annotation>
+ <annotation cp="‡">dagger | double | double dagger sign | double dagger symbol | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">double dagger symbol</annotation>
<annotation cp="⚧">trans | transgender</annotation>
<annotation cp="🦭">sea lion | seal</annotation>
<annotation cp="🩴">beach sandals | flip-flop | flipflop | sandals | thong sandals | thongs | zori | zōri</annotation>
@@ -374,5 +378,9 @@
<annotation cp="™" type="tts">trademark</annotation>
<annotation cp="🏳⚧">flag | light blue | pink | trans | transgender | white</annotation>
<annotation cp="🏳🌈">pride | rainbow | rainbow flag</annotation>
+ <annotation cp="£">currency | EGP | GBP | pound | quid | sterling</annotation>
+ <annotation cp="₽">currency | rouble | ruble</annotation>
+ <annotation cp="µ">measure | micro sign | mu</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en_AU.xml b/common/annotations/en_AU.xml
index 08f8d85..e0afb7f 100644
--- a/common/annotations/en_AU.xml
+++ b/common/annotations/en_AU.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧">↑↑↑</annotation>
<annotation cp="⚧" type="tts">↑↑↑</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">currency | indian rupee | INR | rupee</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en_CA.xml b/common/annotations/en_CA.xml
index d002c32..407585a 100644
--- a/common/annotations/en_CA.xml
+++ b/common/annotations/en_CA.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">↑↑↑</annotation>
<annotation cp="⚧" type="tts" draft="contributed">↑↑↑</annotation>
<annotation cp="🤌" draft="contributed">↑↑↑</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">currency | Indian rupee | rupee</annotation>
+ <annotation cp="₹" type="tts">Indian rupee</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en_GB.xml b/common/annotations/en_GB.xml
index 87c67a5..cb3f35b 100644
--- a/common/annotations/en_GB.xml
+++ b/common/annotations/en_GB.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">dagger | dagger sign | dagger symbol | obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">dagger symbol</annotation>
+ <annotation cp="‡">dagger | double | double dagger sign | double dagger symbol | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">double dagger symbol</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">transgender symbol</annotation>
<annotation cp="⚧" type="tts" draft="contributed">↑↑↑</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">currency | EGP | GBP | pound | quid | sterling</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">currency | rouble | ruble</annotation>
+ <annotation cp="₽" type="tts">rouble</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">measure | micro sign | mu</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/en_IN.xml b/common/annotations/en_IN.xml
index 87df5ca..6a260bb 100644
--- a/common/annotations/en_IN.xml
+++ b/common/annotations/en_IN.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">↑↑↑</annotation>
<annotation cp="⚧" type="tts" draft="contributed">↑↑↑</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/es.xml b/common/annotations/es.xml
index 1abdc38..a94ae32 100644
--- a/common/annotations/es.xml
+++ b/common/annotations/es.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">tono de piel oscuro medio</annotation>
<annotation cp="🏿">piel | tipo 6 | tono | tono de piel | tono de piel oscuro</annotation>
<annotation cp="🏿" type="tts">tono de piel oscuro</annotation>
+ <annotation cp="–">guion | guion corto | semimenos</annotation>
+ <annotation cp="–" type="tts">guion corto</annotation>
+ <annotation cp="—">guion largo | raya</annotation>
+ <annotation cp="—" type="tts">raya</annotation>
+ <annotation cp="·">alto | interpunto | medio | punto | punto centrado</annotation>
+ <annotation cp="·" type="tts">punto medio</annotation>
+ <annotation cp="«">apertura | comillas angulares | comillas de apertura | comillas españolas | comillas francesas | comillas latinas de apertura</annotation>
+ <annotation cp="«" type="tts">comillas latinas de apertura</annotation>
+ <annotation cp="»">cierre | comillas angulares | comillas de cierre | comillas españolas | comillas francesas | comillas latinas de cierre</annotation>
+ <annotation cp="»" type="tts">comillas latinas de cierre</annotation>
+ <annotation cp="§">párrafo | sección | signo | signo de párrafo</annotation>
+ <annotation cp="§" type="tts">signo de párrafo</annotation>
+ <annotation cp="†">cruz | daga | obelisco | signo de cruz</annotation>
+ <annotation cp="†" type="tts">signo de cruz</annotation>
+ <annotation cp="‡">cruz | daga | doble | obelisco | signo de cruz doble</annotation>
+ <annotation cp="‡" type="tts">signo de cruz doble</annotation>
+ <annotation cp="•">boliche | bolo | punto | topo | viñeta</annotation>
+ <annotation cp="•" type="tts">bolo</annotation>
+ <annotation cp="°">grado | o volada | o voladita</annotation>
+ <annotation cp="°" type="tts">grado</annotation>
+ <annotation cp="℗">copyright | copyright de grabación de sonido | grabación | sonido</annotation>
+ <annotation cp="℗" type="tts">copyright de grabación de sonido</annotation>
+ <annotation cp="←">apuntar | flecha | flecha apuntando hacia la izquierda | hacia la izquierda | izquierda</annotation>
+ <annotation cp="←" type="tts">flecha apuntando hacia la izquierda</annotation>
+ <annotation cp="→">apuntar | derecha | flecha | flecha apuntando hacia la derecha | hacia la derecha</annotation>
+ <annotation cp="→" type="tts">flecha apuntando hacia la derecha</annotation>
+ <annotation cp="↑">apuntar | arriba | flecha | flecha apuntando hacia arriba | hacia arriba</annotation>
+ <annotation cp="↑" type="tts">flecha apuntando hacia arriba</annotation>
+ <annotation cp="↓">abajo | apuntar | flecha | flecha apuntando hacia abajo | hacia abajo</annotation>
+ <annotation cp="↓" type="tts">flecha apuntando hacia abajo</annotation>
+ <annotation cp="⇅">abajo | apuntar | arriba | flecha | flechas apuntando arriba y abajo | hacia abajo | hacia arriba</annotation>
+ <annotation cp="⇅" type="tts">flechas apuntando arriba y abajo</annotation>
+ <annotation cp="⇆">apuntar | derecha | flecha | flechas apuntando izquierda sobre derecha | hacia la derecha | hacia la izquierda | izquierda</annotation>
+ <annotation cp="⇆" type="tts">flechas apuntando izquierda sobre derecha</annotation>
+ <annotation cp="∆">incremento | triángulo</annotation>
+ <annotation cp="∆" type="tts">incremento</annotation>
+ <annotation cp="∇">nabla | triángulo</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">conjunto | contiene | elemento | elemento de | miembro</annotation>
+ <annotation cp="∈" type="tts">elemento de</annotation>
+ <annotation cp="÷">dividir | división | lemnisco | óbelo | signo | signo de división</annotation>
+ <annotation cp="÷" type="tts">signo de división</annotation>
+ <annotation cp="×">multiplicación | multiplicar | signo de multiplicación</annotation>
+ <annotation cp="×" type="tts">signo de multiplicación</annotation>
+ <annotation cp="⁻">menos | menos en superíndice | superíndice</annotation>
+ <annotation cp="⁻" type="tts">menos en superíndice</annotation>
+ <annotation cp="√">base | cuadrada | radical | raíz | sordo</annotation>
+ <annotation cp="√" type="tts">raíz cuadrada</annotation>
+ <annotation cp="∞">infinito | signo de infinito</annotation>
+ <annotation cp="∞" type="tts">signo de infinito</annotation>
+ <annotation cp="∩">conjunto | intersección</annotation>
+ <annotation cp="∩" type="tts">intersección</annotation>
+ <annotation cp="∪">colección | conjunto | unión</annotation>
+ <annotation cp="∪" type="tts">unión</annotation>
+ <annotation cp="≡">equivalente | equivalente a | exacto | idéntico | menú de hamburguesa | triple</annotation>
+ <annotation cp="≡" type="tts">equivalente a</annotation>
+ <annotation cp="⊂">conjunto | subconjunto | subconjunto de</annotation>
+ <annotation cp="⊂" type="tts">subconjunto de</annotation>
+ <annotation cp="▲">arriba | flecha | hacia arriba | relleno | triángulo | triángulo relleno apuntando hacia arriba</annotation>
+ <annotation cp="▲" type="tts">triángulo relleno apuntando hacia arriba</annotation>
+ <annotation cp="▼">abajo | flecha | hacia abajo | relleno | triángulo | triángulo relleno apuntando hacia abajo</annotation>
+ <annotation cp="▼" type="tts">triángulo relleno apuntando hacia abajo</annotation>
+ <annotation cp="◊">diamante | rombo</annotation>
+ <annotation cp="◊" type="tts">rombo</annotation>
+ <annotation cp="○">anillo | círculo | hueco</annotation>
+ <annotation cp="○" type="tts">círculo hueco</annotation>
+ <annotation cp="●">círculo | círculo relleno</annotation>
+ <annotation cp="●" type="tts">círculo relleno</annotation>
+ <annotation cp="◯">anillo | círculo | círculo hueco grande | hueco</annotation>
+ <annotation cp="◯" type="tts">círculo hueco grande</annotation>
<annotation cp="⚧">símbolo de transgénero | transgénero</annotation>
<annotation cp="⚧" type="tts">símbolo de transgénero</annotation>
<annotation cp="🤌">dedos | dedos juntos apuntando hacia arriba | gesto | italia | italiano | mano | sarcasmo</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bandera del arcoíris</annotation>
<annotation cp="🏴☠">bandera pirata | botín | Jolly Roger | pirata | tesoro</annotation>
<annotation cp="🏴☠" type="tts">bandera pirata</annotation>
+ <annotation cp="£">divisa | EGP | GBP | libra | libra esterlina | moneda</annotation>
+ <annotation cp="£" type="tts">libra esterlina</annotation>
+ <annotation cp="¥">CNY | divisa | JPY | moneda | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">divisa | EUR | euro | moneda</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">divisa | moneda | rupia | rupia india</annotation>
+ <annotation cp="₹" type="tts">rupia india</annotation>
+ <annotation cp="₽">divisa | moneda | rublo</annotation>
+ <annotation cp="₽" type="tts">rublo</annotation>
+ <annotation cp="¹">superíndice | uno | uno en superíndice</annotation>
+ <annotation cp="¹" type="tts">uno en superíndice</annotation>
+ <annotation cp="²">al cuadrado | dos | dos en superíndice | superíndice</annotation>
+ <annotation cp="²" type="tts">dos en superíndice</annotation>
+ <annotation cp="³">al cubo | superíndice | tres | tres en superíndice</annotation>
+ <annotation cp="³" type="tts">tres en superíndice</annotation>
+ <annotation cp="µ">medida | micro | signo | símbolo de micro | unidad</annotation>
+ <annotation cp="µ" type="tts">símbolo de micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/es_419.xml b/common/annotations/es_419.xml
index c2b1e77..934220c 100644
--- a/common/annotations/es_419.xml
+++ b/common/annotations/es_419.xml
@@ -24,6 +24,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">guion | guion corto</annotation>
+ <annotation cp="–" type="tts">guion</annotation>
+ <annotation cp="—">guion largo | raya</annotation>
+ <annotation cp="—" type="tts">raya</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">punto medio</annotation>
+ <annotation cp="«">apertura | comillas angulares | comillas de apertura | comillas españolas | comillas francesas | diple de apertura</annotation>
+ <annotation cp="«" type="tts">diple de apertura</annotation>
+ <annotation cp="»">cierre | comillas angulares | comillas de cierre | comillas españolas | comillas francesas | diple de cierre</annotation>
+ <annotation cp="»" type="tts">diple de cierre</annotation>
+ <annotation cp="§">párrafo | parte | sección | signo de sección</annotation>
+ <annotation cp="§" type="tts">sección</annotation>
+ <annotation cp="†">daga | obelisco | signo de daga</annotation>
+ <annotation cp="†" type="tts">signo de daga</annotation>
+ <annotation cp="‡">daga | doble | obelisco | signo de daga doble</annotation>
+ <annotation cp="‡" type="tts">signo de daga doble</annotation>
+ <annotation cp="•">punto | viñeta</annotation>
+ <annotation cp="•" type="tts">viñeta</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">abajo | apuntar | arriba | flecha | flecha doble hacia arriba y abajo | hacia abajo | hacia arriba</annotation>
+ <annotation cp="⇅" type="tts">flecha doble hacia arriba y abajo</annotation>
+ <annotation cp="⇆">apuntar | derecha | flecha | flecha doble hacia la izquierda y derecha | hacia la derecha | hacia la izquierda | izquierda</annotation>
+ <annotation cp="⇆" type="tts">flecha doble hacia la izquierda y derecha</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">anillo | círculo | círculo vacío</annotation>
+ <annotation cp="○" type="tts">círculo vacío</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">anillo | círculo | círculo vacío grande</annotation>
+ <annotation cp="◯" type="tts">círculo vacío grande</annotation>
<annotation cp="⚧">↑↑↑</annotation>
<annotation cp="⚧" type="tts">↑↑↑</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3008,5 +3078,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">divisa | moneda | rupia | rupia india</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">signo micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/es_MX.xml b/common/annotations/es_MX.xml
index b4a6554..08d61fd 100644
--- a/common/annotations/es_MX.xml
+++ b/common/annotations/es_MX.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">angular | comilla | comilla angular de apertura | comilla de apertura | corchetes | izquierda</annotation>
+ <annotation cp="«" type="tts">comilla angular de apertura</annotation>
+ <annotation cp="»">angular | comilla | comilla angular de cierre | comilla de cierre | corchetes | derecha</annotation>
+ <annotation cp="»" type="tts">comilla angular de cierre</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">abajo | apuntar | flecha | flecha apuntando hacia abajo | hacia abajo</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">división</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">multiplicación</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">conjunto | subconjunto | subconjunto de</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">arriba | flecha | hacia arriba | relleno | triángulo | triángulo relleno apuntando hacia arriba</annotation>
+ <annotation cp="▲" type="tts">triángulo relleno apuntando hacia arriba</annotation>
+ <annotation cp="▼">abajo | flecha | hacia abajo | relleno | triángulo | triángulo relleno apuntando hacia abajo</annotation>
+ <annotation cp="▼" type="tts">triángulo relleno apuntando hacia abajo</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">↑↑↑</annotation>
<annotation cp="⚧" type="tts" draft="contributed">↑↑↑</annotation>
<annotation cp="🤌" draft="contributed">dedos unidos</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">bandera pirata | botín | calavera | Jolly Roger | pirata</annotation>
<annotation cp="🏴☠" type="tts">bandera pirata</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/es_US.xml b/common/annotations/es_US.xml
index 032c5f2..2cf7c5a 100644
--- a/common/annotations/es_US.xml
+++ b/common/annotations/es_US.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">↑↑↑</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">interpunto | medio | punto</annotation>
+ <annotation cp="·" type="tts">punto medio</annotation>
+ <annotation cp="«">ángulo | cita | comilla | comillas de apertura | corchetes | izquierda</annotation>
+ <annotation cp="«" type="tts">comillas de apertura</annotation>
+ <annotation cp="»">angulo | cita | comilla derecha | comillas de cierre | corchetes | derecha | intercalación</annotation>
+ <annotation cp="»" type="tts">comillas de cierre</annotation>
+ <annotation cp="§">párrafo | parte | sección</annotation>
+ <annotation cp="§" type="tts">sección</annotation>
+ <annotation cp="†">daga | obelisco | obelo | signo obelisco</annotation>
+ <annotation cp="†" type="tts">signo obelisco</annotation>
+ <annotation cp="‡">daga | doble | obelisco | obelo | signo doble obelisco</annotation>
+ <annotation cp="‡" type="tts">signo doble obelisco</annotation>
+ <annotation cp="•">punto | viñeta</annotation>
+ <annotation cp="•" type="tts">viñeta</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">equivalente | equivalente a | exacto | idéntico</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">↑↑↑</annotation>
<annotation cp="⚧" type="tts" draft="contributed">↑↑↑</annotation>
<annotation cp="🤌" draft="contributed">↑↑↑</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠" draft="contributed">bandera pirata</annotation>
<annotation cp="🏴☠" type="tts" draft="contributed">bandera pirata</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/et.xml b/common/annotations/et.xml
index d901093..1b6a313 100644
--- a/common/annotations/et.xml
+++ b/common/annotations/et.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">keskmiselt tume nahatoon</annotation>
<annotation cp="🏿">nahatoon | nahk | tume nahatoon | tüüp 6</annotation>
<annotation cp="🏿" type="tts">tume nahatoon</annotation>
+ <annotation cp="–">kriips | N | N-kriips</annotation>
+ <annotation cp="–" type="tts">N-kriips</annotation>
+ <annotation cp="—">kriips | M | M-kriips</annotation>
+ <annotation cp="—" type="tts">M-kriips</annotation>
+ <annotation cp="·">keskmine | punkt | vahepunkt</annotation>
+ <annotation cp="·" type="tts">keskmine punkt</annotation>
+ <annotation cp="«">nurk | nurksulud | topeltnool vasakule | tsitaat | vasak | vasaknooled</annotation>
+ <annotation cp="«" type="tts">topeltnool vasakule</annotation>
+ <annotation cp="»">nurk | nurksulud | parem | paremnooled | topeltnool paremale | tsitaat</annotation>
+ <annotation cp="»" type="tts">topeltnool paremale</annotation>
+ <annotation cp="§">jaotis | osa | paragrahv</annotation>
+ <annotation cp="§" type="tts">paragrahv</annotation>
+ <annotation cp="†">pistoda | rist | ristimärk</annotation>
+ <annotation cp="†" type="tts">ristimärk</annotation>
+ <annotation cp="‡">pistoda | topelt | topeltristi märk</annotation>
+ <annotation cp="‡" type="tts">topeltristi märk</annotation>
+ <annotation cp="•">mumm | punkt</annotation>
+ <annotation cp="•" type="tts">mumm</annotation>
+ <annotation cp="°">kraad | proov | tund</annotation>
+ <annotation cp="°" type="tts">kraad</annotation>
+ <annotation cp="℗">autoriõigus | heli | helisalvestise autoriõigus | salvestamine</annotation>
+ <annotation cp="℗" type="tts">helisalvestise autoriõigus</annotation>
+ <annotation cp="←">nool | vasak | vasaknool</annotation>
+ <annotation cp="←" type="tts">vasaknool</annotation>
+ <annotation cp="→">nool | parem | paremnool</annotation>
+ <annotation cp="→" type="tts">paremnool</annotation>
+ <annotation cp="↑">nool | üles | ülesnool</annotation>
+ <annotation cp="↑" type="tts">ülesnool</annotation>
+ <annotation cp="↓">alla | allanool | nool</annotation>
+ <annotation cp="↓" type="tts">allanool</annotation>
+ <annotation cp="⇅">alla | nool | üles | ülesnool ja allanool</annotation>
+ <annotation cp="⇅" type="tts">ülesnool ja allanool</annotation>
+ <annotation cp="⇆">nool | parem | vasak | vasaknool paremnoole kohal</annotation>
+ <annotation cp="⇆" type="tts">vasaknool paremnoole kohal</annotation>
+ <annotation cp="∆">juurdekasv | kolmnurk</annotation>
+ <annotation cp="∆" type="tts">juurdekasv</annotation>
+ <annotation cp="∇">kolmnurk | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">element | hulk | kuulub hulka | sisaldab</annotation>
+ <annotation cp="∈" type="tts">element</annotation>
+ <annotation cp="÷">jaga | jagamine | jagamismärk</annotation>
+ <annotation cp="÷" type="tts">jagamismärk</annotation>
+ <annotation cp="×">korda | korrutamine | korrutusmärk</annotation>
+ <annotation cp="×" type="tts">korrutusmärk</annotation>
+ <annotation cp="⁻">miinus | ülakiri | ülamiinus</annotation>
+ <annotation cp="⁻" type="tts">ülamiinus</annotation>
+ <annotation cp="√">juur | radikaal | ruut | ruutjuur | surd</annotation>
+ <annotation cp="√" type="tts">ruutjuur</annotation>
+ <annotation cp="∞">lõpmatus | lõpmatuse märk</annotation>
+ <annotation cp="∞" type="tts">lõpmatuse märk</annotation>
+ <annotation cp="∩">hulk | lõikumine</annotation>
+ <annotation cp="∩" type="tts">lõikumine</annotation>
+ <annotation cp="∪">hulk | kogu | union</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">identne | kolm kriipsu | täpselt</annotation>
+ <annotation cp="≡" type="tts">identne</annotation>
+ <annotation cp="⊂">alamhulk | hulk | kuulub alamhulka</annotation>
+ <annotation cp="⊂" type="tts">alamhulk</annotation>
+ <annotation cp="▲">kolmnurk | nool | täidetud | täidetud üles-kolmnurk | üles</annotation>
+ <annotation cp="▲" type="tts">täidetud üles-kolmnurk</annotation>
+ <annotation cp="▼">alla | kolmnurk | nool | täidetud | täidetud alla-kolmnurk</annotation>
+ <annotation cp="▼" type="tts">täidetud alla-kolmnurk</annotation>
+ <annotation cp="◊">hulktahukas | romb | teemant</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">ring | sõõr | tühi ring</annotation>
+ <annotation cp="○" type="tts">tühi ring</annotation>
+ <annotation cp="●">ring | täidetud ring</annotation>
+ <annotation cp="●" type="tts">täidetud ring</annotation>
+ <annotation cp="◯">ring | sõõr | suur tühi ring</annotation>
+ <annotation cp="◯" type="tts">suur tühi ring</annotation>
<annotation cp="⚧">transsoolisus | transsoolisuse sümbol</annotation>
<annotation cp="⚧" type="tts">transsoolisuse sümbol</annotation>
<annotation cp="🤌">kokkusurutud | küsimus | sarkastiline | sõrmed | žest</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">vikerkaarelipp</annotation>
<annotation cp="🏴☠">piraadilipp | piraat | röövimine | varandus</annotation>
<annotation cp="🏴☠" type="tts">piraadilipp</annotation>
+ <annotation cp="£">EGP | GBP | nael | valuuta</annotation>
+ <annotation cp="£" type="tts">nael</annotation>
+ <annotation cp="¥">CNY | jeen | JPY | jüaan | valuuta</annotation>
+ <annotation cp="¥" type="tts">jeen</annotation>
+ <annotation cp="€">EUR | euro | valuuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">india ruupia | ruupia | valuuta</annotation>
+ <annotation cp="₹" type="tts">ruupia</annotation>
+ <annotation cp="₽">rubla | valuuta</annotation>
+ <annotation cp="₽" type="tts">rubla</annotation>
+ <annotation cp="¹">aste | astmel 1 | üks</annotation>
+ <annotation cp="¹" type="tts">astmel 1</annotation>
+ <annotation cp="²">2 | aste | astmel 2 | ruudus</annotation>
+ <annotation cp="²" type="tts">astmel 2</annotation>
+ <annotation cp="³">aste | astmel 3 | kolm | kuubis</annotation>
+ <annotation cp="³" type="tts">astmel 3</annotation>
+ <annotation cp="µ">mikro | mikro märk | mõõtühik</annotation>
+ <annotation cp="µ" type="tts">mikro märk</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/eu.xml b/common/annotations/eu.xml
index c63caa7..4cb21f1 100644
--- a/common/annotations/eu.xml
+++ b/common/annotations/eu.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">5. mota</annotation>
<annotation cp="🏿">6. mota | azalaren tonua</annotation>
<annotation cp="🏿" type="tts">6. mota</annotation>
+ <annotation cp="–">labur | marra | marra laburra</annotation>
+ <annotation cp="–" type="tts">marra laburra</annotation>
+ <annotation cp="—">luze | marra | marra luzea</annotation>
+ <annotation cp="—" type="tts">marra luzea</annotation>
+ <annotation cp="·">erdia | erdiko puntu | erdiko puntua | puntu</annotation>
+ <annotation cp="·" type="tts">erdiko puntua</annotation>
+ <annotation cp="«">azentu zirkunflexu | ezkerra | ezkerreko komatxo | ezkerreko komatxoak | komatxo | kortxete | xebroi</annotation>
+ <annotation cp="«" type="tts">ezkerreko komatxoak</annotation>
+ <annotation cp="»">azentu zirkunflexu | eskuina | eskuineko komatxo | eskuineko komatxoak | komatxo | kortxete | xebroi</annotation>
+ <annotation cp="»" type="tts">eskuineko komatxoak</annotation>
+ <annotation cp="§">paragrafo | sekzio | sekzioa | zati</annotation>
+ <annotation cp="§" type="tts">sekzioa</annotation>
+ <annotation cp="†">gurutze | gurutzea | obelisko</annotation>
+ <annotation cp="†" type="tts">gurutzea</annotation>
+ <annotation cp="‡">bikoitz | gurutze | gurutze bikoitza | obelisko</annotation>
+ <annotation cp="‡" type="tts">gurutze bikoitza</annotation>
+ <annotation cp="•">bullet | bulleta | puntu</annotation>
+ <annotation cp="•" type="tts">bulleta</annotation>
+ <annotation cp="°">froga | gradu | ordu</annotation>
+ <annotation cp="°" type="tts">gradu</annotation>
+ <annotation cp="℗">copyright | grabaketa | soinu | soinu-grabaketaren copyrighta</annotation>
+ <annotation cp="℗" type="tts">soinu-grabaketaren copyrighta</annotation>
+ <annotation cp="←">ezkerra | ezkerrera seinalatzen duen gezia | gezia</annotation>
+ <annotation cp="←" type="tts">ezkerrera seinalatzen duen gezia</annotation>
+ <annotation cp="→">eskuinera | eskuinera seinalatzen duen gezia | gezia</annotation>
+ <annotation cp="→" type="tts">eskuinera seinalatzen duen gezia</annotation>
+ <annotation cp="↑">gezia | gora | gora seinalatzen duen gezia</annotation>
+ <annotation cp="↑" type="tts">gora seinalatzen duen gezia</annotation>
+ <annotation cp="↓">behera | behera seinalatzen duen gezia | gezia</annotation>
+ <annotation cp="↓" type="tts">behera seinalatzen duen gezia</annotation>
+ <annotation cp="⇅">behera | gezia | gora | gora eta behera seinalatzen duten geziak</annotation>
+ <annotation cp="⇅" type="tts">gora eta behera seinalatzen duten geziak</annotation>
+ <annotation cp="⇆">eskuina | ezkerra | ezkerrera eta eskuinera gezia | ezkerrera eta eskuinera seinalatzen duen gezia</annotation>
+ <annotation cp="⇆" type="tts">ezkerrera eta eskuinera seinalatzen duen gezia</annotation>
+ <annotation cp="∆">gehikuntza | triangelua</annotation>
+ <annotation cp="∆" type="tts">gehikuntza</annotation>
+ <annotation cp="∇">nabla | triangelua</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">elementua | ezarri | hau du | honen elementua | kidetza</annotation>
+ <annotation cp="∈" type="tts">honen elementua</annotation>
+ <annotation cp="÷">zatiketa | zatiketa-ikur | zatitu</annotation>
+ <annotation cp="÷" type="tts">zatiketa-ikur</annotation>
+ <annotation cp="×">aldiak | biderkatu | biderketa | biderketa-ikur</annotation>
+ <annotation cp="×" type="tts">biderketa-ikur</annotation>
+ <annotation cp="⁻">goi-indize | goi-indizeko minusa | minus</annotation>
+ <annotation cp="⁻" type="tts">goi-indizeko minusa</annotation>
+ <annotation cp="√">erro | errotzaile | karratu | oinarri</annotation>
+ <annotation cp="√" type="tts">erro karratu</annotation>
+ <annotation cp="∞">infinitu-ikurra | infinitua</annotation>
+ <annotation cp="∞" type="tts">infinitu-ikurra</annotation>
+ <annotation cp="∩">ebakidura | multzoa</annotation>
+ <annotation cp="∩" type="tts">ebakidura</annotation>
+ <annotation cp="∪">bilduma | lotura | multzoa</annotation>
+ <annotation cp="∪" type="tts">lotura</annotation>
+ <annotation cp="≡">bera | berbera | hirukoitza | honen berbera</annotation>
+ <annotation cp="≡" type="tts">honen berbera</annotation>
+ <annotation cp="⊂">azpimultzoa | honen azpimultzoa | multzoa</annotation>
+ <annotation cp="⊂" type="tts">honen azpimultzoa</annotation>
+ <annotation cp="▲">betea | gezia | gora seinalatzen duen triangelu betea | triangelu</annotation>
+ <annotation cp="▲" type="tts">gora seinalatzen duen triangelu betea</annotation>
+ <annotation cp="▼">behera | behera seinalatzen duen triangelu betea | betea | gezi | triangelu</annotation>
+ <annotation cp="▼" type="tts">behera seinalatzen duen triangelu betea</annotation>
+ <annotation cp="◊">diamante | erronbo</annotation>
+ <annotation cp="◊" type="tts">erronbo</annotation>
+ <annotation cp="○">eraztun | zirkulu | zirkulu huts | zirkulu hutsa</annotation>
+ <annotation cp="○" type="tts">zirkulu hutsa</annotation>
+ <annotation cp="●">zirkulu bete | zirkulu betea | zirkulua</annotation>
+ <annotation cp="●" type="tts">zirkulu betea</annotation>
+ <annotation cp="◯">eraztun | zirkulu | zirkulu huts handi | zirkulu huts handia</annotation>
+ <annotation cp="◯" type="tts">zirkulu huts handia</annotation>
<annotation cp="⚧">transgeneroa | transgeneroen ikurra</annotation>
<annotation cp="⚧" type="tts">transgeneroen ikurra</annotation>
<annotation cp="🤌">elkartuta | esku-keinua | galdera | hatz elkartuak | hatzak | sarkasmoa</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ortzadarraren bandera</annotation>
<annotation cp="🏴☠">altxor | arpilatze | Jolly Roger | pirata | piraten bandera</annotation>
<annotation cp="🏴☠" type="tts">piraten bandera</annotation>
+ <annotation cp="£">diru | EGP | GBP | libera</annotation>
+ <annotation cp="£" type="tts">libera</annotation>
+ <annotation cp="¥">CNY | diru | JPY | yen | yena | yuan</annotation>
+ <annotation cp="¥" type="tts">yena</annotation>
+ <annotation cp="€">diru | EUR | euro | euroa</annotation>
+ <annotation cp="€" type="tts">euroa</annotation>
+ <annotation cp="₹">diru | errupia | errupia indiar | errupia indiarra</annotation>
+ <annotation cp="₹" type="tts">errupia indiarra</annotation>
+ <annotation cp="₽">diru | errublo | errubloa</annotation>
+ <annotation cp="₽" type="tts">errubloa</annotation>
+ <annotation cp="¹">bat | goi-indize | goi-indizeko bat</annotation>
+ <annotation cp="¹" type="tts">goi-indizeko bat</annotation>
+ <annotation cp="²">bi | goi-indize | goi-indizeko bi</annotation>
+ <annotation cp="²" type="tts">goi-indizeko bi</annotation>
+ <annotation cp="³">goi-indize | goi-indizeko hiru | hiru | kubiko</annotation>
+ <annotation cp="³" type="tts">goi-indizeko hiru</annotation>
+ <annotation cp="µ">mikro-ikur | mikro-ikurra | neurketa</annotation>
+ <annotation cp="µ" type="tts">mikro-ikurra</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/fa.xml b/common/annotations/fa.xml
index a1adbd2..832df42 100644
--- a/common/annotations/fa.xml
+++ b/common/annotations/fa.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">پوست گندمی</annotation>
<annotation cp="🏿">اصلاحگر شکلک | پوست | پوست آبنوسی | پوست تیره | تن پوست | رنگ پوست | نوع ۶</annotation>
<annotation cp="🏿" type="tts">پوست آبنوسی</annotation>
+ <annotation cp="–">خطفاصله | کوتاه</annotation>
+ <annotation cp="–" type="tts">خطفاصله کوتاه</annotation>
+ <annotation cp="—">بلند | خطفاصله</annotation>
+ <annotation cp="—" type="tts">خطفاصله بلند</annotation>
+ <annotation cp="·">میاننقطه | میانی | نقطه | نقطهگذاری میانی</annotation>
+ <annotation cp="·" type="tts">نقطه میانی</annotation>
+ <annotation cp="«">جهتنما | چپ | کروشه | گوشه | گیومه بسته | نشان | نقلقول</annotation>
+ <annotation cp="«" type="tts">گیومه بسته</annotation>
+ <annotation cp="»">جهتنما | راست | کروشه | گوشه | گیومه باز | نشان | نقلقول</annotation>
+ <annotation cp="»" type="tts">گیومه باز</annotation>
+ <annotation cp="§">بخش | پاراگراف | جزء | نشان بخش</annotation>
+ <annotation cp="§" type="tts">بخش</annotation>
+ <annotation cp="†">تکستون | چلیپا | نشان چلیپا</annotation>
+ <annotation cp="†" type="tts">نشان چلیپا</annotation>
+ <annotation cp="‡">تکستون | چلیپا | دوگانه | نشان چلیپا | نشان چلیپای دوگانه</annotation>
+ <annotation cp="‡" type="tts">نشان چلیپای دوگانه</annotation>
+ <annotation cp="•">گلوله | نقطه</annotation>
+ <annotation cp="•" type="tts">گلوله</annotation>
+ <annotation cp="°">خلوص | درجه | ساعت</annotation>
+ <annotation cp="°" type="tts">درجه</annotation>
+ <annotation cp="℗">حق نسخهبرداری | حق نسخهبرداری برای ضبط صدا | صدا | ضبط کردن</annotation>
+ <annotation cp="℗" type="tts">حق نسخهبرداری برای ضبط صدا</annotation>
+ <annotation cp="←">پیکان | پیکان روبه چپ | چپ</annotation>
+ <annotation cp="←" type="tts">پیکان روبه چپ</annotation>
+ <annotation cp="→">پیکان | پیکان روبه راست | راست</annotation>
+ <annotation cp="→" type="tts">پیکان روبه راست</annotation>
+ <annotation cp="↑">بالا | پیکان | پیکان روبه بالا</annotation>
+ <annotation cp="↑" type="tts">پیکان روبه بالا</annotation>
+ <annotation cp="↓">پایین | پیکان | پیکان روبه پایین</annotation>
+ <annotation cp="↓" type="tts">پیکان روبه پایین</annotation>
+ <annotation cp="⇅">بالا | پایین | پیکان | پیکانهای روبه بالا و روبه پایین</annotation>
+ <annotation cp="⇅" type="tts">پیکانهای روبه بالا و روبه پایین</annotation>
+ <annotation cp="⇆">پیکان | پیکان روبه چپ روی پیکان روبه راست | چپ | راست</annotation>
+ <annotation cp="⇆" type="tts">پیکان روبه چپ روی پیکان روبه راست</annotation>
+ <annotation cp="∆">افزایش | مثلث</annotation>
+ <annotation cp="∆" type="tts">افزایش</annotation>
+ <annotation cp="∇">عملگر دل، نابلا | مثلث</annotation>
+ <annotation cp="∇" type="tts">عملگر دل، نابلا</annotation>
+ <annotation cp="∈">شامل | عضویت | عنصر | عنصرِ | مجموعه</annotation>
+ <annotation cp="∈" type="tts">عنصرِ</annotation>
+ <annotation cp="÷">بخش کردن | تقسیم | تقسیم کردن | علامت تقسیم</annotation>
+ <annotation cp="÷" type="tts">علامت تقسیم</annotation>
+ <annotation cp="×">چند برابر | ضرب | ضرب کردن | علامت ضرب</annotation>
+ <annotation cp="×" type="tts">علامت ضرب</annotation>
+ <annotation cp="⁻">زِبَرنوشت، برنوشته | منفی | منفی زِبَرنوشت، منفی برنوشته</annotation>
+ <annotation cp="⁻" type="tts">منفی زِبَرنوشت، منفی برنوشته</annotation>
+ <annotation cp="√">جذر، ریشه دوم | رادیکال | ریشه | مجذور</annotation>
+ <annotation cp="√" type="tts">جذر، ریشه دوم</annotation>
+ <annotation cp="∞">بینهایت، نامتناهی | علامت بینهایت، علامت نامتناهی</annotation>
+ <annotation cp="∞" type="tts">علامت بینهایت، علامت نامتناهی</annotation>
+ <annotation cp="∩">اشتراک | مجموعه</annotation>
+ <annotation cp="∩" type="tts">اشتراک</annotation>
+ <annotation cp="∪">اجتماع | مجموعه</annotation>
+ <annotation cp="∪" type="tts">اجتماع</annotation>
+ <annotation cp="≡">سهخط | عین | معادل با، اینهمان با | معادل، اینهمان</annotation>
+ <annotation cp="≡" type="tts">معادل با، اینهمان با</annotation>
+ <annotation cp="⊂">زیرمجموعه | زیرمجموعهٔ | مجموعه</annotation>
+ <annotation cp="⊂" type="tts">زیرمجموعهٔ</annotation>
+ <annotation cp="▲">بالا | پیکان | توپُر | مثلث روبهبالای توپُر</annotation>
+ <annotation cp="▲" type="tts">مثلث روبهبالای توپُر</annotation>
+ <annotation cp="▼">پایین | پیکان | توپُر | مثلث | مثلث روبهپایین توپُر</annotation>
+ <annotation cp="▼" type="tts">مثلث روبهپایین توپُر</annotation>
+ <annotation cp="◊">خشت | لوزی | متوازیالاضلاع</annotation>
+ <annotation cp="◊" type="tts">لوزی</annotation>
+ <annotation cp="○">حلقه | دایره | دایره توخالی</annotation>
+ <annotation cp="○" type="tts">دایره توخالی</annotation>
+ <annotation cp="●">دایره | دایره توپُر</annotation>
+ <annotation cp="●" type="tts">دایره توپُر</annotation>
+ <annotation cp="◯">حلقه | دایره | دایره توخالی بزرگ</annotation>
+ <annotation cp="◯" type="tts">دایره توخالی بزرگ</annotation>
<annotation cp="⚧">تراجنسیتی | علامت تراجنسیتی</annotation>
<annotation cp="⚧" type="tts">علامت تراجنسیتی</annotation>
<annotation cp="🤌">اشاره با دست | انگشتان | جمعشده | سؤال | طنزآلود</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">پرچم رنگینکمان</annotation>
<annotation cp="🏴☠">پرچم دزدان دریایی | جولی راجر | چپاول | دزدان دریایی | غارت | گنج</annotation>
<annotation cp="🏴☠" type="tts">پرچم دزدان دریایی</annotation>
+ <annotation cp="£">ارز | پوند | پوند انگلیس | پوند مصر</annotation>
+ <annotation cp="£" type="tts">پوند</annotation>
+ <annotation cp="¥">ارز | ین | ین ژاپن | یوان | یوان چین</annotation>
+ <annotation cp="¥" type="tts">ین</annotation>
+ <annotation cp="€">ارز | یورو</annotation>
+ <annotation cp="€" type="tts">یورو</annotation>
+ <annotation cp="₹">ارز | روپیه | روپیه هند</annotation>
+ <annotation cp="₹" type="tts">روپیه هند</annotation>
+ <annotation cp="₽">ارز | روبل</annotation>
+ <annotation cp="₽" type="tts">روبل</annotation>
+ <annotation cp="¹">زِبَرنوشت، برنوشته | یک | یک زِبَرنوشت، یک برنوشته</annotation>
+ <annotation cp="¹" type="tts">یک زِبَرنوشت، یک برنوشته</annotation>
+ <annotation cp="²">بهتوان دو | دو | دو زِبَرنوشت، دو برنوشته | زِبَرنوشت، برنوشته</annotation>
+ <annotation cp="²" type="tts">دو زِبَرنوشت، دو برنوشته</annotation>
+ <annotation cp="³">بهتوان سه | زِبَرنوشت، برنوشته | سه | سه زِبَرنوشت، سه برنوشته</annotation>
+ <annotation cp="³" type="tts">سه زِبَرنوشت، سه برنوشته</annotation>
+ <annotation cp="µ">سنجه | نشان میکرو</annotation>
+ <annotation cp="µ" type="tts">نشان میکرو</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/fi.xml b/common/annotations/fi.xml
index bfc162e..0e10bfa 100644
--- a/common/annotations/fi.xml
+++ b/common/annotations/fi.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">keskitumma iho</annotation>
<annotation cp="🏿">emojin muokkaus | fitzpatrick | iho | sävy | tumma iho</annotation>
<annotation cp="🏿" type="tts">tumma iho</annotation>
+ <annotation cp="–">ajatusviiva | lyhyt ajatusviiva | n-viiva | viiva</annotation>
+ <annotation cp="–" type="tts">lyhyt ajatusviiva</annotation>
+ <annotation cp="—">ajatusviiva | m-viiva | pitkä ajatusviiva | viiva</annotation>
+ <annotation cp="—" type="tts">pitkä ajatusviiva</annotation>
+ <annotation cp="·">piste | piste keskellä | rivinkeskinen piste</annotation>
+ <annotation cp="·" type="tts">rivinkeskinen piste</annotation>
+ <annotation cp="«">kaksoisnuoli | kulma | kulmalainausmerkki | lainausmerkki | poisjääntimerkit | vasen</annotation>
+ <annotation cp="«" type="tts">vasen kulmalainausmerkki</annotation>
+ <annotation cp="»">kaksoisnuoli | kulma | kulmalainausmerkki | lainausmerkki | oikea | poisjääntimerkit</annotation>
+ <annotation cp="»" type="tts">oikea kulmalainausmerkki</annotation>
+ <annotation cp="§">kappale | osa | pykälämerkki</annotation>
+ <annotation cp="§" type="tts">pykälämerkki</annotation>
+ <annotation cp="†">risti | ristimerkki</annotation>
+ <annotation cp="†" type="tts">ristimerkki</annotation>
+ <annotation cp="‡">kaksoisristi | kaksoisristimerkki | risti | ristimerkki</annotation>
+ <annotation cp="‡" type="tts">kaksoisristimerkki</annotation>
+ <annotation cp="•">luetelmapallo | luettelomerkki | piste</annotation>
+ <annotation cp="•" type="tts">luettelomerkki</annotation>
+ <annotation cp="°">aste | tunti | vastaavuus</annotation>
+ <annotation cp="°" type="tts">aste</annotation>
+ <annotation cp="℗">ääni | äänite | äänitteen tekijänoikeus | tekijänoikeus</annotation>
+ <annotation cp="℗" type="tts">äänitteen tekijänoikeus</annotation>
+ <annotation cp="←">nuoli | vasemmalle | vasemmalle osoittava nuoli</annotation>
+ <annotation cp="←" type="tts">vasemmalle osoittava nuoli</annotation>
+ <annotation cp="→">nuoli | oikealle | oikealle osoittava nuoli</annotation>
+ <annotation cp="→" type="tts">oikealle osoittava nuoli</annotation>
+ <annotation cp="↑">nuoli | ylös | ylös osoittava nuoli</annotation>
+ <annotation cp="↑" type="tts">ylös osoittava nuoli</annotation>
+ <annotation cp="↓">alas | alas osoittava nuoli | nuoli</annotation>
+ <annotation cp="↓" type="tts">alas osoittava nuoli</annotation>
+ <annotation cp="⇅">alas | nuoli | ylös | ylös ja alas osoittavat nuolet</annotation>
+ <annotation cp="⇅" type="tts">ylös ja alas osoittavat nuolet</annotation>
+ <annotation cp="⇆">nuolet vasemmalle ja oikealle päällekkäin | nuoli | oikealle | vasemmalle</annotation>
+ <annotation cp="⇆" type="tts">nuolet vasemmalle ja oikealle päällekkäin</annotation>
+ <annotation cp="∆">kolmio | lisäys</annotation>
+ <annotation cp="∆" type="tts">lisäys</annotation>
+ <annotation cp="∇">kolmio | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">jäsenyys | joukko | kuuluu joukkoon | osa | sisältää</annotation>
+ <annotation cp="∈" type="tts">kuuluu joukkoon</annotation>
+ <annotation cp="÷">jaa | jakolasku | jakolaskumerkki | jakomerkki</annotation>
+ <annotation cp="÷" type="tts">jakolaskumerkki</annotation>
+ <annotation cp="×">kerro | kertaa | kertolasku | kertomerkki</annotation>
+ <annotation cp="×" type="tts">kertomerkki</annotation>
+ <annotation cp="⁻">miinus | yläindeksi</annotation>
+ <annotation cp="⁻" type="tts">yläindeksi miinus</annotation>
+ <annotation cp="√">juuri | juurilauseke | kantaluku | neliö | neliöjuuri | sievennys</annotation>
+ <annotation cp="√" type="tts">neliöjuuri</annotation>
+ <annotation cp="∞">ääretön | äärettömän merkki | äärettömyys | aina | ikuinen | rajaton | universaali</annotation>
+ <annotation cp="∞" type="tts">äärettömän merkki</annotation>
+ <annotation cp="∩">joukko | leikkaus</annotation>
+ <annotation cp="∩" type="tts">leikkaus</annotation>
+ <annotation cp="∪">joukko | kokoelma | yhdiste</annotation>
+ <annotation cp="∪" type="tts">yhdiste</annotation>
+ <annotation cp="≡">identtinen | kolminkertainen | sama | sama kuin</annotation>
+ <annotation cp="≡" type="tts">sama kuin</annotation>
+ <annotation cp="⊂">joukko | on osajoukko | osajoukko</annotation>
+ <annotation cp="⊂" type="tts">on osajoukko</annotation>
+ <annotation cp="▲">kolmio | musta ylös osoittava kolmio | nuoli | täytetty ylös osoittava kolmio | ylös</annotation>
+ <annotation cp="▲" type="tts">musta ylös osoittava kolmio</annotation>
+ <annotation cp="▼">alas | kolmio | musta alas osoittava kolmio | nuoli | täytetty alas osoittava kolmio</annotation>
+ <annotation cp="▼" type="tts">musta alas osoittava kolmio</annotation>
+ <annotation cp="◊">monikulmio | neljäkäs | vinoneliö</annotation>
+ <annotation cp="◊" type="tts">vinoneliö</annotation>
+ <annotation cp="○">kehä | tyhjä ympyrä | ympyrä</annotation>
+ <annotation cp="○" type="tts">tyhjä ympyrä</annotation>
+ <annotation cp="●">täytetty ympyrä | ympyrä</annotation>
+ <annotation cp="●" type="tts">täytetty ympyrä</annotation>
+ <annotation cp="◯">kehä | suuri tyhjä ympyrä | ympyrä</annotation>
+ <annotation cp="◯" type="tts">suuri tyhjä ympyrä</annotation>
<annotation cp="⚧">trans | transsukupuolinen | transsymboli</annotation>
<annotation cp="⚧" type="tts">transsymboli</annotation>
<annotation cp="🤌">käsi supussa | käsiele | kuulustelu | mitä | sarkastinen | sormet | supussa</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">sateenkaarilippu</annotation>
<annotation cp="🏴☠">aarre | lippu | merirosvolippu | pääkallolippu | rosvous | ryöstö</annotation>
<annotation cp="🏴☠" type="tts">merirosvolippu</annotation>
+ <annotation cp="£">GBP | punta | valuutta</annotation>
+ <annotation cp="£" type="tts">punta</annotation>
+ <annotation cp="¥">jeni | JPY | juan | valuutta</annotation>
+ <annotation cp="¥" type="tts">jeni</annotation>
+ <annotation cp="€">EUR | euro | valuutta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">INR | Intian rupia | rupia | valuutta</annotation>
+ <annotation cp="₹" type="tts">Intian rupia</annotation>
+ <annotation cp="₽">RUB | rupla | valuutta</annotation>
+ <annotation cp="₽" type="tts">rupla</annotation>
+ <annotation cp="¹">yksi | yläindeksi</annotation>
+ <annotation cp="¹" type="tts">yläindeksi yksi</annotation>
+ <annotation cp="²">kaksi | neliö | yläindeksi</annotation>
+ <annotation cp="²" type="tts">yläindeksi kaksi</annotation>
+ <annotation cp="³">kolme | kuutio | yläindeksi</annotation>
+ <annotation cp="³" type="tts">yläindeksi kolme</annotation>
+ <annotation cp="µ">mikro-merkki | mikromerkki | mitta | myy</annotation>
+ <annotation cp="µ" type="tts">mikromerkki</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/fil.xml b/common/annotations/fil.xml
index 962dace..de92f34 100644
--- a/common/annotations/fil.xml
+++ b/common/annotations/fil.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">katamtamang dark na kulay ng balat</annotation>
<annotation cp="🏿">dark na kulay ng balat | kulay ng balat | type 6</annotation>
<annotation cp="🏿" type="tts">dark na kulay ng balat</annotation>
+ <annotation cp="–">gatlang | maikling gatlang</annotation>
+ <annotation cp="–" type="tts">maikling gatlang</annotation>
+ <annotation cp="—">gatlang | mahabang gatlang</annotation>
+ <annotation cp="—" type="tts">mahabang gatlang</annotation>
+ <annotation cp="·">gitna | interpunct | nakagitnang tuldok | tuldok</annotation>
+ <annotation cp="·" type="tts">nakagitnang tuldok</annotation>
+ <annotation cp="«">anggulo | chevron | kaliwa | mga bracket | mga caret | pakaliwang guillemet | quote</annotation>
+ <annotation cp="«" type="tts">pakaliwang guillemet</annotation>
+ <annotation cp="»">anggulo | chevron | kanan | mga bracket | mga caret | pakanang guillemet | quote</annotation>
+ <annotation cp="»" type="tts">pakanang guillemet</annotation>
+ <annotation cp="§">bahagi | seksyon | silcrow | talata</annotation>
+ <annotation cp="§" type="tts">seksyon</annotation>
+ <annotation cp="†">dagger | dagger sign | obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">dagger sign</annotation>
+ <annotation cp="‡">dagger | doble | dobleng dagger sign | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">dobleng dagger sign</annotation>
+ <annotation cp="•">bullet | tuldok</annotation>
+ <annotation cp="•" type="tts">bullet</annotation>
+ <annotation cp="°">degree | oras | proof</annotation>
+ <annotation cp="°" type="tts">degree</annotation>
+ <annotation cp="℗">copyright | copyright ng recording ng tunog | recording | tunog</annotation>
+ <annotation cp="℗" type="tts">copyright ng recording ng tunog</annotation>
+ <annotation cp="←">arrow | arrow na nakaturo sa kaliwa | kaliwa</annotation>
+ <annotation cp="←" type="tts">arrow na nakaturo sa kaliwa</annotation>
+ <annotation cp="→">arrow | arrow na nakaturo sa kanan | kanan</annotation>
+ <annotation cp="→" type="tts">arrow na nakaturo sa kanan</annotation>
+ <annotation cp="↑">arrow | arrow na nakaturo pataas | pataas</annotation>
+ <annotation cp="↑" type="tts">arrow na nakaturo pataas</annotation>
+ <annotation cp="↓">arrow | arrow na nakaturo pababa | pababa</annotation>
+ <annotation cp="↓" type="tts">arrow na nakaturo pababa</annotation>
+ <annotation cp="⇅">arrow | pababa | pataas | pataas na arrow at pababang arrow</annotation>
+ <annotation cp="⇅" type="tts">pataas na arrow at pababang arrow</annotation>
+ <annotation cp="⇆">arrow | kaliwa | kanan | pakaliwa sa ibabaw ng pakanang arrow | pakaliwang arrow sa ibabaw ng pakanang arrow</annotation>
+ <annotation cp="⇆" type="tts">pakaliwa sa ibabaw ng pakanang arrow</annotation>
+ <annotation cp="∆">increment | tatsulok</annotation>
+ <annotation cp="∆" type="tts">increment</annotation>
+ <annotation cp="∇">nabla | tatsulok</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">element | element ng | membership | naglalaman ng | set</annotation>
+ <annotation cp="∈" type="tts">element ng</annotation>
+ <annotation cp="÷">division | division sign | mag-divide | obelus</annotation>
+ <annotation cp="÷" type="tts">division sign</annotation>
+ <annotation cp="×">mag-multiply | multiplication | multiplication sign | times</annotation>
+ <annotation cp="×" type="tts">multiplication sign</annotation>
+ <annotation cp="⁻">minus | superscript</annotation>
+ <annotation cp="⁻" type="tts">superscript minus</annotation>
+ <annotation cp="√">radical | radix | root | square | surd</annotation>
+ <annotation cp="√" type="tts">square root</annotation>
+ <annotation cp="∞">infinity | infinity sign</annotation>
+ <annotation cp="∞" type="tts">infinity sign</annotation>
+ <annotation cp="∩">intersection | set</annotation>
+ <annotation cp="∩" type="tts">intersection</annotation>
+ <annotation cp="∪">koleksyon | set | union</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">eksakto | katulad | katulad ng | triple</annotation>
+ <annotation cp="≡" type="tts">katulad ng</annotation>
+ <annotation cp="⊂">set | subset | subset ng</annotation>
+ <annotation cp="⊂" type="tts">subset ng</annotation>
+ <annotation cp="▲">arrow | may fill | pataas | pataas na tatsulok na may fill | tatsulok</annotation>
+ <annotation cp="▲" type="tts">pataas na tatsulok na may fill</annotation>
+ <annotation cp="▼">arrow | may fill | pababa | pababang tatsulok na may fill | tatsulok</annotation>
+ <annotation cp="▼" type="tts">pababang tatsulok na may fill</annotation>
+ <annotation cp="◊">diamante | lozenge | rhombus</annotation>
+ <annotation cp="◊" type="tts">lozenge</annotation>
+ <annotation cp="○">bilog | singsing | walang lamang bilog</annotation>
+ <annotation cp="○" type="tts">walang lamang bilog</annotation>
+ <annotation cp="●">bilog | may fill na bilog</annotation>
+ <annotation cp="●" type="tts">may fill na bilog</annotation>
+ <annotation cp="◯">bilog | malaking walang lamang bilog | singsing</annotation>
+ <annotation cp="◯" type="tts">malaking walang lamang bilog</annotation>
<annotation cp="⚧">simbolo ng transgender | transgender</annotation>
<annotation cp="⚧" type="tts">simbolo ng transgender</annotation>
<annotation cp="🤌">daliri | hand gesture | pakurot | pakurot na daliri</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bahagharing bandila</annotation>
<annotation cp="🏴☠">bandila ng pirata | Jolly Roger | kayamanan | magnanakaw | pirata</annotation>
<annotation cp="🏴☠" type="tts">bandila ng pirata</annotation>
+ <annotation cp="£">EGP | GBP | pera | pound</annotation>
+ <annotation cp="£" type="tts">pound</annotation>
+ <annotation cp="¥">CNY | JPY | pera | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | pera</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indian rupee | pera | rupee</annotation>
+ <annotation cp="₹" type="tts">indian rupee</annotation>
+ <annotation cp="₽">pera | ruble</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">isa | superscript | superscript na isa</annotation>
+ <annotation cp="¹" type="tts">superscript na isa</annotation>
+ <annotation cp="²">dalawa | squared | superscript | superscript na dalawa</annotation>
+ <annotation cp="²" type="tts">superscript na dalawa</annotation>
+ <annotation cp="³">cubed | superscript | superscript na tatlo | tatlo</annotation>
+ <annotation cp="³" type="tts">superscript na tatlo</annotation>
+ <annotation cp="µ">micro sign | sukat</annotation>
+ <annotation cp="µ" type="tts">micro sign</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/fr.xml b/common/annotations/fr.xml
index 3c41510..3bb12c4 100644
--- a/common/annotations/fr.xml
+++ b/common/annotations/fr.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">peau mate</annotation>
<annotation cp="🏿">peau | peau foncée | peau mate</annotation>
<annotation cp="🏿" type="tts">peau foncée</annotation>
+ <annotation cp="–">demi-cadratin | tiret</annotation>
+ <annotation cp="–" type="tts">tiret demi-cadratin</annotation>
+ <annotation cp="—">cadratin | tiret</annotation>
+ <annotation cp="—" type="tts">tiret cadratin</annotation>
+ <annotation cp="·">médian | milieu | point</annotation>
+ <annotation cp="·" type="tts">point médian</annotation>
+ <annotation cp="«">anti-lambda | chevron | citation | crochet oblique | crochets | gauche | guillemet gauche</annotation>
+ <annotation cp="«" type="tts">guillemet gauche</annotation>
+ <annotation cp="»">anti-lambda | chevron | citation | crochet oblique | crochets | droit | guillemet droit</annotation>
+ <annotation cp="»" type="tts">guillemet droit</annotation>
+ <annotation cp="§">paragraphe | partie | section | symbole</annotation>
+ <annotation cp="§" type="tts">section</annotation>
+ <annotation cp="†">dague | obèle | obélus</annotation>
+ <annotation cp="†" type="tts">obèle</annotation>
+ <annotation cp="‡">dague | double | obèle | obélus</annotation>
+ <annotation cp="‡" type="tts">double obèle</annotation>
+ <annotation cp="•">point | puce</annotation>
+ <annotation cp="•" type="tts">puce</annotation>
+ <annotation cp="°">degré | heure | preuve</annotation>
+ <annotation cp="°" type="tts">degré</annotation>
+ <annotation cp="℗">copyright | enregistrement | phonographique</annotation>
+ <annotation cp="℗" type="tts">copyright phonographique</annotation>
+ <annotation cp="←">flèche | flèche vers la gauche | gauche</annotation>
+ <annotation cp="←" type="tts">flèche vers la gauche</annotation>
+ <annotation cp="→">droite | flèche | flèche vers la droite</annotation>
+ <annotation cp="→" type="tts">flèche vers la droite</annotation>
+ <annotation cp="↑">flèche | flèche vers le haut | haut</annotation>
+ <annotation cp="↑" type="tts">flèche vers le haut</annotation>
+ <annotation cp="↓">bas | flèche | flèche vers le bas</annotation>
+ <annotation cp="↓" type="tts">flèche vers le bas</annotation>
+ <annotation cp="⇅">bas | flèche | flèches vers le haut et vers le bas | haut</annotation>
+ <annotation cp="⇅" type="tts">flèches vers le haut et vers le bas</annotation>
+ <annotation cp="⇆">droite | flèche | flèche gauche au-dessus de flèche droite | gauche</annotation>
+ <annotation cp="⇆" type="tts">flèche gauche au-dessus de flèche droite</annotation>
+ <annotation cp="∆">incrément | triangle</annotation>
+ <annotation cp="∆" type="tts">incrément</annotation>
+ <annotation cp="∇">nabla | triangle</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">appartenance | contient | élément | élément de | ensemble</annotation>
+ <annotation cp="∈" type="tts">élément de</annotation>
+ <annotation cp="÷">diviser | division | obélus | signe de division</annotation>
+ <annotation cp="÷" type="tts">signe de division</annotation>
+ <annotation cp="×">fois | multiplication | multiplier | signe de multiplication</annotation>
+ <annotation cp="×" type="tts">signe de multiplication</annotation>
+ <annotation cp="⁻">exposant | moins</annotation>
+ <annotation cp="⁻" type="tts">exposant moins</annotation>
+ <annotation cp="√">base | carrée | nombre sourd | racine | radical</annotation>
+ <annotation cp="√" type="tts">racine carrée</annotation>
+ <annotation cp="∞">infini | symbole de l’infini</annotation>
+ <annotation cp="∞" type="tts">symbole de l’infini</annotation>
+ <annotation cp="∩">ensemble | intersection</annotation>
+ <annotation cp="∩" type="tts">intersection</annotation>
+ <annotation cp="∪">collection | ensemble | union</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">exact | identique | identique à | triple</annotation>
+ <annotation cp="≡" type="tts">identique à</annotation>
+ <annotation cp="⊂">ensemble | sous-ensemble | sous-ensemble de</annotation>
+ <annotation cp="⊂" type="tts">sous-ensemble de</annotation>
+ <annotation cp="▲">flèche | haut | plein | triangle | triangle plein vers le haut</annotation>
+ <annotation cp="▲" type="tts">triangle plein vers le haut</annotation>
+ <annotation cp="▼">bas | flèche | plein | triangle | triangle plein vers le bas</annotation>
+ <annotation cp="▼" type="tts">triangle plein vers le bas</annotation>
+ <annotation cp="◊">losange | rhombe</annotation>
+ <annotation cp="◊" type="tts">losange</annotation>
+ <annotation cp="○">anneau | cercle | cercle vide</annotation>
+ <annotation cp="○" type="tts">cercle vide</annotation>
+ <annotation cp="●">cercle | cercle plein</annotation>
+ <annotation cp="●" type="tts">cercle plein</annotation>
+ <annotation cp="◯">anneau | cercle | grand cercle vide</annotation>
+ <annotation cp="◯" type="tts">grand cercle vide</annotation>
<annotation cp="⚧">symbole de la communauté transgenre | transgenre</annotation>
<annotation cp="⚧" type="tts">symbole de la communauté transgenre</annotation>
<annotation cp="🤌">argumentation | bout des doigts joints | doigts | geste | main | parler avec les mains</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">drapeau arc-en-ciel</annotation>
<annotation cp="🏴☠">drapeau de pirate | pillage | piller | pirate | trésor</annotation>
<annotation cp="🏴☠" type="tts">drapeau de pirate</annotation>
+ <annotation cp="£">devise | EGP | GBP | livre</annotation>
+ <annotation cp="£" type="tts">livre</annotation>
+ <annotation cp="¥">CNY | devise | JPY | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">devise | EUR | euro</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">devise | roupie | roupie indienne</annotation>
+ <annotation cp="₹" type="tts">roupie indienne</annotation>
+ <annotation cp="₽">devise | rouble</annotation>
+ <annotation cp="₽" type="tts">rouble</annotation>
+ <annotation cp="¹">exposant | un</annotation>
+ <annotation cp="¹" type="tts">exposant un</annotation>
+ <annotation cp="²">au carré | deux | exposant</annotation>
+ <annotation cp="²" type="tts">exposant deux</annotation>
+ <annotation cp="³">au cube | exposant | trois</annotation>
+ <annotation cp="³" type="tts">exposant trois</annotation>
+ <annotation cp="µ">mesure | symbole micro</annotation>
+ <annotation cp="µ" type="tts">symbole micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/fr_CA.xml b/common/annotations/fr_CA.xml
index b3b5618..e31a192 100644
--- a/common/annotations/fr_CA.xml
+++ b/common/annotations/fr_CA.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">peau modérément foncée</annotation>
<annotation cp="🏿">peau | peau foncée | type 6</annotation>
<annotation cp="🏿" type="tts">peau foncée</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">↑↑↑</annotation>
+ <annotation cp="←" type="tts">↑↑↑</annotation>
+ <annotation cp="→">↑↑↑</annotation>
+ <annotation cp="→" type="tts">↑↑↑</annotation>
+ <annotation cp="↑">↑↑↑</annotation>
+ <annotation cp="↑" type="tts">↑↑↑</annotation>
+ <annotation cp="↓">↑↑↑</annotation>
+ <annotation cp="↓" type="tts">↑↑↑</annotation>
+ <annotation cp="⇅">↑↑↑</annotation>
+ <annotation cp="⇅" type="tts">↑↑↑</annotation>
+ <annotation cp="⇆">↑↑↑</annotation>
+ <annotation cp="⇆" type="tts">↑↑↑</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">division</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">multiplication</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">↑↑↑</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">↑↑↑</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧">symbole de la communauté transgenre | symbole transgenre | transgenre</annotation>
<annotation cp="⚧" type="tts">symbole transgenre</annotation>
<annotation cp="🤌">geste de la main | interrogation | main qui interroge | sarcastique</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">↑↑↑</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">↑↑↑</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ga.xml b/common/annotations/ga.xml
index 921917e..1d3a0cc 100644
--- a/common/annotations/ga.xml
+++ b/common/annotations/ga.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ton cnis meándorcha</annotation>
<annotation cp="🏿">cineál 6 | ton cnis | ton cnis dorcha</annotation>
<annotation cp="🏿" type="tts">ton cnis dorcha</annotation>
+ <annotation cp="–" draft="contributed">ein-dais</annotation>
+ <annotation cp="–" type="tts" draft="contributed">ein-dais</annotation>
+ <annotation cp="—" draft="contributed">eim-dais</annotation>
+ <annotation cp="—" type="tts" draft="contributed">eim-dais</annotation>
+ <annotation cp="·" draft="contributed">lárphonc</annotation>
+ <annotation cp="·" type="tts" draft="contributed">lárphonc</annotation>
+ <annotation cp="«" draft="contributed">rachtán tosaigh</annotation>
+ <annotation cp="«" type="tts" draft="contributed">rachtán tosaigh</annotation>
+ <annotation cp="»" draft="contributed">rachtán deiridh</annotation>
+ <annotation cp="»" type="tts" draft="contributed">rachtán deiridh</annotation>
+ <annotation cp="§" draft="contributed">rannán</annotation>
+ <annotation cp="§" type="tts" draft="contributed">rannán</annotation>
+ <annotation cp="†" draft="contributed">comhartha miodóige</annotation>
+ <annotation cp="†" type="tts" draft="contributed">comhartha miodóige</annotation>
+ <annotation cp="‡" draft="contributed">comhartha miodóige dúbailte</annotation>
+ <annotation cp="‡" type="tts" draft="contributed">comhartha miodóige dúbailte</annotation>
+ <annotation cp="•" draft="contributed">urchar</annotation>
+ <annotation cp="•" type="tts" draft="contributed">urchar</annotation>
+ <annotation cp="°" draft="contributed">céim</annotation>
+ <annotation cp="°" type="tts" draft="contributed">céim</annotation>
+ <annotation cp="℗" draft="contributed">cóipcheart taifid fuaime</annotation>
+ <annotation cp="℗" type="tts" draft="contributed">cóipcheart taifid fuaime</annotation>
+ <annotation cp="←" draft="contributed">saighead chlé</annotation>
+ <annotation cp="←" type="tts" draft="contributed">saighead chlé</annotation>
+ <annotation cp="→" draft="contributed">saighead dheas</annotation>
+ <annotation cp="→" type="tts" draft="contributed">saighead dheas</annotation>
+ <annotation cp="↑" draft="contributed">saighead dhírithe suas</annotation>
+ <annotation cp="↑" type="tts" draft="contributed">saighead dhírithe suas</annotation>
+ <annotation cp="↓" draft="contributed">saighead dhírithe síos</annotation>
+ <annotation cp="↓" type="tts" draft="contributed">saighead dhírithe síos</annotation>
+ <annotation cp="⇅" draft="contributed">saighead suas agus saighead síos</annotation>
+ <annotation cp="⇅" type="tts" draft="contributed">saighead suas agus saighead síos</annotation>
+ <annotation cp="⇆" draft="contributed">saighead chlé os cionn saighead dheas</annotation>
+ <annotation cp="⇆" type="tts" draft="contributed">saighead chlé os cionn saighead dheas</annotation>
+ <annotation cp="∆" draft="contributed">incrimint</annotation>
+ <annotation cp="∆" type="tts" draft="contributed">incrimint</annotation>
+ <annotation cp="∇" draft="contributed">nabla</annotation>
+ <annotation cp="∇" type="tts" draft="contributed">nabla</annotation>
+ <annotation cp="∈" draft="contributed">ball de</annotation>
+ <annotation cp="∈" type="tts" draft="contributed">ball de</annotation>
+ <annotation cp="÷" draft="contributed">comhartha roinnte | oibil | roinn | roinnt</annotation>
+ <annotation cp="÷" type="tts" draft="contributed">↑↑↑</annotation>
+ <annotation cp="×" draft="contributed">comhartha iolraithe</annotation>
+ <annotation cp="×" type="tts" draft="contributed">comhartha iolraithe</annotation>
+ <annotation cp="⁻" draft="contributed">lúide forscríofa</annotation>
+ <annotation cp="⁻" type="tts" draft="contributed">lúide forscríofa</annotation>
+ <annotation cp="√" draft="contributed">fréamh chearnach</annotation>
+ <annotation cp="√" type="tts" draft="contributed">fréamh chearnach</annotation>
+ <annotation cp="∞" draft="contributed">comhartha éigríche</annotation>
+ <annotation cp="∞" type="tts" draft="contributed">comhartha éigríche</annotation>
+ <annotation cp="∩" draft="contributed">idirmhír</annotation>
+ <annotation cp="∩" type="tts" draft="contributed">idirmhír</annotation>
+ <annotation cp="∪" draft="contributed">aontas</annotation>
+ <annotation cp="∪" type="tts" draft="contributed">aontas</annotation>
+ <annotation cp="≡" draft="contributed">comhionann le</annotation>
+ <annotation cp="≡" type="tts" draft="contributed">comhionann le</annotation>
+ <annotation cp="⊂" draft="contributed">fo-thacar de chuid</annotation>
+ <annotation cp="⊂" type="tts" draft="contributed">fo-thacar de chuid</annotation>
+ <annotation cp="▲" draft="contributed">triantán líonta lena rinn suas</annotation>
+ <annotation cp="▲" type="tts" draft="contributed">triantán líonta lena rinn suas</annotation>
+ <annotation cp="▼" draft="contributed">triantán líonta lena rinn síos</annotation>
+ <annotation cp="▼" type="tts" draft="contributed">triantán líonta lena rinn síos</annotation>
+ <annotation cp="◊" draft="contributed">muileata</annotation>
+ <annotation cp="◊" type="tts" draft="contributed">muileata</annotation>
+ <annotation cp="○" draft="contributed">ciorcal toll</annotation>
+ <annotation cp="○" type="tts" draft="contributed">ciorcal toll</annotation>
+ <annotation cp="●" draft="contributed">ciorcal líonta</annotation>
+ <annotation cp="●" type="tts" draft="contributed">ciorcal líonta</annotation>
+ <annotation cp="◯" draft="contributed">ciorcal mór toll</annotation>
+ <annotation cp="◯" type="tts" draft="contributed">ciorcal mór toll</annotation>
<annotation cp="⚧" draft="contributed">siombail thrasinsnceach</annotation>
<annotation cp="⚧" type="tts" draft="contributed">siombail thrasinsnceach</annotation>
<annotation cp="🤌" draft="contributed">meára tnáite</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bratach ildaite</annotation>
<annotation cp="🏴☠">argain | bratach foghlaithe | foghlaí | Jolly Roger | seoid</annotation>
<annotation cp="🏴☠" type="tts">bratach foghlaithe</annotation>
+ <annotation cp="£" draft="contributed">punt</annotation>
+ <annotation cp="£" type="tts" draft="contributed">punt</annotation>
+ <annotation cp="¥" draft="contributed">yen</annotation>
+ <annotation cp="¥" type="tts" draft="contributed">yen</annotation>
+ <annotation cp="€" draft="contributed">euro</annotation>
+ <annotation cp="€" type="tts" draft="contributed">euro</annotation>
+ <annotation cp="₹" draft="contributed">rúipí na hIndia</annotation>
+ <annotation cp="₹" type="tts" draft="contributed">rúipí na hIndia</annotation>
+ <annotation cp="₽" draft="contributed">rúbal</annotation>
+ <annotation cp="₽" type="tts" draft="contributed">rúbal</annotation>
+ <annotation cp="¹" draft="contributed">aon forscríofa</annotation>
+ <annotation cp="¹" type="tts" draft="contributed">aon forscríofa</annotation>
+ <annotation cp="²" draft="contributed">dó forscríofa</annotation>
+ <annotation cp="²" type="tts" draft="contributed">dó forscríofa</annotation>
+ <annotation cp="³" draft="contributed">trí forscríofa</annotation>
+ <annotation cp="³" type="tts" draft="contributed">trí forscríofa</annotation>
+ <annotation cp="µ" draft="contributed">comhartha micre</annotation>
+ <annotation cp="µ" type="tts" draft="contributed">comhartha micre</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/gd.xml b/common/annotations/gd.xml
index 9796268..49d0504 100644
--- a/common/annotations/gd.xml
+++ b/common/annotations/gd.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">tòna meadhanach doilleir a’ chraicinn</annotation>
<annotation cp="🏿">seòrsa 6 | tòna a’ chraicinn | tòna doilleir a’ chraicinn</annotation>
<annotation cp="🏿" type="tts">tòna doilleir a’ chraicinn</annotation>
+ <annotation cp="–">dais | en</annotation>
+ <annotation cp="–" type="tts">dais en</annotation>
+ <annotation cp="—">dais | em</annotation>
+ <annotation cp="—" type="tts">dais em</annotation>
+ <annotation cp="·">dot sa mheadhan | dotag | dotag meadhanach | eadar-phuing | meadhan</annotation>
+ <annotation cp="·" type="tts">dot sa mheadhan</annotation>
+ <annotation cp="«">camag | carait | ceàrn | chevron | clì | eadar-ràdhan Frangach dhan taobh chlì | guillemet | iomradh | luaidh | saidh</annotation>
+ <annotation cp="«" type="tts">eadar-ràdhan Frangach dhan taobh chlì</annotation>
+ <annotation cp="»">camag | carait | ceàrn | chevron | deas | eadar-ràdhan Frangach dhan taobh deas | guillemet | iomradh | luaidh | saidh</annotation>
+ <annotation cp="»" type="tts">eadar-ràdhan Frangach dhan taobh deas</annotation>
+ <annotation cp="§">earrann | pàirt | paragraf | silcrow</annotation>
+ <annotation cp="§" type="tts">earrann</annotation>
+ <annotation cp="†">biodag | obelisk | obelus | samhla biodaig | tursa</annotation>
+ <annotation cp="†" type="tts">samhla biodaig</annotation>
+ <annotation cp="‡">biodag | dùbailte | obelisk | obelus | samhla biodaig dùbailte | tursa</annotation>
+ <annotation cp="‡" type="tts">samhla biodaig dùbailte</annotation>
+ <annotation cp="•">dotag | peilear</annotation>
+ <annotation cp="•" type="tts">peilear</annotation>
+ <annotation cp="°">ceum | dearbhadh | uair</annotation>
+ <annotation cp="°" type="tts">ceum</annotation>
+ <annotation cp="℗">ceòl | clàr | còir-lethbhreac | còir-lethbhreac air clàradh fuaime</annotation>
+ <annotation cp="℗" type="tts">còir-lethbhreac air clàradh fuaime</annotation>
+ <annotation cp="←">clì | saighead | saighead a’ tomhadh dhan taobh chlì</annotation>
+ <annotation cp="←" type="tts">saighead a’ tomhadh dhan taobh chlì</annotation>
+ <annotation cp="→">deas | saighead | saighead a’ tomhadh dhan taobh deas</annotation>
+ <annotation cp="→" type="tts">saighead a’ tomhadh dhan taobh deas</annotation>
+ <annotation cp="↑">saighead | saighead a’ tomhadh suas | suas</annotation>
+ <annotation cp="↑" type="tts">saighead a’ tomhadh suas</annotation>
+ <annotation cp="↓">saighead | saighead a’ tomhadh sìos | sìos</annotation>
+ <annotation cp="↓" type="tts">saighead a’ tomhadh sìos</annotation>
+ <annotation cp="⇅">dà shaighead a’ tomhadh suas is sìos | saighdean a’ tomhadh suas is sìos | saighead | sìos | suas</annotation>
+ <annotation cp="⇅" type="tts">dà shaighead a’ tomhadh suas is sìos</annotation>
+ <annotation cp="⇆">clì | dà shaighead dhan taobh chlì is deas | deas | saighdean a’ tomhadh dhan taobh chlì is deas | saighead</annotation>
+ <annotation cp="⇆" type="tts">dà shaighead dhan taobh chlì is deas</annotation>
+ <annotation cp="∆">ioncramaid | meudachadh | meudaich | triantan</annotation>
+ <annotation cp="∆" type="tts">ioncramaid</annotation>
+ <annotation cp="∇">dìochramaid | lughdachadh | lughdaich | nabla | triantan</annotation>
+ <annotation cp="∇" type="tts">dìochramaid</annotation>
+ <annotation cp="∈">am broinn | ballrachd | eileamaid | eileamaid de | eileamaid dhe | na eileamaid de | seata</annotation>
+ <annotation cp="∈" type="tts">na eileamaid de</annotation>
+ <annotation cp="÷">obelus | roinn | roinneadh | samhla roinnidh</annotation>
+ <annotation cp="÷" type="tts">samhla roinnidh</annotation>
+ <annotation cp="×">iomadachadh | iomadaich | samhla iomadachaidh</annotation>
+ <annotation cp="×" type="tts">samhla iomadachaidh</annotation>
+ <annotation cp="⁻">minus | mìonas | os-sgrìobhte</annotation>
+ <annotation cp="⁻" type="tts">minus os-sgrìobhte</annotation>
+ <annotation cp="√">ceàrnagach | freumh | radaigeach | radix | surd</annotation>
+ <annotation cp="√" type="tts">freumh ceàrnagach</annotation>
+ <annotation cp="∞">neo-chrìochnachd | samhla neo-chrìochnachd</annotation>
+ <annotation cp="∞" type="tts">samhla neo-chrìochnachd</annotation>
+ <annotation cp="∩">eadar-ghearradh | seata | trasnadh</annotation>
+ <annotation cp="∩" type="tts">eadar-ghearradh</annotation>
+ <annotation cp="∪">aonadh | cruinneachadh | seata</annotation>
+ <annotation cp="∪" type="tts">aonadh</annotation>
+ <annotation cp="≡">co-ionnann | ionnannach ri | pongail | trìoblaichte</annotation>
+ <annotation cp="≡" type="tts">ionnannach ri</annotation>
+ <annotation cp="⊂">fo-sheata | fo-sheata de | fo-sheata dhe | seata</annotation>
+ <annotation cp="⊂" type="tts">fo-sheata de</annotation>
+ <annotation cp="▲">lìonta | saighead | suas | triantan | triantan lìonta a’ tomhadh sìos | triantan lìonta a’ tomhadh suas</annotation>
+ <annotation cp="▲" type="tts">triantan lìonta a’ tomhadh suas</annotation>
+ <annotation cp="▼">lìonta | saighead | sìos | triantan | triantan lìonta a’ tomhadh sìos</annotation>
+ <annotation cp="▼" type="tts">triantan lìonta a’ tomhadh sìos</annotation>
+ <annotation cp="◊">daoimean | lasaingear | loisin | losaindear | rombas</annotation>
+ <annotation cp="◊" type="tts">losaindear</annotation>
+ <annotation cp="○">cearcall | cearcall falamh | fàinne</annotation>
+ <annotation cp="○" type="tts">cearcall falamh</annotation>
+ <annotation cp="●">cearcall | lìonta</annotation>
+ <annotation cp="●" type="tts">cearcall lìonta</annotation>
+ <annotation cp="◯">cearcall | cearcall mòr falamh | fàinne</annotation>
+ <annotation cp="◯" type="tts">cearcall mòr falamh</annotation>
<annotation cp="⚧">samhla tar-ghnèitheach | tar-ghnèitheach</annotation>
<annotation cp="⚧" type="tts">samhla tar-ghnèitheach</annotation>
<annotation cp="🤌">beumach | beur | ceist | corrag | cruadhagan | crudhagan | gluasad làimhe | meòir | meur | tearrachdail</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">bratach bogha-froise</annotation>
<annotation cp="🏴☠">bratach spùinneadair | creach | Jolly Roger | spùinn | spùinneadair | ulaidh</annotation>
<annotation cp="🏴☠" type="tts">bratach spùinneadair</annotation>
+ <annotation cp="£">airgeadra | EGP | GBP | not | punnd | punnd Sasannach</annotation>
+ <annotation cp="£" type="tts">punnd</annotation>
+ <annotation cp="¥">airgeadra | CNY | JPY | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">airgeadra | Eòro | EUR</annotation>
+ <annotation cp="€" type="tts">Eòro</annotation>
+ <annotation cp="₹">airgeadra | rupee | rupee Innseanach | rupee nan Innseachan</annotation>
+ <annotation cp="₹" type="tts">rupee Innseanach</annotation>
+ <annotation cp="₽">airgeadra | rùbal</annotation>
+ <annotation cp="₽" type="tts">rùbal</annotation>
+ <annotation cp="¹">a h-aon os-sgrìobhte | aon | os-sgrìobhte</annotation>
+ <annotation cp="¹" type="tts">a h-aon os-sgrìobhte</annotation>
+ <annotation cp="²">a dhà os-sgrìobhte | ceàrnagach | ceàrnagaichte | dà | os-sgrìobhte</annotation>
+ <annotation cp="²" type="tts">a dhà os-sgrìobhte</annotation>
+ <annotation cp="³">a trì os-sgrìobhte | ciùbach | ciùbaichte | os-sgrìobhte | trì</annotation>
+ <annotation cp="³" type="tts">a trì os-sgrìobhte</annotation>
+ <annotation cp="µ">samhla micreo | samhla µ | tomhas</annotation>
+ <annotation cp="µ" type="tts">samhla µ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/gl.xml b/common/annotations/gl.xml
index ae42445..49fdbd6 100644
--- a/common/annotations/gl.xml
+++ b/common/annotations/gl.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ton de pel escuro</annotation>
<annotation cp="🏿">tipo 6 | ton de pel | ton de pel moi escuro</annotation>
<annotation cp="🏿" type="tts">ton de pel moi escuro</annotation>
+ <annotation cp="–">guión | longo | menos | signo menos | trazo longo</annotation>
+ <annotation cp="–" type="tts">trazo longo</annotation>
+ <annotation cp="—">longo | raia | trazo</annotation>
+ <annotation cp="—" type="tts">raia</annotation>
+ <annotation cp="·">interpunto | medio | punto medio</annotation>
+ <annotation cp="·" type="tts">punto medio</annotation>
+ <annotation cp="«">angulares | apertura | aspas angulares esquerdas | cita | comiñas | esquerda | latinas</annotation>
+ <annotation cp="«" type="tts">aspas angulares esquerdas</annotation>
+ <annotation cp="»">angulares | aspas angulares dereitas | cita | comiñas | dereita | latinas | peche</annotation>
+ <annotation cp="»" type="tts">aspas angulares dereitas</annotation>
+ <annotation cp="§">parágrafo | parte | sección | signo de sección</annotation>
+ <annotation cp="§" type="tts">sección</annotation>
+ <annotation cp="†">cruz | división | obelisco | signo da cruz</annotation>
+ <annotation cp="†" type="tts">signo da cruz</annotation>
+ <annotation cp="‡">cruz | división | dobre | obelisco | signo da dobre cruz</annotation>
+ <annotation cp="‡" type="tts">signo da dobre cruz</annotation>
+ <annotation cp="•">punto | viñeta</annotation>
+ <annotation cp="•" type="tts">viñeta</annotation>
+ <annotation cp="°">gradación | grao | hora</annotation>
+ <annotation cp="°" type="tts">grao</annotation>
+ <annotation cp="℗">copyright de gravación sonora | gravación | son</annotation>
+ <annotation cp="℗" type="tts">copyright de gravación sonora</annotation>
+ <annotation cp="←">esquerda | frecha apuntando cara a esquerda</annotation>
+ <annotation cp="←" type="tts">frecha apuntando cara a esquerda</annotation>
+ <annotation cp="→">dereita | frecha apuntando cara a dereita</annotation>
+ <annotation cp="→" type="tts">frecha apuntando cara a dereita</annotation>
+ <annotation cp="↑">arriba | frecha apuntando cara arriba</annotation>
+ <annotation cp="↑" type="tts">frecha apuntando cara arriba</annotation>
+ <annotation cp="↓">abaixo | frecha apuntando cara abaixo</annotation>
+ <annotation cp="↓" type="tts">frecha apuntando cara abaixo</annotation>
+ <annotation cp="⇅">abaixo | arriba | frechas apuntando cara arriba e cara abaixo</annotation>
+ <annotation cp="⇅" type="tts">frechas apuntando cara arriba e cara abaixo</annotation>
+ <annotation cp="⇆">dereita | esquerda | frechas cara a esquerda e dereita</annotation>
+ <annotation cp="⇆" type="tts">frechas cara a esquerda e dereita</annotation>
+ <annotation cp="∆">incremento | triángulo</annotation>
+ <annotation cp="∆" type="tts">incremento</annotation>
+ <annotation cp="∇">gradiente | nabla | triángulo</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">contén | conxunto | elemento de | membro</annotation>
+ <annotation cp="∈" type="tts">elemento de</annotation>
+ <annotation cp="÷">dividir | división | óbelo | signo de división</annotation>
+ <annotation cp="÷" type="tts">signo de división</annotation>
+ <annotation cp="×">multiplicación | multiplicar | signo de multiplicación | veces</annotation>
+ <annotation cp="×" type="tts">signo de multiplicación</annotation>
+ <annotation cp="⁻">menos en superíndice | superíndice</annotation>
+ <annotation cp="⁻" type="tts">menos en superíndice</annotation>
+ <annotation cp="√">cadrada | radical | radix | raíz cadrada | raíz enésima</annotation>
+ <annotation cp="√" type="tts">raíz cadrada</annotation>
+ <annotation cp="∞">infinito | signo do infinito</annotation>
+ <annotation cp="∞" type="tts">signo do infinito</annotation>
+ <annotation cp="∩">conxunto | intersección</annotation>
+ <annotation cp="∩" type="tts">intersección</annotation>
+ <annotation cp="∪">colección | conxunto | unión</annotation>
+ <annotation cp="∪" type="tts">unión</annotation>
+ <annotation cp="≡">exacto | idéntico a | triplo</annotation>
+ <annotation cp="≡" type="tts">idéntico a</annotation>
+ <annotation cp="⊂">conxunto | subconxunto de</annotation>
+ <annotation cp="⊂" type="tts">subconxunto de</annotation>
+ <annotation cp="▲">arriba | enchido | frecha | triángulo enchido apuntando cara arriba</annotation>
+ <annotation cp="▲" type="tts">triángulo enchido apuntando cara arriba</annotation>
+ <annotation cp="▼">abaixo | enchido | frecha | triángulo enchido apuntando cara abaixo</annotation>
+ <annotation cp="▼" type="tts">triángulo enchido apuntando cara abaixo</annotation>
+ <annotation cp="◊">diamante | losanxe | rombo</annotation>
+ <annotation cp="◊" type="tts">losanxe</annotation>
+ <annotation cp="○">anel | baleiro | círculo baleiro</annotation>
+ <annotation cp="○" type="tts">círculo baleiro</annotation>
+ <annotation cp="●">círculo | círculo enchido</annotation>
+ <annotation cp="●" type="tts">círculo enchido</annotation>
+ <annotation cp="◯">anel | baleiro | círculo baleiro grande</annotation>
+ <annotation cp="◯" type="tts">círculo baleiro grande</annotation>
<annotation cp="⚧">sexo | símbolo de transxénero | transxénero | xénero</annotation>
<annotation cp="⚧" type="tts">símbolo de transxénero</annotation>
<annotation cp="🤌">a tope | ateigado | de bote en bote | petado | xesto de "ateigado"</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bandeira do arco da vella</annotation>
<annotation cp="🏴☠">bandeira pirata | pillaxe | pirata | saqueo | tesouro</annotation>
<annotation cp="🏴☠" type="tts">bandeira pirata</annotation>
+ <annotation cp="£">divisa | EGP | GBP | libra | libra (divisa)</annotation>
+ <annotation cp="£" type="tts">libra (divisa)</annotation>
+ <annotation cp="¥">CNY | divisa | ien | iuan | JPY</annotation>
+ <annotation cp="¥" type="tts">ien</annotation>
+ <annotation cp="€">divisa | EUR | euro</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">divisa | india | rupia india</annotation>
+ <annotation cp="₹" type="tts">rupia india</annotation>
+ <annotation cp="₽">divisa | rublo</annotation>
+ <annotation cp="₽" type="tts">rublo</annotation>
+ <annotation cp="¹">1 | superíndice | un en superíndice</annotation>
+ <annotation cp="¹" type="tts">un en superíndice</annotation>
+ <annotation cp="²">2 | cadrado | dous en superíndice | superíndice</annotation>
+ <annotation cp="²" type="tts">dous en superíndice</annotation>
+ <annotation cp="³">3 | cubo | superíndice | tres en superíndice</annotation>
+ <annotation cp="³" type="tts">tres en superíndice</annotation>
+ <annotation cp="µ">medida | micro | signo de micro</annotation>
+ <annotation cp="µ" type="tts">signo de micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/gu.xml b/common/annotations/gu.xml
index 9944c62..7ce35d0 100644
--- a/common/annotations/gu.xml
+++ b/common/annotations/gu.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">મધ્યમ ઘેરો ચામડીનો રંગ</annotation>
<annotation cp="🏿">ઘેરો ચામડીનો રંગ | ઘેરો ત્વચાનો રંગ | ત્વચાનો પ્રકાર-6 | ત્વચાનો રંગ</annotation>
<annotation cp="🏿" type="tts">ઘેરો ચામડીનો રંગ</annotation>
+ <annotation cp="–">એન | ડેશ</annotation>
+ <annotation cp="–" type="tts">એન ડેશ</annotation>
+ <annotation cp="—">એમ | ડેશ</annotation>
+ <annotation cp="—" type="tts">એમ ડેશ</annotation>
+ <annotation cp="·">ઇન્ટરપન્ટ | ડોટ | વચ્ચે | વચ્ચેનો ડોટ</annotation>
+ <annotation cp="·" type="tts">વચ્ચેનો ડોટ</annotation>
+ <annotation cp="«">કેરેટ | કોટ | કોણ | કૌંસ | ડાબું | ડાબું ગ્વીમે | શેવરોન</annotation>
+ <annotation cp="«" type="tts">ડાબું ગ્વીમે</annotation>
+ <annotation cp="»">કેરેટ | કોટ | કોણ | કૌંસ | જમણું | જમણું ગ્વીમે | શેવરોન</annotation>
+ <annotation cp="»" type="tts">જમણું ગ્વીમે</annotation>
+ <annotation cp="§">ફકરો | ભાગ | સિલ્ક્રો | સેક્શન</annotation>
+ <annotation cp="§" type="tts">સેક્શન</annotation>
+ <annotation cp="†">ઓબેલસ | કટાર | કટાર ચિન્હ | સ્તંભ-ચિહ્ન</annotation>
+ <annotation cp="†" type="tts">કટાર ચિન્હ</annotation>
+ <annotation cp="‡">ઓબેલસ | કટાર | બમણું | બમણું કટાર ચિન્હ | સ્તંભ-ચિહ્ન</annotation>
+ <annotation cp="‡" type="tts">બમણું કટાર ચિન્હ</annotation>
+ <annotation cp="•">ડોટ | બુલેટ</annotation>
+ <annotation cp="•" type="tts">બુલેટ</annotation>
+ <annotation cp="°">કલાક | પ્રમાણ | માત્રા</annotation>
+ <annotation cp="°" type="tts">માત્રા</annotation>
+ <annotation cp="℗">અવાજ | કોપિરાઇટ | રેકોર્ડિંગ</annotation>
+ <annotation cp="℗" type="tts">અવાજ રેકોર્ડિંગ કોપિરાઇટ</annotation>
+ <annotation cp="←">ડાબું | ડાબું નિર્દેશી તીર | તીર</annotation>
+ <annotation cp="←" type="tts">ડાબું નિર્દેશી તીર</annotation>
+ <annotation cp="→">જમણું | જમણું નિર્દેશી તીર | તીર</annotation>
+ <annotation cp="→" type="tts">જમણું નિર્દેશી તીર</annotation>
+ <annotation cp="↑">ઉપર | ઉપર નિર્દેશી તીર | તીર</annotation>
+ <annotation cp="↑" type="tts">ઉપર નિર્દેશી તીર</annotation>
+ <annotation cp="↓">તીર | નીચે | નીચે નિર્દેશી તીર</annotation>
+ <annotation cp="↓" type="tts">નીચે નિર્દેશી તીર</annotation>
+ <annotation cp="⇅">ઉપર | ઉપર નિર્દેશી અને નીચે નિર્દેશી તીરો | તીર | નીચે</annotation>
+ <annotation cp="⇅" type="tts">ઉપર નિર્દેશી અને નીચે નિર્દેશી તીરો</annotation>
+ <annotation cp="⇆">જમણાં નિર્દેશી તીરો ઉપર ડાબા નિર્દેશી તીરો | જમણું | ડાબું | તીર</annotation>
+ <annotation cp="⇆" type="tts">જમણાં નિર્દેશી તીરો ઉપર ડાબા નિર્દેશી તીરો</annotation>
+ <annotation cp="∆">ત્રિકોણ | વૃદ્ધિ</annotation>
+ <annotation cp="∆" type="tts">વૃદ્ધિ</annotation>
+ <annotation cp="∇">ત્રિકોણ | નાબલા</annotation>
+ <annotation cp="∇" type="tts">નાબલા</annotation>
+ <annotation cp="∈">આનું તત્વ | તત્વ | સદસ્યતા | સમાવે છે | સેટ</annotation>
+ <annotation cp="∈" type="tts">આનું તત્વ</annotation>
+ <annotation cp="÷">ઓબેલસ | ડિવિઝન ચિહ્ન | વિભાજન | વિભાજન ચિહ્ન</annotation>
+ <annotation cp="÷" type="tts">ડિવિઝન ચિહ્ન</annotation>
+ <annotation cp="×">ગુણાકાર | ગુણાકાર ચિહ્ન | વખત</annotation>
+ <annotation cp="×" type="tts">ગુણાકાર ચિહ્ન</annotation>
+ <annotation cp="⁻">બાદબાકી | સુપરસ્ક્રિપ્ટ</annotation>
+ <annotation cp="⁻" type="tts">સુપરસ્ક્રિપ્ટ બાદબાકી</annotation>
+ <annotation cp="√">આમૂલ | કરણી | ચોરસ | મૂળ | મૂળાક્ષર | વર્ગમૂળ</annotation>
+ <annotation cp="√" type="tts">વર્ગમૂળ</annotation>
+ <annotation cp="∞">અનંત | અનંત ચિન્હ</annotation>
+ <annotation cp="∞" type="tts">અનંત ચિન્હ</annotation>
+ <annotation cp="∩">આંતરછેદ | સેટ</annotation>
+ <annotation cp="∩" type="tts">આંતરછેદ</annotation>
+ <annotation cp="∪">મેળ | સમૂહ | સેટ</annotation>
+ <annotation cp="∪" type="tts">મેળ</annotation>
+ <annotation cp="≡">આનાથી સમાન | ચોક્કસ | ત્રણગણું | સમાન</annotation>
+ <annotation cp="≡" type="tts">આનાથી સમાન</annotation>
+ <annotation cp="⊂">આનું સબસેટ | સબસેટ | સેટ</annotation>
+ <annotation cp="⊂" type="tts">આનું સબસેટ</annotation>
+ <annotation cp="▲">ઉપર | તીર | ત્રિકોણ | ભરેલું | રંગથી ભરેલું ઉપર નિર્દેશી ત્રિકોણ</annotation>
+ <annotation cp="▲" type="tts">રંગથી ભરેલું ઉપર નિર્દેશી ત્રિકોણ</annotation>
+ <annotation cp="▼">તીર | ત્રિકોણ | નીચે | ભરેલું | રંગથી ભરેલું નીચે નિર્દેશી ત્રિકોણ</annotation>
+ <annotation cp="▼" type="tts">રંગથી ભરેલું નીચે નિર્દેશી ત્રિકોણ</annotation>
+ <annotation cp="◊">ચતુષ્કોણ | રોમ્બ્સ | હીરા આકાર</annotation>
+ <annotation cp="◊" type="tts">ચતુષ્કોણ</annotation>
+ <annotation cp="○">પોલું વર્તુળ | રિંગ | વર્તુળ</annotation>
+ <annotation cp="○" type="tts">પોલું વર્તુળ</annotation>
+ <annotation cp="●">રંગથી ભરેલું વર્તુળ | વર્તુળ</annotation>
+ <annotation cp="●" type="tts">રંગથી ભરેલું વર્તુળ</annotation>
+ <annotation cp="◯">મોટું પોલું વર્તુળ | રિંગ | વર્તુળ</annotation>
+ <annotation cp="◯" type="tts">મોટું પોલું વર્તુળ</annotation>
<annotation cp="⚧">ટ્રાન્સજેન્ડર | ટ્રાન્સજેન્ડરનું પ્રતીક</annotation>
<annotation cp="⚧" type="tts">ટ્રાન્સજેન્ડરનું પ્રતીક</annotation>
<annotation cp="🤌">આંગળીઓ | કટાક્ષવાળું | ચીમટી આપવી | ચીમટી દેવા તૈયાર આંગળીઓ | પૂછપરછ | હાથનો સંકેત</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">સપ્તરંગી ઝંડો</annotation>
<annotation cp="🏴☠">ખજાનો | ચાંચિયો | જોલી રોજર | પાઇરેટ ધ્વજ | લૂંટ</annotation>
<annotation cp="🏴☠" type="tts">પાઇરેટ ધ્વજ</annotation>
+ <annotation cp="£">ઈજીપી | ચલણ | જીબીપી | પાઉન્ડ</annotation>
+ <annotation cp="£" type="tts">પાઉન્ડ</annotation>
+ <annotation cp="¥">ચલણ | જેપીવાય | યુઆન | યેન | સીએનવાય</annotation>
+ <annotation cp="¥" type="tts">યેન</annotation>
+ <annotation cp="€">ઈયુઆર | ચલણ | યુરો</annotation>
+ <annotation cp="€" type="tts">યુરો</annotation>
+ <annotation cp="₹">ચલણ | ભારતીય રૂપયો | રૂપયો</annotation>
+ <annotation cp="₹" type="tts">ભારતીય રૂપયો</annotation>
+ <annotation cp="₽">ચલણ | રૂબલ</annotation>
+ <annotation cp="₽" type="tts">રૂબલ</annotation>
+ <annotation cp="¹">એક | સુપરસ્ક્રિપ્ટ</annotation>
+ <annotation cp="¹" type="tts">સુપરસ્ક્રિપ્ટ એક</annotation>
+ <annotation cp="²">બે | સુપરસ્ક્રિપ્ટ | સ્ક્વેર્ડ</annotation>
+ <annotation cp="²" type="tts">સુપરસ્ક્રિપ્ટ બે</annotation>
+ <annotation cp="³">ત્રણ | ધન | સુપરસ્ક્રિપ્ટ</annotation>
+ <annotation cp="³" type="tts">સુપરસ્ક્રિપ્ટ ત્રણ</annotation>
+ <annotation cp="µ">માઇક્રો સાઇન | માપો</annotation>
+ <annotation cp="µ" type="tts">માઇક્રો સાઇન</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/he.xml b/common/annotations/he.xml
index a93feff..12ccdac 100644
--- a/common/annotations/he.xml
+++ b/common/annotations/he.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">גוון עור כהה בינוני</annotation>
<annotation cp="🏿">גוון עור | גוון עור כהה | סוג 6</annotation>
<annotation cp="🏿" type="tts">גוון עור כהה</annotation>
+ <annotation cp="–">en dash | קו מפריד | קו מפריד קצר | קצר</annotation>
+ <annotation cp="–" type="tts">קו מפריד קצר</annotation>
+ <annotation cp="—">em dash | ארוך | קו מפריד | קו מפריד ארוך</annotation>
+ <annotation cp="—" type="tts">קו מפריד ארוך</annotation>
+ <annotation cp="·">אמצע | באמצע | נקודה | נקודת אמצע</annotation>
+ <annotation cp="·" type="tts">נקודת אמצע</annotation>
+ <annotation cp="«">מירכאות | מירכאות משמאל | מרכאות | ציטוט | שמאל</annotation>
+ <annotation cp="«" type="tts">מירכאות משמאל</annotation>
+ <annotation cp="»">ימין | מירכאות | מירכאות מימין | מרכאות | ציטוט</annotation>
+ <annotation cp="»" type="tts">מירכאות מימין</annotation>
+ <annotation cp="§">מקטע | סעיף | פסקה</annotation>
+ <annotation cp="§" type="tts">סעיף</annotation>
+ <annotation cp="†">הערת שוליים | סימן | סימן צלב קטן | צְלָבוֹן</annotation>
+ <annotation cp="†" type="tts">צְלָבוֹן</annotation>
+ <annotation cp="‡">הערת שוליים | סימן | צלב עם שני קווים | צְלָבוֹן כפול</annotation>
+ <annotation cp="‡" type="tts">צְלָבוֹן כפול</annotation>
+ <annotation cp="•">נקודה | תבליט</annotation>
+ <annotation cp="•" type="tts">תבליט</annotation>
+ <annotation cp="°">מעלה | מעלות</annotation>
+ <annotation cp="°" type="tts">מעלה</annotation>
+ <annotation cp="℗">הקלטה | זכויות יוצרים | זכויות יוצרים על הקלטת סאונד | סאונד</annotation>
+ <annotation cp="℗" type="tts">זכויות יוצרים על הקלטת סאונד</annotation>
+ <annotation cp="←">חץ | חץ שמצביע שמאלה | מצביע לשמאל | שמאל | שמאלה</annotation>
+ <annotation cp="←" type="tts">חץ שמצביע שמאלה</annotation>
+ <annotation cp="→">חץ | חץ שמצביע ימינה | ימין | ימינה</annotation>
+ <annotation cp="→" type="tts">חץ שמצביע ימינה</annotation>
+ <annotation cp="↑">חץ | חץ שמצביע למעלה | למעלה | מצביע למעלה</annotation>
+ <annotation cp="↑" type="tts">חץ שמצביע למעלה</annotation>
+ <annotation cp="↓">חץ | חץ שמצביע למטה | למטה | מצביע למטה</annotation>
+ <annotation cp="↓" type="tts">חץ שמצביע למטה</annotation>
+ <annotation cp="⇅">חיצים | חיצים למעלה ולמטה | חיצים שפונים למעלה ולמטה | חץ | למטה | למעלה</annotation>
+ <annotation cp="⇅" type="tts">חיצים למעלה ולמטה</annotation>
+ <annotation cp="⇆">חיצים | חיצים ימינה ושמאלה | חץ | ימינה ושמאלה</annotation>
+ <annotation cp="⇆" type="tts">חיצים ימינה ושמאלה</annotation>
+ <annotation cp="∆">דלתא | משולש | תוספת</annotation>
+ <annotation cp="∆" type="tts">תוספת</annotation>
+ <annotation cp="∇">הפוך | משולש</annotation>
+ <annotation cp="∇" type="tts">משולש הפוך</annotation>
+ <annotation cp="∈">אלמנט | אלמנט של | חבר ב- | מערך | נכלל | רכיב | רכיב של</annotation>
+ <annotation cp="∈" type="tts">רכיב של</annotation>
+ <annotation cp="÷">חילוק | חלוקה | סימן חילוק | סימן לחילוק</annotation>
+ <annotation cp="÷" type="tts">סימן לחילוק</annotation>
+ <annotation cp="×">איקס קטן | הכפלה | כפל | סימן | פעמים</annotation>
+ <annotation cp="×" type="tts">סימן הכפלה</annotation>
+ <annotation cp="⁻">מינוס | סימן | עילי</annotation>
+ <annotation cp="⁻" type="tts">סימן מינוס עילי</annotation>
+ <annotation cp="√">שורש | שורש מרובע | שורש ריבועי</annotation>
+ <annotation cp="√" type="tts">שורש ריבועי</annotation>
+ <annotation cp="∞">אינסוף | אינסופי | סימן אינסוף</annotation>
+ <annotation cp="∞" type="tts">סימן אינסוף</annotation>
+ <annotation cp="∩">חיתוך | קבוצה</annotation>
+ <annotation cp="∩" type="tts">חיתוך</annotation>
+ <annotation cp="∪">אוסף | איחוד | קבוצה</annotation>
+ <annotation cp="∪" type="tts">איחוד</annotation>
+ <annotation cp="≡">בדיוק | זהה | זהה ל- | שווה ערך | שקול</annotation>
+ <annotation cp="≡" type="tts">זהה ל-</annotation>
+ <annotation cp="⊂">מוכל ב- | נכלל ב- | קבוצה | קבוצת משנה</annotation>
+ <annotation cp="⊂" type="tts">מוכל ב-</annotation>
+ <annotation cp="▲">חץ | חץ שפונה למעלה | כלפי מעלה | למעלה | משולש | משולש שחור שפונה כלפי מעלה | שחור</annotation>
+ <annotation cp="▲" type="tts">משולש שחור שפונה כלפי מעלה</annotation>
+ <annotation cp="▼">חץ | חץ שפונה למטה | כלפי מטה | למטה | משולש | משולש שחור שפונה כלפי מטה | שחור</annotation>
+ <annotation cp="▼" type="tts">משולש שחור שפונה כלפי מטה</annotation>
+ <annotation cp="◊">יהלום | מעוין | מעוין קטן</annotation>
+ <annotation cp="◊" type="tts">מעוין קטן</annotation>
+ <annotation cp="○">חלול | עיגול | עיגול חלול קטן</annotation>
+ <annotation cp="○" type="tts">עיגול חלול קטן</annotation>
+ <annotation cp="●">עיגול | עיגול שחור קטן | שחור | תבליט</annotation>
+ <annotation cp="●" type="tts">עיגול שחור קטן</annotation>
+ <annotation cp="◯">חלול | טבעת | עיגול | עיגול חלול גדול</annotation>
+ <annotation cp="◯" type="tts">עיגול חלול גדול</annotation>
<annotation cp="⚧">טרנסג׳נדר | סמל לטרנסג׳נדר</annotation>
<annotation cp="⚧" type="tts">סמל לטרנסג׳נדר</annotation>
<annotation cp="🤌">אצבעות | יד מסמנת רק רגע | כף יד | רק רגע | תיכף</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">דגל בצבעי הקשת</annotation>
<annotation cp="🏴☠">דגל פירטים | מטמון | פיראטים | שודדי ים | תיבת אוצר</annotation>
<annotation cp="🏴☠" type="tts">דגל פירטים</annotation>
+ <annotation cp="£">ליש״ט | מטבע | פאונד</annotation>
+ <annotation cp="£" type="tts">פאונד</annotation>
+ <annotation cp="¥">ין | יפן | מטבע</annotation>
+ <annotation cp="¥" type="tts">ין</annotation>
+ <annotation cp="€">אירו | יורו | מטבע</annotation>
+ <annotation cp="€" type="tts">אירו</annotation>
+ <annotation cp="₹">הודו | מטבע | רופי | רופי הודי | רופיה</annotation>
+ <annotation cp="₹" type="tts">רופי הודי</annotation>
+ <annotation cp="₽">מטבע | רובל</annotation>
+ <annotation cp="₽" type="tts">רובל</annotation>
+ <annotation cp="¹">אחת | הספרה אחת בכתב עילי | הערה | כתב עילי | מוקטן</annotation>
+ <annotation cp="¹" type="tts">הספרה אחת בכתב עילי</annotation>
+ <annotation cp="²">בריבוע | הספרה שתיים בכתב עילי | הערה | כתב עילי | מוקטן | שתיים</annotation>
+ <annotation cp="²" type="tts">הספרה שתיים בכתב עילי</annotation>
+ <annotation cp="³">הספרה שלוש בכתב עילי | חזקה | כתב עילי | מוקטן | שלוש</annotation>
+ <annotation cp="³" type="tts">הספרה שלוש בכתב עילי</annotation>
+ <annotation cp="µ">מדידה | מיקרו | סמל</annotation>
+ <annotation cp="µ" type="tts">סמל מיקרו</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/hi.xml b/common/annotations/hi.xml
index 49786eb..8c32df7 100644
--- a/common/annotations/hi.xml
+++ b/common/annotations/hi.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">हल्की साँवली त्वचा</annotation>
<annotation cp="🏿">गहरी साँवली त्वचा | त्वचा का रंग | साँवली त्वचा</annotation>
<annotation cp="🏿" type="tts">साँवली त्वचा</annotation>
+ <annotation cp="–">एन | डैश</annotation>
+ <annotation cp="–" type="tts">एन डैश</annotation>
+ <annotation cp="—">एम | डैश</annotation>
+ <annotation cp="—" type="tts">एम डैश</annotation>
+ <annotation cp="·">अंतरविराम चिह्न | डॉट | मध्य | मध्यडॉट</annotation>
+ <annotation cp="·" type="tts">मध्य डॉट</annotation>
+ <annotation cp="«">कैरेट | कोट | कोण | कोष्ठक | बायां | बायां ग्युमेट | बायां ग्युुमेट | शेवरॉन</annotation>
+ <annotation cp="«" type="tts">बायां ग्युमेट</annotation>
+ <annotation cp="»">कैरेट | कोट | कोण | कोष्ठक | दायां | दायां ग्युमेट | दायां ग्युुमेट | शेवरॉन</annotation>
+ <annotation cp="»" type="tts">दायां ग्युमेट</annotation>
+ <annotation cp="§">पैराग्राफ़ | भाग | सिलक्रो | सेक्शन</annotation>
+ <annotation cp="§" type="tts">सेक्शन</annotation>
+ <annotation cp="†">ओबलस | ओबिलिस्क | डैगर | डैगर का चिह्न</annotation>
+ <annotation cp="†" type="tts">डैगर का चिह्न</annotation>
+ <annotation cp="‡">ओबलस | ओबिलिस्क | डैगर | दोहरा | दोहरा डैगर चिह्न</annotation>
+ <annotation cp="‡" type="tts">दोहरा डैगर चिह्न</annotation>
+ <annotation cp="•">डॉट | बुलेट</annotation>
+ <annotation cp="•" type="tts">बुलेट</annotation>
+ <annotation cp="°">घंटा | डिग्री | प्रमाण</annotation>
+ <annotation cp="°" type="tts">डिग्री</annotation>
+ <annotation cp="℗">कॉपीराइट | रिकॉर्डिंग | साउंड</annotation>
+ <annotation cp="℗" type="tts">साउंड रिकॉर्डिंग कॉपीराइट</annotation>
+ <annotation cp="←">तीर | बाईं | बाईं ओर इशारा करता तीर</annotation>
+ <annotation cp="←" type="tts">बाईं ओर इशारा करता तीर</annotation>
+ <annotation cp="→">तीर | दाईं | दाईं ओर इशारा करता तीर</annotation>
+ <annotation cp="→" type="tts">दाईं ओर इशारा करता तीर</annotation>
+ <annotation cp="↑">ऊपर | ऊपर की ओर इशारा करता तीर | तीर</annotation>
+ <annotation cp="↑" type="tts">ऊपर की ओर इशारा करता तीर</annotation>
+ <annotation cp="↓">तीर | नीचे | नीचे की ओर इशारा करता तीर</annotation>
+ <annotation cp="↓" type="tts">नीचे की ओर इशारा करता तीर</annotation>
+ <annotation cp="⇅">ऊपर | ऊपर और नीचे की ओर इशारे करते तीर | ऊपर की ओर इशारा करते और नीचे की ओर इशारा करते तीर | तीर | नीचे</annotation>
+ <annotation cp="⇅" type="tts">ऊपर और नीचे की ओर इशारे करते तीर</annotation>
+ <annotation cp="⇆">तीर | दाईं | दाईं ओर इशारा करते हुए तीर पर बाईं ओर इशारा करता तीर | दाएं इशारा करते तीर पर बाएं इशारा करता तीर | बाईं</annotation>
+ <annotation cp="⇆" type="tts">दाएं इशारा करते तीर पर बाएं इशारा करता तीर</annotation>
+ <annotation cp="∆">त्रिकोण | संवृद्ध</annotation>
+ <annotation cp="∆" type="tts">संवृद्ध</annotation>
+ <annotation cp="∇">त्रिकोण | नाबला</annotation>
+ <annotation cp="∇" type="tts">नाबला</annotation>
+ <annotation cp="∈">इसका तत्व | इसमें शामिल होता है | तत्व | सदस्यता | सेट</annotation>
+ <annotation cp="∈" type="tts">इसका तत्व</annotation>
+ <annotation cp="÷">ओबलस | भाग | भाग चिह्न | भाग देना</annotation>
+ <annotation cp="÷" type="tts">भाग चिह्न</annotation>
+ <annotation cp="×">गुणन | गुणा | गुणा का चिह्न | बार</annotation>
+ <annotation cp="×" type="tts">गुणा का चिह्न</annotation>
+ <annotation cp="⁻">माइनस | सुपरस्क्रिप्ट</annotation>
+ <annotation cp="⁻" type="tts">सुपरस्क्रिप्ट माइनस</annotation>
+ <annotation cp="√">मूल | मूलांक | वर्ग | वर्गमूल | सर्ड</annotation>
+ <annotation cp="√" type="tts">वर्गमूल</annotation>
+ <annotation cp="∞">अनंत | अनंत चिह्न</annotation>
+ <annotation cp="∞" type="tts">अनंत चिह्न</annotation>
+ <annotation cp="∩">इंटरसेक्शन | सेट</annotation>
+ <annotation cp="∩" type="tts">इंटरसेक्शन</annotation>
+ <annotation cp="∪">यूनियन | संग्रह | सेट</annotation>
+ <annotation cp="∪" type="tts">यूनियन</annotation>
+ <annotation cp="≡">इसके समरूप | ठीक वैसा | तीन | समरूप</annotation>
+ <annotation cp="≡" type="tts">इसके समरूप</annotation>
+ <annotation cp="⊂">इसका सबसेट | सबसेट | सेट</annotation>
+ <annotation cp="⊂" type="tts">इसका सबसेट</annotation>
+ <annotation cp="▲">ऊपर | ऊपर की ओर इंगित करता भरा हुआ त्रिकोण | ऊपर की ओर इशारा करता भरा हुआ त्रिकोण | तीर | त्रिकोण | भरा</annotation>
+ <annotation cp="▲" type="tts">ऊपर की ओर इंगित करता भरा हुआ त्रिकोण</annotation>
+ <annotation cp="▼">तीर | त्रिकोण | नीचे | नीचे की ओर इंगित करता भरा हुआ त्रिकोण | भरा</annotation>
+ <annotation cp="▼" type="tts">नीचे की ओर इंगित करता भरा हुआ त्रिकोण</annotation>
+ <annotation cp="◊">विषमकोण | समचतुर्भुज | हीरा</annotation>
+ <annotation cp="◊" type="tts">समचतुर्भुज</annotation>
+ <annotation cp="○">खोखला वृत्त | रिंग | वृत्त</annotation>
+ <annotation cp="○" type="tts">खोखला वृत्त</annotation>
+ <annotation cp="●">भरा वृत्त | वृत्त</annotation>
+ <annotation cp="●" type="tts">भरा वृत्त</annotation>
+ <annotation cp="◯">बड़़ा सा खोखला वृत्त | रिंग | वृत्त</annotation>
+ <annotation cp="◯" type="tts">बड़़ा सा खोखला वृत्त</annotation>
<annotation cp="⚧">ट्रांसजेंडर | ट्रांसजेंडर चिह्न</annotation>
<annotation cp="⚧" type="tts">ट्रांसजेंडर चिह्न</annotation>
<annotation cp="🤌">उंगलियां | पूछ-ताछ | व्यंग्यपूर्ण | सिकोड़ी हुई अंगुलियाँ | सूखा हुआ | हाथ का इशारा</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">इंद्रधनुषी झंडा</annotation>
<annotation cp="🏴☠">खजाना | जॉली रोजर | लूट | समुद्री डाकू | समुद्री दस्यु का झंडा</annotation>
<annotation cp="🏴☠" type="tts">समुद्री दस्यु का झंडा</annotation>
+ <annotation cp="£">ईजीपी | जीबीपी | पाउंड | मुद्रा</annotation>
+ <annotation cp="£" type="tts">पाउंड</annotation>
+ <annotation cp="¥">जेपीवाई | मुद्रा | युआन | येन | सीएनवाई</annotation>
+ <annotation cp="¥" type="tts">येन</annotation>
+ <annotation cp="€">ईयूआर | मुद्रा | यूरो</annotation>
+ <annotation cp="€" type="tts">यूरो</annotation>
+ <annotation cp="₹">भारतीय रुपया | मुद्रा | रुपया</annotation>
+ <annotation cp="₹" type="tts">भारतीय रुपया</annotation>
+ <annotation cp="₽">मुद्रा | रूबल</annotation>
+ <annotation cp="₽" type="tts">रूबल</annotation>
+ <annotation cp="¹">एक | सुपरस्क्रिप्ट</annotation>
+ <annotation cp="¹" type="tts">सुपरस्क्रिप्ट एक</annotation>
+ <annotation cp="²">चौकोर | दो | सुपरस्क्रिप्ट</annotation>
+ <annotation cp="²" type="tts">सुपरस्क्रिप्ट दो</annotation>
+ <annotation cp="³">घन | तीन | सुपरस्क्रिप्ट</annotation>
+ <annotation cp="³" type="tts">सुपरस्क्रिप्ट तीन</annotation>
+ <annotation cp="µ">माइक्रो चिह्न | माप</annotation>
+ <annotation cp="µ" type="tts">माइक्रो चिह्न</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/hr.xml b/common/annotations/hr.xml
index 4edc68f..1be1fef 100644
--- a/common/annotations/hr.xml
+++ b/common/annotations/hr.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">smeđa boja kože</annotation>
<annotation cp="🏿">boja | emoji modifikator | fitzpatrick | koža | tamno smeđa boja kože</annotation>
<annotation cp="🏿" type="tts">tamno smeđa boja kože</annotation>
+ <annotation cp="–">crtica | pravopisni znak</annotation>
+ <annotation cp="–" type="tts">crtica</annotation>
+ <annotation cp="—">crta | pravopisni znak</annotation>
+ <annotation cp="—" type="tts">crta</annotation>
+ <annotation cp="·">sredina | srednja točka | točka</annotation>
+ <annotation cp="·" type="tts">srednja točka</annotation>
+ <annotation cp="«">kareti | lijevo | lijevo usmjereni šiljasti navodnik | navodnik | ševron | ukošeno | zagrade</annotation>
+ <annotation cp="«" type="tts">lijevo usmjereni šiljasti navodnik</annotation>
+ <annotation cp="»">desno | desno usmjereni šiljasti navodnik | kareti | navodnik | ševron | ukošeno | zagrade</annotation>
+ <annotation cp="»" type="tts">desno usmjereni šiljasti navodnik</annotation>
+ <annotation cp="§">dio | odjeljak | odlomak | znak za odjeljak</annotation>
+ <annotation cp="§" type="tts">odjeljak</annotation>
+ <annotation cp="†">bodež | obelisk | znak bodeža</annotation>
+ <annotation cp="†" type="tts">znak bodeža</annotation>
+ <annotation cp="‡">bodež | dvostruko | obelisk | znak dvostrukog bodeža</annotation>
+ <annotation cp="‡" type="tts">znak dvostrukog bodeža</annotation>
+ <annotation cp="•">grafička oznaka | točka</annotation>
+ <annotation cp="•" type="tts">grafička oznaka</annotation>
+ <annotation cp="°">satni kut | stupanj | udio</annotation>
+ <annotation cp="°" type="tts">stupanj</annotation>
+ <annotation cp="℗">autorsko pravo | simbol autorskog prava za snimanje zvuka | snimanje | zvuk</annotation>
+ <annotation cp="℗" type="tts">simbol autorskog prava za snimanje zvuka</annotation>
+ <annotation cp="←">lijevo | strelica | strelica koja pokazuje ulijevo</annotation>
+ <annotation cp="←" type="tts">strelica koja pokazuje ulijevo</annotation>
+ <annotation cp="→">desno | strelica | strelica koja pokazuje udesno</annotation>
+ <annotation cp="→" type="tts">strelica koja pokazuje udesno</annotation>
+ <annotation cp="↑">gore | strelica | strelica koja pokazuje prema gore</annotation>
+ <annotation cp="↑" type="tts">strelica koja pokazuje prema gore</annotation>
+ <annotation cp="↓">dolje | strelica | strelica koja pokazuje prema dolje</annotation>
+ <annotation cp="↓" type="tts">strelica koja pokazuje prema dolje</annotation>
+ <annotation cp="⇅">dolje | gore | strelica | strelica prema gore i strelica prema dolje</annotation>
+ <annotation cp="⇅" type="tts">strelica prema gore i strelica prema dolje</annotation>
+ <annotation cp="⇆">desno | lijevo | strelica | strelica ulijevo iznad strelice udesno</annotation>
+ <annotation cp="⇆" type="tts">strelica ulijevo iznad strelice udesno</annotation>
+ <annotation cp="∆">inkrement | trokut</annotation>
+ <annotation cp="∆" type="tts">inkrement</annotation>
+ <annotation cp="∇">nabla | trokut</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">članstvo | element | je element | sadrži | skup</annotation>
+ <annotation cp="∈" type="tts">je element</annotation>
+ <annotation cp="÷">dijeljenje | podijeli | znak dijeljenja | znak za dijeljenje</annotation>
+ <annotation cp="÷" type="tts">znak za dijeljenje</annotation>
+ <annotation cp="×">množenje | pomnoži | puta | znak za množenje</annotation>
+ <annotation cp="×" type="tts">znak za množenje</annotation>
+ <annotation cp="⁻">eksponent | minus | minus u eksponentu</annotation>
+ <annotation cp="⁻" type="tts">minus u eksponentu</annotation>
+ <annotation cp="√">korijen | kvadratni | radikal | surd</annotation>
+ <annotation cp="√" type="tts">kvadratni korijen</annotation>
+ <annotation cp="∞">beskonačno</annotation>
+ <annotation cp="∞" type="tts">beskonačno</annotation>
+ <annotation cp="∩">presjek skupova | skup</annotation>
+ <annotation cp="∩" type="tts">presjek skupova</annotation>
+ <annotation cp="∪">skup | unija skupova | zbirka</annotation>
+ <annotation cp="∪" type="tts">unija skupova</annotation>
+ <annotation cp="≡">identično | jednako | trostruko</annotation>
+ <annotation cp="≡" type="tts">identično jednako</annotation>
+ <annotation cp="⊂">je pravi podskup od | podskup | skup</annotation>
+ <annotation cp="⊂" type="tts">je pravi podskup od</annotation>
+ <annotation cp="▲">gore | ispunjen trokut usmjeren prema gore | ispunjeno | strelica | trokut</annotation>
+ <annotation cp="▲" type="tts">ispunjen trokut usmjeren prema gore</annotation>
+ <annotation cp="▼">dolje | ispunjen trokut usmjeren prema dolje | ispunjeno | strelica | trokut</annotation>
+ <annotation cp="▼" type="tts">ispunjen trokut usmjeren prema dolje</annotation>
+ <annotation cp="◊">dijamant | romb | znak romba</annotation>
+ <annotation cp="◊" type="tts">znak romba</annotation>
+ <annotation cp="○">krug | prazan krug | prsten</annotation>
+ <annotation cp="○" type="tts">prazan krug</annotation>
+ <annotation cp="●">ispunjen krug | krug</annotation>
+ <annotation cp="●" type="tts">ispunjen krug</annotation>
+ <annotation cp="◯">krug | prsten | velik prazni krug</annotation>
+ <annotation cp="◯" type="tts">velik prazni krug</annotation>
<annotation cp="⚧">simbol transrodnosti | transrodnost</annotation>
<annotation cp="⚧" type="tts">simbol transrodnosti</annotation>
<annotation cp="🤌">gesta rukom | ispitivanje | prsti | sarkastično | skupljeni prsti | uštipnuti</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">zastava duginih boja</annotation>
<annotation cp="🏴☠">blago | gusar | gusarska zastava | Jolly Roger</annotation>
<annotation cp="🏴☠" type="tts">gusarska zastava</annotation>
+ <annotation cp="£">EGP | funta | GBP | valuta</annotation>
+ <annotation cp="£" type="tts">funta</annotation>
+ <annotation cp="¥">CNY | jen | JPY | juan | valuta</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indijska rupija | rupija | valuta</annotation>
+ <annotation cp="₹" type="tts">indijska rupija</annotation>
+ <annotation cp="₽">rubalj | valuta</annotation>
+ <annotation cp="₽" type="tts">rubalj</annotation>
+ <annotation cp="¹">1 | eksponent</annotation>
+ <annotation cp="¹" type="tts">eksponent 1</annotation>
+ <annotation cp="²">2 | eksponent | kvadratni</annotation>
+ <annotation cp="²" type="tts">eksponent 2</annotation>
+ <annotation cp="³">3 | eksponent | kubični</annotation>
+ <annotation cp="³" type="tts">eksponent 3</annotation>
+ <annotation cp="µ">mjera | znak mikro</annotation>
+ <annotation cp="µ" type="tts">znak mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/hu.xml b/common/annotations/hu.xml
index 65ae218..03f2fa2 100644
--- a/common/annotations/hu.xml
+++ b/common/annotations/hu.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">közepesen sötét bőrtónus</annotation>
<annotation cp="🏿">6-os típus | bőrtónus | sötét bőrtónus</annotation>
<annotation cp="🏿" type="tts">sötét bőrtónus</annotation>
+ <annotation cp="–">fél | félkvirt | kvirt</annotation>
+ <annotation cp="–" type="tts">félkvirt</annotation>
+ <annotation cp="—">kötőjel | kvirtmínusz | nagy</annotation>
+ <annotation cp="—" type="tts">kvirtmínusz</annotation>
+ <annotation cp="·">felezőpont | közép | középvonali pont | pont</annotation>
+ <annotation cp="·" type="tts">középvonali pont</annotation>
+ <annotation cp="«">bal | balra mutató belső idézőjel | balra néző belső idézőjel | beszúrási jelek | csúcsos | idézőjel | sávnyíl | zárójel</annotation>
+ <annotation cp="«" type="tts">balra mutató belső idézőjel</annotation>
+ <annotation cp="»">beszúrási jelek | csúcsos | idézőjel | jobb | jobbra mutató belső idézőjel | jobbra néző belső idézőjel | sávnyíl | zárójel</annotation>
+ <annotation cp="»" type="tts">jobbra mutató belső idézőjel</annotation>
+ <annotation cp="§">bekezdés | rész | silcrow | szakasz | szakaszjel</annotation>
+ <annotation cp="§" type="tts">szakasz</annotation>
+ <annotation cp="†">kereszt | kereszt szimbólum | obeliszk | obelus</annotation>
+ <annotation cp="†" type="tts">kereszt szimbólum</annotation>
+ <annotation cp="‡">kereszt | kettős | kettős kereszt szimbólum | obeliszk | obelus</annotation>
+ <annotation cp="‡" type="tts">kettős kereszt szimbólum</annotation>
+ <annotation cp="•">listajel | pont</annotation>
+ <annotation cp="•" type="tts">listajel</annotation>
+ <annotation cp="°">fok | malligand-fok | óra</annotation>
+ <annotation cp="°" type="tts">fok</annotation>
+ <annotation cp="℗">hang | hangrögzítési szerzői jog | rögzítés | szerzői jog</annotation>
+ <annotation cp="℗" type="tts">hangrögzítési szerzői jog</annotation>
+ <annotation cp="←">bal | bal oldalra mutató nyíl | nyíl</annotation>
+ <annotation cp="←" type="tts">bal oldalra mutató nyíl</annotation>
+ <annotation cp="→">jobb | jobb oldalra mutató nyíl | nyíl</annotation>
+ <annotation cp="→" type="tts">jobb oldalra mutató nyíl</annotation>
+ <annotation cp="↑">felfelé | felfelé néző nyíl | nyíl</annotation>
+ <annotation cp="↑" type="tts">felfelé néző nyíl</annotation>
+ <annotation cp="↓">lefelé | lefelé néző nyíl | nyíl</annotation>
+ <annotation cp="↓" type="tts">lefelé néző nyíl</annotation>
+ <annotation cp="⇅">felfelé | felfelé és lefelé mutató nyíl | lefelé | nyíl</annotation>
+ <annotation cp="⇅" type="tts">felfelé és lefelé mutató nyíl</annotation>
+ <annotation cp="⇆">bal | jobb | nyíl | oda-vissza nyíl</annotation>
+ <annotation cp="⇆" type="tts">oda-vissza nyíl</annotation>
+ <annotation cp="∆">háromszög | növekmény</annotation>
+ <annotation cp="∆" type="tts">növekmény</annotation>
+ <annotation cp="∇">háromszög | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">elem | eleme | halmaz | tagság | tartalmazza</annotation>
+ <annotation cp="∈" type="tts">eleme</annotation>
+ <annotation cp="÷">elosztás | obelus | osztás | osztásjel</annotation>
+ <annotation cp="÷" type="tts">osztásjel</annotation>
+ <annotation cp="×">sokszorozás | szorzás | szorzásjel | szorzó</annotation>
+ <annotation cp="×" type="tts">szorzásjel</annotation>
+ <annotation cp="⁻">felső index | mínuszjel | mínuszjel felső indexben</annotation>
+ <annotation cp="⁻" type="tts">mínuszjel felső indexben</annotation>
+ <annotation cp="√">alapszám | gyök | gyökér | irracionális | négyzet | négyzetgyök</annotation>
+ <annotation cp="√" type="tts">négyzetgyök</annotation>
+ <annotation cp="∞">végtelen | végtelen szimbólum</annotation>
+ <annotation cp="∞" type="tts">végtelen szimbólum</annotation>
+ <annotation cp="∩">halmaz | metszet</annotation>
+ <annotation cp="∩" type="tts">metszet</annotation>
+ <annotation cp="∪">csoport | halmaz | unió</annotation>
+ <annotation cp="∪" type="tts">unió</annotation>
+ <annotation cp="≡">azonos | egyenlőségjel | egyező | tripla</annotation>
+ <annotation cp="≡" type="tts">egyenlőségjel</annotation>
+ <annotation cp="⊂">halmaz | részhalmaz | valódi részhalmaza</annotation>
+ <annotation cp="⊂" type="tts">valódi részhalmaza</annotation>
+ <annotation cp="▲">felfelé | háromszög | kitöltött | kitöltött felfelé mutató háromszög | nyíl</annotation>
+ <annotation cp="▲" type="tts">kitöltött felfelé mutató háromszög</annotation>
+ <annotation cp="▼">háromszög | kitöltött | kitöltött lefelé mutató háromszög | lefelé | nyíl</annotation>
+ <annotation cp="▼" type="tts">kitöltött lefelé mutató háromszög</annotation>
+ <annotation cp="◊">ferde négyszög | gyémánt | rombusz</annotation>
+ <annotation cp="◊" type="tts">rombusz</annotation>
+ <annotation cp="○">gyűrű | kör | üres kör</annotation>
+ <annotation cp="○" type="tts">üres kör</annotation>
+ <annotation cp="●">kitöltött kör | kör</annotation>
+ <annotation cp="●" type="tts">kitöltött kör</annotation>
+ <annotation cp="◯">gyűrű | kör | nagy üres kör</annotation>
+ <annotation cp="◯" type="tts">nagy üres kör</annotation>
<annotation cp="⚧">transznemű | transznemű szimbólum</annotation>
<annotation cp="⚧" type="tts">transznemű szimbólum</annotation>
<annotation cp="🤌">gúnyos | kézmozdulat | kihallgatás | összecsippentett | ujjak</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">szivárványszínű zászló</annotation>
<annotation cp="🏴☠">fosztogató | Jolly Roger | kalóz | kalózzászló | kincs</annotation>
<annotation cp="🏴☠" type="tts">kalózzászló</annotation>
+ <annotation cp="£">EGP | font | GBP | pénznem</annotation>
+ <annotation cp="£" type="tts">font</annotation>
+ <annotation cp="¥">CNY | jen | JPY | jüan | pénznem</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euró | pénznem</annotation>
+ <annotation cp="€" type="tts">euró</annotation>
+ <annotation cp="₹">indiai rúpia | pénznem | rúpia</annotation>
+ <annotation cp="₹" type="tts">indiai rúpia</annotation>
+ <annotation cp="₽">pénznem | rubel</annotation>
+ <annotation cp="₽" type="tts">rubel</annotation>
+ <annotation cp="¹">egyes | egyes felső index | felső index</annotation>
+ <annotation cp="¹" type="tts">egyes felső index</annotation>
+ <annotation cp="²">felső index | kettes | kettes felső index | négyzeten</annotation>
+ <annotation cp="²" type="tts">kettes felső index</annotation>
+ <annotation cp="³">felső index | hármas | hármas felső index | köbön</annotation>
+ <annotation cp="³" type="tts">hármas felső index</annotation>
+ <annotation cp="µ">mérés | mikro szimbólum</annotation>
+ <annotation cp="µ" type="tts">mikro szimbólum</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/hy.xml b/common/annotations/hy.xml
index 96f3774..0f2b6ab 100644
--- a/common/annotations/hy.xml
+++ b/common/annotations/hy.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">միջին մուգ գույնի մաշկ</annotation>
<annotation cp="🏿">մաշկի գույն | մուգ գույնի մաշկ | տիպ 6</annotation>
<annotation cp="🏿" type="tts">մուգ գույնի մաշկ</annotation>
+ <annotation cp="–">գծիկ | միջին գծիկ | ո</annotation>
+ <annotation cp="–" type="tts">միջին գծիկ</annotation>
+ <annotation cp="—">գծիկ | երկար գծիկ | փէ</annotation>
+ <annotation cp="—" type="tts">երկար գծիկ</annotation>
+ <annotation cp="·">կետ | միջին | միջկետ | միջնակետ</annotation>
+ <annotation cp="·" type="tts">միջնակետ</annotation>
+ <annotation cp="«">անկյունաձև | ձախ | չակերտ | պիպ | տանիք | փակագիծ</annotation>
+ <annotation cp="«" type="tts">ձախ չակերտ</annotation>
+ <annotation cp="»">անկյունաձև | աջ | չակերտ | պիպ | տանիք | փակագիծ</annotation>
+ <annotation cp="»" type="tts">աջ չակերտ</annotation>
+ <annotation cp="§">հատված | մաս | պարբերանիշ | պարբերություն</annotation>
+ <annotation cp="§" type="tts">հատված</annotation>
+ <annotation cp="†">դաշույն | դաշույնի նշան</annotation>
+ <annotation cp="†" type="tts">դաշույնի նշան</annotation>
+ <annotation cp="‡">դաշույն | կրկնադաշույն | կրկնակի</annotation>
+ <annotation cp="‡" type="tts">կրկնադաշույն</annotation>
+ <annotation cp="•">կետ | կետանշան</annotation>
+ <annotation cp="•" type="tts">կետանշան</annotation>
+ <annotation cp="°">ապացույց | աստիճան | ժամ</annotation>
+ <annotation cp="°" type="tts">աստիճան</annotation>
+ <annotation cp="℗">հեղինակային իրավունք | ձայն | ձայնագրության պատճենաշնորհ | ձայնագրություն | պատճենաշնորհ</annotation>
+ <annotation cp="℗" type="tts">ձայնագրության պատճենաշնորհ</annotation>
+ <annotation cp="←">ձախ | ձախ ուղղված սլաք | սլաք</annotation>
+ <annotation cp="←" type="tts">ձախ ուղղված սլաք</annotation>
+ <annotation cp="→">աջ | աջ ուղղված սլաք | սլաք</annotation>
+ <annotation cp="→" type="tts">աջ ուղղված սլաք</annotation>
+ <annotation cp="↑">սլաք | վեր | վեր ուղղված սլաք</annotation>
+ <annotation cp="↑" type="tts">վեր ուղղված սլաք</annotation>
+ <annotation cp="↓">սլաք | վար | վար ուղղված սլաք</annotation>
+ <annotation cp="↓" type="tts">վար ուղղված սլաք</annotation>
+ <annotation cp="⇅">սլաք | վար | վեր | վեր և վար ուղղված սլաքներ</annotation>
+ <annotation cp="⇅" type="tts">վեր և վար ուղղված սլաքներ</annotation>
+ <annotation cp="⇆">աջ | ձախ | ձախ ուղղված սլաք՝ աջ ուղղվածի վրա | սլաք</annotation>
+ <annotation cp="⇆" type="tts">ձախ ուղղված սլաք՝ աջ ուղղվածի վրա</annotation>
+ <annotation cp="∆">ավելացում | եռանկյուն</annotation>
+ <annotation cp="∆" type="tts">ավելացում</annotation>
+ <annotation cp="∇">ատլեդ | եռանկյուն</annotation>
+ <annotation cp="∇" type="tts">ատլեդ</annotation>
+ <annotation cp="∈">()-ի տարր | անդամություն | բազմություն | պարունակում է | տարր</annotation>
+ <annotation cp="∈" type="tts">()-ի տարր</annotation>
+ <annotation cp="÷">բաժանած | բաժանման նշան | բաժանում | բավանման նշան | դաշույն</annotation>
+ <annotation cp="÷" type="tts">բաժանման նշան</annotation>
+ <annotation cp="×">անգամ | բազմապատկած | բազմապատկման նշան | բազմապատկում</annotation>
+ <annotation cp="×" type="tts">բազմապատկման նշան</annotation>
+ <annotation cp="⁻">հանած | վերգիր</annotation>
+ <annotation cp="⁻" type="tts">վերգիր հանած</annotation>
+ <annotation cp="√">արմատ | հիմք | ռադիկալ | սուրդ | քառակուսի</annotation>
+ <annotation cp="√" type="tts">քառակուսի արմատ</annotation>
+ <annotation cp="∞">անվերջության նշան | անվերջություն</annotation>
+ <annotation cp="∞" type="tts">անվերջության նշան</annotation>
+ <annotation cp="∩">բազմություն | հատում</annotation>
+ <annotation cp="∩" type="tts">հատում</annotation>
+ <annotation cp="∪">բազմություն | հավաքածու | միավորում</annotation>
+ <annotation cp="∪" type="tts">միավորում</annotation>
+ <annotation cp="≡">եռակի | ճշգրիտ | նույնական | նույնական առ</annotation>
+ <annotation cp="≡" type="tts">նույնական առ</annotation>
+ <annotation cp="⊂">()-ի ենթաբազմություն | բազմություն | ենթաբազմություն</annotation>
+ <annotation cp="⊂" type="tts">()-ի ենթաբազմություն</annotation>
+ <annotation cp="▲">եռանկյուն | հոծ | հոծ վեր ուղղված եռանկյուն | սլաք | վեր</annotation>
+ <annotation cp="▲" type="tts">հոծ վեր ուղղված եռանկյուն</annotation>
+ <annotation cp="▼">եռանկյուն | հոծ | հոծ վար ուղղված եռանկյուն | սլաք | վար</annotation>
+ <annotation cp="▼" type="tts">հոծ վար ուղղված եռանկյուն</annotation>
+ <annotation cp="◊">շեղանկյուն</annotation>
+ <annotation cp="◊" type="tts">շեղանկյուն</annotation>
+ <annotation cp="○">դատարկ | շրջան | սնամեջ շրջան | օղ | օղակ</annotation>
+ <annotation cp="○" type="tts">սնամեջ շրջան</annotation>
+ <annotation cp="●">հոծ շրջան | շրջան</annotation>
+ <annotation cp="●" type="tts">հոծ շրջան</annotation>
+ <annotation cp="◯">դատարկ | մեծ սնամեջ շրջան | շրջան | օղ | օղակ</annotation>
+ <annotation cp="◯" type="tts">մեծ սնամեջ շրջան</annotation>
<annotation cp="⚧">տրանսգենդեր | տրանսգենդերի նշան</annotation>
<annotation cp="⚧" type="tts">տրանսգենդերի նշան</annotation>
<annotation cp="🤌">բացատրություն | ժեստ | հեգնանք | մատներ | պտղունց</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ծիածանով դրոշ</annotation>
<annotation cp="🏴☠">գանձ | ծովահեն | ծովահենների դրոշ | կողոպուտ | Ուրախ Ռոջեր</annotation>
<annotation cp="🏴☠" type="tts">ծովահենների դրոշ</annotation>
+ <annotation cp="£">EGP | GBP | արժույթ | ֆունտ</annotation>
+ <annotation cp="£" type="tts">ֆունտ</annotation>
+ <annotation cp="¥">CNY | JPY | արժույթ | յեն | յուան</annotation>
+ <annotation cp="¥" type="tts">յեն</annotation>
+ <annotation cp="€">EUR | արժույթ | եվրո</annotation>
+ <annotation cp="€" type="tts">եվրո</annotation>
+ <annotation cp="₹">արժույթ | հնդկական ռուփի | ռուփի</annotation>
+ <annotation cp="₹" type="tts">հնդկական ռուփի</annotation>
+ <annotation cp="₽">արժույթ | ռուբլի</annotation>
+ <annotation cp="₽" type="tts">ռուբլի</annotation>
+ <annotation cp="¹">մեկ | վերգիր</annotation>
+ <annotation cp="¹" type="tts">վերգիր մեկ</annotation>
+ <annotation cp="²">երկու | վերգիր | քառակուսի</annotation>
+ <annotation cp="²" type="tts">վերգիր երկու</annotation>
+ <annotation cp="³">երեք | խորանարդ | վերգիր</annotation>
+ <annotation cp="³" type="tts">վերգիր երեք</annotation>
+ <annotation cp="µ">միկրոյի նշան | չափ</annotation>
+ <annotation cp="µ" type="tts">միկրոյի նշան</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/id.xml b/common/annotations/id.xml
index aa78129..b421685 100644
--- a/common/annotations/id.xml
+++ b/common/annotations/id.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">warna kulit gelap-sedang</annotation>
<annotation cp="🏿">tipe 6 | warna kulit | warna kulit gelap</annotation>
<annotation cp="🏿" type="tts">warna kulit gelap</annotation>
+ <annotation cp="–">en | en dash | tanda pisah</annotation>
+ <annotation cp="–" type="tts">en dash</annotation>
+ <annotation cp="—">em | em dash | tanda pisah</annotation>
+ <annotation cp="—" type="tts">em dash</annotation>
+ <annotation cp="·">interpunct | tengah | titik</annotation>
+ <annotation cp="·" type="tts">titik tengah</annotation>
+ <annotation cp="«">caret | chevron | guillemet kiri | kiri | sudut | tanda kurung | tanda petik</annotation>
+ <annotation cp="«" type="tts">guillemet kiri</annotation>
+ <annotation cp="»">caret | chevron | guillemet kanan | kanan | sudut | tanda kurung | tanda petik</annotation>
+ <annotation cp="»" type="tts">guillemet kanan</annotation>
+ <annotation cp="§">bagian | paragraf | seksi | silcrow</annotation>
+ <annotation cp="§" type="tts">bagian</annotation>
+ <annotation cp="†">dagger | obelisk | obelus | tanda dagger</annotation>
+ <annotation cp="†" type="tts">tanda dagger</annotation>
+ <annotation cp="‡">dagger | ganda | obelisk | obelus | tanda dagger ganda</annotation>
+ <annotation cp="‡" type="tts">tanda dagger ganda</annotation>
+ <annotation cp="•">bullet | titik</annotation>
+ <annotation cp="•" type="tts">bullet</annotation>
+ <annotation cp="°">derajat | jam | kadar</annotation>
+ <annotation cp="°" type="tts">derajat</annotation>
+ <annotation cp="℗">hak cipta | hak cipta rekaman suara | rekaman | suara</annotation>
+ <annotation cp="℗" type="tts">hak cipta rekaman suara</annotation>
+ <annotation cp="←">ke kiri | tanda panah | tanda panah mengarah ke kiri</annotation>
+ <annotation cp="←" type="tts">tanda panah mengarah ke kiri</annotation>
+ <annotation cp="→">kanan | tanda panah | tanda panah mengarah ke kanan</annotation>
+ <annotation cp="→" type="tts">tanda panah mengarah ke kanan</annotation>
+ <annotation cp="↑">ke atas | tanda panah | tanda panah mengarah ke atas</annotation>
+ <annotation cp="↑" type="tts">tanda panah mengarah ke atas</annotation>
+ <annotation cp="↓">ke bawah | tanda panah | tanda panah mengarah ke bawah</annotation>
+ <annotation cp="↓" type="tts">tanda panah mengarah ke bawah</annotation>
+ <annotation cp="⇅">ke atas | ke bawah | tanda panah | tanda panah mengarah ke atas dan ke bawah</annotation>
+ <annotation cp="⇅" type="tts">tanda panah mengarah ke atas dan ke bawah</annotation>
+ <annotation cp="⇆">ke kanan | ke kiri | tanda panah | tanda panah mengarah ke kiri di atas tanda panah mengarah ke kanan</annotation>
+ <annotation cp="⇆" type="tts">tanda panah mengarah ke kiri di atas tanda panah mengarah ke kanan</annotation>
+ <annotation cp="∆">pertambahan | segitiga</annotation>
+ <annotation cp="∆" type="tts">pertambahan</annotation>
+ <annotation cp="∇">nabla | segitiga</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">anggota | elemen | himpunan | keanggotaan | terdiri dari</annotation>
+ <annotation cp="∈" type="tts">anggota</annotation>
+ <annotation cp="÷">bagi | obelus | pembagian | tanda pembagian</annotation>
+ <annotation cp="÷" type="tts">tanda pembagian</annotation>
+ <annotation cp="×">kali | perkalian | tanda perkalian</annotation>
+ <annotation cp="×" type="tts">tanda perkalian</annotation>
+ <annotation cp="⁻">minus | superskrip</annotation>
+ <annotation cp="⁻" type="tts">minus superskrip</annotation>
+ <annotation cp="√">akar | bentuk akar | kuadrat | radikal | radiks</annotation>
+ <annotation cp="√" type="tts">akar kuadrat</annotation>
+ <annotation cp="∞">tak terhingga | tanda tak terhingga</annotation>
+ <annotation cp="∞" type="tts">tanda tak terhingga</annotation>
+ <annotation cp="∩">himpunan | irisan</annotation>
+ <annotation cp="∩" type="tts">irisan</annotation>
+ <annotation cp="∪">gabungan | himpunan | koleksi</annotation>
+ <annotation cp="∪" type="tts">gabungan</annotation>
+ <annotation cp="≡">persis | sama | setara dengan | tiga garis</annotation>
+ <annotation cp="≡" type="tts">setara dengan</annotation>
+ <annotation cp="⊂">himpunan | subhimpunan | subhimpunan dari</annotation>
+ <annotation cp="⊂" type="tts">subhimpunan dari</annotation>
+ <annotation cp="▲">ke atas | segitiga | segitiga solid mengarah ke atas | solid | tanda panah</annotation>
+ <annotation cp="▲" type="tts">segitiga solid mengarah ke atas</annotation>
+ <annotation cp="▼">ke bawah | segitiga | segitiga solid mengarah ke bawah | solid | tanda panah</annotation>
+ <annotation cp="▼" type="tts">segitiga solid mengarah ke bawah</annotation>
+ <annotation cp="◊">belah ketupat | berlian | rhombus</annotation>
+ <annotation cp="◊" type="tts">belah ketupat</annotation>
+ <annotation cp="○">cincin | lingkaran | lingkaran kosong</annotation>
+ <annotation cp="○" type="tts">lingkaran kosong</annotation>
+ <annotation cp="●">lingkaran | lingkaran solid</annotation>
+ <annotation cp="●" type="tts">lingkaran solid</annotation>
+ <annotation cp="◯">cincin | lingkaran | lingkaran kosong besar</annotation>
+ <annotation cp="◯" type="tts">lingkaran kosong besar</annotation>
<annotation cp="⚧">simbol transgender | transgender</annotation>
<annotation cp="⚧" type="tts">simbol transgender</annotation>
<annotation cp="🤌">interogasi | isyarat tangan | jari | sarkastik | terkuncup</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bendera pelangi</annotation>
<annotation cp="🏴☠">bajak | bajak laut | bendera bajak laut | harta karun | Jolly Roger</annotation>
<annotation cp="🏴☠" type="tts">bendera bajak laut</annotation>
+ <annotation cp="£">EGP | GBP | mata uang | pound</annotation>
+ <annotation cp="£" type="tts">pound</annotation>
+ <annotation cp="¥">CNY | JPY | mata uang | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | mata uang</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">mata uang | rupee | rupee india</annotation>
+ <annotation cp="₹" type="tts">rupee india</annotation>
+ <annotation cp="₽">mata uang | ruble</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">satu | superskrip</annotation>
+ <annotation cp="¹" type="tts">satu superskrip</annotation>
+ <annotation cp="²">dua | kuadrat | superskrip</annotation>
+ <annotation cp="²" type="tts">dua superskrip</annotation>
+ <annotation cp="³">kubik | superskrip | tiga</annotation>
+ <annotation cp="³" type="tts">tiga superskrip</annotation>
+ <annotation cp="µ">tanda mikro | ukuran</annotation>
+ <annotation cp="µ" type="tts">tanda mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/is.xml b/common/annotations/is.xml
index 68c8ed5..f96b00b 100644
--- a/common/annotations/is.xml
+++ b/common/annotations/is.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">meðaldökkur húðlitur</annotation>
<annotation cp="🏿">dökkur húðlitur | húðlitur | tegund 6</annotation>
<annotation cp="🏿" type="tts">dökkur húðlitur</annotation>
+ <annotation cp="–">stutt | tilstrik | þankastrik</annotation>
+ <annotation cp="–" type="tts">tilstrik</annotation>
+ <annotation cp="—">langt | þankastrik</annotation>
+ <annotation cp="—" type="tts">þankastrik</annotation>
+ <annotation cp="·">depill | miðdepill | miðja | miðjudepill | millipunktur</annotation>
+ <annotation cp="·" type="tts">miðjudepill</annotation>
+ <annotation cp="«">franskar gæsalappir vinstri | horn | hornklofar | innskotsmerki | setja í gæsalappir | tvíoddur | vinstri</annotation>
+ <annotation cp="«" type="tts">franskar gæsalappir vinstri</annotation>
+ <annotation cp="»">franskar gæsalappir hægri | hægri | horn | hornklofar | innskotsmerki | setja í gæsalappir | tvíoddur</annotation>
+ <annotation cp="»" type="tts">franskar gæsalappir hægri</annotation>
+ <annotation cp="§">efnisgrein | hluti | kaflamerki | silcrow</annotation>
+ <annotation cp="§" type="tts">kaflamerki</annotation>
+ <annotation cp="†">broddsúla | obelus | úreldingarmerki</annotation>
+ <annotation cp="†" type="tts">úreldingarmerki</annotation>
+ <annotation cp="‡">broddsúla | obelus | tvöfalt | úreldingarmerki</annotation>
+ <annotation cp="‡" type="tts">tvöfalt úreldingarmerki</annotation>
+ <annotation cp="•">depill | merkill</annotation>
+ <annotation cp="•" type="tts">merkill</annotation>
+ <annotation cp="°">alkóhólstyrkur | gráða | klukkustund</annotation>
+ <annotation cp="°" type="tts">gráða</annotation>
+ <annotation cp="℗">hljóð | höfundarréttur | höfundarréttur hljóðupptöku | upptaka</annotation>
+ <annotation cp="℗" type="tts">höfundarréttur hljóðupptöku</annotation>
+ <annotation cp="←">ör | ör sem vísar til vinstri | vinstri</annotation>
+ <annotation cp="←" type="tts">ör sem vísar til vinstri</annotation>
+ <annotation cp="→">hægri | ör | ör sem vísar til hægri</annotation>
+ <annotation cp="→" type="tts">ör sem vísar til hægri</annotation>
+ <annotation cp="↑">ör | ör sem vísar upp | upp</annotation>
+ <annotation cp="↑" type="tts">ör sem vísar upp</annotation>
+ <annotation cp="↓">niður | ör | ör sem vísar niður</annotation>
+ <annotation cp="↓" type="tts">ör sem vísar niður</annotation>
+ <annotation cp="⇅">niður | ör | ör sem vísar upp og ör sem vísar niður | upp</annotation>
+ <annotation cp="⇅" type="tts">ör sem vísar upp og ör sem vísar niður</annotation>
+ <annotation cp="⇆">hægri | ör | ör sem vísar til vinstri yfir ör sem vísar til hægri | vinstri | vinstriör yfir hægriör</annotation>
+ <annotation cp="⇆" type="tts">vinstriör yfir hægriör</annotation>
+ <annotation cp="∆">aukning | þríhyrningur</annotation>
+ <annotation cp="∆" type="tts">aukning</annotation>
+ <annotation cp="∇">nafla | þríhyrningur</annotation>
+ <annotation cp="∇" type="tts">nafla</annotation>
+ <annotation cp="∈">aðild | inniheldur | mengi | stak | stak í</annotation>
+ <annotation cp="∈" type="tts">stak í</annotation>
+ <annotation cp="÷">deila | deiling | deilingarmerki | obelus</annotation>
+ <annotation cp="÷" type="tts">deilingarmerki</annotation>
+ <annotation cp="×">margfalda | margföldun | margföldunarmerki | sinnum</annotation>
+ <annotation cp="×" type="tts">margföldunarmerki</annotation>
+ <annotation cp="⁻">brjóstletur | mínus</annotation>
+ <annotation cp="⁻" type="tts">brjóstletur mínus</annotation>
+ <annotation cp="√">annað veldi | kvaðratrót | óræð tala | rót | rótarstærð | stofntala</annotation>
+ <annotation cp="√" type="tts">kvaðratrót</annotation>
+ <annotation cp="∞">óendanlegt | óendanlegt-merki</annotation>
+ <annotation cp="∞" type="tts">óendanlegt-merki</annotation>
+ <annotation cp="∩">mengi | sniðmengi</annotation>
+ <annotation cp="∩" type="tts">sniðmengi</annotation>
+ <annotation cp="∪">mengi | sammengi | samsafn</annotation>
+ <annotation cp="∪" type="tts">sammengi</annotation>
+ <annotation cp="≡">nákvæmlega eins | nákvæmlega eins og | nákvæmur | þrefalt</annotation>
+ <annotation cp="≡" type="tts">nákvæmlega eins og</annotation>
+ <annotation cp="⊂">hlutmengi | hlutmengi í | mengi</annotation>
+ <annotation cp="⊂" type="tts">hlutmengi í</annotation>
+ <annotation cp="▲">fylltur | fylltur þríhyrningur sem vísar upp | ör | upp | þríhyrningur</annotation>
+ <annotation cp="▲" type="tts">fylltur þríhyrningur sem vísar upp</annotation>
+ <annotation cp="▼">fylltur | fylltur þríhyrningur sem vísar niður | niður | ör | þríhyrningur</annotation>
+ <annotation cp="▼" type="tts">fylltur þríhyrningur sem vísar niður</annotation>
+ <annotation cp="◊">demantur | rhombus | tígullaga</annotation>
+ <annotation cp="◊" type="tts">tígullaga</annotation>
+ <annotation cp="○">holur hringflötur | hringflötur | hringur</annotation>
+ <annotation cp="○" type="tts">holur hringflötur</annotation>
+ <annotation cp="●">fylltur hringflötur | hringflötur</annotation>
+ <annotation cp="●" type="tts">fylltur hringflötur</annotation>
+ <annotation cp="◯">hringflötur | hringur | stór holur hringflötur</annotation>
+ <annotation cp="◯" type="tts">stór holur hringflötur</annotation>
<annotation cp="⚧">trans | transmerki</annotation>
<annotation cp="⚧" type="tts">transmerki</annotation>
<annotation cp="🤌">fingur | handahreyfing | kaldhæðni | klípa | klípandi fingur | yfirheyrsla</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">regnbogafáni</annotation>
<annotation cp="🏴☠">fjársjóður | hausk´úpuflagg | ræna og rupla | sjóræningi | sjóræningjafáni</annotation>
<annotation cp="🏴☠" type="tts">sjóræningjafáni</annotation>
+ <annotation cp="£">EGP | GBP | gjaldmiðill | pund</annotation>
+ <annotation cp="£" type="tts">pund</annotation>
+ <annotation cp="¥">CNY | gjaldmiðill | jen | JPY | júan</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | evra | gjaldmiðill</annotation>
+ <annotation cp="€" type="tts">evra</annotation>
+ <annotation cp="₹">gjaldmiðill | indversk rúpía | rúpía</annotation>
+ <annotation cp="₹" type="tts">indversk rúpía</annotation>
+ <annotation cp="₽">gjaldmiðill | rúbla</annotation>
+ <annotation cp="₽" type="tts">rúbla</annotation>
+ <annotation cp="¹">brjóstletur | einn</annotation>
+ <annotation cp="¹" type="tts">brjóstletur einn</annotation>
+ <annotation cp="²">brjóstletur | í öðru veldi | tveir</annotation>
+ <annotation cp="²" type="tts">brjóstletur tveir</annotation>
+ <annotation cp="³">brjóstletur | í þriðja veldi | þrír</annotation>
+ <annotation cp="³" type="tts">brjóstletur þrír</annotation>
+ <annotation cp="µ">mál | míkró-merki</annotation>
+ <annotation cp="µ" type="tts">míkró-merki</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/it.xml b/common/annotations/it.xml
index 1eb3904..6c51c6d 100644
--- a/common/annotations/it.xml
+++ b/common/annotations/it.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">carnagione abbastanza scura</annotation>
<annotation cp="🏿">carnagione scura | colore della pelle | fototipo | pelle scura | tonalità</annotation>
<annotation cp="🏿" type="tts">carnagione scura</annotation>
+ <annotation cp="–">corto | trattino</annotation>
+ <annotation cp="–" type="tts">trattino corto</annotation>
+ <annotation cp="—">lungo | trattino</annotation>
+ <annotation cp="—" type="tts">trattino lungo</annotation>
+ <annotation cp="·">centrato | mediano | punto | segno di interpunzione</annotation>
+ <annotation cp="·" type="tts">punto mediano</annotation>
+ <annotation cp="«">apertura | caporali | francesi | parentesi | virgolette | virgolette basse aperte | virgolette basse doppie aperte</annotation>
+ <annotation cp="«" type="tts">virgolette basse doppie aperte</annotation>
+ <annotation cp="»">caporali | chiusura | francesi | parentesi | virgolette | virgolette basse chiuse | virgolette basse doppie chiuse</annotation>
+ <annotation cp="»" type="tts">virgolette basse doppie chiuse</annotation>
+ <annotation cp="§">paragrafo | parte | sezione | simbolo di sezione</annotation>
+ <annotation cp="§" type="tts">simbolo di sezione</annotation>
+ <annotation cp="†">obelisco | òbelo | simbolo dell’obelisco</annotation>
+ <annotation cp="†" type="tts">simbolo dell’obelisco</annotation>
+ <annotation cp="‡">doppio | obelisco | òbelo | simbolo del doppio obelisco</annotation>
+ <annotation cp="‡" type="tts">simbolo del doppio obelisco</annotation>
+ <annotation cp="•">elenco | punto</annotation>
+ <annotation cp="•" type="tts">punto elenco</annotation>
+ <annotation cp="°">grado | ora | proof | simbolo di grado</annotation>
+ <annotation cp="°" type="tts">simbolo di grado</annotation>
+ <annotation cp="℗">copyright | registrazione | simbolo di copyright della registrazione sonora | sonora</annotation>
+ <annotation cp="℗" type="tts">simbolo di copyright della registrazione sonora</annotation>
+ <annotation cp="←">freccia | freccia a sinistra | freccia verso sinistra | sinistra</annotation>
+ <annotation cp="←" type="tts">freccia verso sinistra</annotation>
+ <annotation cp="→">destra | freccia | freccia a destra | freccia verso destra</annotation>
+ <annotation cp="→" type="tts">freccia verso destra</annotation>
+ <annotation cp="↑">freccia | freccia in alto | freccia verso l’alto | in alto</annotation>
+ <annotation cp="↑" type="tts">freccia verso l’alto</annotation>
+ <annotation cp="↓">freccia | freccia in basso | freccia verso il basso | in basso</annotation>
+ <annotation cp="↓" type="tts">freccia verso il basso</annotation>
+ <annotation cp="⇅">freccia | freccia in alto e in basso | freccia verso l’alto e freccia verso il basso | in alto | in basso</annotation>
+ <annotation cp="⇅" type="tts">freccia verso l’alto e freccia verso il basso</annotation>
+ <annotation cp="⇆">destra | freccia | freccia a sinistra su freccia a destra | freccia verso sinistra su freccia verso destra | sinistra</annotation>
+ <annotation cp="⇆" type="tts">freccia verso sinistra su freccia verso destra</annotation>
+ <annotation cp="∆">delta | incremento | simbolo di incremento | triangolo</annotation>
+ <annotation cp="∆" type="tts">simbolo di incremento</annotation>
+ <annotation cp="∇">delta rovesciato | nabla | triangolo rovesciato</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">appartenente a | contiene | elemento | insieme | relazione | simbolo di appartenenza</annotation>
+ <annotation cp="∈" type="tts">simbolo di appartenenza</annotation>
+ <annotation cp="÷">dividere | divisione | obelo | segno della divisione | segno di divisione</annotation>
+ <annotation cp="÷" type="tts">segno di divisione</annotation>
+ <annotation cp="×">moltiplicare | moltiplicazione | per | segno della moltiplicazione | segno di moltiplicazione</annotation>
+ <annotation cp="×" type="tts">segno di moltiplicazione</annotation>
+ <annotation cp="⁻">apice | meno | segno meno in apice</annotation>
+ <annotation cp="⁻" type="tts">segno meno in apice</annotation>
+ <annotation cp="√">numero irrazionale | quadrata | radicale | radice</annotation>
+ <annotation cp="√" type="tts">radice quadrata</annotation>
+ <annotation cp="∞">infinito | simbolo di infinito</annotation>
+ <annotation cp="∞" type="tts">simbolo di infinito</annotation>
+ <annotation cp="∩">insieme | intersezione | simbolo di intersezione</annotation>
+ <annotation cp="∩" type="tts">simbolo di intersezione</annotation>
+ <annotation cp="∪">insieme | raccolta | simbolo di unione | unione</annotation>
+ <annotation cp="∪" type="tts">simbolo di unione</annotation>
+ <annotation cp="≡">coincidente | esatto | identico | simbolo di coincidenza | tre lineette</annotation>
+ <annotation cp="≡" type="tts">simbolo di coincidenza</annotation>
+ <annotation cp="⊂">insieme | simbolo di sottoinsieme | sottoinsieme | sottoinsieme di</annotation>
+ <annotation cp="⊂" type="tts">simbolo di sottoinsieme</annotation>
+ <annotation cp="▲">freccia | in alto | pieno | triangolo | triangolo pieno con punta verso l’alto | triangolo pieno rivolto verso l’alto</annotation>
+ <annotation cp="▲" type="tts">triangolo pieno rivolto verso l’alto</annotation>
+ <annotation cp="▼">freccia | in basso | pieno | triangolo | triangolo pieno capovolto | triangolo pieno con punta verso il basso</annotation>
+ <annotation cp="▼" type="tts">triangolo pieno capovolto</annotation>
+ <annotation cp="◊">diamante | losanga | rombo</annotation>
+ <annotation cp="◊" type="tts">losanga</annotation>
+ <annotation cp="○">anello | cerchio | cerchio vuoto</annotation>
+ <annotation cp="○" type="tts">cerchio vuoto</annotation>
+ <annotation cp="●">cerchio | cerchio pieno</annotation>
+ <annotation cp="●" type="tts">cerchio pieno</annotation>
+ <annotation cp="◯">anello | cerchio | cerchio vuoto grande</annotation>
+ <annotation cp="◯" type="tts">cerchio vuoto grande</annotation>
<annotation cp="⚧">simbolo transgender | transgender</annotation>
<annotation cp="⚧" type="tts">simbolo transgender</annotation>
<annotation cp="🤌">dita | dita unite | gesto della mano | interrogativo | mano a pigna | sarcastico</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bandiera arcobaleno</annotation>
<annotation cp="🏴☠">bandiera dei pirati | corsari | corsaro | pirata | pirati</annotation>
<annotation cp="🏴☠" type="tts">bandiera dei pirati</annotation>
+ <annotation cp="£">EGP | GBP | simbolo della sterlina | sterlina | valuta</annotation>
+ <annotation cp="£" type="tts">simbolo della sterlina</annotation>
+ <annotation cp="¥">CNY | JPY | simbolo dello yen | valuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">simbolo dello yen</annotation>
+ <annotation cp="€">EUR | euro | simbolo dell’euro | valuta</annotation>
+ <annotation cp="€" type="tts">simbolo dell’euro</annotation>
+ <annotation cp="₹">rupia | rupia indiana | simbolo della rupia indiana | valuta</annotation>
+ <annotation cp="₹" type="tts">simbolo della rupia indiana</annotation>
+ <annotation cp="₽">rublo | simbolo del rublo | valuta</annotation>
+ <annotation cp="₽" type="tts">simbolo del rublo</annotation>
+ <annotation cp="¹">apice | numero uno in apice | uno</annotation>
+ <annotation cp="¹" type="tts">numero uno in apice</annotation>
+ <annotation cp="²">apice | due | numero due in apice | valore al quadrato</annotation>
+ <annotation cp="²" type="tts">numero due in apice</annotation>
+ <annotation cp="³">apice | numero tre in apice | tre | valore al cubo</annotation>
+ <annotation cp="³" type="tts">numero tre in apice</annotation>
+ <annotation cp="µ">simbolo del micron | unità di misura</annotation>
+ <annotation cp="µ" type="tts">simbolo del micron</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ja.xml b/common/annotations/ja.xml
index 2e0cfaa..3fd17e2 100644
--- a/common/annotations/ja.xml
+++ b/common/annotations/ja.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">やや濃い肌色</annotation>
<annotation cp="🏿">濃い肌色 | 肌の色 | 肌色6</annotation>
<annotation cp="🏿" type="tts">濃い肌色</annotation>
+ <annotation cp="–">enダッシュ | エヌダッシュ | ダッシュ</annotation>
+ <annotation cp="–" type="tts">enダッシュ</annotation>
+ <annotation cp="—">emダッシュ | エムダッシュ | ダッシュ</annotation>
+ <annotation cp="—" type="tts">emダッシュ</annotation>
+ <annotation cp="·">中点 | 中黒 | 点 | 黒丸</annotation>
+ <annotation cp="·" type="tts">中点</annotation>
+ <annotation cp="«">カッコ | 二重ギュメ | 山パーレン | 左ギュメ | 左山括弧 | 引用符</annotation>
+ <annotation cp="«" type="tts">左山括弧</annotation>
+ <annotation cp="»">カッコ | 二重ギュメ | 右ギュメ | 右山括弧 | 山パーレン | 引用符</annotation>
+ <annotation cp="»" type="tts">右山括弧</annotation>
+ <annotation cp="§">セクション | 段落 | 節 | 節記号 | 項</annotation>
+ <annotation cp="§" type="tts">節記号</annotation>
+ <annotation cp="†">オベリスク | ダガー | 剣標 | 短剣符</annotation>
+ <annotation cp="†" type="tts">短剣符</annotation>
+ <annotation cp="‡">オベリスク | ダガー | ダブルダガー | 二重剣標 | 二重短剣符</annotation>
+ <annotation cp="‡" type="tts">二重短剣符</annotation>
+ <annotation cp="•">ビュレット | 点 | 箇条書き</annotation>
+ <annotation cp="•" type="tts">ビュレット</annotation>
+ <annotation cp="°">度 | 時間 | 温度 | 角度</annotation>
+ <annotation cp="°" type="tts">度</annotation>
+ <annotation cp="℗">レコード | 原盤権 | 原盤権マーク | 著作権</annotation>
+ <annotation cp="℗" type="tts">原盤権マーク</annotation>
+ <annotation cp="←">左 | 左向矢印 | 左矢印 | 矢印</annotation>
+ <annotation cp="←" type="tts">左向矢印</annotation>
+ <annotation cp="→">右 | 右向矢印 | 右矢印 | 矢印</annotation>
+ <annotation cp="→" type="tts">右向矢印</annotation>
+ <annotation cp="↑">上 | 上向矢印 | 上矢印 | 矢印</annotation>
+ <annotation cp="↑" type="tts">上向矢印</annotation>
+ <annotation cp="↓">下 | 下向矢印 | 下矢印 | 矢印</annotation>
+ <annotation cp="↓" type="tts">下向矢印</annotation>
+ <annotation cp="⇅">アップダウン | 上下矢印 | 上向矢印下向矢印 | 矢印</annotation>
+ <annotation cp="⇅" type="tts">上向矢印下向矢印</annotation>
+ <annotation cp="⇆">左右矢印 | 左向矢印右向矢印 | 往復 | 矢印</annotation>
+ <annotation cp="⇆" type="tts">左向矢印右向矢印</annotation>
+ <annotation cp="∆">デルタ | 三角 | 増分</annotation>
+ <annotation cp="∆" type="tts">増分</annotation>
+ <annotation cp="∇">ナブラ | 三角 | 逆三角</annotation>
+ <annotation cp="∇" type="tts">ナブラ</annotation>
+ <annotation cp="∈">元 | 包含 | 属する | 要素 | 集合</annotation>
+ <annotation cp="∈" type="tts">属する</annotation>
+ <annotation cp="÷">割り算 | 割り算記号 | 割る | 除算記号</annotation>
+ <annotation cp="÷" type="tts">除算記号</annotation>
+ <annotation cp="×">乗算記号 | 倍 | 掛ける | 掛け算 | 掛け算記号</annotation>
+ <annotation cp="×" type="tts">乗算記号</annotation>
+ <annotation cp="⁻">マイナス | 上付きマイナス | 添え字</annotation>
+ <annotation cp="⁻" type="tts">上付きマイナス</annotation>
+ <annotation cp="√">ルート | 二乗根 | 平方根 | 根号</annotation>
+ <annotation cp="√" type="tts">平方根</annotation>
+ <annotation cp="∞">インフィニティ | メビウスの輪 | 無限大記号</annotation>
+ <annotation cp="∞" type="tts">無限大記号</annotation>
+ <annotation cp="∩">共通部分 | 積集合 | 集合</annotation>
+ <annotation cp="∩" type="tts">積集合</annotation>
+ <annotation cp="∪">合併集合 | 和集合 | 集合</annotation>
+ <annotation cp="∪" type="tts">和集合</annotation>
+ <annotation cp="≡">3本線 | 合同 | 合同記号 | 常に等しい | 恒等式</annotation>
+ <annotation cp="≡" type="tts">常に等しい</annotation>
+ <annotation cp="⊂">真部分集合 | 部分集合 | 集合</annotation>
+ <annotation cp="⊂" type="tts">真部分集合</annotation>
+ <annotation cp="▲">三角 | 上 | 上向黒三角 | 塗りつぶし | 矢印 | 黒三角</annotation>
+ <annotation cp="▲" type="tts">上向黒三角</annotation>
+ <annotation cp="▼">三角 | 下 | 下向黒三角 | 塗りつぶし | 矢印 | 黒三角</annotation>
+ <annotation cp="▼" type="tts">下向黒三角</annotation>
+ <annotation cp="◊">ダイア | ダイヤ | ひし形 | 四角</annotation>
+ <annotation cp="◊" type="tts">ひし形</annotation>
+ <annotation cp="○">中抜き | 丸 | 白丸 | 輪</annotation>
+ <annotation cp="○" type="tts">白丸</annotation>
+ <annotation cp="●">丸 | 塗りつぶし | 黒丸</annotation>
+ <annotation cp="●" type="tts">黒丸</annotation>
+ <annotation cp="◯">中抜き | 丸 | 大きな白丸 | 白丸大 | 輪</annotation>
+ <annotation cp="◯" type="tts">白丸大</annotation>
<annotation cp="⚧">LGBT | TG | シンボル | トランスジェンダーのマーク | 性別</annotation>
<annotation cp="⚧" type="tts">トランスジェンダーのマーク</annotation>
<annotation cp="🤌">ジェスチャー | すぼめる | 上向きにすぼめた手 | 手 | 指</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">レインボーフラッグ</annotation>
<annotation cp="🏴☠">ジョリー・ロジャー | 宝物 | 海賊 | 海賊旗 | 略奪</annotation>
<annotation cp="🏴☠" type="tts">海賊旗</annotation>
+ <annotation cp="£">EGP | GBP | エジプトポンド | ポンド | 英ポンド | 通貨</annotation>
+ <annotation cp="£" type="tts">ポンド</annotation>
+ <annotation cp="¥">CNY | JPY | 中国元 | 円 | 日本円 | 通貨</annotation>
+ <annotation cp="¥" type="tts">円</annotation>
+ <annotation cp="€">EUR | ユーロ | 通貨</annotation>
+ <annotation cp="€" type="tts">ユーロ</annotation>
+ <annotation cp="₹">インドルピー | ルピー | 通貨</annotation>
+ <annotation cp="₹" type="tts">インドルピー</annotation>
+ <annotation cp="₽">ルーブル | ロシアルーブル | 通貨</annotation>
+ <annotation cp="₽" type="tts">ルーブル</annotation>
+ <annotation cp="¹">1 | 上付き1 | 添え字</annotation>
+ <annotation cp="¹" type="tts">上付き1</annotation>
+ <annotation cp="²">2 | 2乗 | 上付き2 | 添え字</annotation>
+ <annotation cp="²" type="tts">上付き2</annotation>
+ <annotation cp="³">3 | 3乗 | 上付き3 | 添え字</annotation>
+ <annotation cp="³" type="tts">上付き3</annotation>
+ <annotation cp="µ">マイクロ記号 | ミクロ | 単位</annotation>
+ <annotation cp="µ" type="tts">マイクロ記号</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/jv.xml b/common/annotations/jv.xml
index b76bb28..c119f17 100644
--- a/common/annotations/jv.xml
+++ b/common/annotations/jv.xml
@@ -24,6 +24,76 @@
<annotation cp="🏾" type="tts">kulit sawo mateng</annotation>
<annotation cp="🏿">kulit ireng | praupan kulit | tipe 6</annotation>
<annotation cp="🏿" type="tts">kulit ireng</annotation>
+ <annotation cp="–">en | setrip</annotation>
+ <annotation cp="–" type="tts">en setrip</annotation>
+ <annotation cp="—">em | setrip</annotation>
+ <annotation cp="—" type="tts">em setrip</annotation>
+ <annotation cp="·">mudhuk | tengah | titik | titik cilek</annotation>
+ <annotation cp="·" type="tts">titik cilek</annotation>
+ <annotation cp="«">amba | kiwa | kurung | kurung lancip kiwa | nggulung | ngutip | v kualik</annotation>
+ <annotation cp="«" type="tts">kurung lancip kiwa</annotation>
+ <annotation cp="»">amba | kurung | kurung lancip tengen | nggulung | ngutip | tengen | v kualik</annotation>
+ <annotation cp="»" type="tts">kurung lancip tengen</annotation>
+ <annotation cp="§">bagean | bagean cilik | gugus ukara | tanda bagean</annotation>
+ <annotation cp="§" type="tts">bagean</annotation>
+ <annotation cp="†">lading | obelisk | obelus | tanda lading</annotation>
+ <annotation cp="†" type="tts">tanda lading</annotation>
+ <annotation cp="‡">lading | obelisk | obelus | pindo | tanda lading pindo</annotation>
+ <annotation cp="‡" type="tts">tanda lading pindo</annotation>
+ <annotation cp="•">pluru | titik</annotation>
+ <annotation cp="•" type="tts">pluru</annotation>
+ <annotation cp="°">bukti | drajat | jam</annotation>
+ <annotation cp="°" type="tts">drajat</annotation>
+ <annotation cp="℗">hak cipta | hak cipta rekaman swara | rekaman | swara</annotation>
+ <annotation cp="℗" type="tts">hak cipta rekaman swara</annotation>
+ <annotation cp="←">kiwo | panah | panah nuding ngiwo</annotation>
+ <annotation cp="←" type="tts">panah nuding ngiwo</annotation>
+ <annotation cp="→">panah | panah nuding nengen | tengen</annotation>
+ <annotation cp="→" type="tts">panah nuding nengen</annotation>
+ <annotation cp="↑">ndhuwur | panah | panah nuding ndhuwur</annotation>
+ <annotation cp="↑" type="tts">panah nuding ndhuwur</annotation>
+ <annotation cp="↓">ngisor | panah | panah nuding ngisor</annotation>
+ <annotation cp="↓" type="tts">panah nuding ngisor</annotation>
+ <annotation cp="⇅">ndhuwur | ngisor | panah | panah nuding ndhuwur lan nuding ngisor</annotation>
+ <annotation cp="⇅" type="tts">panah nuding ndhuwur lan nuding ngisor</annotation>
+ <annotation cp="⇆">kiwo | panah | panah nuding ngiwo lewat sisih tengen | tengen</annotation>
+ <annotation cp="⇆" type="tts">panah nuding ngiwo lewat sisih tengen</annotation>
+ <annotation cp="∆">mundhak | pesagi telu</annotation>
+ <annotation cp="∆" type="tts">mundhak</annotation>
+ <annotation cp="∇">mlorot | pesagi telu</annotation>
+ <annotation cp="∇" type="tts">mlorot</annotation>
+ <annotation cp="∈">kaanggotaan | ngamot | set | unsur | unsur saka</annotation>
+ <annotation cp="∈" type="tts">unsur saka</annotation>
+ <annotation cp="÷">dipara | obelus | para | tandha para</annotation>
+ <annotation cp="÷" type="tts">para</annotation>
+ <annotation cp="×">dipingke | kaping | ping-pingan | tandha ping-pingan</annotation>
+ <annotation cp="×" type="tts">ping-pingan</annotation>
+ <annotation cp="⁻">kurang | tandha ing dhuwur | tandha kurang ing dhuwur</annotation>
+ <annotation cp="⁻" type="tts">tandha kurang ing dhuwur</annotation>
+ <annotation cp="√">oyod | oyod peng loro | peng loro | radikal | radix | surd</annotation>
+ <annotation cp="√" type="tts">oyod peng loro</annotation>
+ <annotation cp="∞">tandha tanpa wates | tanpa wates</annotation>
+ <annotation cp="∞" type="tts">tandha tanpa wates</annotation>
+ <annotation cp="∩">set | simpangan</annotation>
+ <annotation cp="∩" type="tts">simpangan</annotation>
+ <annotation cp="∪">koleksi | sarekat | set</annotation>
+ <annotation cp="∪" type="tts">sarekat</annotation>
+ <annotation cp="≡">peng telu | persis | podho | podho karo</annotation>
+ <annotation cp="≡" type="tts">podho karo</annotation>
+ <annotation cp="⊂">set | subset | subset saka</annotation>
+ <annotation cp="⊂" type="tts">subset saka</annotation>
+ <annotation cp="▲">kapenuhan | ndhuwur | panah | pesagi telu | pesagi telu kapenuhan pucuke ing ndhuwur</annotation>
+ <annotation cp="▲" type="tts">pesagi telu kapenuhan pucuke ing ndhuwur</annotation>
+ <annotation cp="▼">kapenuhan | ngisor | panah | pesagi telu | pesagi telu kapenuhan pucuke ing ngisor</annotation>
+ <annotation cp="▼" type="tts">pesagi telu kapenuhan pucuke ing ngisor</annotation>
+ <annotation cp="◊">kupatan | pesagi papat kupatan | sigaran kupatan</annotation>
+ <annotation cp="◊" type="tts">pesagi papat kupatan</annotation>
+ <annotation cp="○">binderan | bunderan kothong | cincen</annotation>
+ <annotation cp="○" type="tts">bunderan kothong</annotation>
+ <annotation cp="●">bundera kapenuhan | bunderan | bunderan kapenuhan</annotation>
+ <annotation cp="●" type="tts">bundera kapenuhan</annotation>
+ <annotation cp="◯">bunderan | bunderan kothong gedhe | cincen</annotation>
+ <annotation cp="◯" type="tts">bunderan kothong gedhe</annotation>
<annotation cp="⚧">tandha wariya | wariya</annotation>
<annotation cp="⚧" type="tts">tandha wariya</annotation>
<annotation cp="🤌">basa tangan | digatukake | driji | interogasi | landep</annotation>
@@ -3008,5 +3078,23 @@
<annotation cp="🏳🌈" type="tts">gendera plangi</annotation>
<annotation cp="🏴☠">bandhane karun | begal segara | gendera begal segara | jarah | Jolly Roger</annotation>
<annotation cp="🏴☠" type="tts">gendera begal segara</annotation>
+ <annotation cp="£">EGP | GBP | pound | valuta</annotation>
+ <annotation cp="£" type="tts">pound</annotation>
+ <annotation cp="¥">CNY | JPY | valuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">rupee | rupee india | valuta</annotation>
+ <annotation cp="₹" type="tts">rupee india</annotation>
+ <annotation cp="₽">ruble | valuta</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">siji | tandha ing dhuwur | tandha siji ing dhuwur</annotation>
+ <annotation cp="¹" type="tts">tandha siji ing dhuwur</annotation>
+ <annotation cp="²">loro | peng loro | tandha ing dhuwur | tandha loro ing dhuwur</annotation>
+ <annotation cp="²" type="tts">tandha loro ing dhuwur</annotation>
+ <annotation cp="³">pesagi | tandha ing dhuwur | tandha telu ing dhuwur | telu</annotation>
+ <annotation cp="³" type="tts">tandha telu ing dhuwur</annotation>
+ <annotation cp="µ">ngukur | tandha mikro</annotation>
+ <annotation cp="µ" type="tts">tandha mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ka.xml b/common/annotations/ka.xml
index ed8ad17..ee6ac0e 100644
--- a/common/annotations/ka.xml
+++ b/common/annotations/ka.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">საშუალოდან მუქამდე კანის ტონალობა</annotation>
<annotation cp="🏿">ემოჯი მოდიფიკატორი | კანი | კანის მუქი ტონალობა | ტონი | ფიცპატრიკი</annotation>
<annotation cp="🏿" type="tts">კანის მუქი ტონალობა</annotation>
+ <annotation cp="–">საშუალო | ტირე</annotation>
+ <annotation cp="–" type="tts">საშუალო ტირე</annotation>
+ <annotation cp="—">გრძელი | ტირე</annotation>
+ <annotation cp="—" type="tts">გრძელი ტირე</annotation>
+ <annotation cp="·">შუა | შუა პუნქტი | წერტილი</annotation>
+ <annotation cp="·" type="tts">შუა წერტილი</annotation>
+ <annotation cp="«">ბრჭყალები | კუთხე | კუთხოვანი ბრჭყალები | მარცხენა ბრჭყალი | მარცხენა ორმაგი კუთხოვანი ბრჭყალი | მარჯვნივ | შევრონი | ციტირება</annotation>
+ <annotation cp="«" type="tts">მარცხენა ორმაგი კუთხოვანი ბრჭყალი</annotation>
+ <annotation cp="»">ბრჭყალები | კუთხე | კუთხოვანი ბრჭყალები | მარჯვენა ბრჭყალი | მარჯვენა ორმაგი კუთხოვანი ბრჭყალი | მარჯვნივ | შევრონი | ციტირება</annotation>
+ <annotation cp="»" type="tts">მარჯვენა ორმაგი კუთხოვანი ბრჭყალი</annotation>
+ <annotation cp="§">თავი | ნაწილი | პარაგრაფი | სექცია</annotation>
+ <annotation cp="§" type="tts">პარაგრაფი</annotation>
+ <annotation cp="†">ობელისკი | ხანჯალი | ხანჯლის ნიშანი | ჯვარი</annotation>
+ <annotation cp="†" type="tts">ხანჯლის ნიშანი</annotation>
+ <annotation cp="‡">ობელისკი | ორმაგი | ორმაგი ხანჯლის ნიშანი | ხანჯალი | ჯვარი</annotation>
+ <annotation cp="‡" type="tts">ორმაგი ხანჯლის ნიშანი</annotation>
+ <annotation cp="•">ბულეტი | ბურთი | ბურთულა | წერტილი</annotation>
+ <annotation cp="•" type="tts">ბურთი</annotation>
+ <annotation cp="°">გრადუსი | დამოწმება | საათი</annotation>
+ <annotation cp="°" type="tts">გრადუსი</annotation>
+ <annotation cp="℗">საავტორო უფლება | საავტორო უფლება ხმოვან ჩანაწერზე | ჩანაწერი | ხმა</annotation>
+ <annotation cp="℗" type="tts">საავტორო უფლება ხმოვან ჩანაწერზე</annotation>
+ <annotation cp="←">ისარი | მარცხნივ | მარცხნივ მიმართული ისარი</annotation>
+ <annotation cp="←" type="tts">მარცხნივ მიმართული ისარი</annotation>
+ <annotation cp="→">ისარი | მარჯვნივ | მარჯვნივ მიმართული ისარი</annotation>
+ <annotation cp="→" type="tts">მარჯვნივ მიმართული ისარი</annotation>
+ <annotation cp="↑">ზემოთ | ზემოთ მიმართული ისარი | ისარი</annotation>
+ <annotation cp="↑" type="tts">ზემოთ მიმართული ისარი</annotation>
+ <annotation cp="↓">ისარი | ქვემოთ | ქვემოთ მიმართული ისარი</annotation>
+ <annotation cp="↓" type="tts">ქვემოთ მიმართული ისარი</annotation>
+ <annotation cp="⇅">ზემოთ | ზემოთ მიმართული და ქვემოთ მიმართული ისრები | ისარი | ქვემოთ</annotation>
+ <annotation cp="⇅" type="tts">ზემოთ მიმართული და ქვემოთ მიმართული ისრები</annotation>
+ <annotation cp="⇆">ისარი | მარცხნივ | მარცხნივ მიმართული და მის ქვემოთ მარჯვნივ მიმართული ისრები | მარჯვნივ</annotation>
+ <annotation cp="⇆" type="tts">მარცხნივ მიმართული და მის ქვემოთ მარჯვნივ მიმართული ისრები</annotation>
+ <annotation cp="∆">ნაზრდი | სამკუთხედი</annotation>
+ <annotation cp="∆" type="tts">ნაზრდი</annotation>
+ <annotation cp="∇">ნაბლა | სამკუთხედი</annotation>
+ <annotation cp="∇" type="tts">ნაბლა</annotation>
+ <annotation cp="∈">ელემენტი | სიმრავლე | შეიცავს | შემცველი ელემენტი | წევრობა</annotation>
+ <annotation cp="∈" type="tts">ელემენტი</annotation>
+ <annotation cp="÷">გაყავი | გაყოფა | გაყოფის ნიშანი | ობელუსი</annotation>
+ <annotation cp="÷" type="tts">გაყოფის ნიშანი</annotation>
+ <annotation cp="×">გაამრავლე | გამრავლება | გამრავლების ნიშანი | რამდენჯერ</annotation>
+ <annotation cp="×" type="tts">გამრავლების ნიშანი</annotation>
+ <annotation cp="⁻">ზედა ინდექსი | მინუსი | მინუსი ზედა ინდექსში</annotation>
+ <annotation cp="⁻" type="tts">მინუსი ზედა ინდექსში</annotation>
+ <annotation cp="√">კვადრატული | რადიკალი | ფესვი | ფესვის ამოღება</annotation>
+ <annotation cp="√" type="tts">კვადრატული ფესვი</annotation>
+ <annotation cp="∞">უსასრულობა | უსასრულობის ნიშანი</annotation>
+ <annotation cp="∞" type="tts">უსასრულობის ნიშანი</annotation>
+ <annotation cp="∩">თანაკვეთა | სიმრავლე</annotation>
+ <annotation cp="∩" type="tts">თანაკვეთა</annotation>
+ <annotation cp="∪">გაერთიანება | ნაკრები | სიმრავლე</annotation>
+ <annotation cp="∪" type="tts">გაერთიანება</annotation>
+ <annotation cp="≡">ზუსტი | იდენტობის ნიშანი | იდენტური | სამმაგი</annotation>
+ <annotation cp="≡" type="tts">იდენტური</annotation>
+ <annotation cp="⊂">სიმრავლე | ქვესიმრავლე | შემცველი ქვესიმრავლე</annotation>
+ <annotation cp="⊂" type="tts">ქვესიმრავლე</annotation>
+ <annotation cp="▲">ზემოთ | ზემოთ მიმართული შევსებული სამკუთხედი | ისარი | შევსებული</annotation>
+ <annotation cp="▲" type="tts">ზემოთ მიმართული შევსებული სამკუთხედი</annotation>
+ <annotation cp="▼">ისარი | ქვემოთ | ქვემოთ მიმართული შევსებული სამკუთხედი | შევსებული</annotation>
+ <annotation cp="▼" type="tts">ქვემოთ მიმართული შევსებული სამკუთხედი</annotation>
+ <annotation cp="◊">აგური | ოთხკუთხედი | რომბი</annotation>
+ <annotation cp="◊" type="tts">რომბი</annotation>
+ <annotation cp="○">შეუვსებელი წრე | წრე</annotation>
+ <annotation cp="○" type="tts">შეუვსებელი წრე</annotation>
+ <annotation cp="●">შევსებული წრე | წრე</annotation>
+ <annotation cp="●" type="tts">შევსებული წრე</annotation>
+ <annotation cp="◯">დიდი შეუვსებელი წრე | წრე</annotation>
+ <annotation cp="◯" type="tts">დიდი შეუვსებელი წრე</annotation>
<annotation cp="⚧">ტრანსგენდერი | ტრანსგენდერი სიმბოლო</annotation>
<annotation cp="⚧" type="tts">ტრანსგენდერი სიმბოლო</annotation>
<annotation cp="🤌">დაკითხვა | თითები | სარკასტული | შეჯგუფებული</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ცისარტყელას დროშა</annotation>
<annotation cp="🏴☠">განძი | მეკობრე | მეკობრეთა დროშა | მხიარული როჯერი | ჩონჩხი და თავის ქალა</annotation>
<annotation cp="🏴☠" type="tts">მეკობრეთა დროშა</annotation>
+ <annotation cp="£">GBP | ვალუტა | სტერლინგი | ფუნტი</annotation>
+ <annotation cp="£" type="tts">ფუნტი</annotation>
+ <annotation cp="¥">CNY | JPY | ვალუტა | იენი | იუანი</annotation>
+ <annotation cp="¥" type="tts">იენი</annotation>
+ <annotation cp="€">EUR | ევრო | ვალუტა</annotation>
+ <annotation cp="€" type="tts">ევრო</annotation>
+ <annotation cp="₹">ვალუტა | ინდური რუპია | რუპია</annotation>
+ <annotation cp="₹" type="tts">ინდური რუპია</annotation>
+ <annotation cp="₽">ვალუტა | რუბლი</annotation>
+ <annotation cp="₽" type="tts">რუბლი</annotation>
+ <annotation cp="¹">ერთი | ერთიანი ზედა ინდექსში | ზედა ინდექსი</annotation>
+ <annotation cp="¹" type="tts">ერთიანი ზედა ინდექსში</annotation>
+ <annotation cp="²">ზედა ინდექსი | კვადრატული | ორი | ორიანი ზედა ინდექსში</annotation>
+ <annotation cp="²" type="tts">ორიანი ზედა ინდექსში</annotation>
+ <annotation cp="³">ზედა ინდექსი | კუბი | სამი | სამიანი ზედა ინდექსში</annotation>
+ <annotation cp="³" type="tts">სამიანი ზედა ინდექსში</annotation>
+ <annotation cp="µ">განზომილება | მიკროს ნიშანი</annotation>
+ <annotation cp="µ" type="tts">მიკროს ნიშანი</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/kab.xml b/common/annotations/kab.xml
index 7e55627..fe65bbb 100644
--- a/common/annotations/kab.xml
+++ b/common/annotations/kab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/kk.xml b/common/annotations/kk.xml
index 07d1557..a562c90 100644
--- a/common/annotations/kk.xml
+++ b/common/annotations/kk.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">5-тері түсі</annotation>
<annotation cp="🏿">6-тері түсі | тері | түсі | Фицпатрик | эмодзи өзгертуші</annotation>
<annotation cp="🏿" type="tts">6-тері түсі</annotation>
+ <annotation cp="–">қысқа | сызықша</annotation>
+ <annotation cp="–" type="tts">қысқа сызықша</annotation>
+ <annotation cp="—">сызықша | ұзын</annotation>
+ <annotation cp="—" type="tts">ұзын сызықша</annotation>
+ <annotation cp="·">интерпункт | нүкте | ортаңғы</annotation>
+ <annotation cp="·" type="tts">интерпункт</annotation>
+ <annotation cp="«">бұрыш | дәйексөз | енгізу белгісі | жақшалар | сол жақ | сол жақ тырнақша | тырнақша</annotation>
+ <annotation cp="«" type="tts">сол жақ тырнақша</annotation>
+ <annotation cp="»">бұрыш | дәйексөз | енгізу белгісі | жақшалар | оң жақ | оң жақ тырнақша | тырнақша</annotation>
+ <annotation cp="»" type="tts">оң жақ тырнақша</annotation>
+ <annotation cp="§">бөлік | бөлім | параграф | параграф белгісі</annotation>
+ <annotation cp="§" type="tts">бөлім</annotation>
+ <annotation cp="†">айқаршық | крест | сілтеме | сілтеме белгісі</annotation>
+ <annotation cp="†" type="tts">сілтеме белгісі</annotation>
+ <annotation cp="‡">айқаршық | крест | қос | қос сілтеме белгісі | сілтеме</annotation>
+ <annotation cp="‡" type="tts">қос сілтеме белгісі</annotation>
+ <annotation cp="•">жуан белгі | нүкте</annotation>
+ <annotation cp="•" type="tts">жуан белгі</annotation>
+ <annotation cp="°">дәлел | дәреже | сағат</annotation>
+ <annotation cp="°" type="tts">дәреже</annotation>
+ <annotation cp="℗">авторлық құқық | дыбыс | дыбыс жазу авторлық құқығы | жазу</annotation>
+ <annotation cp="℗" type="tts">дыбыс жазу авторлық құқығы</annotation>
+ <annotation cp="←">көрсеткі | сол | сол бағытты көрсеткі</annotation>
+ <annotation cp="←" type="tts">сол бағытты көрсеткі</annotation>
+ <annotation cp="→">көрсеткі | оң | оң бағытты көрсеткі</annotation>
+ <annotation cp="→" type="tts">оң бағытты көрсеткі</annotation>
+ <annotation cp="↑">жоғары | жоғары бағытты көрсеткі | көрсеткі</annotation>
+ <annotation cp="↑" type="tts" draft="provisional">↑↑↑</annotation>
+ <annotation cp="↓">көрсеткі | төмен | төмен бағытты көрсеткі</annotation>
+ <annotation cp="↓" type="tts" draft="provisional">↑↑↑</annotation>
+ <annotation cp="⇅">жоғары | жоғары және төмен бағытты көрсеткілер | көрсеткі | төмен</annotation>
+ <annotation cp="⇅" type="tts">жоғары және төмен бағытты көрсеткілер</annotation>
+ <annotation cp="⇆">көрсеткі | оң | оң бағытты көрсеткілер үстіндегі сол бағытты көрсеткілер | сол</annotation>
+ <annotation cp="⇆" type="tts" draft="provisional">↑↑↑</annotation>
+ <annotation cp="∆">өсу | үшбұрыш</annotation>
+ <annotation cp="∆" type="tts">өсу</annotation>
+ <annotation cp="∇">набла | үшбұрыш</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">жинақ | құрайды | мүшелік | элемент</annotation>
+ <annotation cp="∈" type="tts">элемент</annotation>
+ <annotation cp="÷">бөлу | бөлу белгісі | крестик</annotation>
+ <annotation cp="÷" type="tts">бөлу белгісі</annotation>
+ <annotation cp="×">көбейту | көбейту белгісі | рет</annotation>
+ <annotation cp="×" type="tts">көбейту белгісі</annotation>
+ <annotation cp="⁻">минус | үстіңгі индекс | үстіңгі минус индексі</annotation>
+ <annotation cp="⁻" type="tts">үстіңгі минус индексі</annotation>
+ <annotation cp="√">иррационал | квадрат түбір | негіз | радикал | түбір | шаршы</annotation>
+ <annotation cp="√" type="tts">квадрат түбір</annotation>
+ <annotation cp="∞">шексіздік | шексіздік белгісі</annotation>
+ <annotation cp="∞" type="tts">шексіздік белгісі</annotation>
+ <annotation cp="∩">жинақ | қиылысу</annotation>
+ <annotation cp="∩" type="tts">қиылысу</annotation>
+ <annotation cp="∪">жинақ | одақ | топтама</annotation>
+ <annotation cp="∪" type="tts">одақ</annotation>
+ <annotation cp="≡">бірдей | дәл | үш</annotation>
+ <annotation cp="≡" type="tts">бірдей</annotation>
+ <annotation cp="⊂">жинақ | ішкі жинағы | ішкі жинақ</annotation>
+ <annotation cp="⊂" type="tts">ішкі жинақ</annotation>
+ <annotation cp="▲">жоғары | көрсеткі | толтырылған | толтырылған жоғары бағытталған үшбұрыш | үшбұрыш</annotation>
+ <annotation cp="▲" type="tts" draft="provisional">↑↑↑</annotation>
+ <annotation cp="▼">көрсеткі | толтырылған | толтырылған төмен бағытталған үшбұрыш | төмен | үшбұрыш</annotation>
+ <annotation cp="▼" type="tts">толтырылған төмен бағытталған үшбұрыш</annotation>
+ <annotation cp="◊">ромб | ромб тәрізді | төрт бұрышты</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">бос шеңбер | дөңгелек | шеңбер</annotation>
+ <annotation cp="○" type="tts">бос шеңбер</annotation>
+ <annotation cp="●">толтырылған шеңбер | шеңбер</annotation>
+ <annotation cp="●" type="tts">толтырылған шеңбер</annotation>
+ <annotation cp="◯">дөңгелек | үлкен бос шеңбер | шеңбер</annotation>
+ <annotation cp="◯" type="tts">үлкен бос шеңбер</annotation>
<annotation cp="⚧">трансгендер | трансгендерлік таңба</annotation>
<annotation cp="⚧" type="tts">трансгендерлік таңба</annotation>
<annotation cp="🤌">қол қимылы | мысқыл | саусақтар | сұрау | түйістірілген бес саусақ | түйістіру</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">кемпірқосақ түсті ту</annotation>
<annotation cp="🏴☠">қазына | Қара қарақшы жалауы | қарақшы | қарақшы жалауы | тонау</annotation>
<annotation cp="🏴☠" type="tts">қарақшы жалауы</annotation>
+ <annotation cp="£">фунт</annotation>
+ <annotation cp="£" type="tts">фунт</annotation>
+ <annotation cp="¥">иена</annotation>
+ <annotation cp="¥" type="tts">иена</annotation>
+ <annotation cp="€">еуро</annotation>
+ <annotation cp="€" type="tts">еуро</annotation>
+ <annotation cp="₹">валюта | рупия | үнді рупиясы</annotation>
+ <annotation cp="₹" type="tts">үнді рупиясы</annotation>
+ <annotation cp="₽">валюта | рубль</annotation>
+ <annotation cp="₽" type="tts">рубль</annotation>
+ <annotation cp="¹">бір | үстіңгі бір индексі | үстіңгі индекс</annotation>
+ <annotation cp="¹" type="tts">үстіңгі бір индексі</annotation>
+ <annotation cp="²">екі | квадрат | үстіңгі екі индексі | үстіңгі индекс</annotation>
+ <annotation cp="²" type="tts">үстіңгі екі индексі</annotation>
+ <annotation cp="³">текше | үстіңгі индекс | үстіңгі үш индексі | үш</annotation>
+ <annotation cp="³" type="tts">үстіңгі үш индексі</annotation>
+ <annotation cp="µ">микро белгісі | өлшеу</annotation>
+ <annotation cp="µ" type="tts">микро белгісі</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/km.xml b/common/annotations/km.xml
index 68cb1b3..e801561 100644
--- a/common/annotations/km.xml
+++ b/common/annotations/km.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">សម្បុរខ្មៅល្មម</annotation>
<annotation cp="🏿">ប្រភេទទី 6 | សម្បុរ | សម្បុរខ្មៅ</annotation>
<annotation cp="🏿" type="tts">សម្បុរខ្មៅ</annotation>
+ <annotation cp="–">តូច | សញ្ញាដក | សញ្ញាដកតូច</annotation>
+ <annotation cp="–" type="tts">សញ្ញាដកតូច</annotation>
+ <annotation cp="—">ធំ | សញ្ញាដក | សញ្ញាដកធំ</annotation>
+ <annotation cp="—" type="tts">សញ្ញាដកធំ</annotation>
+ <annotation cp="·">កណ្ដាល | ចុចកណ្ដាល | សញ្ញាចុច | សញ្ញាចុចកណ្ដាល</annotation>
+ <annotation cp="·" type="tts">សញ្ញាចុចកណ្ដាល</annotation>
+ <annotation cp="«">ឆ្វេង | ដង្កៀប | មុំ | សញ្ញា "" | សញ្ញា [v] | សញ្ញា ^ | សញ្ញាដង្កៀបឆេ្វង | សញ្ញាដង្កៀបឆ្វេង</annotation>
+ <annotation cp="«" type="tts">សញ្ញាដង្កៀបឆ្វេង</annotation>
+ <annotation cp="»" draft="provisional">ដង្កៀប | មុំ | សញ្ញា "" | សញ្ញា [v] | សញ្ញា ^ | សញ្ញាដង្កៀបស្ដាំ</annotation>
+ <annotation cp="»" type="tts">សញ្ញាដង្កៀបស្ដាំ</annotation>
+ <annotation cp="§">កថាខណ្ឌ | ចំណែក | ផ្នែក | សញ្ញាផ្នែក</annotation>
+ <annotation cp="§" type="tts">ផ្នែក</annotation>
+ <annotation cp="†">កាំបិតស្នៀត | សញ្ញាកាំបិតស្នៀត | សញ្ញាចែក | សិលាស្ដម្ភ</annotation>
+ <annotation cp="†" type="tts">សញ្ញាកាំបិតស្នៀត</annotation>
+ <annotation cp="‡">កាំបិតស្នៀត | ពីរ | សញ្ញាកាំបិតស្នៀតពីរ | សញ្ញាចែក | សិលាស្ដម្ភ</annotation>
+ <annotation cp="‡" type="tts">សញ្ញាកាំបិតស្នៀតពីរ</annotation>
+ <annotation cp="•">សញ្ញាចុច | សញ្ញាចុចមូល</annotation>
+ <annotation cp="•" type="tts">សញ្ញាចុចមូល</annotation>
+ <annotation cp="°">ដឺក្រេ | ភស្ដុតាង | ម៉ោង</annotation>
+ <annotation cp="°" type="tts">ដឺក្រេ</annotation>
+ <annotation cp="℗">ថត | រក្សាសិទ្ធិ | រក្សាសិទ្ធិថតសំឡេង | សំឡេង</annotation>
+ <annotation cp="℗" type="tts">រក្សាសិទ្ធិថតសំឡេង</annotation>
+ <annotation cp="←">ឆ្វេង | ព្រួញ | ព្រួញចង្អុលទៅឆ្វេង</annotation>
+ <annotation cp="←" type="tts">ព្រួញចង្អុលទៅឆ្វេង</annotation>
+ <annotation cp="→">ព្រួញ | ព្រួញចង្អុលទៅស្ដាំ | ស្ដាំ</annotation>
+ <annotation cp="→" type="tts">ព្រួញចង្អុលទៅស្ដាំ</annotation>
+ <annotation cp="↑">ព្រួញ | ព្រួញចង្អុលឡើងលើ | ឡើងលើ</annotation>
+ <annotation cp="↑" type="tts">ព្រួញចង្អុលឡើងលើ</annotation>
+ <annotation cp="↓">ចុះក្រោម | ព្រួញ | ព្រួញចង្អុលចុះក្រោម</annotation>
+ <annotation cp="↓" type="tts">ព្រួញចង្អុលចុះក្រោម</annotation>
+ <annotation cp="⇅">ចុះក្រោម | ព្រួញ | ព្រួញចង្អុលឡើងលើ និងព្រួញចង្អុលចុះក្រោម | ឡើងលើ</annotation>
+ <annotation cp="⇅" type="tts">ព្រួញចង្អុលឡើងលើ និងព្រួញចង្អុលចុះក្រោម</annotation>
+ <annotation cp="⇆">ឆ្វេង | ព្រួញ | ព្រួញចង្អុលទៅឆ្វេងនៅលើព្រួញចង្អុលទៅស្តាំ | ស្ដាំ</annotation>
+ <annotation cp="⇆" type="tts">ព្រួញចង្អុលទៅឆ្វេងនៅលើព្រួញចង្អុលទៅស្តាំ</annotation>
+ <annotation cp="∆">ដែលតា | ត្រីកោណ</annotation>
+ <annotation cp="∆" type="tts">ដែលតា</annotation>
+ <annotation cp="∇">ណាប់ឡា | ត្រីកោណ</annotation>
+ <annotation cp="∇" type="tts">ណាប់ឡា</annotation>
+ <annotation cp="∈">ធាតុ | ធាតុនៃ | មាន | សំណុំ | សមាជិកភាព</annotation>
+ <annotation cp="∈" type="tts">ធាតុនៃ</annotation>
+ <annotation cp="÷">ការចែក | ចែក | និមិត្តសញ្ញាចែក | សញ្ញាចែក</annotation>
+ <annotation cp="÷" type="tts">និមិត្តសញ្ញាចែក</annotation>
+ <annotation cp="×">ការគុណ | គុណ | ដង | និមិត្តសញ្ញាគុណ</annotation>
+ <annotation cp="×" type="tts">និមិត្តសញ្ញាគុណ</annotation>
+ <annotation cp="⁻">តូចនៅលើ | សញ្ញាដក | សញ្ញាដកតូចនៅលើ</annotation>
+ <annotation cp="⁻" type="tts">សញ្ញាដកតូចនៅលើ</annotation>
+ <annotation cp="√">ការ៉េ | រ៉ាឌិក | រ៉ាឌីកាល់ | សញ្ញាឬសការ៉េ | ឬស | ឬសការ៉េ</annotation>
+ <annotation cp="√" type="tts">ឬសការ៉េ</annotation>
+ <annotation cp="∞">និមិត្តសញ្ញាអនន្ត | អនន្ត</annotation>
+ <annotation cp="∞" type="tts">និមិត្តសញ្ញាអនន្ត</annotation>
+ <annotation cp="∩">ប្រជុំ | សំណុំ</annotation>
+ <annotation cp="∩" type="tts">ប្រជុំ</annotation>
+ <annotation cp="∪">បណ្ដុំ | ប្រសព្វ | សំណុំ</annotation>
+ <annotation cp="∪" type="tts">ប្រសព្វ</annotation>
+ <annotation cp="≡">ដូច | ត្រីគុណ | ស្មើ | ស្មើនឹង</annotation>
+ <annotation cp="≡" type="tts">ស្មើនឹង</annotation>
+ <annotation cp="⊂">សំណុំ | សំណុំរង | សំណុំរងនៃ</annotation>
+ <annotation cp="⊂" type="tts">សំណុំរងនៃ</annotation>
+ <annotation cp="▲">ខ្មៅ | ត្រីកោណ | ត្រីកោណខ្មៅបែរឡើងលើ | ព្រួញ | ឡើងលើ</annotation>
+ <annotation cp="▲" type="tts">ត្រីកោណខ្មៅបែរឡើងលើ</annotation>
+ <annotation cp="▼">ខ្មៅ | ចុះក្រោម | ត្រីកោណ | ត្រីកោណខ្មៅបែរចុះក្រោម | ព្រួញ</annotation>
+ <annotation cp="▼" type="tts">ត្រីកោណខ្មៅបែរចុះក្រោម</annotation>
+ <annotation cp="◊">ពេជ្រ | សញ្ញាដូចពេជ្រ | សញ្ញាពេជ្រ</annotation>
+ <annotation cp="◊" type="tts">សញ្ញាពេជ្រ</annotation>
+ <annotation cp="○">កងមូល | មូល | មូលប្រហោង</annotation>
+ <annotation cp="○" type="tts">មូលប្រហោង</annotation>
+ <annotation cp="●">ខ្មៅមូល | មូល</annotation>
+ <annotation cp="●" type="tts">ខ្មៅមូល</annotation>
+ <annotation cp="◯">កងមូល | មូល | មូលប្រហោងធំ</annotation>
+ <annotation cp="◯" type="tts">មូលប្រហោងធំ</annotation>
<annotation cp="⚧">និមិត្តសញ្ញាភេទទីបី | ភេទទីបី</annotation>
<annotation cp="⚧" type="tts">និមិត្តសញ្ញាភេទទីបី</annotation>
<annotation cp="🤌">កាយវិការដៃ | ការស៊ើបអង្កេត | ចំអកបញ្ឈឺចិត្ត | ច្បិច | ម្រាមច្បិច | ម្រាមដៃ</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ទង់ឥន្ទធនូ</annotation>
<annotation cp="🏴☠">Jolly Roger | កំណប់ | ការលួចប្លន់ | ចោរសមុទ្រ | ទង់ចោរសមុទ្រ</annotation>
<annotation cp="🏴☠" type="tts">ទង់ចោរសមុទ្រ</annotation>
+ <annotation cp="£" draft="provisional">[EGP] | [GBP] | ផោន | រូបិយបណ្ណ</annotation>
+ <annotation cp="£" type="tts">ផោន</annotation>
+ <annotation cp="¥" draft="provisional">[CNY] | [JPY] | យ័ន | យេន | រូបិយបណ្ណ</annotation>
+ <annotation cp="¥" type="tts">យេន</annotation>
+ <annotation cp="€" draft="provisional">[EUR] | រូបិយបណ្ណ | អឺរ៉ូ</annotation>
+ <annotation cp="€" type="tts">អឺរ៉ូ</annotation>
+ <annotation cp="₹">រូបិយបណ្ណ | រូពី | រូពីឥណ្ឌា</annotation>
+ <annotation cp="₹" type="tts">រូពីឥណ្ឌា</annotation>
+ <annotation cp="₽">រ៉ូបល់ | រូបិយបណ្ណ</annotation>
+ <annotation cp="₽" type="tts">រ៉ូបល់</annotation>
+ <annotation cp="¹">តូចនៅលើ | លេខមួយ | លេខមួយតូចនៅលើ</annotation>
+ <annotation cp="¹" type="tts">លេខមួយតូចនៅលើ</annotation>
+ <annotation cp="²">ការ៉េ | តូចនៅលើ | លេខពីរ | លេខពីរតូចនៅលើ</annotation>
+ <annotation cp="²" type="tts">លេខពីរតូចនៅលើ</annotation>
+ <annotation cp="³">គូប | តូចនៅលើ | លេខបី | លេខបីតូចនៅលើ</annotation>
+ <annotation cp="³" type="tts">លេខបីតូចនៅលើ</annotation>
+ <annotation cp="µ">ខ្នាត | សញ្ញាមីក្រូ</annotation>
+ <annotation cp="µ" type="tts">សញ្ញាមីក្រូ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/kn.xml b/common/annotations/kn.xml
index 274b0fa..4264425 100644
--- a/common/annotations/kn.xml
+++ b/common/annotations/kn.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ಮಧ್ಯಮ-ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
<annotation cp="🏿">ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ | ಚರ್ಮದ ಬಣ್ಣ ಅತ್ಯಂತ ಗಾಢ | ವಿಧ 6</annotation>
<annotation cp="🏿" type="tts">ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="–">ಅಡ್ಡ ಗೆರೆ | ಸಣ್ಣ | ಸಣ್ಣ ಅಡ್ಡ ಗೆರೆ</annotation>
+ <annotation cp="–" type="tts">ಸಣ್ಣ ಅಡ್ಡ ಗೆರೆ</annotation>
+ <annotation cp="—">ಅಡ್ಡ | ಅಡ್ಡಗೆರೆ | ಗೆರೆ</annotation>
+ <annotation cp="—" type="tts">ಅಡ್ಡಗೆರೆ</annotation>
+ <annotation cp="·">ಚುಕ್ಕಿ | ಮಧ್ಯ | ಮಧ್ಯ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="·" type="tts">ಮಧ್ಯ ಚುಕ್ಕಿ</annotation>
+ <annotation cp="«">ಉದ್ಧರಣ ಚಿಹ್ನೆ | ಎಡ | ಎಡ ಕೋನ ಗುರುತು | ಕಂಸಗಳು | ಕೋನ | ಮಾರ್ಜಿನ್ ಚಿಹ್ನೆ | ಲಾಂಛನ</annotation>
+ <annotation cp="«" type="tts">ಎಡ ಕೋನ ಗುರುತು</annotation>
+ <annotation cp="»">ಉದ್ಧರಣ ಚಿಹ್ನೆ | ಕಂಸಗಳು | ಕೋನ | ಬಲ | ಬಲ ಕೋನ ಗುರುತು | ಮಾರ್ಜಿನ್ ಚಿಹ್ನೆ | ಲಾಂಛನ</annotation>
+ <annotation cp="»" type="tts">ಬಲ ಕೋನ ಗುರುತು</annotation>
+ <annotation cp="§">ಪ್ಯಾರಾ | ಭಾಗ | ವಿಭಾಗ | ವಿಭಾಗ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="§" type="tts">ವಿಭಾಗ</annotation>
+ <annotation cp="†">ಕಠಾರಿ ಗುರುತು | ಕಠಾರಿ ಚಿಹ್ನೆ | ಚೌಕ ಸೂಜಿಯಂಥ ಕಂಬ</annotation>
+ <annotation cp="†" type="tts">ಕಠಾರಿ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="‡">ಕಠಾರಿ ಗುರುತು | ಕಠಾರಿ ಚಿಹ್ನೆ | ಚೌಕ ಸೂಜಿಯಂಥ ಕಂಬ | ದ್ವಿ | ದ್ವಿ ಕಠಾರಿ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="‡" type="tts">ದ್ವಿ ಕಠಾರಿ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="•">ಗುಂಡು | ಗುಂಡು ಚಿಹ್ನೆ | ಚುಕ್ಕೆ</annotation>
+ <annotation cp="•" type="tts">ಗುಂಡು ಚಿಹ್ನೆ</annotation>
+ <annotation cp="°">ಕೋನ | ಗಂಟೆ | ಸಾಕ್ಷ್ಯ</annotation>
+ <annotation cp="°" type="tts">ಕೋನ</annotation>
+ <annotation cp="℗">ಧ್ವನಿ | ರೆಕಾರ್ಡಿಂಗ್ | ಹಕ್ಕುಸ್ವಾಮ್ಯ</annotation>
+ <annotation cp="℗" type="tts">ಧ್ವನಿ ರೆಕಾರ್ಡಿಂಗ್ ಹಕ್ಕುಸ್ವಾಮ್ಯ</annotation>
+ <annotation cp="←">ಎಡ | ಎಡ ಮುಖದ ಬಾಣದ ಗುರುತು | ಬಾಣ</annotation>
+ <annotation cp="←" type="tts">ಎಡ ಮುಖದ ಬಾಣದ ಗುರುತು</annotation>
+ <annotation cp="→">ಬಲ | ಬಲ ದಿಕ್ಕಿನ ಬಾಣದ ಗುರುತು | ಬಾಣ</annotation>
+ <annotation cp="→" type="tts">ಬಲ ದಿಕ್ಕಿನ ಬಾಣದ ಗುರುತು</annotation>
+ <annotation cp="↑">ಬಾಣ | ಮೇಲೆ | ಮೇಲ್ಮುಖದ ಬಾಣದ ಗುರುತು</annotation>
+ <annotation cp="↑" type="tts">ಮೇಲ್ಮುಖದ ಬಾಣದ ಗುರುತು</annotation>
+ <annotation cp="↓">ಕೆಳ | ಕೆಳ ಮುಖದ ಬಾಣದ ಗುರುತು | ಬಾಣ</annotation>
+ <annotation cp="↓" type="tts">ಕೆಳ ಮುಖದ ಬಾಣದ ಗುರುತು</annotation>
+ <annotation cp="⇅">ಕೆಳ | ಬಾಣ | ಮೇಲೆ | ಮೇಲೆ ಹಾಗೂ ಕೆಳ ಮುಖದ ಬಾಣದ ಗುರುತುಗಳು</annotation>
+ <annotation cp="⇅" type="tts">ಮೇಲೆ ಹಾಗೂ ಕೆಳ ಮುಖದ ಬಾಣದ ಗುರುತುಗಳು</annotation>
+ <annotation cp="⇆">ಎಡ | ಎಡ ಹಾಗೂ ಬಲ ಮುಖದ ಬಾಣದ ಗುರುತುಗಳು | ಬಲ | ಬಾಣ</annotation>
+ <annotation cp="⇆" type="tts">ಎಡ ಹಾಗೂ ಬಲ ಮುಖದ ಬಾಣದ ಗುರುತುಗಳು</annotation>
+ <annotation cp="∆">ಏರಿಕೆ | ತ್ರಿಕೋನ</annotation>
+ <annotation cp="∆" type="tts">ಏರಿಕೆ</annotation>
+ <annotation cp="∇">ಇಳಿಮುಖ ತ್ರಿಕೋನ | ತ್ರಿಕೋನ</annotation>
+ <annotation cp="∇" type="tts">ಇಳಿಮುಖ ತ್ರಿಕೋನ</annotation>
+ <annotation cp="∈">ಅಂಶ | ಅಂಶವು | ವರ್ಗ | ಸದಸ್ಯತ್ವ | ಹೊಂದಿರುವ</annotation>
+ <annotation cp="∈" type="tts">ಅಂಶ</annotation>
+ <annotation cp="÷">ಕಠಾರಿ ಗುರುತು | ಭಾಗಾಕಾರ | ಭಾಗಾಕಾರ ಚಿಹ್ನೆ | ವಿಭಜನೆ</annotation>
+ <annotation cp="÷" type="tts">ಭಾಗಾಕಾರ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="×">ಗುಣಾಕಾರ | ಗುಣಾಕಾರ ಚಿಹ್ನೆ | ಗುಣಾಕಾರದ ಚಿಹ್ನೆ | ಗುಣಿಸುವುದು | ಪಟ್ಟು</annotation>
+ <annotation cp="×" type="tts">ಗುಣಾಕಾರದ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="⁻">ಕಳೆ | ಘಾತ | ಘಾತ ಕಳೆಯುವಿಕೆ</annotation>
+ <annotation cp="⁻" type="tts">ಘಾತ ಕಳೆಯುವಿಕೆ</annotation>
+ <annotation cp="√">ಅಪರಿಮೇಯ | ಪಾದಾಂಕ | ಪ್ರಾತಿಪದಿಕ | ಮೂಲ | ವರ್ಗ | ವರ್ಗಮೂಲ</annotation>
+ <annotation cp="√" type="tts">ವರ್ಗಮೂಲ</annotation>
+ <annotation cp="∞">ಅನಂತ | ಅನಂತ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="∞" type="tts">ಅನಂತ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="∩">ಛೇದನ | ವರ್ಗ</annotation>
+ <annotation cp="∩" type="tts">ಛೇದನ</annotation>
+ <annotation cp="∪">ವರ್ಗ | ಸಂಗ್ರಹ | ಸಮೂಹ</annotation>
+ <annotation cp="∪" type="tts">ಸಮೂಹ</annotation>
+ <annotation cp="≡">ತ್ರಿವಳಿ | ಸಮ | ಸಮ ರೀತಿಯ | ಸಮಾನ</annotation>
+ <annotation cp="≡" type="tts">ಸಮಾನ</annotation>
+ <annotation cp="⊂">ಉಪ ವರ್ಗ | ಉಪವರ್ಗ | ಉಪವರ್ಗದ | ವರ್ಗ</annotation>
+ <annotation cp="⊂" type="tts">ಉಪ ವರ್ಗ</annotation>
+ <annotation cp="▲">ತುಂಬಿಕೊಂಡ ತುಂಬಿಕೊಂಡ ಮೇಲ್ಮುಖದ ತ್ರಿಕೋನ | ತುಂಬಿಕೊಂಡ ಮೇಲ್ಮುಖದ ತ್ರಿಕೋನ | ತ್ರಿಕೋನ | ಬಾಣ | ಮೇಲ್ಮುಖ</annotation>
+ <annotation cp="▲" type="tts">ತುಂಬಿಕೊಂಡ ಮೇಲ್ಮುಖದ ತ್ರಿಕೋನ</annotation>
+ <annotation cp="▼">ಇಳಿಮುಖ | ತುಂಬಿಕೊಂಡ | ತುಂಬಿಕೊಂಡ ಇಳಿಮುಖದ ತ್ರಿಕೋನ | ತುಂಬಿಕೊಂಡ ಕೆಳಮುಖದ ತ್ರಿಕೋನ | ತ್ರಿಕೋನ | ಬಾಣ</annotation>
+ <annotation cp="▼" type="tts">ತುಂಬಿಕೊಂಡ ಕೆಳಮುಖದ ತ್ರಿಕೋನ</annotation>
+ <annotation cp="◊">ರಾಂಬಸ್ | ವಜ್ರ | ವಜ್ರಾಕೃತಿ</annotation>
+ <annotation cp="◊" type="tts">ವಜ್ರಾಕೃತಿ</annotation>
+ <annotation cp="○">ಖಾಲಿ ವೃತ್ತ | ರಿಂಗ್ | ವೃತ್ತ</annotation>
+ <annotation cp="○" type="tts">ಖಾಲಿ ವೃತ್ತ</annotation>
+ <annotation cp="●">ಭರ್ತಿ ಮಾಡಿದ ವೃತ್ತ | ವೃತ್ತ</annotation>
+ <annotation cp="●" type="tts">ಭರ್ತಿ ಮಾಡಿದ ವೃತ್ತ</annotation>
+ <annotation cp="◯">ದೊಡ್ಡ ಖಾಲಿ ವೃತ್ತ | ರಿಂಗ್ | ವೃತ್ತ</annotation>
+ <annotation cp="◯" type="tts">ದೊಡ್ಡ ಖಾಲಿ ವೃತ್ತ</annotation>
<annotation cp="⚧">ತೃತೀಯ ಲಿಂಗಿ | ತೃತೀಯ ಲಿಂಗಿ ಚಿಹ್ನೆ</annotation>
<annotation cp="⚧" type="tts">ತೃತೀಯ ಲಿಂಗಿ ಚಿಹ್ನೆ</annotation>
<annotation cp="🤌">ಕಹಿಯಾದ | ಕೈ ಸೂಚಕ | ಬೆರಳುಗಳು | ಮಡಚಿಕೊಂಡ | ವಿಚಾರಣೆ</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ಕಾಮನಬಿಲ್ಲಿನ ಧ್ವಜ</annotation>
<annotation cp="🏴☠">ಜಾಲಿ ರೋಜರ್ | ದರೋಡೆಕೋರ | ದರೋಡೆಕೋರರ ಧ್ವಜ | ನಿಧಿ | ಲೂಟಿ</annotation>
<annotation cp="🏴☠" type="tts">ದರೋಡೆಕೋರರ ಧ್ವಜ</annotation>
+ <annotation cp="£">ಇಜಿಪಿ | ಕರೆನ್ಸಿ | ಜಿಬಿಪಿ | ಪೌಂಡ್</annotation>
+ <annotation cp="£" type="tts">ಪೌಂಡ್</annotation>
+ <annotation cp="¥">ಕರೆನ್ಸಿ | ಜೆಪಿವೈ | ಯುವಾನ್ | ಯೆನ್ | ಸಿಎನ್ವೈ</annotation>
+ <annotation cp="¥" type="tts">ಯೆನ್</annotation>
+ <annotation cp="€">ಇಯುಆರ್ | ಕರೆನ್ಸಿ | ಯೂರೋ</annotation>
+ <annotation cp="€" type="tts">ಯೂರೋ</annotation>
+ <annotation cp="₹">ಕರೆನ್ಸಿ | ಭಾರತೀಯ ರೂಪಾಯಿ | ರುಪೀ</annotation>
+ <annotation cp="₹" type="tts">ಭಾರತೀಯ ರೂಪಾಯಿ</annotation>
+ <annotation cp="₽">ಕರೆನ್ಸಿ | ರಬಲ್</annotation>
+ <annotation cp="₽" type="tts">ರಬಲ್</annotation>
+ <annotation cp="¹">ಒಂದು | ಘಾತ</annotation>
+ <annotation cp="¹" type="tts">ಘಾತ ಒಂದು</annotation>
+ <annotation cp="²">ಎರಡು | ಘಾತ | ವರ್ಗ</annotation>
+ <annotation cp="²" type="tts">ಘಾತ ಎರಡು</annotation>
+ <annotation cp="³">ಘನಾಕೃತಿ | ಘಾತ | ಮೂರು</annotation>
+ <annotation cp="³" type="tts">ಘಾತ ಮೂರು</annotation>
+ <annotation cp="µ">ಅಳತೆ | ಮೈಕ್ರೋ ಚಿಹ್ನೆ</annotation>
+ <annotation cp="µ" type="tts">ಮೈಕ್ರೋ ಚಿಹ್ನೆ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ko.xml b/common/annotations/ko.xml
index d28f60a..58d7039 100644
--- a/common/annotations/ko.xml
+++ b/common/annotations/ko.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">진한 갈색 피부</annotation>
<annotation cp="🏿">검은색 피부 | 타입 육 | 피부톤</annotation>
<annotation cp="🏿" type="tts">검은색 피부</annotation>
+ <annotation cp="–">반각 줄표 | 붙임 | 붙임표</annotation>
+ <annotation cp="–" type="tts">붙임표</annotation>
+ <annotation cp="—">긴줄 | 긴줄표 | 전각 줄표</annotation>
+ <annotation cp="—" type="tts">긴줄표</annotation>
+ <annotation cp="·">가운뎃점 | 점 | 중간</annotation>
+ <annotation cp="·" type="tts">가운뎃점</annotation>
+ <annotation cp="«">괄호 | 왼족 이중 꺽쇠괄호 | 왼쪽 | 왼쪽 이중 꺽쇠괄호 | 인용 부호</annotation>
+ <annotation cp="«" type="tts">왼쪽 이중 꺽쇠괄호</annotation>
+ <annotation cp="»">괄호 | 오른쪽 | 오른쪽 이중 꺽쇠괄호 | 인용 부호</annotation>
+ <annotation cp="»" type="tts">오른쪽 이중 꺽쇠괄호</annotation>
+ <annotation cp="§">구분 | 단락 | 부분</annotation>
+ <annotation cp="§" type="tts">단락</annotation>
+ <annotation cp="†">외칼표 | 칼표</annotation>
+ <annotation cp="†" type="tts">외칼표</annotation>
+ <annotation cp="‡">쌍칼표 | 칼표</annotation>
+ <annotation cp="‡" type="tts">쌍칼표</annotation>
+ <annotation cp="•">글머리 기호 | 점</annotation>
+ <annotation cp="•" type="tts">글머리 기호</annotation>
+ <annotation cp="°">도 | 도수 | 시</annotation>
+ <annotation cp="°" type="tts">도</annotation>
+ <annotation cp="℗">녹음 | 음원 | 음원 복제권 | 저작권</annotation>
+ <annotation cp="℗" type="tts">음원 복제권</annotation>
+ <annotation cp="←">왼쪽 | 좌측 | 화살표</annotation>
+ <annotation cp="←" type="tts">왼쪽 화살표</annotation>
+ <annotation cp="→">오른쪽 | 우측 | 화살표</annotation>
+ <annotation cp="→" type="tts">오른쪽 화살표</annotation>
+ <annotation cp="↑">위 | 위쪽 | 화살표</annotation>
+ <annotation cp="↑" type="tts">위 화살표</annotation>
+ <annotation cp="↓">아래 | 아래쪽 | 화살표</annotation>
+ <annotation cp="↓" type="tts">아래 화살표</annotation>
+ <annotation cp="⇅">위아래 | 화살표</annotation>
+ <annotation cp="⇅" type="tts">위아래 화살표</annotation>
+ <annotation cp="⇆">좌우 | 좌우측 | 화살표</annotation>
+ <annotation cp="⇆" type="tts">좌우 화살표</annotation>
+ <annotation cp="∆">증분 | 증분 기호</annotation>
+ <annotation cp="∆" type="tts">증분</annotation>
+ <annotation cp="∇">나블라 | 나블라 기호 | 미분연산자</annotation>
+ <annotation cp="∇" type="tts">나블라</annotation>
+ <annotation cp="∈">원소 | 원소 포함 기호 | 포함</annotation>
+ <annotation cp="∈" type="tts">원소 포함</annotation>
+ <annotation cp="÷">나누기 | 나누기 기호 | 나눗셈 | 나눗셈 기호</annotation>
+ <annotation cp="÷" type="tts">나눗셈 기호</annotation>
+ <annotation cp="×">곱셈 | 곱셈 기호 | 곱하기 | 엑스</annotation>
+ <annotation cp="×" type="tts">곱셈 기호</annotation>
+ <annotation cp="⁻">마이너스 | 승</annotation>
+ <annotation cp="⁻" type="tts">마이너스 승</annotation>
+ <annotation cp="√">거듭 | 거듭제곱근 | 근 | 제곱 | 제곱근</annotation>
+ <annotation cp="√" type="tts">제곱근</annotation>
+ <annotation cp="∞">무한대 | 무한대 기호</annotation>
+ <annotation cp="∞" type="tts">무한대 기호</annotation>
+ <annotation cp="∩">교집합 | 기호</annotation>
+ <annotation cp="∩" type="tts">교집합</annotation>
+ <annotation cp="∪">기호 | 합집합</annotation>
+ <annotation cp="∪" type="tts">합집합</annotation>
+ <annotation cp="≡">동일 | 등호 | 상등 | 일치</annotation>
+ <annotation cp="≡" type="tts">등호</annotation>
+ <annotation cp="⊂">부분 | 부분 집합 | 부분 집합 기호</annotation>
+ <annotation cp="⊂" type="tts">부분 집합</annotation>
+ <annotation cp="▲">검은색 삼각형 | 검은색 위쪽 삼각형 | 삼각형 | 위쪽</annotation>
+ <annotation cp="▲" type="tts">검은색 위쪽 삼각형</annotation>
+ <annotation cp="▼">검은색 삼각형 | 검은색 아래쪽 삼각형 | 삼각형 | 아래쪽</annotation>
+ <annotation cp="▼" type="tts">검은색 아래쪽 삼각형</annotation>
+ <annotation cp="◊">다이아몬드 모양 | 마름모 | 마름모꼴</annotation>
+ <annotation cp="◊" type="tts">마름모</annotation>
+ <annotation cp="○">빈 원 | 원</annotation>
+ <annotation cp="○" type="tts">빈 원</annotation>
+ <annotation cp="●">원 | 채워진 원</annotation>
+ <annotation cp="●" type="tts">채워진 원</annotation>
+ <annotation cp="◯">빈 원 | 원 | 큰 빈 원</annotation>
+ <annotation cp="◯" type="tts">큰 빈 원</annotation>
<annotation cp="⚧">트랜스젠더 | 트랜스젠더 기호</annotation>
<annotation cp="⚧" type="tts">트랜스젠더 기호</annotation>
<annotation cp="🤌">꼬집는 | 빈정대는 | 손가락 | 손동작 | 질문</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">무지개 깃발</annotation>
<annotation cp="🏴☠">보물섬 | 약탈자 | 해골 깃발 | 해적 | 해적 깃발</annotation>
<annotation cp="🏴☠" type="tts">해적 깃발</annotation>
+ <annotation cp="£">영국 파운드 | 이집트 파운드 | 파운드화</annotation>
+ <annotation cp="£" type="tts">파운드화</annotation>
+ <annotation cp="¥">엔 | 엔화 | 위안 | 위안화</annotation>
+ <annotation cp="¥" type="tts">엔화</annotation>
+ <annotation cp="€">유럽 연합 단일 화폐 | 유로 | 유로 화폐 | 유로화</annotation>
+ <annotation cp="€" type="tts">유로화</annotation>
+ <annotation cp="₹">루피 | 인도 루피</annotation>
+ <annotation cp="₹" type="tts">인도 루피</annotation>
+ <annotation cp="₽">러시아 루블 | 루블</annotation>
+ <annotation cp="₽" type="tts">러시아 루블</annotation>
+ <annotation cp="¹">1 | 1승 | 승</annotation>
+ <annotation cp="¹" type="tts">1승</annotation>
+ <annotation cp="²">2 | 2승 | 승 | 제곱</annotation>
+ <annotation cp="²" type="tts">제곱</annotation>
+ <annotation cp="³">3 | 3승 | 세제곱 | 승</annotation>
+ <annotation cp="³" type="tts">세제곱</annotation>
+ <annotation cp="µ">마이크로 | 마이크로 기호 | 측정 단위</annotation>
+ <annotation cp="µ" type="tts">마이크로</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/kok.xml b/common/annotations/kok.xml
index 279c7db..1cd0385 100644
--- a/common/annotations/kok.xml
+++ b/common/annotations/kok.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">मध्यम-दाट कातीचो रंग</annotation>
<annotation cp="🏿">कातीचो रंग | दाट कातीचो रंग | प्रकार 6</annotation>
<annotation cp="🏿" type="tts">दाट कातीचो रंग</annotation>
+ <annotation cp="–">en डॅश | डॅश । en</annotation>
+ <annotation cp="–" type="tts">en डॅश</annotation>
+ <annotation cp="—">em डॅश | डॅश । em</annotation>
+ <annotation cp="—" type="tts">em डॅश</annotation>
+ <annotation cp="·">बिंदू। खंड बिंदू। मदलो। मदलो बिंदू | मदलो बिंदू</annotation>
+ <annotation cp="·" type="tts">मदलो बिंदू</annotation>
+ <annotation cp="«">कोन। ब्रॅकेट। हंसपद चिन्न। चॅवरॉन। दावो। दावो कंस। अवतरण | दावो कंस</annotation>
+ <annotation cp="«" type="tts">दावो कंस</annotation>
+ <annotation cp="»">उजवो कंस | कोन। ब्रॅकेट। हंसपद चिन्न। चॅवरॉन। अवतरण। उजवो। उजवो कंस</annotation>
+ <annotation cp="»" type="tts">उजवो कंस</annotation>
+ <annotation cp="§">परिच्छेद। भाग। विभाग। सिलक्रो | विभाग</annotation>
+ <annotation cp="§" type="tts">विभाग</annotation>
+ <annotation cp="†">डॅगर चिन्न | डॅगर। ऑबेलिस्क। ओबिलस</annotation>
+ <annotation cp="†" type="tts">डॅगर चिन्न</annotation>
+ <annotation cp="‡">डबल डॅगर चिन्न | डॅगर। डबल। ऑबेलिस्क। ओबेलस</annotation>
+ <annotation cp="‡" type="tts">डबल डॅगर चिन्न</annotation>
+ <annotation cp="•">बुलेट | बुलेट। बिंदू</annotation>
+ <annotation cp="•" type="tts">बुलेट</annotation>
+ <annotation cp="°">पदवी | पदवी। वर। पुरावो</annotation>
+ <annotation cp="°" type="tts">पदवी</annotation>
+ <annotation cp="℗">ध्वनी रॅकॉर्डींग मालकीहक्क | मालकीहक्क। रॅकॉर्डींग। ध्वनी</annotation>
+ <annotation cp="℗" type="tts">ध्वनी रॅकॉर्डींग मालकीहक्क</annotation>
+ <annotation cp="←">दाव्यान खुणावपी बाण | बाण। दाव्यान। दाव्यान खुणावपी बाण</annotation>
+ <annotation cp="←" type="tts">दाव्यान खुणावपी बाण</annotation>
+ <annotation cp="→">उजव्यान खुणावपी बाण | बाण। उजवें। उजव्यान खुणावपी बाण</annotation>
+ <annotation cp="→" type="tts">उजव्यान खुणावपी बाण</annotation>
+ <annotation cp="↑">बाण। वयर। वयर खुणावपी बाण | वयर खुणावपी बाण</annotation>
+ <annotation cp="↑" type="tts">वयर खुणावपी बाण</annotation>
+ <annotation cp="↓">बाण। सकयल। सकयल खुणावपी बाण | सकयल खुणावपी बाण</annotation>
+ <annotation cp="↓" type="tts">सकयल खुणावपी बाण</annotation>
+ <annotation cp="⇅">बाण। सकयल। वयर। वयर खुणावपी आनी सकयल खुणावपी बाण | वयर खुणावपी आनी सकयल खुणावपी बाण</annotation>
+ <annotation cp="⇅" type="tts">वयर खुणावपी आनी सकयल खुणावपी बाण</annotation>
+ <annotation cp="⇆">उजव्यान खुणावपी बाणांचेर दाव्यान खुणावपी बाण | बाण। दाव्यान। उजव्यान खुणावपी बाणांचेर दाव्यान खुणावपी बाण। उजव्यान</annotation>
+ <annotation cp="⇆" type="tts">उजव्यान खुणावपी बाणांचेर दाव्यान खुणावपी बाण</annotation>
+ <annotation cp="∆">वृद्धी | वृद्धी। त्रिकोण</annotation>
+ <annotation cp="∆" type="tts">वृद्धी</annotation>
+ <annotation cp="∇">नाब्ला | नाब्ला । त्रिकोण</annotation>
+ <annotation cp="∇" type="tts">नाब्ला</annotation>
+ <annotation cp="∈">आसपावीत। घटक। चो घटक। वांगडीपद। संच | चो घटक</annotation>
+ <annotation cp="∈" type="tts">चो घटक</annotation>
+ <annotation cp="÷">विभाजन कुरू | विभाजीत। विभाजन। विभाजन कुरू। ओबेलस</annotation>
+ <annotation cp="÷" type="tts">विभाजन कुरू</annotation>
+ <annotation cp="×">गुणाकार चिन्न | गुणाकारा। गुणाकार चिन्न। गुणाकार करप।खेपे</annotation>
+ <annotation cp="×" type="tts">गुणाकार चिन्न</annotation>
+ <annotation cp="⁻">वजा । सुपरस्क्रिप्ट | सुपरस्क्रिप्ट वजा</annotation>
+ <annotation cp="⁻" type="tts">सुपरस्क्रिप्ट वजा</annotation>
+ <annotation cp="√">मौलीक। मूळ। मूळ शब्द। समकोण। सुर्द | वर्गमूळ</annotation>
+ <annotation cp="√" type="tts">वर्गमूळ</annotation>
+ <annotation cp="∞">असीमताय | असीमताय कुरू</annotation>
+ <annotation cp="∞" type="tts">असीमताय कुरू</annotation>
+ <annotation cp="∩">प्रतिच्छेदन | प्रतिच्छेदन। संच</annotation>
+ <annotation cp="∩" type="tts">प्रतिच्छेदन</annotation>
+ <annotation cp="∪">एकठावणी। संच। संघीय | संघीत</annotation>
+ <annotation cp="∪" type="tts">संघीत</annotation>
+ <annotation cp="≡">जुस्ताजुस्त। समरुपी। ताका समरुपी। तिट्टी | समरुपी</annotation>
+ <annotation cp="≡" type="tts">समरुपी</annotation>
+ <annotation cp="⊂">चो उप-संच | संच। उप-संच। चो उप-संच</annotation>
+ <annotation cp="⊂" type="tts">चो उप-संच</annotation>
+ <annotation cp="▲">बाण। भरलां। वयर खुणावपी त्रिकोण भरलां। त्रिकोण। वयर | वयर खुणावपी त्रिकोण भरलां</annotation>
+ <annotation cp="▲" type="tts">वयर खुणावपी त्रिकोण भरलां</annotation>
+ <annotation cp="▼">बाण। सकयल। भरिल्लें। सकयल खुणावपी त्रिकोण भरलां। त्रिकोण | सकयल खुणावपी त्रिकोण भरलां</annotation>
+ <annotation cp="▼" type="tts">सकयल खुणावपी त्रिकोण भरलां</annotation>
+ <annotation cp="◊">डायमण्ड। समचतुर्भुज। विषमकोण | समचतुर्भुज</annotation>
+ <annotation cp="◊" type="tts">समचतुर्भुज</annotation>
+ <annotation cp="○">बुराक आशिल्लें वर्तूळ | वर्तूळ। बुराक आशिल्लें वर्तूळ। रिंग</annotation>
+ <annotation cp="○" type="tts">बुराक आशिल्लें वर्तूळ</annotation>
+ <annotation cp="●">भरिल्लें त्रिकोण | वर्तूळ। भरिल्लें वर्तूळ</annotation>
+ <annotation cp="●" type="tts">भरिल्लें त्रिकोण</annotation>
+ <annotation cp="◯">वर्तूळ। व्हड बुराक आशिल्लें वर्तूळ। रिंग | व्हड बुराक आशिल्लें वर्तूळ</annotation>
+ <annotation cp="◯" type="tts">व्हड बुराक आशिल्लें वर्तूळ</annotation>
<annotation cp="⚧">तृतियपंथी | तृतियपंथी चिन्न</annotation>
<annotation cp="⚧" type="tts">तृतियपंथी चिन्न</annotation>
<annotation cp="🤌">चवकशी | चिमटीचीं बोटां | चिमटो काडप | बोटां | व्यंगात्मक | हाताचो हावभाव</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">इंद्रधोणू बावटो</annotation>
<annotation cp="🏴☠">चाच्ये बावटो | च्याचे | च्याच्यांचो बावटो | जॉली रोजर | तिजोरी | प्लंडर</annotation>
<annotation cp="🏴☠" type="tts">चाच्ये बावटो</annotation>
+ <annotation cp="£">चलन। EGP। GBP। पावंड | पावंड</annotation>
+ <annotation cp="£" type="tts">पावंड</annotation>
+ <annotation cp="¥">CNY | JPY | चलन | युआन | यॅन</annotation>
+ <annotation cp="¥" type="tts">यॅन</annotation>
+ <annotation cp="€">चलन। युरो। युरो | युरो</annotation>
+ <annotation cp="€" type="tts">युरो</annotation>
+ <annotation cp="₹">चलन। भारतीय रुपया। रुपया | भारतीय रुपया</annotation>
+ <annotation cp="₹" type="tts">भारतीय रुपया</annotation>
+ <annotation cp="₽">चलन। रुबल (रशियेचे नाणे) | रुबल (रशियेचे नाणे)</annotation>
+ <annotation cp="₽" type="tts">रुबल (रशियेचे नाणे)</annotation>
+ <annotation cp="¹">एक । सुपरस्क्रिप्ट | सुपरस्क्रिप्ट एक</annotation>
+ <annotation cp="¹" type="tts">सुपरस्क्रिप्ट एक</annotation>
+ <annotation cp="²">समकोनी। सुपरस्क्रिप्ट। दोन | सुपरस्क्रिप्ट दोन</annotation>
+ <annotation cp="²" type="tts">सुपरस्क्रिप्ट दोन</annotation>
+ <annotation cp="³">घनाकार। सुपरस्क्रिप्ट। तीन | सुपरस्क्रिप्ट तीन</annotation>
+ <annotation cp="³" type="tts">सुपरस्क्रिप्ट तीन</annotation>
+ <annotation cp="µ">मायक्रो खूण | मेजणी। मायक्रो खूण</annotation>
+ <annotation cp="µ" type="tts">मायक्रो खूण</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ku.xml b/common/annotations/ku.xml
index 01a4027..5c004b9 100644
--- a/common/annotations/ku.xml
+++ b/common/annotations/ku.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/ky.xml b/common/annotations/ky.xml
index 5bbfd53..31040de 100644
--- a/common/annotations/ky.xml
+++ b/common/annotations/ky.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">кара тору</annotation>
<annotation cp="🏿">6-түр | кара | теринин өңү</annotation>
<annotation cp="🏿" type="tts">кара</annotation>
+ <annotation cp="–">тире</annotation>
+ <annotation cp="–" type="tts">тире</annotation>
+ <annotation cp="—">тире | узун тире</annotation>
+ <annotation cp="—" type="tts">узун тире</annotation>
+ <annotation cp="·" draft="contributed">орто чекит</annotation>
+ <annotation cp="·" type="tts" draft="contributed">орто чекит</annotation>
+ <annotation cp="«" draft="contributed">сол тырмакча</annotation>
+ <annotation cp="«" type="tts" draft="contributed">сол тырмакча</annotation>
+ <annotation cp="»">бурч | кашаалар | коюу белгилери | оң | оң бурчтуу кашаа | оң тырмакча | цитата | эки бурчтуу кашаа</annotation>
+ <annotation cp="»" type="tts">оң тырмакча</annotation>
+ <annotation cp="§" draft="contributed">бөлүк</annotation>
+ <annotation cp="§" type="tts" draft="contributed">бөлүк</annotation>
+ <annotation cp="†" draft="contributed">кош жылдыз</annotation>
+ <annotation cp="†" type="tts" draft="contributed">кош жылдыз</annotation>
+ <annotation cp="‡" draft="contributed">кош жылдыз белгиси</annotation>
+ <annotation cp="‡" type="tts" draft="contributed">кош жылдыз белгиси</annotation>
+ <annotation cp="•" draft="contributed">маркер</annotation>
+ <annotation cp="•" type="tts" draft="contributed">маркер</annotation>
+ <annotation cp="°" draft="contributed">градус</annotation>
+ <annotation cp="°" type="tts" draft="contributed">градус</annotation>
+ <annotation cp="℗" draft="contributed">үн жаздыруучу автордук укук</annotation>
+ <annotation cp="℗" type="tts" draft="contributed">үн жаздыруучу автордук укук</annotation>
+ <annotation cp="←" draft="contributed">солго багытталган жебе</annotation>
+ <annotation cp="←" type="tts" draft="contributed">солго багытталган жебе</annotation>
+ <annotation cp="→" draft="contributed">оңго багытталган жебе</annotation>
+ <annotation cp="→" type="tts" draft="contributed">оңго багытталган жебе</annotation>
+ <annotation cp="↑" draft="contributed">жогору багытталган жебе</annotation>
+ <annotation cp="↑" type="tts" draft="contributed">жогору багытталган жебе</annotation>
+ <annotation cp="↓" draft="contributed">ылдый багытталган жебе</annotation>
+ <annotation cp="↓" type="tts" draft="contributed">ылдый багытталган жебе</annotation>
+ <annotation cp="⇅" draft="contributed">жогору жана ылдый багытталган жебе</annotation>
+ <annotation cp="⇅" type="tts" draft="contributed">жогору жана ылдый багытталган жебе</annotation>
+ <annotation cp="⇆">жебе | оң | оң жебенин үстүндө солго караган жебе | оңго багытталган жебенин үстүндө солго багытталган жебе | сол</annotation>
+ <annotation cp="⇆" type="tts">оң жебенин үстүндө солго караган жебе</annotation>
+ <annotation cp="∆" draft="contributed">өсүш</annotation>
+ <annotation cp="∆" type="tts" draft="contributed">өсүш</annotation>
+ <annotation cp="∇" draft="contributed">набла</annotation>
+ <annotation cp="∇" type="tts" draft="contributed">набла</annotation>
+ <annotation cp="∈" draft="contributed">топтом элемент</annotation>
+ <annotation cp="∈" type="tts" draft="contributed">топтом элемент</annotation>
+ <annotation cp="÷" draft="contributed">бөлүү белгиси</annotation>
+ <annotation cp="÷" type="tts" draft="contributed">бөлүү белгиси</annotation>
+ <annotation cp="×" draft="contributed">көбөйтүү белгиси</annotation>
+ <annotation cp="×" type="tts" draft="contributed">көбөйтүү белгиси</annotation>
+ <annotation cp="⁻" draft="contributed">жогорку минус сызыгы</annotation>
+ <annotation cp="⁻" type="tts" draft="contributed">жогорку минус сызыгы</annotation>
+ <annotation cp="√" draft="contributed">квадраттык тамыр</annotation>
+ <annotation cp="√" type="tts" draft="contributed">квадраттык тамыр</annotation>
+ <annotation cp="∞" draft="contributed">чексиздик белгиси</annotation>
+ <annotation cp="∞" type="tts" draft="contributed">чексиздик белгиси</annotation>
+ <annotation cp="∩" draft="contributed">көбөйтүндү</annotation>
+ <annotation cp="∩" type="tts" draft="contributed">көбөйтүндү</annotation>
+ <annotation cp="∪" draft="contributed">бирдик</annotation>
+ <annotation cp="∪" type="tts" draft="contributed">бирдик</annotation>
+ <annotation cp="≡" draft="contributed">буга идентикалык</annotation>
+ <annotation cp="≡" type="tts" draft="contributed">буга идентикалык</annotation>
+ <annotation cp="⊂" draft="contributed">көптүк</annotation>
+ <annotation cp="⊂" type="tts" draft="contributed">көптүк</annotation>
+ <annotation cp="▲" draft="contributed">боёлуп, өйдө каратылган үч бурчтук</annotation>
+ <annotation cp="▲" type="tts" draft="contributed">боёлуп, өйдө каратылган үч бурчтук</annotation>
+ <annotation cp="▼" draft="contributed">боёлуп, ылдый каратылган үч бурчтук</annotation>
+ <annotation cp="▼" type="tts" draft="contributed">боёлуп, ылдый каратылган үч бурчтук</annotation>
+ <annotation cp="◊" draft="contributed">ромб</annotation>
+ <annotation cp="◊" type="tts" draft="contributed">ромб</annotation>
+ <annotation cp="○" draft="contributed">ичи бош тегерекче</annotation>
+ <annotation cp="○" type="tts" draft="contributed">ичи бош тегерекче</annotation>
+ <annotation cp="●" draft="contributed">боёлгон тегерекче</annotation>
+ <annotation cp="●" type="tts" draft="contributed">боёлгон тегерекче</annotation>
+ <annotation cp="◯" draft="contributed">чоң ичи бош тегерекче</annotation>
+ <annotation cp="◯" type="tts" draft="contributed">чоң ичи бош тегерекче</annotation>
<annotation cp="⚧" draft="contributed">трансгендер белгиси</annotation>
<annotation cp="⚧" type="tts" draft="contributed">трансгендер белгиси</annotation>
<annotation cp="🤌" draft="contributed">кыстырылган манжалар</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">асан-үсөн желеги</annotation>
<annotation cp="🏴☠">каракчы | каракчылардын желеги | кенч | пират | тоноо</annotation>
<annotation cp="🏴☠" type="tts">каракчылардын желеги</annotation>
+ <annotation cp="£" draft="contributed">валюта | ЕГФ | УБФ | фунт</annotation>
+ <annotation cp="£" type="tts">фунт</annotation>
+ <annotation cp="¥">валюта | йен | йена | КЮ | уюань | ЯПЮ</annotation>
+ <annotation cp="¥" type="tts">йен</annotation>
+ <annotation cp="€">валюта | ЕВР | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валюта | индия рупийи | рупий</annotation>
+ <annotation cp="₹" type="tts">индия рупийи</annotation>
+ <annotation cp="₽">валюта | рабль | рубль</annotation>
+ <annotation cp="₽" type="tts">рубль</annotation>
+ <annotation cp="¹" draft="contributed">жогоруда бир жазуусу</annotation>
+ <annotation cp="¹" type="tts" draft="contributed">жогоруда бир жазуусу</annotation>
+ <annotation cp="²" draft="contributed">жогоруда эки жазуусу</annotation>
+ <annotation cp="²" type="tts" draft="contributed">жогоруда эки жазуусу</annotation>
+ <annotation cp="³" draft="contributed">жогоруда үч саны</annotation>
+ <annotation cp="³" type="tts" draft="contributed">жогоруда үч саны</annotation>
+ <annotation cp="µ" draft="contributed">микро белги</annotation>
+ <annotation cp="µ" type="tts" draft="contributed">микро белги</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/lo.xml b/common/annotations/lo.xml
index c22558c..b7837ed 100644
--- a/common/annotations/lo.xml
+++ b/common/annotations/lo.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ສີສັນປະເພດ-5</annotation>
<annotation cp="🏿">ສີສັນ | ສີສັນປະເພດ-6 | ໂທນສີ | ປະເພດ</annotation>
<annotation cp="🏿" type="tts">ສີສັນປະເພດ-6</annotation>
+ <annotation cp="–">[en] | ຂີດຕໍ່ | ເຄື່ອງໝາຍຂີດຕໍ່ [en]</annotation>
+ <annotation cp="–" type="tts">ເຄື່ອງໝາຍຂີດຕໍ່ [en]</annotation>
+ <annotation cp="—">[em] | ຂີດຕໍ່ | ເຄື່ອງໝາຍຂີດຕໍ່ [em]</annotation>
+ <annotation cp="—" type="tts">ເຄື່ອງໝາຍຂີດຕໍ່ [em]</annotation>
+ <annotation cp="·">ຂັ້ນຄຳ | ເຄື່ອງໝາຍຈຸດຂັ້ນກາງ | ຈຸດ | ຈຸດຂັ້ນກາງ | ທາງກາງ</annotation>
+ <annotation cp="·" type="tts">ເຄື່ອງໝາຍຈຸດຂັ້ນກາງ</annotation>
+ <annotation cp="«">ເຄື່ອງໝາຍເປີດວົງຢືມ | ຊ້າຍ | ເປິດວົງຢືມ | ມຸມ | ວົງຢືມ | ວົງເລັບ</annotation>
+ <annotation cp="«" type="tts">ເຄື່ອງໝາຍເປີດວົງຢືມ</annotation>
+ <annotation cp="»">ຂວາ | ເຄື່ອງໝາຍປິດວົງຢືມ | ປິດວົງຢືມ | ມຸມ | ວົງຢືມ | ວົງເລັບ</annotation>
+ <annotation cp="»" type="tts">ເຄື່ອງໝາຍປິດວົງຢືມ</annotation>
+ <annotation cp="§">ເຄື່ອງໝາຍພາກສ່ວນ | ສ່ວນ | ພາກສ່ວນ | ວັກ</annotation>
+ <annotation cp="§" type="tts">ເຄື່ອງໝາຍພາກສ່ວນ</annotation>
+ <annotation cp="†">ເຄື່ອງໝາຍດາບ | ດາບ</annotation>
+ <annotation cp="†" type="tts">ເຄື່ອງໝາຍດາບ</annotation>
+ <annotation cp="‡">ເຄື່ອງໝາຍສອງດາບ | ສອງ | ດາບ</annotation>
+ <annotation cp="‡" type="tts">ເຄື່ອງໝາຍສອງດາບ</annotation>
+ <annotation cp="•">ເຄື່ອງໝາຍຈ້ຳວົງມົນ | ຈ້ຳວົງມົນ | ຈຸດ</annotation>
+ <annotation cp="•" type="tts">ເຄື່ອງໝາຍຈ້ຳວົງມົນ</annotation>
+ <annotation cp="°">ເຄື່ອງໝາຍອົງສາ | ຊົ່ວໂມງ | ພິສູດ | ອົງສາ</annotation>
+ <annotation cp="°" type="tts">ເຄື່ອງໝາຍອົງສາ</annotation>
+ <annotation cp="℗">ການບັນທຶກ | ສຽງ | ລິຂະສິດ | ລິຂະສິດການບັນທຶກສຽງ</annotation>
+ <annotation cp="℗" type="tts">ລິຂະສິດການບັນທຶກສຽງ</annotation>
+ <annotation cp="←">ຊ້າຍ | ລູກສອນ | ລູກສອນຊີ້ໄປທາງຊ້າຍ</annotation>
+ <annotation cp="←" type="tts">ລູກສອນຊີ້ໄປທາງຊ້າຍ</annotation>
+ <annotation cp="→">ຂວາ | ລູກສອງຊີ້ໄປທາງຂວາ | ລູກສອນ | ລູກສອນຊີ້ໄປທາງຂວາ</annotation>
+ <annotation cp="→" type="tts">ລູກສອງຊີ້ໄປທາງຂວາ</annotation>
+ <annotation cp="↑">ຂຶ້ນ | ລູກສອນ | ລູກສອນຊີ້ຂຶ້ນເທິງ</annotation>
+ <annotation cp="↑" type="tts">ລູກສອນຊີ້ຂຶ້ນເທິງ</annotation>
+ <annotation cp="↓">ລູກສອນ | ລູກສອນຊີ້ລົງ | ລູກສອນຊີ້ລົງລຸ່ມ | ລົງ</annotation>
+ <annotation cp="↓" type="tts">ລູກສອນຊີ້ລົງລຸ່ມ</annotation>
+ <annotation cp="⇅">ຂຶ້ນ | ລູກສອນ | ລູກສອນຊີ້ຂຶ້ນ ແລະ ລູກສອນຊີ້ລົງ | ລົງ</annotation>
+ <annotation cp="⇅" type="tts">ລູກສອນຊີ້ຂຶ້ນ ແລະ ລູກສອນຊີ້ລົງ</annotation>
+ <annotation cp="⇆">ຂວາ | ຊ້າຍ | ລູກສອນ | ລູກສອນຊີ້ໄປທາງຊ້າຍເທິງລູກສອນຊີ້ໄປທາງຂວາ | ລູກສອນຊີ້ໄປທາງຊ້າຍເທິງລູກສູນຊີ້ໄປທາງຂວາ</annotation>
+ <annotation cp="⇆" type="tts">ລູກສອນຊີ້ໄປທາງຊ້າຍເທິງລູກສອນຊີ້ໄປທາງຂວາ</annotation>
+ <annotation cp="∆">ເຄື່ອງໝາຍເພີ່ມ | ສາມຫຼ່ຽມ | ເພີ່ມ</annotation>
+ <annotation cp="∆" type="tts">ເຄື່ອງໝາຍເພີ່ມ</annotation>
+ <annotation cp="∇">ເຄື່ອງໝາຍນາບຣາ | ສາມຫຼ່ຽມ | ນາບຣາ</annotation>
+ <annotation cp="∇" type="tts">ເຄື່ອງໝາຍນາບຣາ</annotation>
+ <annotation cp="∈">ກຸ່ມ | ເຄື່ອງໝາຍຢູ່ໃນກຸ່ມ | ສະມາຊິກຂອງ | ປະກອບ | ອົງປະກອບ | ອົງປະກອບຂອງ</annotation>
+ <annotation cp="∈" type="tts">ເຄື່ອງໝາຍຢູ່ໃນກຸ່ມ</annotation>
+ <annotation cp="÷">ການຫານ | ເຄື່ອງໝາຍຫານ | ສ່ວນ | ຫານ</annotation>
+ <annotation cp="÷" type="tts">ເຄື່ອງໝາຍຫານ</annotation>
+ <annotation cp="×">ຄູນ | ເຄື່ອງໝາຍ | ສັນຍາລັກ | ສັນຍາລັກຄູນ</annotation>
+ <annotation cp="×" type="tts">ສັນຍາລັກຄູນ</annotation>
+ <annotation cp="⁻">ກຳລັງລົບ | ເຄື່ອງໝາຍກຳລັງລົບ | ລົບ</annotation>
+ <annotation cp="⁻" type="tts">ເຄື່ອງໝາຍກຳລັງລົບ</annotation>
+ <annotation cp="√">ກຳລັງສ່ວນ | ຮາກ | ຮາກຂັ້ນສອງ</annotation>
+ <annotation cp="√" type="tts">ຮາກຂັ້ນສອງ</annotation>
+ <annotation cp="∞">ເຄື່ອງໝາຍອະນັນ | ອະນັນ</annotation>
+ <annotation cp="∞" type="tts">ເຄື່ອງໝາຍອະນັນ</annotation>
+ <annotation cp="∩">ການຕັດ | ກຸ່ມ | ເຄື່ອງໝາຍຕັດ</annotation>
+ <annotation cp="∩" type="tts">ເຄື່ອງໝາຍຕັດ</annotation>
+ <annotation cp="∪">ການຮວມຮວມ | ກຸ່ມ | ເຄື່ອງໝາຍຮວມ | ຮວມ</annotation>
+ <annotation cp="∪" type="tts">ເຄື່ອງໝາຍຮວມ</annotation>
+ <annotation cp="≡">ເຄື່ອງໝາຍລະບຸເປັນ | ຈຳກັດ | ສາມ | ຖືກລະບຸ | ຖືກລະບຸເປັນ</annotation>
+ <annotation cp="≡" type="tts">ເຄື່ອງໝາຍລະບຸເປັນ</annotation>
+ <annotation cp="⊂">ກຸ່ມ | ກຸ່ມຍ່ອຍ | ກຸ່ມຍ່ອຍຂອງ | ເຄື່ອງໝາຍກຸ່ມຍ່ອຍ</annotation>
+ <annotation cp="⊂" type="tts">ເຄື່ອງໝາຍກຸ່ມຍ່ອຍ</annotation>
+ <annotation cp="▲">ຂຶ້ນ | ສາມຫຼ່ຽມ | ສາມຫຼ່ຽມຊິ້ຂຶ້ນ | ສາມຫຼ່ຽມຊີ້ຂຶ້ນແບບທຶບ | ທຶບ | ລູກສອນ</annotation>
+ <annotation cp="▲" type="tts">ສາມຫຼ່ຽມຊິ້ຂຶ້ນ</annotation>
+ <annotation cp="▼">ສາມຫຼ່ຽມ | ສາມຫຼ່ຽມຊີ້ລົງ | ສາມຫຼ່ຽມຊີ້ລົງແບບທຶບ | ທຶບ | ລູກສອນ | ລົງ</annotation>
+ <annotation cp="▼" type="tts">ສາມຫຼ່ຽມຊີ້ລົງ</annotation>
+ <annotation cp="◊">ເຄື່ອງໝາຍສີ່ຫຼ່ຽມດອກຈັນ | ສີ່ຫຼ່ຽມດອກຈັນ | ຮູບເພັດ</annotation>
+ <annotation cp="◊" type="tts">ເຄື່ອງໝາຍສີ່ຫຼ່ຽມດອກຈັນ</annotation>
+ <annotation cp="○">ວົງມົນ | ວົງມົນເປົ່າ | ແຫວນ</annotation>
+ <annotation cp="○" type="tts">ວົງມົນເປົ່າ</annotation>
+ <annotation cp="●">ວົງມົນ | ວົງມົນແບບທຶບ</annotation>
+ <annotation cp="●" type="tts">ວົງມົນແບບທຶບ</annotation>
+ <annotation cp="◯">ວົງເປົ່າແບບກວ້າງ | ວົງມົນ | ວົງມົນເປົ່າແບບກວ້າງ | ແຫວນ</annotation>
+ <annotation cp="◯" type="tts">ວົງເປົ່າແບບກວ້າງ</annotation>
<annotation cp="⚧" draft="provisional">ສັນຍາລັກຄົນຂ້າມເພດ</annotation>
<annotation cp="⚧" type="tts">ສັນຍາລັກຄົນຂ້າມເພດ</annotation>
<annotation cp="🤌" draft="provisional">ຈຸ້ມນິ້ວມື</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ທຸງສາຍຮຸ້ງ</annotation>
<annotation cp="🏴☠">ຂຸມຊັບ | ໂຈນສະລັດ | ທຸງໂຈນສະລັດ | ປູ້ນ | ໂລໂກຫົວກະໂຫຼກ</annotation>
<annotation cp="🏴☠" type="tts">ທຸງໂຈນສະລັດ</annotation>
+ <annotation cp="£">[EGP] | [GBP] | ສະກຸນເງິນ | ປອນ</annotation>
+ <annotation cp="£" type="tts">ປອນ</annotation>
+ <annotation cp="¥">[CNY] | [JPY] | ສະກຸນເງິນ | ຢວນ | ເຢນ</annotation>
+ <annotation cp="¥" type="tts">ເຢນ</annotation>
+ <annotation cp="€">[EUR] | ສະກຸນເງິນ | ເອີໂຣ</annotation>
+ <annotation cp="€" type="tts">ເອີໂຣ</annotation>
+ <annotation cp="₹">ສະກຸນເງິນ | ຣູປີ | ອິນເດຍ ຣູປີ</annotation>
+ <annotation cp="₹" type="tts">ອິນເດຍ ຣູປີ</annotation>
+ <annotation cp="₽">ສະກຸນເງິນ | ຣູເບິນ</annotation>
+ <annotation cp="₽" type="tts">ຣູເບິນ</annotation>
+ <annotation cp="¹">ກຳລັງ | ກຳລັງໜຶ່ງ | ໜຶ່ງ</annotation>
+ <annotation cp="¹" type="tts">ກຳລັງໜຶ່ງ</annotation>
+ <annotation cp="²">ກຳລັງ | ກຳລັງສອງ | ສອງ | ຍົກກຳລັງ</annotation>
+ <annotation cp="²" type="tts">ກຳລັງສອງ</annotation>
+ <annotation cp="³">ກ້ອນ | ກຳລັງ | ກຳລັງສາມ | ສາມ</annotation>
+ <annotation cp="³" type="tts">ກຳລັງສາມ</annotation>
+ <annotation cp="µ">ສັນຍາລັກໄມໂຄຣ | ວັດແທກ</annotation>
+ <annotation cp="µ" type="tts">ສັນຍາລັກໄມໂຄຣ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/lt.xml b/common/annotations/lt.xml
index 7341e21..a1ccf8a 100644
--- a/common/annotations/lt.xml
+++ b/common/annotations/lt.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">tamsios odos</annotation>
<annotation cp="🏿">itin tamsios odos | odos atspalvis</annotation>
<annotation cp="🏿" type="tts">itin tamsios odos</annotation>
+ <annotation cp="–">brūkšnys</annotation>
+ <annotation cp="–" type="tts">brūkšnys</annotation>
+ <annotation cp="—">brūkšnys | ilgasis</annotation>
+ <annotation cp="—" type="tts">ilgasis brūkšnys</annotation>
+ <annotation cp="·">interpunktas | taškas | vidurinysis</annotation>
+ <annotation cp="·" type="tts">interpunktas</annotation>
+ <annotation cp="«">atidaromosios laužtinės kabutės | kabutės | kairiosios | laužtinės | uždaromosios</annotation>
+ <annotation cp="«" type="tts">atidaromosios laužtinės kabutės</annotation>
+ <annotation cp="»">dešiniosios | kabutės | laužtinės | uždaromosios</annotation>
+ <annotation cp="»" type="tts">uždaromosios laužtinės kabutės</annotation>
+ <annotation cp="§">paragrafas | pastraipa | pastraipos simbolis | skirsnis</annotation>
+ <annotation cp="§" type="tts">pastraipos simbolis</annotation>
+ <annotation cp="†">kryžiaus ženklas | kryžius</annotation>
+ <annotation cp="†" type="tts">kryžiaus ženklas</annotation>
+ <annotation cp="‡">dvigubas | dvigubas kryžiaus ženklas | kryžius</annotation>
+ <annotation cp="‡" type="tts">dvigubas kryžiaus ženklas</annotation>
+ <annotation cp="•">taškas | ženklelis</annotation>
+ <annotation cp="•" type="tts">ženklelis</annotation>
+ <annotation cp="°">laipsnis | valanda</annotation>
+ <annotation cp="°" type="tts">laipsnis</annotation>
+ <annotation cp="℗">autorių teisės | autorių teisių simbolis | garsas | garso įrašo autorių teisių simbolis | įrašas</annotation>
+ <annotation cp="℗" type="tts">garso įrašo autorių teisių simbolis</annotation>
+ <annotation cp="←">į kairę nukreipta rodyklė | kairė | rodyklė</annotation>
+ <annotation cp="←" type="tts">į kairę nukreipta rodyklė</annotation>
+ <annotation cp="→">dešinė | į dešinę nukreipta rodyklė | rodyklė</annotation>
+ <annotation cp="→" type="tts">į dešinę nukreipta rodyklė</annotation>
+ <annotation cp="↑">į viršų nukreipta rodyklė | rodyklė | viršus</annotation>
+ <annotation cp="↑" type="tts">į viršų nukreipta rodyklė</annotation>
+ <annotation cp="↓">apačia | į apačią nukreipta rodyklė | rodyklė</annotation>
+ <annotation cp="↓" type="tts">į apačią nukreipta rodyklė</annotation>
+ <annotation cp="⇅">apačia | į viršų ir į apačią nukreiptos rodyklės | rodyklė | viršus</annotation>
+ <annotation cp="⇅" type="tts">į viršų ir į apačią nukreiptos rodyklės</annotation>
+ <annotation cp="⇆">dešinė | į kairę nukreipta rodyklė virš į dešinę nukreiptos rodyklės | kairė | rodyklė</annotation>
+ <annotation cp="⇆" type="tts">į kairę nukreipta rodyklė virš į dešinę nukreiptos rodyklės</annotation>
+ <annotation cp="∆">didinti | trikampis</annotation>
+ <annotation cp="∆" type="tts">didinti</annotation>
+ <annotation cp="∇">nabla | trikampis</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">aibė | elementas | narys | patenka į | priklauso | yra elementas</annotation>
+ <annotation cp="∈" type="tts">priklauso</annotation>
+ <annotation cp="÷">dalyba | dalybos simbolis | dalyti</annotation>
+ <annotation cp="÷" type="tts">dalybos simbolis</annotation>
+ <annotation cp="×">daugyba | daugybos simbolis | sandauga</annotation>
+ <annotation cp="×" type="tts">daugybos simbolis</annotation>
+ <annotation cp="⁻">minusas | minusas viršutiniame indekse | viršutinis indeksas</annotation>
+ <annotation cp="⁻" type="tts">minusas viršutiniame indekse</annotation>
+ <annotation cp="√">kvadratinė šaknis | šaknis</annotation>
+ <annotation cp="√" type="tts">kvadratinė šaknis</annotation>
+ <annotation cp="∞">begalybė | begalybės simbolis</annotation>
+ <annotation cp="∞" type="tts">begalybės simbolis</annotation>
+ <annotation cp="∩">aibė | sankirta</annotation>
+ <annotation cp="∩" type="tts">sankirta</annotation>
+ <annotation cp="∪">aibė | sąjunga</annotation>
+ <annotation cp="∪" type="tts">sąjunga</annotation>
+ <annotation cp="≡">identiška | lygu | tapatu</annotation>
+ <annotation cp="≡" type="tts">tapatu</annotation>
+ <annotation cp="⊂">aibė | poaibis</annotation>
+ <annotation cp="⊂" type="tts">poaibis</annotation>
+ <annotation cp="▲">į viršų | pilnaviduris | pilnaviduris į viršų nukreiptas trikampis | rodyklė | trikampis</annotation>
+ <annotation cp="▲" type="tts">pilnaviduris į viršų nukreiptas trikampis</annotation>
+ <annotation cp="▼">į apačią | pilnaviduris | pilnaviduris į apačią nukreiptas trikampis | rodyklė | trikampis</annotation>
+ <annotation cp="▼" type="tts">pilnaviduris į apačią nukreiptas trikampis</annotation>
+ <annotation cp="◊">rombas</annotation>
+ <annotation cp="◊" type="tts">rombas</annotation>
+ <annotation cp="○">apskritimas | tuščiaviduris apskritimas | žiedas</annotation>
+ <annotation cp="○" type="tts">apskritimas</annotation>
+ <annotation cp="●">pilnaviduris apskritimas | skritulys</annotation>
+ <annotation cp="●" type="tts">skritulys</annotation>
+ <annotation cp="◯">apskritimas | didelis apskritimas | didelis tuščiaviduris apskritimas | žiedas</annotation>
+ <annotation cp="◯" type="tts">didelis apskritimas</annotation>
<annotation cp="⚧">translyčių simbolis | translytis</annotation>
<annotation cp="⚧" type="tts">translyčių simbolis</annotation>
<annotation cp="🤌">pirštai | rankos gestas | sarkastiškas | suspausti</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">vaivorykštinė vėliava</annotation>
<annotation cp="🏴☠">Linksmasis Rodžeris | lobis | piratas | piratų vėliava | plėšikauti</annotation>
<annotation cp="🏴☠" type="tts">piratų vėliava</annotation>
+ <annotation cp="£">EGP | GBP | svaras | valiuta</annotation>
+ <annotation cp="£" type="tts">svaras</annotation>
+ <annotation cp="¥">CNY | jena | JPY | juanis | valiuta</annotation>
+ <annotation cp="¥" type="tts">jena</annotation>
+ <annotation cp="€">EUR | euras | valiuta</annotation>
+ <annotation cp="€" type="tts">euras</annotation>
+ <annotation cp="₹">Indijos rupija | rupija | valiuta</annotation>
+ <annotation cp="₹" type="tts">Indijos rupija</annotation>
+ <annotation cp="₽">rublis | valiuta</annotation>
+ <annotation cp="₽" type="tts">rublis</annotation>
+ <annotation cp="¹">vienetas | vienetas viršutiniame indekse | viršutinis indeksas</annotation>
+ <annotation cp="¹" type="tts">vienetas viršutiniame indekse</annotation>
+ <annotation cp="²">du | dvejetas | dvejetas viršutiniame indekse | kvadratu | viršutinis indeksas</annotation>
+ <annotation cp="²" type="tts">dvejetas viršutiniame indekse</annotation>
+ <annotation cp="³">kubu | trejetas | trejetas viršutiniame indekse | trys | viršutinis indeksas</annotation>
+ <annotation cp="³" type="tts">trejetas viršutiniame indekse</annotation>
+ <annotation cp="µ" draft="provisional">„mikro-“ simbolis</annotation>
+ <annotation cp="µ" type="tts" draft="provisional">„mikro-“ simbolis</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/lv.xml b/common/annotations/lv.xml
index 0c4d5df..0f33cc2 100644
--- a/common/annotations/lv.xml
+++ b/common/annotations/lv.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">vidēji tumšs ādas tonis</annotation>
<annotation cp="🏿">6. tips | ādas tonis | tumšs ādas tonis</annotation>
<annotation cp="🏿" type="tts">tumšs ādas tonis</annotation>
+ <annotation cp="–">svītra | vienotājzīme</annotation>
+ <annotation cp="–" type="tts">vienotājzīme</annotation>
+ <annotation cp="—">domuzīme | svītra</annotation>
+ <annotation cp="—" type="tts">domuzīme</annotation>
+ <annotation cp="·">punkts | vidus | viduspunkts</annotation>
+ <annotation cp="·" type="tts">viduspunkts</annotation>
+ <annotation cp="«">iekavas | jumtiņi | kreisais | kreisās stūra pēdiņas | leņķis | pēdiņas | stūra pēdiņas</annotation>
+ <annotation cp="«" type="tts">kreisās stūra pēdiņas</annotation>
+ <annotation cp="»">iekavas | jumtiņi | labais | labās stūra pēdiņas | leņķis | pēdiņas | stūra pēdiņas</annotation>
+ <annotation cp="»" type="tts">labās stūra pēdiņas</annotation>
+ <annotation cp="§">daļa | paragrāfa zīme | paragrāfs | sadaļa</annotation>
+ <annotation cp="§" type="tts">sadaļa</annotation>
+ <annotation cp="†">dunča zīme | duncis | krustiņš</annotation>
+ <annotation cp="†" type="tts">dunča zīme</annotation>
+ <annotation cp="‡">divi | divu dunču zīme | duncis | krustiņš</annotation>
+ <annotation cp="‡" type="tts">divu dunču zīme</annotation>
+ <annotation cp="•">aizzīme | punkts</annotation>
+ <annotation cp="•" type="tts">aizzīme</annotation>
+ <annotation cp="°">grāds | pakāpe | stunda</annotation>
+ <annotation cp="°" type="tts">pakāpe</annotation>
+ <annotation cp="℗">autortiesības | ieraksts | skaņa | skaņu ieraksta autortiesības</annotation>
+ <annotation cp="℗" type="tts">skaņu ieraksta autortiesības</annotation>
+ <annotation cp="←">bultiņa | kreisā | pa kreisi vērsta bultiņa</annotation>
+ <annotation cp="←" type="tts">pa kreisi vērsta bultiņa</annotation>
+ <annotation cp="→">bultiņa | labā | pa labi vērsta bultiņa</annotation>
+ <annotation cp="→" type="tts">pa labi vērsta bultiņa</annotation>
+ <annotation cp="↑">augšup | augšupvērsta bultiņa | bultiņa</annotation>
+ <annotation cp="↑" type="tts">augšupvērsta bultiņa</annotation>
+ <annotation cp="↓">bultiņa | lejup | lejupvērsta bultiņa</annotation>
+ <annotation cp="↓" type="tts">lejupvērsta bultiņa</annotation>
+ <annotation cp="⇅">augšup | augšupvērsta bultiņa un lejupvērsta bultiņa | bultiņa | lejup</annotation>
+ <annotation cp="⇅" type="tts">augšupvērsta bultiņa un lejupvērsta bultiņa</annotation>
+ <annotation cp="⇆">bultiņa | kreisā | kreisā bultiņa virs labās bultiņas | labā | pa kreisi vērsta bultiņa virs pa labi vērstas bultiņas</annotation>
+ <annotation cp="⇆" type="tts">kreisā bultiņa virs labās bultiņas</annotation>
+ <annotation cp="∆">pieaugums | trīsstūris</annotation>
+ <annotation cp="∆" type="tts">pieaugums</annotation>
+ <annotation cp="∇">nabla | trīsstūris</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">elements | elements no | kopa | piederība | satur</annotation>
+ <annotation cp="∈" type="tts">elements no</annotation>
+ <annotation cp="÷">dalīšana | dalīšanas zīme | dalīt</annotation>
+ <annotation cp="÷" type="tts">dalīšanas zīme</annotation>
+ <annotation cp="×">reizes | reizināšana | reizināšanas zīme | reizināt</annotation>
+ <annotation cp="×" type="tts">reizināšanas zīme</annotation>
+ <annotation cp="⁻">augšraksts | mīnus | mīnus augšrakstā</annotation>
+ <annotation cp="⁻" type="tts">mīnus augšrakstā</annotation>
+ <annotation cp="√">bāze | iracionāls skaitlis | kvadrāts | kvadrātsakne | sakne</annotation>
+ <annotation cp="√" type="tts">kvadrātsakne</annotation>
+ <annotation cp="∞">bezgalība | bezgalības zīme</annotation>
+ <annotation cp="∞" type="tts">bezgalības zīme</annotation>
+ <annotation cp="∩">kopa | šķēlums</annotation>
+ <annotation cp="∩" type="tts">šķēlums</annotation>
+ <annotation cp="∪">datu kopa | kopa | kopums</annotation>
+ <annotation cp="∪" type="tts">kopums</annotation>
+ <annotation cp="≡">precīzs | trīskāršs | vienāds | vienads ar | vienāds ar</annotation>
+ <annotation cp="≡" type="tts">vienāds ar</annotation>
+ <annotation cp="⊂">apakškopa | apakškopa no | kopa</annotation>
+ <annotation cp="⊂" type="tts">apakškopa no</annotation>
+ <annotation cp="▲">augšup | bultiņa | pilns | pilns augšupvērsts trīsstūris | trīsstūris</annotation>
+ <annotation cp="▲" type="tts">pilns augšupvērsts trīsstūris</annotation>
+ <annotation cp="▼">bultiņa | lejup | pilns | pilns lejupvērsts trīsstūris | trīsstūris</annotation>
+ <annotation cp="▼" type="tts">pilns lejupvērsts trīsstūris</annotation>
+ <annotation cp="◊">rombs | rombveida</annotation>
+ <annotation cp="◊" type="tts">rombs</annotation>
+ <annotation cp="○">gredzens | riņķis | tukšs riņķis</annotation>
+ <annotation cp="○" type="tts">tukšs riņķis</annotation>
+ <annotation cp="●">pilns riņķis | riņķis</annotation>
+ <annotation cp="●" type="tts">pilns riņķis</annotation>
+ <annotation cp="◯">gredzens | liels tukšs riņķis | riņķis</annotation>
+ <annotation cp="◯" type="tts">liels tukšs riņķis</annotation>
<annotation cp="⚧">transdzimuma simbols | transdzimums</annotation>
<annotation cp="⚧" type="tts">transdzimuma simbols</annotation>
<annotation cp="🤌">pastiepti pirksti | pirksti | rokas žests | sarkastisks | saspiests</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">varavīksnes karogs</annotation>
<annotation cp="🏴☠">bagātības | laupījums | pirāts | pirātu karogs</annotation>
<annotation cp="🏴☠" type="tts">pirātu karogs</annotation>
+ <annotation cp="£">EGP | GBP | mārciņa | valūta</annotation>
+ <annotation cp="£" type="tts">mārciņa</annotation>
+ <annotation cp="¥">CNY | jena | JPY | juaņa | valūta</annotation>
+ <annotation cp="¥" type="tts">jena</annotation>
+ <annotation cp="€">eiro | EUR | valūta</annotation>
+ <annotation cp="€" type="tts">eiro</annotation>
+ <annotation cp="₹">Indijas rūpija | rūpija | valūta</annotation>
+ <annotation cp="₹" type="tts">Indijas rūpija</annotation>
+ <annotation cp="₽">rublis | valūta</annotation>
+ <annotation cp="₽" type="tts">rublis</annotation>
+ <annotation cp="¹">augšraksts | viens | viens augšrakstā</annotation>
+ <annotation cp="¹" type="tts">viens augšrakstā</annotation>
+ <annotation cp="²">augšraksts | divi | divi augšrakstā | kvadrātā</annotation>
+ <annotation cp="²" type="tts">divi augšrakstā</annotation>
+ <annotation cp="³">augšraksts | kubā | trīs | trīs augšrakstā</annotation>
+ <annotation cp="³" type="tts">trīs augšrakstā</annotation>
+ <annotation cp="µ">mērvienība | mikro zime | mikrozīme</annotation>
+ <annotation cp="µ" type="tts">mikrozīme</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/mk.xml b/common/annotations/mk.xml
index 9fc8d8c..5ea3d12 100644
--- a/common/annotations/mk.xml
+++ b/common/annotations/mk.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">тип на кожа 5</annotation>
<annotation cp="🏿">боја | кожа | модификатор на емотикона | тип на кожа 6</annotation>
<annotation cp="🏿" type="tts">тип на кожа 6</annotation>
+ <annotation cp="–">правописен знак | црта</annotation>
+ <annotation cp="–" type="tts">црта</annotation>
+ <annotation cp="—">долга црта | правописен знак</annotation>
+ <annotation cp="—" type="tts">долга црта</annotation>
+ <annotation cp="·">средина | средна точка | точка</annotation>
+ <annotation cp="·" type="tts">средна точка</annotation>
+ <annotation cp="«">загради | закосен | карети | лев француски наводник | лево | наводник | шеврон</annotation>
+ <annotation cp="«" type="tts">лев француски наводник</annotation>
+ <annotation cp="»">десен француски наводник | десно | загради | закосен | карети | наводник | шеврон</annotation>
+ <annotation cp="»" type="tts">десен француски наводник</annotation>
+ <annotation cp="§">дел | знак за оддел | оддел | параграф</annotation>
+ <annotation cp="§" type="tts">оддел</annotation>
+ <annotation cp="†">бодеж | знак за бодеж | обелиск</annotation>
+ <annotation cp="†" type="tts">знак за бодеж</annotation>
+ <annotation cp="‡">бодеж | двојно | знак за двоен бодеж | обелиск</annotation>
+ <annotation cp="‡" type="tts">знак за двоен бодеж</annotation>
+ <annotation cp="•">знак за набројување | точка</annotation>
+ <annotation cp="•" type="tts">знак за набројување</annotation>
+ <annotation cp="°">процент на алкохол | степен | час</annotation>
+ <annotation cp="°" type="tts">степен</annotation>
+ <annotation cp="℗">авторски права | авторски права за аудио-снимка | звук | снимање</annotation>
+ <annotation cp="℗" type="tts">авторски права за аудио-снимка</annotation>
+ <annotation cp="←">лево | стрелка | стрелка што покажува налево</annotation>
+ <annotation cp="←" type="tts">стрелка што покажува налево</annotation>
+ <annotation cp="→">десно | стрелка | стрелка што покажува надесно</annotation>
+ <annotation cp="→" type="tts">стрелка што покажува надесно</annotation>
+ <annotation cp="↑">горе | стрелка | стрелка што покажува нагоре</annotation>
+ <annotation cp="↑" type="tts">стрелка што покажува нагоре</annotation>
+ <annotation cp="↓">долу | стрелка | стрелка што покажува надолу</annotation>
+ <annotation cp="↓" type="tts">стрелка што покажува надолу</annotation>
+ <annotation cp="⇅">горе | долу | стрелка | стрелка нагоре и стрелка надолу</annotation>
+ <annotation cp="⇅" type="tts">стрелка нагоре и стрелка надолу</annotation>
+ <annotation cp="⇆">десно | лево | стрелка | стрелка налево врз стрелка надесно</annotation>
+ <annotation cp="⇆" type="tts">стрелка налево врз стрелка надесно</annotation>
+ <annotation cp="∆">инкремент | триаголник</annotation>
+ <annotation cp="∆" type="tts">инкремент</annotation>
+ <annotation cp="∇">набла | триаголник</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">е елемент на | елемент | множество | содржи | членство</annotation>
+ <annotation cp="∈" type="tts">е елемент на</annotation>
+ <annotation cp="÷">делење | знак за делење | подели</annotation>
+ <annotation cp="÷" type="tts">знак за делење</annotation>
+ <annotation cp="×">знак за множење | множење | по | помножи</annotation>
+ <annotation cp="×" type="tts">знак за множење</annotation>
+ <annotation cp="⁻">експонент | минус | минус во експонент</annotation>
+ <annotation cp="⁻" type="tts">минус во експонент</annotation>
+ <annotation cp="√">квадратен корен | корен | радикал</annotation>
+ <annotation cp="√" type="tts">квадратен корен</annotation>
+ <annotation cp="∞">бесконечно | знак за бесконечност</annotation>
+ <annotation cp="∞" type="tts">знак за бесконечност</annotation>
+ <annotation cp="∩">множество | пресек</annotation>
+ <annotation cp="∩" type="tts">пресек</annotation>
+ <annotation cp="∪">збирка | множество | унија</annotation>
+ <annotation cp="∪" type="tts">унија</annotation>
+ <annotation cp="≡">е идентично на | еднакво | идентично | тројно</annotation>
+ <annotation cp="≡" type="tts">е идентично на</annotation>
+ <annotation cp="⊂">е подмножество на | множество | подмножество</annotation>
+ <annotation cp="⊂" type="tts">е подмножество на</annotation>
+ <annotation cp="▲">горе | полн триаголник свртен нагоре | полно | стрелка | триаголник</annotation>
+ <annotation cp="▲" type="tts">полн триаголник свртен нагоре</annotation>
+ <annotation cp="▼">долу | полн траголник свртен надолу | полн триаголник свртен надолу | полно | стрелка | триаголник</annotation>
+ <annotation cp="▼" type="tts">полн траголник свртен надолу</annotation>
+ <annotation cp="◊">дијамант | ромб</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">круг | празен круг | прстен</annotation>
+ <annotation cp="○" type="tts">празен круг</annotation>
+ <annotation cp="●">круг | полн круг</annotation>
+ <annotation cp="●" type="tts">полн круг</annotation>
+ <annotation cp="◯">голем празен круг | круг | прстен</annotation>
+ <annotation cp="◯" type="tts">голем празен круг</annotation>
<annotation cp="⚧">трансродов | трансродов симбол</annotation>
<annotation cp="⚧" type="tts">трансродов симбол</annotation>
<annotation cp="🤌">гест со рака | испрашување | прсти | саркастично | стиснати</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">знаме на виножитото</annotation>
<annotation cp="🏴☠">богатство | грабеж | пират | пиратско знаме</annotation>
<annotation cp="🏴☠" type="tts">пиратско знаме</annotation>
+ <annotation cp="£">[EGP] | [GBP] | валута | фунта</annotation>
+ <annotation cp="£" type="tts">фунта</annotation>
+ <annotation cp="¥">[CNY] | [JPY] | валута | јен | јуан</annotation>
+ <annotation cp="¥" type="tts">јен</annotation>
+ <annotation cp="€">[EUR] | валута | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валута | индиска рупија | рупија</annotation>
+ <annotation cp="₹" type="tts">индиска рупија</annotation>
+ <annotation cp="₽">валута | рубља</annotation>
+ <annotation cp="₽" type="tts">рубља</annotation>
+ <annotation cp="¹">1 | експонент</annotation>
+ <annotation cp="¹" type="tts">експонент 1</annotation>
+ <annotation cp="²">2 | експонент | квадратни</annotation>
+ <annotation cp="²" type="tts">експонент 2</annotation>
+ <annotation cp="³">3 | експонент | кубни</annotation>
+ <annotation cp="³" type="tts">експонент 3</annotation>
+ <annotation cp="µ">знак за микро | мера</annotation>
+ <annotation cp="µ" type="tts">знак за микро</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ml.xml b/common/annotations/ml.xml
index b599c2f..3a3da17 100644
--- a/common/annotations/ml.xml
+++ b/common/annotations/ml.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ഇടത്തരം ഇരുണ്ട ചർമ്മ നിറം</annotation>
<annotation cp="🏿">ഇരുണ്ട ചർമ്മ നിറം | ചർമ്മ നിറം | ചർമ്മത്തിന്റെ നിറം-6 | തരം 6</annotation>
<annotation cp="🏿" type="tts">ഇരുണ്ട ചർമ്മ നിറം</annotation>
+ <annotation cp="–">എൻ | ഡാഷ്</annotation>
+ <annotation cp="–" type="tts">എൻ ഡാഷ്</annotation>
+ <annotation cp="—">എം | ഡാഷ്</annotation>
+ <annotation cp="—" type="tts">എം ഡാഷ്</annotation>
+ <annotation cp="·">കേന്ദ്ര ബിന്ദു | ബിന്ദു | മധ്യം | മധ്യ ബിന്ദു | മധ്യബിന്ദു</annotation>
+ <annotation cp="·" type="tts">മധ്യ ബിന്ദു</annotation>
+ <annotation cp="«">ഇടത് | ഇടത് ഗിൽമെ | ഉദ്ധരണി | കോണ് | പാടിനികൾ | വലയങ്ങൾ | ഷെവ്റോൺ</annotation>
+ <annotation cp="«" type="tts">ഇടത് ഗിൽമെ</annotation>
+ <annotation cp="»">ഉദ്ധരണി | കോണ് | പാടിനികൾ | വലത് | വലത് ഗിൽമെ | വലയങ്ങൾ | ഷെവ്റോൺ</annotation>
+ <annotation cp="»" type="tts">വലത് ഗിൽമെ</annotation>
+ <annotation cp="§">ഖണ്ഡിക | ഭാഗം | വിഭാഗം | വിഭാഗ ചിഹ്നം</annotation>
+ <annotation cp="§" type="tts">വിഭാഗം</annotation>
+ <annotation cp="†">ഓബലസ് | ഓബലിസ്ക് | ഡാഗർ | ഡാഗർ ചിഹ്നം</annotation>
+ <annotation cp="†" type="tts">ഡാഗർ ചിഹ്നം</annotation>
+ <annotation cp="‡">ഇരട്ട | ഇരട്ട ഡാഗർ ചിഹ്നം | ഓബലസ് | ഓബലിസ്ക് | ഡാഗർ</annotation>
+ <annotation cp="‡" type="tts">ഇരട്ട ഡാഗർ ചിഹ്നം</annotation>
+ <annotation cp="•">ബിന്ദു | ബുള്ളറ്റ്</annotation>
+ <annotation cp="•" type="tts">ബുള്ളറ്റ്</annotation>
+ <annotation cp="°">ഡിഗ്രി | തെളിവ് | മണിക്കൂർ</annotation>
+ <annotation cp="°" type="tts">ഡിഗ്രി</annotation>
+ <annotation cp="℗">പകർപ്പവകാശം | ശബ്ദം | ശബ്ദ റെക്കോർഡിംഗ് പകർപ്പവകാശം | റെക്കോർഡിംഗ്</annotation>
+ <annotation cp="℗" type="tts">ശബ്ദ റെക്കോർഡിംഗ് പകർപ്പവകാശം</annotation>
+ <annotation cp="←">അമ്പടയാളം | ഇടത് | ഇടത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="←" type="tts">ഇടത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="→">അമ്പടയാളം | വലത് | വലത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="→" type="tts">വലത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="↑">അമ്പടയാളം | മേലെ | മേലേയ്ക്ക് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="↑" type="tts">മേലേയ്ക്ക് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="↓">അമ്പടയാളം | താഴെ | താഴേയ്ക്ക് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="↓" type="tts">താഴേയ്ക്ക് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="⇅">അമ്പടയാളം | താഴെ | മേലെ | മേലേയ്ക്കും താഴേയ്ക്കും ചൂണ്ടുന്ന അമ്പടയാളങ്ങൾ</annotation>
+ <annotation cp="⇅" type="tts">മേലേയ്ക്കും താഴേയ്ക്കും ചൂണ്ടുന്ന അമ്പടയാളങ്ങൾ</annotation>
+ <annotation cp="⇆">അമ്പടയാളം | ഇടത് | വലത് | വലത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളത്തിന് മുകളിൽ ഇടത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="⇆" type="tts">വലത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളത്തിന് മുകളിൽ ഇടത്തോട്ട് ചൂണ്ടുന്ന അമ്പടയാളം</annotation>
+ <annotation cp="∆">ത്രികോണം | വർദ്ധന</annotation>
+ <annotation cp="∆" type="tts">വർദ്ധന</annotation>
+ <annotation cp="∇">ത്രികോണം | ത്രികോണ മുദ്ര</annotation>
+ <annotation cp="∇" type="tts">ത്രികോണ മുദ്ര</annotation>
+ <annotation cp="∈">അംഗത്വം | അടങ്ങുന്നത് | ഇതിൻറെ ഘടകം | ഗണം | ഘടകം</annotation>
+ <annotation cp="∈" type="tts">ഇതിൻറെ ഘടകം</annotation>
+ <annotation cp="÷">ഹരണം | ഹരണ മുദ്ര | ഹരണചിഹ്നം | ഹരിക്കുക</annotation>
+ <annotation cp="÷" type="tts">ഹരണ മുദ്ര</annotation>
+ <annotation cp="×">ഗുണനം | ഗുണന മുദ്ര | ഗുണിക്കുക | തവണകൾ</annotation>
+ <annotation cp="×" type="tts">ഗുണന മുദ്ര</annotation>
+ <annotation cp="⁻">മൈനസ് | സൂപ്പർസ്ക്രിപ്റ്റ്</annotation>
+ <annotation cp="⁻" type="tts">സൂപ്പർസ്ക്രിപ്റ്റ് മൈനസ്</annotation>
+ <annotation cp="√">അടിസ്ഥാന സംഖ്യ | അഭിന്നകം | ഘാതം | മൂല സംഖ്യ | വർഗമൂലം | വർഗ്ഗമൂലം</annotation>
+ <annotation cp="√" type="tts">വർഗ്ഗമൂലം</annotation>
+ <annotation cp="∞">അപാരത | അപാരത ചിഹ്നം</annotation>
+ <annotation cp="∞" type="tts">അപാരത ചിഹ്നം</annotation>
+ <annotation cp="∩">ഗണം | സന്ധി</annotation>
+ <annotation cp="∩" type="tts">സന്ധി</annotation>
+ <annotation cp="∪">ഒത്തുചേരൽ | ഗണം | ശേഖരം</annotation>
+ <annotation cp="∪" type="tts">ഒത്തുചേരൽ</annotation>
+ <annotation cp="≡">ഇതിനോട് സമാനമായ | ഇതിന് സമാനമായ | കൃത്യം | മൂന്നിരട്ടിയാക്കുക | സമാനമായത്</annotation>
+ <annotation cp="≡" type="tts">ഇതിന് സമാനമായ</annotation>
+ <annotation cp="⊂">ഇതിൻറെ ഉപഗണം | ഉപഗണം | ഗണം</annotation>
+ <annotation cp="⊂" type="tts">ഇതിൻറെ ഉപഗണം</annotation>
+ <annotation cp="▲">അമ്പടയാളം | ത്രികോണം | നിറച്ച | മേലെ | മേലേയ്ക്ക് ചൂണ്ടുന്ന നിറമുള്ള ത്രികോണം</annotation>
+ <annotation cp="▲" type="tts">മേലേയ്ക്ക് ചൂണ്ടുന്ന നിറമുള്ള ത്രികോണം</annotation>
+ <annotation cp="▼">അമ്പടയാളം | താഴെ | താഴേയ്ക്ക് ചൂണ്ടുന്ന നിറമുള്ള ത്രികോണം | ത്രികോണം | നിറമുള്ള</annotation>
+ <annotation cp="▼" type="tts">താഴേയ്ക്ക് ചൂണ്ടുന്ന നിറമുള്ള ത്രികോണം</annotation>
+ <annotation cp="◊">ചതുർഭുജം | വിഷമചതുർഭുജക്ഷേത്രം | സമചതുർഭുജം</annotation>
+ <annotation cp="◊" type="tts">വിഷമചതുർഭുജക്ഷേത്രം</annotation>
+ <annotation cp="○">പൊള്ളയായ വൃത്തം | വട്ടം | വൃത്തം</annotation>
+ <annotation cp="○" type="tts">പൊള്ളയായ വൃത്തം</annotation>
+ <annotation cp="●">നിറം നിറച്ച വൃത്തം | വൃത്തം</annotation>
+ <annotation cp="●" type="tts">നിറം നിറച്ച വൃത്തം</annotation>
+ <annotation cp="◯">പൊള്ളയായ വലിയ വൃത്തം | വട്ടം | വൃത്തം</annotation>
+ <annotation cp="◯" type="tts">പൊള്ളയായ വലിയ വൃത്തം</annotation>
<annotation cp="⚧">ഭിന്നലിംഗം | ഭിന്നലിംഗ ചിഹ്നം</annotation>
<annotation cp="⚧" type="tts">ഭിന്നലിംഗ ചിഹ്നം</annotation>
<annotation cp="🤌">ആക്ഷേപസൂചകം | കൈമുദ്ര | ചോദ്യംചെയ്യൽ | നുള്ളിപ്പിടിച്ച വിരലുകൾ | നുള്ളുക | പരിഹാസം</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">മഴവിൽ പതാക</annotation>
<annotation cp="🏴☠">കടൽക്കൊള്ളക്കാരൻ | കൊള്ളയടി | ജോളി റോജർ | നിധി | പൈറേറ്റ് പതാക</annotation>
<annotation cp="🏴☠" type="tts">പൈറേറ്റ് പതാക</annotation>
+ <annotation cp="£">ഈജിപ്ഷ്യൻ പൗണ്ട് | കറൻസി | പൗണ്ട് | ബ്രിട്ടീഷ് പൗണ്ട്</annotation>
+ <annotation cp="£" type="tts">പൗണ്ട്</annotation>
+ <annotation cp="¥">കറൻസി | ചൈനീസ് യുവേൻ | ജാപ്പനീസ് യെൻ | യുവേൻ | യെൻ</annotation>
+ <annotation cp="¥" type="tts">യെൻ</annotation>
+ <annotation cp="€">കറൻസി | യൂറോ</annotation>
+ <annotation cp="€" type="tts">യൂറോ</annotation>
+ <annotation cp="₹">ഇന്ത്യൻ രൂപ | കറൻസി | രൂപ</annotation>
+ <annotation cp="₹" type="tts">ഇന്ത്യൻ രൂപ</annotation>
+ <annotation cp="₽">കറൻസി | റൂബിൾ</annotation>
+ <annotation cp="₽" type="tts">റൂബിൾ</annotation>
+ <annotation cp="¹">ഒന്ന് | സൂപ്പർസ്ക്രിപ്റ്റ്</annotation>
+ <annotation cp="¹" type="tts">സൂപ്പർസ്ക്രിപ്റ്റ് ഒന്ന്</annotation>
+ <annotation cp="²">രണ്ട് | വർഗ്ഗമൂലം | സൂപ്പർസ്ക്രിപ്റ്റ്</annotation>
+ <annotation cp="²" type="tts">സൂപ്പർസ്ക്രിപ്റ്റ് രണ്ട്</annotation>
+ <annotation cp="³">ത്രിവർഗ്ഗം | മൂന്ന് | സൂപ്പർസ്ക്രിപ്റ്റ്</annotation>
+ <annotation cp="³" type="tts">സൂപ്പർസ്ക്രിപ്റ്റ് മൂന്ന്</annotation>
+ <annotation cp="µ">അളവ് | മൈക്രോ ചിഹ്നം</annotation>
+ <annotation cp="µ" type="tts">മൈക്രോ ചിഹ്നം</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/mn.xml b/common/annotations/mn.xml
index 32a223f..b3a1ad9 100644
--- a/common/annotations/mn.xml
+++ b/common/annotations/mn.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">бордуу</annotation>
<annotation cp="🏿">арьсны өнгө | бор | төрөл 6</annotation>
<annotation cp="🏿" type="tts">бор</annotation>
+ <annotation cp="–">зай | эн</annotation>
+ <annotation cp="–" type="tts">эн зай</annotation>
+ <annotation cp="—">зай | эм</annotation>
+ <annotation cp="—" type="tts">эм зай</annotation>
+ <annotation cp="·">голын цэг | дунд цэг | дундын цэг | цэг</annotation>
+ <annotation cp="·" type="tts">дунд цэг</annotation>
+ <annotation cp="«">баруун | зүүн өнцөгтэй хаалт | оруулгын тэмдэг | өнцөг | хаалт | чеврон</annotation>
+ <annotation cp="«" type="tts">зүүн өнцөгтэй хаалт</annotation>
+ <annotation cp="»">баруун | баруун өнцөгтэй хаалт | оруулгын тэмдэг | өнцөг | хаалт | чеврон</annotation>
+ <annotation cp="»" type="tts">баруун өнцөгтэй хаалт</annotation>
+ <annotation cp="§">догол мөр | силроу | хэсэг</annotation>
+ <annotation cp="§" type="tts">хэсэг</annotation>
+ <annotation cp="†">дурсгалын хөшөө | обелус | чинжаал | чинжаал тэмдэг</annotation>
+ <annotation cp="†" type="tts">чинжаал тэмдэг</annotation>
+ <annotation cp="‡">давхар | давхар чинжаал тэмдэг | дурсгалын хөшөө | обелус | чинжаал</annotation>
+ <annotation cp="‡" type="tts">давхар чинжаал тэмдэг</annotation>
+ <annotation cp="•">сум | цэг</annotation>
+ <annotation cp="•" type="tts">сум</annotation>
+ <annotation cp="°">баталгаа | градус | цаг</annotation>
+ <annotation cp="°" type="tts">градус</annotation>
+ <annotation cp="℗">бичлэг | дуу | дуу бичлэгийн зохиогчийн эрх | зохиогчийн эрх</annotation>
+ <annotation cp="℗" type="tts">дуу бичлэгийн зохиогчийн эрх</annotation>
+ <annotation cp="←">зүүн | зүүн тийш чиглэсэн сум | сум</annotation>
+ <annotation cp="←" type="tts">зүүн тийш чиглэсэн сум</annotation>
+ <annotation cp="→">баруун | баруун тийш чиглэсэн сум | сум</annotation>
+ <annotation cp="→" type="tts">баруун тийш чиглэсэн сум</annotation>
+ <annotation cp="↑">дээш | дээшээ чиглэсэн сум | сум</annotation>
+ <annotation cp="↑" type="tts">дээшээ чиглэсэн сум</annotation>
+ <annotation cp="↓">доошоо | доошоо чиглэсэн сум | сум</annotation>
+ <annotation cp="↓" type="tts">доошоо чиглэсэн сум</annotation>
+ <annotation cp="⇅">доош | дээш | дээш чиглэсэн болон доош чиглэсэн сум | дээшээ чиглэсэн болон доошоо чиглэсэн сум | сум</annotation>
+ <annotation cp="⇅" type="tts">дээш чиглэсэн болон доош чиглэсэн сум</annotation>
+ <annotation cp="⇆">баруун дээр зүүн тийш чиглэсэн сум | зүүн | сум</annotation>
+ <annotation cp="⇆" type="tts">баруун дээр зүүн тийш чиглэсэн сум</annotation>
+ <annotation cp="∆">гурвалжин | өсөлт</annotation>
+ <annotation cp="∆" type="tts">өсөлт</annotation>
+ <annotation cp="∇">гурвалжин | набла</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">агуулсан | багц | гишүүнчлэл | элемент</annotation>
+ <annotation cp="∈" type="tts">элемент</annotation>
+ <annotation cp="÷">обелус | хуваах | хуваах тэмдэг | хуувалт</annotation>
+ <annotation cp="÷" type="tts">хуваах тэмдэг</annotation>
+ <annotation cp="×">дахин | үржвэр | үржүүлэх | үржүүлэх тэмдэг</annotation>
+ <annotation cp="×" type="tts">үржүүлэх тэмдэг</annotation>
+ <annotation cp="⁻">зэрэг | хасах</annotation>
+ <annotation cp="⁻" type="tts">хасах зэрэг</annotation>
+ <annotation cp="√">илүүдэл | квадрат | радикал | радиус | язгуур</annotation>
+ <annotation cp="√" type="tts">квадрат язгуур</annotation>
+ <annotation cp="∞">хязгааргүй | хязгааргүйн тэмдэг</annotation>
+ <annotation cp="∞" type="tts">хязгааргүйн тэмдэг</annotation>
+ <annotation cp="∩">багц | уулзвар</annotation>
+ <annotation cp="∩" type="tts">уулзвар</annotation>
+ <annotation cp="∪">багц | нэгдэл | цуглуулга</annotation>
+ <annotation cp="∪" type="tts">нэгдэл</annotation>
+ <annotation cp="≡">гурвалсан | ижил | төсөөтэй</annotation>
+ <annotation cp="≡" type="tts">төсөөтэй</annotation>
+ <annotation cp="⊂">багц | дэд багц</annotation>
+ <annotation cp="⊂" type="tts">дэд багц</annotation>
+ <annotation cp="▲">битүү | битүү дээшээ харсан гурвалжин | гурвалжин | дээш | сум</annotation>
+ <annotation cp="▲" type="tts">битүү дээшээ харсан гурвалжин</annotation>
+ <annotation cp="▼">битүү | битүү доошоо харсан гурвалжин | гурвалжин | доошоо | сум</annotation>
+ <annotation cp="▼" type="tts">битүү доошоо харсан гурвалжин</annotation>
+ <annotation cp="◊">дөрвөлжин | ромбо</annotation>
+ <annotation cp="◊" type="tts">ромбо</annotation>
+ <annotation cp="○">тойрог | хөндий тойрог | цагираг</annotation>
+ <annotation cp="○" type="tts">хөндий тойрог</annotation>
+ <annotation cp="●">битүү тойрог | тойрог</annotation>
+ <annotation cp="●" type="tts">битүү тойрог</annotation>
+ <annotation cp="◯">тойрог | том хөндий тойрог | цагираг</annotation>
+ <annotation cp="◯" type="tts">том хөндий тойрог</annotation>
<annotation cp="⚧">трансжендер | трансжендер тэмдэг</annotation>
<annotation cp="⚧" type="tts">трансжендер тэмдэг</annotation>
<annotation cp="🤌">байцаалт | гарын зангаа | гарын хуруунуудаа нийлүүлж чимхэх | ёжтой | хуруунууд | чимхэх</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">солонгон туг</annotation>
<annotation cp="🏴☠">далайн дээрэмчин | далайн дээрэмчний туг | Жолли Рожер | тонох | үнэт эрдэнэс</annotation>
<annotation cp="🏴☠" type="tts">далайн дээрэмчний туг</annotation>
+ <annotation cp="£">[EGP] | [GBP] | валют | паунд</annotation>
+ <annotation cp="£" type="tts">паунд</annotation>
+ <annotation cp="¥">[CNY] | [JPY] | валют | иен | юань</annotation>
+ <annotation cp="¥" type="tts">иен</annotation>
+ <annotation cp="€">[EUR] | валют | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валют | рупи | энэтхэгийн рупи</annotation>
+ <annotation cp="₹" type="tts">энэтхэгийн рупи</annotation>
+ <annotation cp="₽">валют | рубль</annotation>
+ <annotation cp="₽" type="tts">рубль</annotation>
+ <annotation cp="¹">зэрэг | нэг | нэгийн зэрэг</annotation>
+ <annotation cp="¹" type="tts">нэгийн зэрэг</annotation>
+ <annotation cp="²">квадрат | хоёрын зэрэг</annotation>
+ <annotation cp="²" type="tts">хоёрын зэрэг</annotation>
+ <annotation cp="³">гуравын зэрэг | куб</annotation>
+ <annotation cp="³" type="tts">гуравын зэрэг</annotation>
+ <annotation cp="µ">бичил тэмдэг | хэмжих</annotation>
+ <annotation cp="µ" type="tts">бичил тэмдэг</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/mr.xml b/common/annotations/mr.xml
index 63d14c8..31acb31 100644
--- a/common/annotations/mr.xml
+++ b/common/annotations/mr.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">मध्यम काळसर त्वचा</annotation>
<annotation cp="🏿">काळसर त्वचा | त्वचेचा प्रकार | त्वचेचा प्रकार-6 | प्रकार 6</annotation>
<annotation cp="🏿" type="tts">काळसर त्वचा</annotation>
+ <annotation cp="–">en डॅश | डॅश । en</annotation>
+ <annotation cp="–" type="tts">en डॅश</annotation>
+ <annotation cp="—">em डॅश | डॅश । em</annotation>
+ <annotation cp="—" type="tts">em डॅश</annotation>
+ <annotation cp="·">बिंदू । इंटरपंक्ट । मध्य । मध्य बिंदू | मध्य बिंदू</annotation>
+ <annotation cp="·" type="tts">मध्य बिंदू</annotation>
+ <annotation cp="«">कोन । कंस । कॅरेट । शेवरॉन । डावे । डावे गुलिमेट । कोट | डावे गुलिमेट</annotation>
+ <annotation cp="«" type="tts">डावे गुलिमेट</annotation>
+ <annotation cp="»">उजवे गुलिमेट | कोन । कंस । कॅरेट । शेवरॉन । कोट । उजवे । उजवे गुलिमेट</annotation>
+ <annotation cp="»" type="tts">उजवे गुलिमेट</annotation>
+ <annotation cp="§">परिच्छेद । भाग । विभाग । सिलक्रो | विभाग</annotation>
+ <annotation cp="§" type="tts">विभाग</annotation>
+ <annotation cp="†">डॅगर । ऑबेलिस्क । ओबेलस | डॅगर चिन्ह</annotation>
+ <annotation cp="†" type="tts">डॅगर चिन्ह</annotation>
+ <annotation cp="‡">डॅगर । दुप्पट । ओबेलिस्क । ओबेलस | दुप्पट डॅगर चिन्ह</annotation>
+ <annotation cp="‡" type="tts">दुप्पट डॅगर चिन्ह</annotation>
+ <annotation cp="•">बुलेट | बुलेट । बिंदू</annotation>
+ <annotation cp="•" type="tts">बुलेट</annotation>
+ <annotation cp="°">डिग्री | तास | पुरावा</annotation>
+ <annotation cp="°" type="tts">डिग्री</annotation>
+ <annotation cp="℗">कॉपीराइट । रेकॉर्डिंंग । ध्वनी | ध्वनी रेकॉर्डिंग कॉपीराइट</annotation>
+ <annotation cp="℗" type="tts">ध्वनी रेकॉर्डिंग कॉपीराइट</annotation>
+ <annotation cp="←">डावा-निर्देशित बाण | बाण । डावा । डावा-निर्देशित बाण</annotation>
+ <annotation cp="←" type="tts">डावा-निर्देशित बाण</annotation>
+ <annotation cp="→">उजवा-निर्देशित बाण | बाण । उजवा । उजवा-निर्देशित बाण</annotation>
+ <annotation cp="→" type="tts">उजवा-निर्देशित बाण</annotation>
+ <annotation cp="↑">बाण । वर । वर-निर्देशित बाण | वर-निर्देशित बाण</annotation>
+ <annotation cp="↑" type="tts">वर-निर्देशित बाण</annotation>
+ <annotation cp="↓">खाली-निर्देशित बाण | बाण । खाली । खाली-निर्देशित बाण</annotation>
+ <annotation cp="↓" type="tts">खाली-निर्देशित बाण</annotation>
+ <annotation cp="⇅">बाण । खाली । वर । वर-निर्देशित आणि खाली-निर्देशित बाण | वर-निर्देशित आणि खाली-निर्देशित बाण</annotation>
+ <annotation cp="⇅" type="tts">वर-निर्देशित आणि खाली-निर्देशित बाण</annotation>
+ <annotation cp="⇆">उजव्या-निर्देशित बाणांवर डावे-निर्देशित | बाण । डावा । उजव्या-निर्देशित बाणांवर डावे-निर्देशित । उजवा</annotation>
+ <annotation cp="⇆" type="tts">उजव्या-निर्देशित बाणांवर डावे-निर्देशित</annotation>
+ <annotation cp="∆">वाढ | वाढ । त्रिकोण</annotation>
+ <annotation cp="∆" type="tts">वाढ</annotation>
+ <annotation cp="∇">नाबला | नाबला । त्रिकोण</annotation>
+ <annotation cp="∇" type="tts">नाबला</annotation>
+ <annotation cp="∈">चे घटक | समाविष्ट । घटक । चे घटक । सदस्यता । सेट</annotation>
+ <annotation cp="∈" type="tts">चे घटक</annotation>
+ <annotation cp="÷">ओबेलस | भागणे | भागाकार | भागाकाराचे चिन्ह</annotation>
+ <annotation cp="÷" type="tts">भागाकाराचे चिन्ह</annotation>
+ <annotation cp="×">गुणणे । वेळा | गुणाकार । गुणाकाराचे चिन्ह | गुणाकाराचे चिन्ह</annotation>
+ <annotation cp="×" type="tts">गुणाकाराचे चिन्ह</annotation>
+ <annotation cp="⁻">वजा । सुपरस्क्रिप्ट | सुपरस्क्रिप्ट वजा</annotation>
+ <annotation cp="⁻" type="tts">सुपरस्क्रिप्ट वजा</annotation>
+ <annotation cp="√">मूलगानी । मूलांक । रूट । चौरस । सर्ड | वर्गमुळ</annotation>
+ <annotation cp="√" type="tts">वर्गमुळ</annotation>
+ <annotation cp="∞">इनफिनिटी | इनफिनिटी चिन्ह</annotation>
+ <annotation cp="∞" type="tts">इनफिनिटी चिन्ह</annotation>
+ <annotation cp="∩">छेदनबिंदू | सेट</annotation>
+ <annotation cp="∩" type="tts">छेदनबिंदू</annotation>
+ <annotation cp="∪">युनियन | संग्रह । सेट । युनियन</annotation>
+ <annotation cp="∪" type="tts">युनियन</annotation>
+ <annotation cp="≡">अचूक | एकसारखे | तिहेरी | समान | सारखे</annotation>
+ <annotation cp="≡" type="tts">समान</annotation>
+ <annotation cp="⊂">चा सबसेट | सेट । सबसेट । चे सबसेट</annotation>
+ <annotation cp="⊂" type="tts">चा सबसेट</annotation>
+ <annotation cp="▲">बाण । भरलेला । भरलेला वर-निर्देशित त्रिकोण । त्रिकोण । वर | भरलेला वर-निर्देशित त्रिकोण</annotation>
+ <annotation cp="▲" type="tts">भरलेला वर-निर्देशित त्रिकोण</annotation>
+ <annotation cp="▼">बाण । खाली । भरलेला । भरलेला खाली-निर्देशित त्रिकोण । त्रिकोण | भरलेला खाली-निर्देशित त्रिकोण</annotation>
+ <annotation cp="▼" type="tts">भरलेला खाली-निर्देशित त्रिकोण</annotation>
+ <annotation cp="◊">डायमंंड । लोजेंग । समभुज चौकोन | लोजेंग</annotation>
+ <annotation cp="◊" type="tts">लोजेंग</annotation>
+ <annotation cp="○">रिकामे वर्तुळ | वर्तुळ । रिकामे वर्तुळ । रिंग</annotation>
+ <annotation cp="○" type="tts">रिकामे वर्तुळ</annotation>
+ <annotation cp="●">भरलेले वर्तुळ | वर्तुळ । भरलेले वर्तुळ</annotation>
+ <annotation cp="●" type="tts">भरलेले वर्तुळ</annotation>
+ <annotation cp="◯">मोठे रिकामे वर्तुळ | वर्तुळ । मोठे रिकामे वर्तुळ । रिंग</annotation>
+ <annotation cp="◯" type="tts">मोठे रिकामे वर्तुळ</annotation>
<annotation cp="⚧">ट्रान्सजेंडर | ट्रान्सजेंडर चिन्ह</annotation>
<annotation cp="⚧" type="tts">ट्रान्सजेंडर चिन्ह</annotation>
<annotation cp="🤌">चिमूटभर | चौकशी | व्यंगात्मक | हाताची बोटे | हाताने दर्शविलेल्या भावना</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">इंद्रधनुष्य ध्वज</annotation>
<annotation cp="🏴☠">जॉली रॉजर | ट्रेझर | पायरेट | पायरेट फ्लॅग | प्लंडर</annotation>
<annotation cp="🏴☠" type="tts">पायरेट फ्लॅग</annotation>
+ <annotation cp="£">चलन । EGP । GBP । पाउंड | पाउंड</annotation>
+ <annotation cp="£" type="tts">पाउंड</annotation>
+ <annotation cp="¥">CNY । चलन | JPY । येन | युआन | येन</annotation>
+ <annotation cp="¥" type="tts">येन</annotation>
+ <annotation cp="€">चलन । EUR । युरो | युरो</annotation>
+ <annotation cp="€" type="tts">युरो</annotation>
+ <annotation cp="₹">चलन | भारतीय रुपये | रुपये</annotation>
+ <annotation cp="₹" type="tts">भारतीय रुपये</annotation>
+ <annotation cp="₽">चलन | रुबल</annotation>
+ <annotation cp="₽" type="tts">रुबल</annotation>
+ <annotation cp="¹">एक । सुपरस्क्रिप्ट | सुपरस्क्रिप्ट एक</annotation>
+ <annotation cp="¹" type="tts">सुपरस्क्रिप्ट एक</annotation>
+ <annotation cp="²">वर्ग । सुपरस्क्रिप्ट । दोन | सुपरस्क्रिप्ट दोन</annotation>
+ <annotation cp="²" type="tts">सुपरस्क्रिप्ट दोन</annotation>
+ <annotation cp="³">घन । सुपरस्क्रिप्ट । तीन | सुपरस्क्रिप्ट तीन</annotation>
+ <annotation cp="³" type="tts">सुपरस्क्रिप्ट तीन</annotation>
+ <annotation cp="µ">माप । मायक्रो चिन्ह | मायक्रो चिन्ह</annotation>
+ <annotation cp="µ" type="tts">मायक्रो चिन्ह</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ms.xml b/common/annotations/ms.xml
index 2aa9077..1f8ffa7 100644
--- a/common/annotations/ms.xml
+++ b/common/annotations/ms.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ton kulit sederhana gelap</annotation>
<annotation cp="🏿">jenis 6 | ton kulit | ton kulit gelap</annotation>
<annotation cp="🏿" type="tts">ton kulit gelap</annotation>
+ <annotation cp="–">en | sengkang</annotation>
+ <annotation cp="–" type="tts">sengkang en</annotation>
+ <annotation cp="—">em | sengkang</annotation>
+ <annotation cp="—" type="tts">sengkang em</annotation>
+ <annotation cp="·">noktah tengah | tengah | titik</annotation>
+ <annotation cp="·" type="tts">titik tengah</annotation>
+ <annotation cp="«">chevron | karet | kiri | kurungan | petikan | sudut berganda kiri</annotation>
+ <annotation cp="«" type="tts">sudut berganda kiri</annotation>
+ <annotation cp="»">chevron | kanan | karet | kurungan | petikan | sudut | sudut berganda kanan | tanda sudut berganda kanan</annotation>
+ <annotation cp="»" type="tts">tanda sudut berganda kanan</annotation>
+ <annotation cp="§">bahagian | keratan | perenggan | seksyen</annotation>
+ <annotation cp="§" type="tts">bahagian</annotation>
+ <annotation cp="†">dagger | obelisk | obelus | tanda dagger</annotation>
+ <annotation cp="†" type="tts">tanda dagger</annotation>
+ <annotation cp="‡">berganda | dagger | obelisk | obelus | simbol dagger berganda</annotation>
+ <annotation cp="‡" type="tts">simbol dagger berganda</annotation>
+ <annotation cp="•">bulet | titik</annotation>
+ <annotation cp="•" type="tts">bulet</annotation>
+ <annotation cp="°">bukti | darjah | jam</annotation>
+ <annotation cp="°" type="tts">darjah</annotation>
+ <annotation cp="℗">bunyi | hak cipta | hak cipta rakaman bunyi | rakaman</annotation>
+ <annotation cp="℗" type="tts">hak cipta rakaman bunyi</annotation>
+ <annotation cp="←">anak panah | anak panah menunjuk ke kiri | kiri</annotation>
+ <annotation cp="←" type="tts">anak panah menunjuk ke kiri</annotation>
+ <annotation cp="→">anak panah | anak panah menunjuk ke kanan | kanan</annotation>
+ <annotation cp="→" type="tts">anak panah menunjuk ke kanan</annotation>
+ <annotation cp="↑">anak panah | anak panah menunjuk ke atas | atas</annotation>
+ <annotation cp="↑" type="tts">anak panah menunjuk ke atas</annotation>
+ <annotation cp="↓">anak panah | anak panah menunjuk ke bawah | bawah</annotation>
+ <annotation cp="↓" type="tts">anak panah menunjuk ke bawah</annotation>
+ <annotation cp="⇅">anak panah | anak panah tunjuk atas dan tunjuk bawah | atas | bawah</annotation>
+ <annotation cp="⇅" type="tts">anak panah tunjuk atas dan tunjuk bawah</annotation>
+ <annotation cp="⇆">anak panah | anak panah tunjuk kiri di atas anak panah tunjuk kanan | kanan | kiri</annotation>
+ <annotation cp="⇆" type="tts">anak panah tunjuk kiri di atas anak panah tunjuk kanan</annotation>
+ <annotation cp="∆">kenaikan | segi tiga</annotation>
+ <annotation cp="∆" type="tts">kenaikan</annotation>
+ <annotation cp="∇">nabla | segi tiga</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">keahlian | mengandungi | set | unsur | unsur kepada</annotation>
+ <annotation cp="∈" type="tts">unsur</annotation>
+ <annotation cp="÷">bahagi | obelus | pembahagian | simbol pembahagian</annotation>
+ <annotation cp="÷" type="tts">simbol pembahagian</annotation>
+ <annotation cp="×">darab | kali | pendaraban | simbol pendaraban</annotation>
+ <annotation cp="×" type="tts">simbol pendaraban</annotation>
+ <annotation cp="⁻">superskrip | tolak</annotation>
+ <annotation cp="⁻" type="tts">tolak superskrip</annotation>
+ <annotation cp="√">kuasa dua | punca | punca kuasa dua | radikal | radiks | surd</annotation>
+ <annotation cp="√" type="tts">punca kuasa dua</annotation>
+ <annotation cp="∞">infiniti | simbol infiniti</annotation>
+ <annotation cp="∞" type="tts">simbol infiniti</annotation>
+ <annotation cp="∩">persilangan | set</annotation>
+ <annotation cp="∩" type="tts">persilangan</annotation>
+ <annotation cp="∪">kesatuan | kumpulan | set</annotation>
+ <annotation cp="∪" type="tts">kesatuan</annotation>
+ <annotation cp="≡">bersamaan | bersamaan dengan | sama | tiga kali ganda</annotation>
+ <annotation cp="≡" type="tts">bersamaan dengan</annotation>
+ <annotation cp="⊂">set | subset | subset kepada</annotation>
+ <annotation cp="⊂" type="tts">subset</annotation>
+ <annotation cp="▲">anak panah | atas | berisi | segi tiga | segi tiga berisi menunjuk ke atas</annotation>
+ <annotation cp="▲" type="tts">segi tiga berisi menunjuk ke atas</annotation>
+ <annotation cp="▼">anak panah | bawah | berisi | segi tiga | segi tiga berisi menunjuk ke bawah</annotation>
+ <annotation cp="▼" type="tts">segi tiga berisi menunjuk ke bawah</annotation>
+ <annotation cp="◊">daiman | rombus | wajik</annotation>
+ <annotation cp="◊" type="tts">wajik</annotation>
+ <annotation cp="○">bulatan | bulatan kosong | gelang</annotation>
+ <annotation cp="○" type="tts">bulatan kosong</annotation>
+ <annotation cp="●">bulatan | bulatan berisi</annotation>
+ <annotation cp="●" type="tts">bulatan berisi</annotation>
+ <annotation cp="◯">bulatan | bulatan kosong besar | gelang</annotation>
+ <annotation cp="◯" type="tts">bulatan kosong besar</annotation>
<annotation cp="⚧">simbol transgender | transgender</annotation>
<annotation cp="⚧" type="tts">simbol transgender</annotation>
<annotation cp="🤌">gerak isyarat tangan | jari | mencubit | sarkastik | soal siasat</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bendera pelangi</annotation>
<annotation cp="🏴☠">bendera lanun | harta karun | Jolly Roger | lanun | rampasan</annotation>
<annotation cp="🏴☠" type="tts">bendera lanun</annotation>
+ <annotation cp="£">EGP | GBP | mata wang | paun</annotation>
+ <annotation cp="£" type="tts">paun</annotation>
+ <annotation cp="¥">CNY | JPY | mata wang | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | mata wang</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">mata wang | rupee | rupee india</annotation>
+ <annotation cp="₹" type="tts">rupee india</annotation>
+ <annotation cp="₽">mata wang | rouble</annotation>
+ <annotation cp="₽" type="tts">rouble</annotation>
+ <annotation cp="¹">nombor satu superskrip | satu | superskrip</annotation>
+ <annotation cp="¹" type="tts">nombor satu superskrip</annotation>
+ <annotation cp="²">dua | kuasa dua | nombor dua superskrip | superskrip</annotation>
+ <annotation cp="²" type="tts">nombor dua superskrip</annotation>
+ <annotation cp="³">kuasa tiga | nombor tiga superskrip | superskrip | tiga</annotation>
+ <annotation cp="³" type="tts">nombor tiga superskrip</annotation>
+ <annotation cp="µ">simbol mikro | ukuran</annotation>
+ <annotation cp="µ" type="tts">simbol mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/my.xml b/common/annotations/my.xml
index 302d6e1..14be3d0 100644
--- a/common/annotations/my.xml
+++ b/common/annotations/my.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">အသားညိုရောင်</annotation>
<annotation cp="🏿">အရေပြား အမျိုးအစား−၆ | အသားမဲရောင် | အီမိုဂျီ မွမ်းမံ၊ အရေပြား၊ အသားအရေ</annotation>
<annotation cp="🏿" type="tts">အသားမဲရောင်</annotation>
+ <annotation cp="–">မျဉ်း | မျဉ်းတို</annotation>
+ <annotation cp="–" type="tts">မျဉ်းတို</annotation>
+ <annotation cp="—">မျဉ်း | မျဉ်းရှည်</annotation>
+ <annotation cp="—" type="tts">မျဉ်းရှည်</annotation>
+ <annotation cp="·">အစက် | အလယ် | အလယ်စက်</annotation>
+ <annotation cp="·" type="tts">အလယ် အစက်</annotation>
+ <annotation cp="«">ကွင်း | ကဲရက် | ထောင့် | ဗွီ သင်္ကေတ | ဘယ် | ဘယ်ညွှန် နှစ်ထပ် ထောင့်ချွန်ကွင်း | မျက်တောင် သင်္ကေတ</annotation>
+ <annotation cp="«" type="tts">ဘယ်ညွှန် နှစ်ထပ် ထောင့်ချွန်ကွင်း</annotation>
+ <annotation cp="»">ကွင်း | ကဲရက် | ညာ | ညာညွှန် နှစ်ထပ် ထောင့်ချွန်ကွင်း | ညာညွှန် နှစ်ထပ်ထောင့်ချွန်ကွင်း | ထောင့် | ဗွီ သင်္ကေတ | မျက်တောင် သင်္ကေတ</annotation>
+ <annotation cp="»" type="tts">ညာညွှန် နှစ်ထပ်ထောင့်ချွန်ကွင်း</annotation>
+ <annotation cp="§">စာပိုဒ် | အပိုင်း | အပိုဒ်ခွဲ | အပိုဒ်ခွဲ သင်္ကေတ</annotation>
+ <annotation cp="§" type="tts">အပိုဒ်ခွဲ သင်္ကေတ</annotation>
+ <annotation cp="†">ထိပ်ချွန်း ဒက်ဂါ သင်္ကေတ | ဒက်ဂါ</annotation>
+ <annotation cp="†" type="tts">ထိပ်ချွန်း ဒက်ဂါ သင်္ကေတ</annotation>
+ <annotation cp="‡">ထိပ်ချွန်းဒက်ဂါ သင်္ကေတ | ဒက်ဂါ | နှစ်ထပ် | နှစ်ထပ် ထိပ်ချွန်းဒက်ဂါ သင်္ကေတ</annotation>
+ <annotation cp="‡" type="tts">နှစ်ထပ် ထိပ်ချွန်းဒက်ဂါ သင်္ကေတ</annotation>
+ <annotation cp="•">ဘူးလက် | အစက်</annotation>
+ <annotation cp="•" type="tts">ဘူးလက်</annotation>
+ <annotation cp="°">ဒီဂရီ | နာရီ | သက်သေပြချက်</annotation>
+ <annotation cp="°" type="tts">ဒီဂရီ</annotation>
+ <annotation cp="℗">မူပိုင်ခွင့် | အသံ | အသံဖမ်း | အသံဖမ်းယူမှု မူပိုင်ခွင့်</annotation>
+ <annotation cp="℗" type="tts">အသံဖမ်းယူမှု မူပိုင်ခွင့်</annotation>
+ <annotation cp="←">ဘယ်ဘက် | ဘယ်သို့ပြ မြား | မြား</annotation>
+ <annotation cp="←" type="tts">ဘယ်သို့ပြ မြား</annotation>
+ <annotation cp="→">ညာဘက် | ညာသို့ပြ မြား | မြား</annotation>
+ <annotation cp="→" type="tts">ညာသို့ပြ မြား</annotation>
+ <annotation cp="↑">မြား | အပေါ်ဘက် | အပေါ်သို့ညွှန် မြား</annotation>
+ <annotation cp="↑" type="tts">အပေါ်သို့ညွှန် မြား</annotation>
+ <annotation cp="↓">မြား | အောက်ဘက် | အောက်ဘက်ညွှန် မြား | အောက်သို့ညွှန် မြား</annotation>
+ <annotation cp="↓" type="tts">အောက်သို့ညွှန် မြား</annotation>
+ <annotation cp="⇅">မြား | အပေါ်ဘက် | အပေါ်အောက် ညွှန်မြား | အောက်ဘက်</annotation>
+ <annotation cp="⇅" type="tts">အပေါ်အောက် ညွှန်မြား</annotation>
+ <annotation cp="⇆">ညာဘက် | ဘယ်ညာ ညွှန်မြား | ဘယ်ညာညွှန် မြား | ဘယ်ဘက် | မြား</annotation>
+ <annotation cp="⇆" type="tts">ဘယ်ညာ ညွှန်မြား</annotation>
+ <annotation cp="∆">ဆတိုးပြ သင်္ကေတ | တြိဂံ</annotation>
+ <annotation cp="∆" type="tts">ဆတိုးပြ သင်္ကေတ</annotation>
+ <annotation cp="∇">တြိဂံ | နက်ဗျူလာ</annotation>
+ <annotation cp="∇" type="tts">နက်ဗျူလာ</annotation>
+ <annotation cp="∈">ဆက် | ဆက်တစ်ခု၏ အပိုင်း | ပါဝင်မှု | အဖွဲ့ဝင်</annotation>
+ <annotation cp="∈" type="tts">ဆက်တစ်ခု၏ အပိုင်း</annotation>
+ <annotation cp="÷">ခွဲခြင်း | အစား | အစားလက္ခဏာ | အစားလက်ခဏာ</annotation>
+ <annotation cp="÷" type="tts">အစားလက်ခဏာ</annotation>
+ <annotation cp="×">မြှောက် | မြှောက်ခြင်း | အမြှောက် | အမြှောက် လက္ခဏာ</annotation>
+ <annotation cp="×" type="tts">အမြှောက် လက္ခဏာ</annotation>
+ <annotation cp="⁻">အနုတ် | အနုတ်လက္ခဏာ သင်္ကေတ</annotation>
+ <annotation cp="⁻" type="tts">အနုတ်လက္ခဏာ သင်္ကေတ</annotation>
+ <annotation cp="√">ကိန်းရင်း | နှစ်ထပ် | နှစ်ထပ်ကိန်းရင်း</annotation>
+ <annotation cp="√" type="tts">နှစ်ထပ်ကိန်းရင်း</annotation>
+ <annotation cp="∞">အင်ဖနတီ | အနန္တကိန်း သင်္ကေတ</annotation>
+ <annotation cp="∞" type="tts">အနန္တကိန်း သင်္ကေတ</annotation>
+ <annotation cp="∩">ဆက် | ဖြတ်မှတ်</annotation>
+ <annotation cp="∩" type="tts">ဖြတ်မှတ်</annotation>
+ <annotation cp="∪">စုဆောင်းမှု | စုပေါင်းမှု | ဆက်</annotation>
+ <annotation cp="∪" type="tts">စုပေါင်းမှု</annotation>
+ <annotation cp="≡">ထပ်တူ | ထပ်တူညီမျှခြင်း | နှင့် ထပ်တူညီမျှခြင်း | သုံးဆ</annotation>
+ <annotation cp="≡" type="tts">နှင့် ထပ်တူညီမျှခြင်း</annotation>
+ <annotation cp="⊂">ဆက် | ဆက်တစ်ခု၏ အဖွဲ့ဝင်ကိန်း</annotation>
+ <annotation cp="⊂" type="tts">ဆက်တစ်ခု၏ အဖွဲ့ဝင်ကိန်း</annotation>
+ <annotation cp="▲">တြိဂံ | မြား | အပေါ် | အရောင်ပါ | အရောင်ပါ အပေါ်ညွှန် တြိဂံမြား</annotation>
+ <annotation cp="▲" type="tts">အရောင်ပါ အပေါ်ညွှန် တြိဂံမြား</annotation>
+ <annotation cp="▼">တြိဂံ | မြား | အရောင်ပါ | အရောင်ပါ အောက်ညွှန် တြိဂံမြား | အရောင်ပါ အောက်ညွှန်တြိဂံမြား | အောက်</annotation>
+ <annotation cp="▼" type="tts">အရောင်ပါ အောက်ညွှန်တြိဂံမြား</annotation>
+ <annotation cp="◊">ဒိုင်းမွန်း | မှန်ကူကွက် | ရွမ်းဗတ် | အနားညီ အနားပြိုင် စတုဂံ</annotation>
+ <annotation cp="◊" type="tts">မှန်ကူကွက်</annotation>
+ <annotation cp="○">ကွင်း | စက်ဝိုင်း | အရောင်မပါ စက်ဝိုင်း</annotation>
+ <annotation cp="○" type="tts">အရောင်မပါ စက်ဝိုင်း</annotation>
+ <annotation cp="●">စက်ဝိုင်း | အရောင်ပါ စက်ဝိုင်း</annotation>
+ <annotation cp="●" type="tts">အရောင်ပါ စက်ဝိုင်း</annotation>
+ <annotation cp="◯">ကွင်း | စက်ဝိုင်း | အရောင်မပါ စက်ဝိုင်းကြီး</annotation>
+ <annotation cp="◯" type="tts">အရောင်မပါ စက်ဝိုင်းကြီး</annotation>
<annotation cp="⚧">လိင်ပြောင်းခြင်း | လိင်ပြောင်းခြင်း သင်္ကေတ</annotation>
<annotation cp="⚧" type="tts">လိင်ပြောင်းခြင်း သင်္ကေတ</annotation>
<annotation cp="🤌">စုထားသော လက်ချောင်း | လက်ချောင်းများ၊ လက်ဟန်၊ စစ်ဆေး၊ ဆိတ်၊ အရွဲ့တိုက်</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">သက်တံရောင် အလံ</annotation>
<annotation cp="🏴☠">ဂျိုလီရော်ဂျာ | ပင်လယ်ဓားပြ | ပင်လယ်ဓားပြ အလံ | ရတနာ | လုယက်ပစ္စည်း</annotation>
<annotation cp="🏴☠" type="tts">ပင်လယ်ဓားပြ အလံ</annotation>
+ <annotation cp="£">ဂျီဘီပီ | ငွေကြေး | ပေါင် | အီးဂျီပီ</annotation>
+ <annotation cp="£" type="tts">ပေါင်</annotation>
+ <annotation cp="¥">ဂျေပီဝိုင် | ငွေကြေး | စီအင်ဝိုင် | ယန်း | ယွမ်</annotation>
+ <annotation cp="¥" type="tts">ယန်း</annotation>
+ <annotation cp="€">ငွေကြေး | ယူရို | အီးယူအာ</annotation>
+ <annotation cp="€" type="tts">ယူရို</annotation>
+ <annotation cp="₹">ငွေကြေး | ရူပီး | အိန္ဒိယ ရူပီး</annotation>
+ <annotation cp="₹" type="tts">အိန္ဒိယ ရူပီး</annotation>
+ <annotation cp="₽">ငွေကြေး | ရူဘဲ</annotation>
+ <annotation cp="₽" type="tts">ရူဘဲ</annotation>
+ <annotation cp="¹">၁ | နှစ်ထပ်ကိန်း</annotation>
+ <annotation cp="¹" type="tts">နှစ်ထပ်ကိန်း ၁</annotation>
+ <annotation cp="²">၂ | နှစ်ထပ်ကိန်း</annotation>
+ <annotation cp="²" type="tts">နှစ်ထပ်ကိန်း ၂</annotation>
+ <annotation cp="³">၃ | နှစ်ထပ်ကိန်း</annotation>
+ <annotation cp="³" type="tts">နှစ်ထပ်ကိန်း ၃</annotation>
+ <annotation cp="µ">တိုင်းတာခြင်း | မိုက်ခရို သင်္ကေတ</annotation>
+ <annotation cp="µ" type="tts">မိုက်ခရို သင်္ကေတ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/nb.xml b/common/annotations/nb.xml
index b36b38c..e2a0ae3 100644
--- a/common/annotations/nb.xml
+++ b/common/annotations/nb.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">hudtype 5</annotation>
<annotation cp="🏿">emojimodifikator | fitzpatrick | hud | hudfarge | hudtype 6 | type 6</annotation>
<annotation cp="🏿" type="tts">hudtype 6</annotation>
+ <annotation cp="–">bindestreker | en-dash | halvgefirt | tankestrek</annotation>
+ <annotation cp="–" type="tts">tankestrek</annotation>
+ <annotation cp="—">bindestreker | em-dash | gefirt | lang tankestrek</annotation>
+ <annotation cp="—" type="tts">lang tankestrek</annotation>
+ <annotation cp="·">interpunkt | midtstilt punkt | punkt mellom ord | sentrert punkt</annotation>
+ <annotation cp="·" type="tts">midtstilt punkt</annotation>
+ <annotation cp="«">anførselstegn | hermetegn | sitat start | sitattegn | sjevron | venstre anførselstegn</annotation>
+ <annotation cp="«" type="tts">venstre anførselstegn</annotation>
+ <annotation cp="»">anførselstegn | hermetegn | høyre anførselstegn | sitat slutt | sitattegn | sjevron</annotation>
+ <annotation cp="»" type="tts">høyre anførselstegn</annotation>
+ <annotation cp="§">avsnittstegn | del | paragraf | paragraftegn | signum sectionis</annotation>
+ <annotation cp="§" type="tts">paragraftegn</annotation>
+ <annotation cp="†">kors | korstegn | latinsk kors</annotation>
+ <annotation cp="†" type="tts">korstegn</annotation>
+ <annotation cp="‡">dobbelt kors | dobbeltkorstegn</annotation>
+ <annotation cp="‡" type="tts">dobbeltkorstegn</annotation>
+ <annotation cp="•">prikk | punkt | punktliste | punkttegn</annotation>
+ <annotation cp="•" type="tts">punkttegn</annotation>
+ <annotation cp="°">alkoholinnhold | grader | gradetegn | timer</annotation>
+ <annotation cp="°" type="tts">gradetegn</annotation>
+ <annotation cp="℗">copyright | lydopptak | opphavsrett for lydopptak</annotation>
+ <annotation cp="℗" type="tts">opphavsrett for lydopptak</annotation>
+ <annotation cp="←">pil mot venstre | pil venstre | retning | venstre | venstrepil | vest</annotation>
+ <annotation cp="←" type="tts">pil mot venstre</annotation>
+ <annotation cp="→">høyre | høyrepil | øst | pil høyre | pil mot høyre | retning</annotation>
+ <annotation cp="→" type="tts">pil mot høyre</annotation>
+ <annotation cp="↑">nord | opp | oppover | oppoverpil | pil opp | pil oppover | retning</annotation>
+ <annotation cp="↑" type="tts">pil oppover</annotation>
+ <annotation cp="↓">ned | nedover | nedoverpil | pil ned | pil nedover | retning | sør</annotation>
+ <annotation cp="↓" type="tts">pil nedover</annotation>
+ <annotation cp="⇅">hver vei | nord-sør | opp og ned | opp-ned | pil oppover foran pil nedover | piler</annotation>
+ <annotation cp="⇅" type="tts">pil oppover foran pil nedover</annotation>
+ <annotation cp="⇆">frem og tilbake | hver vei | øst-vest | pil mot venstre over pil mot høyre | piler | venstre-høyre</annotation>
+ <annotation cp="⇆" type="tts">pil mot venstre over pil mot høyre</annotation>
+ <annotation cp="∆">dekrement | delta | inkrement | matematisk endring | matematiske tegn | trekant</annotation>
+ <annotation cp="∆" type="tts">matematisk endring</annotation>
+ <annotation cp="∇">matematiske tegn | nabla | trekant | triangel | vektorfelt | vektoroperator</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">element i | elementsymbol | matematiske tegn | mengdelære</annotation>
+ <annotation cp="∈" type="tts">element i</annotation>
+ <annotation cp="÷">dele | deletegn | dividere | divisjon | divisjonstegn | matematiske tegn</annotation>
+ <annotation cp="÷" type="tts">divisjonstegn</annotation>
+ <annotation cp="×">gange | gangetegn | matematiske tegn | multiplikasjon | multiplikasjonstegn | multiplisere</annotation>
+ <annotation cp="×" type="tts">multiplikasjonstegn</annotation>
+ <annotation cp="⁻">hevet | hevet minustegn | ion | matematiske tegn | minus | negativ ladning</annotation>
+ <annotation cp="⁻" type="tts">hevet minustegn</annotation>
+ <annotation cp="√">kvadratrot | kvadratrottegn | matematiske tegn</annotation>
+ <annotation cp="√" type="tts">kvadratrot</annotation>
+ <annotation cp="∞">matematiske tegn | uendelig | uendelighetstegn</annotation>
+ <annotation cp="∞" type="tts">uendelighetstegn</annotation>
+ <annotation cp="∩">matematiske tegn | mengdelære | snitt | snittegn</annotation>
+ <annotation cp="∩" type="tts">snitt</annotation>
+ <annotation cp="∪">forening | matematiske tegn | mengdelære | union | uniontegn</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">identisk lik | kongruent med | likhetstegn | matematiske tegn</annotation>
+ <annotation cp="≡" type="tts">identisk lik</annotation>
+ <annotation cp="⊂">delmengde av | inklusjonstegn | matematiske tegn | mengdelære</annotation>
+ <annotation cp="⊂" type="tts">delmengde av</annotation>
+ <annotation cp="▲">fylt | fylt trekant som peker opp | opp | pil | trekant</annotation>
+ <annotation cp="▲" type="tts">fylt trekant som peker opp</annotation>
+ <annotation cp="▼">fylt | fylt trekant som peker ned | ned | pil | trekant</annotation>
+ <annotation cp="▼" type="tts">fylt trekant som peker ned</annotation>
+ <annotation cp="◊">diamant | hult rutersymbol | rombe | ruter</annotation>
+ <annotation cp="◊" type="tts">hult rutersymbol</annotation>
+ <annotation cp="○">hul sirkel | ring | runding | sirkel</annotation>
+ <annotation cp="○" type="tts">hul sirkel</annotation>
+ <annotation cp="●">fylt sirkel | runding | sirkel</annotation>
+ <annotation cp="●" type="tts">fylt sirkel</annotation>
+ <annotation cp="◯">hul sirkel | ring | runding | sirkel | stor hul sirkel</annotation>
+ <annotation cp="◯" type="tts">stor hul sirkel</annotation>
<annotation cp="⚧">transperson | transperson-symbol</annotation>
<annotation cp="⚧" type="tts">transperson-symbol</annotation>
<annotation cp="🤌">fingre | fingrene sammen | hånd | hånd med fingertuppene sammen | sarkastisk | spørsmål</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">regnbueflagg</annotation>
<annotation cp="🏴☠">Kaptein Sabeltann | pirat | plyndre | sjørøverflagg | skatt</annotation>
<annotation cp="🏴☠" type="tts">sjørøverflagg</annotation>
+ <annotation cp="£">britiske pund | EGP | GBP | pund | valuta</annotation>
+ <annotation cp="£" type="tts">pund</annotation>
+ <annotation cp="¥">CNY | japanske yen | JPY | kinesiske yuan | valuta | yen</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indiske rupi | INR | rupi | valuta</annotation>
+ <annotation cp="₹" type="tts">indiske rupi</annotation>
+ <annotation cp="₽">RUB | rubler | russiske rubler | valuta</annotation>
+ <annotation cp="₽" type="tts">rubler</annotation>
+ <annotation cp="¹">en | hevet | hevet ettall | i første | opphøyd i første</annotation>
+ <annotation cp="¹" type="tts">hevet ettall</annotation>
+ <annotation cp="²">hevet | hevet totall | i andre | kvadrat | opphøyd i andre | to</annotation>
+ <annotation cp="²" type="tts">hevet totall</annotation>
+ <annotation cp="³">hevet | hevet tretall | i tredje | kubikk | opphøyd i tredje | tre</annotation>
+ <annotation cp="³" type="tts">hevet tretall</annotation>
+ <annotation cp="µ">gresk my | liten my | mikro | mikrotegn | milliondel | milliontedels | my</annotation>
+ <annotation cp="µ" type="tts">mikrotegn</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ne.xml b/common/annotations/ne.xml
index 00b53e8..c9d08bc 100644
--- a/common/annotations/ne.xml
+++ b/common/annotations/ne.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">छालाको प्रकार-५</annotation>
<annotation cp="🏿">इमोजी परिमार्जक | छाला | छालाको प्रकार-६ | टोन | फिटपाट्रिक</annotation>
<annotation cp="🏿" type="tts">छालाको प्रकार-६</annotation>
+ <annotation cp="–">एन | ड्याश</annotation>
+ <annotation cp="–" type="tts">एन ड्याश</annotation>
+ <annotation cp="—">एप ड्याश | एम ड्याश | ड्याश</annotation>
+ <annotation cp="—" type="tts">एप ड्याश</annotation>
+ <annotation cp="·">इन्टरपंक्ट | बिन्दु | मध्य | मध्यबिन्दु</annotation>
+ <annotation cp="·" type="tts">मध्यबिन्दु</annotation>
+ <annotation cp="«">उद्धरण | कोण | कोष्ठक | क्यारेट | बायाँ | बायाँ गिलिमिट | बायाँ गिलिमेट | शेव्रन</annotation>
+ <annotation cp="«" type="tts">बायाँ गिलिमेट</annotation>
+ <annotation cp="»">उद्धरण | कोण | कोष्ठक | क्यारेट | दायाँ | दायाँ गिलिमेट | शेव्रन</annotation>
+ <annotation cp="»" type="tts">दायाँ गिलिमेट</annotation>
+ <annotation cp="§">अनुच्छेद | खण्ड | भाग | सिल्क्रो</annotation>
+ <annotation cp="§" type="tts">खण्ड</annotation>
+ <annotation cp="†">ओबेलस | ओबेलिस्क | चुपी | चुपीको चिन्ह</annotation>
+ <annotation cp="†" type="tts">चुपीको चिन्ह</annotation>
+ <annotation cp="‡">ओबेलस | ओबेलिस्क | चुपी | दुईवटा | दुईवटा चुपीको चिन्ह</annotation>
+ <annotation cp="‡" type="tts">दुईवटा चुपीको चिन्ह</annotation>
+ <annotation cp="•">बिन्दु | बुलेट</annotation>
+ <annotation cp="•" type="tts">बुलेट</annotation>
+ <annotation cp="°">घण्टा | डिग्री | प्रमाण</annotation>
+ <annotation cp="°" type="tts">डिग्री</annotation>
+ <annotation cp="℗">ध्वनि | ध्वनि रेकर्डिङको प्रतिलिपि अधिकार | प्रतिलिपि अधिकार | रेकर्डिङ</annotation>
+ <annotation cp="℗" type="tts">ध्वनि रेकर्डिङको प्रतिलिपि अधिकार</annotation>
+ <annotation cp="←">बाण | बायाँ | बायाँ देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="←" type="tts">बायाँ देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="→">दायाँ | दायाँ देखाइरहेको बाण चिन्ह | बाण</annotation>
+ <annotation cp="→" type="tts">दायाँ देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="↑">बाण | माथि | माथि देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="↑" type="tts">माथि देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="↓">तल | तल देखाइरहेको बाण चिन्ह | बाण</annotation>
+ <annotation cp="↓" type="tts">तल देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="⇅">तल | बाण | माथि | माथि र तल देखाइरहेका बाण चिन्हहरू</annotation>
+ <annotation cp="⇅" type="tts">माथि र तल देखाइरहेका बाण चिन्हहरू</annotation>
+ <annotation cp="⇆">दायाँ | दायाँको माथि बायाँ देखाइरहेको बाण चिन्ह | बाण | बायाँ</annotation>
+ <annotation cp="⇆" type="tts">दायाँको माथि बायाँ देखाइरहेको बाण चिन्ह</annotation>
+ <annotation cp="∆">त्रिभुज | वृद्धि</annotation>
+ <annotation cp="∆" type="tts">वृद्धि</annotation>
+ <annotation cp="∇">त्रिभुज | नाब्ला</annotation>
+ <annotation cp="∇" type="tts">नाब्ला</annotation>
+ <annotation cp="∈">तत्व | निम्नको तत्व | सदस्यता | समावेश | सेट</annotation>
+ <annotation cp="∈" type="tts">निम्नको तत्व</annotation>
+ <annotation cp="÷">ओबेलस | भाग | भाग गर्नु | भागको चिन्ह</annotation>
+ <annotation cp="÷" type="tts">भागको चिन्ह</annotation>
+ <annotation cp="×">गुणन | गुणन गर्नु | गुणनको चिन्ह | गुना</annotation>
+ <annotation cp="×" type="tts">गुणनको चिन्ह</annotation>
+ <annotation cp="⁻">घटाउ | सुपरस्क्रिप्ट | सुपरस्क्रिप्टको घटाउ</annotation>
+ <annotation cp="⁻" type="tts">सुपरस्क्रिप्टको घटाउ</annotation>
+ <annotation cp="√">मूल | रेडिकल | वर्ग | वर्गमूल | सर्ड | स्रोत</annotation>
+ <annotation cp="√" type="tts">वर्गमूल</annotation>
+ <annotation cp="∞">अनन्त | अनन्तताको चिन्ह</annotation>
+ <annotation cp="∞" type="tts">अनन्तताको चिन्ह</annotation>
+ <annotation cp="∩">परस्पर काटिने | सेट</annotation>
+ <annotation cp="∩" type="tts">परस्पर काटिने</annotation>
+ <annotation cp="∪">युनियन | संग्रह | सेट</annotation>
+ <annotation cp="∪" type="tts">युनियन</annotation>
+ <annotation cp="≡">ठ्याक्कै | तीन गुना | निम्न जस्तै | मिल्दो</annotation>
+ <annotation cp="≡" type="tts">निम्न जस्तै</annotation>
+ <annotation cp="⊂">निम्नको सबसेट | सबसेट | सेट</annotation>
+ <annotation cp="⊂" type="tts">निम्नको सबसेट</annotation>
+ <annotation cp="▲">त्रिभुज | बाण | माथि | माथि देखाइरहेको रङ भरिएको त्रिभुज | रङ भरिएको</annotation>
+ <annotation cp="▲" type="tts">माथि देखाइरहेको रङ भरिएको त्रिभुज</annotation>
+ <annotation cp="▼">तल | तल देखाइरहेको रङ भरिएको त्रिभुज | त्रिभुज | बाण | रङ भरिएको</annotation>
+ <annotation cp="▼" type="tts">तल देखाइरहेको रङ भरिएको त्रिभुज</annotation>
+ <annotation cp="◊">तिर्यग्वर्ग | विषमकोण | हीरा</annotation>
+ <annotation cp="◊" type="tts">तिर्यग्वर्ग</annotation>
+ <annotation cp="○">गोलाकार | रङ नभरिएको वृत्त | वृत्त</annotation>
+ <annotation cp="○" type="tts">रङ नभरिएको वृत्त</annotation>
+ <annotation cp="●">रङ भरिएको वृत्त | वृत्त</annotation>
+ <annotation cp="●" type="tts">रङ भरिएको वृत्त</annotation>
+ <annotation cp="◯">गोलाकार | रङ नभरिएको ठुलो वृत्त | वृत्त</annotation>
+ <annotation cp="◯" type="tts">रङ नभरिएको ठुलो वृत्त</annotation>
<annotation cp="⚧">ट्रान्सजेन्डर | ट्रान्सजेन्डर प्रतीक</annotation>
<annotation cp="⚧" type="tts">ट्रान्सजेन्डर प्रतीक</annotation>
<annotation cp="🤌" draft="provisional">चिमोटिएका औँलाहरू</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">इन्द्रेणी झण्डा</annotation>
<annotation cp="🏴☠">खजाना | जोली रोजर | डाँका | डाँकाको झन्डा | प्लन्डर</annotation>
<annotation cp="🏴☠" type="tts">डाँकाको झन्डा</annotation>
+ <annotation cp="£">इजिपी | जिबिपी | पाउन्ड | मुद्रा</annotation>
+ <annotation cp="£" type="tts">पाउन्ड</annotation>
+ <annotation cp="¥">जेपिवाई | मुद्रा | युआन | येन | सिएनवाई</annotation>
+ <annotation cp="¥" type="tts">येन</annotation>
+ <annotation cp="€">इयुआर | मुद्रा | युरो</annotation>
+ <annotation cp="€" type="tts">युरो</annotation>
+ <annotation cp="₹">भारतीय रुपैयाँ | मुद्रा | रुपैयाँ</annotation>
+ <annotation cp="₹" type="tts">भारतीय रुपैयाँ</annotation>
+ <annotation cp="₽">मुद्रा | रूबल</annotation>
+ <annotation cp="₽" type="tts">रूबल</annotation>
+ <annotation cp="¹">एक | सुपरस्क्रिप्ट | सुपरस्क्रिप्टको एक</annotation>
+ <annotation cp="¹" type="tts">सुपरस्क्रिप्टको एक</annotation>
+ <annotation cp="²">दुई | वर्ग | सुपरस्क्रिप्ट | सुपरस्क्रिप्टको दुई</annotation>
+ <annotation cp="²" type="tts">सुपरस्क्रिप्टको दुई</annotation>
+ <annotation cp="³">घन | तीन | सुपरस्क्रिप्ट | सुपरस्क्रिप्टको तीन</annotation>
+ <annotation cp="³" type="tts">सुपरस्क्रिप्टको तीन</annotation>
+ <annotation cp="µ">माइक्रोको चिन्ह | मापन</annotation>
+ <annotation cp="µ" type="tts">माइक्रोको चिन्ह</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/nl.xml b/common/annotations/nl.xml
index f8b75c9..b4b0b89 100644
--- a/common/annotations/nl.xml
+++ b/common/annotations/nl.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">donkergetinte huidskleur</annotation>
<annotation cp="🏿">donkere huidskleur | huidskleur | type 6</annotation>
<annotation cp="🏿" type="tts">donkere huidskleur</annotation>
+ <annotation cp="–">gedachte | gedachtestreepje | streepje</annotation>
+ <annotation cp="–" type="tts">gedachtestreepje</annotation>
+ <annotation cp="—">aandacht | aandachtsstreepje | streepje</annotation>
+ <annotation cp="—" type="tts">aandachtsstreepje</annotation>
+ <annotation cp="·">hoge | interpunct | punt</annotation>
+ <annotation cp="·" type="tts">hoge punt</annotation>
+ <annotation cp="«">aanhalingsteken | guillemet naar links | haakjes | hoek | inlastekens | links | onderscheidingsteken</annotation>
+ <annotation cp="«" type="tts">guillemet naar links</annotation>
+ <annotation cp="»">aanhalingsteken | guillemet naar rechts | haakjes | hoek | inlastektekens | onderscheidingsteken | rechts</annotation>
+ <annotation cp="»" type="tts">guillemet naar rechts</annotation>
+ <annotation cp="§">deel | paragraaf | paragraafsymbool</annotation>
+ <annotation cp="§" type="tts">paragraaf</annotation>
+ <annotation cp="†">obelisk | obelus</annotation>
+ <annotation cp="†" type="tts">obelisk</annotation>
+ <annotation cp="‡">dubbel | dubbele obelisk | obelisk | obelus</annotation>
+ <annotation cp="‡" type="tts">dubbele obelisk</annotation>
+ <annotation cp="•">bullet | rondje</annotation>
+ <annotation cp="•" type="tts">bullet</annotation>
+ <annotation cp="°">bewijs | graden | uur</annotation>
+ <annotation cp="°" type="tts">graden</annotation>
+ <annotation cp="℗">copyright | copyright geluidsopname | geluid | opname</annotation>
+ <annotation cp="℗" type="tts">copyright geluidsopname</annotation>
+ <annotation cp="←">links | naar links wijzende pijl | pijl</annotation>
+ <annotation cp="←" type="tts">naar links wijzende pijl</annotation>
+ <annotation cp="→">naar rechts wijzende pijl | pijl | rechts</annotation>
+ <annotation cp="→" type="tts">naar rechts wijzende pijl</annotation>
+ <annotation cp="↑">omhoog | omhoog wijzende pijl | pijl</annotation>
+ <annotation cp="↑" type="tts">omhoog wijzende pijl</annotation>
+ <annotation cp="↓">omlaag | omlaag wijzende pijl | pijl</annotation>
+ <annotation cp="↓" type="tts">omlaag wijzende pijl</annotation>
+ <annotation cp="⇅">omhoog | omhoog en omlaag wijzende pijlen | omlaag | pijl</annotation>
+ <annotation cp="⇅" type="tts">omhoog en omlaag wijzende pijlen</annotation>
+ <annotation cp="⇆">links | naar links boven naar rechts wijzende pijlen | naar links wijzende boven naar rechts wijzende pijlen | pijl | rechts</annotation>
+ <annotation cp="⇆" type="tts">naar links boven naar rechts wijzende pijlen</annotation>
+ <annotation cp="∆">driehoek | toename</annotation>
+ <annotation cp="∆" type="tts">toename</annotation>
+ <annotation cp="∇">driehoek | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">bevat | element | element van | lidmaatschap | verzameling</annotation>
+ <annotation cp="∈" type="tts">element van</annotation>
+ <annotation cp="÷">deelteken | delen | deling | gedeeld door teken | obelus</annotation>
+ <annotation cp="÷" type="tts">deelteken</annotation>
+ <annotation cp="×">keer | vermenigvuldigen | vermenigvuldiging | vermenigvuldigingsteken</annotation>
+ <annotation cp="×" type="tts">vermenigvuldigingsteken</annotation>
+ <annotation cp="⁻">min | superscript</annotation>
+ <annotation cp="⁻" type="tts">superscript min</annotation>
+ <annotation cp="√">onmeetbaar getal | radix | vierkant | vierkantswortel | wortel | wortelvorm</annotation>
+ <annotation cp="√" type="tts">vierkantswortel</annotation>
+ <annotation cp="∞">oneindig | oneindig teken</annotation>
+ <annotation cp="∞" type="tts">oneindig teken</annotation>
+ <annotation cp="∩">doorsnede | verzameling</annotation>
+ <annotation cp="∩" type="tts">doorsnede</annotation>
+ <annotation cp="∪">reeks | vereniging | verzameling</annotation>
+ <annotation cp="∪" type="tts">vereniging</annotation>
+ <annotation cp="≡">drievoud | gelijk | gelijk aan | is gelijk aan | precies</annotation>
+ <annotation cp="≡" type="tts">is gelijk aan</annotation>
+ <annotation cp="⊂">deelverzameling | deelverzameling van | verzameling</annotation>
+ <annotation cp="⊂" type="tts">deelverzameling van</annotation>
+ <annotation cp="▲">driehoek | gevuld | gevulde, omhoog wijzende driehoek | omhoog | pijl</annotation>
+ <annotation cp="▲" type="tts">gevulde, omhoog wijzende driehoek</annotation>
+ <annotation cp="▼">driehoek | gevuld | gevulde, omlaag wijzende driehoek | omlaag | pijl</annotation>
+ <annotation cp="▼" type="tts">gevulde, omlaag wijzende driehoek</annotation>
+ <annotation cp="◊">ruit | ruitvorm | ruitvormig</annotation>
+ <annotation cp="◊" type="tts">ruit</annotation>
+ <annotation cp="○">cirkel | holle cirkel | ring</annotation>
+ <annotation cp="○" type="tts">holle cirkel</annotation>
+ <annotation cp="●">cirkel | gevulde cirkel</annotation>
+ <annotation cp="●" type="tts">gevulde cirkel</annotation>
+ <annotation cp="◯">cirkel | grote holle cirkel | ring</annotation>
+ <annotation cp="◯" type="tts">grote holle cirkel</annotation>
<annotation cp="⚧">transgender | transgendersymbool</annotation>
<annotation cp="⚧" type="tts">transgendersymbool</annotation>
<annotation cp="🤌">handgebaar | ondervraging | samengeknepen | sarcastisch | vingers</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">regenboogvlag</annotation>
<annotation cp="🏴☠">Jolly Roger | piraat | piratenvlag | plunderen | schat</annotation>
<annotation cp="🏴☠" type="tts">piratenvlag</annotation>
+ <annotation cp="£">Brits pond | EGP | GBP | valuta</annotation>
+ <annotation cp="£" type="tts">Brits pond</annotation>
+ <annotation cp="¥">CNY | JPY | valuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">Indiase roepie | roepie | valuta</annotation>
+ <annotation cp="₹" type="tts">Indiase roepie</annotation>
+ <annotation cp="₽">roebel | valuta</annotation>
+ <annotation cp="₽" type="tts">roebel</annotation>
+ <annotation cp="¹">één | superscript</annotation>
+ <annotation cp="¹" type="tts">superscript één</annotation>
+ <annotation cp="²">in het kwadraat | superscript | twee</annotation>
+ <annotation cp="²" type="tts">superscript twee</annotation>
+ <annotation cp="³">drie | kubieke | superscript</annotation>
+ <annotation cp="³" type="tts">superscript drie</annotation>
+ <annotation cp="µ">maat | mu</annotation>
+ <annotation cp="µ" type="tts">mu</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/nn.xml b/common/annotations/nn.xml
index b373f54..67c6e29 100644
--- a/common/annotations/nn.xml
+++ b/common/annotations/nn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/or.xml b/common/annotations/or.xml
index e264d6b..806cb38 100644
--- a/common/annotations/or.xml
+++ b/common/annotations/or.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ମଧ୍ୟମ-ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
<annotation cp="🏿">ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ | ଚର୍ମ ରଙ୍ଗ | ପ୍ରକାର 6</annotation>
<annotation cp="🏿" type="tts">ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="–">ଏନ୍ | ଡ୍ୟାସ୍</annotation>
+ <annotation cp="–" type="tts">ଏନ୍ ଡ୍ୟାସ୍</annotation>
+ <annotation cp="—">ଏମ୍ | ଡ୍ୟାସ୍</annotation>
+ <annotation cp="—" type="tts">ଏମ୍ ଡ୍ୟାସ୍</annotation>
+ <annotation cp="·">ଇଣ୍ଟରପଙ୍କ୍ଟ | ବିନ୍ଦୁ | ମଧ୍ୟ | ମଧ୍ୟବିନ୍ଦୁ | ମଧ୍ୟମ ବିନ୍ଦୁ</annotation>
+ <annotation cp="·" type="tts">ମଧ୍ୟମ ବିନ୍ଦୁ</annotation>
+ <annotation cp="«">ଉଦ୍ଦୃତି | କେରେଟ୍ସ | କୋଣ | ଚେଭ୍ରଓନ୍ | ବନ୍ଧନୀଗୁଡିକ | ବାମ | ବାମ ଗାଇଲମେଟ୍ | ବାମ ଶୀର୍ଷଧାର</annotation>
+ <annotation cp="«" type="tts">ବାମ ଗାଇଲମେଟ୍</annotation>
+ <annotation cp="»" draft="provisional">ଉଦ୍ଦୃତି | କେରେଟ୍ସ | କୋଣ | ଚେଭ୍ରଓନ୍ | ଡାହାଣ | ଡାହାଣ ଶୀର୍ଷଧାର | ବନ୍ଧନୀଗୁଡିକ</annotation>
+ <annotation cp="»" type="tts">ଡାହାଣ ଶୀର୍ଷଧାର</annotation>
+ <annotation cp="§">ଅନୁଚ୍ଛେଦ | ଅଂଶ | ବିଭାଗ | ସିଲକ୍ରାଉ</annotation>
+ <annotation cp="§" type="tts">ବିଭାଗ</annotation>
+ <annotation cp="†">ଅବେଲସ୍ | ଅବେଲିସ୍କ | ଡାଗ୍ଗର୍ | ଡାଗ୍ଗର୍ ଚିହ୍ନ</annotation>
+ <annotation cp="†" type="tts">ଡାଗ୍ଗର୍ ଚିହ୍ନ</annotation>
+ <annotation cp="‡">ଅବେଲସ୍ | ଅବେଲିସ୍କ | ଡବଲ୍ | ଡବଲ୍ ଡାଗ୍ଗର୍ ଚିହ୍ | ଡାଗ୍ପର୍</annotation>
+ <annotation cp="‡" type="tts">ଡବଲ୍ ଡାଗ୍ଗର୍ ଚିହ୍</annotation>
+ <annotation cp="•">ବିନ୍ଦୁ | ବୁଲେଟ୍</annotation>
+ <annotation cp="•" type="tts">ବୁଲେଟ୍</annotation>
+ <annotation cp="°">ଘଣ୍ଟା | ଡିଗ୍ରୀ | ପ୍ରମାଣ</annotation>
+ <annotation cp="°" type="tts">ଡିଗ୍ରୀ</annotation>
+ <annotation cp="℗">କପିରାଇଟ୍ | ଧ୍ଵନି ରେକଡିଂ କପିରାଇଟ୍ | ଧ୍ୱନି | ରେକର୍ଡିଂ</annotation>
+ <annotation cp="℗" type="tts">ଧ୍ଵନି ରେକଡିଂ କପିରାଇଟ୍</annotation>
+ <annotation cp="←">ତୀର | ବାମ | ବାମକୁ-ସୂଚାଉଥିବା ତୀର</annotation>
+ <annotation cp="←" type="tts">ବାମକୁ-ସୂଚାଉଥିବା ତୀର</annotation>
+ <annotation cp="→">ଡାହାଣ | ଡାହାଣ-ମୁହାଁ ତୀର | ତୀର</annotation>
+ <annotation cp="→" type="tts">ଡାହାଣ-ମୁହାଁ ତୀର</annotation>
+ <annotation cp="↑" draft="provisional">ଉପର-ସୂଚାଉଥିବା ତୀର</annotation>
+ <annotation cp="↑" type="tts" draft="provisional">ଉପର-ସୂଚାଉଥିବା ତୀର</annotation>
+ <annotation cp="↓" draft="provisional">ତଳକୁ-ମୁହାଁ ତୀର</annotation>
+ <annotation cp="↓" type="tts" draft="provisional">ତଳକୁ-ମୁହାଁ ତୀର</annotation>
+ <annotation cp="⇅" draft="provisional">ଉପର-ସୂଚାଉଥିବା ଏବଂ ନିମ୍ନକୁ-ସୂଚାଉଥିବା ତୀରଗୁଡିକ</annotation>
+ <annotation cp="⇅" type="tts" draft="provisional">ଉପର-ସୂଚାଉଥିବା ଏବଂ ନିମ୍ନକୁ-ସୂଚାଉଥିବା ତୀରଗୁଡିକ</annotation>
+ <annotation cp="⇆">ଡାହାଣ | ଡାହାଣକୁ-ସୂଚାଉଥିବା ତୀର ଉପରେ ବାମକୁ-ସୂଚାଉଥିବା ତୀର | ଡାହାଣକୁ-ସୂଚାଉଥିବାରେ ବାମକୁ-ସୂଚାଉଥିବା ତୀର | ତୀର | ବାମ</annotation>
+ <annotation cp="⇆" type="tts">ଡାହାଣକୁ-ସୂଚାଉଥିବାରେ ବାମକୁ-ସୂଚାଉଥିବା ତୀର</annotation>
+ <annotation cp="∆">ଅଭିବୃଦ୍ଧି | ତ୍ରିଭୁଜ</annotation>
+ <annotation cp="∆" type="tts">ଅଭିବୃଦ୍ଧି</annotation>
+ <annotation cp="∇">ତ୍ରିଭୁଜ | ନାବ୍ଲା</annotation>
+ <annotation cp="∇" type="tts">ନାବ୍ଲା</annotation>
+ <annotation cp="∈">ଉପାଦାନ | ଏହାର ଉପାଦାନ | ବିଷୟବସ୍ତୁ | ସଦ୍ୟସତା | ସେଟ୍</annotation>
+ <annotation cp="∈" type="tts">ଏହାର ଉପାଦାନ</annotation>
+ <annotation cp="÷">ଅବେଲସ୍ | ହରଣ | ହରଣ କରିବା | ହରଣ ଚିହ୍ନ</annotation>
+ <annotation cp="÷" type="tts">ହରଣ ଚିହ୍ନ</annotation>
+ <annotation cp="×">ଗୁଣନ | ଗୁଣନ କରିବା | ଗୁଣନ ଚିହ୍ନ | ଥର</annotation>
+ <annotation cp="×" type="tts">ଗୁଣନ ଚିହ୍ନ</annotation>
+ <annotation cp="⁻">ବିଯୋଗ | ସୁପରସ୍କ୍ରିପ୍ଟ</annotation>
+ <annotation cp="⁻" type="tts">ସୁପରସ୍କ୍ରିପ୍ଟ ବିଯୋଗ</annotation>
+ <annotation cp="√">କରଣୀ | ବର୍ଗ | ବର୍ଗମୂଳ | ମୂଳ | ରାଡିକାଲ୍ | ରାଡିକ୍ସ</annotation>
+ <annotation cp="√" type="tts">ବର୍ଗମୂଳ</annotation>
+ <annotation cp="∞">ଇନଫିନିଟୀ | ଇନଫିନିଟୀ ଚିହ୍ନ</annotation>
+ <annotation cp="∞" type="tts">ଇନଫିନିଟୀ ଚିହ୍ନ</annotation>
+ <annotation cp="∩">ଇଣ୍ଟରସେକ୍ସନ୍ | ସେଟ୍</annotation>
+ <annotation cp="∩" type="tts">ଇଣ୍ଟରସେକ୍ସନ୍</annotation>
+ <annotation cp="∪">ୟୁନିଅନ୍ | ସଂଗ୍ରହ | ସେଟ୍</annotation>
+ <annotation cp="∪" type="tts">ୟୁନିଅନ୍</annotation>
+ <annotation cp="≡">ଅବିକଳ | ଏହା ସହିତ ସମରୂପୀ | ତ୍ରିଗୁଣ | ସମରୂପୀ</annotation>
+ <annotation cp="≡" type="tts">ଏହା ସହିତ ସମରୂପୀ</annotation>
+ <annotation cp="⊂">ଏହାର ଉପସେଟ୍ | ଏହାର ସବସେଟ୍ | ସବସେଟ୍ | ସେଟ୍</annotation>
+ <annotation cp="⊂" type="tts">ଏହାର ଉପସେଟ୍</annotation>
+ <annotation cp="▲" draft="provisional">ଉପରକୁ-ସୂଚାଇଥିବା ପୂର୍ଣ୍ଣ ତ୍ରୀକୋଣ</annotation>
+ <annotation cp="▲" type="tts" draft="provisional">ଉପରକୁ-ସୂଚାଇଥିବା ପୂର୍ଣ୍ଣ ତ୍ରୀକୋଣ</annotation>
+ <annotation cp="▼" draft="provisional">ନିମ୍ନକୁ-ସୂଚାଇଥିବା ତ୍ରୀକୋଣ ପୂର୍ଣ୍ଣ ହୋଇଛି</annotation>
+ <annotation cp="▼" type="tts" draft="provisional">ନିମ୍ନକୁ-ସୂଚାଇଥିବା ତ୍ରୀକୋଣ ପୂର୍ଣ୍ଣ ହୋଇଛି</annotation>
+ <annotation cp="◊" draft="provisional">ଡାଇମଣ୍ଡ୍ | ବିମେକୋଣୀ | ବିଷମକୋଣ</annotation>
+ <annotation cp="◊" type="tts">ବିଷମକୋଣ</annotation>
+ <annotation cp="○">ଫମ୍ପା ବୃତ୍ତ | ବୃତ୍ତ | ରିଂ</annotation>
+ <annotation cp="○" type="tts">ଫମ୍ପା ବୃତ୍ତ</annotation>
+ <annotation cp="●">ପୂର୍ଣ୍ଣ ବୃତ୍ତ | ବୃତ୍ତ</annotation>
+ <annotation cp="●" type="tts">ପୂର୍ଣ୍ଣ ବୃତ୍ତ</annotation>
+ <annotation cp="◯">ବଡ଼ ଫମ୍ପା ବୃତ୍ତ | ବୃତ୍ତ | ରିଂ</annotation>
+ <annotation cp="◯" type="tts">ବଡ଼ ଫମ୍ପା ବୃତ୍ତ</annotation>
<annotation cp="⚧">କ୍ଲୀବଲିଙ୍ଗ | କ୍ଲୀବଲିଙ୍ଗ ସଙ୍କେତ</annotation>
<annotation cp="⚧" type="tts">କ୍ଲୀବଲିଙ୍ଗ ସଙ୍କେତ</annotation>
<annotation cp="🤌">ଆଙ୍ଗୁଠିଗୁଡ଼ିକ | ଆଙ୍ଗୁଠିଗୁଡ଼ିକରେ ଚିମୁଟିବା | ଚିମୁଟିବା | ପ୍ରଶ୍ନ କରିବା | ବିଦ୍ରୁପାତ୍ମକ | ହାତର ଇଙ୍ଗିତ</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ଇନ୍ଦ୍ରଧନୁ ପତାକା</annotation>
<annotation cp="🏴☠">କୋଷାଧ୍ୟକ୍ଷ | ଜଳ ଦସ୍ୟୁ ଙ୍କ ପତାକା | ଜଳଦସ୍ୟୁ | ଜୋଲୀ ରୋଜର | ଲୁଟ୍</annotation>
<annotation cp="🏴☠" type="tts">ଜଳ ଦସ୍ୟୁ ଙ୍କ ପତାକା</annotation>
+ <annotation cp="£">₹ | EGP | GBP | ପାଉଣ୍ଡ୍ | ପାଉଣ୍ତ୍</annotation>
+ <annotation cp="£" type="tts">ପାଉଣ୍ଡ୍</annotation>
+ <annotation cp="¥" draft="provisional">₹ | CNY | JPY | ୟୁଆନ | ୟେନ</annotation>
+ <annotation cp="¥" type="tts">ୟେନ</annotation>
+ <annotation cp="€" draft="provisional">₹ | EUR | ୟୁରୋ</annotation>
+ <annotation cp="€" type="tts">ୟୁରୋ</annotation>
+ <annotation cp="₹">ଟଙ୍କା | ଭାରତୀୟ ଟଙ୍କା</annotation>
+ <annotation cp="₹" type="tts">ଭାରତୀୟ ଟଙ୍କା</annotation>
+ <annotation cp="₽">ମୁଦ୍ରା | ରୁବେଲ୍</annotation>
+ <annotation cp="₽" type="tts">ରୁବେଲ୍</annotation>
+ <annotation cp="¹">ଏକ | ସୁପରସ୍କ୍ରିପ୍ଟ</annotation>
+ <annotation cp="¹" type="tts">ସୁପରସ୍କ୍ରିପ୍ଟ ଏକ</annotation>
+ <annotation cp="²">ଦୁଇ | ବର୍ଗ | ସୁପରସ୍କ୍ରିପ୍ଟ</annotation>
+ <annotation cp="²" type="tts">ସୁପରସ୍କ୍ରିପ୍ଟ ଦୁଇ</annotation>
+ <annotation cp="³">ଘନ | ତିନି | ସୁପରସ୍କ୍ରିପ୍ଟ</annotation>
+ <annotation cp="³" type="tts">ସୁପରସ୍କ୍ରିପ୍ଟ ତିନି</annotation>
+ <annotation cp="µ">ମାଇକ୍ରୋ ଚିହ୍ନ | ମାପ</annotation>
+ <annotation cp="µ" type="tts">ମାଇକ୍ରୋ ଚିହ୍ନ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/pa.xml b/common/annotations/pa.xml
index aa08109..456f569 100644
--- a/common/annotations/pa.xml
+++ b/common/annotations/pa.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ਦਰਮਿਆਨਾ ਕਾਲਾ ਰੰਗ</annotation>
<annotation cp="🏿">ਇਮੋਜੀ ਸੋਧਕ | ਕਾਲਾ ਰੰਗ | ਚਮੜੀ ਦਾ ਰੰਗ | ਟੋਨ | ਫਿਟਜਪੈਟਰਿਕ</annotation>
<annotation cp="🏿" type="tts">ਕਾਲਾ ਰੰਗ</annotation>
+ <annotation cp="–">ਐੰਨ | ਐੰਨ-ਡੈਸ਼ | ਡੈਸ਼</annotation>
+ <annotation cp="–" type="tts">ਐੰਨ-ਡੈਸ਼</annotation>
+ <annotation cp="—">ਐਮ | ਡੈਸ਼</annotation>
+ <annotation cp="—" type="tts">ਐਮ ਡੈਸ਼</annotation>
+ <annotation cp="·">ਇੰਟਰਪੰਕਟ | ਬਿੰਦੀ | ਮੱਧ</annotation>
+ <annotation cp="·" type="tts">ਮੱਧ ਬਿੰਦੀ</annotation>
+ <annotation cp="«">ਹਵਾਲਾ | ਕੋਣ | ਖੱਬਾ ਗਿਲੇਮੇਟ | ਖੱਬੇ | ਖੱਬੇ ਗਿਲੇਮੇਟ | ਚੇਵਰਨ | ਦੇਖਭਾਲ | ਬਰੈਕਟ</annotation>
+ <annotation cp="«" type="tts">ਖੱਬਾ ਗਿਲੇਮੇਟ</annotation>
+ <annotation cp="»">ਸਹੀ | ਸੱਜਾ ਗਿਲੇਮੇਟ | ਹਵਾਲਾ | ਕੋਣ | ਚੇਵਰਨ | ਦੇਖਭਾਲ | ਬਰੈਕਟ</annotation>
+ <annotation cp="»" type="tts">ਸੱਜਾ ਗਿਲੇਮੇਟ</annotation>
+ <annotation cp="§">ਸਿਲਕ੍ਰੋ | ਸੈਕਸ਼ਨ | ਪੈਰਾ | ਭਾਗ</annotation>
+ <annotation cp="§" type="tts">ਸੈਕਸ਼ਨ</annotation>
+ <annotation cp="†">ਔਬਲਿਸ | ਔਬਲਿਸਕ | ਡੈਗਰ | ਡੈਗਰ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="†" type="tts">ਡੈਗਰ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="‡">ਔਬਲਿਸ | ਔਬਲਿਸਕ | ਡਬਲ | ਡਬਲ ਡੈਗਰ ਚਿੰਨ੍ਹ | ਡੈਗਰ</annotation>
+ <annotation cp="‡" type="tts">ਡਬਲ ਡੈਗਰ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="•">ਬਿੰਦੀ | ਬੁਲੇਟ</annotation>
+ <annotation cp="•" type="tts">ਬੁਲੇਟ</annotation>
+ <annotation cp="°">ਸਬੂਤ | ਘੰਟਾ | ਡਿਗਰੀ</annotation>
+ <annotation cp="°" type="tts">ਡਿਗਰੀ</annotation>
+ <annotation cp="℗">ਆਵਾਜ਼ | ਕਾਪੀਰਾਈਟ | ਰਿਕਾਰਡਿੰਗ</annotation>
+ <annotation cp="℗" type="tts">ਆਵਾਜ਼ ਰਿਕਾਰਡਿੰਗ ਕਾਪੀਰਾਈਟ</annotation>
+ <annotation cp="←">ਖੱਬਾ | ਖੱਬਾ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤੀਰ | ਤੀਰ</annotation>
+ <annotation cp="←" type="tts">ਖੱਬਾ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤੀਰ</annotation>
+ <annotation cp="→">ਸੱਜਾ | ਸੱਜਾ-ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤੀਰ | ਤੀਰ</annotation>
+ <annotation cp="→" type="tts">ਸੱਜਾ-ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤੀਰ</annotation>
+ <annotation cp="↑">ਉੱਪਰ | ਉੱਪਰ ਵੱਲ ਇਸ਼ਾਰਾ ਕਰਨ ਵਾਲਾ ਤੀਰ | ਉੱਪਰ-ਵੱਲ ਇਸ਼ਾਰਾ ਕਰਨ ਵਾਲਾ ਤੀਰ | ਤੀਰ</annotation>
+ <annotation cp="↑" type="tts">ਉੱਪਰ-ਵੱਲ ਇਸ਼ਾਰਾ ਕਰਨ ਵਾਲਾ ਤੀਰ</annotation>
+ <annotation cp="↓">ਹੇਠਾਂ | ਹੇਠਾਂ ਵੱਲ ਇਸ਼ਾਰਾ ਕਰਨ ਵਾਲਾ ਤੀਰ | ਤੀਰ</annotation>
+ <annotation cp="↓" type="tts">ਹੇਠਾਂ ਵੱਲ ਇਸ਼ਾਰਾ ਕਰਨ ਵਾਲਾ ਤੀਰ</annotation>
+ <annotation cp="⇅">ਉੱਪਰ | ਉੱਪਰ ਅਤੇ ਹੇਠਾਂ ਸੰਕੇਤ ਕਰਨ ਵਾਲੇ ਤੀਰ | ਉੱਪਰ ਵੱਲ ਸੰਕੇਤ ਕਰਨ ਵਾਲੇ ਅਤੇ ਹੇਠਾਂ ਵੱਲ ਸੰਕੇਤ ਕਰਨ ਵਾਲੇ ਤੀਰ | ਹੇਠਾਂ | ਤੀਰ</annotation>
+ <annotation cp="⇅" type="tts">ਉੱਪਰ ਅਤੇ ਹੇਠਾਂ ਸੰਕੇਤ ਕਰਨ ਵਾਲੇ ਤੀਰ</annotation>
+ <annotation cp="⇆">ਸੱਜਾ | ਸੱਜੇ-ਪਾਸੇ ਵੱਲ ਸੰਕੇਤ ਕਰਦੇ ਤੀਰ ਉੱਤੇ ਖੱਬੇ-ਸੰਕੇਤ | ਖੱਬੇ | ਤੀਰ</annotation>
+ <annotation cp="⇆" type="tts">ਸੱਜੇ-ਪਾਸੇ ਵੱਲ ਸੰਕੇਤ ਕਰਦੇ ਤੀਰ ਉੱਤੇ ਖੱਬੇ-ਸੰਕੇਤ</annotation>
+ <annotation cp="∆">ਤਿਕੋਣ | ਵਾਧਾ</annotation>
+ <annotation cp="∆" type="tts">ਵਾਧਾ</annotation>
+ <annotation cp="∇">ਤਿਕੋਣ | ਨਾਬਲਾ</annotation>
+ <annotation cp="∇" type="tts">ਨਾਬਲਾ</annotation>
+ <annotation cp="∈">ਸਦੱਸਤਾ | ਸ਼ਾਮਿਲ ਹੈ | ਸੈੱਟ | ਤੱਤ | ਦਾ ਤੱਤ</annotation>
+ <annotation cp="∈" type="tts">ਦਾ ਤੱਤ</annotation>
+ <annotation cp="÷">ਔਬਲਿਸ | ਭਾਗ | ਭਾਗ ਦਾ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="÷" type="tts">ਭਾਗ ਦਾ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="×">ਗੁਣਾ | ਗੁਣਾ ਦਾ ਚਿੰਨ੍ਹ | ਵਾਰ</annotation>
+ <annotation cp="×" type="tts">ਗੁਣਾ ਦਾ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="⁻">ਸੁਪਰਸਕ੍ਰਿਪਟ | ਘਟਾਓ</annotation>
+ <annotation cp="⁻" type="tts">ਸੁਪਰਸਕ੍ਰਿਪਟ ਘਟਾਓ</annotation>
+ <annotation cp="√">ਸਰਡ | ਰੂਟ | ਰੈਡਿਕਸ | ਰੈਡੀਕਲ | ਵਰਗ | ਵਰਗਮੂਲ</annotation>
+ <annotation cp="√" type="tts">ਵਰਗਮੂਲ</annotation>
+ <annotation cp="∞">ਅਨੰਤ | ਅਨੰਤ ਦਾ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="∞" type="tts">ਅਨੰਤ ਦਾ ਚਿੰਨ੍ਹ</annotation>
+ <annotation cp="∩">ਇੰਟਰਸੈਕਸ਼ਨ | ਸੈੱਟ</annotation>
+ <annotation cp="∩" type="tts">ਇੰਟਰਸੈਕਸ਼ਨ</annotation>
+ <annotation cp="∪">ਸੰਗ੍ਰਹਿ | ਸੈੱਟ | ਯੂਨੀਅਨ</annotation>
+ <annotation cp="∪" type="tts">ਯੂਨੀਅਨ</annotation>
+ <annotation cp="≡">ਸਮਾਨ | ਤਿੰਨ ਗੁਣਾ | ਦੇ ਸਮਾਨ | ਬਿਲਕੁਲ</annotation>
+ <annotation cp="≡" type="tts">ਦੇ ਸਮਾਨ</annotation>
+ <annotation cp="⊂">ਸਬਸੈੱਟ | ਸੈੱਟ | ਦਾ ਸਬਸੈੱਟ</annotation>
+ <annotation cp="⊂" type="tts">ਦਾ ਸਬਸੈੱਟ</annotation>
+ <annotation cp="▲">ਉੱਪਰ | ਉੱਪਰ ਵੱਲ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤਿਕੋਣ | ਤਿਕੋਣ | ਤੀਰ | ਭਰੀ</annotation>
+ <annotation cp="▲" type="tts">ਉੱਪਰ ਵੱਲ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤਿਕੋਣ</annotation>
+ <annotation cp="▼">ਹੇਠਾਂ | ਹੇਠਾਂ ਵੱਲ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤਿਕੋਣ | ਤਿਕੋਣ | ਤੀਰ | ਭਰੀ</annotation>
+ <annotation cp="▼" type="tts">ਹੇਠਾਂ ਵੱਲ ਸੰਕੇਤ ਦੇਣ ਵਾਲਾ ਤਿਕੋਣ</annotation>
+ <annotation cp="◊">ਹੀਰਾ | ਰੋਂਬਸ | ਲੋਜ਼ੈਂਜ</annotation>
+ <annotation cp="◊" type="tts">ਲੋਜ਼ੈਂਜ</annotation>
+ <annotation cp="○">ਖਾਲੀ ਚੱਕਰ | ਚੱਕਰ | ਰਿੰਗ</annotation>
+ <annotation cp="○" type="tts">ਖਾਲੀ ਚੱਕਰ</annotation>
+ <annotation cp="●">ਚੱਕਰ | ਭਰਿਆ ਚੱਕਰ</annotation>
+ <annotation cp="●" type="tts">ਭਰਿਆ ਚੱਕਰ</annotation>
+ <annotation cp="◯">ਚੱਕਰ | ਰਿੰਗ | ਵੱਡਾ ਖਾਲੀ ਚੱਕਰ</annotation>
+ <annotation cp="◯" type="tts">ਵੱਡਾ ਖਾਲੀ ਚੱਕਰ</annotation>
<annotation cp="⚧">ਟਰਾਂਸਜੈਂਡਰ | ਟਰਾਂਸਜੈਂਡਰ ਪ੍ਰਤੀਕ</annotation>
<annotation cp="⚧" type="tts">ਟਰਾਂਸਜੈਂਡਰ ਪ੍ਰਤੀਕ</annotation>
<annotation cp="🤌" draft="contributed">ਇਕੱਠੀਆਂ ਉਂਗਲਾਂ</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ਸਤਰੰਗੀ ਪੀਂਘ ਝੰਡਾ</annotation>
<annotation cp="🏴☠">ਸਮੁੰਦਰੀ ਡਾਕੂ | ਖਜਾਨਾ | ਜੋਲੀ ਰੋਜ਼ਰ | ਲੁੱਟ | ਲੁਟੇਰਿਆਂ ਦਾ ਝੰਡਾ</annotation>
<annotation cp="🏴☠" type="tts">ਲੁਟੇਰਿਆਂ ਦਾ ਝੰਡਾ</annotation>
+ <annotation cp="£">ਈਜੀਪੀ | ਜੀਬੀਪੀ | ਪੌਂਡ | ਮੁਦਰਾ</annotation>
+ <annotation cp="£" type="tts">ਪੌਂਡ</annotation>
+ <annotation cp="¥">ਸੀਐਨਵਾਈ | ਜੇਪੀਵਾਈ | ਮੁਦਰਾ | ਯੂਆਨ | ਯੇਨ</annotation>
+ <annotation cp="¥" type="tts">ਯੇਨ</annotation>
+ <annotation cp="€">ਈਯੂਆਰ | ਮੁਦਰਾ | ਯੂਰੋ</annotation>
+ <annotation cp="€" type="tts">ਯੂਰੋ</annotation>
+ <annotation cp="₹">ਭਾਰਤੀ ਰੁਪਿਆ | ਮੁਦਰਾ | ਰੁਪਿਆ</annotation>
+ <annotation cp="₹" type="tts">ਭਾਰਤੀ ਰੁਪਿਆ</annotation>
+ <annotation cp="₽">ਮੁਦਰਾ | ਰੂਬਲ</annotation>
+ <annotation cp="₽" type="tts">ਰੂਬਲ</annotation>
+ <annotation cp="¹">ਇੱਕ | ਸੁਪਰਸਕ੍ਰਿਪਟ</annotation>
+ <annotation cp="¹" type="tts">ਸੁਪਰਸਕ੍ਰਿਪਟ ਇੱਕ</annotation>
+ <annotation cp="²">ਸੁਪਰਸਕ੍ਰਿਪਟ | ਦੋ | ਵਰਗ</annotation>
+ <annotation cp="²" type="tts">ਸੁਪਰਸਕ੍ਰਿਪਟ ਦੋ</annotation>
+ <annotation cp="³">ਸੁਪਰਸਕ੍ਰਿਪਟ | ਕਿਊਬ | ਤਿੰਨ</annotation>
+ <annotation cp="³" type="tts">ਸੁਪਰਸਕ੍ਰਿਪਟ ਤਿੰਨ</annotation>
+ <annotation cp="µ">ਮਾਈਕਰੋ ਸਾਈਨ | ਮਾਪ</annotation>
+ <annotation cp="µ" type="tts">ਮਾਈਕਰੋ ਸਾਈਨ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/pcm.xml b/common/annotations/pcm.xml
new file mode 100644
index 0000000..09779d7
--- /dev/null
+++ b/common/annotations/pcm.xml
@@ -0,0 +1,3097 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="pcm"/>
+ </identity>
+ <annotations>
+ <annotation cp="🏻">Laít Skín Ton | Skín Ton | Taip 1–2</annotation>
+ <annotation cp="🏻" type="tts">Laít Skín Ton</annotation>
+ <annotation cp="🏼">Mídíọ́m-Laít Skín Ton | Skín Ton | Taip 3</annotation>
+ <annotation cp="🏼" type="tts">Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏽">Mídíọ́m Skín Ton | Skín Ton | Taip 4</annotation>
+ <annotation cp="🏽" type="tts">Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏾">Mídíọ́m Dák Skín Ton | Skín Ton | Taip 5</annotation>
+ <annotation cp="🏾" type="tts">Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏿">Dák Skín Ton | Skín Ton | Taip 6</annotation>
+ <annotation cp="🏿" type="tts">Dák Skín Ton</annotation>
+ <annotation cp="–">Dash | En</annotation>
+ <annotation cp="–" type="tts">En Dash</annotation>
+ <annotation cp="—">Dash | Em</annotation>
+ <annotation cp="—" type="tts">Em Dash</annotation>
+ <annotation cp="·">Dọt | Intápọnkt | Míddọt | Mídul | Mídúl Dọt</annotation>
+ <annotation cp="·" type="tts">Mídúl Dọt</annotation>
+ <annotation cp="«">Ángul | Brákẹt-dẹm | Gílmẹ́t Mak Wé De Pọínt Lẹft | Kárẹt-dẹm | Kwot | Lẹft | Shẹ́vrọn</annotation>
+ <annotation cp="«" type="tts">Gílmẹ́t Mak Wé De Pọínt Lẹft</annotation>
+ <annotation cp="»">Ángul | Brákẹt-dẹm | Gílmẹ́t Mak Wé De Pọínt Rait | Kárẹt-dẹm | Kwot | Rait | Shẹ́vrọn</annotation>
+ <annotation cp="»" type="tts">Gílmẹ́t Mak Wé De Pọínt Rait</annotation>
+ <annotation cp="§">Párágraf | Pat | Sẹ́kshọn | Sílkroo</annotation>
+ <annotation cp="§" type="tts">Sẹ́kshọn</annotation>
+ <annotation cp="†">Dága | Dága Sain | Óbẹlisk | Óbẹ́lus</annotation>
+ <annotation cp="†" type="tts">Dága Sain</annotation>
+ <annotation cp="‡">Dága | Dọ́búl | Dọ́búl Dága Sain | Óbẹlisk | Óbẹ́lus</annotation>
+ <annotation cp="‡" type="tts">Dọ́búl Dága Sain</annotation>
+ <annotation cp="•">Búlẹt | Dọt</annotation>
+ <annotation cp="•" type="tts">Búlẹt</annotation>
+ <annotation cp="°">Áwa | Digrii | Pruv</annotation>
+ <annotation cp="°" type="tts">Digrii</annotation>
+ <annotation cp="℗">Kọ́pírait | Kọ́pírait Fọ Rẹ́kọ́dín Saund | Rẹ́kọ́din | Saund</annotation>
+ <annotation cp="℗" type="tts">Kọ́pírait Fọ Rẹ́kọ́dín Saund</annotation>
+ <annotation cp="←">Áro | Áro Wé De Pọínt Lẹft | Lẹft</annotation>
+ <annotation cp="←" type="tts">Áro Wé De Pọínt Lẹft</annotation>
+ <annotation cp="→">Áro | Áro Wé De Pọínt Rait | Rait</annotation>
+ <annotation cp="→" type="tts">Áro Wé De Pọínt Rait</annotation>
+ <annotation cp="↑">Áro | Áro Wé De Pọínt Ọp | Ọp</annotation>
+ <annotation cp="↑" type="tts">Áro Wé De Pọínt Ọp</annotation>
+ <annotation cp="↓">Áro | Áro Wé De Pọínt Daun | Daun</annotation>
+ <annotation cp="↓" type="tts">Áro Wé De Pọínt Daun</annotation>
+ <annotation cp="⇅">Áro | Áro Wé De Pọínt Ọp An Áro Wé De Pọínt Daun | Daun | Ọp | Pọínt Ọ́p Áro An Pọínt Daún Áro</annotation>
+ <annotation cp="⇅" type="tts">Pọínt Ọ́p Áro An Pọínt Daún Áro</annotation>
+ <annotation cp="⇆">Áro | Áro Wé De Pọínt Lẹft Ọn Tọ́p Áro Wé De Pọínt Rait | Áro Wé De Pọínt Lẹft Ọn Tọ́p Raít Aro | Lẹft | Rait</annotation>
+ <annotation cp="⇆" type="tts">Áro Wé De Pọínt Lẹft Ọn Tọ́p Raít Aro</annotation>
+ <annotation cp="∆">Ínkrímẹnt | Tráyángul</annotation>
+ <annotation cp="∆" type="tts">Ínkrímẹnt</annotation>
+ <annotation cp="∇">Nábla | Tráyángul</annotation>
+ <annotation cp="∇" type="tts">Nábla</annotation>
+ <annotation cp="∈">Ẹ́lẹ́mẹnt | Ẹ́lẹ́mẹ́nt Ọf | Mẹ́mbáship | Sẹt</annotation>
+ <annotation cp="∈" type="tts">Ẹ́lẹ́mẹ́nt Ọf</annotation>
+ <annotation cp="÷">Divaid | Divaid Sain | Divaíd Sain | Dívíshọn</annotation>
+ <annotation cp="÷" type="tts">Divaíd Sain</annotation>
+ <annotation cp="×">Mọltiplai | Mọltiplikéshọn | Sain | Taims</annotation>
+ <annotation cp="×" type="tts">Mọltiplai Sain</annotation>
+ <annotation cp="⁻">Maínọs | Supaskript | Supaskrípt Maínọs</annotation>
+ <annotation cp="⁻" type="tts">Supaskrípt Maínọs</annotation>
+ <annotation cp="√">Rádíkal | Rédiks | Rut | Skwea | Skweá Rut | Sọọd</annotation>
+ <annotation cp="√" type="tts">Skweá Rut</annotation>
+ <annotation cp="∞">Infíníti | Infíníti Sain</annotation>
+ <annotation cp="∞" type="tts">Infíníti Sain</annotation>
+ <annotation cp="∩">Intasẹ́kshọn | Sẹt</annotation>
+ <annotation cp="∩" type="tts">Intasẹ́kshọn</annotation>
+ <annotation cp="∪">Sẹt | Yúniọn</annotation>
+ <annotation cp="∪" type="tts">Yúniọn</annotation>
+ <annotation cp="≡">Di Sem As | Ẹ́zakt | Ẹ́záktli | Trí Taims</annotation>
+ <annotation cp="≡" type="tts">Di Sem As</annotation>
+ <annotation cp="⊂">Sẹt | Sọbsẹt | Sọbsẹ́t Ọf</annotation>
+ <annotation cp="⊂" type="tts">Sọbsẹ́t Ọf</annotation>
+ <annotation cp="▲">Áro | Blák Tráyángul Wé De Pọínt Ọp | Tráyángul</annotation>
+ <annotation cp="▲" type="tts">Blák Tráyángul Wé De Pọínt Ọp</annotation>
+ <annotation cp="▼">Áro | Blák Tráyángul Wé De Pọínt Daun | Tráyángul</annotation>
+ <annotation cp="▼" type="tts">Blák Tráyángul Wé De Pọínt Daun</annotation>
+ <annotation cp="◊">Dáyámọnd | Lọ́zínj | Lọ́zínj Símbul | Rọ́mbus</annotation>
+ <annotation cp="◊" type="tts">Lọ́zínj Símbul</annotation>
+ <annotation cp="○">Ring | Sẹkul | Sẹ́kul Wé Gẹ́t Hol</annotation>
+ <annotation cp="○" type="tts">Sẹ́kul Wé Gẹ́t Hol</annotation>
+ <annotation cp="●">Blák Smọ́l Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="●" type="tts">Blák Smọ́l Sẹ́kul</annotation>
+ <annotation cp="◯">Bíg Sẹ́kul Wé Gẹ́t Hol | Ring | Sẹkul</annotation>
+ <annotation cp="◯" type="tts">Bíg Sẹ́kul Wé Gẹ́t Hol</annotation>
+ <annotation cp="⚧">Transjẹ́nda | Transjẹ́ndá Símbul</annotation>
+ <annotation cp="⚧" type="tts">Transjẹ́ndá Símbul</annotation>
+ <annotation cp="🤌">Fínga-dẹm | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌" type="tts">Pinch Fínga</annotation>
+ <annotation cp="🥲">Hápi | Smail | Smaílín Fes Wit Tis Fọ Ai | Tias</annotation>
+ <annotation cp="🥲" type="tts">Smaílín Fes Wit Tis Fọ Ai</annotation>
+ <annotation cp="🥷">Faíta | Haid | Nínja</annotation>
+ <annotation cp="🥷" type="tts">Nínja</annotation>
+ <annotation cp="🥸">Fes | Fes Wé Dẹm De Haid | Glásis | Haid | Noz</annotation>
+ <annotation cp="🥸" type="tts">Fes Wé Dẹm De Haid</annotation>
+ <annotation cp="🦣">Big | Ẹ́lẹ́fant Tit | Mámọt | Wul</annotation>
+ <annotation cp="🦣" type="tts">Mámọt</annotation>
+ <annotation cp="🦤">Big | Dódo</annotation>
+ <annotation cp="🦤" type="tts">Dódo</annotation>
+ <annotation cp="🦫">Bíva | Dam</annotation>
+ <annotation cp="🦫" type="tts">Bíva</annotation>
+ <annotation cp="🦬">Baison | Búfálo | Vízẹnt</annotation>
+ <annotation cp="🦬" type="tts">Baison</annotation>
+ <annotation cp="🦭">Si Láyọn | Siil</annotation>
+ <annotation cp="🦭" type="tts">Siil</annotation>
+ <annotation cp="🧋">Bọ́bul | Bọ́búl Tii | Mílik | Pẹal | Tii</annotation>
+ <annotation cp="🧋" type="tts">Bọ́búl Tii</annotation>
+ <annotation cp="🩴">Sándal | Slípas | Tọ́ng Slípas | Wọtasaíd Slípas</annotation>
+ <annotation cp="🩴" type="tts">Slípas</annotation>
+ <annotation cp="🪃">Búmárang</annotation>
+ <annotation cp="🪃" type="tts">Búmárang</annotation>
+ <annotation cp="🪄">Májik | Májík Stik | Wich | Wízad</annotation>
+ <annotation cp="🪄" type="tts">Májík Stik</annotation>
+ <annotation cp="🪅">Patí | Pinyáta | Sẹlibréshọn</annotation>
+ <annotation cp="🪅" type="tts">Pinyáta</annotation>
+ <annotation cp="🪆">Dọlbebí | Ínsaíd | Rọ́shia | Wọ́n Dọlbebí Ínsaíd Anọ́dá Dọlbebí</annotation>
+ <annotation cp="🪆" type="tts">Wọ́n Dọlbebí Ínsaíd Anọ́dá Dọlbebí</annotation>
+ <annotation cp="🪖">Ámi | Hẹ́lmẹt | Mílítri | Mílítrí Hẹ́lmẹt | Sója | Wọ́riọ</annotation>
+ <annotation cp="🪖" type="tts">Mílítrí Hẹ́lmẹt</annotation>
+ <annotation cp="🪗">Akọ́diọn | Kọnsẹtína | Skwíz Bọks</annotation>
+ <annotation cp="🪗" type="tts">Akọ́diọn</annotation>
+ <annotation cp="🪘">Bit | Drọm | Kónga | Lọ́ng Drọm | Rídim</annotation>
+ <annotation cp="🪘" type="tts">Lọ́ng Drọm</annotation>
+ <annotation cp="🪙">Gold | Kọin | Mẹ́tal | Mọní | Sílva | Trẹzhọ</annotation>
+ <annotation cp="🪙" type="tts">Kọin</annotation>
+ <annotation cp="🪚">Kápínta | Sọ | Tímba | Tul</annotation>
+ <annotation cp="🪚" type="tts">Kápínta Sọ</annotation>
+ <annotation cp="🪛">Skru | Skrúdraíva | Tul</annotation>
+ <annotation cp="🪛" type="tts">Skrúdraíva</annotation>
+ <annotation cp="🪜">Klaimb | Láda | Stẹp</annotation>
+ <annotation cp="🪜" type="tts">Láda</annotation>
+ <annotation cp="🪝">Huk | Kach | Kọv</annotation>
+ <annotation cp="🪝" type="tts">Huk</annotation>
+ <annotation cp="🪞">Mírọ</annotation>
+ <annotation cp="🪞" type="tts">Mírọ</annotation>
+ <annotation cp="🪟">Frem | Frẹ́sh Ea | Luk | Ópun | Wíndo</annotation>
+ <annotation cp="🪟" type="tts">Wíndo</annotation>
+ <annotation cp="🪠">Plọnj | Plúnja | Toílẹt | Wọ́tá Sístẹm</annotation>
+ <annotation cp="🪠" type="tts">Plúnja</annotation>
+ <annotation cp="🪡">Ẹ́mbroídiri | Nídul | Nídul Fọ Sóyín Klọt | Sóyin | Stich | Télọ</annotation>
+ <annotation cp="🪡" type="tts">Nídul Fọ Sóyín Klọt</annotation>
+ <annotation cp="🪢">Rop | Tai | Taí Nọt | Twain | Twist</annotation>
+ <annotation cp="🪢" type="tts">Taí Nọt</annotation>
+ <annotation cp="🪣">Bọ́kẹt | Pel</annotation>
+ <annotation cp="🪣" type="tts">Bọ́kẹt</annotation>
+ <annotation cp="🪤">Maus | Maús Trap | Rát Trap | Trap</annotation>
+ <annotation cp="🪤" type="tts">Rát Trap</annotation>
+ <annotation cp="🪥">Haijin | Klin | Tit | Tútbrọsh</annotation>
+ <annotation cp="🪥" type="tts">Tútbrọsh</annotation>
+ <annotation cp="🪦">Bẹrial Graund | Grévston | Sẹ́mẹ́tri</annotation>
+ <annotation cp="🪦" type="tts">Grévston</annotation>
+ <annotation cp="🪧">Dẹmọnstréshọn | Plákad | Protẹt | Sain</annotation>
+ <annotation cp="🪧" type="tts">Plákad</annotation>
+ <annotation cp="🪨">Bíg Rọk | Hẹ́vi | Rọk | Sọ́lid | Ston</annotation>
+ <annotation cp="🪨" type="tts">Rọk</annotation>
+ <annotation cp="🪰">Diziz | Dọtí | Flai | Mágọt</annotation>
+ <annotation cp="🪰" type="tts">Flai</annotation>
+ <annotation cp="🪱">Ẹ́twọm | Wọm</annotation>
+ <annotation cp="🪱" type="tts">Wọm</annotation>
+ <annotation cp="🪲">Bítul | Smọ́l Ínsẹkt</annotation>
+ <annotation cp="🪲" type="tts">Bítul</annotation>
+ <annotation cp="🪳">Ínsẹkt | Kókroch</annotation>
+ <annotation cp="🪳" type="tts">Kókroch</annotation>
+ <annotation cp="🪴">Gro | Haus | Plant | Plant Ínsaíd Pọt</annotation>
+ <annotation cp="🪴" type="tts">Plant Ínsaíd Pọt</annotation>
+ <annotation cp="🪵">Lọg | Plank | Tímba | Wud</annotation>
+ <annotation cp="🪵" type="tts">Wud</annotation>
+ <annotation cp="🪶">Bẹd | Fẹ́da | Lait</annotation>
+ <annotation cp="🪶" type="tts">Fẹ́da</annotation>
+ <annotation cp="🫀">As Pẹ́sin Hat Bì | Bit | Bọdí Pat | Dọ́ktọ | Hat</annotation>
+ <annotation cp="🫀" type="tts">As Pẹ́sin Hat Bì</annotation>
+ <annotation cp="🫁">Bọdí Pat | Brit | Brít Aut | Brít In | Lọngs</annotation>
+ <annotation cp="🫁" type="tts">Lọngs</annotation>
+ <annotation cp="🫂">Bai-bai | Hẹ́lo | Họg | Pípol Wé De Họ́g Ích Ọ́da | Tánk-Io</annotation>
+ <annotation cp="🫂" type="tts">Pípol Wé De Họ́g Ích Ọ́da</annotation>
+ <annotation cp="🫐">Bẹ́ri | Blu | Blúbẹ́ri-dẹm</annotation>
+ <annotation cp="🫐" type="tts">Blúbẹ́ri-dẹm</annotation>
+ <annotation cp="🫑">Bẹ́l Pẹ́pe | Pẹ́pe</annotation>
+ <annotation cp="🫑" type="tts">Bẹ́l Pẹ́pe</annotation>
+ <annotation cp="🫒">Fud | Óliv</annotation>
+ <annotation cp="🫒" type="tts">Óliv</annotation>
+ <annotation cp="🫓">Flátbrẹd | Píta</annotation>
+ <annotation cp="🫓" type="tts">Flátbrẹd</annotation>
+ <annotation cp="🫔">Mẹ́ksíko | Rap | Tamálẹ</annotation>
+ <annotation cp="🫔" type="tts">Tamálẹ</annotation>
+ <annotation cp="🫕">Chiz | Chọ́kọ́lét | Fọ́ndu | Mẹlt | Pọt | Swis</annotation>
+ <annotation cp="🫕" type="tts">Fọ́ndu</annotation>
+ <annotation cp="🫖">Drink | Pọt | Tii | Típọt</annotation>
+ <annotation cp="🫖" type="tts">Típọt</annotation>
+ <annotation cp="🛖">Haus | Họt | Raúnd Haus</annotation>
+ <annotation cp="🛖" type="tts">Họt</annotation>
+ <annotation cp="🛗">Ẹ́lívétọ | Lìft</annotation>
+ <annotation cp="🛗" type="tts">Lìft</annotation>
+ <annotation cp="🛻">Pík-ọp | Píkọ́p</annotation>
+ <annotation cp="🛻" type="tts">Píkọ́p</annotation>
+ <annotation cp="🛼">Róla | Rólá Sket | Sket</annotation>
+ <annotation cp="🛼" type="tts">Rólá Sket</annotation>
+ <annotation cp="😀">Bíg ai | Hápi | Laf | Láfín Fes | Ópún maut</annotation>
+ <annotation cp="😀" type="tts">Láfín Fes</annotation>
+ <annotation cp="😃">Bíg Ai-dẹm | Hápi | Láf | Láfín Fes Wé Gẹ́t Bíg Ai-dẹm | Maut</annotation>
+ <annotation cp="😃" type="tts">Láfín Fes Wé Gẹ́t Bíg Ai-dẹm</annotation>
+ <annotation cp="😄">Ai | Faín Fés | Hápi | Láfín Fés Wit Shaínín Ai | Maut</annotation>
+ <annotation cp="😄" type="tts">Láfín Fés Wit Shaínín Ai</annotation>
+ <annotation cp="😁">Ai | Bíg Laf Wit Wait Tit | Fes | Maut</annotation>
+ <annotation cp="😁" type="tts">Bíg Laf Wit Wait Tit</annotation>
+ <annotation cp="😆">Fes | Hápi | Laf | Láfín Fes Wit Klóz Ai | Maut</annotation>
+ <annotation cp="😆" type="tts">Láfín Fes Wit Klóz Ai</annotation>
+ <annotation cp="😅">Fes | Láfín Fes With Smọ́l Swẹt | Ópun | Swẹt</annotation>
+ <annotation cp="😅" type="tts">Láfín Fes With Smọ́l Swẹt</annotation>
+ <annotation cp="🤣">Bẹ́nd Hẹd Wọ́n Said De Laf | Hẹd | Laf | Said</annotation>
+ <annotation cp="🤣" type="tts">Bẹ́nd Hẹd Wọ́n Said De Laf</annotation>
+ <annotation cp="😂">Ai | Fes | Fes Wit Laf and Tias Fọ Ai | Laf | Tias</annotation>
+ <annotation cp="😂" type="tts">Fes Wit Laf and Tias Fọ Ai</annotation>
+ <annotation cp="🙂">Fes | Jẹ́ntul | Laf | Smail | Smaílín Fes Wit Jẹ́ntúl Ai</annotation>
+ <annotation cp="🙂" type="tts">Smaílín Fes Wit Jẹ́ntúl Ai</annotation>
+ <annotation cp="🙃">Fes | Klóz | Maut | Ọ́psaid-daún | Ọ́psaíd-daún Fes</annotation>
+ <annotation cp="🙃" type="tts">Ọ́psaíd-daún Fes</annotation>
+ <annotation cp="😉">Ai | Fes Wit Wọ́n Ai Kloz | Kloz | Ópun</annotation>
+ <annotation cp="😉" type="tts">Fes Wit Wọ́n Ai Kloz</annotation>
+ <annotation cp="😊">Ai | Fes | Laf | Smail | Smaílín Fes Wit Shaínín Ai</annotation>
+ <annotation cp="😊" type="tts">Smaílín Fes Wit Shaínín Ai</annotation>
+ <annotation cp="😇">Hed | Laf | Raund | Smail | Smaílín Fes With Raúnd Lait Fọ Hẹd</annotation>
+ <annotation cp="😇" type="tts">Smaílín Fes With Raúnd Lait Fọ Hẹd</annotation>
+ <annotation cp="🥰">Hat-dẹm | In Lọv | Smailín Fes Wit Trí Hat</annotation>
+ <annotation cp="🥰" type="tts">Smailín Fes Wit Trí Hat</annotation>
+ <annotation cp="😍">Ai | Fes | Laf | Lafín Fes Wit Hat-ai-dẹm | Lọv</annotation>
+ <annotation cp="😍" type="tts">Lafín Fes Wit Hat-ai-dẹm</annotation>
+ <annotation cp="🤩">Ai | Fes | Laf | Láfín Fes Wit Sta Fọ Ai | Sta</annotation>
+ <annotation cp="🤩" type="tts">Láfín Fes Wit Sta Fọ Ai</annotation>
+ <annotation cp="😘">Blo | Fes | Kis | Maut De Bló Kis</annotation>
+ <annotation cp="😘" type="tts">Maut De Bló Kis</annotation>
+ <annotation cp="😗">Fes | Kis | Kísín Fes</annotation>
+ <annotation cp="😗" type="tts">Kísín Fes</annotation>
+ <annotation cp="☺">Reláks | Smail | Smaílín Fes</annotation>
+ <annotation cp="☺" type="tts">Smaílín Fes</annotation>
+ <annotation cp="😚">Ai | Fes | Kis | Kísín Fes Wit Klóz Ai | Kloz</annotation>
+ <annotation cp="😚" type="tts">Kísín Fes Wit Klóz Ai</annotation>
+ <annotation cp="😙">Ai | Fes | Kis | Kísín Fes Wit Smaílín Ai | Kloz</annotation>
+ <annotation cp="😙" type="tts">Kísín Fes Wit Smaílín Ai</annotation>
+ <annotation cp="😋">Ẹnjọi | Fes Wé De Ẹnjọí Fud | Fúd | Smail | Test</annotation>
+ <annotation cp="😋" type="tts">Fes Wé De Ẹnjọí Fud</annotation>
+ <annotation cp="😛">Fes Wit Tọng | tong</annotation>
+ <annotation cp="😛" type="tts">Fes Wit Tọng</annotation>
+ <annotation cp="😜">Ai | Fes | Fés De Klóz & Ópún Wọ́n Ai | Plè plé | Tọng</annotation>
+ <annotation cp="😜" type="tts">Fés De Klóz & Ópún Wọ́n Ai</annotation>
+ <annotation cp="🤪">Bíg Ai | Fes De Mék Pẹ́sin Laf | Fúlish | Tọng</annotation>
+ <annotation cp="🤪" type="tts">Fes De Mék Pẹ́sin Laf</annotation>
+ <annotation cp="😝">Ai | Fes | Fes Klóz Ai Smọl De Luk | Họ́ríbul | Tọng</annotation>
+ <annotation cp="😝" type="tts">Fes Klóz Ai Smọl De Luk</annotation>
+ <annotation cp="🤑">Fes | Mọní | Mọní-Maút Fes | Tọng</annotation>
+ <annotation cp="🤑" type="tts">Mọní-Maút Fes</annotation>
+ <annotation cp="🤗">Fes | Hand | Hand De Họ́l Fes | Hol</annotation>
+ <annotation cp="🤗" type="tts">Hand De Họ́l Fes</annotation>
+ <annotation cp="🤭">Fes | Fes Wit Hand Fọ Maut | Maut</annotation>
+ <annotation cp="🤭" type="tts">Fes Wit Hand Fọ Maut</annotation>
+ <annotation cp="🤫">Fes Pút Fínga Fọ Maut De Mék Shhhh | Kwáyẹt | Shhhh | Shọ́t Ọp</annotation>
+ <annotation cp="🤫" type="tts">Fes Pút Fínga Fọ Maut De Mék Shhhh</annotation>
+ <annotation cp="🤔">Fes De Tink | Tink</annotation>
+ <annotation cp="🤔" type="tts">Fes De Tink</annotation>
+ <annotation cp="🤐">Fes | Maut | Zip | Zíp-Maut Fes</annotation>
+ <annotation cp="🤐" type="tts">Zíp-Maut Fes</annotation>
+ <annotation cp="🤨">Aíbrau | Fes | Fes Réz Ọ́p Aíbrau | Gẹ́t Tú Maind | Rez</annotation>
+ <annotation cp="🤨" type="tts">Fes Réz Ọ́p Aíbrau</annotation>
+ <annotation cp="😐">Fes | Plen | Plén Fes</annotation>
+ <annotation cp="😐" type="tts">Plén Fes</annotation>
+ <annotation cp="😑">Ẹ́mptí Fes | Fes Nọ́ Shó Ẹ́nítin Wé Dé Hápún To Am | Hápun | Plen</annotation>
+ <annotation cp="😑" type="tts">Fes Nọ́ Shó Ẹ́nítin Wé Dé Hápún To Am</annotation>
+ <annotation cp="😶">Fes | Fes Wé Nọ́ Gẹ́t Maut | Kwáyẹt | Maut</annotation>
+ <annotation cp="😶" type="tts">Fes Wé Nọ́ Gẹ́t Maut</annotation>
+ <annotation cp="😏">Bẹn Bẹ́n | Fes | Fes Wit Bẹn Bẹ́n Smail | Smail</annotation>
+ <annotation cp="😏" type="tts">Fes Wit Bẹn Bẹ́n Smail</annotation>
+ <annotation cp="😒">Fes Wé Nọ́ Dé Hapí | Nọ́ Hapí | Skwíz Fes | Vẹks</annotation>
+ <annotation cp="😒" type="tts">Fes Wé Nọ́ Dé Hapí</annotation>
+ <annotation cp="🙄">Ai | Fes | Fes De Tọ́n Im Ai-dẹm | Tọn</annotation>
+ <annotation cp="🙄" type="tts">Fes De Tọ́n Im Ai-dẹm</annotation>
+ <annotation cp="😬">Fes | Ọ́gli | Ọ́glí Fes Wé Sọ́mtin De Pén Am | Pen</annotation>
+ <annotation cp="😬" type="tts">Ọ́glí Fes Wé Sọ́mtin De Pén Am</annotation>
+ <annotation cp="🤥">Fes | Lai | Lai-laí Fes</annotation>
+ <annotation cp="🤥" type="tts">Lai-laí Fes</annotation>
+ <annotation cp="😌">Fes | Fes Wé Riláks Wẹ́l Wẹl | Rilaks</annotation>
+ <annotation cp="😌" type="tts">Fes Wé Riláks Wẹ́l Wẹl</annotation>
+ <annotation cp="😔">Dip | Fes | Fes Wé Dé Tínk Díp Dip | Tink</annotation>
+ <annotation cp="😔" type="tts">Fes Wé Dé Tínk Díp Dip</annotation>
+ <annotation cp="😪">Fes | Slip | Slip-slip Fes</annotation>
+ <annotation cp="😪" type="tts">Slip-slip Fes</annotation>
+ <annotation cp="🤤">Fes | Fes Wé Salaíva De Kọmọ́t Fọ Maut | Maut | Saláiva</annotation>
+ <annotation cp="🤤" type="tts">Fes Wé Salaíva De Kọmọ́t Fọ Maut</annotation>
+ <annotation cp="😴">Fes | Fes Wé De Slip | Slip</annotation>
+ <annotation cp="😴" type="tts">Fes Wé De Slip</annotation>
+ <annotation cp="😷">Dọ́kto | Fes | Fes Wé Wía Họ́spítál Mask | Họ́spítal | Mask | Wia</annotation>
+ <annotation cp="😷" type="tts">Fes Wé Wía Họ́spítál Mask</annotation>
+ <annotation cp="🤒">Fes | Fes Wit Tamómẹ́ta | Síknẹs | Tamómẹ́ta</annotation>
+ <annotation cp="🤒" type="tts">Fes Wit Tamómẹ́ta</annotation>
+ <annotation cp="🤕">Bándej | Fes | Fés Wit Bándej | Wund</annotation>
+ <annotation cp="🤕" type="tts">Fés Wit Bándej</annotation>
+ <annotation cp="🤢">Fes | Vọmit | Wán | Wé</annotation>
+ <annotation cp="🤢" type="tts">Fes Wé Wán Vọmit</annotation>
+ <annotation cp="🤮">Fes | Fes Wé De Vọmit | Síknẹs | Vọmit</annotation>
+ <annotation cp="🤮" type="tts">Fes Wé De Vọmit</annotation>
+ <annotation cp="🤧">Fes | Fes Wé De Sniz | Sniz</annotation>
+ <annotation cp="🤧" type="tts">Fes Wé De Sniz</annotation>
+ <annotation cp="🥵">Fes | Fíva | Họt | Họ́t Fes | Swẹt</annotation>
+ <annotation cp="🥵" type="tts">Họ́t Fes</annotation>
+ <annotation cp="🥶">Fes | Fes Wé Kold De Kach | Kold</annotation>
+ <annotation cp="🥶" type="tts">Fes Wé Kold De Kach</annotation>
+ <annotation cp="🥴">Buuz | Dízí Fes | Drink | Zíg Zág Maut</annotation>
+ <annotation cp="🥴" type="tts">Dízí Fes</annotation>
+ <annotation cp="😵">Fent | Fes | Fes Wé Wán Fent</annotation>
+ <annotation cp="😵" type="tts">Fes Wé Wán Fent</annotation>
+ <annotation cp="🤯">Hẹd | Hẹd Wé Wán Skáta | Shọk | Skáta</annotation>
+ <annotation cp="🤯" type="tts">Hẹd Wé Wán Skáta</annotation>
+ <annotation cp="🤠">Hat | Kaúbọi | Kaúbọi Hát Fes | Kaúgẹl</annotation>
+ <annotation cp="🤠" type="tts">Kaúbọi Hát Fes</annotation>
+ <annotation cp="🥳">Ẹnjọímẹnt | Fes | Fes Wé Dé Fọ Patí | Kap | Patí</annotation>
+ <annotation cp="🥳" type="tts">Fes Wé Dé Fọ Patí</annotation>
+ <annotation cp="😎">Fes | Smail | Smaílín Fes Wé Wiá Sọ́nglásis | Sọn | Sọ́nglásis</annotation>
+ <annotation cp="😎" type="tts">Smaílín Fes Wé Wiá Sọ́nglásis</annotation>
+ <annotation cp="🤓">Ẹ́spat | Fes | Glásis | Tẹ́kíníkál Ẹ́spat Fes</annotation>
+ <annotation cp="🤓" type="tts">Tẹ́kíníkál Ẹ́spat Fes</annotation>
+ <annotation cp="🧐">Aíglas | Fes | Fes Wit Wọ́n Ai Aíglas</annotation>
+ <annotation cp="🧐" type="tts">Fes Wit Wọ́n Ai Aíglas</annotation>
+ <annotation cp="😕">Du | Fes | Fes Wé Nọ́ Nó Wétín I Go Du | Wétin</annotation>
+ <annotation cp="😕" type="tts">Fes Wé Nọ́ Nó Wétín I Go Du</annotation>
+ <annotation cp="😟">Fes | Fes Wé Sọ́mtin De Wọ́ri | Wọ́ri</annotation>
+ <annotation cp="😟" type="tts">Fes Wé Sọ́mtin De Wọ́ri</annotation>
+ <annotation cp="🙁">Fes | Fes Wé De Fraún Smọ́l Smọl | Fraun</annotation>
+ <annotation cp="🙁" type="tts">Fes Wé De Fraún Smọ́l Smọl</annotation>
+ <annotation cp="☹">Fes | Fes Wé De Fraun | Fraun</annotation>
+ <annotation cp="☹" type="tts">Fes Wé De Fraun</annotation>
+ <annotation cp="😮">Fes | Fes Wé Gẹt Ópún Maut | Maut | Ópun</annotation>
+ <annotation cp="😮" type="tts">Fes Wé Gẹt Ópún Maut</annotation>
+ <annotation cp="😯">Fes | Fes Wé Dé Kwáyẹt | Kwáyẹt | Sọpraiz</annotation>
+ <annotation cp="😯" type="tts">Fes Wé Dé Kwáyẹt</annotation>
+ <annotation cp="😲">Fes | Fes Wé Sọpraiz Fúl Am | Ópún Maut | Shọk | Sọpraíz</annotation>
+ <annotation cp="😲" type="tts">Fes Wé Sọpraiz Fúl Am</annotation>
+ <annotation cp="😳">Fes | Fes Wé Shem De Kach | Shem</annotation>
+ <annotation cp="😳" type="tts">Fes Wé Shem De Kach</annotation>
+ <annotation cp="🥺">Abẹg | Ai | Bẹg | Fes Wé De Bẹ́g Fọ Sọ́mtin | Píti</annotation>
+ <annotation cp="🥺" type="tts">Fes Wé De Bẹ́g Fọ Sọ́mtin</annotation>
+ <annotation cp="😦">Fes | Fes Wé De Fraún Wit Ópún Maut | Pen</annotation>
+ <annotation cp="😦" type="tts">Fes Wé De Fraún Wit Ópún Maut</annotation>
+ <annotation cp="😧">Fes | Fes Wé Fia Hol | Fia | Hol</annotation>
+ <annotation cp="😧" type="tts">Fes Wé Fia Hol</annotation>
+ <annotation cp="😨">Fes | Fes Wé De Wọ́ri An Swẹt | Swẹt | Wọ́ri</annotation>
+ <annotation cp="😨" type="tts">Fes Wé De Wọ́ri An Swẹt</annotation>
+ <annotation cp="😰">Fes | Fes Wé Dọ́n Stọ́p To Wọ́ri | Stọp | Wọ́ri</annotation>
+ <annotation cp="😰" type="tts">Fes Wé Dọ́n Stọ́p To Wọ́ri</annotation>
+ <annotation cp="😥">Fes | Krai | Krai Kraí Fes | Nọ́ Dé Hapí | Tias</annotation>
+ <annotation cp="😥" type="tts">Krai Kraí Fes</annotation>
+ <annotation cp="😢">Fes | Fes Wé De Krai | Krai | Laud | Tis</annotation>
+ <annotation cp="😢" type="tts">Fes Wé De Krai</annotation>
+ <annotation cp="😭">Fes | Krai | Laud | Laúd Krai Kraí Fes | Tis</annotation>
+ <annotation cp="😭" type="tts">Laúd Krai Kraí Fes</annotation>
+ <annotation cp="😱">Fes | Fes Wé Fia Mék Am Shaút Laúd Laud | Fia | Shaut</annotation>
+ <annotation cp="😱" type="tts">Fes Wé Fia Mék Am Shaút Laúd Laud</annotation>
+ <annotation cp="😖">Du | Fes | Fes Wé Nọ́ Sabí Wétín I Go Du | No | Wétin</annotation>
+ <annotation cp="😖" type="tts">Fes Wé Nọ́ Sabí Wétín I Go Du</annotation>
+ <annotation cp="😣">Fes | Fes Wé Nọ́ De Táya | Táya</annotation>
+ <annotation cp="😣" type="tts">Fes Wé Nọ́ De Táya</annotation>
+ <annotation cp="😞">Disapoint | Fes | Fes Wé Dẹm Dọ́n Disapọint</annotation>
+ <annotation cp="😞" type="tts">Fes Wé Dẹm Dọ́n Disapọint</annotation>
+ <annotation cp="😓">Fes | Fes Wé De Swẹt An Nọ́ Dé Hapí Sám Sám | Nọ́ Dé Hapí | Swẹt</annotation>
+ <annotation cp="😓" type="tts">Fes Wé De Swẹt An Nọ́ Dé Hapí Sám Sám</annotation>
+ <annotation cp="😩">Fes | Fes Wé Dọ́n Táyá Wẹ́l Wẹl | Táya</annotation>
+ <annotation cp="😩" type="tts">Fes Wé Dọ́n Táyá Wẹ́l Wẹl</annotation>
+ <annotation cp="😫">Fes | Fes Wé Dọ́n Táya | Táya</annotation>
+ <annotation cp="😫" type="tts">Fes Wé Dọ́n Táya</annotation>
+ <annotation cp="🥱">Fes | Fes Wé De Yọn | Yọn</annotation>
+ <annotation cp="🥱" type="tts">Fes Wé De Yọn</annotation>
+ <annotation cp="😤">Chámpiọn | Fes | Fes Wé Smok De Kọmọ́t Fọ Im Noz | Smok | Win</annotation>
+ <annotation cp="😤" type="tts">Fes Wé Smok De Kọmọ́t Fọ Im Noz</annotation>
+ <annotation cp="😡">Fes | Fes Wé De Vẹ́ks Bád Bad | Vẹks</annotation>
+ <annotation cp="😡" type="tts">Fes Wé De Vẹ́ks Bád Bad</annotation>
+ <annotation cp="😠">Fes | Fes Wé De Vẹ́ks | Vẹks</annotation>
+ <annotation cp="😠" type="tts">Fes Wé De Vẹ́ks</annotation>
+ <annotation cp="🤬">Fes | Fes Wit Símbul Fọ Maut | Maut | Símbul | Swia</annotation>
+ <annotation cp="🤬" type="tts">Fes Wit Símbul Fọ Maut</annotation>
+ <annotation cp="😈">Fes | Họn-dem | Smail | Smaílín Fes Wit Tú Họn</annotation>
+ <annotation cp="😈" type="tts">Smaílín Fes Wit Tú Họn</annotation>
+ <annotation cp="👿">Bád Spírit | Dẹ́vul | Fes Wé De Vẹks An Gẹt Tú Họn | Họn | Vẹks</annotation>
+ <annotation cp="👿" type="tts">Fes Wé De Vẹks An Gẹt Tú Họn</annotation>
+ <annotation cp="💀">Bon | Bon Bón Pát Ọf Hẹd | Dai | Fes | Hẹd | Skọl</annotation>
+ <annotation cp="💀" type="tts">Bon Bón Pát Ọf Hẹd</annotation>
+ <annotation cp="☠">Bon | Bon Bón Pát Ọf Hẹd Wit Tú Krọ́s Bon-dẹm | Dai | Fes | Krọ́s Bon-dẹm | Skọl</annotation>
+ <annotation cp="☠" type="tts">Bon Bón Pát Ọf Hẹd Wit Tú Krọ́s Bon-dẹm</annotation>
+ <annotation cp="💩">Big | Bíg Shit | Fes | Shit</annotation>
+ <annotation cp="💩" type="tts">Bíg Shit</annotation>
+ <annotation cp="🤡">Fes | Klaun | Klaun Im Fes</annotation>
+ <annotation cp="🤡" type="tts">Klaun Im Fes</annotation>
+ <annotation cp="👹">Bád Ánímọl | Fes | Ọ́glí | Ọ́glí Wíkẹ́d Fes | Wíkẹd</annotation>
+ <annotation cp="👹" type="tts">Ọ́glí Wíkẹ́d Fes</annotation>
+ <annotation cp="👺">Bád Spírit | Fes | Wíkẹd | Wíkẹ́d Bád Spírit</annotation>
+ <annotation cp="👺" type="tts">Wíkẹ́d Bád Spírit</annotation>
+ <annotation cp="👻">Fes | Gost</annotation>
+ <annotation cp="👻" type="tts">Gost</annotation>
+ <annotation cp="👽">Fes | Kríchọ | Kríchọ Frọm Anọ́dá Wọld | UFO | Wọld</annotation>
+ <annotation cp="👽" type="tts">Kríchọ Frọm Anọ́dá Wọld</annotation>
+ <annotation cp="👾">Fes | Kríchọ | UFO | Wíkẹ́d | Wíkẹ́d Kríchọ Frọm Anọ́dá Wọld | Wọld</annotation>
+ <annotation cp="👾" type="tts">Wíkẹ́d Kríchọ Frọm Anọ́dá Wọld</annotation>
+ <annotation cp="🤖">Fes | Mashín | Mashin Wé Rizẹ́mbúl Húmánbin | Rọ́bọt</annotation>
+ <annotation cp="🤖" type="tts">Mashin Wé Rizẹ́mbúl Húmánbin</annotation>
+ <annotation cp="😺">Fes | Kat | Kat Wé De Laf | Maut | Ópun</annotation>
+ <annotation cp="😺" type="tts">Kat Wé De Laf</annotation>
+ <annotation cp="😸">Ai | Fes | Kat | Laf | Láfín Kat Wit Smaílín Ai | Smail</annotation>
+ <annotation cp="😸" type="tts">Láfín Kat Wit Smaílín Ai</annotation>
+ <annotation cp="😹">Fes | Hápi | Kat | Laf | Láfín Kat Wit Tias Fọ Ai | Tias</annotation>
+ <annotation cp="😹" type="tts">Láfín Kat Wit Tias Fọ Ai</annotation>
+ <annotation cp="😻">Ai | Hat | Kat | Laf | Láfín Kat Wit Hát-Ai-dẹm | Lọv</annotation>
+ <annotation cp="😻" type="tts">Láfín Kat Wit Hát-Ai-dẹm</annotation>
+ <annotation cp="😼">Fes | Kat | Kat Wit Krúkẹ́d Smail Fọ Fes | Krúkẹd | Smail</annotation>
+ <annotation cp="😼" type="tts">Kat Wit Krúkẹ́d Smail Fọ Fes</annotation>
+ <annotation cp="😽">Ai | Fes | Kat | Kis | Kísín Kat</annotation>
+ <annotation cp="😽" type="tts">Kísín Kat</annotation>
+ <annotation cp="🙀">Fes | Kat Wé Dọ́n Táya | Ópún Maut | Táya</annotation>
+ <annotation cp="🙀" type="tts">Kat Wé Dọ́n Táya</annotation>
+ <annotation cp="😿">Fes | Kat | Krai | Krai Kraí Kat | Nọ́ Dé Hápí | Tias</annotation>
+ <annotation cp="😿" type="tts">Krai Kraí Kat</annotation>
+ <annotation cp="😾">Fes | Kat | Kat Wé Nọ́ Dé Hapí | Nọ́ Dé Hapí</annotation>
+ <annotation cp="😾" type="tts">Kat Wé Nọ́ Dé Hapí</annotation>
+ <annotation cp="🙈">Bád Tin | Fes | Mọnkí | Mọnkí Wé Nọ́ Wán Sí Bád Tin | Si</annotation>
+ <annotation cp="🙈" type="tts">Mọnkí Wé Nọ́ Wán Sí Bád Tin</annotation>
+ <annotation cp="🙉">Bád Tin | Fes | Hia | Mọnkí | Mọnkí Wé Nọ́ Wán Hiá Bád Tin</annotation>
+ <annotation cp="🙉" type="tts">Mọnkí Wé Nọ́ Wán Hiá Bád Tin</annotation>
+ <annotation cp="🙊">Bád Tin | Fes | Mọnkí | Mọnkí Wé Nọ́ Wán Tọ́k Bád Tin | Tọk</annotation>
+ <annotation cp="🙊" type="tts">Mọnkí Wé Nọ́ Wán Tọ́k Bád Tin</annotation>
+ <annotation cp="💋">Kis | Kis Mak | Maut</annotation>
+ <annotation cp="💋" type="tts">Kis Mak</annotation>
+ <annotation cp="💌">Hat | I-Mel | Lẹ́ta | Lọv | Lọ́v Lẹ́ta</annotation>
+ <annotation cp="💌" type="tts">Lọ́v Lẹ́ta</annotation>
+ <annotation cp="💘">Áro | Chuk | Hat | Hat Wé Áro Dọ́n Chuk</annotation>
+ <annotation cp="💘" type="tts">Hat Wé Áro Dọ́n Chuk</annotation>
+ <annotation cp="💝">Hat | Hat Wé Dẹm Taí Ríbọn | Ríbọn | Tai | Valẹ́ntaín Dè</annotation>
+ <annotation cp="💝" type="tts">Hat Wé Dẹm Taí Ríbọn</annotation>
+ <annotation cp="💖">Hapí Wẹ́l Wẹl | Hat Wé De Spákul | Spákul | Swit Bẹlẹ́</annotation>
+ <annotation cp="💖" type="tts">Hat Wé De Spákul</annotation>
+ <annotation cp="💗">Gro | Hapí Wẹ́l Wẹl | Hat Wé De Gro Bíkọs I Dé Hapí</annotation>
+ <annotation cp="💗" type="tts">Hat Wé De Gro Bíkọs I Dé Hapí</annotation>
+ <annotation cp="💓">Bit | Hat | Hat Wé De Bit | Hátbit</annotation>
+ <annotation cp="💓" type="tts">Hat Wé De Bit</annotation>
+ <annotation cp="💞">Hat-dẹm Wé De Tọ́n Raúnd An Raund | Raund | Tọn</annotation>
+ <annotation cp="💞" type="tts">Hat-dẹm Wé De Tọ́n Raúnd An Raund</annotation>
+ <annotation cp="💕">Lọv | Tú Hat</annotation>
+ <annotation cp="💕" type="tts">Tú Hat</annotation>
+ <annotation cp="💟">Fain | Hat | Hat Wé Dẹm Mék Am Mék I Lúk Fain | Luk</annotation>
+ <annotation cp="💟" type="tts">Hat Wé Dẹm Mék Am Mék I Lúk Fain</annotation>
+ <annotation cp="❣">Ẹsklaméshọn | Hat | Hat Wé Dẹm Ték Mék Ẹsklaméshọ́n Mak | Pọnchuéshọn Mak</annotation>
+ <annotation cp="❣" type="tts">Hat Wé Dẹm Ték Mék Ẹsklaméshọ́n Mak</annotation>
+ <annotation cp="💔">Brẹk | Hat | Hat Wé Dẹm Dọ́n Brẹk</annotation>
+ <annotation cp="💔" type="tts">Hat Wé Dẹm Dọ́n Brẹk</annotation>
+ <annotation cp="❤">Hat | Rẹ́d Hat</annotation>
+ <annotation cp="❤" type="tts">Rẹ́d Hat</annotation>
+ <annotation cp="🧡">Hat | Kọ́lọ | Ọ́renj | Ọ́rénj Kọ́lọ Hat</annotation>
+ <annotation cp="🧡" type="tts">Ọ́rénj Kọ́lọ Hat</annotation>
+ <annotation cp="💛">Hat | Yẹ́ló</annotation>
+ <annotation cp="💛" type="tts">Yẹ́ló Hat</annotation>
+ <annotation cp="💚">Grin | Grín Hat | Hat</annotation>
+ <annotation cp="💚" type="tts">Grín Hat</annotation>
+ <annotation cp="💙">Blu | Blú Hat | Hat</annotation>
+ <annotation cp="💙" type="tts">Blú Hat</annotation>
+ <annotation cp="💜">Hat | Kọ́lọ | Pọ́pul</annotation>
+ <annotation cp="💜" type="tts">Pọ́pul Kọ́lọ Hat</annotation>
+ <annotation cp="🤎">Braun | Braún Hat | Hat</annotation>
+ <annotation cp="🤎" type="tts">Braún Hat</annotation>
+ <annotation cp="🖤">Blak | Blák Hat | Hat</annotation>
+ <annotation cp="🖤" type="tts">Blák Hat</annotation>
+ <annotation cp="🤍">Hat | Wait | Waít Hat</annotation>
+ <annotation cp="🤍" type="tts">Waít Hat</annotation>
+ <annotation cp="💯">100 | Họ́ndrẹd | Pọint | Skọ | Skọ Wé Bi Wọ́n Họ́ndrẹ́d Pọínt | Wọn</annotation>
+ <annotation cp="💯" type="tts">Skọ Wé Bi Wọ́n Họ́ndrẹ́d Pọínt</annotation>
+ <annotation cp="💢">Símbul | Vẹks | Vẹ́ks Símbul</annotation>
+ <annotation cp="💢" type="tts">Vẹ́ks Símbul</annotation>
+ <annotation cp="💥">Ásídẹnt | Jam</annotation>
+ <annotation cp="💥" type="tts">Jam</annotation>
+ <annotation cp="💫">Ai | Fent | Fọ Ai To Tọ́n Pẹ́sin An Mék Am Wán Fent | Pẹ́sin | Tọn</annotation>
+ <annotation cp="💫" type="tts">Fọ Ai To Tọ́n Pẹ́sin An Mék Am Wán Fent</annotation>
+ <annotation cp="💦">Drọp | Plè Plé | Sọm | Sọm Drọ́p Ọf Swẹt | Swẹt</annotation>
+ <annotation cp="💦" type="tts">Sọm Drọ́p Ọf Swẹt</annotation>
+ <annotation cp="💨">Jok | Plè Plé | Rọn | Spid | To Ték Spid Rọn</annotation>
+ <annotation cp="💨" type="tts">To Ték Spid Rọn</annotation>
+ <annotation cp="🕳">Hol</annotation>
+ <annotation cp="🕳" type="tts">Hol</annotation>
+ <annotation cp="💣">Bọmb | Jok | Plè Plé</annotation>
+ <annotation cp="💣" type="tts">Bọmb</annotation>
+ <annotation cp="💬">Blonbló | Mẹ́sej | Mẹ́séj Blonbló Píkchọ | Píkchọ | Tọk</annotation>
+ <annotation cp="💬" type="tts">Mẹ́séj Blonbló Píkchọ</annotation>
+ <annotation cp="👁🗨">Ai | Ai Fọ Ínsaid Mẹ́séj Blonbló Píkchọ | Blonbló | Ínsaid | Píkchọ</annotation>
+ <annotation cp="👁🗨" type="tts">Ai Fọ Ínsaid Mẹ́séj Blonbló Píkchọ</annotation>
+ <annotation cp="🗨">Blonbló | Hand | Lẹ́ft | Lẹ́ft Hánd Saíd Mẹ́séj Blonbló Píkchọ | Píkchọ | Said</annotation>
+ <annotation cp="🗨" type="tts">Lẹ́ft Hánd Saíd Mẹ́séj Blonbló Píkchọ</annotation>
+ <annotation cp="🗯">Blonbló | Píkchọt | Rait | Raít Hánd Saíd Vẹks Blonbló Píkchọ | Said | Vẹks</annotation>
+ <annotation cp="🗯" type="tts">Raít Hánd Saíd Vẹks Blonbló Píkchọ</annotation>
+ <annotation cp="💭">Blonbló | Blonbló Píkchọ Abaut Tínkin | Píkchọ | Tink</annotation>
+ <annotation cp="💭" type="tts">Blonbló Píkchọ Abaut Tínkin</annotation>
+ <annotation cp="💤">Slip | Zzz</annotation>
+ <annotation cp="💤" type="tts">Zzz</annotation>
+ <annotation cp="👋">Hand | Hand Wé De Wev | Wev</annotation>
+ <annotation cp="👋" type="tts">Hand Wé De Wev</annotation>
+ <annotation cp="🤚">Bak | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="🤚" type="tts">Hand Im Bak Wé Dẹm Réz Ọp</annotation>
+ <annotation cp="🖐">Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Sprẹd</annotation>
+ <annotation cp="🖐" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm</annotation>
+ <annotation cp="✋">Hand | Hand Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="✋" type="tts">Hand Wé Dẹm Réz Ọp</annotation>
+ <annotation cp="🖖">Fínga | Hand | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖" type="tts">Vọ́lkán Salut</annotation>
+ <annotation cp="👌">Hand | OK</annotation>
+ <annotation cp="👌" type="tts">OK Hand</annotation>
+ <annotation cp="🤏">Hand | Hand Wé De Pinch | Pinch</annotation>
+ <annotation cp="🤏" type="tts">Hand Wé De Pinch</annotation>
+ <annotation cp="✌">Hand | Wíktri | Win</annotation>
+ <annotation cp="✌" type="tts">Wíktri Hand</annotation>
+ <annotation cp="🤞">Fínga | Hand | Krọs | Krọ́s Fínga-dẹm</annotation>
+ <annotation cp="🤞" type="tts">Krọ́s Fínga-dẹm</annotation>
+ <annotation cp="🤟">A Lọ́v Yu Sain | ALY | Hand | Lọv | Sain</annotation>
+ <annotation cp="🤟" type="tts">A Lọ́v Yu Sain</annotation>
+ <annotation cp="🤘">Fínga | Hand | Họ́n | Sain</annotation>
+ <annotation cp="🤘" type="tts">Họ́n Sain</annotation>
+ <annotation cp="🤙">Fon | Hand | Mék Yu Fón Mí Hand</annotation>
+ <annotation cp="🤙" type="tts">Mék Yu Fón Mí Hand</annotation>
+ <annotation cp="👈">Bakhand | Fínga | Fínga De Pọínt Lẹft | Hand | Lẹft | Tọmb</annotation>
+ <annotation cp="👈" type="tts">Fínga De Pọínt Lẹft</annotation>
+ <annotation cp="👉">Bakhand | Fínga | Fínga De Pọínt Rait | Hand | Rait | Tọmb</annotation>
+ <annotation cp="👉" type="tts">Fínga De Pọínt Rait</annotation>
+ <annotation cp="👆">Bakhand | Fínga | Fínga De Pọínt Ọp | Hand | Ọp | Tọmb</annotation>
+ <annotation cp="👆" type="tts">Fínga De Pọínt Ọp</annotation>
+ <annotation cp="🖕">Fínga | Hand | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕" type="tts">Mídúl Fínga</annotation>
+ <annotation cp="👇">Bakhand | Daun | Fínga | Fínga De Pọínt Daun | Hand | Tọmb</annotation>
+ <annotation cp="👇" type="tts">Fínga De Pọínt Daun</annotation>
+ <annotation cp="☝">Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp</annotation>
+ <annotation cp="👍">Hand | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍" type="tts">Tọ́mbs Ọp</annotation>
+ <annotation cp="👎">Daun | Hand | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎" type="tts">Tọ́mbs Daun</annotation>
+ <annotation cp="✊">Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Ọp | Rez</annotation>
+ <annotation cp="✊" type="tts">Dẹm Réz Klóz Hand Ọp</annotation>
+ <annotation cp="👊">Blo | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Pẹ́sin</annotation>
+ <annotation cp="👊" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo</annotation>
+ <annotation cp="🤛">Fes | Hand | Klós Hand Wé De Fés Lẹft | Lẹft | Lẹ́ft Said</annotation>
+ <annotation cp="🤛" type="tts">Klós Hand Wé De Fés Lẹft</annotation>
+ <annotation cp="🤜">Fes | Hand | Klós Hand Wé De Fés Rait | Rait | Raít Said</annotation>
+ <annotation cp="🤜" type="tts">Klós Hand Wé De Fés Rait</annotation>
+ <annotation cp="👏">Hand | Hand-dẹm Wé De Klap | Klap</annotation>
+ <annotation cp="👏" type="tts">Hand-dẹm Wé De Klap</annotation>
+ <annotation cp="🙌">Hand | Hand-dẹm Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="🙌" type="tts">Hand-dẹm Wé Dẹm Réz Ọp</annotation>
+ <annotation cp="👐">Hand | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐" type="tts">Ópún Hand-dẹm</annotation>
+ <annotation cp="🤲">Hand | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da</annotation>
+ <annotation cp="🤝">Agrímẹnt | Hand | Hándshek | Mítin | Shek</annotation>
+ <annotation cp="🤝" type="tts">Hándshek</annotation>
+ <annotation cp="🙏">Abẹg | Hand | Hand-dẹm Wé Dẹm Fold | Prè</annotation>
+ <annotation cp="🙏" type="tts">Hand-dẹm Wé Dẹm Fold</annotation>
+ <annotation cp="✍">Hand | Hand Wé De Raít Sọ́mtin | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍" type="tts">Hand Wé De Raít Sọ́mtin</annotation>
+ <annotation cp="💅">Kọsmẹ́tiks | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅" type="tts">Nél Pọ́lish</annotation>
+ <annotation cp="🤳">Fon | Kámẹ́ra | Sẹ́lfi</annotation>
+ <annotation cp="🤳" type="tts">Sẹ́lfi</annotation>
+ <annotation cp="💪">Bẹnd | Hand | Hánd Mọ́zul Wé Bẹnd | Mọ́zul</annotation>
+ <annotation cp="💪" type="tts">Hánd Mọ́zul Wé Bẹnd</annotation>
+ <annotation cp="🦾">Atífíshal | Atífíshál Hand | Hand</annotation>
+ <annotation cp="🦾" type="tts">Atífíshál Hand</annotation>
+ <annotation cp="🦿">Atífíshal | Atífíshál Lẹg | Lẹg</annotation>
+ <annotation cp="🦿" type="tts">Atífíshál Lẹg</annotation>
+ <annotation cp="🦵">Kik | Lẹg</annotation>
+ <annotation cp="🦵" type="tts">Lẹg</annotation>
+ <annotation cp="🦶">Daunlẹg | Kik</annotation>
+ <annotation cp="🦶" type="tts">Daunlẹg</annotation>
+ <annotation cp="👂">Bọdí Pat | Hia | Ia</annotation>
+ <annotation cp="👂" type="tts">Ia</annotation>
+ <annotation cp="🦻">Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Pẹ́sin</annotation>
+ <annotation cp="🦻" type="tts">Ia Wit Iá Hẹ́lẹp</annotation>
+ <annotation cp="👃">Bọdí Pat | Noz</annotation>
+ <annotation cp="👃" type="tts">Noz</annotation>
+ <annotation cp="🧠">Breb | Bren | Sẹns | Waiz</annotation>
+ <annotation cp="🧠" type="tts">Bren</annotation>
+ <annotation cp="🦷">Dẹ́ntist | Tit | Tít Dọ́ktọ</annotation>
+ <annotation cp="🦷" type="tts">Tit</annotation>
+ <annotation cp="🦴">Bon | Skẹ́lẹ́tin</annotation>
+ <annotation cp="🦴" type="tts">Bon</annotation>
+ <annotation cp="👀">Ai | Ai-dẹm | Ais | Fes</annotation>
+ <annotation cp="👀" type="tts">Ai-dẹm</annotation>
+ <annotation cp="👁">Ai | Bọdí Pat</annotation>
+ <annotation cp="👁" type="tts">Ai</annotation>
+ <annotation cp="👅">Bọdí Pat | Tọng</annotation>
+ <annotation cp="👅" type="tts">Tọng</annotation>
+ <annotation cp="👄">Bọdí Pat | Lip | Maut | Tọng</annotation>
+ <annotation cp="👄" type="tts">Maut</annotation>
+ <annotation cp="👶">Bebí | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶" type="tts">Taata</annotation>
+ <annotation cp="🧒">Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒" type="tts">Smọ́l Pikin</annotation>
+ <annotation cp="👦">Bọi | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦" type="tts">Smọ́l Bọi</annotation>
+ <annotation cp="👧">Gẹl | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧" type="tts">Smọ́l Gẹl</annotation>
+ <annotation cp="🧑">Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑" type="tts">Pẹ́sin</annotation>
+ <annotation cp="👱">Hea | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="🧑🍼">Bẹbí | Chọp | Giv | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="🧑🎄">Klọz | Krísmas | Mx Klọz</annotation>
+ <annotation cp="🧑🎄" type="tts">Mx Klọz</annotation>
+ <annotation cp="👨">Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨" type="tts">Man</annotation>
+ <annotation cp="🧔">Biabiá | Man | Man: Biabiá | Pẹ́sin</annotation>
+ <annotation cp="🧔" type="tts">Man: Biabiá</annotation>
+ <annotation cp="👱♂">Blọnd | Blọnd Heá Man | Hea | Man | Man Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👨🍼">Bẹbí | Chọp | Giv | Man | Man Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="👨🍼" type="tts">Man Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩">Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩" type="tts">Wúman</annotation>
+ <annotation cp="👱♀">Blọnd | Blọ́nd Heá Wúman | Hea | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👩🍼">Bẹbí | Chọp | Giv | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🍼" type="tts">Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="🧓">Machọ́ Pẹ́sin | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓" type="tts">Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="👴">Machọ́ Pẹ́sin | Man | Old | Óld Man</annotation>
+ <annotation cp="👴" type="tts">Óld Man</annotation>
+ <annotation cp="👵">Machọ́ Pẹ́sin | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵" type="tts">Óld Wúman</annotation>
+ <annotation cp="🙍">Fes | Fraun | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍" type="tts">Pẹ́sin Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍♂">Fes | Fraun | Man | Man Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍♂" type="tts">Man Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍♀">Fraun | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍♀" type="tts">Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙎">Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎♂">Man | Man Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎♂" type="tts">Man Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎♀">To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎♀" type="tts">Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙅">Hand | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅♂">Hand | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Min | NO</annotation>
+ <annotation cp="🙅♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅♀">Hand | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙆">Hand | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆♂">Hand | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Min | OK</annotation>
+ <annotation cp="🙆♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆♀">Hand | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="💁">Hand | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁" type="tts">Pẹ́sin De Tró Im Hand</annotation>
+ <annotation cp="💁♂">Hand | Man | Man De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁♂" type="tts">Man De Tró Im Hand</annotation>
+ <annotation cp="💁♀">Hand | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁♀" type="tts">Wúman De Tró Im Hand</annotation>
+ <annotation cp="🙋">Hand | Hápi | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋♂">Hand | Hápi | Man | Man Wé De Réz Im Hand Ọp | Ọp | Rez</annotation>
+ <annotation cp="🙋♂" type="tts">Man Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋♀">Hand | Hápi | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋♀" type="tts">Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🧏">Hia | Ia | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏" type="tts">Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏♂">Hia | Ia | Man | Man Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏♂" type="tts">Man Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏♀">Hia | Ia | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏♀" type="tts">Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🙇">Abẹg Sọ́ri | Bau | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇" type="tts">Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇♂">Abẹg Sọ́ri | Bau | Man | Man Wé De Baú Daun</annotation>
+ <annotation cp="🙇♂" type="tts">Man Wé De Baú Daun</annotation>
+ <annotation cp="🙇♀">Abẹg Sọ́ri | Bau | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇♀" type="tts">Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🤦">Fes | Hand | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦♂">Fes | Hand | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦♀">Fes | Hand | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤷">Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷" type="tts">Pẹ́sin De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷♂">Man | Man De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷♂" type="tts">Man De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷♀">Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷♀" type="tts">Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🧑⚕">Dọ́ktọ | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨⚕">Dọ́ktọ | Man | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩⚕">Dọ́ktọ | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🎓">Grájúet | Stúdẹnt</annotation>
+ <annotation cp="🧑🎓" type="tts">Stúdẹnt</annotation>
+ <annotation cp="👨🎓">Grájúet | Man | Mán Stúdẹnt | Stúdẹnt</annotation>
+ <annotation cp="👨🎓" type="tts">Mán Stúdẹnt</annotation>
+ <annotation cp="👩🎓">Grájuet | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🎓" type="tts">Wúmán Stúdẹnt</annotation>
+ <annotation cp="🧑🏫">Ínstrọ́ktọ | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏫" type="tts">Tícha</annotation>
+ <annotation cp="👨🏫">Ínstrọ́ktọ | Man | Mán Tícha | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏫" type="tts">Mán Tícha</annotation>
+ <annotation cp="👩🏫">Ínstrọ́ktọ | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏫" type="tts">Wúmán Tícha</annotation>
+ <annotation cp="🧑⚖">Jọj | Skel</annotation>
+ <annotation cp="🧑⚖" type="tts">Jọj</annotation>
+ <annotation cp="👨⚖">Jọj | Man | Mán Jọj | Skel</annotation>
+ <annotation cp="👨⚖" type="tts">Mán Jọj</annotation>
+ <annotation cp="👩⚖">Jọj | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩⚖" type="tts">Wúmán Jọj</annotation>
+ <annotation cp="🧑🌾">Fáma | Gádína</annotation>
+ <annotation cp="🧑🌾" type="tts">Fáma</annotation>
+ <annotation cp="👨🌾">Fáma | Gádína | Man | Mán Fáma</annotation>
+ <annotation cp="👨🌾" type="tts">Mán Fáma</annotation>
+ <annotation cp="👩🌾">Fáma | Gádína | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🌾" type="tts">Wúmán Fáma</annotation>
+ <annotation cp="🧑🍳">Chẹf | Kuk</annotation>
+ <annotation cp="🧑🍳" type="tts">Kuk</annotation>
+ <annotation cp="👨🍳">Chẹf | Kuk | Man | Mán Kuk</annotation>
+ <annotation cp="👨🍳" type="tts">Mán Kuk</annotation>
+ <annotation cp="👩🍳">Chẹf | Kuk | Wúmán</annotation>
+ <annotation cp="👩🍳" type="tts">Wúmán Kuk</annotation>
+ <annotation cp="🧑🔧">Ẹlẹktríshan | Kráftspẹ́sin | Mékánik | Mẹkánik | Plọ́mba</annotation>
+ <annotation cp="🧑🔧" type="tts">Mẹkánik</annotation>
+ <annotation cp="👨🔧">Ẹlẹktríshan | Kráftsman | Man | Mán Mẹkánik | Mékánik | Plọ́mba</annotation>
+ <annotation cp="👨🔧" type="tts">Mán Mẹkánik</annotation>
+ <annotation cp="👩🔧">Ẹlẹktríshan | Kráftswúman | Mékánik | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🔧" type="tts">Wúmán Mẹkánik</annotation>
+ <annotation cp="🧑🏭">Fáktri | Fáktrí Wọ́ka | Wọ́ka</annotation>
+ <annotation cp="🧑🏭" type="tts">Fáktrí Wọ́ka</annotation>
+ <annotation cp="👨🏭">Fáktri | Man | Mán Fáktrí Wọ́ka | Wọ́ka</annotation>
+ <annotation cp="👨🏭" type="tts">Mán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏭">Fáktri | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏭" type="tts">Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="🧑💼">Ákítẹkt | Bízẹs | Máníja | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑💼" type="tts">Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👨💼">Ákítẹkt | Bízẹs | Man | Mán Ọ́fís Wọ́ka | Máníja | Ọfis</annotation>
+ <annotation cp="👨💼" type="tts">Mán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩💼">Ákítẹkt | Bízẹs | Máníja | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩💼" type="tts">Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🔬" type="tts">Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👨🔬">Bayọ́lọ́gí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Man | Mán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👨🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👨💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🎤">Áktọ | Dans | Maikrofon | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🎤" type="tts">Sínga</annotation>
+ <annotation cp="👨🎤">Áktọ | Jíta | Man | Mán Sínga | Miúzik | Sta</annotation>
+ <annotation cp="👨🎤" type="tts">Mán Sínga</annotation>
+ <annotation cp="👩🎤">Áktọ | Dans | Jíta | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🎤" type="tts">Wúmán Sínga</annotation>
+ <annotation cp="🧑🎨">Átist | Brọsh | Pént Plet</annotation>
+ <annotation cp="🧑🎨" type="tts">Átist</annotation>
+ <annotation cp="👨🎨">Átist | Brọsh | Man | Mán Átist | Pént Plet</annotation>
+ <annotation cp="👨🎨" type="tts">Mán Átist</annotation>
+ <annotation cp="👩🎨">Átist | Brọsh | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🎨" type="tts">Wúmán Átist</annotation>
+ <annotation cp="🧑✈">Eroplen | Káptin | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑✈" type="tts">Paílọt</annotation>
+ <annotation cp="👨✈">Eroplen | Káptin | Man | Mán Paílọt | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨✈" type="tts">Mán Paílọt</annotation>
+ <annotation cp="👩✈">Eroplen | Káptin | Man | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩✈" type="tts">Wúmán Paílọt</annotation>
+ <annotation cp="🧑🚀">Ástrọ́nọt | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🚀" type="tts">Ástrọ́nọt</annotation>
+ <annotation cp="👨🚀">Ástrọ́nọt | Man | Mán Ástrọ́nọt | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🚀" type="tts">Mán Ástrọ́nọt</annotation>
+ <annotation cp="👩🚀">Ástrọ́nọt | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🚀" type="tts">Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="🧑🚒">Fáyáfaíta | Fáyámóto</annotation>
+ <annotation cp="🧑🚒" type="tts">Fáyáfaíta</annotation>
+ <annotation cp="👨🚒">Fáyámóto | Man | Mán Fáyáfaíta</annotation>
+ <annotation cp="👨🚒" type="tts">Mán Fáyáfaíta</annotation>
+ <annotation cp="👩🚒">Fáyámóto | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🚒" type="tts">Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👮">Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮" type="tts">Polís Ọ́físa</annotation>
+ <annotation cp="👮♂">Man | Man Polís Ọ́físa | Ọ́físa | Polis</annotation>
+ <annotation cp="👮♂" type="tts">Man Polís Ọ́físa</annotation>
+ <annotation cp="👮♀">Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮♀" type="tts">Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="🕵">Ditẹ́ktiv | Kraim</annotation>
+ <annotation cp="🕵" type="tts">Ditẹ́ktiv</annotation>
+ <annotation cp="🕵♂">Ditẹ́ktiv | Kraim | Man | Mán Ditẹ́ktiv | Spai</annotation>
+ <annotation cp="🕵♂" type="tts">Mán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵♀">Ditẹ́ktiv | Kraim | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵♀" type="tts">Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="💂">Gad</annotation>
+ <annotation cp="💂" type="tts">Gad</annotation>
+ <annotation cp="💂♂">Gad | Man | Mán Gad</annotation>
+ <annotation cp="💂♂" type="tts">Mán Gad</annotation>
+ <annotation cp="💂♀">Gad | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂♀" type="tts">Wúmán Gad</annotation>
+ <annotation cp="👷">Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷" type="tts">Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷♂">Hat | Hẹd Pan | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷♀">Hat | Hẹd Pan | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="🤴">Kraun | Prins</annotation>
+ <annotation cp="🤴" type="tts">Prins</annotation>
+ <annotation cp="👸">Kraun | Prínsẹs</annotation>
+ <annotation cp="👸" type="tts">Prínsẹs</annotation>
+ <annotation cp="👳">Hẹ́d-Klọt | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳♂">Hẹ́d-Klọt | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳♀">Hẹ́d-Klọt | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👲">Hat | Kap | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲" type="tts">Pẹ́sin Wé Wiá Skọ́lkap</annotation>
+ <annotation cp="🧕">Hẹdtai | Hijab | Mantíla | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕" type="tts">Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🤵">Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵" type="tts">Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵♀">Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵♀" type="tts">Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵♂">Man | Man Wé Wiá Tọksído | Tọksído</annotation>
+ <annotation cp="🤵♂" type="tts">Man Wé Wiá Tọksído</annotation>
+ <annotation cp="👰">Braid | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰" type="tts">Pẹ́sin Wé Wiá Vẹl</annotation>
+ <annotation cp="👰♀">Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰♀" type="tts">Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰♂">Man | Man Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰♂" type="tts">Man Wé Wiá Vẹl</annotation>
+ <annotation cp="🤰">Bẹlẹ́ | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰" type="tts">Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤱">Bẹbí | Brẹst | Chọp | Mamá | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱" type="tts">Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="👼">Bẹ́bí Énjẹl | Énjẹl | Fes</annotation>
+ <annotation cp="👼" type="tts">Bẹ́bí Énjẹl</annotation>
+ <annotation cp="🎅">Krísmas | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅" type="tts">Sántá Klọz</annotation>
+ <annotation cp="🤶">Krísmas | Mamá | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶" type="tts">Misis Klọz</annotation>
+ <annotation cp="🦸">Bẹtá | Gud | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸" type="tts">Supahíro</annotation>
+ <annotation cp="🦸♂">Bẹtá | Gud | Man | Man Híro | Mán Supahíro | Supapáwa</annotation>
+ <annotation cp="🦸♂" type="tts">Mán Supahíro</annotation>
+ <annotation cp="🦸♀">Bẹtá | Gud | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸♀" type="tts">Wúmán Supahíro</annotation>
+ <annotation cp="🦹">Ívul | Krímínal | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹" type="tts">Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹♂">Ívul | Krímínal | Man | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹♂" type="tts">Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹♀">Ívul | Krímínal | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹♀" type="tts">Wíkẹ́d Wúmán Krímínal</annotation>
+ <annotation cp="🧙">Jujúman | Majíshan | Wich</annotation>
+ <annotation cp="🧙" type="tts">Majíshan</annotation>
+ <annotation cp="🧙♂">Jujúman | Majíshan | Man | Mán Majíshan | Wich</annotation>
+ <annotation cp="🧙♂" type="tts">Mán Majíshan</annotation>
+ <annotation cp="🧙♀">Jujúwúman | Majíshan | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙♀" type="tts">Wúmán Majíshan</annotation>
+ <annotation cp="🧚">Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man</annotation>
+ <annotation cp="🧚♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Spírit | Wúman</annotation>
+ <annotation cp="🧚♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán</annotation>
+ <annotation cp="🧛">Drakúla | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛" type="tts">Vámpáya</annotation>
+ <annotation cp="🧛♂">Drakúla | Mán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛♂" type="tts">Mán Vámpáya</annotation>
+ <annotation cp="🧛♀">Drakúla | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛♀" type="tts">Wúmán Vámpáya</annotation>
+ <annotation cp="🧜">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜" type="tts">Pẹ́sin Wé Bi Mamíwọtá</annotation>
+ <annotation cp="🧜♂">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Spírit</annotation>
+ <annotation cp="🧜♂" type="tts">Mán Mamíwọtá</annotation>
+ <annotation cp="🧜♀">Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜♀" type="tts">Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧝">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Sétan</annotation>
+ <annotation cp="🧝" type="tts">Ẹlf</annotation>
+ <annotation cp="🧝♂">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mán Ẹlf | Sétan</annotation>
+ <annotation cp="🧝♂" type="tts">Mán Ẹlf</annotation>
+ <annotation cp="🧝♀">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝♀" type="tts">Wúmán Ẹlf</annotation>
+ <annotation cp="🧞">Bád Spírit | Dẹ́vul | Jiínii | Jujú | Májik | Sétan</annotation>
+ <annotation cp="🧞" type="tts">Jiínii</annotation>
+ <annotation cp="🧞♂">Bád Spírit | Dẹ́vul | Jujú | Májik | Man | Mán Jiínii | Sétan</annotation>
+ <annotation cp="🧞♂" type="tts">Mán Jiínii</annotation>
+ <annotation cp="🧞♀">Bád Spírit | Dẹ́vul | Jujú | Májik | Sétan | Wúman | Wúmán Jiínii</annotation>
+ <annotation cp="🧞♀" type="tts">Wúmán Jiínii</annotation>
+ <annotation cp="🧟">Bád Spírit | Dẹ́d Pẹ́sin Wé De Waká | Dẹ́vul | Sétan | Zombí</annotation>
+ <annotation cp="🧟" type="tts">Zombí</annotation>
+ <annotation cp="🧟♂">Bád Spírit | Dẹ́d Pẹ́sin Wé De Waká | Dẹ́vul | Mán Zombí | Sétan</annotation>
+ <annotation cp="🧟♂" type="tts">Mán Zombí</annotation>
+ <annotation cp="🧟♀">Bád Spírit | Dẹ́d Pẹ́sin Wé De Waká | Dẹ́vul | Sétan | Wúmán Zombí</annotation>
+ <annotation cp="🧟♀" type="tts">Wúmán Zombí</annotation>
+ <annotation cp="💆">Fes | Masaj | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆♂">Fes | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Salọn</annotation>
+ <annotation cp="💆♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆♀">Fes | Masaj | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💇">Bab | Bába | Bábá Shọp | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇♂">Bab | Bába | Bábá Shọp | Man | Man Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇♂" type="tts">Man Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇♀">Bab | Bába | Bábá Shọp | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇♀" type="tts">Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="🚶">Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶" type="tts">Pẹ́sin Wé De Waká</annotation>
+ <annotation cp="🚶♂">Man | Man Wé De Waká | Waká</annotation>
+ <annotation cp="🚶♂" type="tts">Man Wé De Waká</annotation>
+ <annotation cp="🚶♀">Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶♀" type="tts">Wúman Wé De Waká</annotation>
+ <annotation cp="🧍">Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍" type="tts">Pẹ́sín Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍♂">Man | Man Wé De Stánd Ọp | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍♂" type="tts">Man Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍♀">Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍♀" type="tts">Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧎">Daun | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎" type="tts">Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎♂">Daun | Man | Man Wé Níl Daun | Nil</annotation>
+ <annotation cp="🧎♂" type="tts">Man Wé Níl Daun</annotation>
+ <annotation cp="🧎♀">Daun | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎♀" type="tts">Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧑🦯">Blaind | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🦯">Blaind | Man | Man Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🦯" type="tts">Man Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🦯">Blaind | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🦯" type="tts">Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🦼">Ẹ́njin | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👨🦼">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🦼">Ẹ́njin | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🧑🦽">Ẹ́njin | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👨🦽">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🦽">Ẹ́njin | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🏃">Márátọn | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃" type="tts">Pẹ́sin Wé De Rọn</annotation>
+ <annotation cp="🏃♂">Man | Man Wé De Rọn | Márátọn | Run</annotation>
+ <annotation cp="🏃♂" type="tts">Man Wé De Rọn</annotation>
+ <annotation cp="🏃♀">Márátọn | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃♀" type="tts">Wúman Wé De Rọn</annotation>
+ <annotation cp="💃">Dans | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃" type="tts">Wúman Wé De Dans</annotation>
+ <annotation cp="🕺">Dans | Man | Man Wé De Dans</annotation>
+ <annotation cp="🕺" type="tts">Man Wé De Dans</annotation>
+ <annotation cp="🕴">Flot | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea</annotation>
+ <annotation cp="👯">Dánsa | Patí | Pípol | Pípol Wé Wiá Tins Wé Rizẹ́mbúl Rábit Ia | Rábit Ia</annotation>
+ <annotation cp="👯" type="tts">Pípol Wé Wiá Tins Wé Rizẹ́mbúl Rábit Ia</annotation>
+ <annotation cp="👯♂">Dánsa | Man-dẹm | Man-dẹm Wiá Rábít Iá Kaín Tins | Patí | Pípol | Rábit Ia</annotation>
+ <annotation cp="👯♂" type="tts">Man-dẹm Wiá Rábít Iá Kaín Tins</annotation>
+ <annotation cp="👯♀">Dánsa | Patí | Pípol | Rábit Ia | Wúman-dẹm | Wúman-dẹm Wiá Rábít Iá Kaín Tins</annotation>
+ <annotation cp="👯♀" type="tts">Wúman-dẹm Wiá Rábít Iá Kaín Tins</annotation>
+ <annotation cp="🧖">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖♂">Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖♀">Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧗">Klaimb | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗" type="tts">Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗♂">Klaimb | Man | Man Wé De Klaimb</annotation>
+ <annotation cp="🧗♂" type="tts">Man Wé De Klaimb</annotation>
+ <annotation cp="🧗♀">Klaimb | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗♀" type="tts">Wúman Wé De Klaimb</annotation>
+ <annotation cp="🤺">Gem | Pẹ́sin | Pẹ́sin Wé Hol Ple Plé Sọd | Ple | Sod</annotation>
+ <annotation cp="🤺" type="tts">Pẹ́sin Wé Hol Ple Plé Sọd</annotation>
+ <annotation cp="🏇">Họs | Jọkii | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs</annotation>
+ <annotation cp="⛷">Gem | Pẹ́sin Wé Yúz Ski De Rọ́n Ọn Tọ́p Sno | Ski | Sno</annotation>
+ <annotation cp="⛷" type="tts">Pẹ́sin Wé Yúz Ski De Rọ́n Ọn Tọ́p Sno</annotation>
+ <annotation cp="🏂">Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno</annotation>
+ <annotation cp="🏌">Bọl | Gọlf | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌" type="tts">Pẹ́sin Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌♂">Bọl | Gọlf | Man | Man Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌♂" type="tts">Man Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌♀">Bọl | Gọlf | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌♀" type="tts">Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏄">Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄♂">Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄♀">Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🚣">Bot | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣" type="tts">Pẹ́sin Wé De Ró Bot</annotation>
+ <annotation cp="🚣♂">Bot | Man | Man Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣♂" type="tts">Man Wé De Ró Bot</annotation>
+ <annotation cp="🚣♀">Bot | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣♀" type="tts">Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🏊">Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊" type="tts">Pẹ́sin Wé De Swim</annotation>
+ <annotation cp="🏊♂">Man | Man Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊♂" type="tts">Man Wé De Swim</annotation>
+ <annotation cp="🏊♀">Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊♀" type="tts">Wúman Wé De Swim</annotation>
+ <annotation cp="⛹">Bauns | Bọl | Graun | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹♂">Bauns | Bọl | Graun | Man | Man Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹♂" type="tts">Man Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹♀">Bauns | Bọl | Graun | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="🏋">Lift | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋" type="tts">Pẹ́sin Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋♂">Lift | Man | Man Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋♂" type="tts">Man Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋♀">Lift | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋♀" type="tts">Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🚴">Bísíkul | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴" type="tts">Pẹ́sin Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴♂">Bísíkul | Man | Man Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴♂" type="tts">Man Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴♀">Bísíkul | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴♀" type="tts">Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚵">Baísíkul | Maúntin | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin</annotation>
+ <annotation cp="🚵♂">Baísíkul | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Raíd</annotation>
+ <annotation cp="🚵♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin</annotation>
+ <annotation cp="🚵♀">Baísíkul | Maúntin | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🤸">Kátwil | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸" type="tts">Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸♂">Kátwil | Man | Man Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸♂" type="tts">Man Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸♀">Kátwil | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸♀" type="tts">Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤼">Pípul | Pípul Wé De Rẹ́sul | Rẹ́sla | Rẹ́sul</annotation>
+ <annotation cp="🤼" type="tts">Pípul Wé De Rẹ́sul</annotation>
+ <annotation cp="🤼♂">Mẹn | Mẹn Wé De Rẹ́sul | Rẹ́sla | Rẹ́sul</annotation>
+ <annotation cp="🤼♂" type="tts">Mẹn Wé De Rẹ́sul</annotation>
+ <annotation cp="🤼♀">Rẹ́sla | Rẹ́sul | Wímẹn | Wímẹn Wé De Rẹ́sul</annotation>
+ <annotation cp="🤼♀" type="tts">Wímẹn Wé De Rẹ́sul</annotation>
+ <annotation cp="🤽">Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽♂">Man | Man Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽♂" type="tts">Man Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽♀">Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽♀" type="tts">Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤾">Hándbọl | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾" type="tts">Pẹ́sin Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾♂">Hándbọl | Man | Man Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾♂" type="tts">Man Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾♀">Hándbọl | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾♀" type="tts">Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤹">Jọ́gul | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹♂">Jọ́gul | Man | Man Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹♀">Jọ́gul | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🧘">Graun | Lótus | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘♂">Graun | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘♀">Graun | Lótus | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🛀">Baf | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀" type="tts">Pẹ́sin Wé De Baf</annotation>
+ <annotation cp="🛌">Bẹd | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌" type="tts">Pẹ́sin Wé De Slip</annotation>
+ <annotation cp="🧑🤝🧑">Hand | Hól | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🤝🧑" type="tts">Pípul Wé Hól Han</annotation>
+ <annotation cp="👭">Hand | Hol | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭" type="tts">Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👫">Hand | Hol | Man | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫" type="tts">Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👬">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬" type="tts">Man-dẹm Wé Hól Han</annotation>
+ <annotation cp="💏">Kis | Tú Pípol</annotation>
+ <annotation cp="💏" type="tts">Kis</annotation>
+ <annotation cp="💑">Lọv | Tú Pípol | Tú Pípol Wit Hat</annotation>
+ <annotation cp="💑" type="tts">Tú Pípol Wit Hat</annotation>
+ <annotation cp="👪">Fámíli</annotation>
+ <annotation cp="👪" type="tts">Fámíli</annotation>
+ <annotation cp="🗣">Fes | Hẹd | Hẹd Wé De Tọk | Tọk</annotation>
+ <annotation cp="🗣" type="tts">Hẹd Wé De Tọk</annotation>
+ <annotation cp="👤">Bọdí | Dák Píkchọ Ọf Ọ́p Pát Ọf Pẹ́sin Bọdí | Pẹ́sin | Píkchọ | Shep</annotation>
+ <annotation cp="👤" type="tts">Dák Píkchọ Ọf Ọ́p Pát Ọf Pẹ́sin Bọdí</annotation>
+ <annotation cp="👥">Bọdí | Dák Píkchọ Ọf Ọ́p Pát Ọf Tú Pípol Bọdí | Pẹ́sin | Píkchọ | Shep</annotation>
+ <annotation cp="👥" type="tts">Dák Píkchọ Ọf Ọ́p Pát Ọf Tú Pípol Bọdí</annotation>
+ <annotation cp="👣">Fútmak-dẹm | Fútmak-Dẹm</annotation>
+ <annotation cp="👣" type="tts">Fútmak-dẹm</annotation>
+ <annotation cp="🦰">Jínja | Rẹ́d Hea | Rẹ́dhẹd</annotation>
+ <annotation cp="🦰" type="tts">Rẹ́d Hea</annotation>
+ <annotation cp="🦱">Áfró | Kọ́li | Kọ́lí Hea | Lọ́ng Kọ́lí Hea | Rínglẹts</annotation>
+ <annotation cp="🦱" type="tts">Kọ́lí Hea</annotation>
+ <annotation cp="🦳">Grei | Hea | Old | Wait | Waít Hea</annotation>
+ <annotation cp="🦳" type="tts">Waít Hea</annotation>
+ <annotation cp="🦲">Bọld | Kimótẹ́rápi | Nó Hea | Shév Ọ́l Hea Kọmọ́t Fọ Hẹd</annotation>
+ <annotation cp="🦲" type="tts">Bọld</annotation>
+ <annotation cp="🐵">Fes | Mọnkí | Monkí Fes</annotation>
+ <annotation cp="🐵" type="tts">Monkí Fes</annotation>
+ <annotation cp="🐒">Mọnkí</annotation>
+ <annotation cp="🐒" type="tts">Mọnkí</annotation>
+ <annotation cp="🦍">Goríla</annotation>
+ <annotation cp="🦍" type="tts">Goríla</annotation>
+ <annotation cp="🦧">Ọrángutang</annotation>
+ <annotation cp="🦧" type="tts">Ọrángutang</annotation>
+ <annotation cp="🐶">Dọg | Fes | Pẹt</annotation>
+ <annotation cp="🐶" type="tts">Dọg Fes</annotation>
+ <annotation cp="🐕">Dọg | Pẹt</annotation>
+ <annotation cp="🐕" type="tts">Dọg</annotation>
+ <annotation cp="🦮">Blaind | Gaid | Gaíd Dọg</annotation>
+ <annotation cp="🦮" type="tts">Gaíd Dọg</annotation>
+ <annotation cp="🐕🦺">Dọg | Dọg Wé De Sáv Pípol Sík Wẹl | Pípol | Sav | Sik</annotation>
+ <annotation cp="🐕🦺" type="tts">Dọg Wé De Sáv Pípol Sík Wẹl</annotation>
+ <annotation cp="🐩">Dọg | Púdul</annotation>
+ <annotation cp="🐩" type="tts">Púdul</annotation>
+ <annotation cp="🐺">Wulf</annotation>
+ <annotation cp="🐺" type="tts">Wulf</annotation>
+ <annotation cp="🦊">Fes | Fọks</annotation>
+ <annotation cp="🦊" type="tts">Fọks</annotation>
+ <annotation cp="🦝">Bizi Bọdí | Kọní | Rakun</annotation>
+ <annotation cp="🦝" type="tts">Rakun</annotation>
+ <annotation cp="🐱">Fes | Kat | Pẹt</annotation>
+ <annotation cp="🐱" type="tts">Kat Fes</annotation>
+ <annotation cp="🐈">Kat | Pẹt</annotation>
+ <annotation cp="🐈" type="tts">Kat</annotation>
+ <annotation cp="🐈⬛">Blak | Blák Kat | Kat</annotation>
+ <annotation cp="🐈⬛" type="tts">Blák Kat</annotation>
+ <annotation cp="🦁">Láyọn | Lio</annotation>
+ <annotation cp="🦁" type="tts">Láyọn</annotation>
+ <annotation cp="🐯">Fes | Taíga Fes</annotation>
+ <annotation cp="🐯" type="tts">Taíga Fes</annotation>
+ <annotation cp="🐅">Taíga</annotation>
+ <annotation cp="🐅" type="tts">Taíga</annotation>
+ <annotation cp="🐆">Liópad</annotation>
+ <annotation cp="🐆" type="tts">Liópad</annotation>
+ <annotation cp="🐴">Fes | Họs | Họ́s Fes</annotation>
+ <annotation cp="🐴" type="tts">Họ́s Fes</annotation>
+ <annotation cp="🐎">Họs | Họs Wé De Rọn | Rọn</annotation>
+ <annotation cp="🐎" type="tts">Họs</annotation>
+ <annotation cp="🦄">Fes | Yúnikọn</annotation>
+ <annotation cp="🦄" type="tts">Yúnikọn</annotation>
+ <annotation cp="🦓">Lain | Zẹbra</annotation>
+ <annotation cp="🦓" type="tts">Zẹbra</annotation>
+ <annotation cp="🦌">Dia</annotation>
+ <annotation cp="🦌" type="tts">Dia</annotation>
+ <annotation cp="🐮">Fes | Kau</annotation>
+ <annotation cp="🐮" type="tts">Kau Fes</annotation>
+ <annotation cp="🐂">Bul | Mán-Kau</annotation>
+ <annotation cp="🐂" type="tts">Mán-Kau</annotation>
+ <annotation cp="🐃">Búfálo | Wọtá</annotation>
+ <annotation cp="🐃" type="tts">Búfálo</annotation>
+ <annotation cp="🐄">Kau</annotation>
+ <annotation cp="🐄" type="tts">Kau</annotation>
+ <annotation cp="🐷">Fes | Pig</annotation>
+ <annotation cp="🐷" type="tts">Pig Fes</annotation>
+ <annotation cp="🐖">Pig | Wúmán-Pig</annotation>
+ <annotation cp="🐖" type="tts">Pig</annotation>
+ <annotation cp="🐗">Bush | Búsh Pig | Pig</annotation>
+ <annotation cp="🐗" type="tts">Búsh Pig</annotation>
+ <annotation cp="🐽">Fes | Noz | Pig | Píg Noz</annotation>
+ <annotation cp="🐽" type="tts">Píg Noz</annotation>
+ <annotation cp="🐏">Man-Ship | Ram | Ship</annotation>
+ <annotation cp="🐏" type="tts">Ram</annotation>
+ <annotation cp="🐑">Ship | Wúman | Wuman Ship</annotation>
+ <annotation cp="🐑" type="tts">Wuman Ship</annotation>
+ <annotation cp="🐐">Got</annotation>
+ <annotation cp="🐐" type="tts">Got</annotation>
+ <annotation cp="🐪">Họmp | Kámẹl</annotation>
+ <annotation cp="🐪" type="tts">Kámẹl</annotation>
+ <annotation cp="🐫">Bak | Họmp | Kámẹl | Kámẹl Wé Gẹ́t Tú Họmp Fọ Bak</annotation>
+ <annotation cp="🐫" type="tts">Kámẹl Wé Gẹ́t Tú Họmp Fọ Bak</annotation>
+ <annotation cp="🦙">Láma | Wul</annotation>
+ <annotation cp="🦙" type="tts">Láma</annotation>
+ <annotation cp="🦒">Jiraf | Spọt-Spọt</annotation>
+ <annotation cp="🦒" type="tts">Jiraf</annotation>
+ <annotation cp="🐘">Ẹ́lẹ́fant</annotation>
+ <annotation cp="🐘" type="tts">Ẹ́lẹ́fant</annotation>
+ <annotation cp="🦏">Raínósẹ́rọs</annotation>
+ <annotation cp="🦏" type="tts">Raínósẹ́rọs</annotation>
+ <annotation cp="🦛">Hípo | Hípopotámọs</annotation>
+ <annotation cp="🦛" type="tts">Hípopotámọs</annotation>
+ <annotation cp="🐭">Fes | Maus</annotation>
+ <annotation cp="🐭" type="tts">Maus Fes</annotation>
+ <annotation cp="🐁">Maus | Rat</annotation>
+ <annotation cp="🐁" type="tts">Maus</annotation>
+ <annotation cp="🐀">Rat</annotation>
+ <annotation cp="🐀" type="tts">Rat</annotation>
+ <annotation cp="🐹">Fes | Hámsta | Pet</annotation>
+ <annotation cp="🐹" type="tts">Hámsta</annotation>
+ <annotation cp="🐰">Pẹt | Rábit | Rábit Fes</annotation>
+ <annotation cp="🐰" type="tts">Rábit Fes</annotation>
+ <annotation cp="🐇">Pẹt | Rábit</annotation>
+ <annotation cp="🐇" type="tts">Rábit</annotation>
+ <annotation cp="🐿">Chipmọnk | Skwírẹl</annotation>
+ <annotation cp="🐿" type="tts">Chipmọnk</annotation>
+ <annotation cp="🦔">Chukuchúkú | Hẹ́jhọg</annotation>
+ <annotation cp="🦔" type="tts">Hẹ́jhọg</annotation>
+ <annotation cp="🦇">Bat</annotation>
+ <annotation cp="🦇" type="tts">Bat</annotation>
+ <annotation cp="🐻">Bẹ́a | Fes</annotation>
+ <annotation cp="🐻" type="tts">Bẹ́a</annotation>
+ <annotation cp="🐻❄">Aítík Ríjọn | Póla | Pólá Bẹ́a | Wait</annotation>
+ <annotation cp="🐻❄" type="tts">Pólá Bẹ́a</annotation>
+ <annotation cp="🐨">Bẹ́a | Kọála</annotation>
+ <annotation cp="🐨" type="tts">Kọála</annotation>
+ <annotation cp="🐼">Fes | Pánda</annotation>
+ <annotation cp="🐼" type="tts">Pánda</annotation>
+ <annotation cp="🦥">Lézi | Slo | Slot</annotation>
+ <annotation cp="🦥" type="tts">Slot</annotation>
+ <annotation cp="🦦">Físhin | Ọ́ta | Ple</annotation>
+ <annotation cp="🦦" type="tts">Ọ́ta</annotation>
+ <annotation cp="🦨">Bad Smẹl | Skọnk</annotation>
+ <annotation cp="🦨" type="tts">Skọnk</annotation>
+ <annotation cp="🦘">Jọmp | Kángaruu | Ọstrélia</annotation>
+ <annotation cp="🦘" type="tts">Kángaruu</annotation>
+ <annotation cp="🦡">Bája | Họ́ní Bája</annotation>
+ <annotation cp="🦡" type="tts">Bája</annotation>
+ <annotation cp="🐾">Ánímọl | Lẹg | Mak | Mák Ọf Lẹ́g Ọf Ánímọl-dẹm Wé Gẹ́t Nel</annotation>
+ <annotation cp="🐾" type="tts">Mák Ọf Lẹ́g Ọf Ánímọl-dẹm Wé Gẹ́t Nel</annotation>
+ <annotation cp="🦃">Bẹd | Tọkí</annotation>
+ <annotation cp="🦃" type="tts">Tọkí</annotation>
+ <annotation cp="🐔">Bẹd | Chíkin</annotation>
+ <annotation cp="🐔" type="tts">Chíkin</annotation>
+ <annotation cp="🐓">Bẹd | Machọ́ Mán Chíkin</annotation>
+ <annotation cp="🐓" type="tts">Machọ́ Mán Chíkin</annotation>
+ <annotation cp="🐣">Bẹd | Chíkin Pikin | Chíkin Pikin Wé De Kọmọ́t Frọm Ínsaíd Ẹg | Ẹg</annotation>
+ <annotation cp="🐣" type="tts">Chíkin Pikin Wé De Kọmọ́t Frọm Ínsaíd Ẹg</annotation>
+ <annotation cp="🐤">Bẹd | Chíkin Pikin | Smọ́l Pikin</annotation>
+ <annotation cp="🐤" type="tts">Chíkin Pikin</annotation>
+ <annotation cp="🐥">Bẹd | Chíkin Pikin | Chíkin Pikin Wé De Fés Frọnt | Smọ́l Pikin</annotation>
+ <annotation cp="🐥" type="tts">Chíkin Pikin Wé De Fés Frọnt</annotation>
+ <annotation cp="🐦">Bẹd</annotation>
+ <annotation cp="🐦" type="tts">Bẹd</annotation>
+ <annotation cp="🐧">Bẹd | Pẹ́ngwin</annotation>
+ <annotation cp="🐧" type="tts">Pẹ́ngwin</annotation>
+ <annotation cp="🕊">Bẹd | Dov | Flai | Piis</annotation>
+ <annotation cp="🕊" type="tts">Dov</annotation>
+ <annotation cp="🦅">Bẹd | Ígul</annotation>
+ <annotation cp="🦅" type="tts">Ígul</annotation>
+ <annotation cp="🦆">Bẹd | Dọk</annotation>
+ <annotation cp="🦆" type="tts">Dọk</annotation>
+ <annotation cp="🦢">Bẹd | Ọ́glí Yọ́ng Dọk | Swan</annotation>
+ <annotation cp="🦢" type="tts">Swan</annotation>
+ <annotation cp="🦉">Aul | Bẹd | Waiz</annotation>
+ <annotation cp="🦉" type="tts">Aul</annotation>
+ <annotation cp="🦩">Bẹd | Flamíngo</annotation>
+ <annotation cp="🦩" type="tts">Flamíngo</annotation>
+ <annotation cp="🦚">Bẹd | Karí Bọdí Ọp | Píhẹn | Píkọk | Praud</annotation>
+ <annotation cp="🦚" type="tts">Píkọk</annotation>
+ <annotation cp="🦜">Bẹd | Paíret | Párọt | Tọk | Tọk-Tọ́k</annotation>
+ <annotation cp="🦜" type="tts">Párọt</annotation>
+ <annotation cp="🐸">Fes | Frọg</annotation>
+ <annotation cp="🐸" type="tts">Frọg</annotation>
+ <annotation cp="🐊">Krókodail</annotation>
+ <annotation cp="🐊" type="tts">Krókodail</annotation>
+ <annotation cp="🐢">Tẹ́rapin | Tọ́tọis | Tọ́tul</annotation>
+ <annotation cp="🐢" type="tts">Tọ́tul</annotation>
+ <annotation cp="🦎">Ánímọl | Lízad</annotation>
+ <annotation cp="🦎" type="tts">Lízad</annotation>
+ <annotation cp="🐍">Sápẹnt | Snek</annotation>
+ <annotation cp="🐍" type="tts">Snek</annotation>
+ <annotation cp="🐲">Drágọn Fes | Fes</annotation>
+ <annotation cp="🐲" type="tts">Drágọn Fes</annotation>
+ <annotation cp="🐉">Bíg Wíkẹ́d Anímọl | Drágọn</annotation>
+ <annotation cp="🐉" type="tts">Drágọn</annotation>
+ <annotation cp="🦕">Ánímọl | Sórópọd</annotation>
+ <annotation cp="🦕" type="tts">Sórópọd</annotation>
+ <annotation cp="🦖">T-Rẹks</annotation>
+ <annotation cp="🦖" type="tts">T-Rẹks</annotation>
+ <annotation cp="🐳">Fes | Pọ́mp Wọtá | Wéil Wé De Bló Wọtá</annotation>
+ <annotation cp="🐳" type="tts">Wéil Wé De Bló Wọtá</annotation>
+ <annotation cp="🐋">Wéil</annotation>
+ <annotation cp="🐋" type="tts">Wéil</annotation>
+ <annotation cp="🐬">Dọ́lfin</annotation>
+ <annotation cp="🐬" type="tts">Dọ́lfin</annotation>
+ <annotation cp="🐟">Fish</annotation>
+ <annotation cp="🐟" type="tts">Fish</annotation>
+ <annotation cp="🐠">Faín Fish | Họt Ríjọn</annotation>
+ <annotation cp="🐠" type="tts">Faín Fish</annotation>
+ <annotation cp="🐡">Blófish | Fish</annotation>
+ <annotation cp="🐡" type="tts">Blófish</annotation>
+ <annotation cp="🦈">Fish | Shak</annotation>
+ <annotation cp="🦈" type="tts">Shak</annotation>
+ <annotation cp="🐙">Ọ́ktọ́pọs Wé De Lív Fọ Wọtá | Wọtá Ánímọl</annotation>
+ <annotation cp="🐙" type="tts">Ọ́ktọ́pọs Wé De Lív Fọ Wọtá</annotation>
+ <annotation cp="🐚">Shẹl | Snél Shẹl</annotation>
+ <annotation cp="🐚" type="tts">Snél Shẹl</annotation>
+ <annotation cp="🐌">Snel</annotation>
+ <annotation cp="🐌" type="tts">Snel</annotation>
+ <annotation cp="🦋">Bọtáflai | Flai | Ínsẹkt</annotation>
+ <annotation cp="🦋" type="tts">Bọtáflai</annotation>
+ <annotation cp="🐛">Ínsẹkt | Smọ́l Ínsẹkt</annotation>
+ <annotation cp="🐛" type="tts">Smọ́l Ínsẹkt</annotation>
+ <annotation cp="🐜">Ant | Ínsẹkt</annotation>
+ <annotation cp="🐜" type="tts">Ant</annotation>
+ <annotation cp="🐝">Bii | Họ́nibii | Ínsẹkt</annotation>
+ <annotation cp="🐝" type="tts">Họ́nibii</annotation>
+ <annotation cp="🐞">Bítul | Ínsẹkt | Lédi Bítul</annotation>
+ <annotation cp="🐞" type="tts">Lédi Bítul</annotation>
+ <annotation cp="🦗">Gráshọ́pa | Ínsẹkt | Kríkẹt</annotation>
+ <annotation cp="🦗" type="tts">Kríkẹt</annotation>
+ <annotation cp="🕷">Ínsẹkt | Spaída</annotation>
+ <annotation cp="🕷" type="tts">Spaída</annotation>
+ <annotation cp="🕸">Spaída | Spaídá Wẹb</annotation>
+ <annotation cp="🕸" type="tts">Spaídá Wẹb</annotation>
+ <annotation cp="🦂">Skọ́piọn</annotation>
+ <annotation cp="🦂" type="tts">Skọ́piọn</annotation>
+ <annotation cp="🦟">Fíva | Maléria | Mọskíto | Síknẹs</annotation>
+ <annotation cp="🦟" type="tts">Mọskíto</annotation>
+ <annotation cp="🦠">Baktẹ́ria | Maikrob | Vaírọs</annotation>
+ <annotation cp="🦠" type="tts">Maikrob</annotation>
+ <annotation cp="💐">Bọ́nch Ọf Fláwa | Fláwa</annotation>
+ <annotation cp="💐" type="tts">Bọ́nch Ọf Fláwa</annotation>
+ <annotation cp="🌸">Chẹ́ri | Chẹ́rí Fláwa | Fláwa</annotation>
+ <annotation cp="🌸" type="tts">Chẹ́rí Fláwa</annotation>
+ <annotation cp="💮">Fláwa | Waít Fláwa</annotation>
+ <annotation cp="💮" type="tts">Waít Fláwa</annotation>
+ <annotation cp="🏵">Plant | Rozẹt</annotation>
+ <annotation cp="🏵" type="tts">Rozẹt</annotation>
+ <annotation cp="🌹">Fláwa | Roz</annotation>
+ <annotation cp="🌹" type="tts">Roz</annotation>
+ <annotation cp="🥀">Dai | Fláwa Wé Dọ́n De Dai</annotation>
+ <annotation cp="🥀" type="tts">Fláwa Wé Dọ́n De Dai</annotation>
+ <annotation cp="🌺">Fláwa | Haibískọs</annotation>
+ <annotation cp="🌺" type="tts">Haibískọs</annotation>
+ <annotation cp="🌻">Fláwa | Sọn | Sọ́nfláwa</annotation>
+ <annotation cp="🌻" type="tts">Sọ́nfláwa</annotation>
+ <annotation cp="🌼">Faín Fláwa | Fláwa</annotation>
+ <annotation cp="🌼" type="tts">Faín Fláwa</annotation>
+ <annotation cp="🌷">Fláwa | Túlip</annotation>
+ <annotation cp="🌷" type="tts">Túlip</annotation>
+ <annotation cp="🌱">Gádin | Plant | Yọng | Yọ́ng Plant</annotation>
+ <annotation cp="🌱" type="tts">Yọ́ng Plant</annotation>
+ <annotation cp="🌲">Ẹvagrín Tri | Tri</annotation>
+ <annotation cp="🌲" type="tts">Ẹvagrín Tri</annotation>
+ <annotation cp="🌳">Tri | Tri Wé Gẹ́t Plẹ́ntí Líf</annotation>
+ <annotation cp="🌳" type="tts">Tri Wé Gẹ́t Plẹ́ntí Líf</annotation>
+ <annotation cp="🌴">Pam | Pám Tri | Tri</annotation>
+ <annotation cp="🌴" type="tts">Pám Tri</annotation>
+ <annotation cp="🌵">Káktọs | Káktọ́s Plant | Plant</annotation>
+ <annotation cp="🌵" type="tts">Káktọ́s Plant</annotation>
+ <annotation cp="🌾">Gren | Rais | Raís Bọ́ndul</annotation>
+ <annotation cp="🌾" type="tts">Raís Bọ́ndul</annotation>
+ <annotation cp="🌿">Fud | Hab | Hab Plant Wé De Mék Fud Swit | Lif | Pant | Swit</annotation>
+ <annotation cp="🌿" type="tts">Hab Plant Wé De Mék Fud Swit</annotation>
+ <annotation cp="☘">Plant | Shámrọn | Shámrọ́n Plant</annotation>
+ <annotation cp="☘" type="tts">Shámrọ́n Plant</annotation>
+ <annotation cp="🍀">Fọ | Fọ́ Líf Klóva | Klóva | Líf</annotation>
+ <annotation cp="🍀" type="tts">Fọ́ Líf Klóva</annotation>
+ <annotation cp="🍁">Fọl | Lif | Mápul | Mápúl Tri Lif | Tri</annotation>
+ <annotation cp="🍁" type="tts">Mápúl Tri Lif</annotation>
+ <annotation cp="🍂">Fọl | Graund | Lif | Lif Wé Fọ́l Fọ Graund</annotation>
+ <annotation cp="🍂" type="tts">Lif Wé Fọ́l Fọ Graund</annotation>
+ <annotation cp="🍃">Blo | Lif | Lif Wé Wind De Blo | Wind</annotation>
+ <annotation cp="🍃" type="tts">Lif Wé Wind De Blo</annotation>
+ <annotation cp="🍇">Frut | Grep | Grep-dẹm</annotation>
+ <annotation cp="🍇" type="tts">Grep-dẹm</annotation>
+ <annotation cp="🍈">Frut | Mẹ́lọn</annotation>
+ <annotation cp="🍈" type="tts">Mẹ́lọn</annotation>
+ <annotation cp="🍉">Frut | Wọ́tamẹ́lọn</annotation>
+ <annotation cp="🍉" type="tts">Wọ́tamẹ́lọn</annotation>
+ <annotation cp="🍊">Frut | Ọ́renj | Tanjẹrin</annotation>
+ <annotation cp="🍊" type="tts">Tanjẹrin</annotation>
+ <annotation cp="🍋">Frut | Lẹ́mọn</annotation>
+ <annotation cp="🍋" type="tts">Lẹ́mọn</annotation>
+ <annotation cp="🍌">Banána | Frut</annotation>
+ <annotation cp="🍌" type="tts">Banána</annotation>
+ <annotation cp="🍍">Frut | Painápul</annotation>
+ <annotation cp="🍍" type="tts">Painápul</annotation>
+ <annotation cp="🥭">Frut | Mángo</annotation>
+ <annotation cp="🥭" type="tts">Mángo</annotation>
+ <annotation cp="🍎">Frut | Rẹd | Rẹ́d Ápul</annotation>
+ <annotation cp="🍎" type="tts">Rẹ́d Ápul</annotation>
+ <annotation cp="🍏">Frut | Grin | Grín Ápul</annotation>
+ <annotation cp="🍏" type="tts">Grín Ápul</annotation>
+ <annotation cp="🍐">Frut | Pia</annotation>
+ <annotation cp="🍐" type="tts">Pia</annotation>
+ <annotation cp="🍑">Frut | Pich</annotation>
+ <annotation cp="🍑" type="tts">Pich</annotation>
+ <annotation cp="🍒">Chẹ́ri-dẹm | Frut | Rẹd</annotation>
+ <annotation cp="🍒" type="tts">Chẹ́ri-dẹm</annotation>
+ <annotation cp="🍓">Frut | Strọ́bẹ́ri</annotation>
+ <annotation cp="🍓" type="tts">Strọ́bẹ́ri</annotation>
+ <annotation cp="🥝">Frut | Fud | Kíwi</annotation>
+ <annotation cp="🥝" type="tts">Kíwi</annotation>
+ <annotation cp="🍅">Frut | Tomáto | Vẹ́jítébul</annotation>
+ <annotation cp="🍅" type="tts">Tomáto</annotation>
+ <annotation cp="🥥">Kokonọt | Pam</annotation>
+ <annotation cp="🥥" type="tts">Kokonọt</annotation>
+ <annotation cp="🥑">Ávokádo Pia | Frut | Fud</annotation>
+ <annotation cp="🥑" type="tts">Ávokádo Pia</annotation>
+ <annotation cp="🍆">Ẹ́gplant | Obajin | Vẹ́jítébul</annotation>
+ <annotation cp="🍆" type="tts">Ẹ́gplant</annotation>
+ <annotation cp="🥔">Fud | Potéto</annotation>
+ <annotation cp="🥔" type="tts">Potéto</annotation>
+ <annotation cp="🥕">Fud | Kárọt | Vẹ́jítébul</annotation>
+ <annotation cp="🥕" type="tts">Kárọt</annotation>
+ <annotation cp="🌽">Kọn | Mez</annotation>
+ <annotation cp="🌽" type="tts">Kọn</annotation>
+ <annotation cp="🌶">Họt | Họ́t Pẹ́pẹ | Pẹ́pẹ</annotation>
+ <annotation cp="🌶" type="tts">Họ́t Pẹ́pẹ</annotation>
+ <annotation cp="🥒">Fud | Kọkúmba | Vẹ́jítébul</annotation>
+ <annotation cp="🥒" type="tts">Kọkúmba</annotation>
+ <annotation cp="🥬">Grín Lif | Kábéj | Kel | Lẹ́tus</annotation>
+ <annotation cp="🥬" type="tts">Grín Lif</annotation>
+ <annotation cp="🥦">Brọ́kọ́li | Búsh Kábej</annotation>
+ <annotation cp="🥦" type="tts">Brọ́kọ́li</annotation>
+ <annotation cp="🧄">Gálik | Spaísis</annotation>
+ <annotation cp="🧄" type="tts">Gálik</annotation>
+ <annotation cp="🧅">Ọ́niọn | Spaísis</annotation>
+ <annotation cp="🧅" type="tts">Ọ́niọn</annotation>
+ <annotation cp="🍄">Mọ́shrum</annotation>
+ <annotation cp="🍄" type="tts">Mọ́shrum</annotation>
+ <annotation cp="🥜">Fud | Granọt | Nọt</annotation>
+ <annotation cp="🥜" type="tts">Granọt</annotation>
+ <annotation cp="🌰">Chẹ́stnọt | Plant</annotation>
+ <annotation cp="🌰" type="tts">Chẹ́stnọt</annotation>
+ <annotation cp="🍞">Brẹd</annotation>
+ <annotation cp="🍞" type="tts">Brẹd</annotation>
+ <annotation cp="🥐">Brẹd | Brẹ́kfast | Frẹnch | Fud | Kroásant</annotation>
+ <annotation cp="🥐" type="tts">Kroásant</annotation>
+ <annotation cp="🥖">Bagẹt | Frẹnch | Fud</annotation>
+ <annotation cp="🥖" type="tts">Bagẹt</annotation>
+ <annotation cp="🥨">Brẹd | Prẹ́tzẹl | Ring | Twist</annotation>
+ <annotation cp="🥨" type="tts">Prẹ́tzẹl</annotation>
+ <annotation cp="🥯">Bégul | Békri | Brẹ́kfast</annotation>
+ <annotation cp="🥯" type="tts">Bégul</annotation>
+ <annotation cp="🥞">Brẹ́kfast | Fud | Họ́tkek | Pankek</annotation>
+ <annotation cp="🥞" type="tts">Pankek</annotation>
+ <annotation cp="🧇">Brẹ́kfast | Wáful</annotation>
+ <annotation cp="🧇" type="tts">Wáful</annotation>
+ <annotation cp="🧀">Chiz | Chíz Wẹj</annotation>
+ <annotation cp="🧀" type="tts">Chíz Wẹj</annotation>
+ <annotation cp="🍖">Bon | Mit | Mit Ọn Tọ́p Bon</annotation>
+ <annotation cp="🍖" type="tts">Mit Ọn Tọ́p Bon</annotation>
+ <annotation cp="🍗">Bon | Chíkin | Lẹg | Póltri | Póltrí Lẹg | Tai</annotation>
+ <annotation cp="🍗" type="tts">Póltrí Lẹg</annotation>
+ <annotation cp="🥩">Bak | Gọt | Kau | Pig | Pís Ọf Mit | Ram | Tai</annotation>
+ <annotation cp="🥩" type="tts">Pís Ọf Mit</annotation>
+ <annotation cp="🥓">Békọn | Brẹ́kfast | Fud | Mit</annotation>
+ <annotation cp="🥓" type="tts">Békọn</annotation>
+ <annotation cp="🍔">Bọ́ga | Hámbọ́ga</annotation>
+ <annotation cp="🍔" type="tts">Hámbọ́ga</annotation>
+ <annotation cp="🍟">Chips | Frẹ́nch Frais | Potéto | Potétó Chips</annotation>
+ <annotation cp="🍟" type="tts">Potétó Chips</annotation>
+ <annotation cp="🍕">Chiz | Pis | Píza</annotation>
+ <annotation cp="🍕" type="tts">Píza</annotation>
+ <annotation cp="🌭">Fránkfọ́ta | Họ́t Dọg | Sọ́séj</annotation>
+ <annotation cp="🌭" type="tts">Họ́t Dọg</annotation>
+ <annotation cp="🥪">Brẹd | Sándwich</annotation>
+ <annotation cp="🥪" type="tts">Sándwich</annotation>
+ <annotation cp="🌮">Mẹ́ksíko | Rap | Táko</annotation>
+ <annotation cp="🌮" type="tts">Táko</annotation>
+ <annotation cp="🌯">Buríto | Mẹ́ksíko | Rap</annotation>
+ <annotation cp="🌯" type="tts">Buríto</annotation>
+ <annotation cp="🥙">Faláfẹl | Flátbrẹd wit ọ́dá fud ínsaid | Fud | Kẹbab</annotation>
+ <annotation cp="🥙" type="tts">Flátbrẹd wit ọ́dá fud ínsaid</annotation>
+ <annotation cp="🧆">Brẹ́kfast | Faláfẹl | Fud</annotation>
+ <annotation cp="🧆" type="tts">Faláfẹl</annotation>
+ <annotation cp="🥚">Brẹ́kfast | Ẹg | Fud</annotation>
+ <annotation cp="🥚" type="tts">Ẹg</annotation>
+ <annotation cp="🍳">Brẹ́kfast | Ẹg | Frai | Frai Pan | Kúk</annotation>
+ <annotation cp="🍳" type="tts">Kúk</annotation>
+ <annotation cp="🥘">Fud | Kásẹ́rol | Pan | Pọt Wé Nọ́ Dip | Shálo</annotation>
+ <annotation cp="🥘" type="tts">Pọt Wé Nọ́ Dip</annotation>
+ <annotation cp="🍲">Pọt | Pọ́t Ọf Fud | Stiu</annotation>
+ <annotation cp="🍲" type="tts">Pọ́t Ọf Fud</annotation>
+ <annotation cp="🥣">Brẹ́kfast | Díp-plet Wit Spun | Sup</annotation>
+ <annotation cp="🥣" type="tts">Díp-plet Wit Spun</annotation>
+ <annotation cp="🥗">Fud | Grin | Grín Salad | Salad</annotation>
+ <annotation cp="🥗" type="tts">Grín Salad</annotation>
+ <annotation cp="🍿">Kọn | Mez | Pọ́pkọn</annotation>
+ <annotation cp="🍿" type="tts">Pọ́pkọn</annotation>
+ <annotation cp="🧈">Bọ́ta | Deari</annotation>
+ <annotation cp="🧈" type="tts">Bọ́ta</annotation>
+ <annotation cp="🧂">Bọ́tul | Fúd Tins | Kọ́ndímẹnt | Sọlt</annotation>
+ <annotation cp="🧂" type="tts">Sọlt</annotation>
+ <annotation cp="🥫">Kan | Kán Fud | Kọnténa</annotation>
+ <annotation cp="🥫" type="tts">Kán Fud</annotation>
+ <annotation cp="🍱">Bẹ́nto | Bọks</annotation>
+ <annotation cp="🍱" type="tts">Bẹ́nto Bọks</annotation>
+ <annotation cp="🍘">Krákas | Rais | Raís Krákas</annotation>
+ <annotation cp="🍘" type="tts">Raís Krákas</annotation>
+ <annotation cp="🍙">Bọl | Japan | Rais | Raís Bọl</annotation>
+ <annotation cp="🍙" type="tts">Raís Bọl</annotation>
+ <annotation cp="🍚">Kuk | Rais | Rais Wé Dẹm Dọ́n Kuk</annotation>
+ <annotation cp="🍚" type="tts">Rais Wé Dẹm Dọ́n Kuk</annotation>
+ <annotation cp="🍛">Kọrí | Rais</annotation>
+ <annotation cp="🍛" type="tts">Kọrí Rais</annotation>
+ <annotation cp="🍜">Bol | Díp-plet | Họt | Họ́t Ból Ọf Fúd</annotation>
+ <annotation cp="🍜" type="tts">Họ́t Ból Ọf Fúd</annotation>
+ <annotation cp="🍝">Pásta | Spagẹ́ti</annotation>
+ <annotation cp="🍝" type="tts">Spagẹ́ti</annotation>
+ <annotation cp="🍠">Rost | Swit | Swít Potéto Wé Dẹm Rost</annotation>
+ <annotation cp="🍠" type="tts">Swít Potéto Wé Dẹm Rost</annotation>
+ <annotation cp="🍢">Kẹbab | Ódẹn | Sífud | Stik</annotation>
+ <annotation cp="🍢" type="tts">Ódẹn</annotation>
+ <annotation cp="🍣">Súshi</annotation>
+ <annotation cp="🍣" type="tts">Súshi</annotation>
+ <annotation cp="🍤">Fraid | Fraíd Shrimp | Prọns | Shrimp | Tẹmpúra</annotation>
+ <annotation cp="🍤" type="tts">Fraíd Shrimp</annotation>
+ <annotation cp="🍥">Fish | Físh Kek Wit Sẹ́kul | Kek | Pástri | Sẹ́kul</annotation>
+ <annotation cp="🍥" type="tts">Físh Kek Wit Sẹ́kul</annotation>
+ <annotation cp="🥮">Fẹ́stíval | Kek | Mún Kek</annotation>
+ <annotation cp="🥮" type="tts">Mún Kek</annotation>
+ <annotation cp="🍡">Dángó | Dẹzat | Japan | Stik | Swit</annotation>
+ <annotation cp="🍡" type="tts">Dángó</annotation>
+ <annotation cp="🥟">Dọ́mplin | Ẹmpanáda | Gióza | Jiaózi</annotation>
+ <annotation cp="🥟" type="tts">Dọ́mplin</annotation>
+ <annotation cp="🥠">Fọtiún Kúki</annotation>
+ <annotation cp="🥠" type="tts">Fọtiún Kúki</annotation>
+ <annotation cp="🥡">Bọks | Tékaút Bọks</annotation>
+ <annotation cp="🥡" type="tts">Tékaút Bọks</annotation>
+ <annotation cp="🦀">Krab</annotation>
+ <annotation cp="🦀" type="tts">Krab</annotation>
+ <annotation cp="🦞">Lẹg | Lọ́bsta | Sífud</annotation>
+ <annotation cp="🦞" type="tts">Lọ́bsta</annotation>
+ <annotation cp="🦐">Fud | Shẹlfish | Shrimp | Smọl</annotation>
+ <annotation cp="🦐" type="tts">Shrimp</annotation>
+ <annotation cp="🦑">Fud | Skwid</annotation>
+ <annotation cp="🦑" type="tts">Skwid</annotation>
+ <annotation cp="🦪">Daívín Ínsaíd Wọtá | Ọísta | Pẹal</annotation>
+ <annotation cp="🦪" type="tts">Ọísta</annotation>
+ <annotation cp="🍦">Ais | Dẹzat | Shev | Sọ́ft Aís Krim | Swit</annotation>
+ <annotation cp="🍦" type="tts">Sọ́ft Aís Krim</annotation>
+ <annotation cp="🍧">Ais | Ais Wé Dẹm Dọ́n Shev | Dẹzat | Shev | Swit</annotation>
+ <annotation cp="🍧" type="tts">Ais Wé Dẹm Dọ́n Shev</annotation>
+ <annotation cp="🍨">Ais | Aís Krim | Dẹzat | Krim | Swit</annotation>
+ <annotation cp="🍨" type="tts">Aís Krim</annotation>
+ <annotation cp="🍩">Brẹ́kfast | Dẹzat | Dónọt | Swit</annotation>
+ <annotation cp="🍩" type="tts">Dónọt</annotation>
+ <annotation cp="🍪">Dẹzat | Kúki | Swit</annotation>
+ <annotation cp="🍪" type="tts">Kúki</annotation>
+ <annotation cp="🎂">Bátdè | Bátdé Kek | Kek | Pástri | Patí | Swit</annotation>
+ <annotation cp="🎂" type="tts">Bátdé Kek</annotation>
+ <annotation cp="🍰">Dẹzat | Kek | Pástri | Shọ́tkek | Swit</annotation>
+ <annotation cp="🍰" type="tts">Shọ́tkek</annotation>
+ <annotation cp="🧁">Békri | Kọ́pkek | Swit</annotation>
+ <annotation cp="🧁" type="tts">Kọ́pkek</annotation>
+ <annotation cp="🥧">Mítpai | Pai | Pástri</annotation>
+ <annotation cp="🥧" type="tts">Pai</annotation>
+ <annotation cp="🍫">Ckọ́kọ́lét Stik | Dẹzat | Kọ́kọ́lét | Stik | Swit</annotation>
+ <annotation cp="🍫" type="tts">Ckọ́kọ́lét Stik</annotation>
+ <annotation cp="🍬">Dẹzat | Kándi | Swit</annotation>
+ <annotation cp="🍬" type="tts">Kándi</annotation>
+ <annotation cp="🍭">Dẹzat | Kándi | Lọ́lipọp | Swit</annotation>
+ <annotation cp="🍭" type="tts">Lọ́lipọp</annotation>
+ <annotation cp="🍮">Dẹzat | Kọ́stád | Púdin | Swit</annotation>
+ <annotation cp="🍮" type="tts">Kọ́stád</annotation>
+ <annotation cp="🍯">Họ́ni | Pọt | Swit</annotation>
+ <annotation cp="🍯" type="tts">Họ́ni Pọt</annotation>
+ <annotation cp="🍼">Bébi | Bọ́tul | Drink | Fidín Bọ́tul | Mílik</annotation>
+ <annotation cp="🍼" type="tts">Fidín Bọ́tul</annotation>
+ <annotation cp="🥛">Drink | Glas | Glás Ọf Mílik | Mílik</annotation>
+ <annotation cp="🥛" type="tts">Glás Ọf Mílik</annotation>
+ <annotation cp="☕">Drink | Drink Wé Dé Họt | Họ́t Tii | Kọfí</annotation>
+ <annotation cp="☕" type="tts">Drink Wé Dé Họt</annotation>
+ <annotation cp="🍵">Drink | Tii | Tíkọp | Tíkọp Wé Nọ́ Gẹ́t Hand</annotation>
+ <annotation cp="🍵" type="tts">Tíkọp Wé Nọ́ Gẹ́t Hand</annotation>
+ <annotation cp="🍶">Baa | Bọ́tul | Drink | Kọp | Sáki</annotation>
+ <annotation cp="🍶" type="tts">Sáki</annotation>
+ <annotation cp="🍾">Baa | Bọ́tul | Bọ́tul Wit Kọk | Drink | Kọk</annotation>
+ <annotation cp="🍾" type="tts">Bọ́tul Wit Kọk</annotation>
+ <annotation cp="🍷">Baa | Drink | Glas | Wain | Waín Glas</annotation>
+ <annotation cp="🍷" type="tts">Waín Glas</annotation>
+ <annotation cp="🍸">Baa | Drin | Glas | Kọ́ktel | Kọ́ktél Glas</annotation>
+ <annotation cp="🍸" type="tts">Kọ́ktél Glas</annotation>
+ <annotation cp="🍹">Baa | Drink | Họ́t Ríjọn | Họ́t Ríjọn Drink</annotation>
+ <annotation cp="🍹" type="tts">Họ́t Ríjọn Drink</annotation>
+ <annotation cp="🍺">Baa | Biá Kọp | Drink | Kọp | Mọg</annotation>
+ <annotation cp="🍺" type="tts">Biá Kọp</annotation>
+ <annotation cp="🍻">Bia | Drink | Klink | Klínkín Biá Kọp-dẹm | Kọp | Mọg</annotation>
+ <annotation cp="🍻" type="tts">Klínkín Biá Kọp-dẹm</annotation>
+ <annotation cp="🥂">Drink | Glas | Klin | Klínkín Glas-dẹm | Sẹlíbret</annotation>
+ <annotation cp="🥂" type="tts">Klínkín Glas-dẹm</annotation>
+ <annotation cp="🥃">Glas | Họ́t Drink | Líkwọ | Shọt | Tọ́mbla | Wíski</annotation>
+ <annotation cp="🥃" type="tts">Tọ́mbla</annotation>
+ <annotation cp="🥤">Jus | Kọp Wit Strọ | Sóda | Strọ</annotation>
+ <annotation cp="🥤" type="tts">Kọp Wit Strọ</annotation>
+ <annotation cp="🧃">Bọks | Drink | Jus | Strọ | Swit</annotation>
+ <annotation cp="🧃" type="tts">Drink Bọks</annotation>
+ <annotation cp="🧉">Drink | Matẹẹ</annotation>
+ <annotation cp="🧉" type="tts">Matẹẹ</annotation>
+ <annotation cp="🧊">Ais | Aís Blọk | Kold</annotation>
+ <annotation cp="🧊" type="tts">Ais</annotation>
+ <annotation cp="🥢">Chọpstik-dẹm | Háshi</annotation>
+ <annotation cp="🥢" type="tts">Chọpstik-dẹm</annotation>
+ <annotation cp="🍽">Fọk | Fọk An Naif Wit Plet | Kuk | Naif | Plet</annotation>
+ <annotation cp="🍽" type="tts">Fọk An Naif Wit Plet</annotation>
+ <annotation cp="🍴">Fọk | Fọ́k An Naif | Kúkin | Naif</annotation>
+ <annotation cp="🍴" type="tts">Fọ́k An Naif</annotation>
+ <annotation cp="🥄">Chọp | Spun</annotation>
+ <annotation cp="🥄" type="tts">Spun</annotation>
+ <annotation cp="🔪">Kíchín Naif | Kúkin | Naif</annotation>
+ <annotation cp="🔪" type="tts">Kíchín Naif</annotation>
+ <annotation cp="🏺">Ámfora | Drink | Jọg | Kúkin</annotation>
+ <annotation cp="🏺" type="tts">Ámfora</annotation>
+ <annotation cp="🌍">Áfríka | Glob | Map | Raund | Raúnd Wọ́ld Map Wẹ De Shó Yúrop-Áfrika | Wọld | Yúrop</annotation>
+ <annotation cp="🌍" type="tts">Raúnd Wọ́ld Map Wẹ De Shó Yúrop-Áfrika</annotation>
+ <annotation cp="🌎">Amẹ́ríkas | Glob | Raund | Raúnd Wọ́ld Map Wé De Shó Amẹ́ríkas | Wọld</annotation>
+ <annotation cp="🌎" type="tts">Raúnd Wọ́ld Map Wé De Shó Amẹ́ríkas</annotation>
+ <annotation cp="🌏">Éshia | Map | Ọstrélia | Raund | Raúnd Wọ́ld Map Wé De Shó Éshia-Ọstrélia | Wọld</annotation>
+ <annotation cp="🌏" type="tts">Raúnd Wọ́ld Map Wé De Shó Éshia-Ọstrélia</annotation>
+ <annotation cp="🌐">Glob | Lain | Mẹrídian-dẹm | Raund | Raúnd Wọ́ld Map Wit Mẹrídían Lain-dẹm | Wọld</annotation>
+ <annotation cp="🌐" type="tts">Raúnd Wọ́ld Map Wit Mẹrídían Lain-dẹm</annotation>
+ <annotation cp="🗺">Wọld | Wọ́ld Map</annotation>
+ <annotation cp="🗺" type="tts">Wọ́ld Map</annotation>
+ <annotation cp="🗾">Japan | Japán Map | Map</annotation>
+ <annotation cp="🗾" type="tts">Japán Map</annotation>
+ <annotation cp="🧭">Dairẹ́kshọn | Kọ́mpas | Kọ́mpas To Ték Nó Dairẹ́kshọn | Magnẹ́tọ</annotation>
+ <annotation cp="🧭" type="tts">Kọ́mpas To Ték Nó Dairẹ́kshọn</annotation>
+ <annotation cp="🏔">Kold | Maúntin | Maúntin Wé Sno Dé Ọn Tọp | Sno</annotation>
+ <annotation cp="🏔" type="tts">Maúntin Wé Sno Dé Ọn Tọp</annotation>
+ <annotation cp="⛰">Hai | Maúntin</annotation>
+ <annotation cp="⛰" type="tts">Maúntin</annotation>
+ <annotation cp="🌋">Blo | Maúntin | Volkáno</annotation>
+ <annotation cp="🌋" type="tts">Volkáno</annotation>
+ <annotation cp="🗻">Fúji | Fújí Maúntin | Maúntin</annotation>
+ <annotation cp="🗻" type="tts">Fújí Maúntin</annotation>
+ <annotation cp="🏕">Kamp</annotation>
+ <annotation cp="🏕" type="tts">Kamp</annotation>
+ <annotation cp="🏖">Bich | Bich Wit Ọ́mbrẹ́la | Ọ́mbrẹ́la</annotation>
+ <annotation cp="🏖" type="tts">Bich Wit Ọ́mbrẹ́la</annotation>
+ <annotation cp="🏜">Dẹ́zat</annotation>
+ <annotation cp="🏜" type="tts">Dẹ́zat</annotation>
+ <annotation cp="🏝">Aíland | Dẹ́zat | Dẹ́zát Aíland</annotation>
+ <annotation cp="🏝" type="tts">Dẹ́zát Aíland</annotation>
+ <annotation cp="🏞">Náshọ́nál Pak | Pak</annotation>
+ <annotation cp="🏞" type="tts">Náshọ́nál Pak</annotation>
+ <annotation cp="🏟">Stádiọm</annotation>
+ <annotation cp="🏟" type="tts">Stádiọm</annotation>
+ <annotation cp="🏛">Óldín Taim | Óldín Taím Bíldin</annotation>
+ <annotation cp="🏛" type="tts">Óldín Taím Bíldin</annotation>
+ <annotation cp="🏗">Bíldín Kọnstrọ́kshọn | Kọnstrọ́kshọn</annotation>
+ <annotation cp="🏗" type="tts">Bíldín Kọnstrọ́kshọn</annotation>
+ <annotation cp="🧱">Brík | Klé Sansán | Wọl</annotation>
+ <annotation cp="🧱" type="tts">Brík</annotation>
+ <annotation cp="🏘">Haus-dẹm</annotation>
+ <annotation cp="🏘" type="tts">Haus-dẹm</annotation>
+ <annotation cp="🏚">Bád Kọndíshọn | Haus | Haus Wé Dé Fọ Bád Kọndíshọn</annotation>
+ <annotation cp="🏚" type="tts">Haus Wé Dé Fọ Bád Kọndíshọn</annotation>
+ <annotation cp="🏠">Haus | Hom</annotation>
+ <annotation cp="🏠" type="tts">Haus</annotation>
+ <annotation cp="🏡">Gádin | Haus | Haus Wit Gádin | Hom</annotation>
+ <annotation cp="🏡" type="tts">Haus Wit Gádin</annotation>
+ <annotation cp="🏢">Bíldin | Ọ́fís Bíldin</annotation>
+ <annotation cp="🏢" type="tts">Ọ́fís Bíldin</annotation>
+ <annotation cp="🏣">Japan | Japán Póst Ọ́fis | Post</annotation>
+ <annotation cp="🏣" type="tts">Japán Póst Ọ́fis</annotation>
+ <annotation cp="🏤">Post | Póst Ọ́fis | Yúrop</annotation>
+ <annotation cp="🏤" type="tts">Póst Ọ́fis</annotation>
+ <annotation cp="🏥">Dọ́ktọ | Họ́spítal | Mẹ́dísin</annotation>
+ <annotation cp="🏥" type="tts">Họ́spítal</annotation>
+ <annotation cp="🏦">Bank | Bíldin</annotation>
+ <annotation cp="🏦" type="tts">Bank</annotation>
+ <annotation cp="🏨">Bíldin | Họtẹl</annotation>
+ <annotation cp="🏨" type="tts">Họtẹl</annotation>
+ <annotation cp="🏩">Họtẹl | Lọv | Lọ́v Họtẹl</annotation>
+ <annotation cp="🏩" type="tts">Lọ́v Họtẹl</annotation>
+ <annotation cp="🏪">Sẹl | Smọl | Smọ́l Stọ Wé De Sẹ́l Dífrẹ́n Dífrẹ́n Tins | Stọ | Tins</annotation>
+ <annotation cp="🏪" type="tts">Smọ́l Stọ Wé De Sẹ́l Dífrẹ́n Dífrẹ́n Tins</annotation>
+ <annotation cp="🏫">Bíldin | Skul</annotation>
+ <annotation cp="🏫" type="tts">Skul</annotation>
+ <annotation cp="🏬">Bíg Stọ | Bíg Stọ Wé De Sẹ́l Plẹ́ntí Dífrẹ́n Dífrẹ́n Tins | Plẹ́nti | Sẹl | Stọ | Tins</annotation>
+ <annotation cp="🏬" type="tts">Bíg Stọ Wé De Sẹ́l Plẹ́ntí Dífrẹ́n Dífrẹ́n Tins</annotation>
+ <annotation cp="🏭">Bíldin | Fáktri</annotation>
+ <annotation cp="🏭" type="tts">Fáktri</annotation>
+ <annotation cp="🏯">Bíg Strọ́ng Bíldin | Japan | Japán Bíg Strọ́ng Bíldin</annotation>
+ <annotation cp="🏯" type="tts">Japán Bíg Strọ́ng Bíldin</annotation>
+ <annotation cp="🏰">Bíg Strọ́ng Bíldin | Yúrop</annotation>
+ <annotation cp="🏰" type="tts">Bíg Strọ́ng Bíldin</annotation>
+ <annotation cp="💒">Chọch | Lọv | Márej | Romans | Wédin</annotation>
+ <annotation cp="💒" type="tts">Márej</annotation>
+ <annotation cp="🗼">Tókyo | Tọ́wa</annotation>
+ <annotation cp="🗼" type="tts">Tókyo Tọ́wa</annotation>
+ <annotation cp="🗽">Líbáti | Státiu | Státiú Ọf Líbáti</annotation>
+ <annotation cp="🗽" type="tts">Státiú Ọf Líbáti</annotation>
+ <annotation cp="⛪">Chọch | Krístian | Krọs | Rilíjọn</annotation>
+ <annotation cp="⛪" type="tts">Chọch</annotation>
+ <annotation cp="🕌">Íslam | Mọsk | Múslim | Rilíjọn</annotation>
+ <annotation cp="🕌" type="tts">Mọsk</annotation>
+ <annotation cp="🛕">Híndu | Híndú Tẹ́mpul | Tẹ́mpul</annotation>
+ <annotation cp="🛕" type="tts">Híndú Tẹ́mpul</annotation>
+ <annotation cp="🕍">Ju | Judia Pípol | Judiá Pípol Dẹm Preya Haus | Preya Haus | Rilíjọn | Sínágọg</annotation>
+ <annotation cp="🕍" type="tts">Judiá Pípol Dẹm Preya Haus</annotation>
+ <annotation cp="⛩">Japán Rilíjọn | Japán Rilíjọn Jujú Haus | Jujú Haus | Rilíjọn</annotation>
+ <annotation cp="⛩" type="tts">Japán Rilíjọn Jujú Haus</annotation>
+ <annotation cp="🕋">Íslam | Kaaba | Múslim | Rilíjọn</annotation>
+ <annotation cp="🕋" type="tts">Kaaba</annotation>
+ <annotation cp="⛲">Pọ́mp | Sọ́mtin Wé De Pọ́mp Wọtá Gó Ọp | Wọtá</annotation>
+ <annotation cp="⛲" type="tts">Sọ́mtin Wé De Pọ́mp Wọtá Gó Ọp</annotation>
+ <annotation cp="⛺">Kamp | Tẹnt</annotation>
+ <annotation cp="⛺" type="tts">Tẹnt</annotation>
+ <annotation cp="🌁">Fọg | Rod | Si | Tík Klaud | Tík Klaud Wé Nọ́ De Grí Pẹ́sin Sí Rod Wẹl</annotation>
+ <annotation cp="🌁" type="tts">Tík Klaud Wé Nọ́ De Grí Pẹ́sin Sí Rod Wẹl</annotation>
+ <annotation cp="🌃">Nait | Nait Wit Sta-dẹm | Sta</annotation>
+ <annotation cp="🌃" type="tts">Nait Wit Sta-dẹm</annotation>
+ <annotation cp="🏙">Píkchọ | Taun | Taun Píkchọ́</annotation>
+ <annotation cp="🏙" type="tts">Taun Píkchọ́</annotation>
+ <annotation cp="🌄">Maúntin | Píkchọ | Sọn | Sọn As I De Kọmọ́t Ọn Tọ́p Maúntin | Sọn Wẹ́n I De Kọmọt</annotation>
+ <annotation cp="🌄" type="tts">Sọn As I De Kọmọ́t Ọn Tọ́p Maúntin</annotation>
+ <annotation cp="🌅">Mọ́nin | Sọn | Sọn Dọ́n De Kọmọt</annotation>
+ <annotation cp="🌅" type="tts">Sọn Dọ́n De Kọmọt</annotation>
+ <annotation cp="🌆">Ívnin | Sọn Dọ́n De Gò | Taun | Taun Im Píkchọ Wẹ́n Nait Dọ́n De Niálí Rich | Wẹ́n Nait Dọ́n De Niálí Rich</annotation>
+ <annotation cp="🌆" type="tts">Taun Im Píkchọ Wẹ́n Nait Dọ́n De Niálí Rich</annotation>
+ <annotation cp="🌇">Sọn Dọ́n De Gò</annotation>
+ <annotation cp="🌇" type="tts">Sọn Dọ́n De Gò</annotation>
+ <annotation cp="🌉">Brij | Brij Fọ Naít Taim | Nait</annotation>
+ <annotation cp="🌉" type="tts">Brij Fọ Naít Taim</annotation>
+ <annotation cp="♨">Graun | Họt | Họt Wọtá De Kọmọ́t Frọm Ínsaíd Graun | Wọtá</annotation>
+ <annotation cp="♨" type="tts">Họt Wọtá De Kọmọ́t Frọm Ínsaíd Graun</annotation>
+ <annotation cp="🎠">Hápí-Gó-Raúnd | Họs</annotation>
+ <annotation cp="🎠" type="tts">Hápí-Gó-Raúnd Họs</annotation>
+ <annotation cp="🎡">Amíuzmẹ́nt Pak | Fẹ́ris | Fẹ́rís Wiil | Wiil</annotation>
+ <annotation cp="🎡" type="tts">Fẹ́rís Wiil</annotation>
+ <annotation cp="🎢">Amíuzmẹ́nt Pak | Kósta | Róla | Rólá Kósta</annotation>
+ <annotation cp="🎢" type="tts">Rólá Kósta</annotation>
+ <annotation cp="💈">Báb Hea | Bába | Pol</annotation>
+ <annotation cp="💈" type="tts">Bába Pol</annotation>
+ <annotation cp="🎪">Sẹkọs | Sẹkọ́s Tẹnt | Tẹnt</annotation>
+ <annotation cp="🎪" type="tts">Sẹkọ́s Tẹnt</annotation>
+ <annotation cp="🚂">Ẹ́njin | Lokomótív Tren | Relwè | Tren</annotation>
+ <annotation cp="🚂" type="tts">Lokomótív Tren</annotation>
+ <annotation cp="🚃">Ilẹ́ktrik | Kaa | Relwè | Relwé Kaa | Tram | Tren | Trọ́libọs</annotation>
+ <annotation cp="🚃" type="tts">Relwé Kaa</annotation>
+ <annotation cp="🚄">Haí-spíd Tren | Relwè | Spid | Tren</annotation>
+ <annotation cp="🚄" type="tts">Haí-spíd Tren</annotation>
+ <annotation cp="🚅">Búlẹt | Búlẹ́t Tren | Relwè | Shikánsẹn | Spid | Tren</annotation>
+ <annotation cp="🚅" type="tts">Búlẹ́t Tren</annotation>
+ <annotation cp="🚆">Relwè | Tren</annotation>
+ <annotation cp="🚆" type="tts">Tren</annotation>
+ <annotation cp="🚇">Mẹ́tro | Sọ́bwè</annotation>
+ <annotation cp="🚇" type="tts">Mẹ́tro</annotation>
+ <annotation cp="🚈">Laít Rel | Relwè</annotation>
+ <annotation cp="🚈" type="tts">Laít Rel</annotation>
+ <annotation cp="🚉">Relwè | Stéshọn | Tren</annotation>
+ <annotation cp="🚉" type="tts">Stéshọn</annotation>
+ <annotation cp="🚊">Tram | Trọlíbọs</annotation>
+ <annotation cp="🚊" type="tts">Tram</annotation>
+ <annotation cp="🚝">Mónórel | Móto</annotation>
+ <annotation cp="🚝" type="tts">Mónórel</annotation>
+ <annotation cp="🚞">Kaa | Maúntin | Maúntín Relwè | Rélwè</annotation>
+ <annotation cp="🚞" type="tts">Maúntín Relwè</annotation>
+ <annotation cp="🚋">Kaa | Tram | Trám Kaa | Trọlíbọs</annotation>
+ <annotation cp="🚋" type="tts">Trám Kaa</annotation>
+ <annotation cp="🚌">Bọs | Móto</annotation>
+ <annotation cp="🚌" type="tts">Bọs</annotation>
+ <annotation cp="🚍">Bọs | Bọs Wé De Kọ́m Wiá Yu Dè | Sọ́mtin Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚍" type="tts">Bọs Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚎">Bọs | Tram | Trọlí | Trọlíbọs</annotation>
+ <annotation cp="🚎" type="tts">Trọlíbọs</annotation>
+ <annotation cp="🚐">Bọs | Míníbọs</annotation>
+ <annotation cp="🚐" type="tts">Míníbọs</annotation>
+ <annotation cp="🚑">Ámbúlans | Móto</annotation>
+ <annotation cp="🚑" type="tts">Ámbúlans</annotation>
+ <annotation cp="🚒">Fáya | Fáyá Ẹ́njin | Móto</annotation>
+ <annotation cp="🚒" type="tts">Fáyá Ẹ́njin</annotation>
+ <annotation cp="🚓">Kaa | Móto | Patrol | Polis | Polís Móto</annotation>
+ <annotation cp="🚓" type="tts">Polís Móto</annotation>
+ <annotation cp="🚔">Kaa | Kọ́m Wiá Yu Dè | Móto | Polís Móto Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚔" type="tts">Polís Móto Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚕">Móto | Taksí</annotation>
+ <annotation cp="🚕" type="tts">Taksí</annotation>
+ <annotation cp="🚖">Taksí Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚖" type="tts">Taksí Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚗">Kaa | Móto</annotation>
+ <annotation cp="🚗" type="tts">Móto</annotation>
+ <annotation cp="🚘">Kaa | Móto | Móto Wé De Kọ́m Wiá Yu Dè | Sọ́mtin Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚘" type="tts">Móto Wé De Kọ́m Wiá Yu Dè</annotation>
+ <annotation cp="🚙">Spọt Yútílíti | Spọt Yútílíti Móto</annotation>
+ <annotation cp="🚙" type="tts">Spọt Yútílíti Móto</annotation>
+ <annotation cp="🚚">Kári | Móto | Móto Wé De Kárí Tins To Kọ́stọ́ma-dẹm | Pẹ́sin</annotation>
+ <annotation cp="🚚" type="tts">Móto Wé De Kárí Tins To Kọ́stọ́ma-dẹm</annotation>
+ <annotation cp="🚛">Lọ́ri | Tréla</annotation>
+ <annotation cp="🚛" type="tts">Tréla</annotation>
+ <annotation cp="🚜">Móto | Tráktọ</annotation>
+ <annotation cp="🚜" type="tts">Tráktọ</annotation>
+ <annotation cp="🏎">Kaa | Kaa Wé Bi Fọ Résín Kọmpitíshọn | Résin</annotation>
+ <annotation cp="🏎" type="tts">Kaa Wé Bi Fọ Résín Kọmpitíshọn</annotation>
+ <annotation cp="🏍">Motosaíkul | Résín Kọmpitíshọn</annotation>
+ <annotation cp="🏍" type="tts">Motosaíkul</annotation>
+ <annotation cp="🛵">Motosaíkul | Skuta | Skúta Motosaíkul</annotation>
+ <annotation cp="🛵" type="tts">Skúta Motosaíkul</annotation>
+ <annotation cp="🦽">Ẹ́njin | Wílchia | Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🦽" type="tts">Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🦼">Ẹ́njin | Wílchia | Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🦼" type="tts">Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="🛺">Kẹkẹ́ | Kẹkẹ́ Napẹp</annotation>
+ <annotation cp="🛺" type="tts">Kẹkẹ́ Napẹp</annotation>
+ <annotation cp="🚲">Baik | Baísíkul</annotation>
+ <annotation cp="🚲" type="tts">Baísíkul</annotation>
+ <annotation cp="🛴">Kík | Skúta</annotation>
+ <annotation cp="🛴" type="tts">Kík Skúta</annotation>
+ <annotation cp="🛹">Bọd | Skétbọd</annotation>
+ <annotation cp="🛹" type="tts">Skétbọd</annotation>
+ <annotation cp="🚏">Bọs | Bọ́s Stọp | Stọp</annotation>
+ <annotation cp="🚏" type="tts">Bọ́s Stọp</annotation>
+ <annotation cp="🛣">Ẹ́sprẹs | Haíwè | Rod</annotation>
+ <annotation cp="🛣" type="tts">Ẹ́sprẹs</annotation>
+ <annotation cp="🛤">Relwè | Relwé Lain | Tren</annotation>
+ <annotation cp="🛤" type="tts">Relwé Lain</annotation>
+ <annotation cp="🛢">Drọm | Ọ́yil</annotation>
+ <annotation cp="🛢" type="tts">Ọ́yil Drọm</annotation>
+ <annotation cp="⛽">Dízẹl | Fúẹl Pọmp | Pẹtrol | Pẹtról Stéshọn</annotation>
+ <annotation cp="⛽" type="tts">Fúẹl Pọmp</annotation>
+ <annotation cp="🚨">Kaa | Móto | Polis | Polís Kaa Lait | Tọ́n Raund</annotation>
+ <annotation cp="🚨" type="tts">Polís Kaa Lait</annotation>
+ <annotation cp="🚥">Flát-an-Lẹ́vúl | Flát-an-Lẹ́vúl Tráfík Lait | Lait | Sígnal | Tráfik</annotation>
+ <annotation cp="🚥" type="tts">Flát-an-Lẹ́vúl Tráfík Lait</annotation>
+ <annotation cp="🚦">Lait | Ọ́p An Daun | Sígnal | Stret | Tráfik | Tráfík Lait Wé Dé Stret Frọm Ọ́p Rích Daun</annotation>
+ <annotation cp="🚦" type="tts">Tráfík Lait Wé Dé Stret Frọm Ọ́p Rích Daun</annotation>
+ <annotation cp="🛑">Ẹ́t Said | Sain | Stọp | Stọ́p Sain</annotation>
+ <annotation cp="🛑" type="tts">Stọ́p Sain</annotation>
+ <annotation cp="🚧">Kọnstrọ́kshọn | Ródblọk</annotation>
+ <annotation cp="🚧" type="tts">Kọnstrọ́kshọn</annotation>
+ <annotation cp="⚓">Ánkọ | Áyọn | Hẹ́ví Áyọn Wé De Hól Ship Fọ Wọ́n Ples | Ship | Tul</annotation>
+ <annotation cp="⚓" type="tts">Hẹ́ví Áyọn Wé De Hól Ship Fọ Wọ́n Ples</annotation>
+ <annotation cp="⛵">Bíg-Díp-Wọtá | Bot | Sélbot | Yọch</annotation>
+ <annotation cp="⛵" type="tts">Sélbot</annotation>
+ <annotation cp="🛶">Bot | Kénu</annotation>
+ <annotation cp="🛶" type="tts">Kénu</annotation>
+ <annotation cp="🚤">Bot | Spídbot</annotation>
+ <annotation cp="🚤" type="tts">Spídbot</annotation>
+ <annotation cp="🛳">Pásínja | Pásínjá Ship | Ship</annotation>
+ <annotation cp="🛳" type="tts">Pásínjá Ship</annotation>
+ <annotation cp="⛴">Bot | Fẹ́ri | Pásínja</annotation>
+ <annotation cp="⛴" type="tts">Fẹ́ri</annotation>
+ <annotation cp="🛥">Bot | Moto Bot | Motobot</annotation>
+ <annotation cp="🛥" type="tts">Moto Bot</annotation>
+ <annotation cp="🚢">Bot | Pásínja | Ship</annotation>
+ <annotation cp="🚢" type="tts">Ship</annotation>
+ <annotation cp="✈">Eáplen | Eroplen</annotation>
+ <annotation cp="✈" type="tts">Eáplen</annotation>
+ <annotation cp="🛩">Eáplen | Eroplen | Smọ́l Eáplen</annotation>
+ <annotation cp="🛩" type="tts">Smọ́l Eáplen</annotation>
+ <annotation cp="🛫">Chẹ́k-In | Eáplen As I De Lív Eápọt | Eápọt | Eroplen | Kọmọ́t Frọm Sọm Ples</annotation>
+ <annotation cp="🛫" type="tts">Eáplen As I De Lív Eápọt</annotation>
+ <annotation cp="🛬">Araiv | Eáplen Wé De Araív Fọ Eápọt | Eápọt | Eroplen | Lándin</annotation>
+ <annotation cp="🛬" type="tts">Eáplen Wé De Araív Fọ Eápọt</annotation>
+ <annotation cp="🪂">Daív Frọm Skai | Páráshut</annotation>
+ <annotation cp="🪂" type="tts">Páráshut</annotation>
+ <annotation cp="💺">Chia | Sit</annotation>
+ <annotation cp="💺" type="tts">Sit</annotation>
+ <annotation cp="🚁">Hẹlikọ́pta | Plen</annotation>
+ <annotation cp="🚁" type="tts">Hẹlikọ́pta</annotation>
+ <annotation cp="🚟">Hángin | Hángín Rélwè | Rélwè</annotation>
+ <annotation cp="🚟" type="tts">Hángín Rélwè</annotation>
+ <annotation cp="🚠">Kébul | Kébulwè | Maúntin | Maúntín Kébulwè</annotation>
+ <annotation cp="🚠" type="tts">Maúntín Kébulwè</annotation>
+ <annotation cp="🚡">Érial | Eriál Trámwè | Kaa | Kébul | Trámwè</annotation>
+ <annotation cp="🚡" type="tts">Eriál Trámwè</annotation>
+ <annotation cp="🛰">Sátẹ́lait | Spes</annotation>
+ <annotation cp="🛰" type="tts">Sátẹ́lait</annotation>
+ <annotation cp="🚀">Rọ́kẹt | Spes</annotation>
+ <annotation cp="🚀" type="tts">Rọ́kẹt</annotation>
+ <annotation cp="🛸">Fláyín Sọ́sa | UFO</annotation>
+ <annotation cp="🛸" type="tts">Fláyín Sọ́sa</annotation>
+ <annotation cp="🛎">Bẹl | Bẹ́lhọ́p Bẹl | Họtẹl</annotation>
+ <annotation cp="🛎" type="tts">Bẹ́lhọ́p Bẹl</annotation>
+ <annotation cp="🧳">Lọ́gej | Pak | Trávul</annotation>
+ <annotation cp="🧳" type="tts">Lọ́gej</annotation>
+ <annotation cp="⌛">Áwaglás Sand Dọ́n Fló Fínish | Sand | Taíma</annotation>
+ <annotation cp="⌛" type="tts">Áwaglás Sand Dọ́n Fló Fínish</annotation>
+ <annotation cp="⏳">Áwaglas | Áwaglás Sand Nẹ́vá Fló Fínish | Sand | Taíma</annotation>
+ <annotation cp="⏳" type="tts">Áwaglás Sand Nẹ́vá Fló Fínish</annotation>
+ <annotation cp="⌚">Klọk | Wọch</annotation>
+ <annotation cp="⌚" type="tts">Wọch</annotation>
+ <annotation cp="⏰">Alam | Alám Klọk | Klọk</annotation>
+ <annotation cp="⏰" type="tts">Alám Klọk</annotation>
+ <annotation cp="⏱">Klọk | Stọ́pwọch</annotation>
+ <annotation cp="⏱" type="tts">Stọ́pwọch</annotation>
+ <annotation cp="⏲">Klọk | Taíma | Taímá Klọk</annotation>
+ <annotation cp="⏲" type="tts">Taímá Klọk</annotation>
+ <annotation cp="🕰">Klọk | Mántulpís Klọk</annotation>
+ <annotation cp="🕰" type="tts">Mántulpís Klọk</annotation>
+ <annotation cp="🕛">00 | 12 | 12:00 | Klọk | O’klọk | Twẹlf | Twẹ́lf O’klọk</annotation>
+ <annotation cp="🕛" type="tts">Twẹ́lf O’klọk</annotation>
+ <annotation cp="🕧">12 | 12:30 | Klọk | Táti | Twẹlf | Twẹ́lf-Táti</annotation>
+ <annotation cp="🕧" type="tts">Twẹ́lf-Táti</annotation>
+ <annotation cp="🕐">00 | 1 | 1:00 | Klọk | O’klọk | Wọn | Wọ́n O’klọk</annotation>
+ <annotation cp="🕐" type="tts">Wọ́n O’klọk</annotation>
+ <annotation cp="🕜">1 | 1:30 | Klọk | Táti | Wọn | Wọ́n-Táti</annotation>
+ <annotation cp="🕜" type="tts">Wọ́n-Táti</annotation>
+ <annotation cp="🕑">00 | 2 | 2:00 | Klọk | O’klọk | Tu | Tú O’klọk</annotation>
+ <annotation cp="🕑" type="tts">Tú O’klọk</annotation>
+ <annotation cp="🕝">2 | 2:30 | Klọk | Táti | Tu | Tú-Táti</annotation>
+ <annotation cp="🕝" type="tts">Tú-Táti</annotation>
+ <annotation cp="🕒">00 | 3 | 3:00 | Klọk | O’klọk | Tíri | Tírí O’klọk</annotation>
+ <annotation cp="🕒" type="tts">Tírí O’klọk</annotation>
+ <annotation cp="🕞">3 | 3:30 | Klọk | Táti | Tíri | Tírí-Táti</annotation>
+ <annotation cp="🕞" type="tts">Tírí-Táti</annotation>
+ <annotation cp="🕓">00 | 4 | 4:00 | Fọ̀ | Fọ́ O’klọk | Klọk | O’klọk</annotation>
+ <annotation cp="🕓" type="tts">Fọ́ O’klọk</annotation>
+ <annotation cp="🕟">4 | 4:30 | Fọ̀ | Fọ́-Táti | Táti</annotation>
+ <annotation cp="🕟" type="tts">Fọ́-Táti</annotation>
+ <annotation cp="🕔">00 | 5 | 5:00 | Faíf | Klọk | O’klọk</annotation>
+ <annotation cp="🕔" type="tts">Faíf O’klọk</annotation>
+ <annotation cp="🕠">5 | 5:30 | Faíf-Táti | Klọk | Táti</annotation>
+ <annotation cp="🕠" type="tts">Faíf-Táti</annotation>
+ <annotation cp="🕕">00 | 6 | 6:00 | Klọk | O’klọk | Siks | Síks O’klọk</annotation>
+ <annotation cp="🕕" type="tts">Síks O’klọk</annotation>
+ <annotation cp="🕡">6 | 6:30 | Klọk | Siks | Síks-Táti | Táti</annotation>
+ <annotation cp="🕡" type="tts">Síks-Táti</annotation>
+ <annotation cp="🕖">00 | 7 | 7:00 | Klọk | O’klọk | Sẹ́vun | Sẹ́vún O’klọk</annotation>
+ <annotation cp="🕖" type="tts">Sẹ́vún O’klọk</annotation>
+ <annotation cp="🕢">7 | 7:30 | Klọk | Sẹ́vun | Sẹ́vún-Táti | Táti</annotation>
+ <annotation cp="🕢" type="tts">Sẹ́vún-Táti</annotation>
+ <annotation cp="🕗">00 | 8 | 8:00 | Ẹt | Ẹ́t O’klọk | Klọk | O’klọk</annotation>
+ <annotation cp="🕗" type="tts">Ẹ́t O’klọk</annotation>
+ <annotation cp="🕣">8 | 8:30 | Ẹt | Ẹ́t-Táti | Klọk | Táti</annotation>
+ <annotation cp="🕣" type="tts">Ẹ́t-Táti</annotation>
+ <annotation cp="🕘">00 | 9 | 9:00 | Klọk | Nain | Naín O’klọk | O’klọk</annotation>
+ <annotation cp="🕘" type="tts">Naín O’klọk</annotation>
+ <annotation cp="🕤">9 | 9:30 | Klọk | Nain | Naín-Táti | Táti</annotation>
+ <annotation cp="🕤" type="tts">Naín-Táti</annotation>
+ <annotation cp="🕙">00 | 10 | 10:00 | Klọk | O’klọk | Tẹn | Tẹ́n O’klọk</annotation>
+ <annotation cp="🕙" type="tts">Tẹ́n O’klọk</annotation>
+ <annotation cp="🕥">10 | 10:30 | Klọk | Táti | Tẹn | Tẹ́n-Táti</annotation>
+ <annotation cp="🕥" type="tts">Tẹ́n-Táti</annotation>
+ <annotation cp="🕚">00 | 11 | 11:00 | Ilẹ́vun | Ilẹ́vún O’klọk | Klọk | O’klọk</annotation>
+ <annotation cp="🕚" type="tts">Ilẹ́vún O’klọk</annotation>
+ <annotation cp="🕦">11 | 11:30 | Ilẹ́vun | Ilẹ́vún-Táti | Klọk | Táti</annotation>
+ <annotation cp="🕦" type="tts">Ilẹ́vún-Táti</annotation>
+ <annotation cp="🌑">Dak | Mun | Mun Dọ́n Kọmọt | Niú Mun | Níu Mun</annotation>
+ <annotation cp="🌑" type="tts">Níu Mun</annotation>
+ <annotation cp="🌒">Big | Brait | Mọ́ Mọ | Mun | Mun Braít Pat Jọ́s Stát To Bíg Mọ́ Mọ</annotation>
+ <annotation cp="🌒" type="tts">Mun Braít Pat Jọ́s Stát To Bíg Mọ́ Mọ</annotation>
+ <annotation cp="🌓">Fẹst | Kwọ́ta | Mun | Mún Im Fẹ́st Kwọ́ta</annotation>
+ <annotation cp="🌓" type="tts">Mún Im Fẹ́st Kwọ́ta</annotation>
+ <annotation cp="🌔">Brait | Mun | Mun Braít Pat Bíg Pás Háf Di Mun</annotation>
+ <annotation cp="🌔" type="tts">Mun Braít Pat Bíg Pás Háf Di Mun</annotation>
+ <annotation cp="🌕">Fúl | Mun</annotation>
+ <annotation cp="🌕" type="tts">Fúl Mun</annotation>
+ <annotation cp="🌖">Go | Mun | Mun Dọ́n Stát To Go</annotation>
+ <annotation cp="🌖" type="tts">Mun Dọ́n Stát To Go</annotation>
+ <annotation cp="🌗">Kwọ́ta | Last | Mun Im Lást Kwọ́ta</annotation>
+ <annotation cp="🌗" type="tts">Mun Im Lást Kwọ́ta</annotation>
+ <annotation cp="🌘">Go | Mun | Mun Dọ́n De Niálí Gó Fínish</annotation>
+ <annotation cp="🌘" type="tts">Mun Dọ́n De Niálí Gó Fínish</annotation>
+ <annotation cp="🌙">Krísẹnt | Krísẹ́nt Mun | Mun</annotation>
+ <annotation cp="🌙" type="tts">Krísẹ́nt Mun</annotation>
+ <annotation cp="🌚">Fes | Mun | Niu | Niú Mún Fes</annotation>
+ <annotation cp="🌚" type="tts">Niú Mún Fes</annotation>
+ <annotation cp="🌛">Fes | Fẹ́st | Fẹ́st Kwọ́ta Mún Fes | Kwọ́ta | Mun</annotation>
+ <annotation cp="🌛" type="tts">Fẹ́st Kwọ́ta Mún Fes</annotation>
+ <annotation cp="🌜">Fes | Kwọ́tá | Lást | Lást Kwọ́ta Mún Fes | Mun</annotation>
+ <annotation cp="🌜" type="tts">Lást Kwọ́ta Mún Fes</annotation>
+ <annotation cp="🌡">Tamómíta | Wẹ́da</annotation>
+ <annotation cp="🌡" type="tts">Tamómíta</annotation>
+ <annotation cp="☀">Brait | Shain | Sọn</annotation>
+ <annotation cp="☀" type="tts">Sọn</annotation>
+ <annotation cp="🌝">Brait | Fes | Ful | Fúl Mun Fes | Mun</annotation>
+ <annotation cp="🌝" type="tts">Fúl Mun Fes</annotation>
+ <annotation cp="🌞">Brait | Fes | Sọn | Sọn Wit Fes</annotation>
+ <annotation cp="🌞" type="tts">Sọn Wit Fes</annotation>
+ <annotation cp="🪐">Plánẹt | Plánẹt Wé Ríng Sọraund | Ring | Sọraund</annotation>
+ <annotation cp="🪐" type="tts">Plánẹt Wé Ríng Sọraund</annotation>
+ <annotation cp="⭐">Sta</annotation>
+ <annotation cp="⭐" type="tts">Sta</annotation>
+ <annotation cp="🌟">Shainin | Shaínín Sta | Sta</annotation>
+ <annotation cp="🌟" type="tts">Shaínín Sta</annotation>
+ <annotation cp="🌠">Fọ́lin | Shútin | Shútín Sta | Sta</annotation>
+ <annotation cp="🌠" type="tts">Shútín Sta</annotation>
+ <annotation cp="🌌">Mílkí Wè | Spes</annotation>
+ <annotation cp="🌌" type="tts">Mílkí Wè</annotation>
+ <annotation cp="☁">Klaud | Wẹ́da</annotation>
+ <annotation cp="☁" type="tts">Klaud</annotation>
+ <annotation cp="⛅">Klaud | Sọn | Sọn Bihaínd Klaud</annotation>
+ <annotation cp="⛅" type="tts">Sọn Bihaínd Klaud</annotation>
+ <annotation cp="⛈">Klaud | Klaud Wit Laítnin An Ren | Laítnin | Ren | Tọ́nda</annotation>
+ <annotation cp="⛈" type="tts">Klaud Wit Laítnin An Ren</annotation>
+ <annotation cp="🌤">Klaud | Sọn | Sọn Bihaínd Smọl Klaud</annotation>
+ <annotation cp="🌤" type="tts">Sọn Bihaínd Smọl Klaud</annotation>
+ <annotation cp="🌥">Klaud | Sọn | Sọn Bihaínd Bíg Klaud</annotation>
+ <annotation cp="🌥" type="tts">Sọn Bihaínd Bíg Klaud</annotation>
+ <annotation cp="🌦">Klaud | Ren | Sọn | Sọn Bihaínd Klaud Wé De Bríng Ren</annotation>
+ <annotation cp="🌦" type="tts">Sọn Bihaínd Klaud Wé De Bríng Ren</annotation>
+ <annotation cp="🌧">Klaud | Klaud Wit Ren | Ren</annotation>
+ <annotation cp="🌧" type="tts">Klaud Wit Ren</annotation>
+ <annotation cp="🌨">Klaud | Klaud Wit Sno | Kold | Sno</annotation>
+ <annotation cp="🌨" type="tts">Klaud Wit Sno</annotation>
+ <annotation cp="🌩">Klaud | Klaud Wit Laítnin | Laítnin</annotation>
+ <annotation cp="🌩" type="tts">Klaud Wit Laítnin</annotation>
+ <annotation cp="🌪">Klaud | Strọ́ng Wind | Tọnádo</annotation>
+ <annotation cp="🌪" type="tts">Tọnádo</annotation>
+ <annotation cp="🌫">Fọg | Klaud</annotation>
+ <annotation cp="🌫" type="tts">Fọg</annotation>
+ <annotation cp="🌬">Blo | Fes | Klaud | Wind | Wínd Fes</annotation>
+ <annotation cp="🌬" type="tts">Wínd Fes</annotation>
+ <annotation cp="🌀">Họriken | Saiklon | Taifun</annotation>
+ <annotation cp="🌀" type="tts">Saiklon</annotation>
+ <annotation cp="🌈">Ren | Rénbo</annotation>
+ <annotation cp="🌈" type="tts">Rénbo</annotation>
+ <annotation cp="🌂">Klọt | Klóz Ọ́mbrẹ́la | Ọ́mbrẹ́la | Ren</annotation>
+ <annotation cp="🌂" type="tts">Klóz Ọ́mbrẹ́la</annotation>
+ <annotation cp="☂">Klọt | Ọ́mbrẹ́la | Ren</annotation>
+ <annotation cp="☂" type="tts">Ọ́mbrẹ́la</annotation>
+ <annotation cp="☔">Drọp | Klọt | Ọ́mbrẹ́la | Ọ́mbrẹ́la Wé Rén Drọp-dẹm Dé Ọn Tọp | Ren</annotation>
+ <annotation cp="☔" type="tts">Ọ́mbrẹ́la Wé Rén Drọp-dẹm Dé Ọn Tọp</annotation>
+ <annotation cp="⛱">Graund | Ọ́mbrẹ́la | Ọ́mbrẹ́la Ọn Tọ́p Graund | Ren | Sọn</annotation>
+ <annotation cp="⛱" type="tts">Ọ́mbrẹ́la Ọn Tọ́p Graund</annotation>
+ <annotation cp="⚡">Dénja | Ẹlẹ́trik | Haí Vóltej | Haí Vóltéj Ẹlẹ́trik | Laítnin</annotation>
+ <annotation cp="⚡" type="tts">Haí Vóltéj Ẹlẹ́trik</annotation>
+ <annotation cp="❄">Kold | Smọ́l Ais Wé Fọ́l Frọm Skai As Sno | Sno</annotation>
+ <annotation cp="❄" type="tts">Smọ́l Ais Wé Fọ́l Frọm Skai As Sno</annotation>
+ <annotation cp="☃">Cold | Sno | Snóman</annotation>
+ <annotation cp="☃" type="tts">Snóman</annotation>
+ <annotation cp="⛄">Kold | Sno | Snóman | Snóman Wé Sno Nọ́ Dé Ọn Tọ́p Am</annotation>
+ <annotation cp="⛄" type="tts">Snóman Wé Sno Nọ́ Dé Ọn Tọ́p Am</annotation>
+ <annotation cp="☄">Kọ́mẹt | Spes</annotation>
+ <annotation cp="☄" type="tts">Kọ́mẹt</annotation>
+ <annotation cp="🔥">Fáya</annotation>
+ <annotation cp="🔥" type="tts">Fáya</annotation>
+ <annotation cp="💧">Drop | Kold | Líkwíd | Smọ́l Drọ́p Ọf Líkwíd | Swẹt</annotation>
+ <annotation cp="💧" type="tts">Smọ́l Drọ́p Ọf Líkwíd</annotation>
+ <annotation cp="🌊">Bíg-Díp-Wọtá | Óshẹn | Wev | Wọtá Wev</annotation>
+ <annotation cp="🌊" type="tts">Wọtá Wev</annotation>
+ <annotation cp="🎃">Jak | Jak-O-Lántan | Lántan | Sẹlibréshọn</annotation>
+ <annotation cp="🎃" type="tts">Jak-O-Lántan</annotation>
+ <annotation cp="🎄">Fẹ́stíval | Krísmás | Tri</annotation>
+ <annotation cp="🎄" type="tts">Krísmás Tri</annotation>
+ <annotation cp="🎆">Fáyáwọks | Sẹlibréshọn</annotation>
+ <annotation cp="🎆" type="tts">Fáyáwọks</annotation>
+ <annotation cp="🎇">Sẹlibréshọn | Spákla | Spákul</annotation>
+ <annotation cp="🎇" type="tts">Spákla</annotation>
+ <annotation cp="🧨">Daínámait | Ẹksplósiv | Fáyákráka</annotation>
+ <annotation cp="🧨" type="tts">Fáyákráka</annotation>
+ <annotation cp="✨">Spákul | Spákuls | Sta</annotation>
+ <annotation cp="✨" type="tts">Spákuls</annotation>
+ <annotation cp="🎈">Balun | Sẹlibréshọn</annotation>
+ <annotation cp="🎈" type="tts">Balun</annotation>
+ <annotation cp="🎉">Patí | Pátí Pọ́pa | Pọ́pa | Tádá</annotation>
+ <annotation cp="🎉" type="tts">Pátí Pọ́pa</annotation>
+ <annotation cp="🎊">Bọl | Kọnfẹ́ti | Sẹlibréshọn</annotation>
+ <annotation cp="🎊" type="tts">Kọnfẹ́ti Bọl</annotation>
+ <annotation cp="🎋">Bána | Japa | Sẹlibréshọn | Tanábáta | Tanábátá Tri | Tri</annotation>
+ <annotation cp="🎋" type="tts">Tanábátá Tri</annotation>
+ <annotation cp="🎍">Bambú | Japan | Páin | Paín Dẹkọréshọn | Sẹlibréshọn</annotation>
+ <annotation cp="🎍" type="tts">Paín Dẹkọréshọn</annotation>
+ <annotation cp="🎎">Dọlbebí | Fẹ́stíval | Japan | Japán Dọlbebí-dẹm | Sẹlibréshọn</annotation>
+ <annotation cp="🎎" type="tts">Japán Dọlbebí-dẹm</annotation>
+ <annotation cp="🎏">Kárp Fish | Kárp Físh Stríma | Sẹlibréshọn | Stríma</annotation>
+ <annotation cp="🎏" type="tts">Kárp Físh Stríma</annotation>
+ <annotation cp="🎐">Bẹl | Chaim | Sẹlibréshọn | Wind | Wínd Chaim</annotation>
+ <annotation cp="🎐" type="tts">Wínd Chaim</annotation>
+ <annotation cp="🎑">Fẹ́stíval | Fẹ́stival Wé Japán Pípol De Ték Ọ́nọ́ Mun | Japan | Mun | Sẹlibréshọn | Sẹ́rẹ́mọ́ni</annotation>
+ <annotation cp="🎑" type="tts">Fẹ́stival Wé Japán Pípol De Ték Ọ́nọ́ Mun</annotation>
+ <annotation cp="🧧">Ẹnvẹ́lop | Gift | Gúd Lọk | Mọ́ni | Rẹd | Rẹ́d Ẹnvẹ́lop</annotation>
+ <annotation cp="🧧" type="tts">Rẹ́d Ẹnvẹ́lop</annotation>
+ <annotation cp="🎀">Ríbọn | Sẹlibréshọn</annotation>
+ <annotation cp="🎀" type="tts">Ríbọn</annotation>
+ <annotation cp="🎁">Bọks | Gift | Gift Wé Dẹm Ráp Wit Sọ́mtin | Rap | Sẹlibréshọn</annotation>
+ <annotation cp="🎁" type="tts">Gift Wé Dẹm Ráp Wit Sọ́mtin</annotation>
+ <annotation cp="🎗">Ríbọn | Ríbọn To Ték Shó Sọpọt Fọ Sọ́mtin Ọ Grup | Sẹlibréshọn | Sọpọt</annotation>
+ <annotation cp="🎗" type="tts">Ríbọn To Ték Shó Sọpọt Fọ Sọ́mtin Ọ Grup</annotation>
+ <annotation cp="🎟">Gẹ́t Rait | Tíkẹt | Tíkẹt-dẹm To Gẹ́t Rait To Ẹ́ntá Sọm Ples</annotation>
+ <annotation cp="🎟" type="tts">Tíkẹt-dẹm To Gẹ́t Rait To Ẹ́ntá Sọm Ples</annotation>
+ <annotation cp="🎫">Gẹ́t Rait | Tíkẹt</annotation>
+ <annotation cp="🎫" type="tts">Tíkẹt</annotation>
+ <annotation cp="🎖">Mẹ́dal | Mílítri | Mílítrí Mẹ́dal | Sẹlibréshọn</annotation>
+ <annotation cp="🎖" type="tts">Mílítrí Mẹ́dal</annotation>
+ <annotation cp="🏆">Kọp | Praiz</annotation>
+ <annotation cp="🏆" type="tts">Kọp</annotation>
+ <annotation cp="🏅">Mẹ́dal | Spọts Mẹ́dal</annotation>
+ <annotation cp="🏅" type="tts">Spọts Mẹ́dal</annotation>
+ <annotation cp="🥇">1st Plés Mẹ́dal | Fẹ́st | Gold | Mẹ́dal</annotation>
+ <annotation cp="🥇" type="tts">1st Plés Mẹ́dal</annotation>
+ <annotation cp="🥈">2nd Plés Mẹ́dal | Mẹ́dal | Sẹ́kọn | Sílva</annotation>
+ <annotation cp="🥈" type="tts">2nd Plés Mẹ́dal</annotation>
+ <annotation cp="🥉">3rd Plés Mẹ́dal | Bronz | Mẹ́dal | Tẹd</annotation>
+ <annotation cp="🥉" type="tts">3rd Plés Mẹ́dal</annotation>
+ <annotation cp="⚽">Bọl | Fútbọl | Sọ́ka</annotation>
+ <annotation cp="⚽" type="tts">Sọ́ka Bọl</annotation>
+ <annotation cp="⚾">Bésbọl | Bọl</annotation>
+ <annotation cp="⚾" type="tts">Bésbọl</annotation>
+ <annotation cp="🥎">Bọl | Glov | Ọ́ndáram | Sọ́ftbọl</annotation>
+ <annotation cp="🥎" type="tts">Sọ́ftbọl</annotation>
+ <annotation cp="🏀">Baskẹ́tbọl | Bọl | Hup</annotation>
+ <annotation cp="🏀" type="tts">Baskẹ́tbọl</annotation>
+ <annotation cp="🏐">Bọl | Gem | Vọ́libọl</annotation>
+ <annotation cp="🏐" type="tts">Vọ́libọl</annotation>
+ <annotation cp="🏈">Amẹ́ríka | Amẹ́ríká Fútbọl | Bọl | Fútbọl</annotation>
+ <annotation cp="🏈" type="tts">Amẹ́ríká Fútbọl</annotation>
+ <annotation cp="🏉">Bọl | Rákẹt | Rọ́gbi Fútbọl | Tẹnis</annotation>
+ <annotation cp="🏉" type="tts">Rọ́gbi Fútbọl</annotation>
+ <annotation cp="🎾">Bọl | Rákẹt | Tẹnis</annotation>
+ <annotation cp="🎾" type="tts">Tẹnis</annotation>
+ <annotation cp="🥏">Fláyín Disk | Ọ́ltímet</annotation>
+ <annotation cp="🥏" type="tts">Fláyín Disk</annotation>
+ <annotation cp="🎳">Bọl | Bólin | Gem</annotation>
+ <annotation cp="🎳" type="tts">Bólin</annotation>
+ <annotation cp="🏏">Bat | Bọl | Gem | Kríkẹ́t Gem</annotation>
+ <annotation cp="🏏" type="tts">Kríkẹ́t Gem</annotation>
+ <annotation cp="🏑">Bọl | Fild | Fíld Họkí | Gem | Họkí | Stik</annotation>
+ <annotation cp="🏑" type="tts">Fíld Họkí</annotation>
+ <annotation cp="🏒">Aís | Gem | Họkí | Pọk | Stik</annotation>
+ <annotation cp="🏒" type="tts">Aís Họkí</annotation>
+ <annotation cp="🥍">Bọl | Gol | Lakrọs | Stik</annotation>
+ <annotation cp="🥍" type="tts">Lakrọs</annotation>
+ <annotation cp="🏓">Bat | Bọl | Gem | Pádul | Píng Pọng | Tebúl Tẹnis</annotation>
+ <annotation cp="🏓" type="tts">Tebúl Tẹnis</annotation>
+ <annotation cp="🏸">Bádmíntin | Bẹ́di | Gem | Rákẹt | Shọtúlkọk</annotation>
+ <annotation cp="🏸" type="tts">Bádmíntin</annotation>
+ <annotation cp="🥊">Bọ́ksín | Glov</annotation>
+ <annotation cp="🥊" type="tts">Bọ́ksín Glov</annotation>
+ <annotation cp="🥋">Júdo | Karet | Máshál Áts | Máshál Áts Yúnífọm | Taikwọ́ndo | Yúnífọm</annotation>
+ <annotation cp="🥋" type="tts">Máshál Áts Yúnífọm</annotation>
+ <annotation cp="🥅">Gol | Gól Nẹt | Nẹt</annotation>
+ <annotation cp="🥅" type="tts">Gól Nẹt</annotation>
+ <annotation cp="⛳">Flag Wé Dé Ínsaíd Hol | Gọlf | Hol | Ínsaíd</annotation>
+ <annotation cp="⛳" type="tts">Flag Wé Dé Ínsaíd Hol</annotation>
+ <annotation cp="⛸">Ais | Aís Sket | Sket</annotation>
+ <annotation cp="⛸" type="tts">Aís Sket</annotation>
+ <annotation cp="🎣">Fish | Pol | Rọd | Rọd Wé Pípol De Ték Kách Fish</annotation>
+ <annotation cp="🎣" type="tts">Rọd Wé Pípol De Ték Kách Fish</annotation>
+ <annotation cp="🤿">Daiv | Mask | Mask Wé Pípol De Ték Daív Ínsaíd Wọtá | Skúba | Snọ́kul</annotation>
+ <annotation cp="🤿" type="tts">Mask Wé Pípol De Ték Daív Ínsaíd Wọtá</annotation>
+ <annotation cp="🎽">Átlẹ́tiks | Klọt | Rọn | Rọ́nín | Rọ́nín Shẹt</annotation>
+ <annotation cp="🎽" type="tts">Rọ́nín Shẹt</annotation>
+ <annotation cp="🎿">Skii | Skii-dẹm | Sno</annotation>
+ <annotation cp="🎿" type="tts">Skii-dẹm</annotation>
+ <annotation cp="🛷">Slẹd | Slẹi | Slẹj</annotation>
+ <annotation cp="🛷" type="tts">Slẹd</annotation>
+ <annotation cp="🥌">Gem | Kọ́lín Ston | Rọk</annotation>
+ <annotation cp="🥌" type="tts">Kọ́lín Ston</annotation>
+ <annotation cp="🎯">Búlsai | Daat | Dairẹ́kt Hit | Gem | Hit | Tágẹt</annotation>
+ <annotation cp="🎯" type="tts">Dairẹ́kt Hit</annotation>
+ <annotation cp="🪀">Tọi | Yó-Yo</annotation>
+ <annotation cp="🪀" type="tts">Yó-Yo</annotation>
+ <annotation cp="🪁">Flai | Kait | Raíz Ọ́p Hai Kwík Kwik</annotation>
+ <annotation cp="🪁" type="tts">Kait</annotation>
+ <annotation cp="🎱">Bíliad | Bọl | Ẹt | Gem | Pul 8 | Pul 8 Bọl</annotation>
+ <annotation cp="🎱" type="tts">Pul 8 Bọl</annotation>
+ <annotation cp="🔮">Bọl | Fántási | Krístal | Krístál Bọl | Tul</annotation>
+ <annotation cp="🔮" type="tts">Krístál Bọl</annotation>
+ <annotation cp="🧿">Bid | Cham | Ívúl-Ai | Ívúl-Aí Talisman | Nazar | Talisman</annotation>
+ <annotation cp="🧿" type="tts">Ívúl-Aí Talisman</annotation>
+ <annotation cp="🎮">Gem | Kọntróla | Vídio | Vídió Gem</annotation>
+ <annotation cp="🎮" type="tts">Vídió Gem</annotation>
+ <annotation cp="🕹">Gem | Jọístik | Vídió Gem</annotation>
+ <annotation cp="🕹" type="tts">Jọístik</annotation>
+ <annotation cp="🎰">Gámblín Máshin | Gámbul | Máshin</annotation>
+ <annotation cp="🎰" type="tts">Gámblín Máshin</annotation>
+ <annotation cp="🎲">Dais | Gem</annotation>
+ <annotation cp="🎲" type="tts">Gem Dais</annotation>
+ <annotation cp="🧩">Jígsọ | Pọ́zul | Sid</annotation>
+ <annotation cp="🧩" type="tts">Pọ́zul Sid</annotation>
+ <annotation cp="🧸">Sọft | Tẹ́dí Bea | Tọi</annotation>
+ <annotation cp="🧸" type="tts">Tẹ́dí Bea</annotation>
+ <annotation cp="♠">Gem | Kad | Spéd Símbọl</annotation>
+ <annotation cp="♠" type="tts">Spéd Símbọl</annotation>
+ <annotation cp="♥">Gem | Hát Símbọl | Kad | Símbọl</annotation>
+ <annotation cp="♥" type="tts">Hát Símbọl</annotation>
+ <annotation cp="♦">Dáyámọ́nd Símbọl | Gem | Kad | Símbọl</annotation>
+ <annotation cp="♦" type="tts">Dáyámọ́nd Símbọl</annotation>
+ <annotation cp="♣">Gem | Kad | Klọ́b Símbọl | Símbọl</annotation>
+ <annotation cp="♣" type="tts">Klọ́b Símbọl</annotation>
+ <annotation cp="♟">Chẹs | Chẹ́s Pọn | Diup</annotation>
+ <annotation cp="♟" type="tts">Chẹ́s Pọn</annotation>
+ <annotation cp="🃏">Gem | Jóka | Kad | Waíldkad</annotation>
+ <annotation cp="🃏" type="tts">Jóka</annotation>
+ <annotation cp="🀄">Gem | Máhjọng | Máhjọng Rẹ́d Drágọn | Rẹd</annotation>
+ <annotation cp="🀄" type="tts">Máhjọng Rẹ́d Drágọn</annotation>
+ <annotation cp="🎴">Fláwa | Fláwá Pléyín Kad | Gem | Japan | Kad | Ple</annotation>
+ <annotation cp="🎴" type="tts">Fláwá Pléyín Kad</annotation>
+ <annotation cp="🎭">Art | Mask | Pafọ́min | Pafọ́mín Art Mask-dẹm | Tíéta</annotation>
+ <annotation cp="🎭" type="tts">Pafọ́mín Art Mask-dẹm</annotation>
+ <annotation cp="🖼">Frem | Miuziọm | Píkchọ | Píkchọ Wé Dẹm Pút Fọ Frem</annotation>
+ <annotation cp="🖼" type="tts">Píkchọ Wé Dẹm Pút Fọ Frem</annotation>
+ <annotation cp="🎨">Art | Átist | Miuziọm | Pent | Plet Wé Átist De Ték Míks Pent</annotation>
+ <annotation cp="🎨" type="tts">Plet Wé Átist De Ték Míks Pent</annotation>
+ <annotation cp="🧵">Nídul | Sóyin | String | Trẹd</annotation>
+ <annotation cp="🧵" type="tts">Trẹd</annotation>
+ <annotation cp="🧶">Bọl | Nit | Tred Wé Dẹm De Ték Mék Klọt</annotation>
+ <annotation cp="🧶" type="tts">Tred Wé Dẹm De Ték Mék Klọt</annotation>
+ <annotation cp="👓">Ai | Aí Glásis | Aíwia | Glásis | Klọt</annotation>
+ <annotation cp="👓" type="tts">Aí Glásis</annotation>
+ <annotation cp="🕶">Ai | Aíwia | Dak | Glásis | Sọ́nglásis</annotation>
+ <annotation cp="🕶" type="tts">Sọ́nglásis</annotation>
+ <annotation cp="🥽">Gọ́guls | Prótẹ́kt Ai | Swímin | Wẹ́ldin</annotation>
+ <annotation cp="🥽" type="tts">Gọ́guls</annotation>
+ <annotation cp="🥼">Dọ́ktọ | Kot | Lab | Láb Kot | Sayẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🥼" type="tts">Láb Kot</annotation>
+ <annotation cp="🦺">Klọt | Klọt To Ték Kíp Pẹ́sin Sef | Séfti</annotation>
+ <annotation cp="🦺" type="tts">Klọt To Ték Kíp Pẹ́sin Sef</annotation>
+ <annotation cp="👔">Klọt | Tai</annotation>
+ <annotation cp="👔" type="tts">Tai</annotation>
+ <annotation cp="👕">Klọt | Shẹt | T-Shẹt | Tshẹt</annotation>
+ <annotation cp="👕" type="tts">T-Shẹt</annotation>
+ <annotation cp="👖">Jins | Klọt | Traúza</annotation>
+ <annotation cp="👖" type="tts">Jins</annotation>
+ <annotation cp="🧣">Mọ́fla | Nẹk | Skaf</annotation>
+ <annotation cp="🧣" type="tts">Mọ́fla</annotation>
+ <annotation cp="🧤">Glov-dẹm | Hand</annotation>
+ <annotation cp="🧤" type="tts">Glov-dẹm</annotation>
+ <annotation cp="🧥">Jákẹt | Kot</annotation>
+ <annotation cp="🧥" type="tts">Kot</annotation>
+ <annotation cp="🧦">Sọks | Stọ́kins</annotation>
+ <annotation cp="🧦" type="tts">Sọks</annotation>
+ <annotation cp="👗">Drẹs | Gaun | Klọt</annotation>
+ <annotation cp="👗" type="tts">Gaun</annotation>
+ <annotation cp="👘">Japan | Kimóno | Kimóno–Japan Klọt | Klọt</annotation>
+ <annotation cp="👘" type="tts">Kimóno–Japan Klọt</annotation>
+ <annotation cp="🥻">Drẹs | Klọt | Sári</annotation>
+ <annotation cp="🥻" type="tts">Sári Klọt</annotation>
+ <annotation cp="🩱">Baf | Klọt | Swim | Wúmán Swímín Klọt</annotation>
+ <annotation cp="🩱" type="tts">Wúmán Swímín Klọt</annotation>
+ <annotation cp="🩲">Baf | Mán Swímín Pant Mán Swímín Pant | Ọndawia</annotation>
+ <annotation cp="🩲" type="tts">Mán Swímín Pant Mán Swímín Pant</annotation>
+ <annotation cp="🩳">Baf | Ọndawia | Pant | Shọ́t Níka | Swim</annotation>
+ <annotation cp="🩳" type="tts">Shọ́t Níka</annotation>
+ <annotation cp="👙">Bikíni | Klọt | Swim</annotation>
+ <annotation cp="👙" type="tts">Bikíni</annotation>
+ <annotation cp="👚">Klọt | Wúman | Wúmán Klọt</annotation>
+ <annotation cp="👚" type="tts">Wúmán Klọt</annotation>
+ <annotation cp="👛">Klọt | Kọins | Pọs</annotation>
+ <annotation cp="👛" type="tts">Pọs</annotation>
+ <annotation cp="👜">Bag | Hándbag | Klọt | Pọs</annotation>
+ <annotation cp="👜" type="tts">Hándbag</annotation>
+ <annotation cp="👝">Bag | Bag Wé Wúman De Hóld Taít Tait | Klọt</annotation>
+ <annotation cp="👝" type="tts">Bag Wé Wúman De Hóld Taít Tait</annotation>
+ <annotation cp="🛍">Bag | Họtẹl | Shọ́pin | Shọ́pín Bag</annotation>
+ <annotation cp="🛍" type="tts">Shọ́pín Bag</annotation>
+ <annotation cp="🎒">Bag | Bag Wé Pípol De Kárí Fọ Bak | Bákpak | Rọ́ksak | Skul</annotation>
+ <annotation cp="🎒" type="tts">Bag Wé Pípol De Kárí Fọ Bak</annotation>
+ <annotation cp="👞">Klọt | Man | Mán Shu | Shu</annotation>
+ <annotation cp="👞" type="tts">Mán Shu</annotation>
+ <annotation cp="👟">Átlẹ́tics | Klọt | Shu | Shu Fọ Rọ́nin | Sníkas</annotation>
+ <annotation cp="👟" type="tts">Shu Fọ Rọ́nin</annotation>
+ <annotation cp="🥾">Bákpak | But | But Wé Pípol De Wia Fọ Waká Gó Faa | Kamp | To Waká Gó Faa</annotation>
+ <annotation cp="🥾" type="tts">But Wé Pípol De Wia Fọ Waká Gó Faa</annotation>
+ <annotation cp="🥿">Balẹt Flát Shu | Flát Shu | Slípas</annotation>
+ <annotation cp="🥿" type="tts">Flát Shu</annotation>
+ <annotation cp="👠">Haí-Híl Shu | Hil | Klọt | Shu | Wúman</annotation>
+ <annotation cp="👠" type="tts">Haí-Híl Shu</annotation>
+ <annotation cp="👡">Klọt | Sándal | Shu | Wúman | Wúmán Sándal</annotation>
+ <annotation cp="👡" type="tts">Wúmán Sándal</annotation>
+ <annotation cp="🩰">Balẹt | Dans | Shu | Shu Fọ Ték Dáns Balẹt Dans</annotation>
+ <annotation cp="🩰" type="tts">Shu Fọ Ték Dáns Balẹt Dans</annotation>
+ <annotation cp="👢">But | Klọt | Shu | Wúman | Wúmán But</annotation>
+ <annotation cp="👢" type="tts">Wúmán But</annotation>
+ <annotation cp="👑">King | Klọt | Kraun | Kwin</annotation>
+ <annotation cp="👑" type="tts">Kraun</annotation>
+ <annotation cp="👒">Hat | Klọt | Wúman | Wúmán Hat</annotation>
+ <annotation cp="👒" type="tts">Wúmán Hat</annotation>
+ <annotation cp="🎩">Klọt | Tọl | Tọ́l Hat | Tọ́lhat</annotation>
+ <annotation cp="🎩" type="tts">Tọ́l Hat</annotation>
+ <annotation cp="🎓">Grajuéshọn | Grajuẹt Sẹ́rímọ́ni Kap | Hat | Kap | Klọt | Sẹlibréshọn</annotation>
+ <annotation cp="🎓" type="tts">Grajuẹt Sẹ́rímọ́ni Kap</annotation>
+ <annotation cp="🧢">Bésbọ́l Kap | Fes | Kap</annotation>
+ <annotation cp="🧢" type="tts">Fes Kap</annotation>
+ <annotation cp="⛑">Fes | Hat | Hẹ́lmẹt | Hẹ́lmẹt Wé Wọ́kas Wé De Sév Pípol De Wia | Krọs | Sev | Wọ́kas</annotation>
+ <annotation cp="⛑" type="tts">Hẹ́lmẹt Wé Wọ́kas Wé De Sév Pípol De Wia</annotation>
+ <annotation cp="📿">Klọt | Nẹ́kles | Préya | Préyá Bid | Rilíjọn</annotation>
+ <annotation cp="📿" type="tts">Préyá Bid</annotation>
+ <annotation cp="💄">Kọsmẹ́tiks | Lípstik | Mékọp</annotation>
+ <annotation cp="💄" type="tts">Lípstik</annotation>
+ <annotation cp="💍">Dáyámọ́nd | Ring</annotation>
+ <annotation cp="💍" type="tts">Ring</annotation>
+ <annotation cp="💎">Diámọnd | Jẹm | Jẹ́m Ston | Júwẹl | Kọ́slí Faín Shain-Shaín Ston</annotation>
+ <annotation cp="💎" type="tts">Kọ́slí Faín Shain-Shaín Ston</annotation>
+ <annotation cp="🔇">Kwáyẹt | Laúd Spíka | Laúdspíka Wé Nọ́ De Tọk | Miut | Saílẹnt | Tọk</annotation>
+ <annotation cp="🔇" type="tts">Laúdspíka Wé Nọ́ De Tọk</annotation>
+ <annotation cp="🔈">Laúdspíka Ló Vọ́lium | Lo | Spíka | Vọ́lium</annotation>
+ <annotation cp="🔈" type="tts">Laúdspíka Ló Vọ́lium</annotation>
+ <annotation cp="🔉">Laúdspíka Mídiúm Vọ́lium | Mídiọm | Spíka | Vọ́lium</annotation>
+ <annotation cp="🔉" type="tts">Laúdspíka Mídiúm Vọ́lium</annotation>
+ <annotation cp="🔊">Hai | Laud | Laúdspíka Haí Vọ́lium | Spíka | Vọ́lium</annotation>
+ <annotation cp="🔊" type="tts">Laúdspíka Haí Vọ́lium</annotation>
+ <annotation cp="📢">Laud | Laúdspíka | Pọ́blík Laúdspíka</annotation>
+ <annotation cp="📢" type="tts">Laúdspíka</annotation>
+ <annotation cp="📣">Hapí | Mẹ́gafon</annotation>
+ <annotation cp="📣" type="tts">Mẹ́gafon</annotation>
+ <annotation cp="📯">Họn | Post | Póst Ọ́fis | Póst Ọ́fís Họn</annotation>
+ <annotation cp="📯" type="tts">Póst Ọ́fís Họn</annotation>
+ <annotation cp="🔔">Bẹl | Ring</annotation>
+ <annotation cp="🔔" type="tts">Bẹl</annotation>
+ <annotation cp="🔕">Bẹl | Bẹl Wé Gẹ́t Laín Mak | Kwáyẹt | Miut | Saílẹnt</annotation>
+ <annotation cp="🔕" type="tts">Bẹl Wé Gẹ́t Laín Mak</annotation>
+ <annotation cp="🎼">Miúzik | Miúzíkál Skọ | Skọ</annotation>
+ <annotation cp="🎼" type="tts">Miúzíkál Skọ</annotation>
+ <annotation cp="🎵">Miúzik | Miúzíkál Not | Not</annotation>
+ <annotation cp="🎵" type="tts">Miúzíkál Not</annotation>
+ <annotation cp="🎶">Miúzik | Miúzíkál Not-dẹm | Not | Not-dẹm</annotation>
+ <annotation cp="🎶" type="tts">Miúzíkál Not-dẹm</annotation>
+ <annotation cp="🎙">Maik | Miúzik | Stúdio | Stúdió Maikrofon</annotation>
+ <annotation cp="🎙" type="tts">Stúdió Maikrofon</annotation>
+ <annotation cp="🎚">Kọntrol | Lẹ́vúl Slaídá Kọntrol | Miúzik | Slaída</annotation>
+ <annotation cp="🎚" type="tts">Lẹ́vúl Slaídá Kọntrol</annotation>
+ <annotation cp="🎛">Bọ́tin | Kọntrol | Kọntról Bọ́tin | Miúzik</annotation>
+ <annotation cp="🎛" type="tts">Kọntról Bọ́tin</annotation>
+ <annotation cp="🎤">Kariókẹ | Maik | Maikrofon</annotation>
+ <annotation cp="🎤" type="tts">Maikrofon</annotation>
+ <annotation cp="🎧">Hẹ́dfon | Iábọd</annotation>
+ <annotation cp="🎧" type="tts">Hẹ́dfon</annotation>
+ <annotation cp="📻">Rédio | Vídio</annotation>
+ <annotation cp="📻" type="tts">Rédio</annotation>
+ <annotation cp="🎷">Ínstrúmẹnt | Miúzik | Saks | Saksafon</annotation>
+ <annotation cp="🎷" type="tts">Saksafon</annotation>
+ <annotation cp="🎸">Gita | Ínstrúmẹnt | Miúzik</annotation>
+ <annotation cp="🎸" type="tts">Gita</annotation>
+ <annotation cp="🎹">Ínstrúmẹnt | Kíbọd | Miúzik | Piáno</annotation>
+ <annotation cp="🎹" type="tts">Miúzik Kíbọd</annotation>
+ <annotation cp="🎺">Ínstrúmẹnt | Miúzik | Trọ́mpẹt</annotation>
+ <annotation cp="🎺" type="tts">Trọ́mpẹt</annotation>
+ <annotation cp="🎻">Ínstrúmẹnt | Miúzik | Vayọlin</annotation>
+ <annotation cp="🎻" type="tts">Vayọlin</annotation>
+ <annotation cp="🪕">Banjó | Miúzik | String-dẹm</annotation>
+ <annotation cp="🪕" type="tts">Banjó</annotation>
+ <annotation cp="🥁">Drọm | Drọ́mstik-Dẹm | Miúzik</annotation>
+ <annotation cp="🥁" type="tts">Drọm</annotation>
+ <annotation cp="📱">Fon | Mọ́bail | Mọ́baíl Fon | Sẹl | Tẹlífon</annotation>
+ <annotation cp="📱" type="tts">Mọ́baíl Fon</annotation>
+ <annotation cp="📲">Fon | Mọ́bail | Mọ́baíl Fon Wit Áro | Risiv | Sẹl</annotation>
+ <annotation cp="📲" type="tts">Mọ́baíl Fon Wit Áro</annotation>
+ <annotation cp="☎">Fon | Tẹlífon</annotation>
+ <annotation cp="☎" type="tts">Tẹlífon</annotation>
+ <annotation cp="📞">Fon | Risíva | Tẹlífon | Tẹlífón Risíva</annotation>
+ <annotation cp="📞" type="tts">Tẹlífón Risíva</annotation>
+ <annotation cp="📟">Bípa</annotation>
+ <annotation cp="📟" type="tts">Bípa</annotation>
+ <annotation cp="📠">Faks | Fáks Mashin</annotation>
+ <annotation cp="📠" type="tts">Fáks Mashin</annotation>
+ <annotation cp="🔋">Bátri</annotation>
+ <annotation cp="🔋" type="tts">Bátri</annotation>
+ <annotation cp="🔌">Ẹlẹ́trík Plọg | Ẹlẹ́trísíti | Plọg</annotation>
+ <annotation cp="🔌" type="tts">Ẹlẹ́trík Plọg</annotation>
+ <annotation cp="💻">Kọmpúta | Láptọp | PC | Pẹ́sínal</annotation>
+ <annotation cp="💻" type="tts">Láptọp</annotation>
+ <annotation cp="🖥">Dẹ́sk Kọmpúta | Dẹ́sktọp | Kọmpúta</annotation>
+ <annotation cp="🖥" type="tts">Dẹ́sk Kọmpúta</annotation>
+ <annotation cp="🖨">Kọmpúta | Prínta</annotation>
+ <annotation cp="🖨" type="tts">Prínta</annotation>
+ <annotation cp="⌨">Kíbọd | Kọmpúta</annotation>
+ <annotation cp="⌨" type="tts">Kíbọd</annotation>
+ <annotation cp="🖱">Kọmpúta | Kọmpútá Maus</annotation>
+ <annotation cp="🖱" type="tts">Kọmpútá Maus</annotation>
+ <annotation cp="🖲">Kọmpúta | Trákbọl</annotation>
+ <annotation cp="🖲" type="tts">Trákbọl</annotation>
+ <annotation cp="💽">Disk | Kọmpúta | Kọmpútá Disk | Mínídisk</annotation>
+ <annotation cp="💽" type="tts">Kọmpútá Disk</annotation>
+ <annotation cp="💾">Disk | Flọ́pí | Kọmpúta</annotation>
+ <annotation cp="💾" type="tts">Flọ́pí Disk</annotation>
+ <annotation cp="💿">CD | Disk | Kọmpúta | Ọ́ptíkal | Ọ́ptíkál Disk</annotation>
+ <annotation cp="💿" type="tts">Ọ́ptíkál Disk</annotation>
+ <annotation cp="📀">DVD | Kọmpútá | Ọ́ptíkal</annotation>
+ <annotation cp="📀" type="tts">DVD</annotation>
+ <annotation cp="🧮">Ábákọs | Chẹk | Kalkuléshọn</annotation>
+ <annotation cp="🧮" type="tts">Ábákọs</annotation>
+ <annotation cp="🎥">Kámẹ́ra | Múvi | Múví Kámẹ́ra | Sínẹmá</annotation>
+ <annotation cp="🎥" type="tts">Múví Kámẹ́ra</annotation>
+ <annotation cp="🎞">Fim | Fím Frem-dem | Frem-dem | Múvi | Sínẹmá</annotation>
+ <annotation cp="🎞" type="tts">Fím Frem-dem</annotation>
+ <annotation cp="📽">Fim | Fím Projẹ́ktọ | Múvi | Projẹ́ktọ | Sínẹmá | Vídio</annotation>
+ <annotation cp="📽" type="tts">Fím Projẹ́ktọ</annotation>
+ <annotation cp="🎬">Klápa | Klápa Bọd | Múvi</annotation>
+ <annotation cp="🎬" type="tts">Klápa Bọd</annotation>
+ <annotation cp="📺">Tẹlívíshọn | TV | Vídio</annotation>
+ <annotation cp="📺" type="tts">Tẹlívíshọn</annotation>
+ <annotation cp="📷">Kámẹ́ra | Vídio</annotation>
+ <annotation cp="📷" type="tts">Kámẹ́ra</annotation>
+ <annotation cp="📸">Flash | Kámẹ́ra | Kámẹ́ra Wé Gẹ́t Flash | Vídio</annotation>
+ <annotation cp="📸" type="tts">Kámẹ́ra Wé Gẹ́t Flash</annotation>
+ <annotation cp="📹">Kámẹ́ra | Vídio | Vídió Kámẹ́ra</annotation>
+ <annotation cp="📹" type="tts">Vídió Kámẹ́ra</annotation>
+ <annotation cp="📼">Tep | VHS | Vídio | Vídiókasẹt</annotation>
+ <annotation cp="📼" type="tts">Vídiókasẹt</annotation>
+ <annotation cp="🔍">Bẹ́nd Lẹft | Glas | Magnifáyin | Magnifáyín Glas Wé Bẹ́nd Lẹft | Sach | Tul</annotation>
+ <annotation cp="🔍" type="tts">Magnifáyín Glas Wé Bẹ́nd Lẹft</annotation>
+ <annotation cp="🔎">Bẹ́nd Rait | Glas | Magnifáyin | Magnifáyín Glas Wé Bẹ́nd Rait | Sach | Tul</annotation>
+ <annotation cp="🔎" type="tts">Magnifáyín Glas Wé Bẹ́nd Rait</annotation>
+ <annotation cp="🕯">Kándul | Lait</annotation>
+ <annotation cp="🕯" type="tts">Kándul</annotation>
+ <annotation cp="💡">Aidia | Bọlb | Ẹlẹ́ktrik | Lait | Laít Bọlb</annotation>
+ <annotation cp="💡" type="tts">Laít Bọlb</annotation>
+ <annotation cp="🔦">Ẹlẹ́ktrik | Tọch | Tọ́chlait | Tul</annotation>
+ <annotation cp="🔦" type="tts">Tọ́chlait</annotation>
+ <annotation cp="🏮">Lamp | Rẹd | Rẹ́d Pépa | Rẹ́d Pépá Lamp</annotation>
+ <annotation cp="🏮" type="tts">Rẹ́d Pépá Lamp</annotation>
+ <annotation cp="🪔">Díya | Díya Ọ́yil Lamp | Ọ́yil</annotation>
+ <annotation cp="🪔" type="tts">Díya Ọ́yil Lamp</annotation>
+ <annotation cp="📔">Buk | Fain | Kọ́va | Nótbuk | Nótbuk Wé Gẹ́t Faín Kọ́va</annotation>
+ <annotation cp="📔" type="tts">Nótbuk Wé Gẹ́t Faín Kọ́va</annotation>
+ <annotation cp="📕">Buk | Klózd Buk | Klzod</annotation>
+ <annotation cp="📕" type="tts">Klózd Buk</annotation>
+ <annotation cp="📖">Buk | Ópun | Ópún Buk</annotation>
+ <annotation cp="📖" type="tts">Ópún Buk</annotation>
+ <annotation cp="📗">Buk | Grin | Grín Buk</annotation>
+ <annotation cp="📗" type="tts">Grín Buk</annotation>
+ <annotation cp="📘">Blu | Blú Buk | Buk</annotation>
+ <annotation cp="📘" type="tts">Blú Buk</annotation>
+ <annotation cp="📙">Buk | Ọ́rénj Kọ́lọ | Ọ́rénj Kọ́lọ Buk</annotation>
+ <annotation cp="📙" type="tts">Ọ́rénj Kọ́lọ Buk</annotation>
+ <annotation cp="📚">Buk | Buk-dẹm</annotation>
+ <annotation cp="📚" type="tts">Buk-dẹm</annotation>
+ <annotation cp="📓">Nótbuk</annotation>
+ <annotation cp="📓" type="tts">Nótbuk</annotation>
+ <annotation cp="📒">Lẹ́ja | Nótbuk</annotation>
+ <annotation cp="📒" type="tts">Lẹ́ja</annotation>
+ <annotation cp="📃">Bẹnd | Pej | Pej Wé Di Maut Bẹnd</annotation>
+ <annotation cp="📃" type="tts">Pej Wé Di Maut Bẹnd</annotation>
+ <annotation cp="📜">Pépa | Skrol</annotation>
+ <annotation cp="📜" type="tts">Skrol</annotation>
+ <annotation cp="📄">Pej | Pej Wé De Fés Ọp</annotation>
+ <annotation cp="📄" type="tts">Pej Wé De Fés Ọp</annotation>
+ <annotation cp="📰">Niuz | Niúzpépa | Pépa</annotation>
+ <annotation cp="📰" type="tts">Niúzpépa</annotation>
+ <annotation cp="🗞">Niuz | Niúzpépa Wé Dẹm Ról Togẹ́da | Pépa | Ról | Togẹ́da</annotation>
+ <annotation cp="🗞" type="tts">Niúzpépa Wé Dẹm Ról Togẹ́da</annotation>
+ <annotation cp="📑">Bukmák | Mak | Máka | Tab-dẹm</annotation>
+ <annotation cp="📑" type="tts">Bukmák Tab-dẹm</annotation>
+ <annotation cp="🔖">Bukmák | Mak</annotation>
+ <annotation cp="🔖" type="tts">Bukmák</annotation>
+ <annotation cp="🏷">Lébẹl</annotation>
+ <annotation cp="🏷" type="tts">Lébẹl</annotation>
+ <annotation cp="💰">Bag | Dọ́la | Mọní | MọníBag | Naíra</annotation>
+ <annotation cp="💰" type="tts">Mọní Bag</annotation>
+ <annotation cp="💴">Bil | Kọ́rẹ́nsi | Mọní | Pépá Mọní | Yẹn | Yẹn Pépá Mọní</annotation>
+ <annotation cp="💴" type="tts">Yẹn Pépá Mọní</annotation>
+ <annotation cp="💵">Bil | Dọ́la | Dọ́la Pépá Mọní | Kọ́rẹ́nsi | Mọní | Pépá Mọní</annotation>
+ <annotation cp="💵" type="tts">Dọ́la Pépá Mọní</annotation>
+ <annotation cp="💶">Bil | Kọ́rẹ́nsi | Mọní | Pépá Mọní | Yúro | Yúro Pépá Mọní</annotation>
+ <annotation cp="💶" type="tts">Yúro Pépá Mọní</annotation>
+ <annotation cp="💷">Bil | Kọ́rẹ́nsi | Mọní | Paund | Paund Pépá Mọní | Pépá Mọní</annotation>
+ <annotation cp="💷" type="tts">Paund Pépá Mọní</annotation>
+ <annotation cp="💸">Flai | Mọní | Mọní Wé Gẹ́t Wíng | Pépá Mọní | Wíng</annotation>
+ <annotation cp="💸" type="tts">Mọní Wé Gẹ́t Wíng</annotation>
+ <annotation cp="💳">Kad | Krẹ́dit | Krẹ́dít Kad | Mọní</annotation>
+ <annotation cp="💳" type="tts">Krẹ́dít Kad</annotation>
+ <annotation cp="🧾">Akaunt | Bukkípin | Pruv | Risit</annotation>
+ <annotation cp="🧾" type="tts">Risit</annotation>
+ <annotation cp="💹">Graf | Graf Wé Shó Sé Yẹn De Gó Ọp | Mọní | Yẹn</annotation>
+ <annotation cp="💹" type="tts">Graf Wé Shó Sé Yẹn De Gó Ọp</annotation>
+ <annotation cp="💱">Bank | Ẹ́kschenj | Kọ́rẹ́nsi | Kọ́rẹ́nsí Ẹ́kschenj | Mọní</annotation>
+ <annotation cp="💱" type="tts">Kọ́rẹ́nsí Ẹ́kschenj</annotation>
+ <annotation cp="💲">Hẹ́ví Dọ́lá Sain | Kọ́rẹ́nsi | Mọní</annotation>
+ <annotation cp="💲" type="tts">Hẹ́ví Dọ́lá Sain</annotation>
+ <annotation cp="✉">Ẹ́nvẹ́lop | Imel | Lẹ́ta</annotation>
+ <annotation cp="✉" type="tts">Ẹ́nvẹ́lop</annotation>
+ <annotation cp="📧">I-Mel | Imel | Mel</annotation>
+ <annotation cp="📧" type="tts">I-Mel</annotation>
+ <annotation cp="📨">Ẹ́nvẹ́lop | I-Mel | Imel | Ínkọ́min | Ínkọ́mín Ẹ́nvẹ́lop | Lẹ́ta | Risiv</annotation>
+ <annotation cp="📨" type="tts">Ínkọ́mín Ẹ́nvẹ́lop</annotation>
+ <annotation cp="📩">Áro | Aútgóyin | Ẹ́nvẹ́lop | Ẹ́nvẹ́lop Wé Dẹm Drọ́ Áro | I-Mel | Imel</annotation>
+ <annotation cp="📩" type="tts">Ẹ́nvẹ́lop Wé Dẹm Drọ́ Áro</annotation>
+ <annotation cp="📤">Aútbọks | Aútbọ́ks Tre | Bọks | Dọ́n Sẹnd | Lẹ́ta | Mel | Tre</annotation>
+ <annotation cp="📤" type="tts">Aútbọ́ks Tre</annotation>
+ <annotation cp="📥">Bọks | Ínbọks | Ínbọ́ks Tre | Lẹ́ta | Mel | Pákej | Rísiv</annotation>
+ <annotation cp="📥" type="tts">Ínbọ́ks Tre</annotation>
+ <annotation cp="📦">Bọks | Pákej | Pásul</annotation>
+ <annotation cp="📦" type="tts">Pákej</annotation>
+ <annotation cp="📫">Flag | Klozd | Klozd Mélbọks Wit Flag Wé Réz Ọp | Mel | Mélbọks | Póstbọks | Rez</annotation>
+ <annotation cp="📫" type="tts">Klozd Mélbọks Wit Flag Wé Réz Ọp</annotation>
+ <annotation cp="📪">Daun | Flag | Klozd | Klozd Mélbọks Wit Flag Wé Dé Daun | Mel | Mélbọks | Póstbọks</annotation>
+ <annotation cp="📪" type="tts">Klozd Mélbọks Wit Flag Wé Dé Daun</annotation>
+ <annotation cp="📬">Flag | Mel | Mélbọks | Ópun | Ópún Mélbọks Wit Flag Wé Réz Ọp | Póstbọks</annotation>
+ <annotation cp="📬" type="tts">Ópún Mélbọks Wit Flag Wé Réz Ọp</annotation>
+ <annotation cp="📭">Daun | Mel | Mélbọks | Ópún | Ópún Mélbọks Wit Flag Wé Dé Daun | Póstbọks</annotation>
+ <annotation cp="📭" type="tts">Ópún Mélbọks Wit Flag Wé Dé Daun</annotation>
+ <annotation cp="📮">Mel | Mélbọks | Póstbọks</annotation>
+ <annotation cp="📮" type="tts">Póstbọks</annotation>
+ <annotation cp="🗳">Bálọt | Bálọ́t Bọks Wit Bálọt | Bọks</annotation>
+ <annotation cp="🗳" type="tts">Bálọ́t Bọks Wit Bálọt</annotation>
+ <annotation cp="✏">Pẹ́nsul</annotation>
+ <annotation cp="✏" type="tts">Pẹ́nsul</annotation>
+ <annotation cp="✒">Blák Nib | Nib | Pẹn</annotation>
+ <annotation cp="✒" type="tts">Blák Nib</annotation>
+ <annotation cp="🖋">Fauntin | Pẹn</annotation>
+ <annotation cp="🖋" type="tts">Fauntin Pẹn</annotation>
+ <annotation cp="🖊">Baíro | Bọ́lpọint | Pẹn</annotation>
+ <annotation cp="🖊" type="tts">Pẹn</annotation>
+ <annotation cp="🖌">Pent | Péntbrọsh</annotation>
+ <annotation cp="🖌" type="tts">Péntbrọsh</annotation>
+ <annotation cp="🖍">Kréyọn</annotation>
+ <annotation cp="🖍" type="tts">Kréyọn</annotation>
+ <annotation cp="📝">Mẹ́mo | Pẹ́nsul</annotation>
+ <annotation cp="📝" type="tts">Mẹ́mo</annotation>
+ <annotation cp="💼">Brífkes</annotation>
+ <annotation cp="💼" type="tts">Brífkes</annotation>
+ <annotation cp="📁">Fail | Faíl Fólda | Fólda</annotation>
+ <annotation cp="📁" type="tts">Faíl Fólda</annotation>
+ <annotation cp="📂">Fail | Fólda | Ópun | Ópún Faíl Fólda</annotation>
+ <annotation cp="📂" type="tts">Ópún Faíl Fólda</annotation>
+ <annotation cp="🗂">Divaída-dẹm | Índẹks | Kad | Kád Índẹ́ks Divaída-dẹm</annotation>
+ <annotation cp="🗂" type="tts">Kád Índẹ́ks Divaída-dẹm</annotation>
+ <annotation cp="📅">Det | Kalẹ́nda</annotation>
+ <annotation cp="📅" type="tts">Kalẹ́nda</annotation>
+ <annotation cp="📆">Kalẹ́nda | Kalẹ́nda Wé Pípol Fít Tiá Am Kọmọt | Pípol</annotation>
+ <annotation cp="📆" type="tts">Kalẹ́nda Wé Pípol Fít Tiá Am Kọmọt</annotation>
+ <annotation cp="🗒">Not | Pad | Spaíral | Spaírál Nótpad</annotation>
+ <annotation cp="🗒" type="tts">Spaírál Nótpad</annotation>
+ <annotation cp="🗓">Kalẹ́nda | Pad | Spaíral | Spaírál Kalẹ́nda</annotation>
+ <annotation cp="🗓" type="tts">Spaírál Kalẹ́nda</annotation>
+ <annotation cp="📇">Índẹks | Kád | Rólódẹks</annotation>
+ <annotation cp="📇" type="tts">Kád Índẹks</annotation>
+ <annotation cp="📈">Graf | Graf Wit Lain Wé De Gó Ọp | Lain | Ọp</annotation>
+ <annotation cp="📈" type="tts">Graf Wit Lain Wé De Gó Ọp</annotation>
+ <annotation cp="📉">Daun | Graf | Graf Wit Lain Wé De Gó Daun | Lain</annotation>
+ <annotation cp="📉" type="tts">Graf Wit Lain Wé De Gó Daun</annotation>
+ <annotation cp="📊">Graf | Graf Wé Gẹ́t Waíd Lain-dẹm | Waíd Lain-dẹm</annotation>
+ <annotation cp="📊" type="tts">Graf Wé Gẹ́t Waíd Lain-dẹm</annotation>
+ <annotation cp="📋">Klípbọd</annotation>
+ <annotation cp="📋" type="tts">Klípbọd</annotation>
+ <annotation cp="📌">Pin | Púshpin</annotation>
+ <annotation cp="📌" type="tts">Púshpin</annotation>
+ <annotation cp="📍">Pin | Púshpin | Raúnd Púshpin</annotation>
+ <annotation cp="📍" type="tts">Raúnd Púshpin</annotation>
+ <annotation cp="📎">Pépáklip</annotation>
+ <annotation cp="📎" type="tts">Pépáklip</annotation>
+ <annotation cp="🖇">línk | pépáklip | Pépáklip-dẹm wé línk togẹ́da</annotation>
+ <annotation cp="🖇" type="tts">Pépáklip-dẹm wé línk togẹ́da</annotation>
+ <annotation cp="📏">Rúla | Strét Rúla</annotation>
+ <annotation cp="📏" type="tts">Strét Rúla</annotation>
+ <annotation cp="📐">Rúla | Tráyángul | Tráyángúl Rúla</annotation>
+ <annotation cp="📐" type="tts">Tráyángúl Rúla</annotation>
+ <annotation cp="✂">Kọt | Sízọs | Tul</annotation>
+ <annotation cp="✂" type="tts">Sízọs</annotation>
+ <annotation cp="🗃">Bọks | Bọks Fọ Pút Kád Fail | Fail | Kad</annotation>
+ <annotation cp="🗃" type="tts">Bọks Fọ Pút Kád Fail</annotation>
+ <annotation cp="🗄">Fail | Faíl Kábínẹt | Kábínẹt</annotation>
+ <annotation cp="🗄" type="tts">Faíl Kábínẹt</annotation>
+ <annotation cp="🗑">Báskẹt | Pépá | Wést Pépá Báskẹt</annotation>
+ <annotation cp="🗑" type="tts">Wést Pépá Báskẹt</annotation>
+ <annotation cp="🔒">Klozd | Lọkd</annotation>
+ <annotation cp="🔒" type="tts">Lọkd</annotation>
+ <annotation cp="🔓">Lọk | Ọnlọkd | Ópun</annotation>
+ <annotation cp="🔓" type="tts">Ọnlọkd</annotation>
+ <annotation cp="🔏">Lọk | Lọ́kd An Pẹn | Nib | Pẹn | Praívési</annotation>
+ <annotation cp="🔏" type="tts">Lọ́kd An Pẹn</annotation>
+ <annotation cp="🔐">Klozd | Lọk | Lọ́kd An Kii | Sef</annotation>
+ <annotation cp="🔐" type="tts">Lọ́kd An Kii</annotation>
+ <annotation cp="🔑">Kii | Lọk | Páswọd</annotation>
+ <annotation cp="🔑" type="tts">Kii</annotation>
+ <annotation cp="🗝">Kii | Lọk | Old | Óld Kii</annotation>
+ <annotation cp="🗝" type="tts">Óld Kii</annotation>
+ <annotation cp="🔨">Háma | Tul</annotation>
+ <annotation cp="🔨" type="tts">Háma</annotation>
+ <annotation cp="🪓">Aks | Chọp | Háchẹt | Kọt | Split | Wud</annotation>
+ <annotation cp="🪓" type="tts">Aks</annotation>
+ <annotation cp="⛏">Pik | Tul</annotation>
+ <annotation cp="⛏" type="tts">Pik</annotation>
+ <annotation cp="⚒">Háma | Háma An Pik | Pik | Tul</annotation>
+ <annotation cp="⚒" type="tts">Háma An Pik</annotation>
+ <annotation cp="🛠">Háma | Háma An Spána | Rẹnch | Spána | Tul</annotation>
+ <annotation cp="🛠" type="tts">Háma An Spána</annotation>
+ <annotation cp="🗡">Dága | Naif | Wẹ́pọn</annotation>
+ <annotation cp="🗡" type="tts">Dága</annotation>
+ <annotation cp="⚔">Krọs | Sọd-dẹm | Sọd-dẹm Wé Dẹm Krọs | Wẹ́pọn</annotation>
+ <annotation cp="⚔" type="tts">Sọd-dẹm Wé Dẹm Krọs</annotation>
+ <annotation cp="🔫">Gọn | Hándgọn | Pístul | Rívọ́lva | Tul | Wẹ́pọn</annotation>
+ <annotation cp="🔫" type="tts">Pístul</annotation>
+ <annotation cp="🏹">Áro | Bó | Bó An Áro</annotation>
+ <annotation cp="🏹" type="tts">Bó An Áro</annotation>
+ <annotation cp="🛡">Shild | Wẹ́pọn</annotation>
+ <annotation cp="🛡" type="tts">Shild</annotation>
+ <annotation cp="🔧">Rẹnch | Spána | Tul</annotation>
+ <annotation cp="🔧" type="tts">Spána</annotation>
+ <annotation cp="🔩">Bolt | Nọt | Nọ́t An Bolt</annotation>
+ <annotation cp="🔩" type="tts">Nọ́t An Bolt</annotation>
+ <annotation cp="⚙">Gia | Tul</annotation>
+ <annotation cp="⚙" type="tts">Gia</annotation>
+ <annotation cp="🗜">Klamp | Tul | Vais</annotation>
+ <annotation cp="🗜" type="tts">Klamp</annotation>
+ <annotation cp="⚖">Bálans | Jọ́stis | Skel</annotation>
+ <annotation cp="⚖" type="tts">Skel</annotation>
+ <annotation cp="🦯">Blaind | Waít Stik</annotation>
+ <annotation cp="🦯" type="tts">Waít Stik</annotation>
+ <annotation cp="🔗">Link</annotation>
+ <annotation cp="🔗" type="tts">Link</annotation>
+ <annotation cp="⛓">Chen | Chen-dẹm</annotation>
+ <annotation cp="⛓" type="tts">Chen-dẹm</annotation>
+ <annotation cp="🧰">Mẹ́kánik | Tul | Túlbọks</annotation>
+ <annotation cp="🧰" type="tts">Túlbọks</annotation>
+ <annotation cp="🧲">Drọ | Hold | Magnẹt | Magnẹ́tọ</annotation>
+ <annotation cp="🧲" type="tts">Magnẹ́tọ</annotation>
+ <annotation cp="⚗">Alẹ́mbik | Kẹ́místri | Tul</annotation>
+ <annotation cp="⚗" type="tts">Alẹ́mbik</annotation>
+ <annotation cp="🧪">Ẹspẹ́rímẹnt | Kẹ́mist | Kẹ́místri | Lab | Tẹst Tub | Tẹ́st Tub</annotation>
+ <annotation cp="🧪" type="tts">Tẹ́st Tub</annotation>
+ <annotation cp="🧫">Báktéria | Bayọ́lọ́ji | Bayọ́lọ́jí Ẹ́spat | Lab | Pẹ́trí Plet</annotation>
+ <annotation cp="🧫" type="tts">Pẹ́trí Plet</annotation>
+ <annotation cp="🧬">Bayọ́lọ́jí Ẹ́spat | DNA | Jẹnẹ́tiks | Jiin | Laif</annotation>
+ <annotation cp="🧬" type="tts">DNA</annotation>
+ <annotation cp="🔬">Maíkroskop | Sáyẹns | Tul</annotation>
+ <annotation cp="🔬" type="tts">Maíkroskop</annotation>
+ <annotation cp="🔭">Tẹlískop | Tul</annotation>
+ <annotation cp="🔭" type="tts">Tẹlískop</annotation>
+ <annotation cp="📡">Antẹ́na | Dish | Sátálaít Antẹ́na | Sátẹ́lait</annotation>
+ <annotation cp="📡" type="tts">Sátálaít Antẹ́na</annotation>
+ <annotation cp="💉">Mẹ́dísin | Nídul | Shọt | Sik | Sirinj</annotation>
+ <annotation cp="💉" type="tts">Sirinj</annotation>
+ <annotation cp="🩸">Blid | Blọd | Drọ́p Ọf Blọd | Mẹ́dísin | Mẹnstruéshọn | Taím | Wund</annotation>
+ <annotation cp="🩸" type="tts">Drọ́p Ọf Blọd</annotation>
+ <annotation cp="💊">Dọ́ktọ | Mẹ́dísin | Pil | Sik</annotation>
+ <annotation cp="💊" type="tts">Mẹ́dísin</annotation>
+ <annotation cp="🩹">Bándej | Plásta</annotation>
+ <annotation cp="🩹" type="tts">Plásta</annotation>
+ <annotation cp="🩺">Hat | Mẹ́dísin | Stẹteskop</annotation>
+ <annotation cp="🩺" type="tts">Stẹteskop</annotation>
+ <annotation cp="🚪">Dọọ</annotation>
+ <annotation cp="🚪" type="tts">Dọọ</annotation>
+ <annotation cp="🛏">Bẹdi | Họtẹl | Slip</annotation>
+ <annotation cp="🛏" type="tts">Bẹdi</annotation>
+ <annotation cp="🛋">Kauch | Sẹtii An Lamp | Sófa</annotation>
+ <annotation cp="🛋" type="tts">Sẹtii An Lamp</annotation>
+ <annotation cp="🪑">Chia | Sit</annotation>
+ <annotation cp="🪑" type="tts">Chia</annotation>
+ <annotation cp="🚽">Flọsh | Toílẹt | Wọtá | Wọ́tá Sístẹm</annotation>
+ <annotation cp="🚽" type="tts">Wọ́tá Sístẹm</annotation>
+ <annotation cp="🚿">Sháwa | Wọtá</annotation>
+ <annotation cp="🚿" type="tts">Sháwa</annotation>
+ <annotation cp="🛁">Baf</annotation>
+ <annotation cp="🛁" type="tts">Baf</annotation>
+ <annotation cp="🪒">Rézọ | Shap | Shev</annotation>
+ <annotation cp="🪒" type="tts">Rézọ</annotation>
+ <annotation cp="🧴">Lóshọn | Lóshọ́n Bọ́tul | Shampú</annotation>
+ <annotation cp="🧴" type="tts">Lóshọ́n Bọ́tul</annotation>
+ <annotation cp="🧷">Bébí Nápkin | Séfti Pin</annotation>
+ <annotation cp="🧷" type="tts">Séfti Pin</annotation>
+ <annotation cp="🧹">Brum | Klin | Swip</annotation>
+ <annotation cp="🧹" type="tts">Brum</annotation>
+ <annotation cp="🧺">Baskẹt | Fam</annotation>
+ <annotation cp="🧺" type="tts">Baskẹt</annotation>
+ <annotation cp="🧻">Pépá Tọwẹl | Tọílẹ́t Pépa | Tọílẹ́t Rol</annotation>
+ <annotation cp="🧻" type="tts">Tọílẹ́t Rol</annotation>
+ <annotation cp="🧼">Baa Sop | Baf | Fom | Klin | Sop | Sóp Dish</annotation>
+ <annotation cp="🧼" type="tts">Sop</annotation>
+ <annotation cp="🧽">Klin | Sok | Spọnj</annotation>
+ <annotation cp="🧽" type="tts">Spọnj</annotation>
+ <annotation cp="🧯">Fáya | Fáyá Ẹkstíngwísha | Kwẹnch</annotation>
+ <annotation cp="🧯" type="tts">Fáyá Ẹkstíngwísha</annotation>
+ <annotation cp="🛒">Kart | Shọp | Shọ́pin</annotation>
+ <annotation cp="🛒" type="tts">Kart</annotation>
+ <annotation cp="🚬">Sigarẹt | Sigarẹt Smok</annotation>
+ <annotation cp="🚬" type="tts">Sigarẹt</annotation>
+ <annotation cp="⚰">Dai | Kọ́fin</annotation>
+ <annotation cp="⚰" type="tts">Kọ́fin</annotation>
+ <annotation cp="⚱">Ash | Bẹ́rial | Bẹ́riál Kọnténa Fọ Ásh Ọf Pẹ́sin Wé Dọ́n Dai | Dai</annotation>
+ <annotation cp="⚱" type="tts">Bẹ́riál Kọnténa Fọ Ásh Ọf Pẹ́sin Wé Dọ́n Dai</annotation>
+ <annotation cp="🗿">Fes | Moai | Moyai | Statiu</annotation>
+ <annotation cp="🗿" type="tts">Moai</annotation>
+ <annotation cp="🏧">ATM | ATM Sain | Bank | Ọtọmátik | Tẹ́la</annotation>
+ <annotation cp="🏧" type="tts">ATM Sain</annotation>
+ <annotation cp="🚮">Dọstbin | Dọtí | Dọtí Ínsaíd Dọstbin</annotation>
+ <annotation cp="🚮" type="tts">Dọtí Ínsaíd Dọstbin</annotation>
+ <annotation cp="🚰">Drink | Klin | Klín Wọtá | Wọtá</annotation>
+ <annotation cp="🚰" type="tts">Klín Wọtá</annotation>
+ <annotation cp="♿">Wílchia | Wílchiá Símbul</annotation>
+ <annotation cp="♿" type="tts">Wílchiá Símbul</annotation>
+ <annotation cp="🚹">Lávétri | Man | Man-dẹm Tọílẹ́t Rum | Rẹ́strum</annotation>
+ <annotation cp="🚹" type="tts">Man-dẹm Tọílẹ́t Rum</annotation>
+ <annotation cp="🚺">Lávétri | Rẹ́strum | Wúman | Wúman-dẹm Tọílẹ́t Rum</annotation>
+ <annotation cp="🚺" type="tts">Wúman-dẹm Tọílẹ́t Rum</annotation>
+ <annotation cp="🚻">Lávétri | Rẹ́strum | Tọílẹ́t Rum | WC</annotation>
+ <annotation cp="🚻" type="tts">Tọílẹ́t Rum</annotation>
+ <annotation cp="🚼">Bébi | Bébí Símbul</annotation>
+ <annotation cp="🚼" type="tts">Bébí Símbul</annotation>
+ <annotation cp="🚾">Lávétri | Rẹ́strum | WC | Wọ́ta | Wọ́tá Kọnténa</annotation>
+ <annotation cp="🚾" type="tts">Wọ́tá Kọnténa</annotation>
+ <annotation cp="🛂">Kọntrol | Páspọt | Páspọ́t Kọntrol</annotation>
+ <annotation cp="🛂" type="tts">Páspọ́t Kọntrol</annotation>
+ <annotation cp="🛃">Kọ́stọ́m Pípol | Pípol</annotation>
+ <annotation cp="🛃" type="tts">Kọ́stọ́m Pípol</annotation>
+ <annotation cp="🛄">Bágej | Kọlẹ́kt | Wiá To Kọlẹ́kt Bágej</annotation>
+ <annotation cp="🛄" type="tts">Wiá To Kọlẹ́kt Bágej</annotation>
+ <annotation cp="🛅">Bágej | Lọ́gej | Lọ́gej Wé Pípol Lív Bihaind | Lọ́ka</annotation>
+ <annotation cp="🛅" type="tts">Lọ́gej Wé Pípol Lív Bihaind</annotation>
+ <annotation cp="⚠">Wọ́nin</annotation>
+ <annotation cp="⚠" type="tts">Wọ́nin</annotation>
+ <annotation cp="🚸">Krọ́sin | Pẹ́sin Wé Ték Lẹg De Waká Fọ Rod | Pikin | Smọ́l Pikin-dẹm De Krọs | Tráfik</annotation>
+ <annotation cp="🚸" type="tts">Smọ́l Pikin-dẹm De Krọs</annotation>
+ <annotation cp="⛔">Ẹ́nta | Nọ́ | Tráfik</annotation>
+ <annotation cp="⛔" type="tts">Nọ́ Ẹ́nta</annotation>
+ <annotation cp="🚫">Fọbid | Mék Yu Nọ́ Dú Am | Nọ́ Dú Am</annotation>
+ <annotation cp="🚫" type="tts">Mék Yu Nọ́ Dú Am</annotation>
+ <annotation cp="🚳">Baísíkul | Nó Baísíkul Hia</annotation>
+ <annotation cp="🚳" type="tts">Nó Baísíkul Hia</annotation>
+ <annotation cp="🚭">Nó Smókin Hia</annotation>
+ <annotation cp="🚭" type="tts">Nó Smókin Hia</annotation>
+ <annotation cp="🚯">Nó Drọp Drọ́p Dọtí Hia</annotation>
+ <annotation cp="🚯" type="tts">Nó Drọp Drọ́p Dọtí Hia</annotation>
+ <annotation cp="🚱">Dís Wọtá Nọ́ Gud Fọ Drink | Wọtá</annotation>
+ <annotation cp="🚱" type="tts">Dís Wọtá Nọ́ Gud Fọ Drink</annotation>
+ <annotation cp="🚷">Mék Pípol Nọ́ De Wáka Fọ Lẹg Hia | Nọ́ De Wáka Fọ Lẹg Hia</annotation>
+ <annotation cp="🚷" type="tts">Mék Pípol Nọ́ De Wáka Fọ Lẹg Hia</annotation>
+ <annotation cp="📵">Fon | Mọ́bail | Nọ Mọ́baíl Fon | Nọ́ Yúz Mọ́baíl Fon-dẹm Hia | Sẹ́lfon</annotation>
+ <annotation cp="📵" type="tts">Nọ́ Yúz Mọ́baíl Fon-dẹm Hia</annotation>
+ <annotation cp="🔞">18 | Hia Nọ́ Bi Fọ Pípol Wé Nẹ́vá Rích Ẹtín Yiẹs | Ọ́ndá Ẹtín Yiẹs | Ọndaej</annotation>
+ <annotation cp="🔞" type="tts">Hia Nọ́ Bi Fọ Pípol Wé Nẹ́vá Rích Ẹtín Yiẹs</annotation>
+ <annotation cp="☢">Rédioáktiv | Sain</annotation>
+ <annotation cp="☢" type="tts">Rédioáktiv</annotation>
+ <annotation cp="☣">Báioházad | Sain</annotation>
+ <annotation cp="☣" type="tts">Báioházad</annotation>
+ <annotation cp="⬆">Áro | Áro Pọínt Ọp | Dairẹ́kshọn | Kọ́mpas | Nọt</annotation>
+ <annotation cp="⬆" type="tts">Áro Pọínt Ọp</annotation>
+ <annotation cp="↗">Áro | Áro De Pọínt Ọp-Rait | Áro De Pọínt Ọ́p-Rait | Dairẹ́kshọn | Kọ́mpas | Nọt, Saut, Ist, Wẹst | Nọ́tist</annotation>
+ <annotation cp="↗" type="tts">Áro De Pọínt Ọp-Rait</annotation>
+ <annotation cp="➡">Áro | Áro Pọínt Ọp | Áro Pọínt Rait | Dairẹ́kshọn | Ist | Kọ́mpas | Rait</annotation>
+ <annotation cp="➡" type="tts">Áro Pọínt Rait</annotation>
+ <annotation cp="↘">Áro | Áro De Pọínt Daún-Rait | Áro De Pọínt Daún-Raít | Dairẹ́kshọn | Nọt, Saut, Ist, Wẹst | Saútist</annotation>
+ <annotation cp="↘" type="tts">Áro De Pọínt Daún-Rait</annotation>
+ <annotation cp="⬇">Áro | Áro Pọínt Daun | Dairẹ́kshọn | Daun | Kọ́mpas | Saut</annotation>
+ <annotation cp="⬇" type="tts">Áro Pọínt Daun</annotation>
+ <annotation cp="↙">Áro | Áro De Pọínt Daún-Lẹft | Dairẹ́kshọn | Saútwẹst</annotation>
+ <annotation cp="↙" type="tts">Áro De Pọínt Daún-Lẹft</annotation>
+ <annotation cp="⬅">Áro | Áro Pọínt Lẹft | Dairẹ́kshọn | Kọ́mpas | Wẹst</annotation>
+ <annotation cp="⬅" type="tts">Áro Pọínt Lẹft</annotation>
+ <annotation cp="↖">Áro | Áro De Pọínt Ọ́p-Lẹft | Dairẹ́kshọn | Nọ́twẹst</annotation>
+ <annotation cp="↖" type="tts">Áro De Pọínt Ọ́p-Lẹft</annotation>
+ <annotation cp="↕">Áro | Áro De Pọínt Ọ́p-Daun | Ọ́p-Daún Áro</annotation>
+ <annotation cp="↕" type="tts">Áro De Pọínt Ọ́p-Daun</annotation>
+ <annotation cp="↔">Áro | Áro De Pọínt Lẹ́ft-Rait | Lẹ́ft-Raít Áro</annotation>
+ <annotation cp="↔" type="tts">Áro De Pọínt Lẹ́ft-Rait</annotation>
+ <annotation cp="↩">Áro | Raít Áro Kọ́v Gó Lẹft</annotation>
+ <annotation cp="↩" type="tts">Raít Áro Kọ́v Gó Lẹft</annotation>
+ <annotation cp="↪">Áro | Lẹ́ft Áro Kọ́v Gó Rait | Lẹ́ft Áro Kọ́v Gó Raít</annotation>
+ <annotation cp="↪" type="tts">Lẹ́ft Áro Kọ́v Gó Raít</annotation>
+ <annotation cp="⤴">Áro | Raít Áro Kọ́v Gó Ọp</annotation>
+ <annotation cp="⤴" type="tts">Raít Áro Kọ́v Gó Ọp</annotation>
+ <annotation cp="⤵">Áro | Raít Áro Kọ́v Gó Daun</annotation>
+ <annotation cp="⤵" type="tts">Raít Áro Kọ́v Gó Daun</annotation>
+ <annotation cp="🔃">Áro | Áro-dẹm | Aro-dẹm De Pọínt Klọ́k Hand Dairẹ́kshọn | Rilod</annotation>
+ <annotation cp="🔃" type="tts">Aro-dẹm De Pọínt Klọ́k Hand Dairẹ́kshọn</annotation>
+ <annotation cp="🔄">Áro | Aro-dẹm Nọ́ De Pọínt Klọ́k Hand Dairẹ́kshọn | Aro-dẹm Nọ́ De Pọínt Klọ́k Hand Wè</annotation>
+ <annotation cp="🔄" type="tts">Aro-dẹm Nọ́ De Pọínt Klọ́k Hand Wè</annotation>
+ <annotation cp="🔙">Áro | Bak | BAK Áro</annotation>
+ <annotation cp="🔙" type="tts">BAK Áro</annotation>
+ <annotation cp="🔚">Áro | Bak | END Áro</annotation>
+ <annotation cp="🔚" type="tts">END Áro</annotation>
+ <annotation cp="🔛">Áro | Mak | ON!</annotation>
+ <annotation cp="🔛" type="tts">ON! Áro</annotation>
+ <annotation cp="🔜">Áro | SOON</annotation>
+ <annotation cp="🔜" type="tts">SOON Áro</annotation>
+ <annotation cp="🔝">Ọp | Tọp | TOP Áro</annotation>
+ <annotation cp="🔝" type="tts">TOP Áro</annotation>
+ <annotation cp="🛐">Ples Wiá Pípul De Prè | Prè | Rilíjọn</annotation>
+ <annotation cp="🛐" type="tts">Ples Wiá Pípul De Prè</annotation>
+ <annotation cp="⚛">Átọm | Átọ́m Símbul | Pẹ́sin Wé Bilív Sé Gọd Nọ́ Dè</annotation>
+ <annotation cp="⚛" type="tts">Átọ́m Símbul</annotation>
+ <annotation cp="🕉">Híndu | Om | Rilíjọn</annotation>
+ <annotation cp="🕉" type="tts">Om</annotation>
+ <annotation cp="✡">Dévid | Judiá Pẹ́sin | Rilíjọn | Sta | Stá Ọf Dévid</annotation>
+ <annotation cp="✡" type="tts">Stá Ọf Dévid</annotation>
+ <annotation cp="☸">Búdist | Dhárma | Rilíjọn | Wil</annotation>
+ <annotation cp="☸" type="tts">Dhárma Wil</annotation>
+ <annotation cp="☯">Rilíjọn | Táo | Táóist | Yang | Yin</annotation>
+ <annotation cp="☯" type="tts">Yin Yang</annotation>
+ <annotation cp="✝">Krístien | Krọs | Látin | Látín Krọs | Rilíjọn</annotation>
+ <annotation cp="✝" type="tts">Látín Krọs</annotation>
+ <annotation cp="☦">Krístien | Krọs | Ọ́tọ́dọ́ks Krọs | Rilíjọn</annotation>
+ <annotation cp="☦" type="tts">Ọ́tọ́dọ́ks Krọs</annotation>
+ <annotation cp="☪">Íslam | Múslim | Rilíjọn | Sta An Mun Wé Kọv</annotation>
+ <annotation cp="☪" type="tts">Sta An Mun Wé Kọv</annotation>
+ <annotation cp="☮">Piis | Piís Símbul</annotation>
+ <annotation cp="☮" type="tts">Piís Símbul</annotation>
+ <annotation cp="🕎">Mẹnóra | Rilíjọn | Sọ́mtin To Ték Hól Kándul</annotation>
+ <annotation cp="🕎" type="tts">Mẹnóra</annotation>
+ <annotation cp="🔯">Síks Pọínt Sta Wit Dọt Fọ Mídul | Sta</annotation>
+ <annotation cp="🔯" type="tts">Síks Pọínt Sta Wit Dọt Fọ Mídul</annotation>
+ <annotation cp="♈">É́riz | Ram | Zódiak</annotation>
+ <annotation cp="♈" type="tts">É́riz</annotation>
+ <annotation cp="♉">Bul | Mán-kau | Tọ́rus | Zódiak</annotation>
+ <annotation cp="♉" type="tts">Tọ́rus</annotation>
+ <annotation cp="♊">Jẹ́míni | Twins | Zódiak</annotation>
+ <annotation cp="♊" type="tts">Jẹ́míni</annotation>
+ <annotation cp="♋">Kánsa | Krab | Zódiak</annotation>
+ <annotation cp="♋" type="tts">Kánsa</annotation>
+ <annotation cp="♌">Láyọn | Lío | Zódiak</annotation>
+ <annotation cp="♌" type="tts">Lío</annotation>
+ <annotation cp="♍">Vẹ́go | Zódiak</annotation>
+ <annotation cp="♍" type="tts">Vẹ́go</annotation>
+ <annotation cp="♎">Bálans | Jọ́stis | Líbra | Skel-dẹm | Zódiak</annotation>
+ <annotation cp="♎" type="tts">Líbra</annotation>
+ <annotation cp="♏">Skọ́pio | Skọ́piọn | Skọ́pius | Zódiak</annotation>
+ <annotation cp="♏" type="tts">Skọ́pio</annotation>
+ <annotation cp="♐">Pẹ́sin Wé De Shút Wit Bó An Áro | Sajitérius | Zódiak</annotation>
+ <annotation cp="♐" type="tts">Sajitérius</annotation>
+ <annotation cp="♑">Got | Kápríkọn | Zódiak</annotation>
+ <annotation cp="♑" type="tts">Kápríkọn</annotation>
+ <annotation cp="♒">Akwériọs | Pẹ́sin Wé Kárí Sọ́mtin | Water | Zódiak</annotation>
+ <annotation cp="♒" type="tts">Akwériọs</annotation>
+ <annotation cp="♓">Fish | Paísiz | Zódiak</annotation>
+ <annotation cp="♓" type="tts">Paísiz</annotation>
+ <annotation cp="⛎">Ọfiúkus | Pẹ́sin Wé Kárí Sọ́mtin | Sápẹnt | Snek | Zódiak</annotation>
+ <annotation cp="⛎" type="tts">Ọfiúkus</annotation>
+ <annotation cp="🔀">Áro | Krọ́s Áro | Shọ́fúl Trak-dẹm Bọ́tin</annotation>
+ <annotation cp="🔀" type="tts">Shọ́fúl Trak-dẹm Bọ́tin</annotation>
+ <annotation cp="🔁">Áro | Klọ́k Hand Dairẹ́kshọn | Ripit | Ripít Bọ́tin</annotation>
+ <annotation cp="🔁" type="tts">Ripít Bọ́tin</annotation>
+ <annotation cp="🔂">Áro | Klọ́k Hand Dairẹ́kshọn | Ripít Síngúl Bọ́tin | Wọ́n Taim | Wọns</annotation>
+ <annotation cp="🔂" type="tts">Ripít Síngúl Bọ́tin</annotation>
+ <annotation cp="▶">Áro | Plé Bọ́tin | Rait | Tráyángul</annotation>
+ <annotation cp="▶" type="tts">Plé Bọ́tin</annotation>
+ <annotation cp="⏩">Áro | Dọ́bul | Fast | Fást-Fọ́wọ́d Bọ́tin | Fọ́wọd</annotation>
+ <annotation cp="⏩" type="tts">Fást-Fọ́wọ́d Bọ́tin</annotation>
+ <annotation cp="⏭">Áro | Nẹ́kst Siin | Nẹ́kst Trak | Nẹ́kst Trák Bọ́tin | Tráyángul</annotation>
+ <annotation cp="⏭" type="tts">Nẹ́kst Trák Bọ́tin</annotation>
+ <annotation cp="⏯">Áro | Plè | Plé ọ Stọ́p-smọl Bọ́tin | Rait | Stọ́p-smọl | Tráyángul</annotation>
+ <annotation cp="⏯" type="tts">Plé ọ Stọ́p-smọl Bọ́tin</annotation>
+ <annotation cp="◀">Áro | Lẹft | Rivas | Rivás Bọ́tin | Tráyángul</annotation>
+ <annotation cp="◀" type="tts">Rivás Bọ́tin</annotation>
+ <annotation cp="⏪">Áro | Dọ́bul | Fást Rivás Bọ́tin | Riwaind</annotation>
+ <annotation cp="⏪" type="tts">Fást Rivás Bọ́tin</annotation>
+ <annotation cp="⏮">Áro | Di Siin Bifọ́ Dís Wọn | Di Trak Bifọ́ Dís Wọn | Lást Trák Bọ́tin | Tráyángul</annotation>
+ <annotation cp="⏮" type="tts">Lást Trák Bọ́tin</annotation>
+ <annotation cp="🔼">Áro | Bọ́tin | Ọp | Ọ́p Bọ́tin | Rẹd</annotation>
+ <annotation cp="🔼" type="tts">Ọ́p Bọ́tin</annotation>
+ <annotation cp="⏫">Áro | Dọ́bul | Fást Ọ́p Bọ́tin</annotation>
+ <annotation cp="⏫" type="tts">Fást Ọ́p Bọ́tin</annotation>
+ <annotation cp="🔽">Áro | Bọ́tin | Daun | Daún Bọ́tin | Rẹd</annotation>
+ <annotation cp="🔽" type="tts">Daún Bọ́tin</annotation>
+ <annotation cp="⏬">Áro | Daun | Dọ́bul | Fást Daún Bọ́tin</annotation>
+ <annotation cp="⏬" type="tts">Fást Daún Bọ́tin</annotation>
+ <annotation cp="⏸">Baa | Dọ́bul | Stọ́p-smọl | Stọ́p-smọl Bọ́tin | Stret</annotation>
+ <annotation cp="⏸" type="tts">Stọ́p-smọl Bọ́tin</annotation>
+ <annotation cp="⏹">Skwea | Stọp | Stọ́p Bọ́tin</annotation>
+ <annotation cp="⏹" type="tts">Stọ́p Bọ́tin</annotation>
+ <annotation cp="⏺">Rẹ́kọd | Rẹ́kọ́d Bọ́tin | Sẹ́kul</annotation>
+ <annotation cp="⏺" type="tts">Rẹ́kọ́d Bọ́tin</annotation>
+ <annotation cp="⏏">Ijẹkt | Ijẹ́kt Bọ́tin</annotation>
+ <annotation cp="⏏" type="tts">Ijẹ́kt Bọ́tin</annotation>
+ <annotation cp="🎦">Fim | Kámẹ́ra | Múvi | Sinẹ́ma</annotation>
+ <annotation cp="🎦" type="tts">Sinẹ́ma</annotation>
+ <annotation cp="🔅">Braítnẹs | Dim | Dim Bọ́tin | Dím Bọ́tin | Lò</annotation>
+ <annotation cp="🔅" type="tts">Dim Bọ́tin</annotation>
+ <annotation cp="🔆">Brait | Braít Bọ́tin | Braítnẹs</annotation>
+ <annotation cp="🔆" type="tts">Braít Bọ́tin</annotation>
+ <annotation cp="📶">Antẹ́na | Antẹ́ná Baa-dẹm | Baa | Fon | Mọ́bail | Sẹ́lfon</annotation>
+ <annotation cp="📶" type="tts">Antẹ́ná Baa-dẹm</annotation>
+ <annotation cp="📳">Fon | Mọ́bail | Mod | Sẹ́lfon | Tẹlífon | Vaibréshọn | Vaibréshọ́n Mod</annotation>
+ <annotation cp="📳" type="tts">Vaibréshọ́n Mod</annotation>
+ <annotation cp="📴">Fon | Mọ́bail | Mọ́baíl Fon Dé Ọff | Ọff | Sẹ́lfon | Tẹlífon</annotation>
+ <annotation cp="📴" type="tts">Mọ́baíl Fon Dé Ọff</annotation>
+ <annotation cp="♀">Wúman | Wúman Sain</annotation>
+ <annotation cp="♀" type="tts">Wúman Sain</annotation>
+ <annotation cp="♂">Man | Man Sain</annotation>
+ <annotation cp="♂" type="tts">Man Sain</annotation>
+ <annotation cp="⚕">Éskulépius | Mẹ́dikál Símbul | Mẹ́dísin | Wọ́kas</annotation>
+ <annotation cp="⚕" type="tts">Mẹ́dikál Símbul</annotation>
+ <annotation cp="♾">Fọrẹ́va | Infíníti | Nọ́ Gẹ́t Límit | Ọ́lwéz Tru</annotation>
+ <annotation cp="♾" type="tts">Infíníti</annotation>
+ <annotation cp="♻">Risaíkul | Risaíkúl Símbul</annotation>
+ <annotation cp="♻" type="tts">Risaíkúl Símbul</annotation>
+ <annotation cp="⚜">Flẹ́-De-Lis</annotation>
+ <annotation cp="⚜" type="tts">Flẹ́-De-Lis</annotation>
+ <annotation cp="🔱">Ẹ́mblẹm | Hẹ́ví Áyọn Wé De Hol Ship Fọ Wọ́n Ples | Ship | Traidẹnt | Traidẹ́nt Ẹ́mblẹm | Tul</annotation>
+ <annotation cp="🔱" type="tts">Traidẹ́nt Ẹ́mblẹm</annotation>
+ <annotation cp="📛">Baj | Nem</annotation>
+ <annotation cp="📛" type="tts">Baj</annotation>
+ <annotation cp="🔰">Bígína | Japan | Japán Símbul Fọ Bígína | Lif | Shẹ́vrọn</annotation>
+ <annotation cp="🔰" type="tts">Japán Símbul Fọ Bígína</annotation>
+ <annotation cp="⭕">Big | o | Rẹd | Rẹd Sẹ́kul Wé Gẹ́t Hol | Sẹ́kul</annotation>
+ <annotation cp="⭕" type="tts">Rẹd Sẹ́kul Wé Gẹ́t Hol</annotation>
+ <annotation cp="✅">Bọ́tin | Chẹk | Chẹ́k Mák Bọ́tin | Gud | Mak</annotation>
+ <annotation cp="✅" type="tts">Chẹ́k Mák Bọ́tin</annotation>
+ <annotation cp="☑">Bọks | Chẹk | Chẹ́k Bọks Wit Chẹk | Gud</annotation>
+ <annotation cp="☑" type="tts">Chẹ́k Bọks Wit Chẹk</annotation>
+ <annotation cp="✔">Chẹk | Chẹ́k Mak | Mak</annotation>
+ <annotation cp="✔" type="tts">Chẹ́k Mak</annotation>
+ <annotation cp="✖">Kánsul | Sain | Taims | To Mọltiplai | x | X</annotation>
+ <annotation cp="✖" type="tts">Taims Sain</annotation>
+ <annotation cp="❌">Bad | Kánsul | Krọs | Krọ́s Mak | Mak | Mọltiplai | Taims | X</annotation>
+ <annotation cp="❌" type="tts">Krọ́s Mak</annotation>
+ <annotation cp="❎">Krọ́s Mák Bọ́tin | Mak | Skwea | X</annotation>
+ <annotation cp="❎" type="tts">Krọ́s Mák Bọ́tin</annotation>
+ <annotation cp="➕">+ | Mats | Plọs | Sain</annotation>
+ <annotation cp="➕" type="tts">Plọs</annotation>
+ <annotation cp="➖">- | Maínọs | Mats | Sain</annotation>
+ <annotation cp="➖" type="tts">Maínọs</annotation>
+ <annotation cp="➗">÷ | Divaid | Divíshọn | Mats | Sain</annotation>
+ <annotation cp="➗" type="tts">Divaid</annotation>
+ <annotation cp="➰">Raund | Raúnd Shép Rop | Rop</annotation>
+ <annotation cp="➰" type="tts">Raúnd Shép Rop</annotation>
+ <annotation cp="➿">Dọ́búl | Dọ́búl Raúnd Shép Rop | Raúnd | Rop</annotation>
+ <annotation cp="➿" type="tts">Dọ́búl Raúnd Shép Rop</annotation>
+ <annotation cp="〽">Mak | Pat | Pát Ọltanéshọn Mak</annotation>
+ <annotation cp="〽" type="tts">Pát Ọltanéshọn Mak</annotation>
+ <annotation cp="✳">Astẹ́risk | Astẹ́risk Wé Gẹ́t Ẹ́t Spok</annotation>
+ <annotation cp="✳" type="tts">Astẹ́risk Wé Gẹ́t Ẹ́t Spok</annotation>
+ <annotation cp="✴">Sta | Sta Wé Gẹ́t Ẹ́t Pọint</annotation>
+ <annotation cp="✴" type="tts">Sta Wé Gẹ́t Ẹ́t Pọint</annotation>
+ <annotation cp="❇">Spákul</annotation>
+ <annotation cp="❇" type="tts">Spákul</annotation>
+ <annotation cp="‼">! | !! | Bángbang | Dọ́búl Ẹksklaméshọn Mak | Ẹksklaméshọn | Mak</annotation>
+ <annotation cp="‼" type="tts">Dọ́búl Ẹksklaméshọn Mak</annotation>
+ <annotation cp="⁉">! | !? | ? | Ẹksklaméshọn | Kwẹ́shọn | Mak | Pọnkchuéshọn</annotation>
+ <annotation cp="⁉" type="tts">Ẹksklaméshọn Kwẹ́shọn Mak</annotation>
+ <annotation cp="❓">Kwẹ́shọn | Mak | Pọnkchuéshọn</annotation>
+ <annotation cp="❓" type="tts">Kwẹ́shọn Mak</annotation>
+ <annotation cp="❔">? | Aútlain | Kwẹ́shọn | Mak | Pọnkchuéshọn | Waít Kwẹ́shọn Mak</annotation>
+ <annotation cp="❔" type="tts">Waít Kwẹ́shọn Mak</annotation>
+ <annotation cp="❕">! | Aútlain | Ẹksklaméshọn | Mak | Pọnkchuéshọn | Wait Ẹksklaméshọn Mak</annotation>
+ <annotation cp="❕" type="tts">Wait Ẹksklaméshọn Mak</annotation>
+ <annotation cp="❗">Ẹksklaméshọn | Mak | Pọnkchuéshọn</annotation>
+ <annotation cp="❗" type="tts">Ẹksklaméshọn Mak</annotation>
+ <annotation cp="〰">Dash | Kọv-kọ́v | Pọnkchuéshọn</annotation>
+ <annotation cp="〰" type="tts">Kọv-kọ́v Dash</annotation>
+ <annotation cp="©">c | Kọ́pírait</annotation>
+ <annotation cp="©" type="tts">Kọ́pírait</annotation>
+ <annotation cp="®">r | Rẹ́jísta</annotation>
+ <annotation cp="®" type="tts">Rẹ́jísta</annotation>
+ <annotation cp="™">Mak | TM | Tréd Mak | Trédmak</annotation>
+ <annotation cp="™" type="tts">Tréd Mak</annotation>
+ <annotation cp="🔠">AB(CH)D | ABCD | Big | Látin | Lẹ́ta-dẹm | Put | Pút Látin Bíg Lẹ́ta-dẹm</annotation>
+ <annotation cp="🔠" type="tts">Pút Látin Bíg Lẹ́ta-dẹm</annotation>
+ <annotation cp="🔡">ab(ch)d | abcd | Látin | Lẹ́ta-dẹm | Pút Látin Smọ́l Lẹ́ta-dẹm | Smọl</annotation>
+ <annotation cp="🔡" type="tts">Pút Látin Smọ́l Lẹ́ta-dẹm</annotation>
+ <annotation cp="🔢">1234 | Nọ́mba-dẹm | Put | Pút Nọ́mba-dẹm</annotation>
+ <annotation cp="🔢" type="tts">Pút Nọ́mba-dẹm</annotation>
+ <annotation cp="🔣">〒♪&% | Put | Pút Símbọl-dẹm</annotation>
+ <annotation cp="🔣" type="tts">Pút Símbọl-dẹm</annotation>
+ <annotation cp="🔤">ab(ch) | abc | Álfábẹt | Ínput | Látin | Lẹ́ta-dẹm | Pút Látin Lẹ́ta-dẹm</annotation>
+ <annotation cp="🔤" type="tts">Pút Látin Lẹ́ta-dẹm</annotation>
+ <annotation cp="🅰">a | A Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🅰" type="tts">A Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🆎">ab | AB Bọ́tin (Blọ́d Taip) | Blọ́d Taip</annotation>
+ <annotation cp="🆎" type="tts">AB Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🅱">b | B Bọ́tin (Blọ́d Taip) | Blọ́d Taip</annotation>
+ <annotation cp="🅱" type="tts">B Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🆑">cl | CL Bọ́tin</annotation>
+ <annotation cp="🆑" type="tts">CL Bọ́tin</annotation>
+ <annotation cp="🆒">Cool | COOL Bọ́tin</annotation>
+ <annotation cp="🆒" type="tts">COOL Bọ́tin</annotation>
+ <annotation cp="🆓">FREE Bọ́tin | Fri</annotation>
+ <annotation cp="🆓" type="tts">FREE Bọ́tin</annotation>
+ <annotation cp="ℹ">i | Ínfọméshọn</annotation>
+ <annotation cp="ℹ" type="tts">Ínfọméshọn</annotation>
+ <annotation cp="🆔">Aídẹ́ntíti | id | ID Bọ́tin</annotation>
+ <annotation cp="🆔" type="tts">ID Bọ́tin</annotation>
+ <annotation cp="Ⓜ">m | M Wé Dẹm Drọ́ Sẹ́kúl Raúnd Am | Sẹ́kúl</annotation>
+ <annotation cp="Ⓜ" type="tts">M Wé Dẹm Drọ́ Sẹ́kúl Raúnd Am</annotation>
+ <annotation cp="🆕">NEW Bọ́tin | niu</annotation>
+ <annotation cp="🆕" type="tts">NEW Bọ́tin</annotation>
+ <annotation cp="🆖">ng | NG Bọ́tin</annotation>
+ <annotation cp="🆖" type="tts">NG Bọ́tin</annotation>
+ <annotation cp="🅾">Blọ́d Taip | o | O Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🅾" type="tts">O Bọ́tin (Blọ́d Taip)</annotation>
+ <annotation cp="🆗">OK | OK Bọ́tin</annotation>
+ <annotation cp="🆗" type="tts">OK Bọ́tin</annotation>
+ <annotation cp="🅿">P Bọ́tin | Pákin</annotation>
+ <annotation cp="🅿" type="tts">P Bọ́tin</annotation>
+ <annotation cp="🆘">Hẹ́lẹp | sos | SOS Bọ́tin</annotation>
+ <annotation cp="🆘" type="tts">SOS Bọ́tin</annotation>
+ <annotation cp="🆙">Mak | Ọp | UP! Bọ́tin</annotation>
+ <annotation cp="🆙" type="tts">UP! Bọ́tin</annotation>
+ <annotation cp="🆚">Vẹsọs | vs | VS Bọ́tin</annotation>
+ <annotation cp="🆚" type="tts">VS Bọ́tin</annotation>
+ <annotation cp="🈁">“Hia” | Japán Bọ́tin Fọ “Hia” | Japán Pípol | Katákaná</annotation>
+ <annotation cp="🈁" type="tts">Japán Bọ́tin Fọ “Hia”</annotation>
+ <annotation cp="🈂">“Sávís Chaj” | Japán Bọ́tin Fọ “Sávís Chaj” | Japán Pípol | Katákaná</annotation>
+ <annotation cp="🈂" type="tts">Japán Bọ́tin Fọ “Sávís Chaj”</annotation>
+ <annotation cp="🈷">“Mọ́nt Bai Mọ́nt Amaunt” | Japán Bọ́tin Fọ “Mọ́nt Bai Mọ́nt Amaunt” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈷" type="tts">Japán Bọ́tin Fọ “Mọ́nt Bai Mọ́nt Amaunt”</annotation>
+ <annotation cp="🈶">“Nọ́ Bi Frí Ọf Chaj” | Japán Bọ́tin Fọ “Nọ́ Bi Frí Ọf Chaj” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈶" type="tts">Japán Bọ́tin Fọ “Nọ́ Bi Frí Ọf Chaj”</annotation>
+ <annotation cp="🈯">“Rizav Fọ Sọ́mbọ́di” | Japán Bọ́tin Fọ “Rizav” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈯" type="tts">Japán Bọ́tin Fọ “Rizav”</annotation>
+ <annotation cp="🉐">“Gívawé Praiz” | Japán Bọ́tin Fọ “Gívawé Praiz” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🉐" type="tts">Japán Bọ́tin Fọ “Gívawé Praiz”</annotation>
+ <annotation cp="🈹">“Diskaunt” | Japán Bọ́tin Fọ “Diskaunt” | Japán Bọ́tin Fọ “Diskaunt” Bọ́tin | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈹" type="tts">Japán Bọ́tin Fọ “Diskaunt” Bọ́tin</annotation>
+ <annotation cp="🈚">“Frí Ọf Chaj” | Japán Bọ́tin Fọ “Frí Ọf Chaj” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈚" type="tts">Japán Bọ́tin Fọ “Frí Ọf Chaj”</annotation>
+ <annotation cp="🈲">“Fọbid” | Japán Bọ́tin Fọ “Fọbid” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈲" type="tts">Japán Bọ́tin Fọ “Fọbid”</annotation>
+ <annotation cp="🉑">“Asẹpt” | Japán Bọ́tin Fọ “Asẹpt” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🉑" type="tts">Japán Bọ́tin Fọ “Asẹpt”</annotation>
+ <annotation cp="🈸">“Aplai” | Japán Bọ́tin Fọ “Aplai” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈸" type="tts">Japán Bọ́tin Fọ “Aplai”</annotation>
+ <annotation cp="🈴">“Mak To Ték Pás Ẹkzam” | Japán Bọ́tin Fọ “Mak To Ték Pás Ẹkzam” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈴" type="tts">Japán Bọ́tin Fọ “Mak To Ték Pás Ẹkzam”</annotation>
+ <annotation cp="🈳">“Vákánsi Dè” | Japán Bọ́tin Fọ “Vákánsi Dè” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈳" type="tts">Japán Bọ́tin Fọ “Vákánsi Dè”</annotation>
+ <annotation cp="㊗">“Kọngratuléshọn” | Japán Bọ́tin Fọ “Kọngratuléshọn” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="㊗" type="tts">Japán Bọ́tin Fọ “Kọngratuléshọn”</annotation>
+ <annotation cp="㊙">“Síkrit” | Japán Bọ́tin Fọ “Síkrit” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="㊙" type="tts">Japán Bọ́tin Fọ “Síkrit”</annotation>
+ <annotation cp="🈺">“Ópún Fọ Bízẹs” | Japán Bọ́tin Fọ “Ópún Fọ Bízẹs” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈺" type="tts">Japán Bọ́tin Fọ “Ópún Fọ Bízẹs”</annotation>
+ <annotation cp="🈵">“Vákánsi Nọ́ Dè” | Japán Bọ́tin Fọ “Vákánsi Nọ́ Dè” | Japán Pípol | Japán Raítin</annotation>
+ <annotation cp="🈵" type="tts">Japán Bọ́tin Fọ “Vákánsi Nọ́ Dè”</annotation>
+ <annotation cp="🔴">Jiọ́mẹ́tri | Rẹd | Rẹ́d Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="🔴" type="tts">Rẹ́d Sẹ́kul</annotation>
+ <annotation cp="🟠">Ọ́rénj Kọ́lọ | Ọ́rénj Kọ́lọ Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="🟠" type="tts">Ọ́rénj Kọ́lọ Sẹ́kul</annotation>
+ <annotation cp="🟡">Sẹ́kul | Yẹ́ló</annotation>
+ <annotation cp="🟡" type="tts">Yẹ́ló Sẹ́kul</annotation>
+ <annotation cp="🟢">Grin | Grín Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="🟢" type="tts">Grín Sẹ́kul</annotation>
+ <annotation cp="🔵">Blu | Blú Sẹ́kul | Jiọ́mẹ́tri | Sẹ́kul</annotation>
+ <annotation cp="🔵" type="tts">Blú Sẹ́kul</annotation>
+ <annotation cp="🟣">Pọ́púl Kọ́lọ | Pọ́púl Kọ́lọ Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="🟣" type="tts">Pọ́púl Kọ́lọ Sẹ́kul</annotation>
+ <annotation cp="🟤">Braun | Braún Sẹ́kul | Sẹ́kul</annotation>
+ <annotation cp="🟤" type="tts">Braún Sẹ́kul</annotation>
+ <annotation cp="⚫">Blák Sẹ́kul | Jiọ́mẹ́tri | Sẹ́kul</annotation>
+ <annotation cp="⚫" type="tts">Blák Sẹ́kul</annotation>
+ <annotation cp="⚪">Jiọ́mẹ́tri | Sẹ́kul | Waít Sẹ́kul</annotation>
+ <annotation cp="⚪" type="tts">Waít Sẹ́kul</annotation>
+ <annotation cp="🟥">Rẹd | Rẹ́d Skwea | Skwea</annotation>
+ <annotation cp="🟥" type="tts">Rẹ́d Skwea</annotation>
+ <annotation cp="🟧">Ọ́rénj Kọ́lọ | Ọ́rénj Kọ́lọ Skwea | Skwea</annotation>
+ <annotation cp="🟧" type="tts">Ọ́rénj Kọ́lọ Skwea</annotation>
+ <annotation cp="🟨">Skwea | Yẹ́ló</annotation>
+ <annotation cp="🟨" type="tts">Yẹ́ló Skwea</annotation>
+ <annotation cp="🟩">Grin | Grín Skwea | Skwea</annotation>
+ <annotation cp="🟩" type="tts">Grín Skwea</annotation>
+ <annotation cp="🟦">Blu | Blú Skwea | Skwea</annotation>
+ <annotation cp="🟦" type="tts">Blú Skwea</annotation>
+ <annotation cp="🟪">Pọ́púl Kọ́lọ | Pọ́púl Kọ́lọ Skwea | Skwea</annotation>
+ <annotation cp="🟪" type="tts">Pọ́púl Kọ́lọ Skwea</annotation>
+ <annotation cp="🟫">Braun | Braún Skwea | Skwea</annotation>
+ <annotation cp="🟫" type="tts">Braún Skwea</annotation>
+ <annotation cp="⬛">Blák Bíg Skwea | Jiọ́mẹ́tri | Skwea</annotation>
+ <annotation cp="⬛" type="tts">Blák Bíg Skwea</annotation>
+ <annotation cp="⬜">Jiọ́mẹ́tri | Skwea | Waít Bíg Skwea</annotation>
+ <annotation cp="⬜" type="tts">Waít Bíg Skwea</annotation>
+ <annotation cp="◼">Blák Mídiọ́m Saíz Skwea | Jiọ́mẹ́tri | Skwea</annotation>
+ <annotation cp="◼" type="tts">Blák Mídiọ́m Saíz Skwea</annotation>
+ <annotation cp="◻">Jiọ́mẹ́tri | Skwea | Waít Mídiọ́m Saíz Skwea</annotation>
+ <annotation cp="◻" type="tts">Waít Mídiọ́m Saíz Skwea</annotation>
+ <annotation cp="◾">Blák Mídiọ́m-Smọ́l Skwea | Jiọ́mẹ́tri | Skwea</annotation>
+ <annotation cp="◾" type="tts">Blák Mídiọ́m-Smọ́l Skwea</annotation>
+ <annotation cp="◽">Jiọ́mẹ́tri | Skwea | Waít Mídiọ́m-Smọ́l Skwea</annotation>
+ <annotation cp="◽" type="tts">Waít Mídiọ́m-Smọ́l Skwea</annotation>
+ <annotation cp="▪">Blák Smọ́l Skwea | Jiọ́mẹ́tri | Skwea</annotation>
+ <annotation cp="▪" type="tts">Blák Smọ́l Skwea</annotation>
+ <annotation cp="▫">Jiọ́mẹ́tri | Skwea | Waít Smọ́l Skwea</annotation>
+ <annotation cp="▫" type="tts">Waít Smọ́l Skwea</annotation>
+ <annotation cp="🔶">Bíg Ọ́rénj Kọ́lọ́ Dáyámọnd | Dáyámọnd | Jiọ́mẹ́tri | Ọ́rénj Kọ́lọ</annotation>
+ <annotation cp="🔶" type="tts">Bíg Ọ́rénj Kọ́lọ́ Dáyámọnd</annotation>
+ <annotation cp="🔷">Bíg Blú Dáyámọnd | Blu | Dáyámọnd | Jiọ́mẹ́tri</annotation>
+ <annotation cp="🔷" type="tts">Bíg Blú Dáyámọnd</annotation>
+ <annotation cp="🔸">Dáyámọnd | Jiọ́mẹ́tri | Ọ́rénj Kọ́lọ | Smọ́l Ọ́rénj Kọ́lọ́ Dáyámọnd</annotation>
+ <annotation cp="🔸" type="tts">Smọ́l Ọ́rénj Kọ́lọ́ Dáyámọnd</annotation>
+ <annotation cp="🔹">Blu | Dáyámọnd | Jiọ́mẹ́tri | Smọ́l Blú Dáyámọnd</annotation>
+ <annotation cp="🔹" type="tts">Smọ́l Blú Dáyámọnd</annotation>
+ <annotation cp="🔺">Jiọ́mẹ́tri | Rẹd | Rẹ́d Tráyángul Wé De Pọínt Ọp</annotation>
+ <annotation cp="🔺" type="tts">Rẹ́d Tráyángul Wé De Pọínt Ọp</annotation>
+ <annotation cp="🔻">Jiọ́mẹ́tri | Rẹd | Rẹ́d Tráyángul Wé De Pọínt Daun</annotation>
+ <annotation cp="🔻" type="tts">Rẹ́d Tráyángul Wé De Pọínt Daun</annotation>
+ <annotation cp="💠">Dáyámọnd | Dáyámọnd Wit Dọt Fọ Mídul | Ínsaid | Jiọ́mẹ́tri</annotation>
+ <annotation cp="💠" type="tts">Dáyámọnd Wit Dọt Fọ Mídul</annotation>
+ <annotation cp="🔘">Bọ́tin | Jiọ́mẹ́tri | Rédió</annotation>
+ <annotation cp="🔘" type="tts">Rédió Bọ́tin</annotation>
+ <annotation cp="🔳">Bọ́dá-Lain | Bọ́tin | Jiọ́mẹ́tri | Skwea | Waít Skweá Bọ́tin</annotation>
+ <annotation cp="🔳" type="tts">Waít Skweá Bọ́tin</annotation>
+ <annotation cp="🔲">Blák Skweá Bọ́tin | Bọ́tin | Jiọ́mẹ́tri | Skwea</annotation>
+ <annotation cp="🔲" type="tts">Blák Skweá Bọ́tin</annotation>
+ <annotation cp="🏁">Chẹ́kad | Flag | Flag Wé Dẹm Drọ́ Skwea Skwea Ọn Tọp | Res | Rọn | Skwea Skwea</annotation>
+ <annotation cp="🏁" type="tts">Flag Wé Dẹm Drọ́ Skwea Skwea Ọn Tọp</annotation>
+ <annotation cp="🚩">Post | Tráyángul Flag</annotation>
+ <annotation cp="🚩" type="tts">Tráyángul Flag</annotation>
+ <annotation cp="🎌">Bin Krọs | Flag-dẹm Wé Krọ́s Ích Ọ́da | Japán Pípol | Krọs | Krọ́s Flag-dẹm | Sẹlibréshọn</annotation>
+ <annotation cp="🎌" type="tts">Flag-dẹm Wé Krọ́s Ích Ọ́da</annotation>
+ <annotation cp="🏴">Blák Flag | Wev</annotation>
+ <annotation cp="🏴" type="tts">Blák Flag</annotation>
+ <annotation cp="🏳">Waít Flag | Wev</annotation>
+ <annotation cp="🏳" type="tts">Waít Flag</annotation>
+ <annotation cp="🏳⚧">Flag | Laít Blu | Pink | Transjẹ́nda | Wait</annotation>
+ <annotation cp="🏳⚧" type="tts">Transjẹ́nda Flag</annotation>
+ <annotation cp="🏳🌈">Rénbo | Rénbo Flag | Wev</annotation>
+ <annotation cp="🏳🌈" type="tts">Rénbo Flag</annotation>
+ <annotation cp="🏴☠">Ám-Rọ́biri | Jọlí Rója | Paíret | Paíret Flag | Trẹ́zhọ</annotation>
+ <annotation cp="🏴☠" type="tts">Paíret Flag</annotation>
+ <annotation cp="£">EGP | GBP | Kọ́rẹ́nsi | Paund</annotation>
+ <annotation cp="£" type="tts">Paund</annotation>
+ <annotation cp="¥">CNY | JPY | Kọ́rẹ́nsi | Yẹn | Yuan</annotation>
+ <annotation cp="¥" type="tts">Yẹn</annotation>
+ <annotation cp="€">EUR | Kọ́rẹ́nsi | Yúro</annotation>
+ <annotation cp="€" type="tts">Yúro</annotation>
+ <annotation cp="₹">Índiá Rúpi | Kọ́rẹ́nsi | Rúpi</annotation>
+ <annotation cp="₹" type="tts">Índiá Rúpi</annotation>
+ <annotation cp="₽">Kọ́rẹ́nsi | Rúbul</annotation>
+ <annotation cp="₽" type="tts">Rúbul</annotation>
+ <annotation cp="¹">Supaskript | Supaskrípt Wọn | Wọn</annotation>
+ <annotation cp="¹" type="tts">Supaskrípt Wọn</annotation>
+ <annotation cp="²">Skwea | Supaskript | Supaskrípt Tu | Tu</annotation>
+ <annotation cp="²" type="tts">Supaskrípt Tu</annotation>
+ <annotation cp="³">Kiub | Supaskript | Supaskrípt Tri | Tri</annotation>
+ <annotation cp="³" type="tts">Supaskrípt Tri</annotation>
+ <annotation cp="µ">Maíkró Sain | Mẹ́zhọ</annotation>
+ <annotation cp="µ" type="tts">Maíkró Sain</annotation>
+ </annotations>
+</ldml>
diff --git a/common/annotations/pl.xml b/common/annotations/pl.xml
index c79cff1..c0a3e23 100644
--- a/common/annotations/pl.xml
+++ b/common/annotations/pl.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">karnacja średnio ciemna</annotation>
<annotation cp="🏿">karnacja | karnacja ciemna | odcień skóry | typ 6</annotation>
<annotation cp="🏿" type="tts">karnacja ciemna</annotation>
+ <annotation cp="–">myślnik | półpauza | znak półpauzy</annotation>
+ <annotation cp="–" type="tts">znak półpauzy</annotation>
+ <annotation cp="—">myślnik | pauza | znak pauzy</annotation>
+ <annotation cp="—" type="tts">znak pauzy</annotation>
+ <annotation cp="·">kropka | kropka środkowa | punkt | środek</annotation>
+ <annotation cp="·" type="tts">kropka środkowa</annotation>
+ <annotation cp="«">cudzysłów | daszki | lewy | lewy cudzysłów ostrokątny | nawias ostry | nawiasy | szewron</annotation>
+ <annotation cp="«" type="tts">lewy cudzysłów ostrokątny</annotation>
+ <annotation cp="»">cudzysłów | daszki | nawias ostry | nawiasy | prawy | prawy cudzysłów ostrokątny | szewron</annotation>
+ <annotation cp="»" type="tts">prawy cudzysłów ostrokątny</annotation>
+ <annotation cp="§">artykuł | paragraf</annotation>
+ <annotation cp="§" type="tts">paragraf</annotation>
+ <annotation cp="†">crux philologorum | obelisk | obelos | obelus | sztylet | znak sztyletu</annotation>
+ <annotation cp="†" type="tts">znak sztyletu</annotation>
+ <annotation cp="‡">obelisk | obelos | obelus | podwójny | sztylet | znak podwójnego sztyletu</annotation>
+ <annotation cp="‡" type="tts">znak podwójnego sztyletu</annotation>
+ <annotation cp="•">kropka | punktor</annotation>
+ <annotation cp="•" type="tts">punktor</annotation>
+ <annotation cp="°">stopień | symbol stopnia</annotation>
+ <annotation cp="°" type="tts">stopień</annotation>
+ <annotation cp="℗">muzyczne | nagranie | znak praw autorskich | znak praw autorskich do nagrań muzycznych</annotation>
+ <annotation cp="℗" type="tts">znak praw autorskich do nagrań muzycznych</annotation>
+ <annotation cp="←">lewo | strzałka | strzałka skierowana w lewo</annotation>
+ <annotation cp="←" type="tts">strzałka skierowana w lewo</annotation>
+ <annotation cp="→">prawo | strzałka | strzałka skierowana w prawo</annotation>
+ <annotation cp="→" type="tts">strzałka skierowana w prawo</annotation>
+ <annotation cp="↑">góra | strzałka | strzałka skierowana w górę</annotation>
+ <annotation cp="↑" type="tts">strzałka skierowana w górę</annotation>
+ <annotation cp="↓">dół | strzałka | strzałka skierowana w dół</annotation>
+ <annotation cp="↓" type="tts">strzałka skierowana w dół</annotation>
+ <annotation cp="⇅">dół | góra | strzałka | strzałki skierowane w górę i w dół</annotation>
+ <annotation cp="⇅" type="tts">strzałki skierowane w górę i w dół</annotation>
+ <annotation cp="⇆">lewo | prawo | strzałka | strzałka skierowana w lewo nad strzałką skierowaną w prawo | strzałka w lewo nad strzałką w prawo</annotation>
+ <annotation cp="⇆" type="tts">strzałka w lewo nad strzałką w prawo</annotation>
+ <annotation cp="∆">delta | trójkąt</annotation>
+ <annotation cp="∆" type="tts">delta</annotation>
+ <annotation cp="∇">nabla | trójkąt</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">element | jest elementem | należy do | zbiór | znak przynależności do zbioru</annotation>
+ <annotation cp="∈" type="tts">należy do</annotation>
+ <annotation cp="÷">dzielenie | iloraz | podzielić | znak dzielenia | znak ilorazu</annotation>
+ <annotation cp="÷" type="tts">znak ilorazu</annotation>
+ <annotation cp="×">iloczyn | mnożenie | mnożyć | razy | znak iloczynu | znak mnożenia</annotation>
+ <annotation cp="×" type="tts">znak iloczynu</annotation>
+ <annotation cp="⁻">indeks górny | minus | minus w indeksie górnym</annotation>
+ <annotation cp="⁻" type="tts">minus w indeksie górnym</annotation>
+ <annotation cp="√">kwadratowy | pierwiastek</annotation>
+ <annotation cp="√" type="tts">pierwiastek kwadratowy</annotation>
+ <annotation cp="∞">nieskończoność | znak nieskończoności</annotation>
+ <annotation cp="∞" type="tts">znak nieskończoności</annotation>
+ <annotation cp="∩">część wspólna zbiorów | iloczyn zbiorów | przecięcie</annotation>
+ <annotation cp="∩" type="tts">iloczyn zbiorów</annotation>
+ <annotation cp="∪">suma zbiorów | zbiór</annotation>
+ <annotation cp="∪" type="tts">suma zbiorów</annotation>
+ <annotation cp="≡">identyczny | identyczny z | równoważny | tożsamy | tożsamy z | trzy kreski</annotation>
+ <annotation cp="≡" type="tts">tożsamy z</annotation>
+ <annotation cp="⊂">jest zawarty w | podzbiór | zbiór</annotation>
+ <annotation cp="⊂" type="tts">jest zawarty w</annotation>
+ <annotation cp="▲">strzałka | trójkąt | w górę | wypełniony | wypełniony trójkąt skierowany w górę</annotation>
+ <annotation cp="▲" type="tts">wypełniony trójkąt skierowany w górę</annotation>
+ <annotation cp="▼">strzałka | trójkąt | w dół | wypełniony | wypełniony trójkąt skierowany w dół</annotation>
+ <annotation cp="▼" type="tts">wypełniony trójkąt skierowany w dół</annotation>
+ <annotation cp="◊">karo | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">okrąg | pierścień</annotation>
+ <annotation cp="○" type="tts">okrąg</annotation>
+ <annotation cp="●">koło | wypełniony okrąg</annotation>
+ <annotation cp="●" type="tts">koło</annotation>
+ <annotation cp="◯">duży okrąg | okrąg | pierścień</annotation>
+ <annotation cp="◯" type="tts">duży okrąg</annotation>
<annotation cp="⚧">symbol transpłciowości | transpłciowość</annotation>
<annotation cp="⚧" type="tts">symbol transpłciowości</annotation>
<annotation cp="🤌">gest | palce | przesłuchanie | sarkazm | złączone palce</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">tęczowa flaga</annotation>
<annotation cp="🏴☠">czaszka i kości | Jolly Roger | piraci | piracka flaga | pirat | skarb</annotation>
<annotation cp="🏴☠" type="tts">piracka flaga</annotation>
+ <annotation cp="£">funt | funt szterling | GBP | waluta</annotation>
+ <annotation cp="£" type="tts">funt</annotation>
+ <annotation cp="¥">CNY | jen | JPY | juan | waluta</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | waluta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">rupia | rupia indyjska | waluta</annotation>
+ <annotation cp="₹" type="tts">rupia indyjska</annotation>
+ <annotation cp="₽">rubel | waluta</annotation>
+ <annotation cp="₽" type="tts">rubel</annotation>
+ <annotation cp="¹">indeks górny | jeden | jeden w indeksie górnym</annotation>
+ <annotation cp="¹" type="tts">jeden w indeksie górnym</annotation>
+ <annotation cp="²">dwa | dwa w indeksie górnym | indeks górny | kwadrat</annotation>
+ <annotation cp="²" type="tts">dwa w indeksie górnym</annotation>
+ <annotation cp="³">indeks górny | sześcian | trzy | trzy w indeksie górnym</annotation>
+ <annotation cp="³" type="tts">trzy w indeksie górnym</annotation>
+ <annotation cp="µ">miara | znak mikro</annotation>
+ <annotation cp="µ" type="tts">znak mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ps.xml b/common/annotations/ps.xml
index b942c18..9520a78 100644
--- a/common/annotations/ps.xml
+++ b/common/annotations/ps.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">غنمی-تورنګه پوستکۍ</annotation>
<annotation cp="🏿">پوستکۍ | تور پوستکۍ | ډول ۶</annotation>
<annotation cp="🏿" type="tts">تور پوستکۍ</annotation>
+ <annotation cp="–">پای | کرښک</annotation>
+ <annotation cp="–" type="tts">پای کرښک</annotation>
+ <annotation cp="—">اوږده | کرښک</annotation>
+ <annotation cp="—" type="tts">اوږده کرښک</annotation>
+ <annotation cp="·">ټکي | درونی | منځوني | مینځني ټکي</annotation>
+ <annotation cp="·" type="tts">مینځني ټکي</annotation>
+ <annotation cp="«">اخيستنښه | زاویه | ښی وینالېږد نښه | قوسونه | کيڼ وینالېږد نښه | کیڼ | کیڼحولی | هشتکونه</annotation>
+ <annotation cp="«" type="tts">کيڼ وینالېږد نښه</annotation>
+ <annotation cp="»">اخيستنښه | زاویه | ښی | ښی وینالېږد نښه | قوسونه | کیڼحولی | هشتکونه</annotation>
+ <annotation cp="»" type="tts">ښی وینالېږد نښه</annotation>
+ <annotation cp="§">برخه | پاراګراف | سلکرو</annotation>
+ <annotation cp="§" type="tts">برخه</annotation>
+ <annotation cp="†">خنجر | د خنجر نښه | ویش نښه</annotation>
+ <annotation cp="†" type="tts">د خنجر نښه</annotation>
+ <annotation cp="‡">دوګني ویش نښه | ډیګر | ویش نښه</annotation>
+ <annotation cp="‡" type="tts">دوګني ویش نښه</annotation>
+ <annotation cp="•">ټکي | ګلوله</annotation>
+ <annotation cp="•" type="tts">ګلوله</annotation>
+ <annotation cp="°">ثبوت | درجه | ساعت</annotation>
+ <annotation cp="°" type="tts">درجه</annotation>
+ <annotation cp="℗">ثبتول | د غږ ثبتولو نسخه حقوق | د نسخه حق | غږ</annotation>
+ <annotation cp="℗" type="tts">د غږ ثبتولو نسخه حقوق</annotation>
+ <annotation cp="←">غشی | کي- ښکارونکی غشی | کي-- ښکارونکی غشی | کيڼ</annotation>
+ <annotation cp="←" type="tts">کي-- ښکارونکی غشی</annotation>
+ <annotation cp="→">ښي - ښکارونکی غشی | ښۍ | غشی</annotation>
+ <annotation cp="→" type="tts">ښي - ښکارونکی غشی</annotation>
+ <annotation cp="↑">بره | غځېدونکې غشی | غشی</annotation>
+ <annotation cp="↑" type="tts">غځېدونکې غشی</annotation>
+ <annotation cp="↓">ښکته | ښکته-ښکارونکی غشی | غشی</annotation>
+ <annotation cp="↓" type="tts">ښکته-ښکارونکی غشی</annotation>
+ <annotation cp="⇅">بره | بره-ښیې او ښکته-ښیې غشی | ښکته | غشی</annotation>
+ <annotation cp="⇅" type="tts">بره-ښیې او ښکته-ښیې غشی</annotation>
+ <annotation cp="⇆">ښي | غشی | کيڼ | کيڼ اشاره باندې ښي اشاره غشي</annotation>
+ <annotation cp="⇆" type="tts">کيڼ اشاره باندې ښي اشاره غشي</annotation>
+ <annotation cp="∆">اضافه | مثلث</annotation>
+ <annotation cp="∆" type="tts">اضافه</annotation>
+ <annotation cp="∇">دریڅنډي | نسکوره دریڅنډي</annotation>
+ <annotation cp="∇" type="tts">نسکوره دریڅنډي</annotation>
+ <annotation cp="∈">څخه عنصر | د عنصر | شامل لري | عنصر | غړیتوب | مجموعه</annotation>
+ <annotation cp="∈" type="tts">د عنصر</annotation>
+ <annotation cp="÷">ویش نښه | وېش | وېش کول | وېش نښه</annotation>
+ <annotation cp="÷" type="tts">وېش نښه</annotation>
+ <annotation cp="×">ځله | ضرب | ضرب نښه | ضرب ورکول | ضرف نښه</annotation>
+ <annotation cp="×" type="tts">ضرب نښه</annotation>
+ <annotation cp="⁻">بالانوشت | منفي</annotation>
+ <annotation cp="⁻" type="tts">بالانوشت منفي</annotation>
+ <annotation cp="√">اصل عدد | افراطي | بنسټ | جذر | غیرناطق | مربع</annotation>
+ <annotation cp="√" type="tts">جذر</annotation>
+ <annotation cp="∞">لامحدود | لامحدود نښهلامحدود نښه</annotation>
+ <annotation cp="∞" type="tts">لامحدود نښهلامحدود نښه</annotation>
+ <annotation cp="∩">تقاطع | مجموعه</annotation>
+ <annotation cp="∩" type="tts">تقاطع</annotation>
+ <annotation cp="∪">اتحاد | ټولګه | مجموعه</annotation>
+ <annotation cp="∪" type="tts">مجموعه</annotation>
+ <annotation cp="≡">ته یکسان | دری چنده | ورته | یکسان</annotation>
+ <annotation cp="≡" type="tts">ته یکسان</annotation>
+ <annotation cp="⊂">زیر مجموعه | زیر مجموعه څخه | زیر مجموعه له | مجموعه</annotation>
+ <annotation cp="⊂" type="tts">زیر مجموعه څخه</annotation>
+ <annotation cp="▲">پورته | ډک شوی | ډکونکی - څرګندونې مثلث | ډکونکی - ښودونکی مثلث | غشی | مثلث</annotation>
+ <annotation cp="▲" type="tts">ډکونکی - څرګندونې مثلث</annotation>
+ <annotation cp="▼">ډک شوی | ډک شوی - نښې ښودونکی مثلث | ډک ښکته-اشاره د مثلث | ښکته | غشی | مثلث</annotation>
+ <annotation cp="▼" type="tts">ډک ښکته-اشاره د مثلث</annotation>
+ <annotation cp="◊">الماس | روميبس | لوزینج | لوزینګ</annotation>
+ <annotation cp="◊" type="tts">لوزینج</annotation>
+ <annotation cp="○">تشه حلقه | تشه دایره | حلقه | زنګ</annotation>
+ <annotation cp="○" type="tts">تشه دایره</annotation>
+ <annotation cp="●">دایره | ډک شوی دایره</annotation>
+ <annotation cp="●" type="tts">ډک شوی دایره</annotation>
+ <annotation cp="◯">حلقه | زنګ | لوی تش تشې حلقه | لوی تشه دایره</annotation>
+ <annotation cp="◯" type="tts">لوی تشه دایره</annotation>
<annotation cp="⚧">جنس بدلوونکی | د جنس بدلوونکي سمبول</annotation>
<annotation cp="⚧" type="tts">د جنس بدلوونکي سمبول</annotation>
<annotation cp="🤌">تفتيش | تنزيه | چونګ | د لاس اشاره | ګوتې</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">د بوډۍ ټال بېرغ</annotation>
<annotation cp="🏴☠">بحري ډاکو | جولي راجر | خزانه | د بحري ډاکوانو بېرغ | لوټ کول</annotation>
<annotation cp="🏴☠" type="tts">د بحري ډاکوانو بېرغ</annotation>
+ <annotation cp="£">اسعار | بریتاني پونډ | پونډ | مصري پونډ</annotation>
+ <annotation cp="£" type="tts">پونډ</annotation>
+ <annotation cp="¥">اسعار | جاپاني ین | چینايی ین | چینایي ین | ین</annotation>
+ <annotation cp="¥" type="tts">ین</annotation>
+ <annotation cp="€">اسعار | یورو</annotation>
+ <annotation cp="€" type="tts">یورو</annotation>
+ <annotation cp="₹">اسعار | روپئ | هندي روپئ | هندي روپۍ</annotation>
+ <annotation cp="₹" type="tts">هندي روپۍ</annotation>
+ <annotation cp="₽">اسعار | روبل</annotation>
+ <annotation cp="₽" type="tts">روبل</annotation>
+ <annotation cp="¹">بالانوشت | یو</annotation>
+ <annotation cp="¹" type="tts">یو بالانوشت</annotation>
+ <annotation cp="²">بالانوشت | څلوریځ | دوه</annotation>
+ <annotation cp="²" type="tts">بالانوشت دوه</annotation>
+ <annotation cp="³">بالانوشت | دری | درییځ</annotation>
+ <annotation cp="³" type="tts">بالانوشت دری</annotation>
+ <annotation cp="µ">پیمائش | مائیکرو نښه</annotation>
+ <annotation cp="µ" type="tts">مائیکرو نښه</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/pt.xml b/common/annotations/pt.xml
index d4e2596..82df092 100644
--- a/common/annotations/pt.xml
+++ b/common/annotations/pt.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">pele morena escura</annotation>
<annotation cp="🏿">pele escura | tipo 6 | tom de pele</annotation>
<annotation cp="🏿" type="tts">pele escura</annotation>
+ <annotation cp="–">meia-risca | traço</annotation>
+ <annotation cp="–" type="tts">meia-risca</annotation>
+ <annotation cp="—">traço | travessão</annotation>
+ <annotation cp="—" type="tts">travessão</annotation>
+ <annotation cp="·">mediano | ponto | ponto médio</annotation>
+ <annotation cp="·" type="tts">ponto mediano</annotation>
+ <annotation cp="«">ângulo | aspas | aspas em linha para a esquerda | aspas francesas | chevron | esquerda</annotation>
+ <annotation cp="«" type="tts">aspas em linha para a esquerda</annotation>
+ <annotation cp="»">ângulo | aspas | aspas em linha para a direita | aspas francesas | chevron | direita</annotation>
+ <annotation cp="»" type="tts">aspas em linha para a direita</annotation>
+ <annotation cp="§">parágrafo | parte | seção | símbolo de parágrafo</annotation>
+ <annotation cp="§" type="tts">seção</annotation>
+ <annotation cp="†">adaga | cruz | obelisco | óbelo</annotation>
+ <annotation cp="†" type="tts">obelisco</annotation>
+ <annotation cp="‡">adaga | duplo | obelisco | óbelo</annotation>
+ <annotation cp="‡" type="tts">obelisco duplo</annotation>
+ <annotation cp="•">ponto | ponto lista</annotation>
+ <annotation cp="•" type="tts">ponto lista</annotation>
+ <annotation cp="°">grau | hora | prova</annotation>
+ <annotation cp="°" type="tts">grau</annotation>
+ <annotation cp="℗">direitos autorais | fonograma | símbolo de direitos autorais de fonograma | som</annotation>
+ <annotation cp="℗" type="tts">símbolo de direitos autorais de fonograma</annotation>
+ <annotation cp="←">esquerda | seta | seta apontando para a esquerda</annotation>
+ <annotation cp="←" type="tts">seta apontando para a esquerda</annotation>
+ <annotation cp="→">direita | seta | seta apontando para a direita</annotation>
+ <annotation cp="→" type="tts">seta apontando para a direita</annotation>
+ <annotation cp="↑">cima | seta | seta apontando para cima</annotation>
+ <annotation cp="↑" type="tts">seta apontando para cima</annotation>
+ <annotation cp="↓">baixo | seta | seta apontando para baixo</annotation>
+ <annotation cp="↓" type="tts">seta apontando para baixo</annotation>
+ <annotation cp="⇅">baixo | cima | seta | setas apontando para cima e para baixo</annotation>
+ <annotation cp="⇅" type="tts">setas apontando para cima e para baixo</annotation>
+ <annotation cp="⇆">direita | esquerda | seta | setas apontando para a esquerda e para a direita</annotation>
+ <annotation cp="⇆" type="tts">setas apontando para a esquerda e para a direita</annotation>
+ <annotation cp="∆">delta | triângulo</annotation>
+ <annotation cp="∆" type="tts">delta</annotation>
+ <annotation cp="∇">nabla | triângulo</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">conjunto | contém | elemento | elemento de | membro</annotation>
+ <annotation cp="∈" type="tts">elemento de</annotation>
+ <annotation cp="÷">dividir | divisão | símbolo de divisão | sinal de divisão</annotation>
+ <annotation cp="÷" type="tts">sinal de divisão</annotation>
+ <annotation cp="×">multiplicação | multiplicar | símbolo de multiplicação | vezes</annotation>
+ <annotation cp="×" type="tts">símbolo de multiplicação</annotation>
+ <annotation cp="⁻">menos | sobrescrito</annotation>
+ <annotation cp="⁻" type="tts">menos sobrescrito</annotation>
+ <annotation cp="√">base aritmética | quadrada | radical | radiciação | raiz</annotation>
+ <annotation cp="√" type="tts">raiz quadrada</annotation>
+ <annotation cp="∞">infinito | sinal de infinito</annotation>
+ <annotation cp="∞" type="tts">sinal de infinito</annotation>
+ <annotation cp="∩">conjunto | interseção</annotation>
+ <annotation cp="∩" type="tts">interseção</annotation>
+ <annotation cp="∪">coleção | conjunto | união</annotation>
+ <annotation cp="∪" type="tts">união</annotation>
+ <annotation cp="≡">exato | igual | igual a | triplo</annotation>
+ <annotation cp="≡" type="tts">igual a</annotation>
+ <annotation cp="⊂">conjunto | subconjunto | subconjunto de</annotation>
+ <annotation cp="⊂" type="tts">subconjunto de</annotation>
+ <annotation cp="▲">cima | preenchido | seta | triângulo | triângulo preenchido apontando para cima</annotation>
+ <annotation cp="▲" type="tts">triângulo preenchido apontando para cima</annotation>
+ <annotation cp="▼">baixo | preenchido | seta | triângulo | triângulo preenchido apontando para baixo</annotation>
+ <annotation cp="▼" type="tts">triângulo preenchido apontando para baixo</annotation>
+ <annotation cp="◊">diamante | losango | rombo</annotation>
+ <annotation cp="◊" type="tts">losango</annotation>
+ <annotation cp="○">anel | círculo | círculo vazio</annotation>
+ <annotation cp="○" type="tts">círculo vazio</annotation>
+ <annotation cp="●">círculo | círculo preenchido</annotation>
+ <annotation cp="●" type="tts">círculo preenchido</annotation>
+ <annotation cp="◯">anel | círculo | círculo vazio grande</annotation>
+ <annotation cp="◯" type="tts">círculo vazio grande</annotation>
<annotation cp="⚧">símbolo transgênero | transgênero</annotation>
<annotation cp="⚧" type="tts">símbolo transgênero</annotation>
<annotation cp="🤌">beliscado | dedos | dedos comprimidos | gesto de mão | interrogação | sarcástico</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bandeira do arco-íris</annotation>
<annotation cp="🏴☠">bandeira de pirata | caveira e osso | pirata | saque | tesouro</annotation>
<annotation cp="🏴☠" type="tts">bandeira de pirata</annotation>
+ <annotation cp="£">GBP | libra | libra esterlina | moeda</annotation>
+ <annotation cp="£" type="tts">libra</annotation>
+ <annotation cp="¥">CNY | iene | JPY | moeda | yuan chinês</annotation>
+ <annotation cp="¥" type="tts">iene</annotation>
+ <annotation cp="€">EUR | euro | moeda</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">moeda | rupia | rupia indiana</annotation>
+ <annotation cp="₹" type="tts">rupia indiana</annotation>
+ <annotation cp="₽">moeda | rublo</annotation>
+ <annotation cp="₽" type="tts">rublo</annotation>
+ <annotation cp="¹">número um | número um sobrescrito | sobrescrito</annotation>
+ <annotation cp="¹" type="tts">número um sobrescrito</annotation>
+ <annotation cp="²">dois | número dois sobrescrito | quadrado | sobrescrito</annotation>
+ <annotation cp="²" type="tts">número dois sobrescrito</annotation>
+ <annotation cp="³">cubo | número três sobrescrito | sobrescrito | três</annotation>
+ <annotation cp="³" type="tts">número três sobrescrito</annotation>
+ <annotation cp="µ">medida | sinal micro</annotation>
+ <annotation cp="µ" type="tts">sinal micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/pt_PT.xml b/common/annotations/pt_PT.xml
index 033764f..0298d9b 100644
--- a/common/annotations/pt_PT.xml
+++ b/common/annotations/pt_PT.xml
@@ -24,6 +24,76 @@
<annotation cp="🏾" type="tts">tipo de pele 5</annotation>
<annotation cp="🏿">cor de pele | cor de pele escura | tez escura | tipo de pele 6</annotation>
<annotation cp="🏿" type="tts">tipo de pele 6</annotation>
+ <annotation cp="–">meia-risca | meio-traço | traço | traço de ligação | traço médio</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">↑↑↑</annotation>
+ <annotation cp="«" type="tts">↑↑↑</annotation>
+ <annotation cp="»">↑↑↑</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">parágrafo | parte | secção | símbolo de parágrafo</annotation>
+ <annotation cp="§" type="tts">secção</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">marca | marca de lista | ponto</annotation>
+ <annotation cp="•" type="tts">marca de lista</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">direitos de autor | fonograma | símbolo de direitos de autor de fonograma | som</annotation>
+ <annotation cp="℗" type="tts">símbolo de direitos de autor de fonograma</annotation>
+ <annotation cp="←">esquerda | para a esquerda | seta | seta a apontar para a esquerda</annotation>
+ <annotation cp="←" type="tts">seta a apontar para a esquerda</annotation>
+ <annotation cp="→">direita | para a direita | seta | seta a apontar para a direita</annotation>
+ <annotation cp="→" type="tts">seta a apontar para a direita</annotation>
+ <annotation cp="↑">cima | para cima | seta | seta a apontar para cima</annotation>
+ <annotation cp="↑" type="tts">seta a apontar para cima</annotation>
+ <annotation cp="↓">baixo | para baixo | seta | seta a apontar para baixo</annotation>
+ <annotation cp="↓" type="tts">seta a apontar para baixo</annotation>
+ <annotation cp="⇅">baixo | cima | para baixo | para cima | seta | setas a apontar para cima e para baixo</annotation>
+ <annotation cp="⇅" type="tts">setas a apontar para cima e para baixo</annotation>
+ <annotation cp="⇆">direita | esquerda | para a direita | para a esquerda | seta | setas a apontar para a esquerda e direita | setas a apontar para a esquerda e para a direita</annotation>
+ <annotation cp="⇆" type="tts">setas a apontar para a esquerda e para a direita</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">conjunto | contém | elemento | elemento de | membro | pertence a</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">símbolo de divisão</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">infinito | símbolo de infinito</annotation>
+ <annotation cp="∞" type="tts">símbolo de infinito</annotation>
+ <annotation cp="∩">conjunto | interseção | intersecção</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">coleção | conjunto | reunião | união</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">cima | para cima | preenchido | seta | triângulo | triângulo preenchido a apontar para cima</annotation>
+ <annotation cp="▲" type="tts">triângulo preenchido a apontar para cima</annotation>
+ <annotation cp="▼">baixo | para baixo | preenchido | seta | triângulo | triângulo preenchido a apontar para baixo</annotation>
+ <annotation cp="▼" type="tts">triângulo preenchido a apontar para baixo</annotation>
+ <annotation cp="◊">↑↑↑</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧" draft="contributed">símbolo transgénero</annotation>
<annotation cp="⚧" type="tts" draft="contributed">símbolo transgénero</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3008,5 +3078,23 @@
<annotation cp="🏳🌈" type="tts">bandeira arco-íris</annotation>
<annotation cp="🏴☠">bandeira pirata | perna-de-pau | pirata | tesouro</annotation>
<annotation cp="🏴☠" type="tts">bandeira pirata</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">↑↑↑</annotation>
+ <annotation cp="¥" type="tts">↑↑↑</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">expoente | número um | número um sobrescrito | sobrescrito | um</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">dois | expoente | número dois | número dois sobrescrito | quadrado | sobrescrito</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">cubo | expoente | número três | número três sobrescrito | sobrescrito | três</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">↑↑↑</annotation>
+ <annotation cp="µ" type="tts">↑↑↑</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/qu.xml b/common/annotations/qu.xml
index 4b8500b..eb24d78 100644
--- a/common/annotations/qu.xml
+++ b/common/annotations/qu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/ro.xml b/common/annotations/ro.xml
index 950b094..a844976 100644
--- a/common/annotations/ro.xml
+++ b/common/annotations/ro.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ton semi‑închis al pielii</annotation>
<annotation cp="🏿">nuanță | piele | tipul 6 | ton închis al pielii</annotation>
<annotation cp="🏿" type="tts">ton închis al pielii</annotation>
+ <annotation cp="–">linie | linie de pauză | pauză</annotation>
+ <annotation cp="–" type="tts">linie de pauză</annotation>
+ <annotation cp="—">dialog | linie | linie de dialog</annotation>
+ <annotation cp="—" type="tts">linie de dialog</annotation>
+ <annotation cp="·">interpunct | mijloc | punct | punct de mijloc | punct la mijloc | punct median</annotation>
+ <annotation cp="·" type="tts">punct la mijloc</annotation>
+ <annotation cp="«">accente circumflexe | ascuțite | ghilimele ascuțite stânga | ghilimele unghiulare | paranteze | semnele citării | stânga</annotation>
+ <annotation cp="«" type="tts">ghilimele ascuțite stânga</annotation>
+ <annotation cp="»">accente circumflexe | ascuțite | dreapta | ghilimele ascuțite dreapta | ghilimele unghiulare | paranteze | semnele citării</annotation>
+ <annotation cp="»" type="tts">ghilimele ascuțite dreapta</annotation>
+ <annotation cp="§">paragraf | parte | secțiune | semnul secțiune</annotation>
+ <annotation cp="§" type="tts">secțiune</annotation>
+ <annotation cp="†">cruciuliță | obelisc | semn cruciuliță</annotation>
+ <annotation cp="†" type="tts">semn cruciuliță</annotation>
+ <annotation cp="‡">cruciuliță | dublă | obelisc | semn cruciuliță dublă</annotation>
+ <annotation cp="‡" type="tts">semn cruciuliță dublă</annotation>
+ <annotation cp="•">marcator | punct</annotation>
+ <annotation cp="•" type="tts">marcator</annotation>
+ <annotation cp="°">grad | oră</annotation>
+ <annotation cp="°" type="tts">grad</annotation>
+ <annotation cp="℗">audio | copyright | drepturi de autor | drepturi de autor pentru înregistrare audio | înregistrare</annotation>
+ <annotation cp="℗" type="tts">drepturi de autor pentru înregistrare audio</annotation>
+ <annotation cp="←">săgeată | săgeată spre stânga | stânga</annotation>
+ <annotation cp="←" type="tts">săgeată spre stânga</annotation>
+ <annotation cp="→">dreapta | săgeată | săgeată spre dreapta</annotation>
+ <annotation cp="→" type="tts">săgeată spre dreapta</annotation>
+ <annotation cp="↑">săgeată | săgeată în sus | sus</annotation>
+ <annotation cp="↑" type="tts">săgeată în sus</annotation>
+ <annotation cp="↓">jos | săgeată | săgeată în jos</annotation>
+ <annotation cp="↓" type="tts">săgeată în jos</annotation>
+ <annotation cp="⇅">jos | săgeată | săgeată în sus și săgeată în jos | sus</annotation>
+ <annotation cp="⇅" type="tts">săgeată în sus și săgeată în jos</annotation>
+ <annotation cp="⇆">dreapta | săgeată | săgeată la stânga pe săgeată la dreapta | săgeată spre stânga peste săgeata spre dreapta | stânga</annotation>
+ <annotation cp="⇆" type="tts">săgeată la stânga pe săgeată la dreapta</annotation>
+ <annotation cp="∆">creștere | increment | triunghi</annotation>
+ <annotation cp="∆" type="tts">creștere</annotation>
+ <annotation cp="∇">nabla | triunghi</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">apartenență | aparține | conține | element | element al | mulțime</annotation>
+ <annotation cp="∈" type="tts">element al</annotation>
+ <annotation cp="÷">împărți | împărțire | semnul împărțirii</annotation>
+ <annotation cp="÷" type="tts">semnul împărțirii</annotation>
+ <annotation cp="×">înmulți | înmulțire | ori | semnul înmulțirii</annotation>
+ <annotation cp="×" type="tts">semnul înmulțirii</annotation>
+ <annotation cp="⁻">exponent | minus</annotation>
+ <annotation cp="⁻" type="tts">exponent minus</annotation>
+ <annotation cp="√">număr irațional | pătrat | rădăcină | rădăcină pătrată | radical</annotation>
+ <annotation cp="√" type="tts">rădăcină pătrată</annotation>
+ <annotation cp="∞">infinit | semnul infinit</annotation>
+ <annotation cp="∞" type="tts">semnul infinit</annotation>
+ <annotation cp="∩">intersecție | mulțime</annotation>
+ <annotation cp="∩" type="tts">intersecție</annotation>
+ <annotation cp="∪">colecție | mulțime | reuniune</annotation>
+ <annotation cp="∪" type="tts">reuniune</annotation>
+ <annotation cp="≡">congruent | exact | identic | identic cu | triplu</annotation>
+ <annotation cp="≡" type="tts">identic cu</annotation>
+ <annotation cp="⊂">mulțime | submulțime | submulțime a</annotation>
+ <annotation cp="⊂" type="tts">submulțime a</annotation>
+ <annotation cp="▲">plină | săgeată | sus | triunghi | triunghi cu vârful în sus | triunghi plin cu vârful în sus</annotation>
+ <annotation cp="▲" type="tts">triunghi plin cu vârful în sus</annotation>
+ <annotation cp="▼">jos | plin | săgeată | triunghi | triunghi plin cu vârful în jos</annotation>
+ <annotation cp="▼" type="tts">triunghi plin cu vârful în jos</annotation>
+ <annotation cp="◊">caro | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">cerc | cerc gol | inel</annotation>
+ <annotation cp="○" type="tts">cerc gol</annotation>
+ <annotation cp="●">cerc | cerc plin</annotation>
+ <annotation cp="●" type="tts">cerc plin</annotation>
+ <annotation cp="◯">cerc | cerc gol mare | inel</annotation>
+ <annotation cp="◯" type="tts">cerc gol mare</annotation>
<annotation cp="⚧" draft="contributed">transgender</annotation>
<annotation cp="⚧" type="tts" draft="contributed">transgender</annotation>
<annotation cp="🤌">degete | degete strânse | gest cu mâna | interogație | sarcastic</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">steag curcubeu</annotation>
<annotation cp="🏴☠">comoară | pirați | pradă | steag cu cap de mort | steagul piraților</annotation>
<annotation cp="🏴☠" type="tts">steagul piraților</annotation>
+ <annotation cp="£">EGP | GBP | liră | monedă</annotation>
+ <annotation cp="£" type="tts">liră</annotation>
+ <annotation cp="¥">CNY | JPY | monedă | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | monedă</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">monedă | rupie | rupie indiană</annotation>
+ <annotation cp="₹" type="tts">rupie indiană</annotation>
+ <annotation cp="₽">monedă | rublă</annotation>
+ <annotation cp="₽" type="tts">rublă</annotation>
+ <annotation cp="¹">exponent | unu</annotation>
+ <annotation cp="¹" type="tts">exponent unu</annotation>
+ <annotation cp="²">doi | exponent | la pătrat</annotation>
+ <annotation cp="²" type="tts">exponent doi</annotation>
+ <annotation cp="³">exponent | la cub | trei</annotation>
+ <annotation cp="³" type="tts">exponent trei</annotation>
+ <annotation cp="µ">măsură | semnul micro</annotation>
+ <annotation cp="µ" type="tts">semnul micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/root.xml b/common/annotations/root.xml
index df04c72..7abfac5 100644
--- a/common/annotations/root.xml
+++ b/common/annotations/root.xml
@@ -27,6 +27,76 @@
<annotation cp="🏾" type="tts">E10-443</annotation>
<annotation cp="🏿">E10-444</annotation>
<annotation cp="🏿" type="tts">E10-444</annotation>
+ <annotation cp="–">E13-113</annotation>
+ <annotation cp="–" type="tts">E13-113</annotation>
+ <annotation cp="—">E13-114</annotation>
+ <annotation cp="—" type="tts">E13-114</annotation>
+ <annotation cp="·">E13-138</annotation>
+ <annotation cp="·" type="tts">E13-138</annotation>
+ <annotation cp="«">E13-140</annotation>
+ <annotation cp="«" type="tts">E13-140</annotation>
+ <annotation cp="»">E13-139</annotation>
+ <annotation cp="»" type="tts">E13-139</annotation>
+ <annotation cp="§">E13-146</annotation>
+ <annotation cp="§" type="tts">E13-146</annotation>
+ <annotation cp="†">E13-147</annotation>
+ <annotation cp="†" type="tts">E13-147</annotation>
+ <annotation cp="‡">E13-148</annotation>
+ <annotation cp="‡" type="tts">E13-148</annotation>
+ <annotation cp="•">E13-145</annotation>
+ <annotation cp="•" type="tts">E13-145</annotation>
+ <annotation cp="°">E13-149</annotation>
+ <annotation cp="°" type="tts">E13-149</annotation>
+ <annotation cp="℗">E13-126</annotation>
+ <annotation cp="℗" type="tts">E13-126</annotation>
+ <annotation cp="←">E13-103</annotation>
+ <annotation cp="←" type="tts">E13-103</annotation>
+ <annotation cp="→">E13-100</annotation>
+ <annotation cp="→" type="tts">E13-100</annotation>
+ <annotation cp="↑">E13-102</annotation>
+ <annotation cp="↑" type="tts">E13-102</annotation>
+ <annotation cp="↓">E13-101</annotation>
+ <annotation cp="↓" type="tts">E13-101</annotation>
+ <annotation cp="⇅">E13-107</annotation>
+ <annotation cp="⇅" type="tts">E13-107</annotation>
+ <annotation cp="⇆">E13-106</annotation>
+ <annotation cp="⇆" type="tts">E13-106</annotation>
+ <annotation cp="∆">E13-131</annotation>
+ <annotation cp="∆" type="tts">E13-131</annotation>
+ <annotation cp="∇">E13-133</annotation>
+ <annotation cp="∇" type="tts">E13-133</annotation>
+ <annotation cp="∈">E13-142</annotation>
+ <annotation cp="∈" type="tts">E13-142</annotation>
+ <annotation cp="÷">E13-132</annotation>
+ <annotation cp="÷" type="tts">E13-132</annotation>
+ <annotation cp="×">E13-127</annotation>
+ <annotation cp="×" type="tts">E13-127</annotation>
+ <annotation cp="⁻">E13-134</annotation>
+ <annotation cp="⁻" type="tts">E13-134</annotation>
+ <annotation cp="√">E13-128</annotation>
+ <annotation cp="√" type="tts">E13-128</annotation>
+ <annotation cp="∞">E13-129</annotation>
+ <annotation cp="∞" type="tts">E13-129</annotation>
+ <annotation cp="∩">E13-141</annotation>
+ <annotation cp="∩" type="tts">E13-141</annotation>
+ <annotation cp="∪">E13-144</annotation>
+ <annotation cp="∪" type="tts">E13-144</annotation>
+ <annotation cp="≡">E13-130</annotation>
+ <annotation cp="≡" type="tts">E13-130</annotation>
+ <annotation cp="⊂">E13-143</annotation>
+ <annotation cp="⊂" type="tts">E13-143</annotation>
+ <annotation cp="▲">E13-119</annotation>
+ <annotation cp="▲" type="tts">E13-119</annotation>
+ <annotation cp="▼">E13-115</annotation>
+ <annotation cp="▼" type="tts">E13-115</annotation>
+ <annotation cp="◊">E13-122</annotation>
+ <annotation cp="◊" type="tts">E13-122</annotation>
+ <annotation cp="○">E13-118</annotation>
+ <annotation cp="○" type="tts">E13-118</annotation>
+ <annotation cp="●">E13-116</annotation>
+ <annotation cp="●" type="tts">E13-116</annotation>
+ <annotation cp="◯">E13-121</annotation>
+ <annotation cp="◯" type="tts">E13-121</annotation>
<annotation cp="⚧">E13-075</annotation>
<annotation cp="⚧" type="tts">E13-075</annotation>
<annotation cp="🤌">E13-004</annotation>
@@ -3012,5 +3082,23 @@
<annotation cp="🏳🌈" type="tts">E10-1156</annotation>
<annotation cp="🏴☠">E11-003</annotation>
<annotation cp="🏴☠" type="tts">E11-003</annotation>
+ <annotation cp="£">E13-109</annotation>
+ <annotation cp="£" type="tts">E13-109</annotation>
+ <annotation cp="¥">E13-110</annotation>
+ <annotation cp="¥" type="tts">E13-110</annotation>
+ <annotation cp="€">E13-108</annotation>
+ <annotation cp="€" type="tts">E13-108</annotation>
+ <annotation cp="₹">E13-111</annotation>
+ <annotation cp="₹" type="tts">E13-111</annotation>
+ <annotation cp="₽">E13-112</annotation>
+ <annotation cp="₽" type="tts">E13-112</annotation>
+ <annotation cp="¹">E13-135</annotation>
+ <annotation cp="¹" type="tts">E13-135</annotation>
+ <annotation cp="²">E13-136</annotation>
+ <annotation cp="²" type="tts">E13-136</annotation>
+ <annotation cp="³">E13-137</annotation>
+ <annotation cp="³" type="tts">E13-137</annotation>
+ <annotation cp="µ">E13-150</annotation>
+ <annotation cp="µ" type="tts">E13-150</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ru.xml b/common/annotations/ru.xml
index 86e87d3..725c426 100644
--- a/common/annotations/ru.xml
+++ b/common/annotations/ru.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">темный тон кожи</annotation>
<annotation cp="🏿">кожа | оттенок | очень темный тон кожи | тело | темный | цвет | цвет кожи | цвет кожи 6</annotation>
<annotation cp="🏿" type="tts">очень темный тон кожи</annotation>
+ <annotation cp="–">среднее | тире</annotation>
+ <annotation cp="–" type="tts">среднее тире</annotation>
+ <annotation cp="—">длинное | тире</annotation>
+ <annotation cp="—" type="tts">длинное тире</annotation>
+ <annotation cp="·">интерпункт | средняя | точка</annotation>
+ <annotation cp="·" type="tts">интерпункт</annotation>
+ <annotation cp="«">влево | елочка | елочки | знак вставки | кавычки | открывающая французская кавычка | шеврон</annotation>
+ <annotation cp="«" type="tts">открывающая французская кавычка</annotation>
+ <annotation cp="»">вправо | елочка | елочки | закрывающая французская кавычка | знак вставки | кавычки | шеврон</annotation>
+ <annotation cp="»" type="tts">закрывающая французская кавычка</annotation>
+ <annotation cp="§">параграф | пункт | раздел</annotation>
+ <annotation cp="§" type="tts">параграф</annotation>
+ <annotation cp="†">даггер | крестик | обелиск | типографский крестик</annotation>
+ <annotation cp="†" type="tts">типографский крестик</annotation>
+ <annotation cp="‡">даггер | двойной | крестик | обелиск</annotation>
+ <annotation cp="‡" type="tts">двойной крестик</annotation>
+ <annotation cp="•">маркер | маркер пункта | маркер пункта в списке | пункт | пункт в списке | пункт списка</annotation>
+ <annotation cp="•" type="tts">маркер пункта в списке</annotation>
+ <annotation cp="°">градус | крепость | угол</annotation>
+ <annotation cp="°" type="tts">градус</annotation>
+ <annotation cp="℗">авторские права | авторское право | авторское право на музыку | запись | копирайт | музыка</annotation>
+ <annotation cp="℗" type="tts">авторское право на музыку</annotation>
+ <annotation cp="←">налево | стрелка | стрелка «налево»</annotation>
+ <annotation cp="←" type="tts">стрелка «налево»</annotation>
+ <annotation cp="→">направо | стрелка | стрелка «направо»</annotation>
+ <annotation cp="→" type="tts">стрелка «направо»</annotation>
+ <annotation cp="↑">кверху | стрелка | стрелка «кверху»</annotation>
+ <annotation cp="↑" type="tts">стрелка «кверху»</annotation>
+ <annotation cp="↓">книзу | стрелка | стрелка «книзу»</annotation>
+ <annotation cp="↓" type="tts">стрелка «книзу»</annotation>
+ <annotation cp="⇅">кверху | книзу | стрелка | стрелки «кверху» и «книзу»</annotation>
+ <annotation cp="⇅" type="tts">стрелки «кверху» и «книзу»</annotation>
+ <annotation cp="⇆">налево | направо | стрелка | стрелка «налево» над стрелкой «направо»</annotation>
+ <annotation cp="⇆" type="tts">стрелка «налево» над стрелкой «направо»</annotation>
+ <annotation cp="∆">инкремент | треугольник</annotation>
+ <annotation cp="∆" type="tts">инкремент</annotation>
+ <annotation cp="∇">набла | треугольник</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">множество | принадлежность | принадлежность множеству | содержит | состоит в | элемент</annotation>
+ <annotation cp="∈" type="tts">принадлежность множеству</annotation>
+ <annotation cp="÷">деление | знак деления | обелюс | разделить</annotation>
+ <annotation cp="÷" type="tts">деление</annotation>
+ <annotation cp="×">знак умножения | умножение | умноженный | умножить</annotation>
+ <annotation cp="×" type="tts">умножение</annotation>
+ <annotation cp="⁻">минус | надстрочный | степень</annotation>
+ <annotation cp="⁻" type="tts">надстрочный минус</annotation>
+ <annotation cp="√">знак корня | иррациональное число | квадратный | корень | радикал</annotation>
+ <annotation cp="√" type="tts">квадратный корень</annotation>
+ <annotation cp="∞">бесконечность | знак бесконечности</annotation>
+ <annotation cp="∞" type="tts">знак бесконечности</annotation>
+ <annotation cp="∩">множество | пересечение</annotation>
+ <annotation cp="∩" type="tts">пересечение</annotation>
+ <annotation cp="∪">множество | объединение | совокупность</annotation>
+ <annotation cp="∪" type="tts">объединение</annotation>
+ <annotation cp="≡">идентичный | равный | тождественное равенство | тождество | тройной</annotation>
+ <annotation cp="≡" type="tts">тождество</annotation>
+ <annotation cp="⊂">включено в | множество | подмножество</annotation>
+ <annotation cp="⊂" type="tts">подмножество</annotation>
+ <annotation cp="▲">вверх | закрашенный | закрашенный треугольник вершиной вверх | стрелка | треугольник</annotation>
+ <annotation cp="▲" type="tts">закрашенный треугольник вершиной вверх</annotation>
+ <annotation cp="▼">вниз | закрашенный | закрашенный треугольник вершиной вниз | стрелка | треугольник</annotation>
+ <annotation cp="▼" type="tts">закрашенный треугольник вершиной вниз</annotation>
+ <annotation cp="◊">бубны | косоугольник | ромб</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">круг | незакрашенный круг | полый | пустой круг | шар</annotation>
+ <annotation cp="○" type="tts">незакрашенный круг</annotation>
+ <annotation cp="●">закрашенный круг | заполненный круг | круг | шар</annotation>
+ <annotation cp="●" type="tts">закрашенный круг</annotation>
+ <annotation cp="◯">большой незакрашенный круг | круг | полый | пустой | шар</annotation>
+ <annotation cp="◯" type="tts">большой незакрашенный круг</annotation>
<annotation cp="⚧">символ | трансгендер | трансгендерная | трансгендерное | трансгендерные | трансгендерный</annotation>
<annotation cp="⚧" type="tts">трансгендер</annotation>
<annotation cp="🤌">вопрос | жест | пальцы | рега | сарказм | щепотка | щепоть</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">радужный флаг</annotation>
<annotation cp="🏴☠">веселый роджер | кости | пиратский флаг | пираты | флаг | череп</annotation>
<annotation cp="🏴☠" type="tts">пиратский флаг</annotation>
+ <annotation cp="£">валюта | стерлинги | фунт | фунт стерлингов</annotation>
+ <annotation cp="£" type="tts">фунт</annotation>
+ <annotation cp="¥">валюта | иена | китайский юань | юань | японская иена</annotation>
+ <annotation cp="¥" type="tts">иена</annotation>
+ <annotation cp="€">валюта | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валюта | индийская рупия | рупия</annotation>
+ <annotation cp="₹" type="tts">индийская рупия</annotation>
+ <annotation cp="₽">валюта | рубль</annotation>
+ <annotation cp="₽" type="tts">рубль</annotation>
+ <annotation cp="¹">надстрочная цифра один | надстрочный | один | степень</annotation>
+ <annotation cp="¹" type="tts">надстрочная цифра один</annotation>
+ <annotation cp="²">в квадрате | два | квадрат | надстрочная цифра два | надстрочный | степень</annotation>
+ <annotation cp="²" type="tts">надстрочная цифра два</annotation>
+ <annotation cp="³">в кубе | куб | надстрочная | надстрочная цифра три | степень | три</annotation>
+ <annotation cp="³" type="tts">надстрочная цифра три</annotation>
+ <annotation cp="µ">значок микро | измерение</annotation>
+ <annotation cp="µ" type="tts">значок микро</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sd.xml b/common/annotations/sd.xml
index fdbd8d9..b5dab31 100644
--- a/common/annotations/sd.xml
+++ b/common/annotations/sd.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">وچولو ڪارو رنگ</annotation>
<annotation cp="🏿">رنگ | قسم 6 | ڪارو رنگ</annotation>
<annotation cp="🏿" type="tts">ڪارو رنگ</annotation>
+ <annotation cp="–">اي اين | اي اين ڊيش | ڊيش</annotation>
+ <annotation cp="–" type="tts">اي اين ڊيش</annotation>
+ <annotation cp="—">اي ايم | اي ايم ڊيش | ڊيش</annotation>
+ <annotation cp="—" type="tts">اي ايم ڊيش</annotation>
+ <annotation cp="·">انٽرپنڪٽ | ٽٻڪو | وچ | وچ وارو ٽٻڪو</annotation>
+ <annotation cp="·" type="tts">وچ وارو ٽٻڪو</annotation>
+ <annotation cp="«">اينگل | بريڪيٽ | چيورون | کاٻو | کاٻو گيولمينٽ | ڪوٽ | ڪيريٽس</annotation>
+ <annotation cp="«" type="tts">کاٻو گيولمينٽ</annotation>
+ <annotation cp="»">اينگل | بريڪيٽ | چيورون | ساڄو | ساڄو گيولمينٽ | ڪوٽ | ڪيريٽس</annotation>
+ <annotation cp="»" type="tts">ساڄو گيولمينٽ</annotation>
+ <annotation cp="§">پيراگراف | حصو | سلڪرو | سيڪشن</annotation>
+ <annotation cp="§" type="tts">سيڪشن</annotation>
+ <annotation cp="†">اوبيلسڪ | حاشي | ڊيگر | ڊيگر جي نشاني</annotation>
+ <annotation cp="†" type="tts">ڊيگر جي نشاني</annotation>
+ <annotation cp="‡">اوبيلسڪ | حاشي | ڊبل | ڊبل ڊيگر نشاني | ڊيگر</annotation>
+ <annotation cp="‡" type="tts">ڊبل ڊيگر نشاني</annotation>
+ <annotation cp="•">بليٽ | ٽٻڪو</annotation>
+ <annotation cp="•" type="tts">بليٽ</annotation>
+ <annotation cp="°">ثبوت | ڊگري | ڪلاڪ</annotation>
+ <annotation cp="°" type="tts">ڊگري</annotation>
+ <annotation cp="℗">آواز | آواز رڪارڊنگ ڪاپي رائيٽ | رڪارڊنگ | ڪاپي رائيٽ</annotation>
+ <annotation cp="℗" type="tts">آواز رڪارڊنگ ڪاپي رائيٽ</annotation>
+ <annotation cp="←">تير | کاٻو | کاٻو-اشارو ڏيندڙ تير</annotation>
+ <annotation cp="←" type="tts">کاٻو-اشارو ڏيندڙ تير</annotation>
+ <annotation cp="→">تير | ساڄو | ساڄو-اشارو ڪندڙ تڳر | ساڄو-اشارو ڪندڙ تير</annotation>
+ <annotation cp="→" type="tts">ساڄو-اشارو ڪندڙ تير</annotation>
+ <annotation cp="↑">تير | مٿي | مٿي-اشارو ڏيندڙ تير | مٿي-اشارو ڪندڙ تير</annotation>
+ <annotation cp="↑" type="tts">مٿي-اشارو ڪندڙ تير</annotation>
+ <annotation cp="↓">تير | هيٺ | هيٺ-اشارو ڪندڙ تير</annotation>
+ <annotation cp="↓" type="tts">هيٺ-اشارو ڪندڙ تير</annotation>
+ <annotation cp="⇅">تير / هيٺ / مٿي / مٿي اشارو ڏيندڙ تير ۽ هيٺ اشارو ڏيندڙ تير | مٿي-اشارو ڏيندڙ ۽ هيٺ-اشارو ڏيندڙ تير</annotation>
+ <annotation cp="⇅" type="tts">مٿي-اشارو ڏيندڙ ۽ هيٺ-اشارو ڏيندڙ تير</annotation>
+ <annotation cp="⇆">تير | ساڄو | ساڄو-اشارو ڏيندڙ تيرن تي کاٻو-اشارو ڏيندڙ تير | کاٻو</annotation>
+ <annotation cp="⇆" type="tts">ساڄو-اشارو ڏيندڙ تيرن تي کاٻو-اشارو ڏيندڙ تير</annotation>
+ <annotation cp="∆">انڪريمينٽ | ٽڪنڊو</annotation>
+ <annotation cp="∆" type="tts">انڪريمينٽ</annotation>
+ <annotation cp="∇">ٽڪنڊو | نبلا</annotation>
+ <annotation cp="∇" type="tts">نبلا</annotation>
+ <annotation cp="∈">جو عنصر | سيٽ | عنصر | ڪنٽينس | ميمبرشپ</annotation>
+ <annotation cp="∈" type="tts">جو عنصر</annotation>
+ <annotation cp="÷">حاشي | ضرب ڪريو | ونڍ | ونڍ جي نشاني</annotation>
+ <annotation cp="÷" type="tts">ونڍ جي نشاني</annotation>
+ <annotation cp="×">ڀيرا | ضرب | ضرب جي نشاني | ضرب ڪريو</annotation>
+ <annotation cp="×" type="tts">ضرب جي نشاني</annotation>
+ <annotation cp="⁻">سپر اسڪرپٽ | سپر اسڪرپٽ مائنس | مائنس</annotation>
+ <annotation cp="⁻" type="tts">سپر اسڪرپٽ مائنس</annotation>
+ <annotation cp="√">اسڪوائر | روٽ | ريڊڪس | ريڊيڪل | سرڊ</annotation>
+ <annotation cp="√" type="tts">اسڪوائر روٽ</annotation>
+ <annotation cp="∞">انفينٽي | انفينٽي سائن</annotation>
+ <annotation cp="∞" type="tts">انفينٽي سائن</annotation>
+ <annotation cp="∩">انٽر سيڪشن | سيٽ</annotation>
+ <annotation cp="∩" type="tts">انٽر سيڪشن</annotation>
+ <annotation cp="∪">سيٽ | ڪليڪشن | يونين</annotation>
+ <annotation cp="∪" type="tts">يونين</annotation>
+ <annotation cp="≡">ٽرپل | ڏانهن ساڳيا | ڏانهن هڪ جهڙا | ساڳيا | هڪ جهڙا</annotation>
+ <annotation cp="≡" type="tts">ڏانهن ساڳيا</annotation>
+ <annotation cp="⊂">جو سب سيٽ | جو سبسيٽ | سب سيٽ | سيٽ</annotation>
+ <annotation cp="⊂" type="tts">جو سبسيٽ</annotation>
+ <annotation cp="▲">ڀريل | ڀريل مٿي-اشارو ڏيندڙ ٽڪنڊو | تير | ٽڪنڊو | مٿي</annotation>
+ <annotation cp="▲" type="tts">ڀريل مٿي-اشارو ڏيندڙ ٽڪنڊو</annotation>
+ <annotation cp="▼">ڀريل | ڀريل هيٺ-اشارو ڏيندڙ ٽڪنڊو | تير | ٽڪنڊو | هيٺ</annotation>
+ <annotation cp="▼" type="tts">ڀريل هيٺ-اشارو ڏيندڙ ٽڪنڊو</annotation>
+ <annotation cp="◊">روهمبس | لوزينج | هيرو</annotation>
+ <annotation cp="◊" type="tts">لوزينج</annotation>
+ <annotation cp="○">خالي دائرو | دائرو | رنگ</annotation>
+ <annotation cp="○" type="tts">خالي دائرو</annotation>
+ <annotation cp="●">ڀريل دائرو | ڀريل گول | دائرو</annotation>
+ <annotation cp="●" type="tts">ڀريل گول</annotation>
+ <annotation cp="◯">دائرو | رنگ | وڏو خالي دائرو</annotation>
+ <annotation cp="◯" type="tts">وڏو خالي دائرو</annotation>
<annotation cp="⚧">وچ جنس | وچ جنس جي نشاني</annotation>
<annotation cp="⚧" type="tts">وچ جنس جي نشاني</annotation>
<annotation cp="🤌">آڱريون | انٽيروگيشن | پنچ ٿيل | پنچ ٿيل آڱريون | سارڪيسٽڪ | هٿ جو اشرو</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">انڊلٺي جھنڊو</annotation>
<annotation cp="🏴☠">پائريٽ | پائريٽ نشان | پلونڊر | جولي روجر | خزانو</annotation>
<annotation cp="🏴☠" type="tts">پائريٽ نشان</annotation>
+ <annotation cp="£">£ | پائونڊ</annotation>
+ <annotation cp="£" type="tts">پائونڊ</annotation>
+ <annotation cp="¥">¥ | يوئان | يين</annotation>
+ <annotation cp="¥" type="tts">يين</annotation>
+ <annotation cp="€">€ | يورو</annotation>
+ <annotation cp="€" type="tts">يورو</annotation>
+ <annotation cp="₹">انڊين رپيو | رپيو | ڪرنسي</annotation>
+ <annotation cp="₹" type="tts">انڊين رپيو</annotation>
+ <annotation cp="₽">ربل | ڪرنسي</annotation>
+ <annotation cp="₽" type="tts">ربل</annotation>
+ <annotation cp="¹">سپر اسڪرپٽ | سپر اسڪرپٽ ون | ون</annotation>
+ <annotation cp="¹" type="tts">سپر اسڪرپٽ ون</annotation>
+ <annotation cp="²">ٽو | چورس | سپر اسڪرپٽ | سپر اسڪرپٽ ٽو</annotation>
+ <annotation cp="²" type="tts">سپر اسڪرپٽ ٽو</annotation>
+ <annotation cp="³">ٽي | سپر اسڪرپٽ | سپر اسڪرپٽ ٿري | ڪيوبڊ</annotation>
+ <annotation cp="³" type="tts">سپر اسڪرپٽ ٿري</annotation>
+ <annotation cp="µ">مائيڪرو سائن | ماپ</annotation>
+ <annotation cp="µ" type="tts">مائيڪرو سائن</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/si.xml b/common/annotations/si.xml
index 8ef4685..cb75843 100644
--- a/common/annotations/si.xml
+++ b/common/annotations/si.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">සමෙහි වර්ගය-5</annotation>
<annotation cp="🏿">ඉමෝජි විකරණකාරකය | වර්ණය | සම | සමෙහි වර්ගය-6 | ෆ්ට්ස්පැට්රික්</annotation>
<annotation cp="🏿" type="tts">සමෙහි වර්ගය-6</annotation>
+ <annotation cp="–">ඉර | එන්</annotation>
+ <annotation cp="–" type="tts">එන් ඉර</annotation>
+ <annotation cp="—">ඉර | එම්</annotation>
+ <annotation cp="—" type="tts">එම් ඉර</annotation>
+ <annotation cp="·">අන්තර් විරාමය | තිත | මැද</annotation>
+ <annotation cp="·" type="tts">මැද තිත</annotation>
+ <annotation cp="«">උද්ධරණය | කෝණය | නිලපටය | ලෝප ලකුණ | වම | වම් ගිල්මටය | වරහන්</annotation>
+ <annotation cp="«" type="tts">වම් ගිල්මටය</annotation>
+ <annotation cp="»">උද්ධරණය | කෝණය | දකුණ | දකුණු ගිල්මටය | නිලපටය | ලෝප ලකුණ | වරහන්</annotation>
+ <annotation cp="»" type="tts">දකුණු ගිල්මටය</annotation>
+ <annotation cp="§">අංශය | කොටස | ඡේදය | සිල්ක්රෝ</annotation>
+ <annotation cp="§" type="tts">කොටස</annotation>
+ <annotation cp="†">ඔබලිස්කය | කිරිච්වය | කිරිච්වය ලකුණ | සිරිය</annotation>
+ <annotation cp="†" type="tts">කිරිච්වය ලකුණ</annotation>
+ <annotation cp="‡">ඔබලිස්කය | කිරිච්වය | ද්විත්ව | ද්විත්ව කිරිච්වය ලකුණ | සිරිය</annotation>
+ <annotation cp="‡" type="tts">ද්විත්ව කිරිච්වය ලකුණ</annotation>
+ <annotation cp="•">උණ්ඩය | තිත | පතරොම</annotation>
+ <annotation cp="•" type="tts">පතරොම</annotation>
+ <annotation cp="°">අංශකය | පැය | සාධකය</annotation>
+ <annotation cp="°" type="tts">අංශකය</annotation>
+ <annotation cp="℗">පටිගත කිරීම | ප්රකාශන හිමිකම | ශබ්ද පටිගත කිරීමේ ප්රකාශන අයිතිය | ශබ්දය</annotation>
+ <annotation cp="℗" type="tts">ශබ්ද පටිගත කිරීමේ ප්රකාශන අයිතිය</annotation>
+ <annotation cp="←">ඊතලය | වම | වමට යොමු වන ඊතලය</annotation>
+ <annotation cp="←" type="tts">වමට යොමු වන ඊතලය</annotation>
+ <annotation cp="→">ඊතලය | දකුණ | දකුණට යොමු වන ඊතලය</annotation>
+ <annotation cp="→" type="tts">දකුණට යොමු වන ඊතලය</annotation>
+ <annotation cp="↑">ඉහළට | ඉහළට යොමු වන ඊතලය | ඊතලය</annotation>
+ <annotation cp="↑" type="tts">ඉහළට යොමු වන ඊතලය</annotation>
+ <annotation cp="↓">ඊතලය | පහළට | පහළට යොමු වන ඊතලය</annotation>
+ <annotation cp="↓" type="tts">පහළට යොමු වන ඊතලය</annotation>
+ <annotation cp="⇅">ඉහළට | ඉහළට යොමු කරන සහ පහළට යොමු වන ඊතල | ඉහළට සහ පහළට යොමු වන ඊතල | ඊතලය | පහළට</annotation>
+ <annotation cp="⇅" type="tts">ඉහළට සහ පහළට යොමු වන ඊතල</annotation>
+ <annotation cp="⇆">ඊතලය | දකුණ | දකුණට ඊතල මත වමට යොමු කිරීම | දකුණට ඊතල හරහා වමට යොමු කිරීම | වම</annotation>
+ <annotation cp="⇆" type="tts">දකුණට ඊතල මත වමට යොමු කිරීම</annotation>
+ <annotation cp="∆">ත්රිකෝණය | වර්ධකය</annotation>
+ <annotation cp="∆" type="tts">වර්ධකය</annotation>
+ <annotation cp="∇">ත්රිකෝණය | නැබ්ලා</annotation>
+ <annotation cp="∇" type="tts">නැබ්ලා</annotation>
+ <annotation cp="∈">අඩංගු | කට්ටලය | මූලද්රව්යය | සාමාජිකත්වය | හි මූලද්රව්යය</annotation>
+ <annotation cp="∈" type="tts">හි මූලද්රව්යය</annotation>
+ <annotation cp="÷">කිරිච්වයක හැඩයට ඇති සලකුණ | බෙදන්න | බෙදීම | බෙදීම් ලකුණ</annotation>
+ <annotation cp="÷" type="tts">බෙදීම් ලකුණ</annotation>
+ <annotation cp="×">ගුණ කරන්න | ගුණ කිරීම | ගුණ කිරීමේ ලකුණ | වාරයන්</annotation>
+ <annotation cp="×" type="tts">ගුණ කිරීමේ ලකුණ</annotation>
+ <annotation cp="⁻">උඩකුර | උඩුකුරු ඍණ | සෘණ</annotation>
+ <annotation cp="⁻" type="tts">උඩුකුරු ඍණ</annotation>
+ <annotation cp="√">ආමූලය | කරණිය | මූලකය | මූලය | වර්ග මූලය | වර්ගය</annotation>
+ <annotation cp="√" type="tts">වර්ග මූලය</annotation>
+ <annotation cp="∞">අනන්තය | අපරිමිත ලකුණ</annotation>
+ <annotation cp="∞" type="tts">අපරිමිත ලකුණ</annotation>
+ <annotation cp="∩">අන්තර්ඡේදනය | කට්ටලය</annotation>
+ <annotation cp="∩" type="tts">අන්තර්ඡේදනය</annotation>
+ <annotation cp="∪">එකතුව | කට්ටලය | සන්ධිය</annotation>
+ <annotation cp="∪" type="tts">සන්ධිය</annotation>
+ <annotation cp="≡">ත්රිත්ව | වෙත සමාන | සමාන | සමාන වේ | හරියටම</annotation>
+ <annotation cp="≡" type="tts">සමාන වේ</annotation>
+ <annotation cp="⊂">උප කුලකය | කට්ටලය | හි උප කුලකය</annotation>
+ <annotation cp="⊂" type="tts">හි උප කුලකය</annotation>
+ <annotation cp="▲">ඉහළට | ඊතලය | ත්රිකෝණය | පිරවූ ඉහළට යොමු වන ත්රිකෝණය | පුරවා</annotation>
+ <annotation cp="▲" type="tts">පිරවූ ඉහළට යොමු වන ත්රිකෝණය</annotation>
+ <annotation cp="▼">ඊතලය | ත්රිකෝණය | පහළට | පිරවූ පහළට යොමු වන ත්රිකෝණය | පුරවා</annotation>
+ <annotation cp="▼" type="tts">පිරවූ පහළට යොමු වන ත්රිකෝණය</annotation>
+ <annotation cp="◊">දියමන්තිය | රොම්බසය | ලොසින්ජරය</annotation>
+ <annotation cp="◊" type="tts">ලොසින්ජරය</annotation>
+ <annotation cp="○">කවය | කුහර කවය | මුද්ද</annotation>
+ <annotation cp="○" type="tts">කුහර කවය</annotation>
+ <annotation cp="●">කවය | පිරවූ කවය</annotation>
+ <annotation cp="●" type="tts">පිරවූ කවය</annotation>
+ <annotation cp="◯">කවය | මුද්ද | විශාල කුහර කවය</annotation>
+ <annotation cp="◯" type="tts">විශාල කුහර කවය</annotation>
<annotation cp="⚧">සංක්රාන්ති ලිංගික සංකේතය | සංක්රාන්ති ලිංගිකයන්</annotation>
<annotation cp="⚧" type="tts">සංක්රාන්ති ලිංගික සංකේතය</annotation>
<annotation cp="🤌">අත් ඉඟිය | ඇඟිලි | උපහාසාත්මක | ප්රශ්න කිරීම | වකුටු කළ | වකුටු කළ ඇඟිලි</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">දේදුනු කොඩිය</annotation>
<annotation cp="🏴☠">කොල්ලකෑම | ජොලි රොජර් | නිධානය | මුහුදු කොල්ලකාර කොඩිය | මුහුදු කොල්ලාකරු</annotation>
<annotation cp="🏴☠" type="tts">මුහුදු කොල්ලකාර කොඩිය</annotation>
+ <annotation cp="£">ඊ.ප. | පවුම | පවුම් | ම.බ්රි.ප. | මුදල්</annotation>
+ <annotation cp="£" type="tts">පවුම්</annotation>
+ <annotation cp="¥">චී.යු. | ජ.යෙ. | මුදල් | යුවාන් | යෙන්</annotation>
+ <annotation cp="¥" type="tts">යෙන්</annotation>
+ <annotation cp="€">මුදල් | යුරෝ</annotation>
+ <annotation cp="€" type="tts">යුරෝ</annotation>
+ <annotation cp="₹">ඉන්දියානු රුපියල | ඉන්දියානු රුපියල් | මුදල් | රුපියල</annotation>
+ <annotation cp="₹" type="tts">ඉන්දියානු රුපියල්</annotation>
+ <annotation cp="₽">මුදල් | රූබල්</annotation>
+ <annotation cp="₽" type="tts">රූබල්</annotation>
+ <annotation cp="¹">උඩකුර | එක</annotation>
+ <annotation cp="¹" type="tts">උඩකුර එක</annotation>
+ <annotation cp="²">උඩකුර | දෙක | වර්ගායිත</annotation>
+ <annotation cp="²" type="tts">උඩකුර දෙක</annotation>
+ <annotation cp="³">උඩකුර | ඝනායිත | තුන</annotation>
+ <annotation cp="³" type="tts">උඩකුර තුන</annotation>
+ <annotation cp="µ">ක්ෂුද්ර ලකුණ | මිනුම</annotation>
+ <annotation cp="µ" type="tts">ක්ෂුද්ර ලකුණ</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sk.xml b/common/annotations/sk.xml
index d93b4e4..a7beeec 100644
--- a/common/annotations/sk.xml
+++ b/common/annotations/sk.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">stredne tmavý tón pleti</annotation>
<annotation cp="🏿">koža | odtieň | pleť | tmavá | tmavý tón pleti | tón</annotation>
<annotation cp="🏿" type="tts">tmavý tón pleti</annotation>
+ <annotation cp="–">krátka | pomlčka</annotation>
+ <annotation cp="–" type="tts">pomlčka</annotation>
+ <annotation cp="—">dlhá | dlhá pomlčka</annotation>
+ <annotation cp="—" type="tts">dlhá pomlčka</annotation>
+ <annotation cp="·">bodka | stredná | znak</annotation>
+ <annotation cp="·" type="tts">stredná bodka</annotation>
+ <annotation cp="«">citácia | francúzske | ľavé | ľavé bočné úvodzovky | ľavé úvodzovky | lomené | ruské | uhlové</annotation>
+ <annotation cp="«" type="tts">ľavé bočné úvodzovky</annotation>
+ <annotation cp="»">citácia | francúzske | lomené | pravé | pravé bočné úvodzovky | pravé úvodzovky | ruské | uhlové</annotation>
+ <annotation cp="»" type="tts">pravé bočné úvodzovky</annotation>
+ <annotation cp="§">časť | odsek | paragraf | znak paragrafu</annotation>
+ <annotation cp="§" type="tts">odsek</annotation>
+ <annotation cp="†">kríž | krížik | znak kríža | znak krížika</annotation>
+ <annotation cp="†" type="tts">znak krížika</annotation>
+ <annotation cp="‡">dvojitý | dvojkríž | kríž | krížik | znak dvojitého kríža</annotation>
+ <annotation cp="‡" type="tts">znak dvojitého kríža</annotation>
+ <annotation cp="•">guľka | odrážka</annotation>
+ <annotation cp="•" type="tts">odrážka</annotation>
+ <annotation cp="°">hodina | promile | stupeň</annotation>
+ <annotation cp="°" type="tts">stupeň</annotation>
+ <annotation cp="℗">autorské práva | autorské práva na nahrávku | nahrávka | zvuk</annotation>
+ <annotation cp="℗" type="tts">autorské práva na nahrávku</annotation>
+ <annotation cp="←">doľava | šípka | šípka smerujúca doľava</annotation>
+ <annotation cp="←" type="tts">šípka smerujúca doľava</annotation>
+ <annotation cp="→">šípka | šípka smerujúca doprava | vpravo</annotation>
+ <annotation cp="→" type="tts">šípka smerujúca doprava</annotation>
+ <annotation cp="↑">nahor | šípka | šípka smerujúca nahor</annotation>
+ <annotation cp="↑" type="tts">šípka smerujúca nahor</annotation>
+ <annotation cp="↓">nadol | šípka | šípka smerujúca nadol</annotation>
+ <annotation cp="↓" type="tts">šípka smerujúca nadol</annotation>
+ <annotation cp="⇅">nadol | nahor | šípka | šípka nahor a šípka nadol | šípky smerujúce nahor a nadol</annotation>
+ <annotation cp="⇅" type="tts">šípka nahor a šípka nadol</annotation>
+ <annotation cp="⇆">šípka | šípka smerujúca vľavo nad šípkou smerujúcou vpravo | šípka vľavo nad šípkou vpravo | vľavo | vpravo</annotation>
+ <annotation cp="⇆" type="tts">šípka vľavo nad šípkou vpravo</annotation>
+ <annotation cp="∆">delta | trojuholník</annotation>
+ <annotation cp="∆" type="tts">delta</annotation>
+ <annotation cp="∇">nabla | trojuholník</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">je prvkom | množina | obsahuje | patrí | prvok</annotation>
+ <annotation cp="∈" type="tts">je prvkom</annotation>
+ <annotation cp="÷">delené | delenie | deliť | znak delenia</annotation>
+ <annotation cp="÷" type="tts">znak delenia</annotation>
+ <annotation cp="×">krát | násobenie | násobiť | znak násobenia</annotation>
+ <annotation cp="×" type="tts">znak násobenia</annotation>
+ <annotation cp="⁻">horný index | mínus | mínus horný index</annotation>
+ <annotation cp="⁻" type="tts">mínus horný index</annotation>
+ <annotation cp="√">druhá odmocnina | odmocnenie | odmocnina | odmocniť | odmocňovať | znak odmocnenia</annotation>
+ <annotation cp="√" type="tts">druhá odmocnina</annotation>
+ <annotation cp="∞">nekonečno | znak nekonečna</annotation>
+ <annotation cp="∞" type="tts">znak nekonečna</annotation>
+ <annotation cp="∩">množina | prienik</annotation>
+ <annotation cp="∩" type="tts">prienik</annotation>
+ <annotation cp="∪">množina | súbor | zjednotenie</annotation>
+ <annotation cp="∪" type="tts">zjednotenie</annotation>
+ <annotation cp="≡">identické | kongruentné | totožné | totožné s</annotation>
+ <annotation cp="≡" type="tts">totožné s</annotation>
+ <annotation cp="⊂">množina | podmnožina | podmožina z</annotation>
+ <annotation cp="⊂" type="tts">podmnožina</annotation>
+ <annotation cp="▲">nahor | plný trojuholník smerujúci nahor | šípka | trojuholník | vyplnený</annotation>
+ <annotation cp="▲" type="tts">plný trojuholník smerujúci nahor</annotation>
+ <annotation cp="▼">nadol | plný trojuholník smerujúci nadol | šípka | trojuholník | vyplnený</annotation>
+ <annotation cp="▼" type="tts">plný trojuholník smerujúci nadol</annotation>
+ <annotation cp="◊">diamantový vzor | káro | kosoštvorec</annotation>
+ <annotation cp="◊" type="tts">kosoštvorec</annotation>
+ <annotation cp="○">kruh | krúžok | prázdny kruh</annotation>
+ <annotation cp="○" type="tts">prázdny kruh</annotation>
+ <annotation cp="●">kruh | plný kruh</annotation>
+ <annotation cp="●" type="tts">plný kruh</annotation>
+ <annotation cp="◯">kruh | prstenec | veľký prázdny kruh</annotation>
+ <annotation cp="◯" type="tts">veľký prázdny kruh</annotation>
<annotation cp="⚧">transgender | transgenderový symbol</annotation>
<annotation cp="⚧" type="tts">transgenderový symbol</annotation>
<annotation cp="🤌">málo | prsty | štipka | trocha | troška</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">dúhová zástava</annotation>
<annotation cp="🏴☠">korisť | pirát | pirátska zástava | poklad</annotation>
<annotation cp="🏴☠" type="tts">pirátska zástava</annotation>
+ <annotation cp="£">EGP | GBP | libra | mena</annotation>
+ <annotation cp="£" type="tts">libra</annotation>
+ <annotation cp="¥">CNY | jen | JPY | mena | yen</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | mena</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indická rupia | mena | rupia</annotation>
+ <annotation cp="₹" type="tts">indická rupia</annotation>
+ <annotation cp="₽">mena | rubeľ</annotation>
+ <annotation cp="₽" type="tts">rubeľ</annotation>
+ <annotation cp="¹">horný index | jedna | jedna horný index</annotation>
+ <annotation cp="¹" type="tts">jedna horný index</annotation>
+ <annotation cp="²">dva | dva horný index | horný index | na druhú</annotation>
+ <annotation cp="²" type="tts">dva horný index</annotation>
+ <annotation cp="³">horný index | na tretiu | tri | tri horný index</annotation>
+ <annotation cp="³" type="tts">tri horný index</annotation>
+ <annotation cp="µ">mierka | znak mikro</annotation>
+ <annotation cp="µ" type="tts">znak mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sl.xml b/common/annotations/sl.xml
index 50d01a0..845da21 100644
--- a/common/annotations/sl.xml
+++ b/common/annotations/sl.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">srednje temen ten kože</annotation>
<annotation cp="🏿">temen ten kože | ten | vrsta 6</annotation>
<annotation cp="🏿" type="tts">temen ten kože</annotation>
+ <annotation cp="–">kratek | vezaj</annotation>
+ <annotation cp="–" type="tts">vezaj</annotation>
+ <annotation cp="—">dolg | pomišljaj</annotation>
+ <annotation cp="—" type="tts">pomišljaj</annotation>
+ <annotation cp="·">ločilo | pika | srednja</annotation>
+ <annotation cp="·" type="tts">srednja pika</annotation>
+ <annotation cp="«">kotni | levi | levi francoski narekovaj | narekovaji | navednica | škarnice | znak</annotation>
+ <annotation cp="«" type="tts">levi francoski narekovaj</annotation>
+ <annotation cp="»">desni | desni francoski narekovaj | kotni | narekovaji | navednica | škarnice | znak</annotation>
+ <annotation cp="»" type="tts">desni francoski narekovaj</annotation>
+ <annotation cp="§">člen | del | razdelek | znak za razdelek</annotation>
+ <annotation cp="§" type="tts">razdelek</annotation>
+ <annotation cp="†">bodalo | križec | znak za bodalo | znamenje</annotation>
+ <annotation cp="†" type="tts">znak za bodalo</annotation>
+ <annotation cp="‡">bodalo | dvojno | križec | znak za dvojno bodalo | znamenje</annotation>
+ <annotation cp="‡" type="tts">znak za dvojno bodalo</annotation>
+ <annotation cp="•">pika | vrstična oznaka</annotation>
+ <annotation cp="•" type="tts">vrstična oznaka</annotation>
+ <annotation cp="°">količina | stopinja | ura</annotation>
+ <annotation cp="°" type="tts">stopinja</annotation>
+ <annotation cp="℗">avtorske pravice | avtorske pravice za zvočni posnetek | posnetek | zvočni</annotation>
+ <annotation cp="℗" type="tts">avtorske pravice za zvočni posnetek</annotation>
+ <annotation cp="←">levo | puščica | puščica, obrnjena v levo</annotation>
+ <annotation cp="←" type="tts">puščica, obrnjena v levo</annotation>
+ <annotation cp="→">desno | puščica | puščica, obrnjena v desno</annotation>
+ <annotation cp="→" type="tts">puščica, obrnjena v desno</annotation>
+ <annotation cp="↑">navzgor | puščica | puščica, obrnjena navzgor</annotation>
+ <annotation cp="↑" type="tts">puščica, obrnjena navzgor</annotation>
+ <annotation cp="↓">navzdol | puščica | puščica, obrnjena navzdol</annotation>
+ <annotation cp="↓" type="tts">puščica, obrnjena navzdol</annotation>
+ <annotation cp="⇅">navzdol | navzgor | puščica | puščici, obrnjeni navzgor in navzdol | Puščici, obrnjeni navzgor in navzdol</annotation>
+ <annotation cp="⇅" type="tts">puščici, obrnjeni navzgor in navzdol</annotation>
+ <annotation cp="⇆">desno | levo | puščica | puščica v levo nad puščico v desno | puščica, obrnjena v levo, nad puščico, obrnjeno v desno</annotation>
+ <annotation cp="⇆" type="tts">puščica v levo nad puščico v desno</annotation>
+ <annotation cp="∆">razlika | trikotnik</annotation>
+ <annotation cp="∆" type="tts">razlika</annotation>
+ <annotation cp="∇">nabla | trikotnik</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">članstvo | element | je element množice | množica | vsebuje</annotation>
+ <annotation cp="∈" type="tts">je element množice</annotation>
+ <annotation cp="÷">deli | deljenje | znak za deljenje</annotation>
+ <annotation cp="÷" type="tts">znak za deljenje</annotation>
+ <annotation cp="×">krat | množenje | množi | znak za množenje</annotation>
+ <annotation cp="×" type="tts">znak za množenje</annotation>
+ <annotation cp="⁻">minus | nadpis | nadpisani minus</annotation>
+ <annotation cp="⁻" type="tts">nadpisani minus</annotation>
+ <annotation cp="√">iracionalno število | koren | korenski | kvadratni</annotation>
+ <annotation cp="√" type="tts">kvadratni koren</annotation>
+ <annotation cp="∞">neskončno | znak za neskončno</annotation>
+ <annotation cp="∞" type="tts">znak za neskončno</annotation>
+ <annotation cp="∩">množica | presek</annotation>
+ <annotation cp="∩" type="tts">presek</annotation>
+ <annotation cp="∪">množica | unija | zbirka</annotation>
+ <annotation cp="∪" type="tts">unija</annotation>
+ <annotation cp="≡">enako | je enako | točno</annotation>
+ <annotation cp="≡" type="tts">je enako</annotation>
+ <annotation cp="⊂">je podmnožica množice | množica | podmnožica</annotation>
+ <annotation cp="⊂" type="tts">je podmnožica množice</annotation>
+ <annotation cp="▲">navzgor | poln | poln navzgor obrnjen trikotnik | puščica | trikotnik</annotation>
+ <annotation cp="▲" type="tts">poln navzgor obrnjen trikotnik</annotation>
+ <annotation cp="▼">navzdol | poln | poln navzdol obrnjen trikotnik | puščica | trikotnik</annotation>
+ <annotation cp="▼" type="tts">poln navzdol obrnjen trikotnik</annotation>
+ <annotation cp="◊">romb | rombast lik</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">krog | obroč | votel krog</annotation>
+ <annotation cp="○" type="tts">votel krog</annotation>
+ <annotation cp="●">krog | poln krog</annotation>
+ <annotation cp="●" type="tts">poln krog</annotation>
+ <annotation cp="◯">krog | obroč | velik votel krog</annotation>
+ <annotation cp="◯" type="tts">velik votel krog</annotation>
<annotation cp="⚧">simbol za transseksualnost | transseksualnost</annotation>
<annotation cp="⚧" type="tts">simbol za transseksualnost</annotation>
<annotation cp="🤌">izpraševanje | kretnja z roko | prsti | prsti, stisnjeni skupaj | sarkastično | stisnjen</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">mavrična zastava</annotation>
<annotation cp="🏴☠">gusarska zastava | pirat | piratska zastava | plenjenje | zaklad</annotation>
<annotation cp="🏴☠" type="tts">piratska zastava</annotation>
+ <annotation cp="£">EGP | funt | GBP | valuta</annotation>
+ <annotation cp="£" type="tts">funt</annotation>
+ <annotation cp="¥">CNY | jen | JPY | juan | valuta</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | evro | valuta</annotation>
+ <annotation cp="€" type="tts">evro</annotation>
+ <annotation cp="₹">indijska rupija | indijska rupoja | rupija | valuta</annotation>
+ <annotation cp="₹" type="tts">indijska rupija</annotation>
+ <annotation cp="₽">rubelj | valuta</annotation>
+ <annotation cp="₽" type="tts">rubelj</annotation>
+ <annotation cp="¹">enka | nadpis | nadpisana enka</annotation>
+ <annotation cp="¹" type="tts">nadpisana enka</annotation>
+ <annotation cp="²">dvojka | kvadrat | nadpis | nadpisana dvojka</annotation>
+ <annotation cp="²" type="tts">nadpisana dvojka</annotation>
+ <annotation cp="³">kub | nadpis | nadpisana trojka | trojka</annotation>
+ <annotation cp="³" type="tts">nadpisana trojka</annotation>
+ <annotation cp="µ">mera | znak za mikro</annotation>
+ <annotation cp="µ" type="tts">znak za mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/so.xml b/common/annotations/so.xml
index c66dea6..9be56cf 100644
--- a/common/annotations/so.xml
+++ b/common/annotations/so.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">jidh nooc madaw oo dhexe</annotation>
<annotation cp="🏿">jidh | jidh madaw | nooc 6</annotation>
<annotation cp="🏿" type="tts">jidh madaw</annotation>
+ <annotation cp="–">isbeeys tiriye | xarakada erayga | xarakayn</annotation>
+ <annotation cp="–" type="tts">xarakada erayga</annotation>
+ <annotation cp="—">cutub cabir | laynka astaameeynta | xarakayn</annotation>
+ <annotation cp="—" type="tts">laynka astaameeynta</annotation>
+ <annotation cp="·">dhexda | dhibic | dhibic dhexaad | dhibicda dhexdeeda | kala go ‘</annotation>
+ <annotation cp="·" type="tts">dhibicda dhexdeeda</annotation>
+ <annotation cp="«">bidix | calaamad hoosaad | gulimeetka bidix | layn | soodin | xagal | xigasho</annotation>
+ <annotation cp="«" type="tts">gulimeetka bidix</annotation>
+ <annotation cp="»">calaamad hoosaad | gulimeetka midig | layn | midig | soodin | xagal | xigasho | xuquuqda guillemetka</annotation>
+ <annotation cp="»" type="tts">xuquuqda guillemetka</annotation>
+ <annotation cp="§">baaragraaf | qayb | qaybta | silkroow</annotation>
+ <annotation cp="§" type="tts">qaybta</annotation>
+ <annotation cp="†">calaamad isdultaala | calaamada toorida</annotation>
+ <annotation cp="†" type="tts">calaamada toorida</annotation>
+ <annotation cp="‡">calaamada isdultaal | calaamada toorid | calaamada toorida oo labajibaaran | labajibaaran | toori</annotation>
+ <annotation cp="‡" type="tts">calaamada toorida oo labajibaaran</annotation>
+ <annotation cp="•">dhibic | rasaas</annotation>
+ <annotation cp="•" type="tts">rasaas</annotation>
+ <annotation cp="°">cadeeyn | degree ga | saacada</annotation>
+ <annotation cp="°" type="tts">degree ga</annotation>
+ <annotation cp="℗">cod | duubis | xuquuqda daabacaad | xuquuqda duubista codka</annotation>
+ <annotation cp="℗" type="tts">xuquuqda duubista codka</annotation>
+ <annotation cp="←">bidix | fallaar | fallaar bidixda ku aadan | fallaar ku aadan bidix</annotation>
+ <annotation cp="←" type="tts">fallaar ku aadan bidix</annotation>
+ <annotation cp="→">fallaa | fallaarta midigta ku aadan | midig</annotation>
+ <annotation cp="→" type="tts">fallaarta midigta ku aadan</annotation>
+ <annotation cp="↑">fallaar | fallaar kor ku aadan | kor</annotation>
+ <annotation cp="↑" type="tts">fallaar kor ku aadan</annotation>
+ <annotation cp="↓">fallaar | fallaar hoos ku aadan | hoos</annotation>
+ <annotation cp="↓" type="tts">fallaar hoos ku aadan</annotation>
+ <annotation cp="⇅">fallaar | fallaaro kor iyo hoos ku aadan | fallaaro koro iyo hoos ku aadan | hoos | kor</annotation>
+ <annotation cp="⇅" type="tts">fallaaro kor iyo hoos ku aadan</annotation>
+ <annotation cp="⇆">bidix | fallaar | fallaaro bidix ku aadan oo ka sareeya kuwa midig ku aadan | midig</annotation>
+ <annotation cp="⇆" type="tts">fallaaro bidix ku aadan oo ka sareeya kuwa midig ku aadan</annotation>
+ <annotation cp="∆">kordhin | sadex geesood</annotation>
+ <annotation cp="∆" type="tts">kordhin</annotation>
+ <annotation cp="∇">nabla | sadex geesood</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">curiyaha | curiye | isku hagaajin | ka kooban | xubinimada</annotation>
+ <annotation cp="∈" type="tts">curiyaha</annotation>
+ <annotation cp="÷">calaamada qaladka | calaamada qaybta | qayb | qaybi</annotation>
+ <annotation cp="÷" type="tts">calaamada qaybta</annotation>
+ <annotation cp="×">isku dhufasho | isku dhufo | mar | xalaamada isku dhufashada</annotation>
+ <annotation cp="×" type="tts">xalaamada isku dhufashada</annotation>
+ <annotation cp="⁻">calaamad | calaamada kajar | kajar</annotation>
+ <annotation cp="⁻" type="tts">calaamada kajar</annotation>
+ <annotation cp="√">aasaasi ah | afar geesood | lambarka laba jibaarma | lambarka surd | radikis | xidid</annotation>
+ <annotation cp="√" type="tts">lambarka laba jibaarma</annotation>
+ <annotation cp="∞">aan dhamaad lahayn | calaamada infinity</annotation>
+ <annotation cp="∞" type="tts">calaamada infinity</annotation>
+ <annotation cp="∩">is goys | isku hagaajin</annotation>
+ <annotation cp="∩" type="tts">is goys</annotation>
+ <annotation cp="∪">isku hagaajin | isu gayn | midow</annotation>
+ <annotation cp="∪" type="tts">midow</annotation>
+ <annotation cp="≡">ay mataano yihiin | lamid ah | mataano | sadex</annotation>
+ <annotation cp="≡" type="tts">ay mataano yihiin</annotation>
+ <annotation cp="⊂">hoosaadka | hooseed | hooseedka | isku hagaajin</annotation>
+ <annotation cp="⊂" type="tts">hoosaadka</annotation>
+ <annotation cp="▲">allaar | ka buuxda | kor | saddex xagal | saddex xagal buuxda oo kor u taagan</annotation>
+ <annotation cp="▲" type="tts">saddex xagal buuxda oo kor u taagan</annotation>
+ <annotation cp="▼">allaar | hoos | ka buuxda | saddex xagal | saddex xagal hoos-loo fiiqay | saddex xagal hoos-u-fiiqan</annotation>
+ <annotation cp="▼" type="tts">saddex xagal hoos-u-fiiqan</annotation>
+ <annotation cp="◊">dheeman | qaab dheeman | rhombus</annotation>
+ <annotation cp="◊" type="tts">qaab dheeman</annotation>
+ <annotation cp="○">duleelka goobada | faraanti | goobad</annotation>
+ <annotation cp="○" type="tts">duleelka goobada</annotation>
+ <annotation cp="●">goobad | goobad buuxda | goobada buuxa</annotation>
+ <annotation cp="●" type="tts">goobada buuxa</annotation>
+ <annotation cp="◯">faraanti | goobad | goobad duleel weeyn</annotation>
+ <annotation cp="◯" type="tts">goobad duleel weeyn</annotation>
<annotation cp="⚧">calaamada laba dhidiga | laba dhidig</annotation>
<annotation cp="⚧" type="tts">calaamada laba dhidiga</annotation>
<annotation cp="🤌">faro la isku wada duubay | tilmaamta gacanta</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">calanka qaanso roobeed</annotation>
<annotation cp="🏴☠">burcad badeed | calanka burcad badeedda | dhaca | Jolly Roger | khasnadda</annotation>
<annotation cp="🏴☠" type="tts">calanka burcad badeedda</annotation>
+ <annotation cp="£">´lacagta ingiriska laga isticmaalo | EGP | GBP | hadda | lacagta ingiriska</annotation>
+ <annotation cp="£" type="tts">´lacagta ingiriska laga isticmaalo</annotation>
+ <annotation cp="¥">CNY | JPY | lacagta | lacagta yen | yuan</annotation>
+ <annotation cp="¥" type="tts">lacagta yen</annotation>
+ <annotation cp="€">hadda | yuurada | yuuro</annotation>
+ <annotation cp="€" type="tts">yuuro</annotation>
+ <annotation cp="₹">lacagta | rubiis | rubiiska hindiya</annotation>
+ <annotation cp="₹" type="tts">rubiiska hindiya</annotation>
+ <annotation cp="₽">cutub lacageedka raashiya | lacagta</annotation>
+ <annotation cp="₽" type="tts">cutub lacageedka raashiya</annotation>
+ <annotation cp="¹">calaamad | calaamada koobaad | koow</annotation>
+ <annotation cp="¹" type="tts">calaamada koobaad</annotation>
+ <annotation cp="²">calaama | calaamada labaad | labo | lambar laisku dhuftay</annotation>
+ <annotation cp="²" type="tts">calaamada labaad</annotation>
+ <annotation cp="³">calaamad | calaamda sadexaad | kiyuub | sadex</annotation>
+ <annotation cp="³" type="tts">calaamda sadexaad</annotation>
+ <annotation cp="µ">astaanta micro | cabir</annotation>
+ <annotation cp="µ" type="tts">astaanta micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sq.xml b/common/annotations/sq.xml
index 16b305b..5e17b46 100644
--- a/common/annotations/sq.xml
+++ b/common/annotations/sq.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">nuancë lëkure gjysmë e errët</annotation>
<annotation cp="🏿">nuancë lëkure | nuancë lëkure e errët | tipi VI</annotation>
<annotation cp="🏿" type="tts">nuancë lëkure e errët</annotation>
+ <annotation cp="–">e mesme | vizë | vizë e mesme</annotation>
+ <annotation cp="–" type="tts">vizë e mesme</annotation>
+ <annotation cp="—">e gjatë | vizë | vizë e gjatë</annotation>
+ <annotation cp="—" type="tts">vizë e gjatë</annotation>
+ <annotation cp="·">mes | pikë | pikë mesi | pikë ndërmjetëse</annotation>
+ <annotation cp="·" type="tts">pikë mesi</annotation>
+ <annotation cp="«">shenjë citimi | shirit grade | thonjëza të majta</annotation>
+ <annotation cp="«" type="tts">thonjëza të majta</annotation>
+ <annotation cp="»">shenjë citimi | shirit grade | thonjëza të djathta</annotation>
+ <annotation cp="»" type="tts">thonjëza të djathta</annotation>
+ <annotation cp="§">paragraf | pjesë | seksion | shenja e paragrafit</annotation>
+ <annotation cp="§" type="tts">seksion</annotation>
+ <annotation cp="†">kamë | obelisk | obelus | shenja e kamës</annotation>
+ <annotation cp="†" type="tts">shenja e kamës</annotation>
+ <annotation cp="‡">dyshe | kamë | obelisk | obelus | shenja e kamës dyshe</annotation>
+ <annotation cp="‡" type="tts">shenja e kamës dyshe</annotation>
+ <annotation cp="•">pikë | pikë liste</annotation>
+ <annotation cp="•" type="tts">pikë liste</annotation>
+ <annotation cp="°">gradë | orë | provë</annotation>
+ <annotation cp="°" type="tts">gradë</annotation>
+ <annotation cp="℗">e drejta e autorit | e drejta e autorit për regjistrim zanor | regjistrim | zë</annotation>
+ <annotation cp="℗" type="tts">e drejta e autorit për regjistrim zanor</annotation>
+ <annotation cp="←">majtas | shigjetë | shigjetë me drejtim majtas</annotation>
+ <annotation cp="←" type="tts">shigjetë me drejtim majtas</annotation>
+ <annotation cp="→">djathtas | shigjetë | shigjetë me drejtim djathtas</annotation>
+ <annotation cp="→" type="tts">shigjetë me drejtim djathtas</annotation>
+ <annotation cp="↑">lart | shigjetë | shigjetë me drejtim lart</annotation>
+ <annotation cp="↑" type="tts">shigjetë me drejtim lart</annotation>
+ <annotation cp="↓">poshtë | shigjetë | shigjetë me drejtim poshtë</annotation>
+ <annotation cp="↓" type="tts">shigjetë me drejtim poshtë</annotation>
+ <annotation cp="⇅">lart | poshtë | shigjeta me drejtim lart dhe me drejtim poshtë | shigjetë</annotation>
+ <annotation cp="⇅" type="tts">shigjeta me drejtim lart dhe me drejtim poshtë</annotation>
+ <annotation cp="⇆">djathtas | majtas | shigjeta me drejtim majtas mbi me drejtim djathtas | shigjetë</annotation>
+ <annotation cp="⇆" type="tts">shigjeta me drejtim majtas mbi me drejtim djathtas</annotation>
+ <annotation cp="∆">rritje | trekëndësh</annotation>
+ <annotation cp="∆" type="tts">rritje</annotation>
+ <annotation cp="∇">nabla | trekëndësh</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">anëtarësi | bashkësi | element | element i | përmban</annotation>
+ <annotation cp="∈" type="tts">element i</annotation>
+ <annotation cp="÷">obelus | pjesëtim | pjesëto | shenja e pjesëtimit</annotation>
+ <annotation cp="÷" type="tts">shenja e pjesëtimit</annotation>
+ <annotation cp="×">herë | shenja e shumëzimit | shumëzim | shumëzo</annotation>
+ <annotation cp="×" type="tts">shenja e shumëzimit</annotation>
+ <annotation cp="⁻">minus | minus me superskript | superskript</annotation>
+ <annotation cp="⁻" type="tts">minus me superskript</annotation>
+ <annotation cp="√">numër irracional | rrënja katrore | rrënjë | shprehje radikale</annotation>
+ <annotation cp="√" type="tts">rrënja katrore</annotation>
+ <annotation cp="∞">infinit | shenja e infinitit</annotation>
+ <annotation cp="∞" type="tts">shenja e infinitit</annotation>
+ <annotation cp="∩">bashkësi | ndërprerje</annotation>
+ <annotation cp="∩" type="tts">ndërprerje</annotation>
+ <annotation cp="∪">bashkësi | bashkim | koleksion</annotation>
+ <annotation cp="∪" type="tts">bashkim</annotation>
+ <annotation cp="≡">i ngjashëm | i ngjashëm me | njëlloj me | njësoj | trefish</annotation>
+ <annotation cp="≡" type="tts">njëlloj me</annotation>
+ <annotation cp="⊂">bashkësi | nënbashkësi | nënbashkësi e</annotation>
+ <annotation cp="⊂" type="tts">nënbashkësi e</annotation>
+ <annotation cp="▲">lart | mbushur | shigjetë | trekëndësh | trekëndësh i mbushur, me drejtim lart</annotation>
+ <annotation cp="▲" type="tts">trekëndësh i mbushur, me drejtim lart</annotation>
+ <annotation cp="▼">mbushur | poshtë | shigjetë | trekëndësh | trekëndësh i mbushur, me drejtim poshtë</annotation>
+ <annotation cp="▼" type="tts">trekëndësh i mbushur, me drejtim poshtë</annotation>
+ <annotation cp="◊">diamant | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">rreth | rreth bosh | unazë</annotation>
+ <annotation cp="○" type="tts">rreth bosh</annotation>
+ <annotation cp="●">rreth | rreth i mbushur</annotation>
+ <annotation cp="●" type="tts">rreth i mbushur</annotation>
+ <annotation cp="◯">rreth | rreth i madh bosh | unazë</annotation>
+ <annotation cp="◯" type="tts">rreth i madh bosh</annotation>
<annotation cp="⚧">simboli për transgjinorë | transgjinorë</annotation>
<annotation cp="⚧" type="tts">simboli për transgjinorë</annotation>
<annotation cp="🤌">gishta | gishta të mbledhur | gjest me dorë | hetim | mbledhur | sarkastik</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">flamur i ylbertë</annotation>
<annotation cp="🏴☠">flamur piratësh | Jolly Roger | pirat | plaçkitje | thesar</annotation>
<annotation cp="🏴☠" type="tts">flamur piratësh</annotation>
+ <annotation cp="£">monedhë | stërlinë britanike</annotation>
+ <annotation cp="£" type="tts">stërlinë britanike</annotation>
+ <annotation cp="¥">jen | juan | monedhë</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">EUR | euro | monedhë</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">monedhë | rupi indiane</annotation>
+ <annotation cp="₹" type="tts">rupi indiane</annotation>
+ <annotation cp="₽">monedhë | rubël</annotation>
+ <annotation cp="₽" type="tts">rubël</annotation>
+ <annotation cp="¹">një | një me superskript | superskript</annotation>
+ <annotation cp="¹" type="tts">një me superskript</annotation>
+ <annotation cp="²">dy | dy me superskript | rrënjë katrore | superskript</annotation>
+ <annotation cp="²" type="tts">dy me superskript</annotation>
+ <annotation cp="³">kub | superskript | tre | tre me superskript</annotation>
+ <annotation cp="³" type="tts">tre me superskript</annotation>
+ <annotation cp="µ">masë | shenja mikro</annotation>
+ <annotation cp="µ" type="tts">shenja mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sr.xml b/common/annotations/sr.xml
index fb0b3c5..d8ecac6 100644
--- a/common/annotations/sr.xml
+++ b/common/annotations/sr.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">средње тамна кожа</annotation>
<annotation cp="🏿">бoja коже | тамна кожа | тип коже 6</annotation>
<annotation cp="🏿" type="tts">тамна кожа</annotation>
+ <annotation cp="–">правописни знак | црта</annotation>
+ <annotation cp="–" type="tts">црта</annotation>
+ <annotation cp="—">дуга црта | правописни знак</annotation>
+ <annotation cp="—" type="tts">дуга црта</annotation>
+ <annotation cp="·">средина | средња тачка | тачка</annotation>
+ <annotation cp="·" type="tts">средња тачка</annotation>
+ <annotation cp="«">заграде | карети | леви француски наводник | лево | наводник | угласти | шеврон</annotation>
+ <annotation cp="«" type="tts">леви француски наводник</annotation>
+ <annotation cp="»">десни француски наводник | десно | заграде | карети | наводник | угласти | шеврон</annotation>
+ <annotation cp="»" type="tts">десни француски наводник</annotation>
+ <annotation cp="§">део | знак за одељак | одељак | параграф</annotation>
+ <annotation cp="§" type="tts">одељак</annotation>
+ <annotation cp="†">бодеж | знак бодежа | обелиск</annotation>
+ <annotation cp="†" type="tts">знак бодежа</annotation>
+ <annotation cp="‡">бодеж | двоструко | знак двоструког бодежа | обелиск</annotation>
+ <annotation cp="‡" type="tts">знак двоструког бодежа</annotation>
+ <annotation cp="•">знак за набрајање | тачка</annotation>
+ <annotation cp="•" type="tts">знак за набрајање</annotation>
+ <annotation cp="°">степен | удео | час</annotation>
+ <annotation cp="°" type="tts">степен</annotation>
+ <annotation cp="℗">ауторско право | ауторско право о снимању звука | звук | снимање</annotation>
+ <annotation cp="℗" type="tts">ауторско право о снимању звука</annotation>
+ <annotation cp="←">лево | стрелица | стрелица која показује налево</annotation>
+ <annotation cp="←" type="tts">стрелица која показује налево</annotation>
+ <annotation cp="→">десно | стрелица | стрелица која показује надесно</annotation>
+ <annotation cp="→" type="tts">стрелица која показује надесно</annotation>
+ <annotation cp="↑">горе | стрелица | стрелица која показује нагоре</annotation>
+ <annotation cp="↑" type="tts">стрелица која показује нагоре</annotation>
+ <annotation cp="↓">доле | стрелица | стрелица која показује надоле</annotation>
+ <annotation cp="↓" type="tts">стрелица која показује надоле</annotation>
+ <annotation cp="⇅">горе | доле | стрелица | стрелица нагоре и стрелица надоле</annotation>
+ <annotation cp="⇅" type="tts">стрелица нагоре и стрелица надоле</annotation>
+ <annotation cp="⇆">десно | лево | стрелица | стрелица налево изнад стрелице надесно</annotation>
+ <annotation cp="⇆" type="tts">стрелица налево изнад стрелице надесно</annotation>
+ <annotation cp="∆">инкремент | троугао</annotation>
+ <annotation cp="∆" type="tts">инкремент</annotation>
+ <annotation cp="∇">набла | троугао</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">елемент | елемент скупа | садржи | скуп | члан</annotation>
+ <annotation cp="∈" type="tts">елемент скупа</annotation>
+ <annotation cp="÷">дељење | знак дељења | поделити</annotation>
+ <annotation cp="÷" type="tts">знак дељења</annotation>
+ <annotation cp="×">знак множења | множење | помножити | пута</annotation>
+ <annotation cp="×" type="tts">знак множења</annotation>
+ <annotation cp="⁻">експонент | минус | минус у експоненту</annotation>
+ <annotation cp="⁻" type="tts">минус у експоненту</annotation>
+ <annotation cp="√">квадратни | корен | радикал</annotation>
+ <annotation cp="√" type="tts">квадратни корен</annotation>
+ <annotation cp="∞">бесконачно</annotation>
+ <annotation cp="∞" type="tts">бесконачно</annotation>
+ <annotation cp="∩">пресек | скуп</annotation>
+ <annotation cp="∩" type="tts">пресек</annotation>
+ <annotation cp="∪">скуп | унија</annotation>
+ <annotation cp="∪" type="tts">унија</annotation>
+ <annotation cp="≡">идентично | једнако | троструко</annotation>
+ <annotation cp="≡" type="tts">идентично</annotation>
+ <annotation cp="⊂">подскуп | скуп</annotation>
+ <annotation cp="⊂" type="tts">подскуп</annotation>
+ <annotation cp="▲">горе | испуњен троугао окренут нагоре | испуњено | стрелица | троугао</annotation>
+ <annotation cp="▲" type="tts">испуњен троугао окренут нагоре</annotation>
+ <annotation cp="▼">доле | испуњен троугао окренут надоле | испуњено | стрелица | троугао</annotation>
+ <annotation cp="▼" type="tts">испуњен троугао окренут надоле</annotation>
+ <annotation cp="◊">дијамант | ромб</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">круг | празан круг | прстен</annotation>
+ <annotation cp="○" type="tts">празан круг</annotation>
+ <annotation cp="●">испуњен круг | круг</annotation>
+ <annotation cp="●" type="tts">испуњен круг</annotation>
+ <annotation cp="◯">велики празни круг | круг | прстен</annotation>
+ <annotation cp="◯" type="tts">велики празни круг</annotation>
<annotation cp="⚧">трансродни симбол | трансродно</annotation>
<annotation cp="⚧" type="tts">трансродни симбол</annotation>
<annotation cp="🤌">знак руком | саркастично | скупљени прсти | упитно</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">дугина застава</annotation>
<annotation cp="🏴☠">благо | Весели Роџер | пират | пиратска застава | пљачка</annotation>
<annotation cp="🏴☠" type="tts">пиратска застава</annotation>
+ <annotation cp="£">[EGP] | [GBP] | валута | фунта</annotation>
+ <annotation cp="£" type="tts">фунта</annotation>
+ <annotation cp="¥">[CNY] | [JPY] | валута | јен | јуан</annotation>
+ <annotation cp="¥" type="tts">јен</annotation>
+ <annotation cp="€">[EUR] | валута | евро</annotation>
+ <annotation cp="€" type="tts">евро</annotation>
+ <annotation cp="₹">валута | индијска рупија | рупија</annotation>
+ <annotation cp="₹" type="tts">индијска рупија</annotation>
+ <annotation cp="₽">валута | рубља</annotation>
+ <annotation cp="₽" type="tts">рубља</annotation>
+ <annotation cp="¹">1 | експонент</annotation>
+ <annotation cp="¹" type="tts">експонент 1</annotation>
+ <annotation cp="²">2 | експонент | квадратни</annotation>
+ <annotation cp="²" type="tts">експонент 2</annotation>
+ <annotation cp="³">3 | експонент | кубни</annotation>
+ <annotation cp="³" type="tts">експонент 3</annotation>
+ <annotation cp="µ">знак за микро | мера</annotation>
+ <annotation cp="µ" type="tts">знак за микро</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sr_Cyrl.xml b/common/annotations/sr_Cyrl.xml
index fef0c0b..31adb66 100644
--- a/common/annotations/sr_Cyrl.xml
+++ b/common/annotations/sr_Cyrl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/sr_Cyrl_BA.xml b/common/annotations/sr_Cyrl_BA.xml
index 856a328..88b1ac0 100644
--- a/common/annotations/sr_Cyrl_BA.xml
+++ b/common/annotations/sr_Cyrl_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/sr_Latn.xml b/common/annotations/sr_Latn.xml
index 7e969f5..0dfb75e 100644
--- a/common/annotations/sr_Latn.xml
+++ b/common/annotations/sr_Latn.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">srednje tamna koža</annotation>
<annotation cp="🏿">boja kože | tamna koža | tip kože 6</annotation>
<annotation cp="🏿" type="tts">tamna koža</annotation>
+ <annotation cp="–">crta | pravopisni znak</annotation>
+ <annotation cp="–" type="tts">crta</annotation>
+ <annotation cp="—">duga crta | pravopisni znak</annotation>
+ <annotation cp="—" type="tts">duga crta</annotation>
+ <annotation cp="·">sredina | srednja tačka | tačka</annotation>
+ <annotation cp="·" type="tts">srednja tačka</annotation>
+ <annotation cp="«">kareti | levi francuski navodnik | levo | navodnik | ševron | uglasti | zagrade</annotation>
+ <annotation cp="«" type="tts">levi francuski navodnik</annotation>
+ <annotation cp="»">desni francuski navodnik | desno | kareti | navodnik | ševron | uglasti | zagrade</annotation>
+ <annotation cp="»" type="tts">desni francuski navodnik</annotation>
+ <annotation cp="§">deo | odeljak | paragraf | znak za odeljak</annotation>
+ <annotation cp="§" type="tts">odeljak</annotation>
+ <annotation cp="†">bodež | obelisk | znak bodeža</annotation>
+ <annotation cp="†" type="tts">znak bodeža</annotation>
+ <annotation cp="‡">bodež | dvostruko | obelisk | znak dvostrukog bodeža</annotation>
+ <annotation cp="‡" type="tts">znak dvostrukog bodeža</annotation>
+ <annotation cp="•">tačka | znak za nabrajanje</annotation>
+ <annotation cp="•" type="tts">znak za nabrajanje</annotation>
+ <annotation cp="°">čas | stepen | udeo</annotation>
+ <annotation cp="°" type="tts">stepen</annotation>
+ <annotation cp="℗">autorsko pravo | autorsko pravo o snimanju zvuka | snimanje | zvuk</annotation>
+ <annotation cp="℗" type="tts">autorsko pravo o snimanju zvuka</annotation>
+ <annotation cp="←">levo | strelica | strelica koja pokazuje nalevo</annotation>
+ <annotation cp="←" type="tts">strelica koja pokazuje nalevo</annotation>
+ <annotation cp="→">desno | strelica | strelica koja pokazuje nadesno</annotation>
+ <annotation cp="→" type="tts">strelica koja pokazuje nadesno</annotation>
+ <annotation cp="↑">gore | strelica | strelica koja pokazuje nagore</annotation>
+ <annotation cp="↑" type="tts">strelica koja pokazuje nagore</annotation>
+ <annotation cp="↓">dole | strelica | strelica koja pokazuje nadole</annotation>
+ <annotation cp="↓" type="tts">strelica koja pokazuje nadole</annotation>
+ <annotation cp="⇅">dole | gore | strelica | strelica nagore i strelica nadole</annotation>
+ <annotation cp="⇅" type="tts">strelica nagore i strelica nadole</annotation>
+ <annotation cp="⇆">desno | levo | strelica | strelica nalevo iznad strelice nadesno</annotation>
+ <annotation cp="⇆" type="tts">strelica nalevo iznad strelice nadesno</annotation>
+ <annotation cp="∆">inkrement | trougao</annotation>
+ <annotation cp="∆" type="tts">inkrement</annotation>
+ <annotation cp="∇">nabla | trougao</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">član | element | element skupa | sadrži | skup</annotation>
+ <annotation cp="∈" type="tts">element skupa</annotation>
+ <annotation cp="÷">deljenje | podeliti | znak deljenja</annotation>
+ <annotation cp="÷" type="tts">znak deljenja</annotation>
+ <annotation cp="×">množenje | pomnožiti | puta | znak množenja</annotation>
+ <annotation cp="×" type="tts">znak množenja</annotation>
+ <annotation cp="⁻">eksponent | minus | minus u eksponentu</annotation>
+ <annotation cp="⁻" type="tts">minus u eksponentu</annotation>
+ <annotation cp="√">koren | kvadratni | radikal</annotation>
+ <annotation cp="√" type="tts">kvadratni koren</annotation>
+ <annotation cp="∞">beskonačno</annotation>
+ <annotation cp="∞" type="tts">beskonačno</annotation>
+ <annotation cp="∩">presek | skup</annotation>
+ <annotation cp="∩" type="tts">presek</annotation>
+ <annotation cp="∪">skup | unija</annotation>
+ <annotation cp="∪" type="tts">unija</annotation>
+ <annotation cp="≡">identično | jednako | trostruko</annotation>
+ <annotation cp="≡" type="tts">identično</annotation>
+ <annotation cp="⊂">podskup | skup</annotation>
+ <annotation cp="⊂" type="tts">podskup</annotation>
+ <annotation cp="▲">gore | ispunjen trougao okrenut nagore | ispunjeno | strelica | trougao</annotation>
+ <annotation cp="▲" type="tts">ispunjen trougao okrenut nagore</annotation>
+ <annotation cp="▼">dole | ispunjen trougao okrenut nadole | ispunjeno | strelica | trougao</annotation>
+ <annotation cp="▼" type="tts">ispunjen trougao okrenut nadole</annotation>
+ <annotation cp="◊">dijamant | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">krug | prazan krug | prsten</annotation>
+ <annotation cp="○" type="tts">prazan krug</annotation>
+ <annotation cp="●">ispunjen krug | krug</annotation>
+ <annotation cp="●" type="tts">ispunjen krug</annotation>
+ <annotation cp="◯">krug | prsten | veliki prazni krug</annotation>
+ <annotation cp="◯" type="tts">veliki prazni krug</annotation>
<annotation cp="⚧">transrodni simbol | transrodno</annotation>
<annotation cp="⚧" type="tts">transrodni simbol</annotation>
<annotation cp="🤌">sarkastično | skupljeni prsti | upitno | znak rukom</annotation>
@@ -3006,5 +3076,23 @@
<annotation cp="🏳🌈" type="tts">dugina zastava</annotation>
<annotation cp="🏴☠">blago | pirat | piratska zastava | pljačka | Veseli Rodžer</annotation>
<annotation cp="🏴☠" type="tts">piratska zastava</annotation>
+ <annotation cp="£">[EGP] | [GBP] | funta | valuta</annotation>
+ <annotation cp="£" type="tts">funta</annotation>
+ <annotation cp="¥">[CNY] | [JPY] | jen | juan | valuta</annotation>
+ <annotation cp="¥" type="tts">jen</annotation>
+ <annotation cp="€">[EUR] | evro | valuta</annotation>
+ <annotation cp="€" type="tts">evro</annotation>
+ <annotation cp="₹">indijska rupija | rupija | valuta</annotation>
+ <annotation cp="₹" type="tts">indijska rupija</annotation>
+ <annotation cp="₽">rublja | valuta</annotation>
+ <annotation cp="₽" type="tts">rublja</annotation>
+ <annotation cp="¹">1 | eksponent</annotation>
+ <annotation cp="¹" type="tts">eksponent 1</annotation>
+ <annotation cp="²">2 | eksponent | kvadratni</annotation>
+ <annotation cp="²" type="tts">eksponent 2</annotation>
+ <annotation cp="³">3 | eksponent | kubni</annotation>
+ <annotation cp="³" type="tts">eksponent 3</annotation>
+ <annotation cp="µ">mera | znak za mikro</annotation>
+ <annotation cp="µ" type="tts">znak za mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sr_Latn_BA.xml b/common/annotations/sr_Latn_BA.xml
index 36a350d..37a0c09 100644
--- a/common/annotations/sr_Latn_BA.xml
+++ b/common/annotations/sr_Latn_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotations/sv.xml b/common/annotations/sv.xml
index a0cbc22..7f4a82d 100644
--- a/common/annotations/sv.xml
+++ b/common/annotations/sv.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">mellanmörk hy</annotation>
<annotation cp="🏿">hud | hudfärg | hudton 6 | mörk hy</annotation>
<annotation cp="🏿" type="tts">mörk hy</annotation>
+ <annotation cp="–">streck | tank- | tankstreck</annotation>
+ <annotation cp="–" type="tts">tankstreck</annotation>
+ <annotation cp="—">långt | tankstreck</annotation>
+ <annotation cp="—" type="tts">långt tankstreck</annotation>
+ <annotation cp="·">halvhög punkt | mellanpunkt | mittpunkt | punkt | punkt i mitten</annotation>
+ <annotation cp="·" type="tts">halvhög punkt</annotation>
+ <annotation cp="«">citationstecken | dubbla vinkelcitationstecken | gåsögon vänster | vänster | vinkel</annotation>
+ <annotation cp="«" type="tts">gåsögon vänster</annotation>
+ <annotation cp="»">citationstecken | dubbla vinkelcitationstecken | gåsögon höger | höger | vinkel</annotation>
+ <annotation cp="»" type="tts">gåsögon höger</annotation>
+ <annotation cp="§">avsnitt | del | paragraf | paragraftecken</annotation>
+ <annotation cp="§" type="tts">avsnitt</annotation>
+ <annotation cp="†">kors | kors (tecken) | korstecken | tecken kors</annotation>
+ <annotation cp="†" type="tts">korstecken</annotation>
+ <annotation cp="‡">dubbel | dubbelkors | dubbelkorstecken | obelus</annotation>
+ <annotation cp="‡" type="tts">dubbelkorstecken</annotation>
+ <annotation cp="•">listpunkt | punkt | punktlista</annotation>
+ <annotation cp="•" type="tts">listpunkt</annotation>
+ <annotation cp="°">grad | gradsymbol | gradtecken</annotation>
+ <annotation cp="°" type="tts">grad</annotation>
+ <annotation cp="℗">inspelning | ljud | ljudinspelning upphovsrätt | upphovsrätt</annotation>
+ <annotation cp="℗" type="tts">ljudinspelning upphovsrätt</annotation>
+ <annotation cp="←">pil | vänster | vänsterriktad pil</annotation>
+ <annotation cp="←" type="tts">vänsterriktad pil</annotation>
+ <annotation cp="→">höger | högerpil | högerriktad pil | pil</annotation>
+ <annotation cp="→" type="tts">högerriktad pil</annotation>
+ <annotation cp="↑">pil | uppåt | uppåtriktad pil</annotation>
+ <annotation cp="↑" type="tts">uppåtriktad pil</annotation>
+ <annotation cp="↓">nedåt | nedåtriktad pil | pil</annotation>
+ <annotation cp="↓" type="tts">nedåtriktad pil</annotation>
+ <annotation cp="⇅">nedåt | pil | uppåt | uppåt- och nedåtriktade pilar</annotation>
+ <annotation cp="⇅" type="tts">uppåt- och nedåtriktade pilar</annotation>
+ <annotation cp="⇆">höger | pil | vänster | vänster- över högerriktad pil | vänsterriktad över högerriktad pil</annotation>
+ <annotation cp="⇆" type="tts">vänsterriktad över högerriktad pil</annotation>
+ <annotation cp="∆">tillskott | triangel</annotation>
+ <annotation cp="∆" type="tts">tillskott</annotation>
+ <annotation cp="∇">nablaoperatorn | triangel</annotation>
+ <annotation cp="∇" type="tts">nablaoperatorn</annotation>
+ <annotation cp="∈">element | finns i | i | tillhör</annotation>
+ <annotation cp="∈" type="tts">element i</annotation>
+ <annotation cp="÷">dela | division | divisionstecken | obelus</annotation>
+ <annotation cp="÷" type="tts">divisionstecken</annotation>
+ <annotation cp="×">gånger | multiplicera | multiplikation | multiplikationstecken</annotation>
+ <annotation cp="×" type="tts">multiplikationstecken</annotation>
+ <annotation cp="⁻">minus | upphöjt till | upphöjt till minus</annotation>
+ <annotation cp="⁻" type="tts">upphöjt till minus</annotation>
+ <annotation cp="√">kvadrat | kvadratrot | rot | rotmärke</annotation>
+ <annotation cp="√" type="tts">kvadratrot</annotation>
+ <annotation cp="∞">oändlighet | oändlighetstecken</annotation>
+ <annotation cp="∞" type="tts">oändlighetstecken</annotation>
+ <annotation cp="∩">skärning | snitt</annotation>
+ <annotation cp="∩" type="tts">snitt</annotation>
+ <annotation cp="∪">union | unionen av</annotation>
+ <annotation cp="∪" type="tts">union</annotation>
+ <annotation cp="≡">exakt | identiskt | identiskt lika med | trippel</annotation>
+ <annotation cp="≡" type="tts">identiskt lika med</annotation>
+ <annotation cp="⊂">är en delmängd av | delmängd | delmängd av</annotation>
+ <annotation cp="⊂" type="tts">delmängd av</annotation>
+ <annotation cp="▲">fylld | fylld uppåtpekande triangel | fylld uppåtriktad triangel | pil | triangel | uppåt</annotation>
+ <annotation cp="▲" type="tts">fylld uppåtpekande triangel</annotation>
+ <annotation cp="▼">fylld | fylld nedåtpekande triangel | fylld nedåtriktad triangel | nedåt | pil | triangel</annotation>
+ <annotation cp="▼" type="tts">fylld nedåtpekande triangel</annotation>
+ <annotation cp="◊">diamant | romb | ruta</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">cirkel | ihålig cirkel | ring</annotation>
+ <annotation cp="○" type="tts">ihålig cirkel</annotation>
+ <annotation cp="●">cirkel | fylld cirkel</annotation>
+ <annotation cp="●" type="tts">fylld cirkel</annotation>
+ <annotation cp="◯">cirkel | ring | stor ihålig cirkel</annotation>
+ <annotation cp="◯" type="tts">stor ihålig cirkel</annotation>
<annotation cp="⚧">transgender | transgendersymbol</annotation>
<annotation cp="⚧" type="tts">transgendersymbol</annotation>
<annotation cp="🤌">fingerportmonnä | fingrar | frågande | handgest | knyten | sarkastisk</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">regnbågsflagga</annotation>
<annotation cp="🏴☠">pirater | plundra | sjörövarflagga | skatter</annotation>
<annotation cp="🏴☠" type="tts">sjörövarflagga</annotation>
+ <annotation cp="£">EGP | GBP | pund | valuta</annotation>
+ <annotation cp="£" type="tts">pund</annotation>
+ <annotation cp="¥">CNY | JPY | valuta | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">EUR | euro | valuta</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">indisk rupie | rupie | valuta</annotation>
+ <annotation cp="₹" type="tts">indisk rupie</annotation>
+ <annotation cp="₽">rubel | valuta</annotation>
+ <annotation cp="₽" type="tts">rubel</annotation>
+ <annotation cp="¹">ett | upphöjt till | upphöjt till ett</annotation>
+ <annotation cp="¹" type="tts">upphöjt till ett</annotation>
+ <annotation cp="²">kvadrat | två | upphöjt till | upphöjt till två</annotation>
+ <annotation cp="²" type="tts">upphöjt till två</annotation>
+ <annotation cp="³">kubik | tre | upphöjt till | upphöjt till tre</annotation>
+ <annotation cp="³" type="tts">upphöjt till tre</annotation>
+ <annotation cp="µ">mått | mikrotecken</annotation>
+ <annotation cp="µ" type="tts">mikrotecken</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/sw.xml b/common/annotations/sw.xml
index c0b442c..08f71de 100644
--- a/common/annotations/sw.xml
+++ b/common/annotations/sw.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">ngozi nyeusi kiasi</annotation>
<annotation cp="🏿">kibadilisha emoji | ngozi nyeusi | nyeusi | sura</annotation>
<annotation cp="🏿" type="tts">ngozi nyeusi</annotation>
+ <annotation cp="–">kirefu | kistari</annotation>
+ <annotation cp="–" type="tts">kistari kirefu</annotation>
+ <annotation cp="—">kirefu zaidi | kistari | kistari kirefu zaidi</annotation>
+ <annotation cp="—" type="tts">kistari kirefu zaidi</annotation>
+ <annotation cp="·">alama ya kitone | kati | kitone | kitone cha kati</annotation>
+ <annotation cp="·" type="tts">kitone cha kati</annotation>
+ <annotation cp="«">dondoa | kareti | kushoto | mwango | pembe | tepe | vishale viwili vinavyoelekea kushoto | vishale viwili vya kushoto</annotation>
+ <annotation cp="«" type="tts">vishale viwili vinavyoelekea kushoto</annotation>
+ <annotation cp="»">dondoa | kareti | kulia | mwango | pembe | tepe | vishale viwili vinavyoelekea kulia | vishale viwili vya kulia</annotation>
+ <annotation cp="»" type="tts">vishale viwili vinavyoelekea kulia</annotation>
+ <annotation cp="§">alama ya kifungu | aya | kifungu | sehemu</annotation>
+ <annotation cp="§" type="tts">kifungu</annotation>
+ <annotation cp="†">alama iliyotumika zamani katika maandishi | alama ya kurejea</annotation>
+ <annotation cp="†" type="tts">alama ya kurejea</annotation>
+ <annotation cp="‡">alama iliyotumika zamani katika maandishi | alama mbili za kurejea | alama ya kurejea | mara mbili</annotation>
+ <annotation cp="‡" type="tts">alama mbili za kurejea</annotation>
+ <annotation cp="•">kitone | tobo</annotation>
+ <annotation cp="•" type="tts">tobo</annotation>
+ <annotation cp="°">digrii | saa | thibitisho</annotation>
+ <annotation cp="°" type="tts">digrii</annotation>
+ <annotation cp="℗">hakimiliki | hakimiliki ya rekodi ya sauti | rekodi | sauti</annotation>
+ <annotation cp="℗" type="tts">hakimiliki ya rekodi ya sauti</annotation>
+ <annotation cp="←">kushoto | mshale | mshale unaoelekea kushoto</annotation>
+ <annotation cp="←" type="tts">mshale unaoelekea kushoto</annotation>
+ <annotation cp="→">kulia | mshale | mshale unaoelekea kulia</annotation>
+ <annotation cp="→" type="tts">mshale unaoelekea kulia</annotation>
+ <annotation cp="↑">juu | mshale | mshale unaoelekea juu</annotation>
+ <annotation cp="↑" type="tts">mshale unaoelekea juu</annotation>
+ <annotation cp="↓">chini | mshale | mshale unaoelekea chini</annotation>
+ <annotation cp="↓" type="tts">mshale unaoelekea chini</annotation>
+ <annotation cp="⇅">chini | juu | mshale | mshale unaoelekea juu na mwingine chini</annotation>
+ <annotation cp="⇅" type="tts">mshale unaoelekea juu na mwingine chini</annotation>
+ <annotation cp="⇆">kulia | kushoto | mshale | mshale unaoelekea kushoto juu ya mshale unaoelekea kulia</annotation>
+ <annotation cp="⇆" type="tts">mshale unaoelekea kushoto juu ya mshale unaoelekea kulia</annotation>
+ <annotation cp="∆">nyongeza | pembetatu</annotation>
+ <annotation cp="∆" type="tts">nyongeza</annotation>
+ <annotation cp="∇">nabla | pembetatu</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">inajumuisha | memba | memba ya | seti | umemba</annotation>
+ <annotation cp="∈" type="tts">memba ya</annotation>
+ <annotation cp="÷">alama iliyoashiria maandishi ya kutiliwa shaka | alama ya kugawanya | gawanya | kugawanya</annotation>
+ <annotation cp="÷" type="tts">alama ya kugawanya</annotation>
+ <annotation cp="×">alama ya kuzidisha | kuzidisha | mara nyingi | zidisha</annotation>
+ <annotation cp="×" type="tts">alama ya kuzidisha</annotation>
+ <annotation cp="⁻">alama ya kutoa | alama ya kutoa ya juu | juu</annotation>
+ <annotation cp="⁻" type="tts">alama ya kutoa ya juu</annotation>
+ <annotation cp="√">isiyoeleweka | kipeo | kipeo cha pili | mraba | mzizi</annotation>
+ <annotation cp="√" type="tts">kipeo cha pili</annotation>
+ <annotation cp="∞">alama ya isiyokoma | isiyokoma</annotation>
+ <annotation cp="∞" type="tts">alama ya isiyokoma</annotation>
+ <annotation cp="∩">seti | ungano</annotation>
+ <annotation cp="∩" type="tts">ungano</annotation>
+ <annotation cp="∪">mkusanyiko | muungano | seti</annotation>
+ <annotation cp="∪" type="tts">muungano</annotation>
+ <annotation cp="≡">hasa | inafanana | inafanana na | mara tatu</annotation>
+ <annotation cp="≡" type="tts">inafanana na</annotation>
+ <annotation cp="⊂">seti | seti ndogo | seti ndogo ya</annotation>
+ <annotation cp="⊂" type="tts">seti ndogo ya</annotation>
+ <annotation cp="▲">juu | mshale | pembetatu | pembetatu iliyojazwa inayoelekea juu | uliojazwa</annotation>
+ <annotation cp="▲" type="tts">pembetatu iliyojazwa inayoelekea juu</annotation>
+ <annotation cp="▼">chini | iliyojazwa | mshale | pembetatu | pembetatu iliyojazwa inayoelekea chini</annotation>
+ <annotation cp="▼" type="tts">pembetatu iliyojazwa inayoelekea chini</annotation>
+ <annotation cp="◊">almasi | msambamba | msambamba sawa</annotation>
+ <annotation cp="◊" type="tts">msambamba</annotation>
+ <annotation cp="○">mduara | mduara wazi | pete</annotation>
+ <annotation cp="○" type="tts">mduara wazi</annotation>
+ <annotation cp="●">mduara | mduara uliojazwa</annotation>
+ <annotation cp="●" type="tts">mduara uliojazwa</annotation>
+ <annotation cp="◯">mduara | mduara mkubwa wazi | pete</annotation>
+ <annotation cp="◯" type="tts">mduara mkubwa wazi</annotation>
<annotation cp="⚧">ishara ya wabadili jinsia | wabadili jinsia</annotation>
<annotation cp="⚧" type="tts">ishara ya wabadili jinsia</annotation>
<annotation cp="🤌">ishara ya mkono | kejeli | kubanwa | kuuliza | mkono wenye vidole vinavyobana | vidole</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">bendera ya upinde wa mvua</annotation>
<annotation cp="🏴☠">bendera ya maharamia | hazina | Jolly Roger | maharamia | pora</annotation>
<annotation cp="🏴☠" type="tts">bendera ya maharamia</annotation>
+ <annotation cp="£">EGP | GBP | pauni | sarafu</annotation>
+ <annotation cp="£" type="tts">pauni</annotation>
+ <annotation cp="¥">CNY | JPY | sarafu | yeni | yuani</annotation>
+ <annotation cp="¥" type="tts">yeni</annotation>
+ <annotation cp="€">EUR | sarafu | yuro</annotation>
+ <annotation cp="€" type="tts">yuro</annotation>
+ <annotation cp="₹">rupia | rupia ya india | sarafu</annotation>
+ <annotation cp="₹" type="tts">rupia ya india</annotation>
+ <annotation cp="₽">rubo | sarafu</annotation>
+ <annotation cp="₽" type="tts">rubo</annotation>
+ <annotation cp="¹">juu | moja | weka moja juu</annotation>
+ <annotation cp="¹" type="tts">weka moja juu</annotation>
+ <annotation cp="²">juu | mbili | mraba | weka mbili juu</annotation>
+ <annotation cp="²" type="tts">weka mbili juu</annotation>
+ <annotation cp="³">juu | mchemraba | tatu | weka tatu juu</annotation>
+ <annotation cp="³" type="tts">weka tatu juu</annotation>
+ <annotation cp="µ">alama ya mikro | kipimo</annotation>
+ <annotation cp="µ" type="tts">alama ya mikro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ta.xml b/common/annotations/ta.xml
index 067cf00..4486c5c 100644
--- a/common/annotations/ta.xml
+++ b/common/annotations/ta.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">வகை 5</annotation>
<annotation cp="🏿">தோலின் நிறம் | வகை 6</annotation>
<annotation cp="🏿" type="tts">வகை 6</annotation>
+ <annotation cp="–">கோடு | நடு | நடு அரைக்கோடு</annotation>
+ <annotation cp="–" type="tts">நடு அரைக்கோடு</annotation>
+ <annotation cp="—">கோடு | நடு முழுக்கோடு</annotation>
+ <annotation cp="—" type="tts">நடு முழுக்கோடு</annotation>
+ <annotation cp="·">நடுப்புள்ளி | புள்ளி | மையப் புள்ளி | மையம்</annotation>
+ <annotation cp="·" type="tts">மையப் புள்ளி</annotation>
+ <annotation cp="«">அடைப்புக்குறிகள் | இடது | இடது மேற்கோட்குறி | காரட்கள் | கோணம் | செவ்ரான் | மேற்கோள் குறி</annotation>
+ <annotation cp="«" type="tts">இடது மேற்கோட்குறி</annotation>
+ <annotation cp="»">அடைப்புக்குறிகள் | காரட்கள் | கோணம் | செவ்ரான் | மேற்கோள் குறி | வலது | வலது மேற்கோட்குறி</annotation>
+ <annotation cp="»" type="tts">வலது மேற்கோட்குறி</annotation>
+ <annotation cp="§">சில்க்ரோ | பகுதி | பத்தி | பிரிவு</annotation>
+ <annotation cp="§" type="tts">பிரிவு</annotation>
+ <annotation cp="†">சதுரத்தூபி | சிலுவை | சிலுவைக் குறி | வகுத்தற்குறி</annotation>
+ <annotation cp="†" type="tts">சிலுவைக் குறி</annotation>
+ <annotation cp="‡">இரட்டை | இரட்டை சிலுவைக் குறி | சதுரத்தூபி | சிலுவை | வகுத்தற்குறி</annotation>
+ <annotation cp="‡" type="tts">இரட்டை சிலுவைக் குறி</annotation>
+ <annotation cp="•">புள்ளி | பொட்டுக்குறி</annotation>
+ <annotation cp="•" type="tts">பொட்டுக்குறி</annotation>
+ <annotation cp="°">டிகிரி | பாகை | மணிநேரம்</annotation>
+ <annotation cp="°" type="tts">டிகிரி</annotation>
+ <annotation cp="℗">ஒலி | ஒலிப்பதிவு பதிப்புரிமை | பதிப்புரிமை | பதிவு</annotation>
+ <annotation cp="℗" type="tts">ஒலிப்பதிவு பதிப்புரிமை</annotation>
+ <annotation cp="←">அம்பு | இடது | இடதுபுறம் நோக்கிய அம்பு</annotation>
+ <annotation cp="←" type="tts">இடதுபுறம் நோக்கிய அம்பு</annotation>
+ <annotation cp="→">அம்பு | வலது | வலதுபுறம் நோக்கிய அம்பு</annotation>
+ <annotation cp="→" type="tts">வலதுபுறம் நோக்கிய அம்பு</annotation>
+ <annotation cp="↑">அம்பு | மேல் | மேல் நோக்கிய அம்பு</annotation>
+ <annotation cp="↑" type="tts">மேல் நோக்கிய அம்பு</annotation>
+ <annotation cp="↓">அம்பு | கீழ் | கீழ் நோக்கிய அம்பு</annotation>
+ <annotation cp="↓" type="tts">கீழ் நோக்கிய அம்பு</annotation>
+ <annotation cp="⇅">அம்பு | கீழ் | மேல் | மேல் நோக்கிய மற்றும் கீழ் நோக்கிய அம்புகள்</annotation>
+ <annotation cp="⇅" type="tts">மேல் நோக்கிய மற்றும் கீழ் நோக்கிய அம்புகள்</annotation>
+ <annotation cp="⇆">அம்பு | இடது | வலது | வலது மற்றும் இடது நோக்கிய அம்புகள் | வலதுபுறம் நோக்கிய அம்பிற்கு மேல் இடதுபுறம் நோக்கிய அம்பு</annotation>
+ <annotation cp="⇆" type="tts">வலது மற்றும் இடது நோக்கிய அம்புகள்</annotation>
+ <annotation cp="∆">அதிகரிப்பு | முக்கோணம்</annotation>
+ <annotation cp="∆" type="tts">அதிகரிப்பு</annotation>
+ <annotation cp="∇">நாப்லா | முக்கோணம்</annotation>
+ <annotation cp="∇" type="tts">நாப்லா</annotation>
+ <annotation cp="∈">இதன் உறுப்பு | உள்ளடக்கியது | உறுப்பு | உறுப்புரிமை | தொகுப்பு</annotation>
+ <annotation cp="∈" type="tts">இதன் உறுப்பு</annotation>
+ <annotation cp="÷">ஓபலஸ் | வகு | வகுத்தல் | வகுத்தல் குறி</annotation>
+ <annotation cp="÷" type="tts">வகுத்தல் குறி</annotation>
+ <annotation cp="×">பெருக்கல் | பெருக்கல் குறி | பெருக்கல் குறியீடு | பெருக்கு | மடங்குகள்</annotation>
+ <annotation cp="×" type="tts">பெருக்கல் குறியீடு</annotation>
+ <annotation cp="⁻">கழித்தல் | மேல் ஒட்டு | மேல் ஒட்டு கழித்தல் குறி</annotation>
+ <annotation cp="⁻" type="tts">மேல் ஒட்டு கழித்தல் குறி</annotation>
+ <annotation cp="√">அடிமானம் | இரண்டாம் படி மூலம் | படி | வர்க்க மூலம் | வர்க்கம் | விகிதமுறா மூலம்</annotation>
+ <annotation cp="√" type="tts">வர்க்க மூலம்</annotation>
+ <annotation cp="∞">முடிவிலி | முடிவிலிக் குறி</annotation>
+ <annotation cp="∞" type="tts">முடிவிலிக் குறி</annotation>
+ <annotation cp="∩">குறுக்குவெட்டு | தொகுப்பு</annotation>
+ <annotation cp="∩" type="tts">குறுக்குவெட்டு</annotation>
+ <annotation cp="∪">இணைப்பு | சேகரிப்பு | தொகுப்பு</annotation>
+ <annotation cp="∪" type="tts">இணைப்பு</annotation>
+ <annotation cp="≡">இதற்கு ஒத்தது | ஒரே மாதிரியான | பொருத்தமான | மூன்று மடங்கு</annotation>
+ <annotation cp="≡" type="tts">இதற்கு ஒத்தது</annotation>
+ <annotation cp="⊂">இதன் துணைக்குழு | துணைக்குழு | தொகுப்பு</annotation>
+ <annotation cp="⊂" type="tts">இதன் துணைக்குழு</annotation>
+ <annotation cp="▲">அம்புக்குறி | நிரப்பட்ட மேல்நோக்கிய முக்கோண வடிவம் | நிரப்பப்பட்டது | நிரப்பிய மேல்நோக்கிய முக்கோணம் | முக்கோணம் | மேல்நோக்கியது</annotation>
+ <annotation cp="▲" type="tts">நிரப்பட்ட மேல்நோக்கிய முக்கோண வடிவம்</annotation>
+ <annotation cp="▼">அம்புக்குறி | கீழ்நோக்கியது | நிரப்பட்ட கீழ்நோக்கிய முக்கோண வடிவம் | நிரப்பப்பட்டது | நிரப்பிய கீழ்நோக்கிய முக்கோணம் | முக்கோணம்</annotation>
+ <annotation cp="▼" type="tts">நிரப்பட்ட கீழ்நோக்கிய முக்கோண வடிவம்</annotation>
+ <annotation cp="◊">செவ்வகம் | நாற்கரம் | வைரம்</annotation>
+ <annotation cp="◊" type="tts">செவ்வகம்</annotation>
+ <annotation cp="○">நிரப்பப்படாத வட்டம் | வட்டம் | வளையம்</annotation>
+ <annotation cp="○" type="tts">நிரப்பப்படாத வட்டம்</annotation>
+ <annotation cp="●">நிரப்பப்பட்ட வட்டம் | வட்டம்</annotation>
+ <annotation cp="●" type="tts">நிரப்பப்பட்ட வட்டம்</annotation>
+ <annotation cp="◯">பெரிய நிரப்பப்படாத வட்டம் | வட்டம் | வளையம்</annotation>
+ <annotation cp="◯" type="tts">பெரிய நிரப்பப்படாத வட்டம்</annotation>
<annotation cp="⚧">திருநங்கை | திருநங்கைக்கான குறியீடு</annotation>
<annotation cp="⚧" type="tts">திருநங்கைக்கான குறியீடு</annotation>
<annotation cp="🤌">கிண்டலான | கிள்ளியது | கை சைகை | பிணைக்கப்பட்ட விரல்கள் | விரல்கள்</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">வானவில் கொடி</annotation>
<annotation cp="🏴☠">கடற்கொள்ளையர் | கடற்கொள்ளையர் கொடி | கொள்ளை புதையல் | ஜாலி ரோஜர்</annotation>
<annotation cp="🏴☠" type="tts">கடற்கொள்ளையர் கொடி</annotation>
+ <annotation cp="£">ஈ.ஜி.பி | நாணயம் | பவுண்ட் | ஜி.பி.பி</annotation>
+ <annotation cp="£" type="tts">பவுண்ட்</annotation>
+ <annotation cp="¥">சி.என்.ஒய் | நாணயம் | யுவான் | யென் | ஜே.பி. ஒய்</annotation>
+ <annotation cp="¥" type="tts">யென்</annotation>
+ <annotation cp="€">ஈ.யூ.ஆர் | நாணயம் | யூரோ</annotation>
+ <annotation cp="€" type="tts">யூரோ</annotation>
+ <annotation cp="₹">இந்திய ரூபாய் | நாணயம் | ரூபாய்</annotation>
+ <annotation cp="₹" type="tts">இந்திய ரூபாய்</annotation>
+ <annotation cp="₽">நாணயம் | ரூபிள்</annotation>
+ <annotation cp="₽" type="tts">ரூபிள்</annotation>
+ <annotation cp="¹">ஒன்று | மேல் ஒட்டு | மேல் ஒட்டு எண் ஒன்று</annotation>
+ <annotation cp="¹" type="tts">மேல் ஒட்டு எண் ஒன்று</annotation>
+ <annotation cp="²">இரண்டு | மேல் ஒட்டு | மேல் ஒட்டு எண் இரண்டு | வர்க்கம்</annotation>
+ <annotation cp="²" type="tts">மேல் ஒட்டு எண் இரண்டு</annotation>
+ <annotation cp="³">கனமூலம் | மூன்று | மேல் ஒட்டு | மேல் ஒட்டு எண் மூன்று</annotation>
+ <annotation cp="³" type="tts">மேல் ஒட்டு எண் மூன்று</annotation>
+ <annotation cp="µ">அளவீடு | மைக்ரோ குறி</annotation>
+ <annotation cp="µ" type="tts">மைக்ரோ குறி</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/te.xml b/common/annotations/te.xml
index fbfa1d9..9b0c366 100644
--- a/common/annotations/te.xml
+++ b/common/annotations/te.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">మధ్యస్థంగా ముదురు చర్మపు రంగు</annotation>
<annotation cp="🏿">చర్మం | చర్మం టోన్ - 6 | టోన్ | ముదురు చర్మపు రంగు</annotation>
<annotation cp="🏿" type="tts">ముదురు చర్మపు రంగు</annotation>
+ <annotation cp="–">ఎన్ | డాష్</annotation>
+ <annotation cp="–" type="tts">ఎన్ డాష్</annotation>
+ <annotation cp="—">ఎమ్ | డాష్</annotation>
+ <annotation cp="—" type="tts">ఎమ్ డాష్</annotation>
+ <annotation cp="·">ఇంటర్ పంచ్యువేషన్ | డాట్ | మధ్య</annotation>
+ <annotation cp="·" type="tts">మధ్య డాట్</annotation>
+ <annotation cp="«">ఎడమ | ఎడమ గిలెమెట్ | కారెట్లు | కోణం | క్వాట్ | చేవ్రాన్ | బ్రాకెట్లు</annotation>
+ <annotation cp="«" type="tts">ఎడమ గిలెమెట్</annotation>
+ <annotation cp="»">కారెట్లు | కుడి | కుడి గిలెమెట్ | కోణం | క్వాట్ | చేవ్రాన్ | బ్రాకెట్లు</annotation>
+ <annotation cp="»" type="tts">కుడి గిలెమెట్</annotation>
+ <annotation cp="§">పారాగ్రాఫ్ | భాగం | విభాగం | సిల్క్రో</annotation>
+ <annotation cp="§" type="tts">విభాగం</annotation>
+ <annotation cp="†">ఆబ్లిస్క్ | ఒబేలస్ | డాగ్గర్ | డాగ్గర్ గుర్తు</annotation>
+ <annotation cp="†" type="tts">డాగ్గర్ గుర్తు</annotation>
+ <annotation cp="‡">ఒబేలస్ | ఒబ్లిస్క్ | డబుల్ | డబుల్ డాగ్గర్ గుర్తు | డాగ్గర్</annotation>
+ <annotation cp="‡" type="tts">డబుల్ డాగ్గర్ గుర్తు</annotation>
+ <annotation cp="•">డాట్ | బుల్లెట్</annotation>
+ <annotation cp="•" type="tts">బుల్లెట్</annotation>
+ <annotation cp="°">ఋజువు | గంట | డిగ్రీ</annotation>
+ <annotation cp="°" type="tts">డిగ్రీ</annotation>
+ <annotation cp="℗">కాపీరైట్ | ధ్వని | రికార్డింగ్</annotation>
+ <annotation cp="℗" type="tts">ధ్వని రికార్డింగ్ కాపీరైట్</annotation>
+ <annotation cp="←">ఎడమ | ఎడమవైపు చూపుతున్న బాణం | బాణం</annotation>
+ <annotation cp="←" type="tts">ఎడమవైపు చూపుతున్న బాణం</annotation>
+ <annotation cp="→">కుడి | కుడివైపు చూపుతున్న బాణం | బాణం</annotation>
+ <annotation cp="→" type="tts">కుడివైపు చూపుతున్న బాణం</annotation>
+ <annotation cp="↑">పైకి | పైకి చూపుతున్న బాణం | బాణం</annotation>
+ <annotation cp="↑" type="tts">పైకి చూపుతున్న బాణం</annotation>
+ <annotation cp="↓">కింద | కిందికి చూపుతున్న బాణం | బాణం</annotation>
+ <annotation cp="↓" type="tts">కిందికి చూపుతున్న బాణం</annotation>
+ <annotation cp="⇅">కింద | పైకి మరియు కిందికి చూపుతున్న బాణాలు | పైన | బాణం</annotation>
+ <annotation cp="⇅" type="tts">పైకి మరియు కిందికి చూపుతున్న బాణాలు</annotation>
+ <annotation cp="⇆">ఎడమ | కుడి | కుడి మరియు ఎడమవైపులు చూపుతున్న బాణాలు | బాణం</annotation>
+ <annotation cp="⇆" type="tts">కుడి మరియు ఎడమవైపులు చూపుతున్న బాణాలు</annotation>
+ <annotation cp="∆">త్రిభుజం | వృద్ధి</annotation>
+ <annotation cp="∆" type="tts">వృద్ధి</annotation>
+ <annotation cp="∇">త్రిభుజం | నాబ్లా</annotation>
+ <annotation cp="∇" type="tts">నాబ్లా</annotation>
+ <annotation cp="∈">కలిగి ఉంటుంది | మూలకం | యొక్క మూలకం | సభ్యత్వం | సెట్</annotation>
+ <annotation cp="∈" type="tts">యొక్క మూలకం</annotation>
+ <annotation cp="÷">ఒబెలస్ | విభజన | విభజన గుర్తు | విభజించు</annotation>
+ <annotation cp="÷" type="tts">విభజన గుర్తు</annotation>
+ <annotation cp="×">గుణించు | గుణింతం | గుణింతపు గుర్తు | సార్లు</annotation>
+ <annotation cp="×" type="tts">గుణింతపు గుర్తు</annotation>
+ <annotation cp="⁻">మైనస్ | సూపర్ స్క్రిప్ట్ | సూపర్ స్క్రిప్ట్ మైనస్</annotation>
+ <annotation cp="⁻" type="tts">సూపర్ స్క్రిప్ట్ మైనస్</annotation>
+ <annotation cp="√">చదరపు | రాడికల్ | రాడిక్స్ | రూట్ | వర్గమూలం | సర్డ్</annotation>
+ <annotation cp="√" type="tts">వర్గమూలం</annotation>
+ <annotation cp="∞">అనంతం | అనంతం గుర్తు</annotation>
+ <annotation cp="∞" type="tts">అనంతం గుర్తు</annotation>
+ <annotation cp="∩">ఇంటర్సెక్షన్ | సెట్</annotation>
+ <annotation cp="∩" type="tts">ఇంటర్సెక్షన్</annotation>
+ <annotation cp="∪">కలెక్షన్ | యూనియన్ | సెట్</annotation>
+ <annotation cp="∪" type="tts">యూనియన్</annotation>
+ <annotation cp="≡">ఖచ్చితంగా | ట్రిపుల్ | దీనిలా | సరిపోలిన</annotation>
+ <annotation cp="≡" type="tts">దీనిలా</annotation>
+ <annotation cp="⊂">యొక్క సబ్సెట్ | సబ్సెట్ | సెట్</annotation>
+ <annotation cp="⊂" type="tts">యొక్క సబ్సెట్</annotation>
+ <annotation cp="▲">త్రిభుజం | నిండి ఉన్న | పైకి | పైకి చూపుతున్న నిండి ఉన్న త్రిభుజం | బాణం</annotation>
+ <annotation cp="▲" type="tts">పైకి చూపుతున్న నిండి ఉన్న త్రిభుజం</annotation>
+ <annotation cp="▼">కింద | కిందకి చూపుతున్న నిండి ఉన్న త్రిభుజం | త్రిభుజం | నిండి ఉన్న | బాణం</annotation>
+ <annotation cp="▼" type="tts">కిందకి చూపుతున్న నిండి ఉన్న త్రిభుజం</annotation>
+ <annotation cp="◊">రాంబస్ | వజ్రం | వజ్రపు ఆకారం</annotation>
+ <annotation cp="◊" type="tts">వజ్రపు ఆకారం</annotation>
+ <annotation cp="○">ఉంగరం | లోతు వృత్తం | వృత్తం</annotation>
+ <annotation cp="○" type="tts">లోతు వృత్తం</annotation>
+ <annotation cp="●">నిండి ఉన్న వృత్తం | వృత్తం</annotation>
+ <annotation cp="●" type="tts">నిండి ఉన్న వృత్తం</annotation>
+ <annotation cp="◯">ఉంగరం | పెద్ద లోతు వృత్తం | వృత్తం</annotation>
+ <annotation cp="◯" type="tts">పెద్ద లోతు వృత్తం</annotation>
<annotation cp="⚧">లింగం మార్చుకున్న వారి చిహ్నం | లింగం మార్చుకున్న వాళ్లు</annotation>
<annotation cp="⚧" type="tts">లింగం మార్చుకున్న వారి చిహ్నం</annotation>
<annotation cp="🤌">గిచ్చడం | గిచ్చుతున్నట్లు ఉండే వేళ్లు | చేతి సైగ | ప్రశ్నించడం | వంటివి చేయడం | వేళ్లు</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ఇంధ్రధనుస్సు పతాకం</annotation>
<annotation cp="🏴☠">జాలీ రోజర్ | దోపిడీ | నిధి | పైరేట్ | సముద్రపుదొంగల జెండా</annotation>
<annotation cp="🏴☠" type="tts">సముద్రపుదొంగల జెండా</annotation>
+ <annotation cp="£">ఇజిపి | కరెన్సీ | జిబిపి | పౌండ్</annotation>
+ <annotation cp="£" type="tts">పౌండ్</annotation>
+ <annotation cp="¥">కరెన్సీ | జెపివై | యువాన్ | యెన్ | సిఎన్వై</annotation>
+ <annotation cp="¥" type="tts">యెన్</annotation>
+ <annotation cp="€">ఇయుఆర్ | కరెన్సీ | యూరో</annotation>
+ <annotation cp="€" type="tts">యూరో</annotation>
+ <annotation cp="₹">కరెన్సీ | భారతీయ రూపాయి | రూపాయి</annotation>
+ <annotation cp="₹" type="tts">భారతీయ రూపాయి</annotation>
+ <annotation cp="₽">కరెన్సీ | రబల్</annotation>
+ <annotation cp="₽" type="tts">రబల్</annotation>
+ <annotation cp="¹">ఒకటి | సూపర్ స్క్రిప్ట్ | సూపర్ స్క్రిప్ట్ ఒకటి</annotation>
+ <annotation cp="¹" type="tts">సూపర్ స్క్రిప్ట్ ఒకటి</annotation>
+ <annotation cp="²">రెండు | సూపర్ స్క్రిప్ట్ | సూపర్ స్క్రిప్ట్ రెండు | స్క్వేర్డ్</annotation>
+ <annotation cp="²" type="tts">సూపర్ స్క్రిప్ట్ రెండు</annotation>
+ <annotation cp="³">క్యూబ్డ్ | మూడు | సూపర్ స్క్రిప్ట్ | సూపర్ స్క్రిప్ట్ మూడు</annotation>
+ <annotation cp="³" type="tts">సూపర్ స్క్రిప్ట్ మూడు</annotation>
+ <annotation cp="µ">కొలత | మైక్రో గుర్తు</annotation>
+ <annotation cp="µ" type="tts">మైక్రో గుర్తు</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/th.xml b/common/annotations/th.xml
index 430dc61..3cb47d2 100644
--- a/common/annotations/th.xml
+++ b/common/annotations/th.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">โทนผิวสีแทน</annotation>
<annotation cp="🏿">โทนผิวสีเข้ม | โทนสีผิว | ผิวโทน 6</annotation>
<annotation cp="🏿" type="tts">โทนผิวสีเข้ม</annotation>
+ <annotation cp="–">ขีดกลาง | ขีดสั้น | เส้นประสั้น</annotation>
+ <annotation cp="–" type="tts">เส้นประสั้น</annotation>
+ <annotation cp="—">ขีดกลาง | ขีดยาว | เส้นประยาว</annotation>
+ <annotation cp="—" type="tts">เส้นประยาว</annotation>
+ <annotation cp="·">กลาง | จุด | จุดกลาง | จุดตรงกลาง</annotation>
+ <annotation cp="·" type="tts">จุดกลาง</annotation>
+ <annotation cp="«">กิลเลอเมตเปิด | เครื่องหมายตก | เครื่องหมายอ้างอิง | บั้ง | เปิด | มุม | วงเล็บ</annotation>
+ <annotation cp="«" type="tts">กิลเลอเมตเปิด</annotation>
+ <annotation cp="»">กิลเลอเมตปิด | เครื่องหมายตก | เครื่องหมายอ้างอิง | บั้ง | ปิด | มุม | วงเล็บ</annotation>
+ <annotation cp="»" type="tts">กิลเลอเมตปิด</annotation>
+ <annotation cp="§">ตอน | ย่อหน้า | ส่วน | สัญลักษณ์ระบุว่าเป็นตอน | สัญลักษณ์ระบุส่วนของหนังสือ</annotation>
+ <annotation cp="§" type="tts">สัญลักษณ์ระบุว่าเป็นตอน</annotation>
+ <annotation cp="†">กริช | เครื่องหมายกริช | สัญลักษณ์อ้างอิง | ออเบอลุส</annotation>
+ <annotation cp="†" type="tts">เครื่องหมายกริช</annotation>
+ <annotation cp="‡">กริช | คู่ | สัญลักษณ์กริชคู่ | สัญลักษณ์อ้างอิง | ออเบอลุส</annotation>
+ <annotation cp="‡" type="tts">สัญลักษณ์กริชคู่</annotation>
+ <annotation cp="•">จุด | สัญลักษณ์หัวข้อย่อย</annotation>
+ <annotation cp="•" type="tts">สัญลักษณ์หัวข้อย่อย</annotation>
+ <annotation cp="°">การพิสูจน์ | ชั่วโมง | องศา</annotation>
+ <annotation cp="°" type="tts">องศา</annotation>
+ <annotation cp="℗">ลิขสิทธิ์ | ลิขสิทธิ์แถบบันทึกเสียง | เสียง | เสียงบันทึก</annotation>
+ <annotation cp="℗" type="tts">ลิขสิทธิ์แถบบันทึกเสียง</annotation>
+ <annotation cp="←">ซ้าย | ลูกศร | ลูกศรชี้ซ้าย</annotation>
+ <annotation cp="←" type="tts">ลูกศรชี้ซ้าย</annotation>
+ <annotation cp="→">ขวา | ลูกศร | ลูกศรชี้ขวา</annotation>
+ <annotation cp="→" type="tts">ลูกศรชี้ขวา</annotation>
+ <annotation cp="↑">ขึ้น | ลูกศร | ลูกศรแบบชี้ขึ้น</annotation>
+ <annotation cp="↑" type="tts">ลูกศรแบบชี้ขึ้น</annotation>
+ <annotation cp="↓">ลง | ลูกศร | ลูกศรแบบชี้ลง</annotation>
+ <annotation cp="↓" type="tts">ลูกศรแบบชี้ลง</annotation>
+ <annotation cp="⇅">ขึ้น | ลง | ลูกศร | ลูกศรชี้ขึ้นและลูกศรชี้ลง</annotation>
+ <annotation cp="⇅" type="tts">ลูกศรชี้ขึ้นและลูกศรชี้ลง</annotation>
+ <annotation cp="⇆">ขวา | ซ้าย | ลูกศร | ลูกศรชี้ซ้ายเหนือลูกศรชี้ขวา</annotation>
+ <annotation cp="⇆" type="tts">ลูกศรชี้ซ้ายเหนือลูกศรชี้ขวา</annotation>
+ <annotation cp="∆">การเพิ่มค่า | สามเหลี่ยม</annotation>
+ <annotation cp="∆" type="tts">การเพิ่มค่า</annotation>
+ <annotation cp="∇">เดล | นาบลา | สามเหลี่ยม</annotation>
+ <annotation cp="∇" type="tts">เดล</annotation>
+ <annotation cp="∈">ความเป็นสมาชิก | เซต | ประกอบด้วย | เป็นสมาชิกของ | สมาชิก</annotation>
+ <annotation cp="∈" type="tts">เป็นสมาชิกของ</annotation>
+ <annotation cp="÷">การหาร | สัญลักษณ์หาร | หาร | ออเบอลุส</annotation>
+ <annotation cp="÷" type="tts">สัญลักษณ์หาร</annotation>
+ <annotation cp="×">การคูณ | เครื่องหมายคูณ | เท่า | สัญลักษณ์คูณ</annotation>
+ <annotation cp="×" type="tts">สัญลักษณ์คูณ</annotation>
+ <annotation cp="⁻">ตัวยก | ตัวยกเครื่องหมายลบ | ลบ</annotation>
+ <annotation cp="⁻" type="tts">ตัวยกเครื่องหมายลบ</annotation>
+ <annotation cp="√">ฐาน | ราก | รากที่สอง | รูต | สแควร์ | เสิร์ด</annotation>
+ <annotation cp="√" type="tts">รากที่สอง</annotation>
+ <annotation cp="∞">สัญลักษณ์อนันต์ | อนันต์</annotation>
+ <annotation cp="∞" type="tts">สัญลักษณ์อนันต์</annotation>
+ <annotation cp="∩">เซต | อินเตอร์เซกชั่น</annotation>
+ <annotation cp="∩" type="tts">อินเตอร์เซกชั่น</annotation>
+ <annotation cp="∪">เซต | ยูเนียน | หมู่</annotation>
+ <annotation cp="∪" type="tts">ยูเนียน</annotation>
+ <annotation cp="≡">ตรงกัน | สามขีด | เหมือน | เหมือนกับ</annotation>
+ <annotation cp="≡" type="tts">เหมือนกับ</annotation>
+ <annotation cp="⊂">เซต | เซตย่อย | เซตย่อยของ</annotation>
+ <annotation cp="⊂" type="tts">เซตย่อยของ</annotation>
+ <annotation cp="▲">ขึ้น | ทึบ | ลูกศร | สามเหลี่ยม | สามเหลี่ยมทึบหัวชี้ขึ้น</annotation>
+ <annotation cp="▲" type="tts">สามเหลี่ยมทึบหัวชี้ขึ้น</annotation>
+ <annotation cp="▼">ทึบ | ลง | ลูกศร | สามเหลี่ยม | สามเหลี่ยมทึบหัวชี้ลง</annotation>
+ <annotation cp="▼" type="tts">สามเหลี่ยมทึบหัวชี้ลง</annotation>
+ <annotation cp="◊">สี่เหลี่ยมขนมเปียกปูน | สี่เหลี่ยมข้าวหลามตัด | สี่เหลี่ยมด้านเท่า</annotation>
+ <annotation cp="◊" type="tts">สี่เหลี่ยมขนมเปียกปูน</annotation>
+ <annotation cp="○">จุดกลม | จุดกลมกลวง | วงแหวน</annotation>
+ <annotation cp="○" type="tts">จุดกลมกลวง</annotation>
+ <annotation cp="●">จุดกลม | จุดกลมทึบ</annotation>
+ <annotation cp="●" type="tts">จุดกลมทึบ</annotation>
+ <annotation cp="◯">จุดกลม | จุดกลมกลวงใหญ่ | วงแหวน</annotation>
+ <annotation cp="◯" type="tts">จุดกลมกลวงใหญ่</annotation>
<annotation cp="⚧">คนข้ามเพศ | สัญลักษณ์คนข้ามเพศ</annotation>
<annotation cp="⚧" type="tts">สัญลักษณ์คนข้ามเพศ</annotation>
<annotation cp="🤌">การถาม | ท่าทางมือ | นิ้ว | ปากจัด | หุบนิ้ว</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">ธงสีรุ้ง</annotation>
<annotation cp="🏴☠">ขุมทรัพย์ | จอลลีโรเจอร์ | โจรสลัด | ธงโจรสลัด | ปล้น</annotation>
<annotation cp="🏴☠" type="tts">ธงโจรสลัด</annotation>
+ <annotation cp="£">เงินปอนด์อังกฤษ (GBP) | เงินปอนด์อียิปต์ (EGP) | ปอนด์ | สกุลเงิน</annotation>
+ <annotation cp="£" type="tts">ปอนด์</annotation>
+ <annotation cp="¥">เงินเยนญี่ปุ่น (JPY) | เงินหยวนจีน (CNY) | เยน | สกุลเงิน | หยวน</annotation>
+ <annotation cp="¥" type="tts">เยน</annotation>
+ <annotation cp="€">เงินยูโร (EUR) | ยูโร | สกุลเงิน</annotation>
+ <annotation cp="€" type="tts">ยูโร</annotation>
+ <annotation cp="₹">รูปี | รูปีอินเดีย | สกุลเงิน</annotation>
+ <annotation cp="₹" type="tts">รูปีอินเดีย</annotation>
+ <annotation cp="₽">รูเบิล | สกุลเงิน</annotation>
+ <annotation cp="₽" type="tts">รูเบิล</annotation>
+ <annotation cp="¹">ตัวยกเลขหนึ่ง | หนึ่ง</annotation>
+ <annotation cp="¹" type="tts">ตัวยกเลขหนึ่ง</annotation>
+ <annotation cp="²">ตัวยก | ตัวยกเลขสอง | ยกกำลังสอง | สอง</annotation>
+ <annotation cp="²" type="tts">ตัวยกเลขสอง</annotation>
+ <annotation cp="³">ตัวยก | ตัวยกเลขสาม | ยกกำลังสาม | สาม</annotation>
+ <annotation cp="³" type="tts">ตัวยกเลขสาม</annotation>
+ <annotation cp="µ">การวัด | สัญลักษณ์ไมโคร</annotation>
+ <annotation cp="µ" type="tts">สัญลักษณ์ไมโคร</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/tk.xml b/common/annotations/tk.xml
index c6fe488..8895d09 100644
--- a/common/annotations/tk.xml
+++ b/common/annotations/tk.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">orta goýy deri reňki</annotation>
<annotation cp="🏿">deri reňki | görnüş 6 | goýy deri reňki</annotation>
<annotation cp="🏿" type="tts">goýy deri reňki</annotation>
+ <annotation cp="–">gysga | gysga kese çyzyk | kese çyzyk</annotation>
+ <annotation cp="–" type="tts">gysga kese çyzyk</annotation>
+ <annotation cp="—">kese çyzyk | uzyn | uzyn kese çyzyk</annotation>
+ <annotation cp="—" type="tts">uzyn kese çyzyk</annotation>
+ <annotation cp="·">interpunkt | midot | nokta | orta</annotation>
+ <annotation cp="·" type="tts">interpunkt</annotation>
+ <annotation cp="«">burç | çep | çep goşa dyrnak | goşa burçly ýaý | goşa dyrnak | kareler | ýaýlar</annotation>
+ <annotation cp="«" type="tts">çep goşa dyrnak</annotation>
+ <annotation cp="»">burç | goşa dyrnak | kareler | sag | sag goşa dyrnak | ýaý | ýaýlar</annotation>
+ <annotation cp="»" type="tts">sag goşa dyrnak</annotation>
+ <annotation cp="§">bölek | bölme | bölüm | bölüm nyşany | paragraf</annotation>
+ <annotation cp="§" type="tts">bölme</annotation>
+ <annotation cp="†">çykgyt | çykgyt nyşany | obelýus | salgylanyş</annotation>
+ <annotation cp="†" type="tts">çykgyt nyşany</annotation>
+ <annotation cp="‡">çykgyt | goşa | goşa çykgyt nyşany | obelýus | salgylanyş</annotation>
+ <annotation cp="‡" type="tts">goşa çykgyt nyşany</annotation>
+ <annotation cp="•">nokat | seçme</annotation>
+ <annotation cp="•" type="tts">seçme</annotation>
+ <annotation cp="°">dereje | sagat | subut</annotation>
+ <annotation cp="°" type="tts">dereje</annotation>
+ <annotation cp="℗">awtorlyk hukugy | ses | ses ýazgysy awtorlyk hukugy | ýazdyrmak</annotation>
+ <annotation cp="℗" type="tts">ses ýazgysy awtorlyk hukugy</annotation>
+ <annotation cp="←">çep | çepe görkezýän ok | ok</annotation>
+ <annotation cp="←" type="tts">çepe görkezýän ok</annotation>
+ <annotation cp="→">ok | sag | sagy görkezýän ok</annotation>
+ <annotation cp="→" type="tts">sagy görkezýän ok</annotation>
+ <annotation cp="↑">ok | ýokaryk | ýokaryk görkezýän ok</annotation>
+ <annotation cp="↑" type="tts">ýokaryk görkezýän ok</annotation>
+ <annotation cp="↓">aşak | aşak görkezýän ok | ok</annotation>
+ <annotation cp="↓" type="tts">aşak görkezýän ok</annotation>
+ <annotation cp="⇅">aşak | ok | ýokaryk | ýokaryk we aşak görkezýän oklar</annotation>
+ <annotation cp="⇅" type="tts">ýokaryk we aşak görkezýän oklar</annotation>
+ <annotation cp="⇆">çep | ok | sag | saga görkezýän oklaryň üstünde çepe görkezýän ok | saga görkezýän okuň üstünde çepe görkezýän ok</annotation>
+ <annotation cp="⇆" type="tts">saga görkezýän oklaryň üstünde çepe görkezýän ok</annotation>
+ <annotation cp="∆">artdyrma | üçburçlyk</annotation>
+ <annotation cp="∆" type="tts">artdyrma</annotation>
+ <annotation cp="∇">nabla | üçburçlyk</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">agza | agzalyk | toplum | ybarat</annotation>
+ <annotation cp="∈" type="tts">agza</annotation>
+ <annotation cp="÷">bölme | bölme nyşany | bölmek | obelýus</annotation>
+ <annotation cp="÷" type="tts">bölme nyşany</annotation>
+ <annotation cp="×">artdyrmak | köpeltme | köpeltme nyşan | köpeltmek</annotation>
+ <annotation cp="×" type="tts">köpeltme nyşan</annotation>
+ <annotation cp="⁻">minus | ýokary indeks | ýokary indeks minus</annotation>
+ <annotation cp="⁻" type="tts">ýokary indeks minus</annotation>
+ <annotation cp="√">hasaplama ulgamyň esasy | irrasionallyk | kök | kwadrat</annotation>
+ <annotation cp="√" type="tts">kwadrat kök</annotation>
+ <annotation cp="∞">tükeniksiz | tükeniksiz nyşan</annotation>
+ <annotation cp="∞" type="tts">tükeniksiz nyşan</annotation>
+ <annotation cp="∩">köpeltme jemi | toplum</annotation>
+ <annotation cp="∩" type="tts">köpeltme jemi</annotation>
+ <annotation cp="∪">köplük | toplum | ýygyndy</annotation>
+ <annotation cp="∪" type="tts">köplük</annotation>
+ <annotation cp="≡">birmeňzeş | deň | takyk | üç esse</annotation>
+ <annotation cp="≡" type="tts">deň</annotation>
+ <annotation cp="⊂">kiçi synp | toplum</annotation>
+ <annotation cp="⊂" type="tts">kiçi synp</annotation>
+ <annotation cp="▲">doly | doly ýokaryk görkezýän üçburçlyk | ok | üçburçlyk | ýokaryk</annotation>
+ <annotation cp="▲" type="tts">doly ýokaryk görkezýän üçburçlyk</annotation>
+ <annotation cp="▼">aşak | doly | doly aşak görkezýän üçburçlyk | ok | üçburçlyk</annotation>
+ <annotation cp="▼" type="tts">doly aşak görkezýän üçburçlyk</annotation>
+ <annotation cp="◊">almaz | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">aýlaw | boş aýlaw | tegelek</annotation>
+ <annotation cp="○" type="tts">boş aýlaw</annotation>
+ <annotation cp="●">aýlaw | doly aýlaw</annotation>
+ <annotation cp="●" type="tts">doly aýlaw</annotation>
+ <annotation cp="◯">aýlaw | tegelek | uly boş aýlaw</annotation>
+ <annotation cp="◯" type="tts">uly boş aýlaw</annotation>
<annotation cp="⚧">transgender | transgender nyşany</annotation>
<annotation cp="⚧" type="tts">transgender nyşany</annotation>
<annotation cp="🤌">barmaklar | el hereketi | gysylan | soramak | teýeneli</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">älemgoşar baýdak</annotation>
<annotation cp="🏴☠">garakçy | garakçy baýdagy | hazyna | şadyýan Rojer | talaň</annotation>
<annotation cp="🏴☠" type="tts">garakçy baýdagy</annotation>
+ <annotation cp="£">EGP | GBP | pul birligi | sterling funty</annotation>
+ <annotation cp="£" type="tts">sterling funty</annotation>
+ <annotation cp="¥">CNY | JPY | pul birligi | ýen | ýuan</annotation>
+ <annotation cp="¥" type="tts">ýen</annotation>
+ <annotation cp="€">ewro | EWRO | pul birligi</annotation>
+ <annotation cp="€" type="tts">ewro</annotation>
+ <annotation cp="₹">hindi rupi | pul birligi | rupi</annotation>
+ <annotation cp="₹" type="tts">hindi rupi</annotation>
+ <annotation cp="₽">pul birligi | rubl</annotation>
+ <annotation cp="₽" type="tts">rubl</annotation>
+ <annotation cp="¹">bir | ýokary indeks | ýokary indeks bir</annotation>
+ <annotation cp="¹" type="tts">ýokary indeks bir</annotation>
+ <annotation cp="²">iki | kwadratda | ýokary indeks | ýokary indeks iki</annotation>
+ <annotation cp="²" type="tts">ýokary indeks iki</annotation>
+ <annotation cp="³">kubda | üç | ýokary indeks | ýokary indeks üç</annotation>
+ <annotation cp="³" type="tts">ýokary indeks üç</annotation>
+ <annotation cp="µ">mikro belgisi | ölçeg</annotation>
+ <annotation cp="µ" type="tts">mikro belgisi</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/tr.xml b/common/annotations/tr.xml
index feeb8f4..6596699 100644
--- a/common/annotations/tr.xml
+++ b/common/annotations/tr.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">orta koyu cilt tonu</annotation>
<annotation cp="🏿">deri | emoji değiştirici | koyu cilt tonu | koyu ten rengi | ton</annotation>
<annotation cp="🏿" type="tts">koyu cilt tonu</annotation>
+ <annotation cp="–">çizgi | tire</annotation>
+ <annotation cp="–" type="tts">tire</annotation>
+ <annotation cp="—">tire | uzun</annotation>
+ <annotation cp="—" type="tts">uzun tire</annotation>
+ <annotation cp="·">nokta | orta | ortaya konan nokta</annotation>
+ <annotation cp="·" type="tts">orta nokta</annotation>
+ <annotation cp="«">açılı | düzeltme işareti | köşeli çift ayraç | parantezler | sol | sola bakan köşeli tırnak işareti | tırnak işareti</annotation>
+ <annotation cp="«" type="tts">sola bakan köşeli tırnak işareti</annotation>
+ <annotation cp="»">açılı | düzeltme işareti | köşeli çift ayraç | parantezler | sağ | sağa bakan köşeli tırnak işareti | tırnak işareti</annotation>
+ <annotation cp="»" type="tts">sağa bakan köşeli tırnak işareti</annotation>
+ <annotation cp="§">bölüm | bölüm işareti | paragraf | parça</annotation>
+ <annotation cp="§" type="tts">bölüm</annotation>
+ <annotation cp="†">dikili taş | kama | kama işareti | obelus</annotation>
+ <annotation cp="†" type="tts">kama işareti</annotation>
+ <annotation cp="‡">çift | çift kama işareti | dikili taş | kama | obelus</annotation>
+ <annotation cp="‡" type="tts">çift kama işareti</annotation>
+ <annotation cp="•">madde imi | nokta</annotation>
+ <annotation cp="•" type="tts">madde imi</annotation>
+ <annotation cp="°">derece | kanıt | saat</annotation>
+ <annotation cp="°" type="tts">derece</annotation>
+ <annotation cp="℗">kayıt | ses | ses kaydı telif hakkı | telif hakkı</annotation>
+ <annotation cp="℗" type="tts">ses kaydı telif hakkı</annotation>
+ <annotation cp="←">ok | sol | solu gösteren ok</annotation>
+ <annotation cp="←" type="tts">solu gösteren ok</annotation>
+ <annotation cp="→">ok | sağ | sağı gösteren ok</annotation>
+ <annotation cp="→" type="tts">sağı gösteren ok</annotation>
+ <annotation cp="↑">ok | yukarı | yukarı gösteren ok</annotation>
+ <annotation cp="↑" type="tts">yukarı gösteren ok</annotation>
+ <annotation cp="↓">aşağı | aşağı gösteren ok | ok</annotation>
+ <annotation cp="↓" type="tts">aşağı gösteren ok</annotation>
+ <annotation cp="⇅">aşağı | ok | yukarı | yukarı ve aşağı bakan oklar</annotation>
+ <annotation cp="⇅" type="tts">yukarı ve aşağı bakan oklar</annotation>
+ <annotation cp="⇆">altta sağa üstte sola bakan oklar | ok | sağ | sol</annotation>
+ <annotation cp="⇆" type="tts">altta sağa üstte sola bakan oklar</annotation>
+ <annotation cp="∆">artım | üçgen</annotation>
+ <annotation cp="∆" type="tts">artım</annotation>
+ <annotation cp="∇">nabla | üçgen</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">eleman | elemanıdır | içerir | küme | üyelik</annotation>
+ <annotation cp="∈" type="tts">elemanıdır</annotation>
+ <annotation cp="÷">bölme | bölme işareti | bölüm | obelus</annotation>
+ <annotation cp="÷" type="tts">bölme işareti</annotation>
+ <annotation cp="×">çarpım | çarpma | çarpma işareti</annotation>
+ <annotation cp="×" type="tts">çarpma işareti</annotation>
+ <annotation cp="⁻">eksi | üst eksi simgesi | üst simge</annotation>
+ <annotation cp="⁻" type="tts">üst eksi simgesi</annotation>
+ <annotation cp="√">kare | karekök | kök | radikal | radikal ifade | taban</annotation>
+ <annotation cp="√" type="tts">karekök</annotation>
+ <annotation cp="∞">sonsuzluk | sonsuzluk işareti</annotation>
+ <annotation cp="∞" type="tts">sonsuzluk işareti</annotation>
+ <annotation cp="∩">kesişim | küme</annotation>
+ <annotation cp="∩" type="tts">kesişim</annotation>
+ <annotation cp="∪">birleşim | küme | toplam</annotation>
+ <annotation cp="∪" type="tts">birleşim</annotation>
+ <annotation cp="≡">aynı | denk | denktir | üçlü</annotation>
+ <annotation cp="≡" type="tts">denktir</annotation>
+ <annotation cp="⊂">alt küme | alt kümesidir | alt kümesidr | küme</annotation>
+ <annotation cp="⊂" type="tts">alt kümesidir</annotation>
+ <annotation cp="▲">içi dolu | ok | üçgen | yukarı | yukarı bakan içi dolu üçgen</annotation>
+ <annotation cp="▲" type="tts">yukarı bakan içi dolu üçgen</annotation>
+ <annotation cp="▼">aşağı | aşağı bakan içi dolu üçgen | içi dolu | ok | üçgen</annotation>
+ <annotation cp="▼" type="tts">aşağı bakan içi dolu üçgen</annotation>
+ <annotation cp="◊">baklava | elmas | eşkenar dörtgen</annotation>
+ <annotation cp="◊" type="tts">eşkenar dörtgen</annotation>
+ <annotation cp="○">boş daire | daire | halka</annotation>
+ <annotation cp="○" type="tts">boş daire</annotation>
+ <annotation cp="●">çember | içi dolu çember</annotation>
+ <annotation cp="●" type="tts">içi dolu çember</annotation>
+ <annotation cp="◯">büyük boş daire | daire | halka</annotation>
+ <annotation cp="◯" type="tts">büyük boş daire</annotation>
<annotation cp="⚧">transgender | transgender sembolü | transseksüel</annotation>
<annotation cp="⚧" type="tts">transgender sembolü</annotation>
<annotation cp="🤌">bravo | çok güzel | harika | kıstırma hareketi yapan parmaklar | lezzetli | parmaklar</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">gökkuşağı bayrağı</annotation>
<annotation cp="🏴☠">hazine | Jolly Roger | korsan | korsan bayrağı | yağmacı</annotation>
<annotation cp="🏴☠" type="tts">korsan bayrağı</annotation>
+ <annotation cp="£">EGP | GBP | para birimi | sterlin</annotation>
+ <annotation cp="£" type="tts">sterlin</annotation>
+ <annotation cp="¥">CNY | JPY | para birimi | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">yen</annotation>
+ <annotation cp="€">avro | EUR | para birimi</annotation>
+ <annotation cp="€" type="tts">avro</annotation>
+ <annotation cp="₹">hint rupisi | para birimi | rupi</annotation>
+ <annotation cp="₹" type="tts">hint rupisi</annotation>
+ <annotation cp="₽">para birimi | ruble</annotation>
+ <annotation cp="₽" type="tts">ruble</annotation>
+ <annotation cp="¹">bir | üst bir simgesi | üst simge</annotation>
+ <annotation cp="¹" type="tts">üst bir simgesi</annotation>
+ <annotation cp="²">iki | karesi alınmış | üst iki simgesi | üst simge</annotation>
+ <annotation cp="²" type="tts">üst iki simgesi</annotation>
+ <annotation cp="³">küpü alınmış | üç | üst simge | üst üç simgesi</annotation>
+ <annotation cp="³" type="tts">üst üç simgesi</annotation>
+ <annotation cp="µ">mikro işareti | ölçüm</annotation>
+ <annotation cp="µ" type="tts">mikro işareti</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/uk.xml b/common/annotations/uk.xml
index 27f7946..2faaede 100644
--- a/common/annotations/uk.xml
+++ b/common/annotations/uk.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">помірно темний тон шкіри</annotation>
<annotation cp="🏿">темний тон шкіри | тон | фіцпатрік | шкіра</annotation>
<annotation cp="🏿" type="tts">темний тон шкіри</annotation>
+ <annotation cp="–">коротке | тире</annotation>
+ <annotation cp="–" type="tts">коротке тире</annotation>
+ <annotation cp="—">довге | тире</annotation>
+ <annotation cp="—" type="tts">довге тире</annotation>
+ <annotation cp="·">інтерпункт | крапка | середній | середня крапка</annotation>
+ <annotation cp="·" type="tts">середня крапка</annotation>
+ <annotation cp="«">дужки | карет | кут | лапки | ліва шевронна лапка | ліво | шеврон</annotation>
+ <annotation cp="«" type="tts">ліва шевронна лапка</annotation>
+ <annotation cp="»">дужки | карет | кут | лапки | права шевронна лапка | право | шеврон</annotation>
+ <annotation cp="»" type="tts">права шевронна лапка</annotation>
+ <annotation cp="§">абзац | знак розділу | розділ | частина</annotation>
+ <annotation cp="§" type="tts">розділ</annotation>
+ <annotation cp="†">друкарський знак | друкарський хрестик | обелюс</annotation>
+ <annotation cp="†" type="tts">друкарський хрестик</annotation>
+ <annotation cp="‡">друкарський знак | друкарський хрестик | обелюс | подвійний | подвійний друкарський хрестик</annotation>
+ <annotation cp="‡" type="tts">подвійний друкарський хрестик</annotation>
+ <annotation cp="•">крапка | маркер | маркованний список</annotation>
+ <annotation cp="•" type="tts">маркер</annotation>
+ <annotation cp="°">година | доведення | доказ | ступінь</annotation>
+ <annotation cp="°" type="tts">ступінь</annotation>
+ <annotation cp="℗">авторське право | авторське право на звукозапис | запис | звук</annotation>
+ <annotation cp="℗" type="tts">авторське право на звукозапис</annotation>
+ <annotation cp="←">вліво | ліворуч | стрілка ліворуч</annotation>
+ <annotation cp="←" type="tts">стрілка ліворуч</annotation>
+ <annotation cp="→">право | праворуч | стрілка праворуч</annotation>
+ <annotation cp="→" type="tts">стрілка праворуч</annotation>
+ <annotation cp="↑">вгору | догори | стрілка догори</annotation>
+ <annotation cp="↑" type="tts">стрілка догори</annotation>
+ <annotation cp="↓">вниз | донизу | стрілка донизу</annotation>
+ <annotation cp="↓" type="tts">стрілка донизу</annotation>
+ <annotation cp="⇅">вгору | вниз | догори | донизу | стрілки догори та донизу</annotation>
+ <annotation cp="⇅" type="tts">стрілки догори та донизу</annotation>
+ <annotation cp="⇆">вліво | вправо | ліворуч | праворуч | стрілка ліворуч над стрілкою праворуч</annotation>
+ <annotation cp="⇆" type="tts">стрілка ліворуч над стрілкою праворуч</annotation>
+ <annotation cp="∆">збільшення | трикутник</annotation>
+ <annotation cp="∆" type="tts">збільшення</annotation>
+ <annotation cp="∇">набла | трикутник</annotation>
+ <annotation cp="∇" type="tts">набла</annotation>
+ <annotation cp="∈">елемент | компонент | містить | набір | складник | членство</annotation>
+ <annotation cp="∈" type="tts">елемент</annotation>
+ <annotation cp="÷">ділення | ділити | знак ділення | обелюс</annotation>
+ <annotation cp="÷" type="tts">знак ділення</annotation>
+ <annotation cp="×">знак множення | множення | множити | раз</annotation>
+ <annotation cp="×" type="tts">знак множення</annotation>
+ <annotation cp="⁻">верхній | мінус | надрядковий мінус</annotation>
+ <annotation cp="⁻" type="tts">надрядковий мінус</annotation>
+ <annotation cp="√">ірраціональний | квадрат | квадратний корінь | корінь | радикальний</annotation>
+ <annotation cp="√" type="tts">квадратний корінь</annotation>
+ <annotation cp="∞">знак нескінченності | нескінченність</annotation>
+ <annotation cp="∞" type="tts">знак нескінченності</annotation>
+ <annotation cp="∩">знак перетину | набір | перетин</annotation>
+ <annotation cp="∩" type="tts">знак перетину</annotation>
+ <annotation cp="∪">набір | обʼєднання | поєднання | союз | сполука</annotation>
+ <annotation cp="∪" type="tts">обʼєднання</annotation>
+ <annotation cp="≡">однаковий | потрійний | тотожний | тотожність | точний</annotation>
+ <annotation cp="≡" type="tts">тотожність</annotation>
+ <annotation cp="⊂">набір | підмножина</annotation>
+ <annotation cp="⊂" type="tts">підмножина</annotation>
+ <annotation cp="▲">заповнений | заповнений трикутник, обернений угору | стрілка | трикутник | угору</annotation>
+ <annotation cp="▲" type="tts">заповнений трикутник, обернений угору</annotation>
+ <annotation cp="▼">заповнений | заповнений трикутник, обернений униз | стрілка | трикутник | униз</annotation>
+ <annotation cp="▼" type="tts">заповнений трикутник, обернений униз</annotation>
+ <annotation cp="◊">діамант | ромб</annotation>
+ <annotation cp="◊" type="tts">ромб</annotation>
+ <annotation cp="○">кільце | коло | порожнє коло</annotation>
+ <annotation cp="○" type="tts">порожнє коло</annotation>
+ <annotation cp="●">заповнене коло | коло</annotation>
+ <annotation cp="●" type="tts">заповнене коло</annotation>
+ <annotation cp="◯">велике порожнє коло | кільце | коло</annotation>
+ <annotation cp="◯" type="tts">велике порожнє коло</annotation>
<annotation cp="⚧">трансгендер | трансгендерний символ</annotation>
<annotation cp="⚧" type="tts">трансгендерний символ</annotation>
<annotation cp="🤌">жест рукою | запитання | зведені | пальці | сарказм</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">веселковий прапор</annotation>
<annotation cp="🏴☠">Веселий Роджер | корсар | піратський | піратський прапор | скарб</annotation>
<annotation cp="🏴☠" type="tts">піратський прапор</annotation>
+ <annotation cp="£">EGP | GBP | британський фунт | валюта | єгипетський фунт | фунт | фунт стерлінгів</annotation>
+ <annotation cp="£" type="tts">фунт</annotation>
+ <annotation cp="¥">CNY | JPY | валюта | єна | китайський юань | юань | японська єна</annotation>
+ <annotation cp="¥" type="tts">єна</annotation>
+ <annotation cp="€">EUR | валюта | євро</annotation>
+ <annotation cp="€" type="tts">євро</annotation>
+ <annotation cp="₹">валюта | індійська рупія | рупія</annotation>
+ <annotation cp="₹" type="tts">індійська рупія</annotation>
+ <annotation cp="₽">валюта | рубль</annotation>
+ <annotation cp="₽" type="tts">рубль</annotation>
+ <annotation cp="¹">верхній індекс | верхній регістр | надрядкова одиниця | одиниця</annotation>
+ <annotation cp="¹" type="tts">надрядкова одиниця</annotation>
+ <annotation cp="²">верхній індекс | верхній регістр | два | двійка | надрядкова двійка | у квадраті</annotation>
+ <annotation cp="²" type="tts">надрядкова двійка</annotation>
+ <annotation cp="³">верхній індекс | верхній регістр | надрядкова трійка | три | трійка | у кубі</annotation>
+ <annotation cp="³" type="tts">надрядкова трійка</annotation>
+ <annotation cp="µ">µ | вимірювати | знак мікро | мк | мю</annotation>
+ <annotation cp="µ" type="tts">знак мікро</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/ur.xml b/common/annotations/ur.xml
index 77088e1..c7e9368 100644
--- a/common/annotations/ur.xml
+++ b/common/annotations/ur.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">جلد کی درمیانی سیاہ رنگت</annotation>
<annotation cp="🏿">اسکن | ایموجی | تبدیل کار | ٹون | جلد کی سیاہ رنگت</annotation>
<annotation cp="🏿" type="tts">جلد کی سیاہ رنگت</annotation>
+ <annotation cp="–">این | ڈیش</annotation>
+ <annotation cp="–" type="tts">این ڈیش</annotation>
+ <annotation cp="—">ایم | ڈیش</annotation>
+ <annotation cp="—" type="tts">ایم ڈیش</annotation>
+ <annotation cp="·">درمیانی نقطہ | علامت وقف | نقطہ | وسط | وسطی نقطہ</annotation>
+ <annotation cp="·" type="tts">وسطی نقطہ</annotation>
+ <annotation cp="«">اقتباس | بائیں | بائیں گلیمیٹ | بریکٹ | زاویہ | شیوران | کیریٹس</annotation>
+ <annotation cp="«" type="tts">بائیں گلیمیٹ</annotation>
+ <annotation cp="»">اقتباس | بریکٹس | دائیں | دائیں گلیمیٹ | زاویہ | شیوران | صحیح گلیمیٹ | کیریٹس</annotation>
+ <annotation cp="»" type="tts">دائیں گلیمیٹ</annotation>
+ <annotation cp="§">پارٹ | پیراگراف | سلکرو | سیکشن</annotation>
+ <annotation cp="§" type="tts">سیکشن</annotation>
+ <annotation cp="†">ڈیگر | ڈیگر کا نشان | مخروطی پتھر کا مینار | نشان تحریف</annotation>
+ <annotation cp="†" type="tts">ڈیگر کا نشان</annotation>
+ <annotation cp="‡">دہرا | دہرا ڈیگر کی علامت | ڈیگر | مخروطی پتھر کا مینار | نشان تحریف</annotation>
+ <annotation cp="‡" type="tts">دہرا ڈیگر کی علامت</annotation>
+ <annotation cp="•">بلٹ | نقطہ</annotation>
+ <annotation cp="•" type="tts">بلٹ</annotation>
+ <annotation cp="°">پروف | ڈگری | گھنٹہ</annotation>
+ <annotation cp="°" type="tts">ڈگری</annotation>
+ <annotation cp="℗">آواز | آواز ریکارڈنگ کی کاپی رائٹ | ریکارڈنگ | کاپی رائٹ</annotation>
+ <annotation cp="℗" type="tts">آواز ریکارڈنگ کی کاپی رائٹ</annotation>
+ <annotation cp="←">بائيں | بائيں طرف اشارہ کرنے والا تیر | تیر</annotation>
+ <annotation cp="←" type="tts">بائيں طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="→">تیر | دائیں طرف اشارہ کرنے والا تیر | دایاں</annotation>
+ <annotation cp="→" type="tts">دائیں طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="↑">اوپر | اوپر کی طرف اشارہ کرنے والا تیر | تیر</annotation>
+ <annotation cp="↑" type="tts">اوپر کی طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="↓">تیر | نیچے | نیچے کی طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="↓" type="tts">نیچے کی طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="⇅">اوپر | اوپر اور نیچے کی طرف اشارہ کرنے والا تیر | تیر | نیچے</annotation>
+ <annotation cp="⇅" type="tts">اوپر اور نیچے کی طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="⇆">بائيں | تیر | دائيں | دائیں اور بائيں طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="⇆" type="tts">دائیں اور بائيں طرف اشارہ کرنے والا تیر</annotation>
+ <annotation cp="∆">اضافہ | بڑھوتری | مثلث</annotation>
+ <annotation cp="∆" type="tts">اضافہ</annotation>
+ <annotation cp="∇">مثلث | نابلہ</annotation>
+ <annotation cp="∇" type="tts">نابلہ</annotation>
+ <annotation cp="∈">حامل | رکنیت | سیٹ | عنصر | کا عنصر</annotation>
+ <annotation cp="∈" type="tts">کا عنصر</annotation>
+ <annotation cp="÷">تقسیم | تقسیم کرنا | علامت تحریف | علامت تقسیم</annotation>
+ <annotation cp="÷" type="tts">علامت تقسیم</annotation>
+ <annotation cp="×">ضرب | ضرب دینا | علامت ضرب | مرتبہ</annotation>
+ <annotation cp="×" type="tts">علامت ضرب</annotation>
+ <annotation cp="⁻">سپر اسکرپٹ | سپر اسکرپٹ مائنس | مائنس</annotation>
+ <annotation cp="⁻" type="tts">سپر اسکرپٹ مائنس</annotation>
+ <annotation cp="√">بنیاد | بنیادی | جذرالمربع | مختفی | مربع | منبع</annotation>
+ <annotation cp="√" type="tts">جذرالمربع</annotation>
+ <annotation cp="∞">لا متناہی | لا متناہی علامت</annotation>
+ <annotation cp="∞" type="tts">لا متناہی علامت</annotation>
+ <annotation cp="∩">تقاطع | سیٹ</annotation>
+ <annotation cp="∩" type="tts">تقاطع</annotation>
+ <annotation cp="∪">سیٹ | مجموعہ | یونین</annotation>
+ <annotation cp="∪" type="tts">یونین</annotation>
+ <annotation cp="≡">تہرا | مماثل | مماثل ہے | ہو بہو</annotation>
+ <annotation cp="≡" type="tts">مماثل ہے</annotation>
+ <annotation cp="⊂">ذیلی سیٹ | سیٹ | کا ذیلی سیٹ</annotation>
+ <annotation cp="⊂" type="tts">کا ذیلی سیٹ</annotation>
+ <annotation cp="▲">اوپر | اوپر کی طرف اشارہ کرتا ہوا بھرا ہوا مثلث | بھرا ہوا | تیر | مثلث</annotation>
+ <annotation cp="▲" type="tts">اوپر کی طرف اشارہ کرتا ہوا بھرا ہوا مثلث</annotation>
+ <annotation cp="▼">بھرا ہوا | تیر | مثلث | نیچے | نیچے کی طرف اشارہ کرتا ہوا بھرا ہوا مثلث</annotation>
+ <annotation cp="▼" type="tts">نیچے کی طرف اشارہ کرتا ہوا بھرا ہوا مثلث</annotation>
+ <annotation cp="◊">ڈائمنڈ | رومبس | شکل معین</annotation>
+ <annotation cp="◊" type="tts">شکل معین</annotation>
+ <annotation cp="○">خالی سرکل | رنگ | سرکل</annotation>
+ <annotation cp="○" type="tts">خالی سرکل</annotation>
+ <annotation cp="●">بھرا ہوا سرکل | سرکل</annotation>
+ <annotation cp="●" type="tts">بھرا ہوا سرکل</annotation>
+ <annotation cp="◯">بڑا خالی سرکل | رنگ | سرکل</annotation>
+ <annotation cp="◯" type="tts">بڑا خالی سرکل</annotation>
<annotation cp="⚧">ہیجڑا | ہیجڑوں کی علامت</annotation>
<annotation cp="⚧" type="tts">ہیجڑوں کی علامت</annotation>
<annotation cp="🤌">انگلیاں | بھینچی ہوئی انگلیاں | تفتیش | طنزیہ | ہاتھ کا اشارہ</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">قوس قزح پرچم</annotation>
<annotation cp="🏴☠">جولی راجر | خزانہ | غارت گری | قزاق | قزاقوں کا جھنڈا</annotation>
<annotation cp="🏴☠" type="tts">قزاقوں کا جھنڈا</annotation>
+ <annotation cp="£">ای جی پی | پاؤنڈ | جی بی پی | کرنسی</annotation>
+ <annotation cp="£" type="tts">پاؤنڈ</annotation>
+ <annotation cp="¥">جے پی وائی | سی این وائی | کرنسی | ین | یوان</annotation>
+ <annotation cp="¥" type="tts">ین</annotation>
+ <annotation cp="€">کرنسی | یور | یورو</annotation>
+ <annotation cp="€" type="tts">یورو</annotation>
+ <annotation cp="₹">بھارتی روبیہ | بھارتی روپیہ | روپیہ | کرنسی</annotation>
+ <annotation cp="₹" type="tts">بھارتی روپیہ</annotation>
+ <annotation cp="₽">روبل | کرنسی</annotation>
+ <annotation cp="₽" type="tts">روبل</annotation>
+ <annotation cp="¹">ایک | سپر اسکرپٹ | سپر اسکرپٹ ایک</annotation>
+ <annotation cp="¹" type="tts">سپر اسکرپٹ ایک</annotation>
+ <annotation cp="²">دو | سپر اسکرپٹ | سپر اسکرپٹ دو | مربع</annotation>
+ <annotation cp="²" type="tts">سپر اسکرپٹ دو</annotation>
+ <annotation cp="³">تین | سپر اسکرپٹ | سپر اسکرپٹ تین | مکعب</annotation>
+ <annotation cp="³" type="tts">سپر اسکرپٹ تین</annotation>
+ <annotation cp="µ">پیمائش | مائکروسائن</annotation>
+ <annotation cp="µ" type="tts">مائکروسائن</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/uz.xml b/common/annotations/uz.xml
index 93c3977..8772fc2 100644
--- a/common/annotations/uz.xml
+++ b/common/annotations/uz.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">5-teri turi</annotation>
<annotation cp="🏿">6-teri turi | emojini o‘zgartirish | teri | tus</annotation>
<annotation cp="🏿" type="tts">6-teri turi</annotation>
+ <annotation cp="–">qisqa tire</annotation>
+ <annotation cp="–" type="tts">qisqa tire</annotation>
+ <annotation cp="—">uzun tire</annotation>
+ <annotation cp="—" type="tts">uzun tire</annotation>
+ <annotation cp="·">chiziqcha | nuqta | o‘rtadagi</annotation>
+ <annotation cp="·" type="tts">o‘rtadagi nuqta</annotation>
+ <annotation cp="«">burchak | chap | chap bosma qo‘shtirnoq | ikkitali burchakli qo‘shtirnoq | kare belgisi | qavs | quote</annotation>
+ <annotation cp="«" type="tts">chap bosma qo‘shtirnoq</annotation>
+ <annotation cp="»">burchak | ikkitali burchakli qo‘shtirnoq | kare belgisi | o‘ng | o‘ng bosma qo‘shtirnoq | qavs | quote</annotation>
+ <annotation cp="»" type="tts">o‘ng bosma qo‘shtirnoq</annotation>
+ <annotation cp="§">bo‘lim | paragraf</annotation>
+ <annotation cp="§" type="tts">bo‘lim</annotation>
+ <annotation cp="†">dagger | dragger belgisi | obelisk | obelus belgisi</annotation>
+ <annotation cp="†" type="tts">dragger belgisi</annotation>
+ <annotation cp="‡">dagger | ikkitali | ikkitali dragger belgisi | obelisk | obelus belgisi</annotation>
+ <annotation cp="‡" type="tts">ikkitali dragger belgisi</annotation>
+ <annotation cp="•">nuqta | tugma</annotation>
+ <annotation cp="•" type="tts">nuqta</annotation>
+ <annotation cp="°">daraja | isbot | soat</annotation>
+ <annotation cp="°" type="tts">daraja</annotation>
+ <annotation cp="℗">mualliflik huquqi | ovozli | ovozli yozuv mualliflik huquqi belgisi | yozuv</annotation>
+ <annotation cp="℗" type="tts">ovozli yozuv mualliflik huquqi belgisi</annotation>
+ <annotation cp="←">chapga | chapga qaragan chiziq | chiziq</annotation>
+ <annotation cp="←" type="tts">chapga qaragan chiziq</annotation>
+ <annotation cp="→">chiziq | o‘ngga | o‘ngga qaragan chiziq</annotation>
+ <annotation cp="→" type="tts">o‘ngga qaragan chiziq</annotation>
+ <annotation cp="↑">chiziq | yuqoriga | yuqoriga qaragan chiziq</annotation>
+ <annotation cp="↑" type="tts">yuqoriga qaragan chiziq</annotation>
+ <annotation cp="↓">chiziq | pastga | pastga qaragan chiziq</annotation>
+ <annotation cp="↓" type="tts">pastga qaragan chiziq</annotation>
+ <annotation cp="⇅">chiziq | pastga | yuqoriga | yuqoriga va pastga qaragan chiziqlar</annotation>
+ <annotation cp="⇅" type="tts">yuqoriga va pastga qaragan chiziqlar</annotation>
+ <annotation cp="⇆">chapga | chiziq | o‘ngga | o‘ngga qaragan chiziq ustidagi chapga qaragan chiziq | o‘ngga qaragan chiziq ustidagi chapga qaragan chiziqlar</annotation>
+ <annotation cp="⇆" type="tts">o‘ngga qaragan chiziq ustidagi chapga qaragan chiziqlar</annotation>
+ <annotation cp="∆">ortish belgisi | uchburchak</annotation>
+ <annotation cp="∆" type="tts">ortish belgisi</annotation>
+ <annotation cp="∇">nabla | uchburchak</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">a’zolik | element | elementi hisoblanadi | tashkil topadi | to‘plam</annotation>
+ <annotation cp="∈" type="tts">element</annotation>
+ <annotation cp="÷">bo‘linish | bo‘lish | bo‘lish belgisi | obelus belgisi</annotation>
+ <annotation cp="÷" type="tts">bo‘lish belgisi</annotation>
+ <annotation cp="×">ko‘paytirish | ko‘paytirish belgisi | marta</annotation>
+ <annotation cp="×" type="tts">ko‘paytirish belgisi</annotation>
+ <annotation cp="⁻">ayirish belgisi | satr ustidagi | satr ustidagi ayirish belgisi</annotation>
+ <annotation cp="⁻" type="tts">satr ustidagi ayirish belgisi</annotation>
+ <annotation cp="√">ildiz | ildiz belgisi | irratsional son | kvadrat | radiks</annotation>
+ <annotation cp="√" type="tts">kvadrat ildiz</annotation>
+ <annotation cp="∞">cheksizlik | cheksizlik belgisi</annotation>
+ <annotation cp="∞" type="tts">cheksizlik belgisi</annotation>
+ <annotation cp="∩">kesishma | to‘plam</annotation>
+ <annotation cp="∩" type="tts">kesishma</annotation>
+ <annotation cp="∪">birlashma | birlashtirish belgisi | kolleksiya | to‘plam</annotation>
+ <annotation cp="∪" type="tts">birlashtirish belgisi</annotation>
+ <annotation cp="≡">aniq | bir xil | bir xillik belgisi | uchta chiziqli</annotation>
+ <annotation cp="≡" type="tts">bir xillik belgisi</annotation>
+ <annotation cp="⊂">ichki toʻplam | toʻplam</annotation>
+ <annotation cp="⊂" type="tts">ichki toʻplam</annotation>
+ <annotation cp="▲">chiziq | ichi boʻyalgan yuqoriga qaragan uchburchak | ichi to‘ldirilgan | ichi to‘ldirilgan yuqoriga qaragan uchburchak | uchburchak | yuqoriga</annotation>
+ <annotation cp="▲" type="tts">ichi boʻyalgan yuqoriga qaragan uchburchak</annotation>
+ <annotation cp="▼">chiziq | ichi to‘ldirilgan | ichi to‘ldirilgan pastga qaragan uchburchak | pastga | uchburchak</annotation>
+ <annotation cp="▼" type="tts">ichi to‘ldirilgan pastga qaragan uchburchak</annotation>
+ <annotation cp="◊">marvarid | romb</annotation>
+ <annotation cp="◊" type="tts">romb</annotation>
+ <annotation cp="○">doira | halqa | ichi bo‘sh doira</annotation>
+ <annotation cp="○" type="tts">ichi bo‘sh doira</annotation>
+ <annotation cp="●">doira | ichi to‘ldirilgan doira</annotation>
+ <annotation cp="●" type="tts">ichi to‘ldirilgan doira</annotation>
+ <annotation cp="◯">doira | halqa | yirik ichi bo‘sh doira</annotation>
+ <annotation cp="◯" type="tts">yirik ichi bo‘sh doira</annotation>
<annotation cp="⚧">transgender | transseksual | transseksuallik belgisi</annotation>
<annotation cp="⚧" type="tts">transseksuallik belgisi</annotation>
<annotation cp="🤌">barmoqlar | chimdilgan | istehzoli | juftlangan | qoʻl ishorasi | soʻroq</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">kamalak bayroq</annotation>
<annotation cp="🏴☠">bayroq | bosh suyagi | dengiz qaroqchilari bayrog‘i | dengiz qaroqchisi | qaroqchi | quvnoq rojer | skelet | suyak</annotation>
<annotation cp="🏴☠" type="tts">dengiz qaroqchilari bayrog‘i</annotation>
+ <annotation cp="£">EGP | funt sterling | GBP | valyuta</annotation>
+ <annotation cp="£" type="tts">funt sterling</annotation>
+ <annotation cp="¥">CNY | JPY | valyuta | yena | yuan</annotation>
+ <annotation cp="¥" type="tts">yena</annotation>
+ <annotation cp="€">EUR | valyuta | yevro | yevro belgisi</annotation>
+ <annotation cp="€" type="tts">yevro belgisi</annotation>
+ <annotation cp="₹">hind rupiysi | rupiy | valyuta</annotation>
+ <annotation cp="₹" type="tts">hind rupiysi</annotation>
+ <annotation cp="₽">rubl | valyuta</annotation>
+ <annotation cp="₽" type="tts">rubl</annotation>
+ <annotation cp="¹">bir soni | satr ustidagi | satr ustidagi bir soni</annotation>
+ <annotation cp="¹" type="tts">satr ustidagi bir soni</annotation>
+ <annotation cp="²">ikki soni | kvadrat belgisi | satr ustida | satr ustidagi ikki soni</annotation>
+ <annotation cp="²" type="tts">satr ustidagi ikki soni</annotation>
+ <annotation cp="³">kub belgisi | satr ustidagi | satr ustidagi uch soni | uch soni</annotation>
+ <annotation cp="³" type="tts">satr ustidagi uch soni</annotation>
+ <annotation cp="µ">mikron ishorasi | o‘lchov birligi</annotation>
+ <annotation cp="µ" type="tts">mikron ishorasi</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/vi.xml b/common/annotations/vi.xml
index 861bdc0..5b8b772 100644
--- a/common/annotations/vi.xml
+++ b/common/annotations/vi.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">màu da tối trung bình</annotation>
<annotation cp="🏿">loại 6 | màu da | màu da tối</annotation>
<annotation cp="🏿" type="tts">màu da tối</annotation>
+ <annotation cp="–">dấu gạch ngắn | dấu gạch ngang | ngắn</annotation>
+ <annotation cp="–" type="tts">dấu gạch ngắn</annotation>
+ <annotation cp="—">dài | dấu gạch dài | dấu gạch ngang</annotation>
+ <annotation cp="—" type="tts">dấu gạch dài</annotation>
+ <annotation cp="·">chấm | dấu chấm giữa | dấu chấm giữa dòng | dấu chấm ở giữa dòng | giữa</annotation>
+ <annotation cp="·" type="tts">dấu chấm giữa dòng</annotation>
+ <annotation cp="«">dấu chữ V | dấu ngoặc đơn | dấu ngoặc góc | dấu ngoặc kép | dấu ngoặc kép trái | dấu sót | trái</annotation>
+ <annotation cp="«" type="tts">dấu ngoặc kép trái</annotation>
+ <annotation cp="»">dấu chữ V | dấu ngoặc đơn | dấu ngoặc góc | dấu ngoặc kép | dấu ngoặc kép phải | dấu sót | phải</annotation>
+ <annotation cp="»" type="tts">dấu ngoặc kép phải</annotation>
+ <annotation cp="§">biểu tượng chương mục | đoạn | mục | phần</annotation>
+ <annotation cp="§" type="tts">mục</annotation>
+ <annotation cp="†">biểu tượng kiếm ngược | dao găm | dấu thập giá | kiếm ngược</annotation>
+ <annotation cp="†" type="tts">biểu tượng kiếm ngược</annotation>
+ <annotation cp="‡">biểu tượng song kiếm | dao găm | dấu thập giá | kiếm ngược | song</annotation>
+ <annotation cp="‡" type="tts">biểu tượng song kiếm</annotation>
+ <annotation cp="•">chấm | dấu đầu câu</annotation>
+ <annotation cp="•" type="tts">dấu đầu câu</annotation>
+ <annotation cp="°">chứng minh | độ | giờ</annotation>
+ <annotation cp="°" type="tts">độ</annotation>
+ <annotation cp="℗">âm thanh | bản quyền | bản quyền ghi âm | ghi</annotation>
+ <annotation cp="℗" type="tts">bản quyền ghi âm</annotation>
+ <annotation cp="←">bên trái | mũi tên | mũi tên hướng trái</annotation>
+ <annotation cp="←" type="tts">mũi tên hướng trái</annotation>
+ <annotation cp="→">bên phải | mũi tên | mũi tên hướng phải</annotation>
+ <annotation cp="→" type="tts">mũi tên hướng phải</annotation>
+ <annotation cp="↑">lên | mũi tên | mũi tên hướng lên</annotation>
+ <annotation cp="↑" type="tts">mũi tên hướng lên</annotation>
+ <annotation cp="↓">mũi tên | mũi tên hướng xuống | xuống</annotation>
+ <annotation cp="↓" type="tts">mũi tên hướng xuống</annotation>
+ <annotation cp="⇅">lên | mũi tên | mũi tên lên/xuống | xuống</annotation>
+ <annotation cp="⇅" type="tts">mũi tên lên/xuống</annotation>
+ <annotation cp="⇆">mũi tên | mũi tên trái/phải | phải | trái</annotation>
+ <annotation cp="⇆" type="tts">mũi tên trái/phải</annotation>
+ <annotation cp="∆">hình tam giác | số gia</annotation>
+ <annotation cp="∆" type="tts">số gia</annotation>
+ <annotation cp="∇">hình tam giác | nabla</annotation>
+ <annotation cp="∇" type="tts">nabla</annotation>
+ <annotation cp="∈">chứa | phần tử | phần tử của | tập hợp | thuộc</annotation>
+ <annotation cp="∈" type="tts">phần tử của</annotation>
+ <annotation cp="÷">biểu tượng dấu chia | chia | dấu chia | phép chia</annotation>
+ <annotation cp="÷" type="tts">biểu tượng dấu chia</annotation>
+ <annotation cp="×">biểu tượng dấu nhân | dấu nhân | lần | nhân | phép nhân</annotation>
+ <annotation cp="×" type="tts">biểu tượng dấu nhân</annotation>
+ <annotation cp="⁻">chỉ số trên | dấu trừ | dấu trừ trên</annotation>
+ <annotation cp="⁻" type="tts">dấu trừ trên</annotation>
+ <annotation cp="√">bậc hai | căn | căn bậc hai | căn số | cơ số | vô tỷ</annotation>
+ <annotation cp="√" type="tts">căn bậc hai</annotation>
+ <annotation cp="∞">biểu tượng vô cực | vô cực</annotation>
+ <annotation cp="∞" type="tts">biểu tượng vô cực</annotation>
+ <annotation cp="∩">giao | tập hợp</annotation>
+ <annotation cp="∩" type="tts">giao</annotation>
+ <annotation cp="∪">hợp | sự tụ tập | tập hợp</annotation>
+ <annotation cp="∪" type="tts">hợp</annotation>
+ <annotation cp="≡">bằng | bằng nhau | dấu bằng | gấp ba | giống</annotation>
+ <annotation cp="≡" type="tts">dấu bằng</annotation>
+ <annotation cp="⊂">tập hợp | tập hợp con | tập hợp con của</annotation>
+ <annotation cp="⊂" type="tts">tập hợp con của</annotation>
+ <annotation cp="▲">kín | lên | mũi tên | tam giác | tam giác hướng lên</annotation>
+ <annotation cp="▲" type="tts">tam giác hướng lên</annotation>
+ <annotation cp="▼">kín | mũi tên | tam giác | tam giác hướng xuống | xuống</annotation>
+ <annotation cp="▼" type="tts">tam giác hướng xuống</annotation>
+ <annotation cp="◊">hình quả trám | hình thoi | kim cương</annotation>
+ <annotation cp="◊" type="tts">hình thoi</annotation>
+ <annotation cp="○">chấm rỗng | hình tròn | vòng tròn</annotation>
+ <annotation cp="○" type="tts">chấm rỗng</annotation>
+ <annotation cp="●">chấm tròn | hình tròn</annotation>
+ <annotation cp="●" type="tts">chấm tròn</annotation>
+ <annotation cp="◯">chấm rỗng lớn | hình tròn | vòng tròn</annotation>
+ <annotation cp="◯" type="tts">chấm rỗng lớn</annotation>
<annotation cp="⚧">biểu tượng chuyển giới | người chuyển giới</annotation>
<annotation cp="⚧" type="tts">biểu tượng chuyển giới</annotation>
<annotation cp="🤌">cử chỉ tay | khum lại | mỉa mai | ngón tay | ngón tay khum lại | thẩm vấn</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">cờ cầu vồng</annotation>
<annotation cp="🏴☠">cờ cướp biển | cướp biển | cướp bóc | hải tặc | Jolly Roger | kho báu</annotation>
<annotation cp="🏴☠" type="tts">cờ cướp biển</annotation>
+ <annotation cp="£">bảng Anh | EGP | GBP | tiền tệ</annotation>
+ <annotation cp="£" type="tts">bảng Anh</annotation>
+ <annotation cp="¥">CNY | JPY | tiền tệ | Yên Nhật | yuan</annotation>
+ <annotation cp="¥" type="tts">Yên Nhật</annotation>
+ <annotation cp="€">EUR | euro | tiền tệ</annotation>
+ <annotation cp="€" type="tts">euro</annotation>
+ <annotation cp="₹">rupee | rupee Ấn Độ | tiền tệ</annotation>
+ <annotation cp="₹" type="tts">rupee Ấn Độ</annotation>
+ <annotation cp="₽">rúp | tiền tệ</annotation>
+ <annotation cp="₽" type="tts">rúp</annotation>
+ <annotation cp="¹">một | mũ</annotation>
+ <annotation cp="¹" type="tts">mũ một</annotation>
+ <annotation cp="²">bình phương | hai | mũ hai | số mũ</annotation>
+ <annotation cp="²" type="tts">mũ hai</annotation>
+ <annotation cp="³">ba | lũy thừa ba | mũ ba | số mũ</annotation>
+ <annotation cp="³" type="tts">mũ ba</annotation>
+ <annotation cp="µ">đo lường | ký hiệu micro</annotation>
+ <annotation cp="µ" type="tts">ký hiệu micro</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/yo.xml b/common/annotations/yo.xml
new file mode 100644
index 0000000..d7ffa47
--- /dev/null
+++ b/common/annotations/yo.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="yo"/>
+ </identity>
+ <annotations>
+ <annotation cp="🥲">↑↑↑</annotation>
+ <annotation cp="🥲" type="tts">↑↑↑</annotation>
+ <annotation cp="🥸">↑↑↑</annotation>
+ <annotation cp="🥸" type="tts">↑↑↑</annotation>
+ <annotation cp="😀">↑↑↑</annotation>
+ <annotation cp="😀" type="tts">↑↑↑</annotation>
+ <annotation cp="😃">↑↑↑</annotation>
+ <annotation cp="😃" type="tts">↑↑↑</annotation>
+ <annotation cp="😄">↑↑↑</annotation>
+ <annotation cp="😄" type="tts">↑↑↑</annotation>
+ <annotation cp="😁">↑↑↑</annotation>
+ <annotation cp="😁" type="tts">↑↑↑</annotation>
+ <annotation cp="😆">↑↑↑</annotation>
+ <annotation cp="😆" type="tts">↑↑↑</annotation>
+ <annotation cp="😅">↑↑↑</annotation>
+ <annotation cp="😅" type="tts">↑↑↑</annotation>
+ <annotation cp="🤣">↑↑↑</annotation>
+ <annotation cp="🤣" type="tts">↑↑↑</annotation>
+ <annotation cp="😂">↑↑↑</annotation>
+ <annotation cp="😂" type="tts">↑↑↑</annotation>
+ <annotation cp="🙂">↑↑↑</annotation>
+ <annotation cp="🙂" type="tts">↑↑↑</annotation>
+ <annotation cp="🙃">↑↑↑</annotation>
+ <annotation cp="🙃" type="tts">↑↑↑</annotation>
+ <annotation cp="😉">↑↑↑</annotation>
+ <annotation cp="😉" type="tts">↑↑↑</annotation>
+ <annotation cp="😊">↑↑↑</annotation>
+ <annotation cp="😊" type="tts">↑↑↑</annotation>
+ <annotation cp="😇">↑↑↑</annotation>
+ <annotation cp="😇" type="tts">↑↑↑</annotation>
+ <annotation cp="🥰">↑↑↑</annotation>
+ <annotation cp="🥰" type="tts">↑↑↑</annotation>
+ <annotation cp="😍">↑↑↑</annotation>
+ <annotation cp="😍" type="tts">↑↑↑</annotation>
+ <annotation cp="🤩">↑↑↑</annotation>
+ <annotation cp="🤩" type="tts">↑↑↑</annotation>
+ <annotation cp="😘">↑↑↑</annotation>
+ <annotation cp="😘" type="tts">↑↑↑</annotation>
+ <annotation cp="😗">↑↑↑</annotation>
+ <annotation cp="😗" type="tts">↑↑↑</annotation>
+ <annotation cp="☺">↑↑↑</annotation>
+ <annotation cp="☺" type="tts">↑↑↑</annotation>
+ <annotation cp="😚">↑↑↑</annotation>
+ <annotation cp="😚" type="tts">↑↑↑</annotation>
+ <annotation cp="😙">↑↑↑</annotation>
+ <annotation cp="😙" type="tts">↑↑↑</annotation>
+ <annotation cp="😋">↑↑↑</annotation>
+ <annotation cp="😋" type="tts">↑↑↑</annotation>
+ <annotation cp="😛">↑↑↑</annotation>
+ <annotation cp="😛" type="tts">↑↑↑</annotation>
+ <annotation cp="😜">↑↑↑</annotation>
+ <annotation cp="😜" type="tts">↑↑↑</annotation>
+ <annotation cp="🤪">↑↑↑</annotation>
+ <annotation cp="🤪" type="tts">↑↑↑</annotation>
+ <annotation cp="😝">↑↑↑</annotation>
+ <annotation cp="😝" type="tts">↑↑↑</annotation>
+ <annotation cp="🤑">↑↑↑</annotation>
+ <annotation cp="🤑" type="tts">↑↑↑</annotation>
+ <annotation cp="🤗">↑↑↑</annotation>
+ <annotation cp="🤗" type="tts">↑↑↑</annotation>
+ <annotation cp="🤭">↑↑↑</annotation>
+ <annotation cp="🤭" type="tts">↑↑↑</annotation>
+ <annotation cp="🤫">↑↑↑</annotation>
+ <annotation cp="🤫" type="tts">↑↑↑</annotation>
+ <annotation cp="🤔">↑↑↑</annotation>
+ <annotation cp="🤔" type="tts">↑↑↑</annotation>
+ <annotation cp="🤐">↑↑↑</annotation>
+ <annotation cp="🤐" type="tts">↑↑↑</annotation>
+ <annotation cp="🤨">↑↑↑</annotation>
+ <annotation cp="🤨" type="tts">↑↑↑</annotation>
+ <annotation cp="😐">↑↑↑</annotation>
+ <annotation cp="😐" type="tts">↑↑↑</annotation>
+ <annotation cp="😑">↑↑↑</annotation>
+ <annotation cp="😑" type="tts">↑↑↑</annotation>
+ <annotation cp="😶">↑↑↑</annotation>
+ <annotation cp="😶" type="tts">↑↑↑</annotation>
+ <annotation cp="😏">↑↑↑</annotation>
+ <annotation cp="😏" type="tts">↑↑↑</annotation>
+ <annotation cp="😒">↑↑↑</annotation>
+ <annotation cp="😒" type="tts">↑↑↑</annotation>
+ <annotation cp="🙄">↑↑↑</annotation>
+ <annotation cp="🙄" type="tts">↑↑↑</annotation>
+ <annotation cp="😬">↑↑↑</annotation>
+ <annotation cp="😬" type="tts">↑↑↑</annotation>
+ <annotation cp="🤥">↑↑↑</annotation>
+ <annotation cp="🤥" type="tts">↑↑↑</annotation>
+ <annotation cp="😌">↑↑↑</annotation>
+ <annotation cp="😌" type="tts">↑↑↑</annotation>
+ <annotation cp="😔">↑↑↑</annotation>
+ <annotation cp="😔" type="tts">↑↑↑</annotation>
+ <annotation cp="😪">↑↑↑</annotation>
+ <annotation cp="😪" type="tts">↑↑↑</annotation>
+ <annotation cp="🤤">↑↑↑</annotation>
+ <annotation cp="🤤" type="tts">↑↑↑</annotation>
+ <annotation cp="😴">↑↑↑</annotation>
+ <annotation cp="😴" type="tts">↑↑↑</annotation>
+ <annotation cp="😷">↑↑↑</annotation>
+ <annotation cp="😷" type="tts">↑↑↑</annotation>
+ <annotation cp="🤒">↑↑↑</annotation>
+ <annotation cp="🤒" type="tts">↑↑↑</annotation>
+ <annotation cp="🤕">↑↑↑</annotation>
+ <annotation cp="🤕" type="tts">↑↑↑</annotation>
+ <annotation cp="🤢">↑↑↑</annotation>
+ <annotation cp="🤢" type="tts">↑↑↑</annotation>
+ <annotation cp="🤮">↑↑↑</annotation>
+ <annotation cp="🤮" type="tts">↑↑↑</annotation>
+ <annotation cp="🤧">↑↑↑</annotation>
+ <annotation cp="🤧" type="tts">↑↑↑</annotation>
+ <annotation cp="🥵">↑↑↑</annotation>
+ <annotation cp="🥵" type="tts">↑↑↑</annotation>
+ <annotation cp="🥶">↑↑↑</annotation>
+ <annotation cp="🥶" type="tts">↑↑↑</annotation>
+ <annotation cp="🥴">↑↑↑</annotation>
+ <annotation cp="🥴" type="tts">↑↑↑</annotation>
+ <annotation cp="😵">↑↑↑</annotation>
+ <annotation cp="😵" type="tts">↑↑↑</annotation>
+ <annotation cp="🤯">↑↑↑</annotation>
+ <annotation cp="🤯" type="tts">↑↑↑</annotation>
+ <annotation cp="🤠">↑↑↑</annotation>
+ <annotation cp="🤠" type="tts">↑↑↑</annotation>
+ <annotation cp="🥳">↑↑↑</annotation>
+ <annotation cp="🥳" type="tts">↑↑↑</annotation>
+ <annotation cp="😎">↑↑↑</annotation>
+ <annotation cp="😎" type="tts">↑↑↑</annotation>
+ <annotation cp="🤓">↑↑↑</annotation>
+ <annotation cp="🤓" type="tts">↑↑↑</annotation>
+ <annotation cp="🧐">↑↑↑</annotation>
+ <annotation cp="🧐" type="tts">↑↑↑</annotation>
+ <annotation cp="😕">↑↑↑</annotation>
+ <annotation cp="😕" type="tts">↑↑↑</annotation>
+ <annotation cp="😟">↑↑↑</annotation>
+ <annotation cp="😟" type="tts">↑↑↑</annotation>
+ <annotation cp="🙁">↑↑↑</annotation>
+ <annotation cp="🙁" type="tts">↑↑↑</annotation>
+ <annotation cp="☹">↑↑↑</annotation>
+ <annotation cp="☹" type="tts">↑↑↑</annotation>
+ <annotation cp="😮">↑↑↑</annotation>
+ <annotation cp="😮" type="tts">↑↑↑</annotation>
+ <annotation cp="😯">↑↑↑</annotation>
+ <annotation cp="😯" type="tts">↑↑↑</annotation>
+ <annotation cp="😲">↑↑↑</annotation>
+ <annotation cp="😲" type="tts">↑↑↑</annotation>
+ <annotation cp="😳">↑↑↑</annotation>
+ <annotation cp="😳" type="tts">↑↑↑</annotation>
+ <annotation cp="🥺">↑↑↑</annotation>
+ <annotation cp="🥺" type="tts">↑↑↑</annotation>
+ <annotation cp="😦">↑↑↑</annotation>
+ <annotation cp="😦" type="tts">↑↑↑</annotation>
+ <annotation cp="😧">↑↑↑</annotation>
+ <annotation cp="😧" type="tts">↑↑↑</annotation>
+ <annotation cp="😨">↑↑↑</annotation>
+ <annotation cp="😨" type="tts">↑↑↑</annotation>
+ <annotation cp="😰">↑↑↑</annotation>
+ <annotation cp="😰" type="tts">↑↑↑</annotation>
+ <annotation cp="😥">↑↑↑</annotation>
+ <annotation cp="😥" type="tts">↑↑↑</annotation>
+ <annotation cp="😢">↑↑↑</annotation>
+ <annotation cp="😢" type="tts">↑↑↑</annotation>
+ <annotation cp="😭">↑↑↑</annotation>
+ <annotation cp="😭" type="tts">↑↑↑</annotation>
+ <annotation cp="😱">↑↑↑</annotation>
+ <annotation cp="😱" type="tts">↑↑↑</annotation>
+ <annotation cp="😖">↑↑↑</annotation>
+ <annotation cp="😖" type="tts">↑↑↑</annotation>
+ <annotation cp="😣">↑↑↑</annotation>
+ <annotation cp="😣" type="tts">↑↑↑</annotation>
+ <annotation cp="😞">↑↑↑</annotation>
+ <annotation cp="😞" type="tts">↑↑↑</annotation>
+ <annotation cp="😓">↑↑↑</annotation>
+ <annotation cp="😓" type="tts">↑↑↑</annotation>
+ <annotation cp="😩">↑↑↑</annotation>
+ <annotation cp="😩" type="tts">↑↑↑</annotation>
+ <annotation cp="😫">↑↑↑</annotation>
+ <annotation cp="😫" type="tts">↑↑↑</annotation>
+ <annotation cp="🥱">↑↑↑</annotation>
+ <annotation cp="🥱" type="tts">↑↑↑</annotation>
+ <annotation cp="😤">↑↑↑</annotation>
+ <annotation cp="😤" type="tts">↑↑↑</annotation>
+ <annotation cp="😡">↑↑↑</annotation>
+ <annotation cp="😡" type="tts">↑↑↑</annotation>
+ <annotation cp="😠">↑↑↑</annotation>
+ <annotation cp="😠" type="tts">↑↑↑</annotation>
+ <annotation cp="🤬">↑↑↑</annotation>
+ <annotation cp="🤬" type="tts">↑↑↑</annotation>
+ <annotation cp="😈">↑↑↑</annotation>
+ <annotation cp="😈" type="tts">↑↑↑</annotation>
+ <annotation cp="👿">↑↑↑</annotation>
+ <annotation cp="👿" type="tts">↑↑↑</annotation>
+ <annotation cp="💀">↑↑↑</annotation>
+ <annotation cp="💀" type="tts">↑↑↑</annotation>
+ <annotation cp="☠">↑↑↑</annotation>
+ <annotation cp="☠" type="tts">↑↑↑</annotation>
+ <annotation cp="💩">↑↑↑</annotation>
+ <annotation cp="💩" type="tts">↑↑↑</annotation>
+ <annotation cp="🤡">↑↑↑</annotation>
+ <annotation cp="🤡" type="tts">↑↑↑</annotation>
+ <annotation cp="👹">↑↑↑</annotation>
+ <annotation cp="👹" type="tts">↑↑↑</annotation>
+ <annotation cp="👺">↑↑↑</annotation>
+ <annotation cp="👺" type="tts">↑↑↑</annotation>
+ <annotation cp="👻">↑↑↑</annotation>
+ <annotation cp="👻" type="tts">↑↑↑</annotation>
+ <annotation cp="👽">↑↑↑</annotation>
+ <annotation cp="👽" type="tts">↑↑↑</annotation>
+ <annotation cp="👾">↑↑↑</annotation>
+ <annotation cp="👾" type="tts">↑↑↑</annotation>
+ <annotation cp="🤖">↑↑↑</annotation>
+ <annotation cp="🤖" type="tts">↑↑↑</annotation>
+ <annotation cp="😺">↑↑↑</annotation>
+ <annotation cp="😺" type="tts">↑↑↑</annotation>
+ <annotation cp="😸">↑↑↑</annotation>
+ <annotation cp="😸" type="tts">↑↑↑</annotation>
+ <annotation cp="😹">↑↑↑</annotation>
+ <annotation cp="😹" type="tts">↑↑↑</annotation>
+ <annotation cp="😻">↑↑↑</annotation>
+ <annotation cp="😻" type="tts">↑↑↑</annotation>
+ <annotation cp="😼">↑↑↑</annotation>
+ <annotation cp="😼" type="tts">↑↑↑</annotation>
+ <annotation cp="😽">↑↑↑</annotation>
+ <annotation cp="😽" type="tts">↑↑↑</annotation>
+ <annotation cp="🙀">↑↑↑</annotation>
+ <annotation cp="🙀" type="tts">↑↑↑</annotation>
+ <annotation cp="😿">↑↑↑</annotation>
+ <annotation cp="😿" type="tts">↑↑↑</annotation>
+ <annotation cp="😾">↑↑↑</annotation>
+ <annotation cp="😾" type="tts">↑↑↑</annotation>
+ <annotation cp="🙈">↑↑↑</annotation>
+ <annotation cp="🙈" type="tts">↑↑↑</annotation>
+ <annotation cp="🙉">↑↑↑</annotation>
+ <annotation cp="🙉" type="tts">↑↑↑</annotation>
+ <annotation cp="🙊">↑↑↑</annotation>
+ <annotation cp="🙊" type="tts">↑↑↑</annotation>
+ <annotation cp="💋">↑↑↑</annotation>
+ <annotation cp="💋" type="tts">↑↑↑</annotation>
+ <annotation cp="💌">↑↑↑</annotation>
+ <annotation cp="💌" type="tts">↑↑↑</annotation>
+ <annotation cp="💘">↑↑↑</annotation>
+ <annotation cp="💘" type="tts">↑↑↑</annotation>
+ <annotation cp="💝">↑↑↑</annotation>
+ <annotation cp="💝" type="tts">↑↑↑</annotation>
+ <annotation cp="💖">↑↑↑</annotation>
+ <annotation cp="💖" type="tts">↑↑↑</annotation>
+ <annotation cp="💗">↑↑↑</annotation>
+ <annotation cp="💗" type="tts">↑↑↑</annotation>
+ <annotation cp="💓">↑↑↑</annotation>
+ <annotation cp="💓" type="tts">↑↑↑</annotation>
+ <annotation cp="💞">↑↑↑</annotation>
+ <annotation cp="💞" type="tts">↑↑↑</annotation>
+ <annotation cp="💕">↑↑↑</annotation>
+ <annotation cp="💕" type="tts">↑↑↑</annotation>
+ <annotation cp="💟">↑↑↑</annotation>
+ <annotation cp="💟" type="tts">↑↑↑</annotation>
+ <annotation cp="❣">↑↑↑</annotation>
+ <annotation cp="❣" type="tts">↑↑↑</annotation>
+ <annotation cp="💔">↑↑↑</annotation>
+ <annotation cp="💔" type="tts">↑↑↑</annotation>
+ <annotation cp="❤">↑↑↑</annotation>
+ <annotation cp="❤" type="tts">↑↑↑</annotation>
+ <annotation cp="🧡">↑↑↑</annotation>
+ <annotation cp="🧡" type="tts">↑↑↑</annotation>
+ <annotation cp="💛">↑↑↑</annotation>
+ <annotation cp="💛" type="tts">↑↑↑</annotation>
+ <annotation cp="💚">↑↑↑</annotation>
+ <annotation cp="💚" type="tts">↑↑↑</annotation>
+ <annotation cp="💙">↑↑↑</annotation>
+ <annotation cp="💙" type="tts">↑↑↑</annotation>
+ <annotation cp="💜">↑↑↑</annotation>
+ <annotation cp="💜" type="tts">↑↑↑</annotation>
+ <annotation cp="🤎">↑↑↑</annotation>
+ <annotation cp="🤎" type="tts">↑↑↑</annotation>
+ <annotation cp="🖤">↑↑↑</annotation>
+ <annotation cp="🖤" type="tts">↑↑↑</annotation>
+ <annotation cp="🤍">↑↑↑</annotation>
+ <annotation cp="🤍" type="tts">↑↑↑</annotation>
+ <annotation cp="💯">↑↑↑</annotation>
+ <annotation cp="💯" type="tts">↑↑↑</annotation>
+ <annotation cp="💢">↑↑↑</annotation>
+ <annotation cp="💢" type="tts">↑↑↑</annotation>
+ <annotation cp="💥">↑↑↑</annotation>
+ <annotation cp="💥" type="tts">↑↑↑</annotation>
+ <annotation cp="💫">↑↑↑</annotation>
+ <annotation cp="💫" type="tts">↑↑↑</annotation>
+ <annotation cp="💦">↑↑↑</annotation>
+ <annotation cp="💦" type="tts">↑↑↑</annotation>
+ <annotation cp="💨">↑↑↑</annotation>
+ <annotation cp="💨" type="tts">↑↑↑</annotation>
+ <annotation cp="🕳">↑↑↑</annotation>
+ <annotation cp="🕳" type="tts">↑↑↑</annotation>
+ <annotation cp="💣">↑↑↑</annotation>
+ <annotation cp="💣" type="tts">↑↑↑</annotation>
+ <annotation cp="💬">↑↑↑</annotation>
+ <annotation cp="💬" type="tts">↑↑↑</annotation>
+ <annotation cp="👁🗨">↑↑↑</annotation>
+ <annotation cp="👁🗨" type="tts">↑↑↑</annotation>
+ <annotation cp="🗨">↑↑↑</annotation>
+ <annotation cp="🗨" type="tts">↑↑↑</annotation>
+ <annotation cp="🗯">↑↑↑</annotation>
+ <annotation cp="🗯" type="tts">↑↑↑</annotation>
+ <annotation cp="💭">↑↑↑</annotation>
+ <annotation cp="💭" type="tts">↑↑↑</annotation>
+ <annotation cp="💤">↑↑↑</annotation>
+ <annotation cp="💤" type="tts">↑↑↑</annotation>
+ </annotations>
+</ldml>
diff --git a/common/annotations/yue.xml b/common/annotations/yue.xml
index ddc076f..60c096a 100644
--- a/common/annotations/yue.xml
+++ b/common/annotations/yue.xml
@@ -21,6 +21,76 @@
<annotation cp="🏾" type="tts">中深膚色</annotation>
<annotation cp="🏿">深膚色 | 膚色 | 類型 6</annotation>
<annotation cp="🏿" type="tts">深膚色</annotation>
+ <annotation cp="–">破折號</annotation>
+ <annotation cp="–" type="tts">破折號</annotation>
+ <annotation cp="—">長破折號</annotation>
+ <annotation cp="—" type="tts">長破折號</annotation>
+ <annotation cp="·">中間 | 中點 | 間隔號 | 點</annotation>
+ <annotation cp="·" type="tts">中點</annotation>
+ <annotation cp="«">人字形 | 向左 | 左雙書名號 | 引用 | 括號 | 脫字符 | 角</annotation>
+ <annotation cp="«" type="tts">左雙書名號</annotation>
+ <annotation cp="»">人字形 | 右雙書名號 | 向右 | 引用 | 括號 | 脫字符 | 角</annotation>
+ <annotation cp="»" type="tts">右雙書名號</annotation>
+ <annotation cp="§">分節 | 分節符號 | 段落 | 部分</annotation>
+ <annotation cp="§" type="tts">部分</annotation>
+ <annotation cp="†">劍標 | 短劍號</annotation>
+ <annotation cp="†" type="tts">劍標</annotation>
+ <annotation cp="‡">劍標 | 短劍號 | 雙劍標 | 雙重</annotation>
+ <annotation cp="‡" type="tts">雙劍標</annotation>
+ <annotation cp="•">要點 | 點</annotation>
+ <annotation cp="•" type="tts">要點</annotation>
+ <annotation cp="°">小時 | 度 | 證明</annotation>
+ <annotation cp="°" type="tts">度</annotation>
+ <annotation cp="℗">版權 | 聲音 | 錄音 | 錄音版權</annotation>
+ <annotation cp="℗" type="tts">錄音版權</annotation>
+ <annotation cp="←">向左 | 向左箭咀 | 指向左嘅箭咀 | 箭咀</annotation>
+ <annotation cp="←" type="tts">指向左嘅箭咀</annotation>
+ <annotation cp="→">向右 | 向右箭咀 | 指向右嘅箭咀 | 箭咀</annotation>
+ <annotation cp="→" type="tts">指向右嘅箭咀</annotation>
+ <annotation cp="↑">向上 | 向上箭咀 | 指向上嘅箭咀 | 箭咀</annotation>
+ <annotation cp="↑" type="tts">指向上嘅箭咀</annotation>
+ <annotation cp="↓">向下 | 向下箭咀 | 指向下嘅箭咀 | 箭咀</annotation>
+ <annotation cp="↓" type="tts">指向下嘅箭咀</annotation>
+ <annotation cp="⇅">向上 | 向上向下箭咀 | 向下 | 向左箭咀在向右箭咀上面 | 箭咀</annotation>
+ <annotation cp="⇅" type="tts">向左箭咀在向右箭咀上面</annotation>
+ <annotation cp="⇆">向右 | 向左 | 向左箭咀喺向右箭咀上面 | 箭咀</annotation>
+ <annotation cp="⇆" type="tts">向左箭咀喺向右箭咀上面</annotation>
+ <annotation cp="∆">三角形 | 遞增</annotation>
+ <annotation cp="∆" type="tts">遞增</annotation>
+ <annotation cp="∇">三角 | 拉普拉斯算子</annotation>
+ <annotation cp="∇" type="tts">拉普拉斯算子</annotation>
+ <annotation cp="∈">元素 | 包含 | 成員 | 集</annotation>
+ <annotation cp="∈" type="tts">元素</annotation>
+ <annotation cp="÷">除 | 除法 | 除號</annotation>
+ <annotation cp="÷" type="tts">除號</annotation>
+ <annotation cp="×">乘 | 乘數 | 乘法 | 乘號</annotation>
+ <annotation cp="×" type="tts">乘號</annotation>
+ <annotation cp="⁻">上標 | 上標減號 | 減號</annotation>
+ <annotation cp="⁻" type="tts">上標減號</annotation>
+ <annotation cp="√">基數 | 平方 | 平方根 | 平方符號 | 根</annotation>
+ <annotation cp="√" type="tts">平方根</annotation>
+ <annotation cp="∞">無限 | 無限符號</annotation>
+ <annotation cp="∞" type="tts">無限符號</annotation>
+ <annotation cp="∩">交集 | 集</annotation>
+ <annotation cp="∩" type="tts">交集</annotation>
+ <annotation cp="∪">合集 | 收集 | 集</annotation>
+ <annotation cp="∪" type="tts">合集</annotation>
+ <annotation cp="≡">三倍 | 完全 | 完全相同 | 相同</annotation>
+ <annotation cp="≡" type="tts">完全相同</annotation>
+ <annotation cp="⊂">子集 | 集</annotation>
+ <annotation cp="⊂" type="tts">子集</annotation>
+ <annotation cp="▲">三角形 | 向上 | 實心 | 實心向上三角形 | 箭咀</annotation>
+ <annotation cp="▲" type="tts">實心向上三角形</annotation>
+ <annotation cp="▼">三角形 | 向下 | 實心 | 實心向下三角形 | 箭咀</annotation>
+ <annotation cp="▼" type="tts">實心向下三角形</annotation>
+ <annotation cp="◊">菱形 | 鑽石</annotation>
+ <annotation cp="◊" type="tts">菱形</annotation>
+ <annotation cp="○">圓形 | 環形 | 空心圓形</annotation>
+ <annotation cp="○" type="tts">空心圓形</annotation>
+ <annotation cp="●">圓形 | 實心圓形</annotation>
+ <annotation cp="●" type="tts">實心圓形</annotation>
+ <annotation cp="◯">圓形 | 大空心圓形 | 環形</annotation>
+ <annotation cp="◯" type="tts">大空心圓形</annotation>
<annotation cp="⚧">跨性别人士 | 跨性别人士符號</annotation>
<annotation cp="⚧" type="tts">跨性别人士符號</annotation>
<annotation cp="🤌">卒 | 卒手指 | 嘲笑 | 手勢 | 手指 | 質問</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">彩虹旗</annotation>
<annotation cp="🏴☠">寶藏 | 搶 | 海盜 | 海盜旗</annotation>
<annotation cp="🏴☠" type="tts">海盜旗</annotation>
+ <annotation cp="£">埃及鎊 | 英鎊 | 貨幣 | 鎊</annotation>
+ <annotation cp="£" type="tts">英鎊</annotation>
+ <annotation cp="¥">人民幣 | 日圓 | 貨幣</annotation>
+ <annotation cp="¥" type="tts">日圓</annotation>
+ <annotation cp="€">歐元 | 歐羅 | 貨幣</annotation>
+ <annotation cp="€" type="tts">歐羅</annotation>
+ <annotation cp="₹">印度盧比 | 盧比 | 貨幣</annotation>
+ <annotation cp="₹" type="tts">印度盧比</annotation>
+ <annotation cp="₽">盧布 | 貨幣</annotation>
+ <annotation cp="₽" type="tts">盧布</annotation>
+ <annotation cp="¹">一 | 上標 | 上標一</annotation>
+ <annotation cp="¹" type="tts">上標一</annotation>
+ <annotation cp="²">上標 | 上標二 | 二 | 二次方</annotation>
+ <annotation cp="²" type="tts">上標二</annotation>
+ <annotation cp="³">三 | 三次方 | 上標 | 上標三</annotation>
+ <annotation cp="³" type="tts">上標三</annotation>
+ <annotation cp="µ">微單位標誌 | 量度</annotation>
+ <annotation cp="µ" type="tts">微單位標誌</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/yue_Hans.xml b/common/annotations/yue_Hans.xml
index 4343121..01e9122 100644
--- a/common/annotations/yue_Hans.xml
+++ b/common/annotations/yue_Hans.xml
@@ -22,6 +22,76 @@
<annotation cp="🏾" type="tts">中深肤色</annotation>
<annotation cp="🏿">深肤色 | 类型 6 | 肤色</annotation>
<annotation cp="🏿" type="tts">深肤色</annotation>
+ <annotation cp="–">破折号</annotation>
+ <annotation cp="–" type="tts">破折号</annotation>
+ <annotation cp="—">长破折号</annotation>
+ <annotation cp="—" type="tts">长破折号</annotation>
+ <annotation cp="·">中点 | 中间 | 点 | 间隔号</annotation>
+ <annotation cp="·" type="tts">中点</annotation>
+ <annotation cp="«">人字形 | 向左 | 左双书名号 | 引用 | 括号 | 脱字符 | 角</annotation>
+ <annotation cp="«" type="tts">左双书名号</annotation>
+ <annotation cp="»">人字形 | 右双书名号 | 向右 | 引用 | 括号 | 脱字符 | 角</annotation>
+ <annotation cp="»" type="tts">右双书名号</annotation>
+ <annotation cp="§">分节 | 分节符号 | 段落 | 部分</annotation>
+ <annotation cp="§" type="tts">部分</annotation>
+ <annotation cp="†">剑标 | 短剑号</annotation>
+ <annotation cp="†" type="tts">剑标</annotation>
+ <annotation cp="‡">剑标 | 双剑标 | 双重 | 短剑号</annotation>
+ <annotation cp="‡" type="tts">双剑标</annotation>
+ <annotation cp="•">点 | 要点</annotation>
+ <annotation cp="•" type="tts">要点</annotation>
+ <annotation cp="°">小时 | 度 | 证明</annotation>
+ <annotation cp="°" type="tts">度</annotation>
+ <annotation cp="℗">声音 | 录音 | 录音版权 | 版权</annotation>
+ <annotation cp="℗" type="tts">录音版权</annotation>
+ <annotation cp="←">向左 | 向左箭咀 | 指向左嘅箭咀 | 箭咀</annotation>
+ <annotation cp="←" type="tts">指向左嘅箭咀</annotation>
+ <annotation cp="→">向右 | 向右箭咀 | 指向右嘅箭咀 | 箭咀</annotation>
+ <annotation cp="→" type="tts">指向右嘅箭咀</annotation>
+ <annotation cp="↑">向上 | 向上箭咀 | 指向上嘅箭咀 | 箭咀</annotation>
+ <annotation cp="↑" type="tts">指向上嘅箭咀</annotation>
+ <annotation cp="↓">向下 | 向下箭咀 | 指向下嘅箭咀 | 箭咀</annotation>
+ <annotation cp="↓" type="tts">指向下嘅箭咀</annotation>
+ <annotation cp="⇅">向上 | 向上向下箭咀 | 向下 | 向左箭咀在向右箭咀上面 | 箭咀</annotation>
+ <annotation cp="⇅" type="tts">向左箭咀在向右箭咀上面</annotation>
+ <annotation cp="⇆">向右 | 向左 | 向左箭咀喺向右箭咀上面 | 箭咀</annotation>
+ <annotation cp="⇆" type="tts">向左箭咀喺向右箭咀上面</annotation>
+ <annotation cp="∆">三角形 | 递增</annotation>
+ <annotation cp="∆" type="tts">递增</annotation>
+ <annotation cp="∇">三角 | 拉普拉斯算子</annotation>
+ <annotation cp="∇" type="tts">拉普拉斯算子</annotation>
+ <annotation cp="∈">元素 | 包含 | 成员 | 集</annotation>
+ <annotation cp="∈" type="tts">元素</annotation>
+ <annotation cp="÷">除 | 除号 | 除法</annotation>
+ <annotation cp="÷" type="tts">除号</annotation>
+ <annotation cp="×">乘 | 乘号 | 乘数 | 乘法</annotation>
+ <annotation cp="×" type="tts">乘号</annotation>
+ <annotation cp="⁻">上标 | 上标减号 | 减号</annotation>
+ <annotation cp="⁻" type="tts">上标减号</annotation>
+ <annotation cp="√">基数 | 平方 | 平方根 | 平方符号 | 根</annotation>
+ <annotation cp="√" type="tts">平方根</annotation>
+ <annotation cp="∞">无限 | 无限符号</annotation>
+ <annotation cp="∞" type="tts">无限符号</annotation>
+ <annotation cp="∩">交集 | 集</annotation>
+ <annotation cp="∩" type="tts">交集</annotation>
+ <annotation cp="∪">合集 | 收集 | 集</annotation>
+ <annotation cp="∪" type="tts">合集</annotation>
+ <annotation cp="≡">三倍 | 完全 | 完全相同 | 相同</annotation>
+ <annotation cp="≡" type="tts">完全相同</annotation>
+ <annotation cp="⊂">子集 | 集</annotation>
+ <annotation cp="⊂" type="tts">子集</annotation>
+ <annotation cp="▲">三角形 | 向上 | 实心 | 实心向上三角形 | 箭咀</annotation>
+ <annotation cp="▲" type="tts">实心向上三角形</annotation>
+ <annotation cp="▼">三角形 | 向下 | 实心 | 实心向下三角形 | 箭咀</annotation>
+ <annotation cp="▼" type="tts">实心向下三角形</annotation>
+ <annotation cp="◊">菱形 | 钻石</annotation>
+ <annotation cp="◊" type="tts">菱形</annotation>
+ <annotation cp="○">圆形 | 环形 | 空心圆形</annotation>
+ <annotation cp="○" type="tts">空心圆形</annotation>
+ <annotation cp="●">圆形 | 实心圆形</annotation>
+ <annotation cp="●" type="tts">实心圆形</annotation>
+ <annotation cp="◯">圆形 | 大空心圆形 | 环形</annotation>
+ <annotation cp="◯" type="tts">大空心圆形</annotation>
<annotation cp="⚧">跨性别人士 | 跨性别人士符号</annotation>
<annotation cp="⚧" type="tts">跨性别人士符号</annotation>
<annotation cp="🤌">卒 | 卒手指 | 嘲笑 | 手势 | 手指 | 质问</annotation>
@@ -3005,5 +3075,23 @@
<annotation cp="🏳🌈" type="tts">彩虹旗</annotation>
<annotation cp="🏴☠">宝藏 | 抢 | 海盗 | 海盗旗</annotation>
<annotation cp="🏴☠" type="tts">海盗旗</annotation>
+ <annotation cp="£">埃及镑 | 英镑 | 货币 | 镑</annotation>
+ <annotation cp="£" type="tts">英镑</annotation>
+ <annotation cp="¥">人民币 | 日圆 | 货币</annotation>
+ <annotation cp="¥" type="tts">日圆</annotation>
+ <annotation cp="€">欧元 | 欧罗 | 货币</annotation>
+ <annotation cp="€" type="tts">欧罗</annotation>
+ <annotation cp="₹">卢比 | 印度卢比 | 货币</annotation>
+ <annotation cp="₹" type="tts">印度卢比</annotation>
+ <annotation cp="₽">卢布 | 货币</annotation>
+ <annotation cp="₽" type="tts">卢布</annotation>
+ <annotation cp="¹">一 | 上标 | 上标一</annotation>
+ <annotation cp="¹" type="tts">上标一</annotation>
+ <annotation cp="²">上标 | 上标二 | 二 | 二次方</annotation>
+ <annotation cp="²" type="tts">上标二</annotation>
+ <annotation cp="³">三 | 三次方 | 上标 | 上标三</annotation>
+ <annotation cp="³" type="tts">上标三</annotation>
+ <annotation cp="µ">微单位标志 | 量度</annotation>
+ <annotation cp="µ" type="tts">微单位标志</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/zh.xml b/common/annotations/zh.xml
index be6ff1d..0926a8c 100644
--- a/common/annotations/zh.xml
+++ b/common/annotations/zh.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">中等-深肤色</annotation>
<annotation cp="🏿">肤色 | 较深肤色</annotation>
<annotation cp="🏿" type="tts">较深肤色</annotation>
+ <annotation cp="–">横线 | 短划线 | 连接号</annotation>
+ <annotation cp="–" type="tts">连接号</annotation>
+ <annotation cp="—">横线 | 破折号 | 长划线</annotation>
+ <annotation cp="—" type="tts">破折号</annotation>
+ <annotation cp="·">中点 | 中间 | 中间名 | 点 | 间隔号</annotation>
+ <annotation cp="·" type="tts">间隔号</annotation>
+ <annotation cp="«">尾巴 | 左 | 左燕尾号 | 引用 | 方框 | 燕子 | 角</annotation>
+ <annotation cp="«" type="tts">左燕尾号</annotation>
+ <annotation cp="»">右 | 右燕尾号 | 尾巴 | 引用 | 方框 | 燕子 | 角</annotation>
+ <annotation cp="»" type="tts">右燕尾号</annotation>
+ <annotation cp="§">双S | 段落 | 部分 | 章节 | 章节符号</annotation>
+ <annotation cp="§" type="tts">章节符号</annotation>
+ <annotation cp="†">剑 | 剑号 | 十字架</annotation>
+ <annotation cp="†" type="tts">剑号</annotation>
+ <annotation cp="‡">剑 | 剑号 | 双 | 双剑号 | 篱笆</annotation>
+ <annotation cp="‡" type="tts">双剑号</annotation>
+ <annotation cp="•">圆点 | 项目符号</annotation>
+ <annotation cp="•" type="tts">项目符号</annotation>
+ <annotation cp="°">度 | 度数 | 时角 | 标准酒精度</annotation>
+ <annotation cp="°" type="tts">度</annotation>
+ <annotation cp="℗">录音 | 录音版权 | 版权 | 音频</annotation>
+ <annotation cp="℗" type="tts">录音版权</annotation>
+ <annotation cp="←">向左的箭头 | 左 | 箭头</annotation>
+ <annotation cp="←" type="tts">向左的箭头</annotation>
+ <annotation cp="→">右 | 向右的箭头 | 箭头</annotation>
+ <annotation cp="→" type="tts">向右的箭头</annotation>
+ <annotation cp="↑">上 | 向上的箭头 | 箭头</annotation>
+ <annotation cp="↑" type="tts">向上的箭头</annotation>
+ <annotation cp="↓">下 | 向下的箭头 | 箭头</annotation>
+ <annotation cp="↓" type="tts">向下的箭头</annotation>
+ <annotation cp="⇅">上 | 下 | 左上右下两个箭头 | 箭头</annotation>
+ <annotation cp="⇅" type="tts">左上右下两个箭头</annotation>
+ <annotation cp="⇆">上左下右两个箭头 | 右 | 左 | 箭头</annotation>
+ <annotation cp="⇆" type="tts">上左下右两个箭头</annotation>
+ <annotation cp="∆">三角 | 增量</annotation>
+ <annotation cp="∆" type="tts">增量</annotation>
+ <annotation cp="∇">倒三角 | 向量微分</annotation>
+ <annotation cp="∇" type="tts">向量微分</annotation>
+ <annotation cp="∈">元素 | 包含 | 成员 | 是...的元素 | 集合</annotation>
+ <annotation cp="∈" type="tts">是...的元素</annotation>
+ <annotation cp="÷">商数 | 除以 | 除号 | 除商 | 除法</annotation>
+ <annotation cp="÷" type="tts">除号</annotation>
+ <annotation cp="×">乘以 | 乘号 | 乘法 | 乘积 | 积数</annotation>
+ <annotation cp="×" type="tts">乘号</annotation>
+ <annotation cp="⁻">上标 | 上标减号 | 减号</annotation>
+ <annotation cp="⁻" type="tts">上标减号</annotation>
+ <annotation cp="√">不尽根 | 平方根 | 开平方 | 开根 | 根号</annotation>
+ <annotation cp="√" type="tts">平方根</annotation>
+ <annotation cp="∞">无穷大 | 无穷大符号</annotation>
+ <annotation cp="∞" type="tts">无穷大符号</annotation>
+ <annotation cp="∩">交集 | 集 | 集合</annotation>
+ <annotation cp="∩" type="tts">交集</annotation>
+ <annotation cp="∪">并集 | 集 | 集合</annotation>
+ <annotation cp="∪" type="tts">并集</annotation>
+ <annotation cp="≡">三线 | 相同 | 等于 | 等同 | 等同于</annotation>
+ <annotation cp="≡" type="tts">等同于</annotation>
+ <annotation cp="⊂">子集 | 是...的子集 | 集合</annotation>
+ <annotation cp="⊂" type="tts">是...的子集</annotation>
+ <annotation cp="▲">三角 | 上 | 填充 | 实心 | 实心向上三角 | 实心向上箭头 | 箭头</annotation>
+ <annotation cp="▲" type="tts">实心向上三角</annotation>
+ <annotation cp="▼">三角 | 下 | 填充 | 实心 | 实心向下三角 | 实心向下箭头 | 箭头</annotation>
+ <annotation cp="▼" type="tts">实心向下三角</annotation>
+ <annotation cp="◊">扑克 | 方块 | 菱形 | 钻石</annotation>
+ <annotation cp="◊" type="tts">菱形</annotation>
+ <annotation cp="○">圆 | 环形 | 空心圆</annotation>
+ <annotation cp="○" type="tts">空心圆</annotation>
+ <annotation cp="●">圆 | 实心圆</annotation>
+ <annotation cp="●" type="tts">实心圆</annotation>
+ <annotation cp="◯">圆 | 大空心圆 | 环形</annotation>
+ <annotation cp="◯" type="tts">大空心圆</annotation>
<annotation cp="⚧">跨性别 | 跨性别符号</annotation>
<annotation cp="⚧" type="tts">跨性别符号</annotation>
<annotation cp="🤌">匮乏 | 审讯 | 手势 | 手指 | 挖苦 | 捏手指</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">彩虹旗</annotation>
<annotation cp="🏴☠">掠夺 | 海上 | 海盗旗 | 财宝 | 骷髅</annotation>
<annotation cp="🏴☠" type="tts">海盗旗</annotation>
+ <annotation cp="£">英镑 | 英镑符号 | 货币 | 镑</annotation>
+ <annotation cp="£" type="tts">英镑符号</annotation>
+ <annotation cp="¥">中国 | 人民币 | 元 | 元符号 | 日元 | 日本 | 货币</annotation>
+ <annotation cp="¥" type="tts">元符号</annotation>
+ <annotation cp="€">欧元 | 欧元区 | 欧元符号 | 欧洲 | 货币</annotation>
+ <annotation cp="€" type="tts">欧元符号</annotation>
+ <annotation cp="₹">卢比 | 印度卢比 | 印度卢比符号 | 货币</annotation>
+ <annotation cp="₹" type="tts">印度卢比符号</annotation>
+ <annotation cp="₽">俄罗斯 | 俄罗斯卢布 | 卢布 | 卢布符号 | 货币</annotation>
+ <annotation cp="₽" type="tts">卢布符号</annotation>
+ <annotation cp="¹">1 | 上标 | 上标1</annotation>
+ <annotation cp="¹" type="tts">上标1</annotation>
+ <annotation cp="²">2 | 上标 | 上标2 | 平方</annotation>
+ <annotation cp="²" type="tts">上标2</annotation>
+ <annotation cp="³">3 | 上标 | 上标3 | 立方</annotation>
+ <annotation cp="³" type="tts">上标3</annotation>
+ <annotation cp="µ">度量 | 微符号</annotation>
+ <annotation cp="µ" type="tts">微符号</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/zh_Hant.xml b/common/annotations/zh_Hant.xml
index bee3b6f..58e2163 100644
--- a/common/annotations/zh_Hant.xml
+++ b/common/annotations/zh_Hant.xml
@@ -24,6 +24,76 @@
<annotation cp="🏾" type="tts">褐皮膚</annotation>
<annotation cp="🏿">膚色 | 黑皮膚</annotation>
<annotation cp="🏿" type="tts">黑皮膚</annotation>
+ <annotation cp="–">標點 | 連接號</annotation>
+ <annotation cp="–" type="tts">連接號</annotation>
+ <annotation cp="—">標點 | 破折號</annotation>
+ <annotation cp="—" type="tts">破折號</annotation>
+ <annotation cp="·">中點 | 間隔號 | 點</annotation>
+ <annotation cp="·" type="tts">間隔號</annotation>
+ <annotation cp="«">左 | 左書名號 | 括號 | 角形</annotation>
+ <annotation cp="«" type="tts">左書名號</annotation>
+ <annotation cp="»">右 | 右書名號 | 括號 | 角形</annotation>
+ <annotation cp="»" type="tts">右書名號</annotation>
+ <annotation cp="§">分節符號 | 段落 | 部分 | 章節</annotation>
+ <annotation cp="§" type="tts">分節符號</annotation>
+ <annotation cp="†">劍標 | 短劍號</annotation>
+ <annotation cp="†" type="tts">劍標</annotation>
+ <annotation cp="‡">劍標 | 短劍號 | 雙 | 雙劍標</annotation>
+ <annotation cp="‡" type="tts">雙劍標</annotation>
+ <annotation cp="•">項目號 | 點</annotation>
+ <annotation cp="•" type="tts">項目號</annotation>
+ <annotation cp="°">度 | 度數 | 度時 | 酒精度</annotation>
+ <annotation cp="°" type="tts">度</annotation>
+ <annotation cp="℗">著作權 | 錄音 | 錄音著作權</annotation>
+ <annotation cp="℗" type="tts">錄音著作權</annotation>
+ <annotation cp="←">朝左 | 朝左箭頭 | 箭頭</annotation>
+ <annotation cp="←" type="tts">朝左箭頭</annotation>
+ <annotation cp="→">朝右 | 朝右箭頭 | 箭頭</annotation>
+ <annotation cp="→" type="tts">朝右箭頭</annotation>
+ <annotation cp="↑">朝上 | 朝上箭頭 | 箭頭</annotation>
+ <annotation cp="↑" type="tts">朝上箭頭</annotation>
+ <annotation cp="↓">朝下 | 朝下箭頭 | 箭頭</annotation>
+ <annotation cp="↓" type="tts">朝下箭頭</annotation>
+ <annotation cp="⇅">上下並列箭頭 | 朝上 | 朝下 | 箭頭</annotation>
+ <annotation cp="⇅" type="tts">上下並列箭頭</annotation>
+ <annotation cp="⇆">右 | 左 | 左右相疊箭頭 | 箭頭</annotation>
+ <annotation cp="⇆" type="tts">左右相疊箭頭</annotation>
+ <annotation cp="∆">三角形 | 遞增</annotation>
+ <annotation cp="∆" type="tts">遞增</annotation>
+ <annotation cp="∇">倒三角形 | 遞減</annotation>
+ <annotation cp="∇" type="tts">遞減</annotation>
+ <annotation cp="∈">包含 | 屬於</annotation>
+ <annotation cp="∈" type="tts">屬於</annotation>
+ <annotation cp="÷">除 | 除法 | 除法符號 | 除號</annotation>
+ <annotation cp="÷" type="tts">除法符號</annotation>
+ <annotation cp="×">乘 | 乘法 | 乘號</annotation>
+ <annotation cp="×" type="tts">乘號</annotation>
+ <annotation cp="⁻">上標 | 上標負數 | 負數</annotation>
+ <annotation cp="⁻" type="tts">上標負數</annotation>
+ <annotation cp="√">基數 | 平方根 | 根號</annotation>
+ <annotation cp="√" type="tts">平方根</annotation>
+ <annotation cp="∞">無限 | 無限符號</annotation>
+ <annotation cp="∞" type="tts">無限符號</annotation>
+ <annotation cp="∩">交集 | 集</annotation>
+ <annotation cp="∩" type="tts">交集</annotation>
+ <annotation cp="∪">聯集 | 集</annotation>
+ <annotation cp="∪" type="tts">聯集</annotation>
+ <annotation cp="≡">全等 | 同餘 | 恆等</annotation>
+ <annotation cp="≡" type="tts">全等</annotation>
+ <annotation cp="⊂">子集 | 集</annotation>
+ <annotation cp="⊂" type="tts">子集</annotation>
+ <annotation cp="▲">三角形 | 實心 | 實心正三角形 | 朝上 | 箭頭</annotation>
+ <annotation cp="▲" type="tts">實心正三角形</annotation>
+ <annotation cp="▼">三角形 | 實心 | 實心倒三角形 | 朝下 | 箭頭</annotation>
+ <annotation cp="▼" type="tts">實心倒三角形</annotation>
+ <annotation cp="◊">菱形 | 鑽石</annotation>
+ <annotation cp="◊" type="tts">菱形</annotation>
+ <annotation cp="○">圓 | 環 | 空心圓</annotation>
+ <annotation cp="○" type="tts">空心圓</annotation>
+ <annotation cp="●">圓 | 實心圓</annotation>
+ <annotation cp="●" type="tts">實心圓</annotation>
+ <annotation cp="◯">圓 | 大空心圓 | 環</annotation>
+ <annotation cp="◯" type="tts">大空心圓</annotation>
<annotation cp="⚧">變性 | 變性符號</annotation>
<annotation cp="⚧" type="tts">變性符號</annotation>
<annotation cp="🤌">手勢 | 手指 | 捏 | 捏手指 | 疑問</annotation>
@@ -3008,5 +3078,23 @@
<annotation cp="🏳🌈" type="tts">彩虹旗</annotation>
<annotation cp="🏴☠">寶藏 | 掠奪 | 海盜 | 海盜旗 | 骷髏旗</annotation>
<annotation cp="🏴☠" type="tts">海盜旗</annotation>
+ <annotation cp="£">英國 | 英鎊 | 英鎊符號 | 貨幣</annotation>
+ <annotation cp="£" type="tts">英鎊符號</annotation>
+ <annotation cp="¥">日圓 | 日幣 | 日幣符號 | 日本 | 貨幣</annotation>
+ <annotation cp="¥" type="tts">日幣符號</annotation>
+ <annotation cp="€">歐元 | 歐元符號 | 歐洲 | 貨幣</annotation>
+ <annotation cp="€" type="tts">歐元符號</annotation>
+ <annotation cp="₹">印度盧比 | 盧比 | 貨幣</annotation>
+ <annotation cp="₹" type="tts">印度盧比</annotation>
+ <annotation cp="₽">盧布 | 貨幣</annotation>
+ <annotation cp="₽" type="tts">盧布</annotation>
+ <annotation cp="¹">1 | 上標 | 上標數字 1</annotation>
+ <annotation cp="¹" type="tts">上標數字 1</annotation>
+ <annotation cp="²">2 | 上標 | 上標數字 2 | 平方</annotation>
+ <annotation cp="²" type="tts">上標數字 2</annotation>
+ <annotation cp="³">2 | 上標 | 上標數字 3 | 立方</annotation>
+ <annotation cp="³" type="tts">上標數字 3</annotation>
+ <annotation cp="µ">微米符號 | 測量</annotation>
+ <annotation cp="µ" type="tts">微米符號</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/zh_Hant_HK.xml b/common/annotations/zh_Hant_HK.xml
index 9ffe63d..211c439 100644
--- a/common/annotations/zh_Hant_HK.xml
+++ b/common/annotations/zh_Hant_HK.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">中深皮膚</annotation>
<annotation cp="🏿">↑↑↑</annotation>
<annotation cp="🏿" type="tts">↑↑↑</annotation>
+ <annotation cp="–">↑↑↑</annotation>
+ <annotation cp="–" type="tts">↑↑↑</annotation>
+ <annotation cp="—">↑↑↑</annotation>
+ <annotation cp="—" type="tts">↑↑↑</annotation>
+ <annotation cp="·">↑↑↑</annotation>
+ <annotation cp="·" type="tts">↑↑↑</annotation>
+ <annotation cp="«">V 字型 | 向左 | 左書名號 | 引號 | 括號 | 插入符號 | 角度</annotation>
+ <annotation cp="«" type="tts">左書名號</annotation>
+ <annotation cp="»">V 字型 | 右書名號 | 向右 | 引號 | 括號 | 插入符號 | 角度</annotation>
+ <annotation cp="»" type="tts">↑↑↑</annotation>
+ <annotation cp="§">↑↑↑</annotation>
+ <annotation cp="§" type="tts">↑↑↑</annotation>
+ <annotation cp="†">↑↑↑</annotation>
+ <annotation cp="†" type="tts">↑↑↑</annotation>
+ <annotation cp="‡">↑↑↑</annotation>
+ <annotation cp="‡" type="tts">↑↑↑</annotation>
+ <annotation cp="•">↑↑↑</annotation>
+ <annotation cp="•" type="tts">↑↑↑</annotation>
+ <annotation cp="°">↑↑↑</annotation>
+ <annotation cp="°" type="tts">↑↑↑</annotation>
+ <annotation cp="℗">↑↑↑</annotation>
+ <annotation cp="℗" type="tts">↑↑↑</annotation>
+ <annotation cp="←">向左 | 向左箭嘴 | 箭嘴</annotation>
+ <annotation cp="←" type="tts">向左箭嘴</annotation>
+ <annotation cp="→">向右 | 向右箭嘴 | 箭嘴</annotation>
+ <annotation cp="→" type="tts">向右箭嘴</annotation>
+ <annotation cp="↑">向上 | 向上箭嘴 | 箭嘴</annotation>
+ <annotation cp="↑" type="tts">向上箭嘴</annotation>
+ <annotation cp="↓">向下 | 向下箭嘴 | 箭嘴</annotation>
+ <annotation cp="↓" type="tts">向下箭嘴</annotation>
+ <annotation cp="⇅">上下並列箭嘴 | 向上 | 向下 | 箭嘴</annotation>
+ <annotation cp="⇅" type="tts">上下並列箭嘴</annotation>
+ <annotation cp="⇆">向右 | 向左 | 向左箭嘴在向右箭嘴上邊 | 箭嘴</annotation>
+ <annotation cp="⇆" type="tts">向左箭嘴在向右箭嘴上邊</annotation>
+ <annotation cp="∆">↑↑↑</annotation>
+ <annotation cp="∆" type="tts">↑↑↑</annotation>
+ <annotation cp="∇">↑↑↑</annotation>
+ <annotation cp="∇" type="tts">↑↑↑</annotation>
+ <annotation cp="∈">↑↑↑</annotation>
+ <annotation cp="∈" type="tts">↑↑↑</annotation>
+ <annotation cp="÷">↑↑↑</annotation>
+ <annotation cp="÷" type="tts">↑↑↑</annotation>
+ <annotation cp="×">↑↑↑</annotation>
+ <annotation cp="×" type="tts">↑↑↑</annotation>
+ <annotation cp="⁻">↑↑↑</annotation>
+ <annotation cp="⁻" type="tts">↑↑↑</annotation>
+ <annotation cp="√">↑↑↑</annotation>
+ <annotation cp="√" type="tts">↑↑↑</annotation>
+ <annotation cp="∞">↑↑↑</annotation>
+ <annotation cp="∞" type="tts">↑↑↑</annotation>
+ <annotation cp="∩">↑↑↑</annotation>
+ <annotation cp="∩" type="tts">↑↑↑</annotation>
+ <annotation cp="∪">↑↑↑</annotation>
+ <annotation cp="∪" type="tts">↑↑↑</annotation>
+ <annotation cp="≡">↑↑↑</annotation>
+ <annotation cp="≡" type="tts">↑↑↑</annotation>
+ <annotation cp="⊂">↑↑↑</annotation>
+ <annotation cp="⊂" type="tts">↑↑↑</annotation>
+ <annotation cp="▲">三角形 | 向上 | 實心 | 實心正三角形 | 箭嘴</annotation>
+ <annotation cp="▲" type="tts">↑↑↑</annotation>
+ <annotation cp="▼">三角形 | 向下 | 實心 | 實心倒三角形 | 箭嘴</annotation>
+ <annotation cp="▼" type="tts">↑↑↑</annotation>
+ <annotation cp="◊">斜方形 | 菱形 | 鑽石型</annotation>
+ <annotation cp="◊" type="tts">↑↑↑</annotation>
+ <annotation cp="○">↑↑↑</annotation>
+ <annotation cp="○" type="tts">↑↑↑</annotation>
+ <annotation cp="●">↑↑↑</annotation>
+ <annotation cp="●" type="tts">↑↑↑</annotation>
+ <annotation cp="◯">↑↑↑</annotation>
+ <annotation cp="◯" type="tts">↑↑↑</annotation>
<annotation cp="⚧">↑↑↑</annotation>
<annotation cp="⚧" type="tts">↑↑↑</annotation>
<annotation cp="🤌">↑↑↑</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">↑↑↑</annotation>
<annotation cp="🏴☠">寶藏 | 掠奪 | 海盜 | 海盜旗 | 骷髏頭</annotation>
<annotation cp="🏴☠" type="tts">↑↑↑</annotation>
+ <annotation cp="£">↑↑↑</annotation>
+ <annotation cp="£" type="tts">↑↑↑</annotation>
+ <annotation cp="¥">日圓 | 日圓符號 | 日幣 | 日本 | 貨幣</annotation>
+ <annotation cp="¥" type="tts">日圓符號</annotation>
+ <annotation cp="€">↑↑↑</annotation>
+ <annotation cp="€" type="tts">↑↑↑</annotation>
+ <annotation cp="₹">↑↑↑</annotation>
+ <annotation cp="₹" type="tts">↑↑↑</annotation>
+ <annotation cp="₽">↑↑↑</annotation>
+ <annotation cp="₽" type="tts">↑↑↑</annotation>
+ <annotation cp="¹">↑↑↑</annotation>
+ <annotation cp="¹" type="tts">↑↑↑</annotation>
+ <annotation cp="²">↑↑↑</annotation>
+ <annotation cp="²" type="tts">↑↑↑</annotation>
+ <annotation cp="³">3 | 上標 | 上標數字 3 | 立方</annotation>
+ <annotation cp="³" type="tts">↑↑↑</annotation>
+ <annotation cp="µ">微的符號 | 測量</annotation>
+ <annotation cp="µ" type="tts">微的符號</annotation>
</annotations>
</ldml>
diff --git a/common/annotations/zu.xml b/common/annotations/zu.xml
index 5436e3e..170a6d4 100644
--- a/common/annotations/zu.xml
+++ b/common/annotations/zu.xml
@@ -23,6 +23,76 @@
<annotation cp="🏾" type="tts">uhlobo-5</annotation>
<annotation cp="🏿">uhlobo 6 | uhlobo lwesikhumba | uhlobo-6</annotation>
<annotation cp="🏿" type="tts">uhlobo-6</annotation>
+ <annotation cp="–">en | i-dash | i-en dash</annotation>
+ <annotation cp="–" type="tts">i-en dash</annotation>
+ <annotation cp="—">em | i-dash | i-em dash</annotation>
+ <annotation cp="—" type="tts">i-em dash</annotation>
+ <annotation cp="·">ichashaza | ichashaza eliphakathi nendawo | interpunct | middot | phakathi nendawo</annotation>
+ <annotation cp="·" type="tts">ichashaza eliphakathi nendawo</annotation>
+ <annotation cp="«">amabrakhethi | carets | chevron | i-angle | i-guillement ekwesobunxele | i-guillment ekwesobunxele | kwesobunxele | ukucaphuna</annotation>
+ <annotation cp="«" type="tts">i-guillement ekwesobunxele</annotation>
+ <annotation cp="»">amabrakhethi | carets | chevron | i-angle | i-guillement ekwesokudla | kwesokudla | ukucaphuna</annotation>
+ <annotation cp="»" type="tts">i-guillement ekwesokudla</annotation>
+ <annotation cp="§">i-section | ingxenye | isigaba | silcrow</annotation>
+ <annotation cp="§" type="tts">i-section</annotation>
+ <annotation cp="†">dagger | obelisk | obelus | uphawu lwe-dagger</annotation>
+ <annotation cp="†" type="tts">uphawu lwe-dagger</annotation>
+ <annotation cp="‡">i-dagger | obelisk | obelus | phinda kabili | uphawu lwe-dagger oluphindeke kabili</annotation>
+ <annotation cp="‡" type="tts">uphawu lwe-dagger oluphindeke kabili</annotation>
+ <annotation cp="•">ichashaza | ungqi</annotation>
+ <annotation cp="•" type="tts">ichashaza</annotation>
+ <annotation cp="°">i-degree | ihora | ubufakazi</annotation>
+ <annotation cp="°" type="tts">i-degree</annotation>
+ <annotation cp="℗">copyright | i-copyright yokuqopha umsindo | ukuqopha | umsindo</annotation>
+ <annotation cp="℗" type="tts">i-copyright yokuqopha umsindo</annotation>
+ <annotation cp="←">kwesobunxele | kwesobunxele-i-arrow yokukhomba | umcibisholo</annotation>
+ <annotation cp="←" type="tts">kwesobunxele-i-arrow yokukhomba</annotation>
+ <annotation cp="→">kwesokudla | kwesokudla-i-arrow yokukhomba | umcibisholo</annotation>
+ <annotation cp="→" type="tts">kwesokudla-i-arrow yokukhomba</annotation>
+ <annotation cp="↑">phezulu | phezulu-i-arrow yokukhomba | umcibisholo</annotation>
+ <annotation cp="↑" type="tts">phezulu-i-arrow yokukhomba</annotation>
+ <annotation cp="↓">ezansi | ezansi-i-arrow yokukhomba | umcibisholo</annotation>
+ <annotation cp="↓" type="tts">ezansi-i-arrow yokukhomba</annotation>
+ <annotation cp="⇅">imicibisholo ekhomba phansi nekhomba phezulu | phansi | phezulu | phezulu-ukukhomba phezulu nasezansi | umcibisholo</annotation>
+ <annotation cp="⇅" type="tts">phezulu-ukukhomba phezulu nasezansi</annotation>
+ <annotation cp="⇆">kwesobunxele | kwesobunxele-ukukhomba kwesokudla-imicibisholo yokukhomba | kwesokudla | left-ukukhomba ku-right naku-left | umcibisholo</annotation>
+ <annotation cp="⇆" type="tts">left-ukukhomba ku-right naku-left</annotation>
+ <annotation cp="∆">i-increment | triangle</annotation>
+ <annotation cp="∆" type="tts">i-increment</annotation>
+ <annotation cp="∇">i-nabla | ungxantathu</annotation>
+ <annotation cp="∇" type="tts">i-nabla</annotation>
+ <annotation cp="∈">element | element of | i-element of | iqukethe | set | ukuba yilungu</annotation>
+ <annotation cp="∈" type="tts">i-element of</annotation>
+ <annotation cp="÷">hlukanisa | obelus | ukuhlukanisa | uphawu lokuhlukanisa</annotation>
+ <annotation cp="÷" type="tts">uphawu lokuhlukanisa</annotation>
+ <annotation cp="×">izikhathi | ukuphindaphinda | uphawu lokuphindaphinda</annotation>
+ <annotation cp="×" type="tts">uphawu lokuphindaphinda</annotation>
+ <annotation cp="⁻">i-minus | i-superscript minus | superscript</annotation>
+ <annotation cp="⁻" type="tts">i-superscript minus</annotation>
+ <annotation cp="√">i-radical | i-square root | radix | root | square | surd</annotation>
+ <annotation cp="√" type="tts">i-square root</annotation>
+ <annotation cp="∞">i-infinity | i-infinity sign</annotation>
+ <annotation cp="∞" type="tts">i-infinity sign</annotation>
+ <annotation cp="∩">i-intersection | set</annotation>
+ <annotation cp="∩" type="tts">i-intersection</annotation>
+ <annotation cp="∪">i-collection | i-union | set | union</annotation>
+ <annotation cp="∪" type="tts">i-union</annotation>
+ <annotation cp="≡">kufana nalokhu | kufana nse | kuthathu | kuyafana</annotation>
+ <annotation cp="≡" type="tts">kufana nalokhu</annotation>
+ <annotation cp="⊂">i-set | i-subset of | subset | subset of</annotation>
+ <annotation cp="⊂" type="tts">i-subset of</annotation>
+ <annotation cp="▲">egcwele phezulu-ungxantathu okhombayo | phezulu | ugcwele | ugcwele phezulu-ungxantathu okhombayo | umkhonto | ungxantathu</annotation>
+ <annotation cp="▲" type="tts">egcwele phezulu-ungxantathu okhombayo</annotation>
+ <annotation cp="▼">igcwaliswe phansi-okukhomba ungxantathu | phansi | ukugcwalisa | ukugcwalisa phansi-ukukhomba okungxantathu | umkhonto | ungxantathu</annotation>
+ <annotation cp="▼" type="tts">igcwaliswe phansi-okukhomba ungxantathu</annotation>
+ <annotation cp="◊">i-lozenge | i-rhombus | idayimani</annotation>
+ <annotation cp="◊" type="tts">i-lozenge</annotation>
+ <annotation cp="○">indandatho | indilinga | indilinga engenalutho</annotation>
+ <annotation cp="○" type="tts">indilinga engenalutho</annotation>
+ <annotation cp="●">indilinga | indilinga egcwele</annotation>
+ <annotation cp="●" type="tts">indilinga egcwele</annotation>
+ <annotation cp="◯">indandatho | indilinga | indilinga enkulu engenalutho</annotation>
+ <annotation cp="◯" type="tts">indilinga enkulu engenalutho</annotation>
<annotation cp="⚧">i-transgender | isimbuli ye-transgender</annotation>
<annotation cp="⚧" type="tts">isimbuli ye-transgender</annotation>
<annotation cp="🤌">iminwe | iminwe encinziwe | ncinziwe | ukubhuqa | ukuphenywa | ukwenza ngezandla</annotation>
@@ -3007,5 +3077,23 @@
<annotation cp="🏳🌈" type="tts">Ifulegi elimibalabala</annotation>
<annotation cp="🏴☠">Jolly Roger | pirate | pirate flag | plunder | treasure</annotation>
<annotation cp="🏴☠" type="tts">pirate flag</annotation>
+ <annotation cp="£">EGP | GBP | i-currency | i-pound | pound</annotation>
+ <annotation cp="£" type="tts">i-pound</annotation>
+ <annotation cp="¥">currency | I-CNY | i-yen | JPY | yen | yuan</annotation>
+ <annotation cp="¥" type="tts">i-yen</annotation>
+ <annotation cp="€">EUR | euro | i-currency | i-euro</annotation>
+ <annotation cp="€" type="tts">i-euro</annotation>
+ <annotation cp="₹">i-currency | i-indian rupee | indian rupee | rupee</annotation>
+ <annotation cp="₹" type="tts">i-indian rupee</annotation>
+ <annotation cp="₽">i-currency | i-ruble | ruble</annotation>
+ <annotation cp="₽" type="tts">i-ruble</annotation>
+ <annotation cp="¹">i-one | i-superscript one | superscript</annotation>
+ <annotation cp="¹" type="tts">i-superscript one</annotation>
+ <annotation cp="²">i-squared | i-superscript two | superscript | two</annotation>
+ <annotation cp="²" type="tts">i-superscript two</annotation>
+ <annotation cp="³">i-cubed | i-superscript three | superscript | three</annotation>
+ <annotation cp="³" type="tts">i-superscript three</annotation>
+ <annotation cp="µ">i-micro sign | kala | micro sign</annotation>
+ <annotation cp="µ" type="tts">i-micro sign</annotation>
</annotations>
</ldml>
diff --git a/common/annotationsDerived/af.xml b/common/annotationsDerived/af.xml
index 4c60ee3..03a4116 100644
--- a/common/annotationsDerived/af.xml
+++ b/common/annotationsDerived/af.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">vingerpunte saamgedruk: medium-donker velkleur</annotation>
<annotation cp="🤌🏿">beklemtoon | donker velkleur | handgebaar | ondervraging | sarkasties | vingerpunte saamgedruk | vingers</annotation>
<annotation cp="🤌🏿" type="tts">vingerpunte saamgedruk: donker velkleur</annotation>
+ <annotation cp="🥷🏻">ligte velkleur | ninja | stilletjies | vegter | verberg</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ligte velkleur</annotation>
+ <annotation cp="🥷🏼">medium-ligte velkleur | ninja | stilletjies | vegter | verberg</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: medium-ligte velkleur</annotation>
+ <annotation cp="🥷🏽">medium velkleur | ninja | stilletjies | vegter | verberg</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: medium velkleur</annotation>
+ <annotation cp="🥷🏾">medium-donker velkleur | ninja | stilletjies | vegter | verberg</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: medium-donker velkleur</annotation>
+ <annotation cp="🥷🏿">donker velkleur | ninja | stilletjies | vegter | verberg</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: donker velkleur</annotation>
<annotation cp="👋🏻">hand | liggaam | ligte velkleur | waai | wuif | wuiwende hand</annotation>
<annotation cp="👋🏻" type="tts">wuiwende hand: ligte velkleur</annotation>
<annotation cp="👋🏼">hand | liggaam | medium-ligte velkleur | waai | wuif | wuiwende hand</annotation>
diff --git a/common/annotationsDerived/am.xml b/common/annotationsDerived/am.xml
index 90615c0..7c078c0 100644
--- a/common/annotationsDerived/am.xml
+++ b/common/annotationsDerived/am.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">የቆነጠጡ ጣቶች: የቆዳ ዓይነት-5</annotation>
<annotation cp="🤌🏿">የቆነጠጡ ጣቶች | የቆዳ ዓይነት-6</annotation>
<annotation cp="🤌🏿" type="tts">የቆነጠጡ ጣቶች: የቆዳ ዓይነት-6</annotation>
+ <annotation cp="🥷🏻">ኒንጃ | የቆዳ ዓይነት-1-2</annotation>
+ <annotation cp="🥷🏻" type="tts">ኒንጃ: የቆዳ ዓይነት-1-2</annotation>
+ <annotation cp="🥷🏼">መሃከለኛ ቀላ ያለ የቆዳ ቀለም | ኒንጃ</annotation>
+ <annotation cp="🥷🏼" type="tts">ኒንጃ: መሃከለኛ ቀላ ያለ የቆዳ ቀለም</annotation>
+ <annotation cp="🥷🏽">ኒንጃ | የቆዳ ዓይነት-4</annotation>
+ <annotation cp="🥷🏽" type="tts">ኒንጃ: የቆዳ ዓይነት-4</annotation>
+ <annotation cp="🥷🏾">ኒንጃ | የቆዳ ዓይነት-5</annotation>
+ <annotation cp="🥷🏾" type="tts">ኒንጃ: የቆዳ ዓይነት-5</annotation>
+ <annotation cp="🥷🏿">ኒንጃ | የቆዳ ዓይነት-6</annotation>
+ <annotation cp="🥷🏿" type="tts">ኒንጃ: የቆዳ ዓይነት-6</annotation>
<annotation cp="👋🏻">ሞገድ | ተወዛዋዥ እጅ | አካል | እጅ | እጅ ማወዛወዝ | የቆዳ ዓይነት-1-2</annotation>
<annotation cp="👋🏻" type="tts">ተወዛዋዥ እጅ: የቆዳ ዓይነት-1-2</annotation>
<annotation cp="👋🏼">መሃከለኛ ቀላ ያለ የቆዳ ቀለም | ሞገድ | ተወዛዋዥ እጅ | አካል | እጅ | እጅ ማወዛወዝ</annotation>
diff --git a/common/annotationsDerived/ar.xml b/common/annotationsDerived/ar.xml
index 6183647..e146774 100644
--- a/common/annotationsDerived/ar.xml
+++ b/common/annotationsDerived/ar.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">أصابع مضمومة: بشرة بلون معتدل مائل للغامق</annotation>
<annotation cp="🤌🏿">أصابع | أصابع مضمومة | إيماءة باليد | بشرة بلون غامق | تهكّم | ضم</annotation>
<annotation cp="🤌🏿" type="tts">أصابع مضمومة: بشرة بلون غامق</annotation>
+ <annotation cp="🥷🏻">بشرة بلون فاتح | خفي | متخفي | محارب | نينجا</annotation>
+ <annotation cp="🥷🏻" type="tts">نينجا: بشرة بلون فاتح</annotation>
+ <annotation cp="🥷🏼">بشرة بلون فاتح ومعتدل | خفي | متخفي | محارب | نينجا</annotation>
+ <annotation cp="🥷🏼" type="tts">نينجا: بشرة بلون فاتح ومعتدل</annotation>
+ <annotation cp="🥷🏽">بشرة بلون معتدل | خفي | متخفي | محارب | نينجا</annotation>
+ <annotation cp="🥷🏽" type="tts">نينجا: بشرة بلون معتدل</annotation>
+ <annotation cp="🥷🏾">بشرة بلون معتدل مائل للغامق | خفي | متخفي | محارب | نينجا</annotation>
+ <annotation cp="🥷🏾" type="tts">نينجا: بشرة بلون معتدل مائل للغامق</annotation>
+ <annotation cp="🥷🏿">بشرة بلون غامق | خفي | متخفي | محارب | نينجا</annotation>
+ <annotation cp="🥷🏿" type="tts">نينجا: بشرة بلون غامق</annotation>
<annotation cp="👋🏻">بشرة بلون فاتح | تلويح | تلويح باليد | يد</annotation>
<annotation cp="👋🏻" type="tts">تلويح باليد: بشرة بلون فاتح</annotation>
<annotation cp="👋🏼">بشرة بلون فاتح ومعتدل | تلويح | تلويح باليد | يد</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">بالغ: بشرة بلون معتدل مائل للغامق وأصلع</annotation>
<annotation cp="🧑🏿🦲">أصلع | بالغ | بشرة بلون غامق | شخص | كبير</annotation>
<annotation cp="🧑🏿🦲" type="tts">بالغ: بشرة بلون غامق وأصلع</annotation>
- <annotation cp="🧑🏻🍼">بشرة بلون فاتح | رضاعة | رضيع | شخص | طفل</annotation>
+ <annotation cp="🧑🏻🍼">بشرة بلون فاتح | رضاعة | رضيع | شخص | شخص يُرضع طفلاً | طفل</annotation>
<annotation cp="🧑🏻🍼" type="tts">شخص يُرضع طفلاً: بشرة بلون فاتح</annotation>
- <annotation cp="🧑🏼🍼">بشرة بلون فاتح ومعتدل | رضاعة | رضيع | شخص | طفل</annotation>
+ <annotation cp="🧑🏼🍼">بشرة بلون فاتح ومعتدل | رضاعة | رضيع | شخص | شخص يُرضع طفلاً | طفل</annotation>
<annotation cp="🧑🏼🍼" type="tts">شخص يُرضع طفلاً: بشرة بلون فاتح ومعتدل</annotation>
- <annotation cp="🧑🏽🍼">بشرة بلون معتدل | رضاعة | رضيع | شخص | طفل</annotation>
+ <annotation cp="🧑🏽🍼">بشرة بلون معتدل | رضاعة | رضيع | شخص | شخص يُرضع طفلاً | طفل</annotation>
<annotation cp="🧑🏽🍼" type="tts">شخص يُرضع طفلاً: بشرة بلون معتدل</annotation>
- <annotation cp="🧑🏾🍼">بشرة بلون معتدل مائل للغامق | رضاعة | رضيع | شخص | طفل</annotation>
+ <annotation cp="🧑🏾🍼">بشرة بلون معتدل مائل للغامق | رضاعة | رضيع | شخص | شخص يُرضع طفلاً | طفل</annotation>
<annotation cp="🧑🏾🍼" type="tts">شخص يُرضع طفلاً: بشرة بلون معتدل مائل للغامق</annotation>
- <annotation cp="🧑🏿🍼">بشرة بلون غامق | رضاعة | رضيع | شخص | طفل</annotation>
+ <annotation cp="🧑🏿🍼">بشرة بلون غامق | رضاعة | رضيع | شخص | شخص يُرضع طفلاً | طفل</annotation>
<annotation cp="🧑🏿🍼" type="tts">شخص يُرضع طفلاً: بشرة بلون غامق</annotation>
<annotation cp="🧑🏻🎄">بشرة بلون فاتح | عيد الميلاد | كلوز</annotation>
<annotation cp="🧑🏻🎄" type="tts">كلوز: بشرة بلون فاتح</annotation>
diff --git a/common/annotationsDerived/ar_SA.xml b/common/annotationsDerived/ar_SA.xml
index 94da65e..e31c64c 100644
--- a/common/annotationsDerived/ar_SA.xml
+++ b/common/annotationsDerived/ar_SA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/as.xml b/common/annotationsDerived/as.xml
index d54e9eb..4cd7408 100644
--- a/common/annotationsDerived/as.xml
+++ b/common/annotationsDerived/as.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">টিপা মাৰি ৰখা আঙুলি: মধ্যমীয়া-ক’লা ছালৰ ৰং</annotation>
<annotation cp="🤌🏿">আঙুলি | ক’লা ছালৰ ৰং | জিজ্ঞাসা | টিপা মাৰি ৰখা | টিপা মাৰি ৰখা আঙুলি | ব্যঙ্গ | হাতৰ ভঙ্গিমা</annotation>
<annotation cp="🤌🏿" type="tts">টিপা মাৰি ৰখা আঙুলি: ক’লা ছালৰ ৰং</annotation>
+ <annotation cp="🥷🏻">চৌৰ্য্য | নিনজা | পাতল ছালৰ ৰং | যোদ্ধা | লুকাই থকা</annotation>
+ <annotation cp="🥷🏻" type="tts">নিনজা: পাতল ছালৰ ৰং</annotation>
+ <annotation cp="🥷🏼">চৌৰ্য্য | নিনজা | মধ্যমীয়া-পাতল ছালৰ ৰং | যোদ্ধা | লুকাই থকা</annotation>
+ <annotation cp="🥷🏼" type="tts">নিনজা: মধ্যমীয়া-পাতল ছালৰ ৰং</annotation>
+ <annotation cp="🥷🏽">চৌৰ্য্য | নিনজা | মধ্যমীয়া ছালৰ ৰং | যোদ্ধা | লুকাই থকা</annotation>
+ <annotation cp="🥷🏽" type="tts">নিনজা: মধ্যমীয়া ছালৰ ৰং</annotation>
+ <annotation cp="🥷🏾">চৌৰ্য্য | নিনজা | মধ্যমীয়া-ক’লা ছালৰ ৰং | যোদ্ধা | লুকাই থকা</annotation>
+ <annotation cp="🥷🏾" type="tts">নিনজা: মধ্যমীয়া-ক’লা ছালৰ ৰং</annotation>
+ <annotation cp="🥷🏿">ক’লা ছালৰ ৰং | চৌৰ্য্য | নিনজা | যোদ্ধা | লুকাই থকা</annotation>
+ <annotation cp="🥷🏿" type="tts">নিনজা: ক’লা ছালৰ ৰং</annotation>
<annotation cp="👋🏻">পাতল ছালৰ ৰং | লৰোৱা | লহৰ | হাত</annotation>
<annotation cp="👋🏻" type="tts">হাত লৰোৱা: পাতল ছালৰ ৰং</annotation>
<annotation cp="👋🏼">মধ্যমীয়া-পাতল ছালৰ ৰং | লৰোৱা | লহৰ | হাত</annotation>
diff --git a/common/annotationsDerived/ast.xml b/common/annotationsDerived/ast.xml
index 3ef94bb..826f5d5 100644
--- a/common/annotationsDerived/ast.xml
+++ b/common/annotationsDerived/ast.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/az.xml b/common/annotationsDerived/az.xml
index c0d5f4d..b35f9bb 100644
--- a/common/annotationsDerived/az.xml
+++ b/common/annotationsDerived/az.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">çimdik: orta-tünd dəri tonu</annotation>
<annotation cp="🤌🏿">barmaqlar | çimdik | əl jesti | sarkastik | sorğu-sual | tünd dəri tonu</annotation>
<annotation cp="🤌🏿" type="tts">çimdik: tünd dəri tonu</annotation>
+ <annotation cp="🥷🏻">açıq dəri tonu | döyüşçü | gizli | gizlilik | nindza</annotation>
+ <annotation cp="🥷🏻" type="tts">nindza: açıq dəri tonu</annotation>
+ <annotation cp="🥷🏼">döyüşçü | gizli | gizlilik | nindza | orta-açıq dəri tonu</annotation>
+ <annotation cp="🥷🏼" type="tts">nindza: orta-açıq dəri tonu</annotation>
+ <annotation cp="🥷🏽">döyüşçü | gizli | gizlilik | nindza | orta dəri tonu</annotation>
+ <annotation cp="🥷🏽" type="tts">nindza: orta dəri tonu</annotation>
+ <annotation cp="🥷🏾">döyüşçü | gizli | gizlilik | nindza | orta-tünd dəri tonu</annotation>
+ <annotation cp="🥷🏾" type="tts">nindza: orta-tünd dəri tonu</annotation>
+ <annotation cp="🥷🏿">döyüşçü | gizli | gizlilik | nindza | tünd dəri tonu</annotation>
+ <annotation cp="🥷🏿" type="tts">nindza: tünd dəri tonu</annotation>
<annotation cp="👋🏻">açıq dəri tonu | əl | əl sallayan əllər | orqan | yelləmə | yelləmək</annotation>
<annotation cp="👋🏻" type="tts">əl sallayan əllər: açıq dəri tonu</annotation>
<annotation cp="👋🏼">əl | əl sallayan əllər | orqan | orta-açıq dəri tonu | yelləmə | yelləmək</annotation>
diff --git a/common/annotationsDerived/be.xml b/common/annotationsDerived/be.xml
index e2c1935..2c0c29b 100644
--- a/common/annotationsDerived/be.xml
+++ b/common/annotationsDerived/be.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">зведзеныя пальцы: сярэдняцёмны тон скуры</annotation>
<annotation cp="🤌🏿">жэст рукі | зведзеныя | пальцы | пытанне | сарказм | цёмны тон скуры | шчыпок</annotation>
<annotation cp="🤌🏿" type="tts">зведзеныя пальцы: цёмны тон скуры</annotation>
+ <annotation cp="🥷🏻">баец | ніндзя | нябачны | светлы тон скуры | схаваны</annotation>
+ <annotation cp="🥷🏻" type="tts">ніндзя: светлы тон скуры</annotation>
+ <annotation cp="🥷🏼">баец | ніндзя | нябачны | схаваны | сярэднясветлы тон скуры</annotation>
+ <annotation cp="🥷🏼" type="tts">ніндзя: сярэднясветлы тон скуры</annotation>
+ <annotation cp="🥷🏽">баец | ніндзя | нябачны | схаваны | сярэдні тон скуры</annotation>
+ <annotation cp="🥷🏽" type="tts">ніндзя: сярэдні тон скуры</annotation>
+ <annotation cp="🥷🏾">баец | ніндзя | нябачны | схаваны | сярэдняцёмны тон скуры</annotation>
+ <annotation cp="🥷🏾" type="tts">ніндзя: сярэдняцёмны тон скуры</annotation>
+ <annotation cp="🥷🏿">баец | ніндзя | нябачны | схаваны | цёмны тон скуры</annotation>
+ <annotation cp="🥷🏿" type="tts">ніндзя: цёмны тон скуры</annotation>
<annotation cp="👋🏻">вітаю | махае рукой | маханне | рука | светлы тон скуры</annotation>
<annotation cp="👋🏻" type="tts">махае рукой: светлы тон скуры</annotation>
<annotation cp="👋🏼">вітаю | махае рукой | маханне | рука | сярэднясветлы тон скуры</annotation>
diff --git a/common/annotationsDerived/bg.xml b/common/annotationsDerived/bg.xml
index e6ca2a9..5d76764 100644
--- a/common/annotationsDerived/bg.xml
+++ b/common/annotationsDerived/bg.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">събрани пръсти: средно тъмна кожа</annotation>
<annotation cp="🤌🏿">въпрос | жест с ръка | пръсти | саркастично | събрани | тъмна кожа</annotation>
<annotation cp="🤌🏿" type="tts">събрани пръсти: тъмна кожа</annotation>
+ <annotation cp="🥷🏻">воин | нинджа | прокрадване | светла кожа | скрит</annotation>
+ <annotation cp="🥷🏻" type="tts">нинджа: светла кожа</annotation>
+ <annotation cp="🥷🏼">воин | нинджа | прокрадване | скрит | средно светла кожа</annotation>
+ <annotation cp="🥷🏼" type="tts">нинджа: средно светла кожа</annotation>
+ <annotation cp="🥷🏽">воин | нинджа | прокрадване | скрит | средна на цвят кожа</annotation>
+ <annotation cp="🥷🏽" type="tts">нинджа: средна на цвят кожа</annotation>
+ <annotation cp="🥷🏾">воин | нинджа | прокрадване | скрит | средно тъмна кожа</annotation>
+ <annotation cp="🥷🏾" type="tts">нинджа: средно тъмна кожа</annotation>
+ <annotation cp="🥷🏿">воин | нинджа | прокрадване | скрит | тъмна кожа</annotation>
+ <annotation cp="🥷🏿" type="tts">нинджа: тъмна кожа</annotation>
<annotation cp="👋🏻">махане | Махане с ръка | ръка | светла кожа | тяло</annotation>
<annotation cp="👋🏻" type="tts">Махане с ръка: светла кожа</annotation>
<annotation cp="👋🏼">махане | Махане с ръка | ръка | средно светла кожа | тяло</annotation>
diff --git a/common/annotationsDerived/bn.xml b/common/annotationsDerived/bn.xml
index 914aaab..deaf22d 100644
--- a/common/annotationsDerived/bn.xml
+++ b/common/annotationsDerived/bn.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">অল্প একটু: মাঝারি-কালো ত্বকের রঙ</annotation>
<annotation cp="🤌🏿">অল্প একটু | আঙ্গুল | কালো ত্বকের রঙ | চিমটিকাটা | জিজ্ঞেস করা | বিদ্রুপপূর্ণ | হাতের অঙ্গিভঙ্গি</annotation>
<annotation cp="🤌🏿" type="tts">অল্প একটু: কালো ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏻">গুপ্ত | নিনজা | লড়াকু | লুকোনো | হালকা ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏻" type="tts">নিনজা: হালকা ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏼">গুপ্ত | নিনজা | মাঝারি-হালকা ত্বকের রঙ | লড়াকু | লুকোনো</annotation>
+ <annotation cp="🥷🏼" type="tts">নিনজা: মাঝারি-হালকা ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏽">গুপ্ত | নিনজা | মাঝারি ত্বকের রঙ | লড়াকু | লুকোনো</annotation>
+ <annotation cp="🥷🏽" type="tts">নিনজা: মাঝারি ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏾">গুপ্ত | নিনজা | মাঝারি-কালো ত্বকের রঙ | লড়াকু | লুকোনো</annotation>
+ <annotation cp="🥷🏾" type="tts">নিনজা: মাঝারি-কালো ত্বকের রঙ</annotation>
+ <annotation cp="🥷🏿">কালো ত্বকের রঙ | গুপ্ত | নিনজা | লড়াকু | লুকোনো</annotation>
+ <annotation cp="🥷🏿" type="tts">নিনজা: কালো ত্বকের রঙ</annotation>
<annotation cp="👋🏻">দোলানো | নাড়ানো | শরীর | হাত | হালকা ত্বকের রঙ</annotation>
<annotation cp="👋🏻" type="tts">হাত নাড়ানো: হালকা ত্বকের রঙ</annotation>
<annotation cp="👋🏼">দোলানো | নাড়ানো | মাঝারি-হালকা ত্বকের রঙ | শরীর | হাত</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">প্রাপ্তবয়স্ক: মাঝারি-কালো ত্বকের রঙ, নেড়া</annotation>
<annotation cp="🧑🏿🦲">কালো ত্বকের রঙ | নেড়া | প্রাপ্তবয়স্ক | লিঙ্গ-নিরপেক্ষ</annotation>
<annotation cp="🧑🏿🦲" type="tts">প্রাপ্তবয়স্ক: কালো ত্বকের রঙ, নেড়া</annotation>
- <annotation cp="🧑🏻🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | শিশু | হালকা ত্বকের রঙ</annotation>
+ <annotation cp="🧑🏻🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | শিশু | শিশুকে একজন খাওয়াচ্ছেন | হালকা ত্বকের রঙ</annotation>
<annotation cp="🧑🏻🍼" type="tts">শিশুকে একজন খাওয়াচ্ছেন: হালকা ত্বকের রঙ</annotation>
- <annotation cp="🧑🏼🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি-হালকা ত্বকের রঙ | শিশু</annotation>
+ <annotation cp="🧑🏼🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি-হালকা ত্বকের রঙ | শিশু | শিশুকে একজন খাওয়াচ্ছেন</annotation>
<annotation cp="🧑🏼🍼" type="tts">শিশুকে একজন খাওয়াচ্ছেন: মাঝারি-হালকা ত্বকের রঙ</annotation>
- <annotation cp="🧑🏽🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি ত্বকের রঙ | শিশু</annotation>
+ <annotation cp="🧑🏽🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি ত্বকের রঙ | শিশু | শিশুকে একজন খাওয়াচ্ছেন</annotation>
<annotation cp="🧑🏽🍼" type="tts">শিশুকে একজন খাওয়াচ্ছেন: মাঝারি ত্বকের রঙ</annotation>
- <annotation cp="🧑🏾🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি-কালো ত্বকের রঙ | শিশু</annotation>
+ <annotation cp="🧑🏾🍼">একজন শিশুকে খাওয়াচ্ছেন | খাওয়ানো | পরিচর্যা | ব্যক্তি | মাঝারি-কালো ত্বকের রঙ | শিশু | শিশুকে একজন খাওয়াচ্ছেন</annotation>
<annotation cp="🧑🏾🍼" type="tts">শিশুকে একজন খাওয়াচ্ছেন: মাঝারি-কালো ত্বকের রঙ</annotation>
- <annotation cp="🧑🏿🍼">একজন শিশুকে খাওয়াচ্ছেন | কালো ত্বকের রঙ | খাওয়ানো | পরিচর্যা | ব্যক্তি | শিশু</annotation>
+ <annotation cp="🧑🏿🍼">একজন শিশুকে খাওয়াচ্ছেন | কালো ত্বকের রঙ | খাওয়ানো | পরিচর্যা | ব্যক্তি | শিশু | শিশুকে একজন খাওয়াচ্ছেন</annotation>
<annotation cp="🧑🏿🍼" type="tts">শিশুকে একজন খাওয়াচ্ছেন: কালো ত্বকের রঙ</annotation>
<annotation cp="🧑🏻🎄">কল্স, ক্রিসমাস | ম্যাক্স ক্লস | হালকা ত্বকের রঙ</annotation>
<annotation cp="🧑🏻🎄" type="tts">ম্যাক্স ক্লস: হালকা ত্বকের রঙ</annotation>
diff --git a/common/annotationsDerived/bs.xml b/common/annotationsDerived/bs.xml
index 79b1c7e..3fab27e 100644
--- a/common/annotationsDerived/bs.xml
+++ b/common/annotationsDerived/bs.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">skupljeni prsti: umjereno tamna boja kože</annotation>
<annotation cp="🤌🏿">gest rukom | ispitivanje | prsti | sarkastično | skupljeni prsti | tamna boja kože | uštinuti</annotation>
<annotation cp="🤌🏿" type="tts">skupljeni prsti: tamna boja kože</annotation>
+ <annotation cp="🥷🏻">borac | nindža | prikradanje | sakrivanje | svijetla boja kože</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: svijetla boja kože</annotation>
+ <annotation cp="🥷🏼">borac | nindža | prikradanje | sakrivanje | umjereno svijetla boja kože</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: umjereno svijetla boja kože</annotation>
+ <annotation cp="🥷🏽">borac | nindža | prikradanje | sakrivanje | umjerena boja kože</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: umjerena boja kože</annotation>
+ <annotation cp="🥷🏾">borac | nindža | prikradanje | sakrivanje | umjereno tamna boja kože</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: umjereno tamna boja kože</annotation>
+ <annotation cp="🥷🏿">borac | nindža | prikradanje | sakrivanje | tamna boja kože</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: tamna boja kože</annotation>
<annotation cp="👋🏻">mahanje | mahanje rukom | svijetla boja kože</annotation>
<annotation cp="👋🏻" type="tts">mahanje rukom: svijetla boja kože</annotation>
<annotation cp="👋🏼">mahanje | mahanje rukom | umjereno svijetla boja kože</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">odrasla osoba: umjereno tamna boja kože i ćelavo</annotation>
<annotation cp="🧑🏿🦲">ćelavo | neodređeni spol | odrasla osoba | srednji rod | tamna boja kože</annotation>
<annotation cp="🧑🏿🦲" type="tts">odrasla osoba: tamna boja kože i ćelavo</annotation>
- <annotation cp="🧑🏻🍼">beba | dojenje | hranjenje | osoba | osoba hrani bebu | svijetla boja kože</annotation>
+ <annotation cp="🧑🏻🍼">beba | dojenje | hranjenje | osoba | osoba doji bebu | osoba hrani bebu | svijetla boja kože</annotation>
<annotation cp="🧑🏻🍼" type="tts">osoba doji bebu: svijetla boja kože</annotation>
- <annotation cp="🧑🏼🍼">beba | dojenje | hranjenje | osoba | osoba hrani bebu | umjereno svijetla boja kože</annotation>
+ <annotation cp="🧑🏼🍼">beba | dojenje | hranjenje | osoba | osoba doji bebu | osoba hrani bebu | umjereno svijetla boja kože</annotation>
<annotation cp="🧑🏼🍼" type="tts">osoba doji bebu: umjereno svijetla boja kože</annotation>
- <annotation cp="🧑🏽🍼">beba | dojenje | hranjenje | osoba | osoba hrani bebu | umjerena boja kože</annotation>
+ <annotation cp="🧑🏽🍼">beba | dojenje | hranjenje | osoba | osoba doji bebu | osoba hrani bebu | umjerena boja kože</annotation>
<annotation cp="🧑🏽🍼" type="tts">osoba doji bebu: umjerena boja kože</annotation>
- <annotation cp="🧑🏾🍼">beba | dojenje | hranjenje | osoba | osoba hrani bebu | umjereno tamna boja kože</annotation>
+ <annotation cp="🧑🏾🍼">beba | dojenje | hranjenje | osoba | osoba doji bebu | osoba hrani bebu | umjereno tamna boja kože</annotation>
<annotation cp="🧑🏾🍼" type="tts">osoba doji bebu: umjereno tamna boja kože</annotation>
- <annotation cp="🧑🏿🍼">beba | dojenje | hranjenje | osoba | osoba hrani bebu | tamna boja kože</annotation>
+ <annotation cp="🧑🏿🍼">beba | dojenje | hranjenje | osoba | osoba doji bebu | osoba hrani bebu | tamna boja kože</annotation>
<annotation cp="🧑🏿🍼" type="tts">osoba doji bebu: tamna boja kože</annotation>
<annotation cp="🧑🏻🎄">Djeda Mraz, božić | g. Mraz | svijetla boja kože</annotation>
<annotation cp="🧑🏻🎄" type="tts">g. Mraz: svijetla boja kože</annotation>
diff --git a/common/annotationsDerived/ca.xml b/common/annotationsDerived/ca.xml
index f1f66d7..7020769 100644
--- a/common/annotationsDerived/ca.xml
+++ b/common/annotationsDerived/ca.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">dits junts: pell fosca</annotation>
<annotation cp="🤌🏿">dits | dits junts | gest de la mà | interrogació | pell molt fosca | sarcàstic</annotation>
<annotation cp="🤌🏿" type="tts">dits junts: pell molt fosca</annotation>
+ <annotation cp="🥷🏻">guerrer | lluitador | ninja | ocult | pell molt clara | sigilós</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: pell molt clara</annotation>
+ <annotation cp="🥷🏼">guerrer | lluitador | ninja | ocult | pell bastant clara | sigilós</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: pell bastant clara</annotation>
+ <annotation cp="🥷🏽">guerrer | lluitador | ninja | ocult | pell morena | sigilós</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: pell morena</annotation>
+ <annotation cp="🥷🏾">guerrer | lluitador | ninja | ocult | pell fosca | sigilós</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: pell fosca</annotation>
+ <annotation cp="🥷🏿">guerrer | lluitador | ninja | ocult | pell molt fosca | sigilós</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: pell molt fosca</annotation>
<annotation cp="👋🏻">mà | mà que saluda | pell molt clara | salutació</annotation>
<annotation cp="👋🏻" type="tts">mà que saluda: pell molt clara</annotation>
<annotation cp="👋🏼">mà | mà que saluda | pell bastant clara | salutació</annotation>
diff --git a/common/annotationsDerived/ccp.xml b/common/annotationsDerived/ccp.xml
index 990b90c..40cedef 100644
--- a/common/annotationsDerived/ccp.xml
+++ b/common/annotationsDerived/ccp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/chr.xml b/common/annotationsDerived/chr.xml
index 2be01fa..820cc74 100644
--- a/common/annotationsDerived/chr.xml
+++ b/common/annotationsDerived/chr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ᏗᏓᏇᏄᎩᏍᏗ ᏕᎦᏰᏌᏛ: ᎠᏲᏟᎨ-ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
<annotation cp="🤌🏿">ᎠᏓᎵᏍᎦᎾᏁᎯ | ᎠᏛᏛᎲᏍᎩ | ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ | ᎤᏬᏰᏂ ᎠᏌᎳᏙᏗ | ᏕᎦᏰᏌᏛ | ᏗᏓᏇᏄᎩᏍᏗ</annotation>
<annotation cp="🤌🏿" type="tts">ᏗᏓᏇᏄᎩᏍᏗ ᏕᎦᏰᏌᏛ: ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
+ <annotation cp="🥷🏻">ᎤᏓᏕᎵᏍᏗ | ᎤᏗᏴᎳᏘ ᎤᏁᎦᎵ ᏄᏍᏛᎢ | ᏂᏅᏣ | ᏓᎿᏩ ᎠᎾᎵᎯ | ᏯᎬᏍᎦᎳᏁᎳ</annotation>
+ <annotation cp="🥷🏻" type="tts">ᏂᏅᏣ: ᎤᏗᏴᎳᏘ ᎤᏁᎦᎵ ᏄᏍᏛᎢ</annotation>
+ <annotation cp="🥷🏼">ᎠᏲᏟᎨ-ᎤᏗᏴᎳᏘ ᎤᏁᎦᎸ ᏄᎿᏍᏛᎢ | ᎤᏓᏕᎵᏍᏗ | ᏂᏅᏣ | ᏓᎿᏩ ᎠᎾᎵᎯ | ᏯᎬᏍᎦᎳᏁᎳ</annotation>
+ <annotation cp="🥷🏼" type="tts">ᏂᏅᏣ: ᎠᏲᏟᎨ-ᎤᏗᏴᎳᏘ ᎤᏁᎦᎸ ᏄᎿᏍᏛᎢ</annotation>
+ <annotation cp="🥷🏽">ᎠᏲᏟᎨ ᎣᏁᎦᎸ ᏄᏍᏛᎢ | ᎤᏓᏕᎵᏍᏗ | ᏂᏅᏣ | ᏓᎿᏩ ᎠᎾᎵᎯ | ᏯᎬᏍᎦᎳᏁᎳ</annotation>
+ <annotation cp="🥷🏽" type="tts">ᏂᏅᏣ: ᎠᏲᏟᎨ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
+ <annotation cp="🥷🏾">ᎠᏲᏟᎨ-ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ | ᎤᏓᏕᎵᏍᏗ | ᏂᏅᏣ | ᏓᎿᏩ ᎠᎾᎵᎯ | ᏯᎬᏍᎦᎳᏁᎳ</annotation>
+ <annotation cp="🥷🏾" type="tts">ᏂᏅᏣ: ᎠᏲᏟᎨ-ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
+ <annotation cp="🥷🏿">ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ | ᎤᏓᏕᎵᏍᏗ | ᏂᏅᏣ | ᏓᎿᏩ ᎠᎾᎵᎯ | ᏯᎬᏍᎦᎳᏁᎳ</annotation>
+ <annotation cp="🥷🏿" type="tts">ᏂᏅᏣ: ᎤᎵᏏᎩ ᎣᏁᎦᎸ ᏄᏍᏛᎢ</annotation>
<annotation cp="👋🏻">ᎠᏐᏰᎭ | ᎠᏲᎵᎭ | ᎤᏗᏴᎳᏘ ᎤᏁᎦᎵ ᏄᏍᏛᎢ | ᎤᏬᏱ</annotation>
<annotation cp="👋🏻" type="tts">ᎠᏲᎵᎭ: ᎤᏗᏴᎳᏘ ᎤᏁᎦᎵ ᏄᏍᏛᎢ</annotation>
<annotation cp="👋🏼">ᎠᏐᏰᎭ | ᎠᏲᎵᎭ | ᎠᏲᏟᎨ-ᎤᏗᏴᎳᏘ ᎤᏁᎦᎸ ᏄᎿᏍᏛᎢ | ᎤᏬᏱ</annotation>
diff --git a/common/annotationsDerived/cs.xml b/common/annotationsDerived/cs.xml
index 780048c..502d342 100644
--- a/common/annotationsDerived/cs.xml
+++ b/common/annotationsDerived/cs.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">špetka z pěti prstů: středně tmavý odstín pleti</annotation>
<annotation cp="🤌🏿">gesto rukou | ironie | italské sarkastické gesto | otázka | prsty | sarkasmus | sevřené | špetka z pěti prstů | tmavý odstín pleti</annotation>
<annotation cp="🤌🏿" type="tts">špetka z pěti prstů: tmavý odstín pleti</annotation>
+ <annotation cp="🥷🏻">bojovník | nenápadný | nindža | špion | světlý odstín pleti | tajný</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: světlý odstín pleti</annotation>
+ <annotation cp="🥷🏼">bojovník | nenápadný | nindža | špion | středně světlý odstín pleti | tajný</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: středně světlý odstín pleti</annotation>
+ <annotation cp="🥷🏽">bojovník | nenápadný | nindža | špion | střední odstín pleti | tajný</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: střední odstín pleti</annotation>
+ <annotation cp="🥷🏾">bojovník | nenápadný | nindža | špion | středně tmavý odstín pleti | tajný</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: středně tmavý odstín pleti</annotation>
+ <annotation cp="🥷🏿">bojovník | nenápadný | nindža | špion | tajný | tmavý odstín pleti</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: tmavý odstín pleti</annotation>
<annotation cp="👋🏻">mávající ruka | mávání | mávat | ruka | světlý odstín pleti | tělo</annotation>
<annotation cp="👋🏻" type="tts">mávající ruka: světlý odstín pleti</annotation>
<annotation cp="👋🏼">mávající ruka | mávání | mávat | ruka | středně světlý odstín pleti | tělo</annotation>
diff --git a/common/annotationsDerived/cy.xml b/common/annotationsDerived/cy.xml
index a51a8a6..e6ad2c1 100644
--- a/common/annotationsDerived/cy.xml
+++ b/common/annotationsDerived/cy.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">bysedd wedi’u pinsio: arlliw croen canolig-tywyll</annotation>
<annotation cp="🤌🏿">arlliw croen tywyll | arwydd â llaw | bysedd | bysedd wedi’u pinsio | holi | sarcastig | wedi pinsio</annotation>
<annotation cp="🤌🏿" type="tts">bysedd wedi’u pinsio: arlliw croen tywyll</annotation>
+ <annotation cp="🥷🏻">arlliw croen golau | cudd | cuddio | ninja | ymladdwr</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: arlliw croen golau</annotation>
+ <annotation cp="🥷🏼">arlliw croen canolig-golau | cudd | cuddio | ninja | ymladdwr</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: arlliw croen canolig-golau</annotation>
+ <annotation cp="🥷🏽">arlliw croen canolog | cudd | cuddio | ninja | ymladdwr</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: arlliw croen canolog</annotation>
+ <annotation cp="🥷🏾">arlliw croen canolig-tywyll | cudd | cuddio | ninja | ymladdwr</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: arlliw croen canolig-tywyll</annotation>
+ <annotation cp="🥷🏿">arlliw croen tywyll | cudd | cuddio | ninja | ymladdwr</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: arlliw croen tywyll</annotation>
<annotation cp="👋🏻">arlliw croen golau | chwifio | corff | llaw | llaw yn chwifio</annotation>
<annotation cp="👋🏻" type="tts">llaw yn chwifio: arlliw croen golau</annotation>
<annotation cp="👋🏼">arlliw croen canolig-golau | chwifio | corff | llaw | llaw yn chwifio</annotation>
diff --git a/common/annotationsDerived/da.xml b/common/annotationsDerived/da.xml
index 436818f..6ebc9ab 100644
--- a/common/annotationsDerived/da.xml
+++ b/common/annotationsDerived/da.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">samlede fingre: medium til mørk teint</annotation>
<annotation cp="🤌🏿">fingre | gestus | håndtegn | mørk teint | samlede fingre | sammenknebne | sarkastisk | udspørge</annotation>
<annotation cp="🤌🏿" type="tts">samlede fingre: mørk teint</annotation>
+ <annotation cp="🥷🏻">lys teint | ninja | ninjakriger | skjult | stealth</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: lys teint</annotation>
+ <annotation cp="🥷🏼">medium til lys teint | ninja | ninjakriger | skjult | stealth</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: medium til lys teint</annotation>
+ <annotation cp="🥷🏽">medium teint | ninja | ninjakriger | skjult | stealth</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: medium teint</annotation>
+ <annotation cp="🥷🏾">medium til mørk teint | ninja | ninjakriger | skjult | stealth</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: medium til mørk teint</annotation>
+ <annotation cp="🥷🏿">mørk teint | ninja | ninjakriger | skjult | stealth</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: mørk teint</annotation>
<annotation cp="👋🏻">hånd | lys teint | vinker</annotation>
<annotation cp="👋🏻" type="tts">vinker: lys teint</annotation>
<annotation cp="👋🏼">hånd | medium til lys teint | vinker</annotation>
diff --git a/common/annotationsDerived/de.xml b/common/annotationsDerived/de.xml
index f10fe3b..5018901 100644
--- a/common/annotationsDerived/de.xml
+++ b/common/annotationsDerived/de.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">zusammengedrückte Finger: mitteldunkle Hautfarbe</annotation>
<annotation cp="🤌🏿">dunkle Hautfarbe | Finger | Handgeste | sarkastisch | zusammengedrückt | zusammengedrückte Finger</annotation>
<annotation cp="🤌🏿" type="tts">zusammengedrückte Finger: dunkle Hautfarbe</annotation>
+ <annotation cp="🥷🏻">Ausdauer | helle Hautfarbe | Kämpfer | Ninja | vermummt</annotation>
+ <annotation cp="🥷🏻" type="tts">Ninja: helle Hautfarbe</annotation>
+ <annotation cp="🥷🏼">Ausdauer | Kämpfer | mittelhelle Hautfarbe | Ninja | vermummt</annotation>
+ <annotation cp="🥷🏼" type="tts">Ninja: mittelhelle Hautfarbe</annotation>
+ <annotation cp="🥷🏽">Ausdauer | Kämpfer | mittlere Hautfarbe | Ninja | vermummt</annotation>
+ <annotation cp="🥷🏽" type="tts">Ninja: mittlere Hautfarbe</annotation>
+ <annotation cp="🥷🏾">Ausdauer | Kämpfer | mitteldunkle Hautfarbe | Ninja | vermummt</annotation>
+ <annotation cp="🥷🏾" type="tts">Ninja: mitteldunkle Hautfarbe</annotation>
+ <annotation cp="🥷🏿">Ausdauer | dunkle Hautfarbe | Kämpfer | Ninja | vermummt</annotation>
+ <annotation cp="🥷🏿" type="tts">Ninja: dunkle Hautfarbe</annotation>
<annotation cp="👋🏻">Hand | helle Hautfarbe | Winken | winkende Hand</annotation>
<annotation cp="👋🏻" type="tts">winkende Hand: helle Hautfarbe</annotation>
<annotation cp="👋🏼">Hand | mittelhelle Hautfarbe | Winken | winkende Hand</annotation>
diff --git a/common/annotationsDerived/de_CH.xml b/common/annotationsDerived/de_CH.xml
index 556170c..9b888ee 100644
--- a/common/annotationsDerived/de_CH.xml
+++ b/common/annotationsDerived/de_CH.xml
@@ -14,6 +14,11 @@
<territory type="CH"/>
</identity>
<annotations>
+ <annotation cp="🥷🏻">helle Hautfarbe | Ninja</annotation>
+ <annotation cp="🥷🏼">mittelhelle Hautfarbe | Ninja</annotation>
+ <annotation cp="🥷🏽">mittlere Hautfarbe | Ninja</annotation>
+ <annotation cp="🥷🏾">mitteldunkle Hautfarbe | Ninja</annotation>
+ <annotation cp="🥷🏿">dunkle Hautfarbe | Ninja</annotation>
<annotation cp="🖖🏻">Finger | Hand | helle Hautfarbe | Spock | Vulkanier(in) | vulkanisch | Vulkanischer Gruss</annotation>
<annotation cp="🖖🏻" type="tts">Vulkanischer Gruss: helle Hautfarbe</annotation>
<annotation cp="🖖🏼">Finger | Hand | mittelhelle Hautfarbe | Spock | Vulkanier(in) | vulkanisch | Vulkanischer Gruss</annotation>
diff --git a/common/annotationsDerived/el.xml b/common/annotationsDerived/el.xml
index 9220e32..c385423 100644
--- a/common/annotationsDerived/el.xml
+++ b/common/annotationsDerived/el.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">δάχτυλα που κλείνουν: μεσαίος-σκούρος τόνος δέρματος</annotation>
<annotation cp="🤌🏿">ανάκριση | δάχτυλα | δάχτυλα που κλείνουν | κίνηση χεριών | κλειστά | σαρκαστικό | σκούρος τόνος δέρματος</annotation>
<annotation cp="🤌🏿" type="tts">δάχτυλα που κλείνουν: σκούρος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏻">ανοιχτόχρωμος τόνος δέρματος | αόρατος | κρυμμένος | μαχητής | νίντζα</annotation>
+ <annotation cp="🥷🏻" type="tts">νίντζα: ανοιχτόχρωμος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏼">αόρατος | κρυμμένος | μαχητής | μεσαίος-ανοιχτόχρωμος τόνος δέρματος | νίντζα</annotation>
+ <annotation cp="🥷🏼" type="tts">νίντζα: μεσαίος-ανοιχτόχρωμος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏽">αόρατος | κρυμμένος | μαχητής | μεσαίος τόνος δέρματος | νίντζα</annotation>
+ <annotation cp="🥷🏽" type="tts">νίντζα: μεσαίος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏾">αόρατος | κρυμμένος | μαχητής | μεσαίος-σκούρος τόνος δέρματος | νίντζα</annotation>
+ <annotation cp="🥷🏾" type="tts">νίντζα: μεσαίος-σκούρος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏿">αόρατος | κρυμμένος | μαχητής | νίντζα | σκούρος τόνος δέρματος</annotation>
+ <annotation cp="🥷🏿" type="tts">νίντζα: σκούρος τόνος δέρματος</annotation>
<annotation cp="👋🏻">ανοιχτόχρωμος τόνος δέρματος | νεύμα | σώμα | χαιρετώ | χέρι | χέρι που χαιρετά</annotation>
<annotation cp="👋🏻" type="tts">χέρι που χαιρετά: ανοιχτόχρωμος τόνος δέρματος</annotation>
<annotation cp="👋🏼">μεσαίος-ανοιχτόχρωμος τόνος δέρματος | νεύμα | σώμα | χαιρετώ | χέρι | χέρι που χαιρετά</annotation>
diff --git a/common/annotationsDerived/en.xml b/common/annotationsDerived/en.xml
index 5f1cb1a..86f723c 100644
--- a/common/annotationsDerived/en.xml
+++ b/common/annotationsDerived/en.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">pinched fingers: medium-dark skin tone</annotation>
<annotation cp="🤌🏿">dark skin tone | fingers | hand gesture | interrogation | pinched | sarcastic</annotation>
<annotation cp="🤌🏿" type="tts">pinched fingers: dark skin tone</annotation>
+ <annotation cp="🥷🏻">fighter | hidden | light skin tone | ninja | stealth</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: light skin tone</annotation>
+ <annotation cp="🥷🏼">fighter | hidden | medium-light skin tone | ninja | stealth</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: medium-light skin tone</annotation>
+ <annotation cp="🥷🏽">fighter | hidden | medium skin tone | ninja | stealth</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: medium skin tone</annotation>
+ <annotation cp="🥷🏾">fighter | hidden | medium-dark skin tone | ninja | stealth</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: medium-dark skin tone</annotation>
+ <annotation cp="🥷🏿">dark skin tone | fighter | hidden | ninja | stealth</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: dark skin tone</annotation>
<annotation cp="👋🏻">hand | light skin tone | wave | waving</annotation>
<annotation cp="👋🏻" type="tts">waving hand: light skin tone</annotation>
<annotation cp="👋🏼">hand | medium-light skin tone | wave | waving</annotation>
diff --git a/common/annotationsDerived/es.xml b/common/annotationsDerived/es.xml
index 702438b..7d636ed 100644
--- a/common/annotationsDerived/es.xml
+++ b/common/annotationsDerived/es.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">dedos juntos apuntando hacia arriba: tono de piel oscuro medio</annotation>
<annotation cp="🤌🏿">dedos | dedos juntos apuntando hacia arriba | gesto | italia | italiano | mano | sarcasmo | tono de piel oscuro</annotation>
<annotation cp="🤌🏿" type="tts">dedos juntos apuntando hacia arriba: tono de piel oscuro</annotation>
+ <annotation cp="🥷🏻">furtivo | luchador | ninja | oculto | sigilo | tono de piel claro</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: tono de piel claro</annotation>
+ <annotation cp="🥷🏼">furtivo | luchador | ninja | oculto | sigilo | tono de piel claro medio</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: tono de piel claro medio</annotation>
+ <annotation cp="🥷🏽">furtivo | luchador | ninja | oculto | sigilo | tono de piel medio</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: tono de piel medio</annotation>
+ <annotation cp="🥷🏾">furtivo | luchador | ninja | oculto | sigilo | tono de piel oscuro medio</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: tono de piel oscuro medio</annotation>
+ <annotation cp="🥷🏿">furtivo | luchador | ninja | oculto | sigilo | tono de piel oscuro</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: tono de piel oscuro</annotation>
<annotation cp="👋🏻">agitar | mano | mano saludando | saludar | saludo | tono de piel claro</annotation>
<annotation cp="👋🏻" type="tts">mano saludando: tono de piel claro</annotation>
<annotation cp="👋🏼">agitar | mano | mano saludando | saludar | saludo | tono de piel claro medio</annotation>
diff --git a/common/annotationsDerived/es_MX.xml b/common/annotationsDerived/es_MX.xml
index c00b13d..3f522a3 100644
--- a/common/annotationsDerived/es_MX.xml
+++ b/common/annotationsDerived/es_MX.xml
@@ -24,6 +24,11 @@
<annotation cp="🤌🏾" type="tts">dedos unidos: tono de piel oscuro medio</annotation>
<annotation cp="🤌🏿">dedos unidos | tono de piel oscuro</annotation>
<annotation cp="🤌🏿" type="tts">dedos unidos: tono de piel oscuro</annotation>
+ <annotation cp="🥷🏻">luchador | ninja | oculto | silencioso | tono de piel claro</annotation>
+ <annotation cp="🥷🏼">luchador | ninja | oculto | silencioso | tono de piel claro medio</annotation>
+ <annotation cp="🥷🏽">luchador | ninja | oculto | silencioso | tono de piel medio</annotation>
+ <annotation cp="🥷🏾">luchador | ninja | oculto | silencioso | tono de piel oscuro medio</annotation>
+ <annotation cp="🥷🏿">luchador | ninja | oculto | silencioso | tono de piel oscuro</annotation>
<annotation cp="🤚🏻">dorso de la mano | tono de piel claro</annotation>
<annotation cp="🤚🏻" type="tts">dorso de la mano: tono de piel claro</annotation>
<annotation cp="🤚🏼">dorso de la mano | tono de piel claro medio</annotation>
diff --git a/common/annotationsDerived/es_US.xml b/common/annotationsDerived/es_US.xml
index fc9c24d..88bcb6f 100644
--- a/common/annotationsDerived/es_US.xml
+++ b/common/annotationsDerived/es_US.xml
@@ -14,6 +14,11 @@
<territory type="US"/>
</identity>
<annotations>
+ <annotation cp="🥷🏻">ninja | tono de piel claro</annotation>
+ <annotation cp="🥷🏼">ninja | tono de piel claro medio</annotation>
+ <annotation cp="🥷🏽">ninja | tono de piel medio</annotation>
+ <annotation cp="🥷🏾">ninja | tono de piel oscuro medio</annotation>
+ <annotation cp="🥷🏿">ninja | tono de piel oscuro</annotation>
<annotation cp="🖖🏻">saludo | spock | star | tono de piel claro | trek | vulcano</annotation>
<annotation cp="🖖🏼">saludo | spock | star | tono de piel claro medio | trek | vulcano</annotation>
<annotation cp="🖖🏽">saludo | spock | star | tono de piel medio | trek | vulcano</annotation>
diff --git a/common/annotationsDerived/et.xml b/common/annotationsDerived/et.xml
index 26c40c1..c36d92d 100644
--- a/common/annotationsDerived/et.xml
+++ b/common/annotationsDerived/et.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">kokkusurutud sõrmed: keskmiselt tume nahatoon</annotation>
<annotation cp="🤌🏿">kokkusurutud | küsimus | sarkastiline | sõrmed | tume nahatoon | žest</annotation>
<annotation cp="🤌🏿" type="tts">kokkusurutud sõrmed: tume nahatoon</annotation>
+ <annotation cp="🥷🏻">hele nahatoon | jaapan | ninja | salakuulaja | sõdalane</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: hele nahatoon</annotation>
+ <annotation cp="🥷🏼">jaapan | keskmiselt hele nahatoon | ninja | salakuulaja | sõdalane</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: keskmiselt hele nahatoon</annotation>
+ <annotation cp="🥷🏽">jaapan | keskmine nahatoon | ninja | salakuulaja | sõdalane</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: keskmine nahatoon</annotation>
+ <annotation cp="🥷🏾">jaapan | keskmiselt tume nahatoon | ninja | salakuulaja | sõdalane</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: keskmiselt tume nahatoon</annotation>
+ <annotation cp="🥷🏿">jaapan | ninja | salakuulaja | sõdalane | tume nahatoon</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: tume nahatoon</annotation>
<annotation cp="👋🏻">hele nahatoon | käsi | keha | lehvitav käsi | lehvitus</annotation>
<annotation cp="👋🏻" type="tts">lehvitav käsi: hele nahatoon</annotation>
<annotation cp="👋🏼">käsi | keha | keskmiselt hele nahatoon | lehvitav käsi | lehvitus</annotation>
diff --git a/common/annotationsDerived/eu.xml b/common/annotationsDerived/eu.xml
index 455adf8..5e81d92 100644
--- a/common/annotationsDerived/eu.xml
+++ b/common/annotationsDerived/eu.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">hatz elkartuak: 5. mota</annotation>
<annotation cp="🤌🏿">6. mota | elkartuta | esku-keinua | galdera | hatz elkartuak | hatzak | sarkasmoa</annotation>
<annotation cp="🤌🏿" type="tts">hatz elkartuak: 6. mota</annotation>
+ <annotation cp="🥷🏻">1–2. mota | borrokalari | ezkutu | isil-gorde | ninja</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: 1–2. mota</annotation>
+ <annotation cp="🥷🏼">3. mota | borrokalari | ezkutu | isil-gorde | ninja</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: 3. mota</annotation>
+ <annotation cp="🥷🏽">bitarteko azal-tonua | borrokalari | ezkutu | isil-gorde | ninja</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: bitarteko azal-tonua</annotation>
+ <annotation cp="🥷🏾">5. mota | borrokalari | ezkutu | isil-gorde | ninja</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: 5. mota</annotation>
+ <annotation cp="🥷🏿">6. mota | borrokalari | ezkutu | isil-gorde | ninja</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: 6. mota</annotation>
<annotation cp="👋🏻">1–2. mota | eskua | gorputza | mugitu | mugitzen ari den eskua</annotation>
<annotation cp="👋🏻" type="tts">mugitzen ari den eskua: 1–2. mota</annotation>
<annotation cp="👋🏼">3. mota | eskua | gorputza | mugitu | mugitzen ari den eskua</annotation>
diff --git a/common/annotationsDerived/fa.xml b/common/annotationsDerived/fa.xml
index 87b332e..6f8a492 100644
--- a/common/annotationsDerived/fa.xml
+++ b/common/annotationsDerived/fa.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">انگشتان جمعشده: پوست گندمی</annotation>
<annotation cp="🤌🏿">اشاره با دست | انگشتان | پوست آبنوسی | جمعشده | سؤال | طنزآلود</annotation>
<annotation cp="🤌🏿" type="tts">انگشتان جمعشده: پوست آبنوسی</annotation>
+ <annotation cp="🥷🏻">پوست سفید | جنگجو | دزدکی | مخفی | نینجا</annotation>
+ <annotation cp="🥷🏻" type="tts">نینجا: پوست سفید</annotation>
+ <annotation cp="🥷🏼">پوست روشن | جنگجو | دزدکی | مخفی | نینجا</annotation>
+ <annotation cp="🥷🏼" type="tts">نینجا: پوست روشن</annotation>
+ <annotation cp="🥷🏽">پوست طلایی | جنگجو | دزدکی | مخفی | نینجا</annotation>
+ <annotation cp="🥷🏽" type="tts">نینجا: پوست طلایی</annotation>
+ <annotation cp="🥷🏾">پوست گندمی | جنگجو | دزدکی | مخفی | نینجا</annotation>
+ <annotation cp="🥷🏾" type="tts">نینجا: پوست گندمی</annotation>
+ <annotation cp="🥷🏿">پوست آبنوسی | جنگجو | دزدکی | مخفی | نینجا</annotation>
+ <annotation cp="🥷🏿" type="tts">نینجا: پوست آبنوسی</annotation>
<annotation cp="👋🏻">بدن | پوست سفید | تکان دادن | تکان دادن دست | دست | موج</annotation>
<annotation cp="👋🏻" type="tts">تکان دادن دست: پوست سفید</annotation>
<annotation cp="👋🏼">بدن | پوست روشن | تکان دادن | تکان دادن دست | دست | موج</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">بزرگسال: پوست گندمی، تاس</annotation>
<annotation cp="🧑🏿🦲">بزرگسال | پوست آبنوسی | تاس | جنس خنثی</annotation>
<annotation cp="🧑🏿🦲" type="tts">بزرگسال: پوست آبنوسی، تاس</annotation>
- <annotation cp="🧑🏻🍼">بچه | پوست سفید | شخص | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
+ <annotation cp="🧑🏻🍼">بچه | پوست سفید | شخص | شخصی که به بچه شیر میدهد | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
<annotation cp="🧑🏻🍼" type="tts">شخصی که به بچه شیر میدهد: پوست سفید</annotation>
- <annotation cp="🧑🏼🍼">بچه | پوست روشن | شخص | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
+ <annotation cp="🧑🏼🍼">بچه | پوست روشن | شخص | شخصی که به بچه شیر میدهد | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
<annotation cp="🧑🏼🍼" type="tts">شخصی که به بچه شیر میدهد: پوست روشن</annotation>
- <annotation cp="🧑🏽🍼">بچه | پوست طلایی | شخص | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
+ <annotation cp="🧑🏽🍼">بچه | پوست طلایی | شخص | شخصی که به بچه شیر میدهد | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
<annotation cp="🧑🏽🍼" type="tts">شخصی که به بچه شیر میدهد: پوست طلایی</annotation>
- <annotation cp="🧑🏾🍼">بچه | پوست گندمی | شخص | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
+ <annotation cp="🧑🏾🍼">بچه | پوست گندمی | شخص | شخصی که به بچه شیر میدهد | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
<annotation cp="🧑🏾🍼" type="tts">شخصی که به بچه شیر میدهد: پوست گندمی</annotation>
- <annotation cp="🧑🏿🍼">بچه | پوست آبنوسی | شخص | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
+ <annotation cp="🧑🏿🍼">بچه | پوست آبنوسی | شخص | شخصی که به بچه شیر میدهد | شخصی که به بچه غذا میدهد | شیر | غذا دادن | مراقبت</annotation>
<annotation cp="🧑🏿🍼" type="tts">شخصی که به بچه شیر میدهد: پوست آبنوسی</annotation>
<annotation cp="🧑🏻🎄">پوست سفید | نوئل | نوئل، کریسمس</annotation>
<annotation cp="🧑🏻🎄" type="tts">نوئل: پوست سفید</annotation>
diff --git a/common/annotationsDerived/fi.xml b/common/annotationsDerived/fi.xml
index 4ad6cf4..ef6d870 100644
--- a/common/annotationsDerived/fi.xml
+++ b/common/annotationsDerived/fi.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">käsi supussa: keskitumma iho</annotation>
<annotation cp="🤌🏿">käsi supussa | käsiele | kuulustelu | mitä | sarkastinen | sormet | supussa | tumma iho</annotation>
<annotation cp="🤌🏿" type="tts">käsi supussa: tumma iho</annotation>
+ <annotation cp="🥷🏻">ninja | piilossa | soturi | taistelija | vaalea iho | väijyy</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: vaalea iho</annotation>
+ <annotation cp="🥷🏼">keskivaalea iho | ninja | piilossa | soturi | taistelija | väijyy</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: keskivaalea iho</annotation>
+ <annotation cp="🥷🏽">ninja | piilossa | soturi | taistelija | tummanvaalea iho | väijyy</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: tummanvaalea iho</annotation>
+ <annotation cp="🥷🏾">keskitumma iho | ninja | piilossa | soturi | taistelija | väijyy</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: keskitumma iho</annotation>
+ <annotation cp="🥷🏿">ninja | piilossa | soturi | taistelija | tumma iho | väijyy</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: tumma iho</annotation>
<annotation cp="👋🏻">heilautus | käden heilautus | käsi | vaalea iho | vartalo | vilkuttaa</annotation>
<annotation cp="👋🏻" type="tts">käden heilautus: vaalea iho</annotation>
<annotation cp="👋🏼">heilautus | käden heilautus | käsi | keskivaalea iho | vartalo | vilkuttaa</annotation>
diff --git a/common/annotationsDerived/fil.xml b/common/annotationsDerived/fil.xml
index 640d9bd..82dfd48 100644
--- a/common/annotationsDerived/fil.xml
+++ b/common/annotationsDerived/fil.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">pakurot na daliri: katamtamang dark na kulay ng balat</annotation>
<annotation cp="🤌🏿">daliri | dark na kulay ng balat | hand gesture | pakurot | pakurot na daliri</annotation>
<annotation cp="🤌🏿" type="tts">pakurot na daliri: dark na kulay ng balat</annotation>
+ <annotation cp="🥷🏻">light na kulay ng balat | manlalaban | nakatago | ninja | stealth</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: light na kulay ng balat</annotation>
+ <annotation cp="🥷🏼">katamtamang light na kulay ng balat | manlalaban | nakatago | ninja | stealth</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: katamtamang light na kulay ng balat</annotation>
+ <annotation cp="🥷🏽">katamtamang kulay ng balat | manlalaban | nakatago | ninja | stealth</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: katamtamang kulay ng balat</annotation>
+ <annotation cp="🥷🏾">katamtamang dark na kulay ng balat | manlalaban | nakatago | ninja | stealth</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: katamtamang dark na kulay ng balat</annotation>
+ <annotation cp="🥷🏿">dark na kulay ng balat | manlalaban | nakatago | ninja | stealth</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: dark na kulay ng balat</annotation>
<annotation cp="👋🏻">bumabati | kamay | kumakaway | kumakaway na kamay | light na kulay ng balat</annotation>
<annotation cp="👋🏻" type="tts">kumakaway na kamay: light na kulay ng balat</annotation>
<annotation cp="👋🏼">bumabati | kamay | katamtamang light na kulay ng balat | kumakaway | kumakaway na kamay</annotation>
diff --git a/common/annotationsDerived/fo.xml b/common/annotationsDerived/fo.xml
index 66df02e..5f42589 100644
--- a/common/annotationsDerived/fo.xml
+++ b/common/annotationsDerived/fo.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">samlaðir fingrar: miðalmyrkur húðarlitur</annotation>
<annotation cp="🤌🏿">fingrar | hond | hondtekin | myrkur húðarlitur | samlaðir fingrar</annotation>
<annotation cp="🤌🏿" type="tts">samlaðir fingrar: myrkur húðarlitur</annotation>
+ <annotation cp="🥷🏻">fjaldur | ljósur húðarlitur | ninja | ninja andlit | sníkjandi | stríðsmaður</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja andlit: ljósur húðarlitur</annotation>
+ <annotation cp="🥷🏼">fjaldur | miðalljósur húðarlitur | ninja | ninja andlit | sníkjandi | stríðsmaður</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja andlit: miðalljósur húðarlitur</annotation>
+ <annotation cp="🥷🏽">fjaldur | miðal húðarlitur | ninja | ninja andlit | sníkjandi | stríðsmaður</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja andlit: miðal húðarlitur</annotation>
+ <annotation cp="🥷🏾">fjaldur | miðalmyrkur húðarlitur | ninja | ninja andlit | sníkjandi | stríðsmaður</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja andlit: miðalmyrkur húðarlitur</annotation>
+ <annotation cp="🥷🏿">fjaldur | myrkur húðarlitur | ninja | ninja andlit | sníkjandi | stríðsmaður</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja andlit: myrkur húðarlitur</annotation>
<annotation cp="👋🏻">hond | ljósur húðarlitur | veitra | veitrandi hond | vinka</annotation>
<annotation cp="👋🏻" type="tts">veitrandi hond: ljósur húðarlitur</annotation>
<annotation cp="👋🏼">hond | miðalljósur húðarlitur | veitra | veitrandi hond | vinka</annotation>
diff --git a/common/annotationsDerived/fr.xml b/common/annotationsDerived/fr.xml
index 232d251..c5c0043 100644
--- a/common/annotationsDerived/fr.xml
+++ b/common/annotationsDerived/fr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">bout des doigts joints : peau mate</annotation>
<annotation cp="🤌🏿">argumentation | bout des doigts joints | doigts | geste | main | parler avec les mains | peau foncée</annotation>
<annotation cp="🤌🏿" type="tts">bout des doigts joints : peau foncée</annotation>
+ <annotation cp="🥷🏻">furtif | guerrier | masqué | ninja | peau claire</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja : peau claire</annotation>
+ <annotation cp="🥷🏼">furtif | guerrier | masqué | ninja | peau moyennement claire</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja : peau moyennement claire</annotation>
+ <annotation cp="🥷🏽">furtif | guerrier | masqué | ninja | peau légèrement mate</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja : peau légèrement mate</annotation>
+ <annotation cp="🥷🏾">furtif | guerrier | masqué | ninja | peau mate</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja : peau mate</annotation>
+ <annotation cp="🥷🏿">furtif | guerrier | masqué | ninja | peau foncée</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja : peau foncée</annotation>
<annotation cp="👋🏻">coucou | main | peau claire | signe de la main</annotation>
<annotation cp="👋🏻" type="tts">signe de la main : peau claire</annotation>
<annotation cp="👋🏼">coucou | main | peau moyennement claire | signe de la main</annotation>
diff --git a/common/annotationsDerived/fr_CA.xml b/common/annotationsDerived/fr_CA.xml
index 17cf216..6cba387 100644
--- a/common/annotationsDerived/fr_CA.xml
+++ b/common/annotationsDerived/fr_CA.xml
@@ -24,6 +24,13 @@
<annotation cp="🤌🏾" type="tts">main qui interroge : peau modérément foncée</annotation>
<annotation cp="🤌🏿">geste de la main | interrogation | main qui interroge | peau foncée | sarcastique</annotation>
<annotation cp="🤌🏿" type="tts">main qui interroge : peau foncée</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja : peau claire</annotation>
+ <annotation cp="🥷🏼">furtif | guerrier | masqué | ninja | peau modérément claire</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja : peau modérément claire</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja : peau légèrement mate</annotation>
+ <annotation cp="🥷🏾">furtif | guerrier | masqué | ninja | peau modérément foncée</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja : peau modérément foncée</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja : peau foncée</annotation>
<annotation cp="👋🏻">coucou | main | peau claire | signe | signe de la main</annotation>
<annotation cp="👋🏻" type="tts">signe de la main : peau claire</annotation>
<annotation cp="👋🏼">coucou | main | peau modérément claire | signe | signe de la main</annotation>
diff --git a/common/annotationsDerived/ga.xml b/common/annotationsDerived/ga.xml
index 66c48c0..9cce74b 100644
--- a/common/annotationsDerived/ga.xml
+++ b/common/annotationsDerived/ga.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">meára tnáite: ton cnis meándorcha</annotation>
<annotation cp="🤌🏿">meára tnáite | ton cnis dorcha</annotation>
<annotation cp="🤌🏿" type="tts">meára tnáite: ton cnis dorcha</annotation>
+ <annotation cp="🥷🏻">ninja | ton cnis geal</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ton cnis geal</annotation>
+ <annotation cp="🥷🏼">ninja | ton cnis mheánach-gheal</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: ton cnis mheánach-gheal</annotation>
+ <annotation cp="🥷🏽">ninja | ton cnis meánach</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: ton cnis meánach</annotation>
+ <annotation cp="🥷🏾">ninja | ton cnis meándorcha</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: ton cnis meándorcha</annotation>
+ <annotation cp="🥷🏿">ninja | ton cnis dorcha</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: ton cnis dorcha</annotation>
<annotation cp="👋🏻">croitheadh | lámh | lámh ag croitheadh | ton cnis geal</annotation>
<annotation cp="👋🏻" type="tts">lámh ag croitheadh: ton cnis geal</annotation>
<annotation cp="👋🏼">croitheadh | lámh | lámh ag croitheadh | ton cnis mheánach-gheal</annotation>
diff --git a/common/annotationsDerived/gd.xml b/common/annotationsDerived/gd.xml
index d085716..7222b1d 100644
--- a/common/annotationsDerived/gd.xml
+++ b/common/annotationsDerived/gd.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">crudhagan: tòna meadhanach doilleir a’ chraicinn</annotation>
<annotation cp="🤌🏿">beumach | beur | ceist | corrag | cruadhagan | crudhagan | gluasad làimhe | meòir | meur | tearrachdail | tòna doilleir a’ chraicinn</annotation>
<annotation cp="🤌🏿" type="tts">crudhagan: tòna doilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏻">fàillidh | falaichte | gaisgeach | ninja | tòna soilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: tòna soilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏼">fàillidh | falaichte | gaisgeach | ninja | tòna meadhanach soilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: tòna meadhanach soilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏽">fàillidh | falaichte | gaisgeach | ninja | tòna meadhanach a’ chraicinn</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: tòna meadhanach a’ chraicinn</annotation>
+ <annotation cp="🥷🏾">fàillidh | falaichte | gaisgeach | ninja | tòna meadhanach doilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: tòna meadhanach doilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏿">fàillidh | falaichte | gaisgeach | ninja | tòna doilleir a’ chraicinn</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: tòna doilleir a’ chraicinn</annotation>
<annotation cp="👋🏻">làmh | làmh a’ smèideadh | smèid | smèideadh | tòna soilleir a’ chraicinn</annotation>
<annotation cp="👋🏻" type="tts">làmh a’ smèideadh: tòna soilleir a’ chraicinn</annotation>
<annotation cp="👋🏼">làmh | làmh a’ smèideadh | smèid | smèideadh | tòna meadhanach soilleir a’ chraicinn</annotation>
diff --git a/common/annotationsDerived/gl.xml b/common/annotationsDerived/gl.xml
index e29e5d0..2f710c9 100644
--- a/common/annotationsDerived/gl.xml
+++ b/common/annotationsDerived/gl.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">xesto de "ateigado": ton de pel escuro</annotation>
<annotation cp="🤌🏿">a tope | ateigado | de bote en bote | petado | ton de pel moi escuro | xesto de "ateigado"</annotation>
<annotation cp="🤌🏿" type="tts">xesto de "ateigado": ton de pel moi escuro</annotation>
+ <annotation cp="🥷🏻">combatente | guerreiro | ninja | silandeiro | sixiloso | ton de pel moi claro</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ton de pel moi claro</annotation>
+ <annotation cp="🥷🏼">combatente | guerreiro | ninja | silandeiro | sixiloso | ton de pel claro</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: ton de pel claro</annotation>
+ <annotation cp="🥷🏽">combatente | guerreiro | ninja | silandeiro | sixiloso | ton de pel medio</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: ton de pel medio</annotation>
+ <annotation cp="🥷🏾">combatente | guerreiro | ninja | silandeiro | sixiloso | ton de pel escuro</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: ton de pel escuro</annotation>
+ <annotation cp="🥷🏿">combatente | guerreiro | ninja | silandeiro | sixiloso | ton de pel moi escuro</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: ton de pel moi escuro</annotation>
<annotation cp="👋🏻">man | man saudando | saudar | saúdo | ton de pel moi claro</annotation>
<annotation cp="👋🏻" type="tts">man saudando: ton de pel moi claro</annotation>
<annotation cp="👋🏼">man | man saudando | saudar | saúdo | ton de pel claro</annotation>
diff --git a/common/annotationsDerived/gu.xml b/common/annotationsDerived/gu.xml
index e7c6c7b..e99c6c2 100644
--- a/common/annotationsDerived/gu.xml
+++ b/common/annotationsDerived/gu.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ચીમટી દેવા તૈયાર આંગળીઓ: મધ્યમ ઘેરો ચામડીનો રંગ</annotation>
<annotation cp="🤌🏿">આંગળીઓ | કટાક્ષવાળું | ઘેરો ચામડીનો રંગ | ચીમટી આપવી | ચીમટી દેવા તૈયાર આંગળીઓ | પૂછપરછ | હાથનો સંકેત</annotation>
<annotation cp="🤌🏿" type="tts">ચીમટી દેવા તૈયાર આંગળીઓ: ઘેરો ચામડીનો રંગ</annotation>
+ <annotation cp="🥷🏻">ચામડીનો આછો રંગ | ચોરીચૂપકી | છુપાયેલ | નિન્જા | યોદ્ધો</annotation>
+ <annotation cp="🥷🏻" type="tts">નિન્જા: ચામડીનો આછો રંગ</annotation>
+ <annotation cp="🥷🏼">ચામડીનો મધ્યમ આછો રંગ | ચોરીચૂપકી | છુપાયેલ | નિન્જા | યોદ્ધો</annotation>
+ <annotation cp="🥷🏼" type="tts">નિન્જા: ચામડીનો મધ્યમ આછો રંગ</annotation>
+ <annotation cp="🥷🏽">ચોરીચૂપકી | છુપાયેલ | નિન્જા | મધ્યમ ચામડીનો રંગ | યોદ્ધો</annotation>
+ <annotation cp="🥷🏽" type="tts">નિન્જા: મધ્યમ ચામડીનો રંગ</annotation>
+ <annotation cp="🥷🏾">ચોરીચૂપકી | છુપાયેલ | નિન્જા | મધ્યમ ઘેરો ચામડીનો રંગ | યોદ્ધો</annotation>
+ <annotation cp="🥷🏾" type="tts">નિન્જા: મધ્યમ ઘેરો ચામડીનો રંગ</annotation>
+ <annotation cp="🥷🏿">ઘેરો ચામડીનો રંગ | ચોરીચૂપકી | છુપાયેલ | નિન્જા | યોદ્ધો</annotation>
+ <annotation cp="🥷🏿" type="tts">નિન્જા: ઘેરો ચામડીનો રંગ</annotation>
<annotation cp="👋🏻">ચામડીનો આછો રંગ | હલાવવા | હાથ</annotation>
<annotation cp="👋🏻" type="tts">હાથ હલાવવા: ચામડીનો આછો રંગ</annotation>
<annotation cp="👋🏼">ચામડીનો મધ્યમ આછો રંગ | હલાવવા | હાથ</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">વ્યક્તિ: મધ્યમ ઘેરો ચામડીનો રંગ, ટાલ</annotation>
<annotation cp="🧑🏿🦲">અનિર્દિષ્ટ લિંગ | ઘેરો ચામડીનો રંગ | ટાલ | પુખ્ત | લિંગ-તટસ્થ | વ્યક્તિ</annotation>
<annotation cp="🧑🏿🦲" type="tts">વ્યક્તિ: ઘેરો ચામડીનો રંગ, ટાલ</annotation>
- <annotation cp="🧑🏻🍼">ખોરાક | ચામડીનો આછો રંગ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
+ <annotation cp="🧑🏻🍼">ખોરાક | ચામડીનો આછો રંગ | બળકને ખોરાક આપતી વ્યક્તિ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
<annotation cp="🧑🏻🍼" type="tts">બળકને ખોરાક આપતી વ્યક્તિ: ચામડીનો આછો રંગ</annotation>
- <annotation cp="🧑🏼🍼">ખોરાક | ચામડીનો મધ્યમ આછો રંગ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
+ <annotation cp="🧑🏼🍼">ખોરાક | ચામડીનો મધ્યમ આછો રંગ | બળકને ખોરાક આપતી વ્યક્તિ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
<annotation cp="🧑🏼🍼" type="tts">બળકને ખોરાક આપતી વ્યક્તિ: ચામડીનો મધ્યમ આછો રંગ</annotation>
- <annotation cp="🧑🏽🍼">ખોરાક | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | મધ્યમ ચામડીનો રંગ | વ્યક્તિ | સારવાર કરતી</annotation>
+ <annotation cp="🧑🏽🍼">ખોરાક | બળકને ખોરાક આપતી વ્યક્તિ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | મધ્યમ ચામડીનો રંગ | વ્યક્તિ | સારવાર કરતી</annotation>
<annotation cp="🧑🏽🍼" type="tts">બળકને ખોરાક આપતી વ્યક્તિ: મધ્યમ ચામડીનો રંગ</annotation>
- <annotation cp="🧑🏾🍼">ખોરાક | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | મધ્યમ ઘેરો ચામડીનો રંગ | વ્યક્તિ | સારવાર કરતી</annotation>
+ <annotation cp="🧑🏾🍼">ખોરાક | બળકને ખોરાક આપતી વ્યક્તિ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | મધ્યમ ઘેરો ચામડીનો રંગ | વ્યક્તિ | સારવાર કરતી</annotation>
<annotation cp="🧑🏾🍼" type="tts">બળકને ખોરાક આપતી વ્યક્તિ: મધ્યમ ઘેરો ચામડીનો રંગ</annotation>
- <annotation cp="🧑🏿🍼">ખોરાક | ઘેરો ચામડીનો રંગ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
+ <annotation cp="🧑🏿🍼">ખોરાક | ઘેરો ચામડીનો રંગ | બળકને ખોરાક આપતી વ્યક્તિ | બાળકને | બાળકને ખોરાક આપતી વ્યક્તિ | વ્યક્તિ | સારવાર કરતી</annotation>
<annotation cp="🧑🏿🍼" type="tts">બળકને ખોરાક આપતી વ્યક્તિ: ઘેરો ચામડીનો રંગ</annotation>
<annotation cp="🧑🏻🎄">એમએક્સ ક્લોઝ | ક્લોઝ, નાતાલ | ચામડીનો આછો રંગ</annotation>
<annotation cp="🧑🏻🎄" type="tts">એમએક્સ ક્લોઝ: ચામડીનો આછો રંગ</annotation>
diff --git a/common/annotationsDerived/he.xml b/common/annotationsDerived/he.xml
index be8ca99..d4e8775 100644
--- a/common/annotationsDerived/he.xml
+++ b/common/annotationsDerived/he.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">יד מסמנת רק רגע: גוון עור כהה בינוני</annotation>
<annotation cp="🤌🏿">אצבעות | גוון עור כהה | יד מסמנת רק רגע | כף יד | רק רגע | תיכף</annotation>
<annotation cp="🤌🏿" type="tts">יד מסמנת רק רגע: גוון עור כהה</annotation>
+ <annotation cp="🥷🏻">אומנויות לחימה | גוון עור בהיר | לוחם | נינג׳ה</annotation>
+ <annotation cp="🥷🏻" type="tts">נינג׳ה: גוון עור בהיר</annotation>
+ <annotation cp="🥷🏼">אומנויות לחימה | גוון עור בהיר בינוני | לוחם | נינג׳ה</annotation>
+ <annotation cp="🥷🏼" type="tts">נינג׳ה: גוון עור בהיר בינוני</annotation>
+ <annotation cp="🥷🏽">אומנויות לחימה | גוון עור בינוני | לוחם | נינג׳ה</annotation>
+ <annotation cp="🥷🏽" type="tts">נינג׳ה: גוון עור בינוני</annotation>
+ <annotation cp="🥷🏾">אומנויות לחימה | גוון עור כהה בינוני | לוחם | נינג׳ה</annotation>
+ <annotation cp="🥷🏾" type="tts">נינג׳ה: גוון עור כהה בינוני</annotation>
+ <annotation cp="🥷🏿">אומנויות לחימה | גוון עור כהה | לוחם | נינג׳ה</annotation>
+ <annotation cp="🥷🏿" type="tts">נינג׳ה: גוון עור כהה</annotation>
<annotation cp="👋🏻">ביי | גוון עור בהיר | יד | להתראות | מנופפת</annotation>
<annotation cp="👋🏻" type="tts">יד מנופפת: גוון עור בהיר</annotation>
<annotation cp="👋🏼">ביי | גוון עור בהיר בינוני | יד | להתראות | מנופפת</annotation>
diff --git a/common/annotationsDerived/hi.xml b/common/annotationsDerived/hi.xml
index 2b20d49..3d3edb6 100644
--- a/common/annotationsDerived/hi.xml
+++ b/common/annotationsDerived/hi.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">सिकोड़ी हुई अंगुलियाँ: हल्की साँवली त्वचा</annotation>
<annotation cp="🤌🏿">उंगलियां | पूछ-ताछ | व्यंग्यपूर्ण | साँवली त्वचा | सिकोड़ी हुई अंगुलियाँ | सूखा हुआ | हाथ का इशारा</annotation>
<annotation cp="🤌🏿" type="tts">सिकोड़ी हुई अंगुलियाँ: साँवली त्वचा</annotation>
+ <annotation cp="🥷🏻">गोरी त्वचा | चालबाज़ी | छिपा हुआ | निंजा | लड़ाकू</annotation>
+ <annotation cp="🥷🏻" type="tts">निंजा: गोरी त्वचा</annotation>
+ <annotation cp="🥷🏼">चालबाज़ी | छिपा हुआ | निंजा | लड़ाकू | हल्की गोरी त्वचा</annotation>
+ <annotation cp="🥷🏼" type="tts">निंजा: हल्की गोरी त्वचा</annotation>
+ <annotation cp="🥷🏽">गेहुँआ त्वचा | चालबाज़ी | छिपा हुआ | निंजा | लड़ाकू</annotation>
+ <annotation cp="🥷🏽" type="tts">निंजा: गेहुँआ त्वचा</annotation>
+ <annotation cp="🥷🏾">चालबाज़ी | छिपा हुआ | निंजा | लड़ाकू | हल्की साँवली त्वचा</annotation>
+ <annotation cp="🥷🏾" type="tts">निंजा: हल्की साँवली त्वचा</annotation>
+ <annotation cp="🥷🏿">चालबाज़ी | छिपा हुआ | निंजा | लड़ाकू | साँवली त्वचा</annotation>
+ <annotation cp="🥷🏿" type="tts">निंजा: साँवली त्वचा</annotation>
<annotation cp="👋🏻">गोरी त्वचा | हाथ | हिलाना</annotation>
<annotation cp="👋🏻" type="tts">हाथ हिलाना: गोरी त्वचा</annotation>
<annotation cp="👋🏼">हल्की गोरी त्वचा | हाथ | हिलाना</annotation>
diff --git a/common/annotationsDerived/hr.xml b/common/annotationsDerived/hr.xml
index a17f2d9..65bc359 100644
--- a/common/annotationsDerived/hr.xml
+++ b/common/annotationsDerived/hr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">skupljeni prsti: smeđa boja kože</annotation>
<annotation cp="🤌🏿">gesta rukom | ispitivanje | prsti | sarkastično | skupljeni prsti | tamno smeđa boja kože | uštipnuti</annotation>
<annotation cp="🤌🏿" type="tts">skupljeni prsti: tamno smeđa boja kože</annotation>
+ <annotation cp="🥷🏻">borac | nindža | prikradanje | skrivanje | svijetla boja kože</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: svijetla boja kože</annotation>
+ <annotation cp="🥷🏼">borac | nindža | prikradanje | skrivanje | svijetlo maslinasta boja kože</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: svijetlo maslinasta boja kože</annotation>
+ <annotation cp="🥷🏽">borac | maslinasta boja kože | nindža | prikradanje | skrivanje</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: maslinasta boja kože</annotation>
+ <annotation cp="🥷🏾">borac | nindža | prikradanje | skrivanje | smeđa boja kože</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: smeđa boja kože</annotation>
+ <annotation cp="🥷🏿">borac | nindža | prikradanje | skrivanje | tamno smeđa boja kože</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: tamno smeđa boja kože</annotation>
<annotation cp="👋🏻">mahanje | ruka | ruka koja maše | šaka | svijetla boja kože | tijelo</annotation>
<annotation cp="👋🏻" type="tts">ruka koja maše: svijetla boja kože</annotation>
<annotation cp="👋🏼">mahanje | ruka | ruka koja maše | šaka | svijetlo maslinasta boja kože | tijelo</annotation>
diff --git a/common/annotationsDerived/hu.xml b/common/annotationsDerived/hu.xml
index 603b086..7cee084 100644
--- a/common/annotationsDerived/hu.xml
+++ b/common/annotationsDerived/hu.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">összecsippentett ujjak: közepesen sötét bőrtónus</annotation>
<annotation cp="🤌🏿">gúnyos | kézmozdulat | kihallgatás | összecsippentett | sötét bőrtónus | ujjak</annotation>
<annotation cp="🤌🏿" type="tts">összecsippentett ujjak: sötét bőrtónus</annotation>
+ <annotation cp="🥷🏻">harcos | nindzsa | rejtett | rejtőzködés | világos bőrtónus</annotation>
+ <annotation cp="🥷🏻" type="tts">nindzsa: világos bőrtónus</annotation>
+ <annotation cp="🥷🏼">harcos | közepesen világos bőrtónus | nindzsa | rejtett | rejtőzködés</annotation>
+ <annotation cp="🥷🏼" type="tts">nindzsa: közepesen világos bőrtónus</annotation>
+ <annotation cp="🥷🏽">harcos | közepes bőrtónus | nindzsa | rejtett | rejtőzködés</annotation>
+ <annotation cp="🥷🏽" type="tts">nindzsa: közepes bőrtónus</annotation>
+ <annotation cp="🥷🏾">harcos | közepesen sötét bőrtónus | nindzsa | rejtett | rejtőzködés</annotation>
+ <annotation cp="🥷🏾" type="tts">nindzsa: közepesen sötét bőrtónus</annotation>
+ <annotation cp="🥷🏿">harcos | nindzsa | rejtett | rejtőzködés | sötét bőrtónus</annotation>
+ <annotation cp="🥷🏿" type="tts">nindzsa: sötét bőrtónus</annotation>
<annotation cp="👋🏻">integetés | integető kéz | kéz | test | világos bőrtónus</annotation>
<annotation cp="👋🏻" type="tts">integető kéz: világos bőrtónus</annotation>
<annotation cp="👋🏼">integetés | integető kéz | kéz | közepesen világos bőrtónus | test</annotation>
diff --git a/common/annotationsDerived/hy.xml b/common/annotationsDerived/hy.xml
index 14028eb..1af5c38 100644
--- a/common/annotationsDerived/hy.xml
+++ b/common/annotationsDerived/hy.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">պտղունց․ միջին մուգ գույնի մաշկ</annotation>
<annotation cp="🤌🏿">բացատրություն | ժեստ | հեգնանք | մատներ | մուգ գույնի մաշկ | պտղունց</annotation>
<annotation cp="🤌🏿" type="tts">պտղունց․ մուգ գույնի մաշկ</annotation>
+ <annotation cp="🥷🏻">աննկատ | բաց գույնի մաշկ | մարտիկ | նինջա | քողարկված</annotation>
+ <annotation cp="🥷🏻" type="tts">նինջա․ բաց գույնի մաշկ</annotation>
+ <annotation cp="🥷🏼">աննկատ | մարտիկ | միջին բաց գույնի մաշկ | նինջա | քողարկված</annotation>
+ <annotation cp="🥷🏼" type="tts">նինջա․ միջին բաց գույնի մաշկ</annotation>
+ <annotation cp="🥷🏽">աննկատ | մարտիկ | միջին գույնի մաշկ | նինջա | քողարկված</annotation>
+ <annotation cp="🥷🏽" type="tts">նինջա․ միջին գույնի մաշկ</annotation>
+ <annotation cp="🥷🏾">աննկատ | մարտիկ | միջին մուգ գույնի մաշկ | նինջա | քողարկված</annotation>
+ <annotation cp="🥷🏾" type="tts">նինջա․ միջին մուգ գույնի մաշկ</annotation>
+ <annotation cp="🥷🏿">աննկատ | մարտիկ | մուգ գույնի մաշկ | նինջա | քողարկված</annotation>
+ <annotation cp="🥷🏿" type="tts">նինջա․ մուգ գույնի մաշկ</annotation>
<annotation cp="👋🏻">բաց գույնի մաշկ | թափահարել | թափահարող | ձեռք | մարմին</annotation>
<annotation cp="👋🏻" type="tts">թափահարող ձեռք․ բաց գույնի մաշկ</annotation>
<annotation cp="👋🏼">թափահարել | թափահարող | ձեռք | մարմին | միջին բաց գույնի մաշկ</annotation>
diff --git a/common/annotationsDerived/id.xml b/common/annotationsDerived/id.xml
index 53716fd..09e0f53 100644
--- a/common/annotationsDerived/id.xml
+++ b/common/annotationsDerived/id.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">jari terkuncup: warna kulit gelap-sedang</annotation>
<annotation cp="🤌🏿">interogasi | isyarat tangan | jari | sarkastik | terkuncup | warna kulit gelap</annotation>
<annotation cp="🤌🏿" type="tts">jari terkuncup: warna kulit gelap</annotation>
+ <annotation cp="🥷🏻">ninja | petarung | sembunyi-sembunyi | tersembunyi | warna kulit cerah</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: warna kulit cerah</annotation>
+ <annotation cp="🥷🏼">ninja | petarung | sembunyi-sembunyi | tersembunyi | warna kulit cerah-sedang</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: warna kulit cerah-sedang</annotation>
+ <annotation cp="🥷🏽">ninja | petarung | sembunyi-sembunyi | tersembunyi | warna kulit sedang</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: warna kulit sedang</annotation>
+ <annotation cp="🥷🏾">ninja | petarung | sembunyi-sembunyi | tersembunyi | warna kulit gelap-sedang</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: warna kulit gelap-sedang</annotation>
+ <annotation cp="🥷🏿">ninja | petarung | sembunyi-sembunyi | tersembunyi | warna kulit gelap</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: warna kulit gelap</annotation>
<annotation cp="👋🏻">badan | lambai | tangan | tangan melambai | tubuh | warna kulit cerah</annotation>
<annotation cp="👋🏻" type="tts">tangan melambai: warna kulit cerah</annotation>
<annotation cp="👋🏼">badan | lambai | tangan | tangan melambai | tubuh | warna kulit cerah-sedang</annotation>
diff --git a/common/annotationsDerived/is.xml b/common/annotationsDerived/is.xml
index bb77483..8e3e8e1 100644
--- a/common/annotationsDerived/is.xml
+++ b/common/annotationsDerived/is.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">klípandi fingur: meðaldökkur húðlitur</annotation>
<annotation cp="🤌🏿">dökkur húðlitur | fingur | handahreyfing | kaldhæðni | klípa | klípandi fingur | yfirheyrsla</annotation>
<annotation cp="🤌🏿" type="tts">klípandi fingur: dökkur húðlitur</annotation>
+ <annotation cp="🥷🏻">bardagamaður | falinn | laumulegur | ljós húðlitur | ninja</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ljós húðlitur</annotation>
+ <annotation cp="🥷🏼">bardagamaður | falinn | laumulegur | meðalljós húðlitur | ninja</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: meðalljós húðlitur</annotation>
+ <annotation cp="🥷🏽">bardagamaður | falinn | laumulegur | millihúðlitur | ninja</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: millihúðlitur</annotation>
+ <annotation cp="🥷🏾">bardagamaður | falinn | laumulegur | meðaldökkur húðlitur | ninja</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: meðaldökkur húðlitur</annotation>
+ <annotation cp="🥷🏿">bardagamaður | dökkur húðlitur | falinn | laumulegur | ninja</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: dökkur húðlitur</annotation>
<annotation cp="👋🏻">hönd | hönd veifar | ljós húðlitur | veifa</annotation>
<annotation cp="👋🏻" type="tts">hönd veifar: ljós húðlitur</annotation>
<annotation cp="👋🏼">hönd | hönd veifar | meðalljós húðlitur | veifa</annotation>
diff --git a/common/annotationsDerived/it.xml b/common/annotationsDerived/it.xml
index df95b2e..7f4da1d 100644
--- a/common/annotationsDerived/it.xml
+++ b/common/annotationsDerived/it.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">mano a pigna: carnagione abbastanza scura</annotation>
<annotation cp="🤌🏿">carnagione scura | dita | dita unite | gesto della mano | interrogativo | mano a pigna | sarcastico</annotation>
<annotation cp="🤌🏿" type="tts">mano a pigna: carnagione scura</annotation>
+ <annotation cp="🥷🏻">carnagione chiara | guerriero | invisibile | nascosto | ninja</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: carnagione chiara</annotation>
+ <annotation cp="🥷🏼">carnagione abbastanza chiara | guerriero | invisibile | nascosto | ninja</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: carnagione abbastanza chiara</annotation>
+ <annotation cp="🥷🏽">carnagione olivastra | guerriero | invisibile | nascosto | ninja</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: carnagione olivastra</annotation>
+ <annotation cp="🥷🏾">carnagione abbastanza scura | guerriero | invisibile | nascosto | ninja</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: carnagione abbastanza scura</annotation>
+ <annotation cp="🥷🏿">carnagione scura | guerriero | invisibile | nascosto | ninja</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: carnagione scura</annotation>
<annotation cp="👋🏻">carnagione chiara | mano | mano che saluta | salutare</annotation>
<annotation cp="👋🏻" type="tts">mano che saluta: carnagione chiara</annotation>
<annotation cp="👋🏼">carnagione abbastanza chiara | mano | mano che saluta | salutare</annotation>
diff --git a/common/annotationsDerived/ja.xml b/common/annotationsDerived/ja.xml
index 8d91217..f39d66a 100644
--- a/common/annotationsDerived/ja.xml
+++ b/common/annotationsDerived/ja.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">上向きにすぼめた手: やや濃い肌色</annotation>
<annotation cp="🤌🏿">ジェスチャー | すぼめる | 上向きにすぼめた手 | 手 | 指 | 濃い肌色</annotation>
<annotation cp="🤌🏿" type="tts">上向きにすぼめた手: 濃い肌色</annotation>
+ <annotation cp="🥷🏻">スパイ | 忍び | 忍者 | 忍術 | 草の者 | 薄い肌色 | 隠密</annotation>
+ <annotation cp="🥷🏻" type="tts">忍者: 薄い肌色</annotation>
+ <annotation cp="🥷🏼">スパイ | やや薄い肌色 | 忍び | 忍者 | 忍術 | 草の者 | 隠密</annotation>
+ <annotation cp="🥷🏼" type="tts">忍者: やや薄い肌色</annotation>
+ <annotation cp="🥷🏽">スパイ | 中間の肌色 | 忍び | 忍者 | 忍術 | 草の者 | 隠密</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 中間の肌色</annotation>
+ <annotation cp="🥷🏾">スパイ | やや濃い肌色 | 忍び | 忍者 | 忍術 | 草の者 | 隠密</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: やや濃い肌色</annotation>
+ <annotation cp="🥷🏿">スパイ | 忍び | 忍者 | 忍術 | 濃い肌色 | 草の者 | 隠密</annotation>
+ <annotation cp="🥷🏿" type="tts">忍者: 濃い肌色</annotation>
<annotation cp="👋🏻">バイバイ | 手 | 手を振る | 薄い肌色</annotation>
<annotation cp="👋🏻" type="tts">手を振る: 薄い肌色</annotation>
<annotation cp="👋🏼">バイバイ | やや薄い肌色 | 手 | 手を振る</annotation>
diff --git a/common/annotationsDerived/ka.xml b/common/annotationsDerived/ka.xml
index 86259cb..2976105 100644
--- a/common/annotationsDerived/ka.xml
+++ b/common/annotationsDerived/ka.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">შეჯგუფებული თითები: საშუალოდან მუქამდე კანის ტონალობა</annotation>
<annotation cp="🤌🏿">დაკითხვა | თითები | კანის მუქი ტონალობა | სარკასტული | შეჯგუფებული</annotation>
<annotation cp="🤌🏿" type="tts">შეჯგუფებული თითები: კანის მუქი ტონალობა</annotation>
+ <annotation cp="🥷🏻">კანის ღია ტონალობა | მებრძოლი | ნინძა | უჩინარი</annotation>
+ <annotation cp="🥷🏻" type="tts">ნინძა: კანის ღია ტონალობა</annotation>
+ <annotation cp="🥷🏼">მებრძოლი | ნინძა | უჩინარი | ღიადან საშუალომდე კანის ტონალობა</annotation>
+ <annotation cp="🥷🏼" type="tts">ნინძა: ღიადან საშუალომდე კანის ტონალობა</annotation>
+ <annotation cp="🥷🏽">კანის საშუალო ტონალობა | მებრძოლი | ნინძა | უჩინარი</annotation>
+ <annotation cp="🥷🏽" type="tts">ნინძა: კანის საშუალო ტონალობა</annotation>
+ <annotation cp="🥷🏾">მებრძოლი | ნინძა | საშუალოდან მუქამდე კანის ტონალობა | უჩინარი</annotation>
+ <annotation cp="🥷🏾" type="tts">ნინძა: საშუალოდან მუქამდე კანის ტონალობა</annotation>
+ <annotation cp="🥷🏿">კანის მუქი ტონალობა | მებრძოლი | ნინძა | უჩინარი</annotation>
+ <annotation cp="🥷🏿" type="tts">ნინძა: კანის მუქი ტონალობა</annotation>
<annotation cp="👋🏻">კანის ღია ტონალობა | ტალღა | ქნევა | ხელი | ხელის ქნევა</annotation>
<annotation cp="👋🏻" type="tts">ხელის ქნევა: კანის ღია ტონალობა</annotation>
<annotation cp="👋🏼">ტალღა | ქნევა | ღიადან საშუალომდე კანის ტონალობა | ხელი | ხელის ქნევა</annotation>
diff --git a/common/annotationsDerived/kab.xml b/common/annotationsDerived/kab.xml
index db598f9..f4c2500 100644
--- a/common/annotationsDerived/kab.xml
+++ b/common/annotationsDerived/kab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/kk.xml b/common/annotationsDerived/kk.xml
index 9852d70..90f6ac5 100644
--- a/common/annotationsDerived/kk.xml
+++ b/common/annotationsDerived/kk.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">түйістірілген бес саусақ: 5-тері түсі</annotation>
<annotation cp="🤌🏿">6-тері түсі | қол қимылы | мысқыл | саусақтар | сұрау | түйістірілген бес саусақ | түйістіру</annotation>
<annotation cp="🤌🏿" type="tts">түйістірілген бес саусақ: 6-тері түсі</annotation>
+ <annotation cp="🥷🏻">1–2 тері түсі | жасырыну | көзге көрінбеу | күресші | ниндзя</annotation>
+ <annotation cp="🥷🏻" type="tts">ниндзя: 1–2 тері түсі</annotation>
+ <annotation cp="🥷🏼">3-тері түрі | жасырыну | көзге көрінбеу | күресші | ниндзя</annotation>
+ <annotation cp="🥷🏼" type="tts">ниндзя: 3-тері түрі</annotation>
+ <annotation cp="🥷🏽">4-тері түсі | жасырыну | көзге көрінбеу | күресші | ниндзя</annotation>
+ <annotation cp="🥷🏽" type="tts">ниндзя: 4-тері түсі</annotation>
+ <annotation cp="🥷🏾">5-тері түсі | жасырыну | көзге көрінбеу | күресші | ниндзя</annotation>
+ <annotation cp="🥷🏾" type="tts">ниндзя: 5-тері түсі</annotation>
+ <annotation cp="🥷🏿">6-тері түсі | жасырыну | көзге көрінбеу | күресші | ниндзя</annotation>
+ <annotation cp="🥷🏿" type="tts">ниндзя: 6-тері түсі</annotation>
<annotation cp="👋🏻">1–2 тері түсі | бұлғап тұр | бұлғау | дене | қол</annotation>
<annotation cp="👋🏻" type="tts">қол бұлғау: 1–2 тері түсі</annotation>
<annotation cp="👋🏼">3-тері түрі | бұлғап тұр | бұлғау | дене | қол</annotation>
diff --git a/common/annotationsDerived/km.xml b/common/annotationsDerived/km.xml
index e5826ca..b1248de 100644
--- a/common/annotationsDerived/km.xml
+++ b/common/annotationsDerived/km.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ម្រាមច្បិច: សម្បុរខ្មៅល្មម</annotation>
<annotation cp="🤌🏿">កាយវិការដៃ | ការស៊ើបអង្កេត | ចំអកបញ្ឈឺចិត្ត | ច្បិច | ម្រាមច្បិច | ម្រាមដៃ | សម្បុរខ្មៅ</annotation>
<annotation cp="🤌🏿" type="tts">ម្រាមច្បិច: សម្បុរខ្មៅ</annotation>
+ <annotation cp="🥷🏻">ការធ្វើចលនាយ៉ាងស្ងាត់ | និនចា | បំបាំងខ្លួន | សម្បុរស | អ្នកប្រយុទ្ធ</annotation>
+ <annotation cp="🥷🏻" type="tts">និនចា: សម្បុរស</annotation>
+ <annotation cp="🥷🏼">ការធ្វើចលនាយ៉ាងស្ងាត់ | និនចា | បំបាំងខ្លួន | សម្បុរសល្មម | អ្នកប្រយុទ្ធ</annotation>
+ <annotation cp="🥷🏼" type="tts">និនចា: សម្បុរសល្មម</annotation>
+ <annotation cp="🥷🏽">ការធ្វើចលនាយ៉ាងស្ងាត់ | និនចា | បំបាំងខ្លួន | សម្បុរស្រអែម | អ្នកប្រយុទ្ធ</annotation>
+ <annotation cp="🥷🏽" type="tts">និនចា: សម្បុរស្រអែម</annotation>
+ <annotation cp="🥷🏾">ការធ្វើចលនាយ៉ាងស្ងាត់ | និនចា | បំបាំងខ្លួន | សម្បុរខ្មៅល្មម | អ្នកប្រយុទ្ធ</annotation>
+ <annotation cp="🥷🏾" type="tts">និនចា: សម្បុរខ្មៅល្មម</annotation>
+ <annotation cp="🥷🏿">ការធ្វើចលនាយ៉ាងស្ងាត់ | និនចា | បំបាំងខ្លួន | សម្បុរខ្មៅ | អ្នកប្រយុទ្ធ</annotation>
+ <annotation cp="🥷🏿" type="tts">និនចា: សម្បុរខ្មៅ</annotation>
<annotation cp="👋🏻">ដៃ | បក់ | បក់ដៃ | សម្បុរស</annotation>
<annotation cp="👋🏻" type="tts">បក់ដៃ: សម្បុរស</annotation>
<annotation cp="👋🏼">ដៃ | បក់ | បក់ដៃ | សម្បុរសល្មម</annotation>
diff --git a/common/annotationsDerived/kn.xml b/common/annotationsDerived/kn.xml
index f89cf95..5b69895 100644
--- a/common/annotationsDerived/kn.xml
+++ b/common/annotationsDerived/kn.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ಮಡಚಿಕೊಂಡ ಬೆರಳುಗಳು: ಮಧ್ಯಮ-ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
<annotation cp="🤌🏿">ಕಹಿಯಾದ | ಕೈ ಸೂಚಕ | ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ | ಬೆರಳುಗಳು | ಮಡಚಿಕೊಂಡ | ವಿಚಾರಣೆ</annotation>
<annotation cp="🤌🏿" type="tts">ಮಡಚಿಕೊಂಡ ಬೆರಳುಗಳು: ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="🥷🏻">ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ | ನಿಂಜಾ | ಫೈಟರ್ | ಮರೆಮಾಡಲಾಗಿದೆ | ರಹಸ್ಯ</annotation>
+ <annotation cp="🥷🏻" type="tts">ನಿಂಜಾ: ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="🥷🏼">ನಿಂಜಾ | ಫೈಟರ್ | ಮಧ್ಯಮ-ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ | ಮರೆಮಾಡಲಾಗಿದೆ | ರಹಸ್ಯ</annotation>
+ <annotation cp="🥷🏼" type="tts">ನಿಂಜಾ: ಮಧ್ಯಮ-ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="🥷🏽">ನಿಂಜಾ | ಫೈಟರ್ | ಮಧ್ಯಮ ಬಣ್ಣದ ಚರ್ಮ | ಮರೆಮಾಡಲಾಗಿದೆ | ರಹಸ್ಯ</annotation>
+ <annotation cp="🥷🏽" type="tts">ನಿಂಜಾ: ಮಧ್ಯಮ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="🥷🏾">ನಿಂಜಾ | ಫೈಟರ್ | ಮಧ್ಯಮ-ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ | ಮರೆಮಾಡಲಾಗಿದೆ | ರಹಸ್ಯ</annotation>
+ <annotation cp="🥷🏾" type="tts">ನಿಂಜಾ: ಮಧ್ಯಮ-ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
+ <annotation cp="🥷🏿">ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ | ನಿಂಜಾ | ಫೈಟರ್ | ಮರೆಮಾಡಲಾಗಿದೆ | ರಹಸ್ಯ</annotation>
+ <annotation cp="🥷🏿" type="tts">ನಿಂಜಾ: ಗಾಢ ಬಣ್ಣದ ಚರ್ಮ</annotation>
<annotation cp="👋🏻">ಕೈ ಬೀಸುತ್ತಿರುವುದು | ಕೈ ಬೀಸುವ | ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ</annotation>
<annotation cp="👋🏻" type="tts">ಕೈ ಬೀಸುತ್ತಿರುವುದು: ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ</annotation>
<annotation cp="👋🏼">ಕೈ ಬೀಸುತ್ತಿರುವುದು | ಕೈ ಬೀಸುವ | ಮಧ್ಯಮ-ತಿಳಿ ಬಣ್ಣದ ಚರ್ಮ</annotation>
diff --git a/common/annotationsDerived/ko.xml b/common/annotationsDerived/ko.xml
index 9ff2160..6f61b6b 100644
--- a/common/annotationsDerived/ko.xml
+++ b/common/annotationsDerived/ko.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">꼬집는 손가락: 진한 갈색 피부</annotation>
<annotation cp="🤌🏿">검은색 피부 | 꼬집는 | 빈정대는 | 손가락 | 손동작 | 질문</annotation>
<annotation cp="🤌🏿" type="tts">꼬집는 손가락: 검은색 피부</annotation>
+ <annotation cp="🥷🏻">닌자 | 몰래 하기 | 숨은 | 전투원 | 하얀 피부</annotation>
+ <annotation cp="🥷🏻" type="tts">닌자: 하얀 피부</annotation>
+ <annotation cp="🥷🏼">닌자 | 몰래 하기 | 숨은 | 연한 갈색 피부 | 전투원</annotation>
+ <annotation cp="🥷🏼" type="tts">닌자: 연한 갈색 피부</annotation>
+ <annotation cp="🥷🏽">갈색 피부 | 닌자 | 몰래 하기 | 숨은 | 전투원</annotation>
+ <annotation cp="🥷🏽" type="tts">닌자: 갈색 피부</annotation>
+ <annotation cp="🥷🏾">닌자 | 몰래 하기 | 숨은 | 전투원 | 진한 갈색 피부</annotation>
+ <annotation cp="🥷🏾" type="tts">닌자: 진한 갈색 피부</annotation>
+ <annotation cp="🥷🏿">검은색 피부 | 닌자 | 몰래 하기 | 숨은 | 전투원</annotation>
+ <annotation cp="🥷🏿" type="tts">닌자: 검은색 피부</annotation>
<annotation cp="👋🏻">펼친 손 | 하얀 피부 | 흔드는 손</annotation>
<annotation cp="👋🏻" type="tts">흔드는 손: 하얀 피부</annotation>
<annotation cp="👋🏼">연한 갈색 피부 | 펼친 손 | 흔드는 손</annotation>
diff --git a/common/annotationsDerived/ky.xml b/common/annotationsDerived/ky.xml
index 5c3f1b6..1f5f558 100644
--- a/common/annotationsDerived/ky.xml
+++ b/common/annotationsDerived/ky.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">кыстырылган манжалар: кара тору</annotation>
<annotation cp="🤌🏿">кара | кыстырылган манжалар</annotation>
<annotation cp="🤌🏿" type="tts">кыстырылган манжалар: кара</annotation>
+ <annotation cp="🥷🏻">акжуумал | ниндзя</annotation>
+ <annotation cp="🥷🏻" type="tts">ниндзя: акжуумал</annotation>
+ <annotation cp="🥷🏼">буудай жүздүү | ниндзя</annotation>
+ <annotation cp="🥷🏼" type="tts">ниндзя: буудай жүздүү</annotation>
+ <annotation cp="🥷🏽">ниндзя | орточо</annotation>
+ <annotation cp="🥷🏽" type="tts">ниндзя: орточо</annotation>
+ <annotation cp="🥷🏾">кара тору | ниндзя</annotation>
+ <annotation cp="🥷🏾" type="tts">ниндзя: кара тору</annotation>
+ <annotation cp="🥷🏿">кара | ниндзя</annotation>
+ <annotation cp="🥷🏿" type="tts">ниндзя: кара</annotation>
<annotation cp="👋🏻">акжуумал | булгалоо | дене | кол</annotation>
<annotation cp="👋🏻" type="tts">кол булгалоо: акжуумал</annotation>
<annotation cp="👋🏼">булгалоо | буудай жүздүү | дене | кол</annotation>
diff --git a/common/annotationsDerived/lo.xml b/common/annotationsDerived/lo.xml
index 5eca1c4..07f6b04 100644
--- a/common/annotationsDerived/lo.xml
+++ b/common/annotationsDerived/lo.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ຈຸ້ມນິ້ວມື: ສີສັນປະເພດ-5</annotation>
<annotation cp="🤌🏿">ຈຸ້ມນິ້ວມື | ສີສັນປະເພດ-6</annotation>
<annotation cp="🤌🏿" type="tts">ຈຸ້ມນິ້ວມື: ສີສັນປະເພດ-6</annotation>
+ <annotation cp="🥷🏻">ການຕໍ່ສຸ້ | ສີສັນປະເພດ-1-2 | ຊິ້ງຊັບ | ນິນຈາ | ລີ້ຢຸ່</annotation>
+ <annotation cp="🥷🏻" type="tts">ນິນຈາ: ສີສັນປະເພດ-1-2</annotation>
+ <annotation cp="🥷🏼">ການຕໍ່ສຸ້ | ສີສັນປະເພດ-3 | ຊິ້ງຊັບ | ນິນຈາ | ລີ້ຢຸ່</annotation>
+ <annotation cp="🥷🏼" type="tts">ນິນຈາ: ສີສັນປະເພດ-3</annotation>
+ <annotation cp="🥷🏽">ການຕໍ່ສຸ້ | ສີສັນປະເພດ-4 | ຊິ້ງຊັບ | ນິນຈາ | ລີ້ຢຸ່</annotation>
+ <annotation cp="🥷🏽" type="tts">ນິນຈາ: ສີສັນປະເພດ-4</annotation>
+ <annotation cp="🥷🏾">ການຕໍ່ສຸ້ | ສີສັນປະເພດ-5 | ຊິ້ງຊັບ | ນິນຈາ | ລີ້ຢຸ່</annotation>
+ <annotation cp="🥷🏾" type="tts">ນິນຈາ: ສີສັນປະເພດ-5</annotation>
+ <annotation cp="🥷🏿">ການຕໍ່ສຸ້ | ສີສັນປະເພດ-6 | ຊິ້ງຊັບ | ນິນຈາ | ລີ້ຢຸ່</annotation>
+ <annotation cp="🥷🏿" type="tts">ນິນຈາ: ສີສັນປະເພດ-6</annotation>
<annotation cp="👋🏻">ສີສັນປະເພດ-1-2 | ໂບກມື | ມື | ຮ່າງກາຍ</annotation>
<annotation cp="👋🏻" type="tts">ໂບກມື: ສີສັນປະເພດ-1-2</annotation>
<annotation cp="👋🏼">ສີສັນປະເພດ-3 | ໂບກມື | ມື | ຮ່າງກາຍ</annotation>
diff --git a/common/annotationsDerived/lt.xml b/common/annotationsDerived/lt.xml
index 8b907fe..1a38dec 100644
--- a/common/annotationsDerived/lt.xml
+++ b/common/annotationsDerived/lt.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">suspausti pirštai: tamsios odos</annotation>
<annotation cp="🤌🏿">itin tamsios odos | pirštai | rankos gestas | sarkastiškas | suspausti</annotation>
<annotation cp="🤌🏿" type="tts">suspausti pirštai: itin tamsios odos</annotation>
+ <annotation cp="🥷🏻">kovotojas | nindzė | šviesios odos | užsimaskavęs</annotation>
+ <annotation cp="🥷🏻" type="tts">nindzė: šviesios odos</annotation>
+ <annotation cp="🥷🏼">kovotojas | nindzė | užsimaskavęs | vidutinio gymio</annotation>
+ <annotation cp="🥷🏼" type="tts">nindzė: vidutinio gymio</annotation>
+ <annotation cp="🥷🏽">kovotojas | nindzė | rusvos odos | užsimaskavęs</annotation>
+ <annotation cp="🥷🏽" type="tts">nindzė: rusvos odos</annotation>
+ <annotation cp="🥷🏾">kovotojas | nindzė | tamsios odos | užsimaskavęs</annotation>
+ <annotation cp="🥷🏾" type="tts">nindzė: tamsios odos</annotation>
+ <annotation cp="🥷🏿">itin tamsios odos | kovotojas | nindzė | užsimaskavęs</annotation>
+ <annotation cp="🥷🏿" type="tts">nindzė: itin tamsios odos</annotation>
<annotation cp="👋🏻">mojuoja | mojuojanti ranka | mojuoti | ranka | šviesios odos</annotation>
<annotation cp="👋🏻" type="tts">mojuojanti ranka: šviesios odos</annotation>
<annotation cp="👋🏼">mojuoja | mojuojanti ranka | mojuoti | ranka | vidutinio gymio</annotation>
diff --git a/common/annotationsDerived/lv.xml b/common/annotationsDerived/lv.xml
index 51741ba..9ba9f6b 100644
--- a/common/annotationsDerived/lv.xml
+++ b/common/annotationsDerived/lv.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">pastiepti pirksti: vidēji tumšs ādas tonis</annotation>
<annotation cp="🤌🏿">pastiepti pirksti | pirksti | rokas žests | sarkastisks | saspiests | tumšs ādas tonis</annotation>
<annotation cp="🤌🏿" type="tts">pastiepti pirksti: tumšs ādas tonis</annotation>
+ <annotation cp="🥷🏻">cīnītājs | gaišs ādas tonis | nindzja | paslēpts | slepens</annotation>
+ <annotation cp="🥷🏻" type="tts">nindzja: gaišs ādas tonis</annotation>
+ <annotation cp="🥷🏼">cīnītājs | nindzja | paslēpts | slepens | vidēji gaišs ādas tonis</annotation>
+ <annotation cp="🥷🏼" type="tts">nindzja: vidēji gaišs ādas tonis</annotation>
+ <annotation cp="🥷🏽">cīnītājs | nindzja | paslēpts | slepens | vidējs ādas tonis</annotation>
+ <annotation cp="🥷🏽" type="tts">nindzja: vidējs ādas tonis</annotation>
+ <annotation cp="🥷🏾">cīnītājs | nindzja | paslēpts | slepens | vidēji tumšs ādas tonis</annotation>
+ <annotation cp="🥷🏾" type="tts">nindzja: vidēji tumšs ādas tonis</annotation>
+ <annotation cp="🥷🏿">cīnītājs | nindzja | paslēpts | slepens | tumšs ādas tonis</annotation>
+ <annotation cp="🥷🏿" type="tts">nindzja: tumšs ādas tonis</annotation>
<annotation cp="👋🏻">gaišs ādas tonis | ķermenis | mājoša roka | māt | roka</annotation>
<annotation cp="👋🏻" type="tts">mājoša roka: gaišs ādas tonis</annotation>
<annotation cp="👋🏼">ķermenis | mājoša roka | māt | roka | vidēji gaišs ādas tonis</annotation>
diff --git a/common/annotationsDerived/mk.xml b/common/annotationsDerived/mk.xml
index 9ada024..bcacab8 100644
--- a/common/annotationsDerived/mk.xml
+++ b/common/annotationsDerived/mk.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">стиснати прсти: тип на кожа 5</annotation>
<annotation cp="🤌🏿">гест со рака | испрашување | прсти | саркастично | стиснати | тип на кожа 6</annotation>
<annotation cp="🤌🏿" type="tts">стиснати прсти: тип на кожа 6</annotation>
+ <annotation cp="🥷🏻">борач | нинџа | сокриен | стелт | тип на кожа 1–2</annotation>
+ <annotation cp="🥷🏻" type="tts">нинџа: тип на кожа 1–2</annotation>
+ <annotation cp="🥷🏼">борач | нинџа | сокриен | стелт | тип на кожа 3</annotation>
+ <annotation cp="🥷🏼" type="tts">нинџа: тип на кожа 3</annotation>
+ <annotation cp="🥷🏽">борач | нинџа | сокриен | стелт | тип на кожа 4</annotation>
+ <annotation cp="🥷🏽" type="tts">нинџа: тип на кожа 4</annotation>
+ <annotation cp="🥷🏾">борач | нинџа | сокриен | стелт | тип на кожа 5</annotation>
+ <annotation cp="🥷🏾" type="tts">нинџа: тип на кожа 5</annotation>
+ <annotation cp="🥷🏿">борач | нинџа | сокриен | стелт | тип на кожа 6</annotation>
+ <annotation cp="🥷🏿" type="tts">нинџа: тип на кожа 6</annotation>
<annotation cp="👋🏻">мавтање | мавтање со рака | поздрав | рака | тело | тип на кожа 1–2</annotation>
<annotation cp="👋🏻" type="tts">мавтање со рака: тип на кожа 1–2</annotation>
<annotation cp="👋🏼">мавтање | мавтање со рака | поздрав | рака | тело | тип на кожа 3</annotation>
diff --git a/common/annotationsDerived/ml.xml b/common/annotationsDerived/ml.xml
index a3212f7..8e428f3 100644
--- a/common/annotationsDerived/ml.xml
+++ b/common/annotationsDerived/ml.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">നുള്ളിപ്പിടിച്ച വിരലുകൾ: ഇടത്തരം ഇരുണ്ട ചർമ്മ നിറം</annotation>
<annotation cp="🤌🏿">ആക്ഷേപസൂചകം | ഇരുണ്ട ചർമ്മ നിറം | കൈമുദ്ര | ചോദ്യംചെയ്യൽ | നുള്ളിപ്പിടിച്ച വിരലുകൾ | നുള്ളുക | പരിഹാസം</annotation>
<annotation cp="🤌🏿" type="tts">നുള്ളിപ്പിടിച്ച വിരലുകൾ: ഇരുണ്ട ചർമ്മ നിറം</annotation>
+ <annotation cp="🥷🏻">ഒളിപ്പിച്ച | തെളിഞ്ഞ ചർമ്മ നിറം | നിഞ്ജ | പോരാളി | ശക്തിയുള്ള</annotation>
+ <annotation cp="🥷🏻" type="tts">നിഞ്ജ: തെളിഞ്ഞ ചർമ്മ നിറം</annotation>
+ <annotation cp="🥷🏼">ഇടത്തരം തെളിഞ്ഞ ചർമ്മ നിറം | ഒളിപ്പിച്ച | നിഞ്ജ | പോരാളി | ശക്തിയുള്ള</annotation>
+ <annotation cp="🥷🏼" type="tts">നിഞ്ജ: ഇടത്തരം തെളിഞ്ഞ ചർമ്മ നിറം</annotation>
+ <annotation cp="🥷🏽">ഒളിപ്പിച്ച | ചർമ്മത്തിന്റെ നിറം-4 | നിഞ്ജ | പോരാളി | ശക്തിയുള്ള</annotation>
+ <annotation cp="🥷🏽" type="tts">നിഞ്ജ: ചർമ്മത്തിന്റെ നിറം-4</annotation>
+ <annotation cp="🥷🏾">ഇടത്തരം ഇരുണ്ട ചർമ്മ നിറം | ഒളിപ്പിച്ച | നിഞ്ജ | പോരാളി | ശക്തിയുള്ള</annotation>
+ <annotation cp="🥷🏾" type="tts">നിഞ്ജ: ഇടത്തരം ഇരുണ്ട ചർമ്മ നിറം</annotation>
+ <annotation cp="🥷🏿">ഇരുണ്ട ചർമ്മ നിറം | ഒളിപ്പിച്ച | നിഞ്ജ | പോരാളി | ശക്തിയുള്ള</annotation>
+ <annotation cp="🥷🏿" type="tts">നിഞ്ജ: ഇരുണ്ട ചർമ്മ നിറം</annotation>
<annotation cp="👋🏻">കൈ | കൈ വീശുന്നു | ടാറ്റ | തെളിഞ്ഞ ചർമ്മ നിറം | വീശുക | ശരീരം</annotation>
<annotation cp="👋🏻" type="tts">കൈ വീശുന്നു: തെളിഞ്ഞ ചർമ്മ നിറം</annotation>
<annotation cp="👋🏼">ഇടത്തരം തെളിഞ്ഞ ചർമ്മ നിറം | കൈ | കൈ വീശുന്നു | ടാറ്റ | വീശുക | ശരീരം</annotation>
diff --git a/common/annotationsDerived/mn.xml b/common/annotationsDerived/mn.xml
index 083656f..f2621df 100644
--- a/common/annotationsDerived/mn.xml
+++ b/common/annotationsDerived/mn.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">гарын хуруунуудаа нийлүүлж чимхэх: бордуу</annotation>
<annotation cp="🤌🏿">байцаалт | бор | гарын зангаа | гарын хуруунуудаа нийлүүлж чимхэх | ёжтой | хуруунууд | чимхэх</annotation>
<annotation cp="🤌🏿" type="tts">гарын хуруунуудаа нийлүүлж чимхэх: бор</annotation>
+ <annotation cp="🥷🏻">нинжа | нуугдмал | нууцаар | тулаанч | цайвар</annotation>
+ <annotation cp="🥷🏻" type="tts">нинжа: цайвар</annotation>
+ <annotation cp="🥷🏼">бага зэргийн цайвар | нинжа | нуугдмал | нууцаар | тулаанч</annotation>
+ <annotation cp="🥷🏼" type="tts">нинжа: бага зэргийн цайвар</annotation>
+ <annotation cp="🥷🏽">дунд зэргийн | нинжа | нуугдмал | нууцаар | тулаанч</annotation>
+ <annotation cp="🥷🏽" type="tts">нинжа: дунд зэргийн</annotation>
+ <annotation cp="🥷🏾">бордуу | нинжа | нуугдмал | нууцаар | тулаанч</annotation>
+ <annotation cp="🥷🏾" type="tts">нинжа: бордуу</annotation>
+ <annotation cp="🥷🏿">бор | нинжа | нуугдмал | нууцаар | тулаанч</annotation>
+ <annotation cp="🥷🏿" type="tts">нинжа: бор</annotation>
<annotation cp="👋🏻">алга | гар | мэндчилж байгаа гар | мэндчлэх | хуруу | цайвар</annotation>
<annotation cp="👋🏻" type="tts">мэндчилж байгаа гар: цайвар</annotation>
<annotation cp="👋🏼">алга | бага зэргийн цайвар | гар | мэндчилж байгаа гар | мэндчлэх | хуруу</annotation>
diff --git a/common/annotationsDerived/mr.xml b/common/annotationsDerived/mr.xml
index e73c7f6..ca3f509 100644
--- a/common/annotationsDerived/mr.xml
+++ b/common/annotationsDerived/mr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">चिमूटभर: मध्यम काळसर त्वचा</annotation>
<annotation cp="🤌🏿">काळसर त्वचा | चिमूटभर | चौकशी | व्यंगात्मक | हाताची बोटे | हाताने दर्शविलेल्या भावना</annotation>
<annotation cp="🤌🏿" type="tts">चिमूटभर: काळसर त्वचा</annotation>
+ <annotation cp="🥷🏻">उजळ त्वचा | चोरी करणारा | निन्जा | लढणारा | लपलेला</annotation>
+ <annotation cp="🥷🏻" type="tts">निन्जा: उजळ त्वचा</annotation>
+ <annotation cp="🥷🏼">चोरी करणारा | निन्जा | मध्यम उजळ त्वचा | लढणारा | लपलेला</annotation>
+ <annotation cp="🥷🏼" type="tts">निन्जा: मध्यम उजळ त्वचा</annotation>
+ <annotation cp="🥷🏽">चोरी करणारा | निन्जा | मध्यम त्वचा | लढणारा | लपलेला</annotation>
+ <annotation cp="🥷🏽" type="tts">निन्जा: मध्यम त्वचा</annotation>
+ <annotation cp="🥷🏾">चोरी करणारा | निन्जा | मध्यम काळसर त्वचा | लढणारा | लपलेला</annotation>
+ <annotation cp="🥷🏾" type="tts">निन्जा: मध्यम काळसर त्वचा</annotation>
+ <annotation cp="🥷🏿">काळसर त्वचा | चोरी करणारा | निन्जा | लढणारा | लपलेला</annotation>
+ <annotation cp="🥷🏿" type="tts">निन्जा: काळसर त्वचा</annotation>
<annotation cp="👋🏻">उजळ त्वचा | हवा | हवेत हलविणारा हात | हवेत हलविणे | हात</annotation>
<annotation cp="👋🏻" type="tts">हवेत हलविणारा हात: उजळ त्वचा</annotation>
<annotation cp="👋🏼">मध्यम उजळ त्वचा | हवा | हवेत हलविणारा हात | हवेत हलविणे | हात</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">तरूण: मध्यम काळसर त्वचा, टक्कल</annotation>
<annotation cp="🧑🏿🦲">काळसर त्वचा | टक्कल | तरूण | लिंग-तटस्थ</annotation>
<annotation cp="🧑🏿🦲" type="tts">तरूण: काळसर त्वचा, टक्कल</annotation>
- <annotation cp="🧑🏻🍼">उजळ त्वचा | दूध देणारे | नर्सिंंग | बाळ | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
+ <annotation cp="🧑🏻🍼">उजळ त्वचा | दूध देणारे | नर्सिंंग | बाळ | बाळाला दूध देणारी व्यक्ती | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
<annotation cp="🧑🏻🍼" type="tts">बाळाला दूध देणारी व्यक्ती: उजळ त्वचा</annotation>
- <annotation cp="🧑🏼🍼">दूध देणारे | नर्सिंंग | बाळ | मध्यम उजळ त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
+ <annotation cp="🧑🏼🍼">दूध देणारे | नर्सिंंग | बाळ | बाळाला दूध देणारी व्यक्ती | मध्यम उजळ त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
<annotation cp="🧑🏼🍼" type="tts">बाळाला दूध देणारी व्यक्ती: मध्यम उजळ त्वचा</annotation>
- <annotation cp="🧑🏽🍼">दूध देणारे | नर्सिंंग | बाळ | मध्यम त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
+ <annotation cp="🧑🏽🍼">दूध देणारे | नर्सिंंग | बाळ | बाळाला दूध देणारी व्यक्ती | मध्यम त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
<annotation cp="🧑🏽🍼" type="tts">बाळाला दूध देणारी व्यक्ती: मध्यम त्वचा</annotation>
- <annotation cp="🧑🏾🍼">दूध देणारे | नर्सिंंग | बाळ | मध्यम काळसर त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
+ <annotation cp="🧑🏾🍼">दूध देणारे | नर्सिंंग | बाळ | बाळाला दूध देणारी व्यक्ती | मध्यम काळसर त्वचा | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
<annotation cp="🧑🏾🍼" type="tts">बाळाला दूध देणारी व्यक्ती: मध्यम काळसर त्वचा</annotation>
- <annotation cp="🧑🏿🍼">काळसर त्वचा | दूध देणारे | नर्सिंंग | बाळ | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
+ <annotation cp="🧑🏿🍼">काळसर त्वचा | दूध देणारे | नर्सिंंग | बाळ | बाळाला दूध देणारी व्यक्ती | व्यक्ती । बाळाला दूध देणारी व्यक्ती</annotation>
<annotation cp="🧑🏿🍼" type="tts">बाळाला दूध देणारी व्यक्ती: काळसर त्वचा</annotation>
<annotation cp="🧑🏻🎄">mx क्लॉज | उजळ त्वचा | क्लॉज, ख्रिसमस । mx क्लॉज</annotation>
<annotation cp="🧑🏻🎄" type="tts">mx क्लॉज: उजळ त्वचा</annotation>
diff --git a/common/annotationsDerived/ms.xml b/common/annotationsDerived/ms.xml
index 072a14c..46c37af 100644
--- a/common/annotationsDerived/ms.xml
+++ b/common/annotationsDerived/ms.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">jari mencubit: ton kulit sederhana gelap</annotation>
<annotation cp="🤌🏿">gerak isyarat tangan | jari | mencubit | sarkastik | soal siasat | ton kulit gelap</annotation>
<annotation cp="🤌🏿" type="tts">jari mencubit: ton kulit gelap</annotation>
+ <annotation cp="🥷🏻">ninja | pejuang | senyap-senyap | tersembunyi | ton kulit cerah</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ton kulit cerah</annotation>
+ <annotation cp="🥷🏼">ninja | pejuang | senyap-senyap | tersembunyi | ton kulit sederhana cerah</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: ton kulit sederhana cerah</annotation>
+ <annotation cp="🥷🏽">ninja | pejuang | senyap-senyap | tersembunyi | ton kulit sederhana</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: ton kulit sederhana</annotation>
+ <annotation cp="🥷🏾">ninja | pejuang | senyap-senyap | tersembunyi | ton kulit sederhana gelap</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: ton kulit sederhana gelap</annotation>
+ <annotation cp="🥷🏿">ninja | pejuang | senyap-senyap | tersembunyi | ton kulit gelap</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: ton kulit gelap</annotation>
<annotation cp="👋🏻">badan | lambai | melambai | tangan | ton kulit cerah</annotation>
<annotation cp="👋🏻" type="tts">lambai tangan: ton kulit cerah</annotation>
<annotation cp="👋🏼">badan | lambai | melambai | tangan | ton kulit sederhana cerah</annotation>
diff --git a/common/annotationsDerived/my.xml b/common/annotationsDerived/my.xml
index a8c2353..24080b0 100644
--- a/common/annotationsDerived/my.xml
+++ b/common/annotationsDerived/my.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">စုထားသော လက်ချောင်း − အသားညိုရောင်</annotation>
<annotation cp="🤌🏿">စုထားသော လက်ချောင်း | လက်ချောင်းများ၊ လက်ဟန်၊ စစ်ဆေး၊ ဆိတ်၊ အရွဲ့တိုက် | အသားမဲရောင်</annotation>
<annotation cp="🤌🏿" type="tts">စုထားသော လက်ချောင်း − အသားမဲရောင်</annotation>
+ <annotation cp="🥷🏻">နင်ဂျာ | ဖိုက်တာ၊ ဖုံးကွယ်၊ လျို့ဝှက် | အသားဖြူရောင်</annotation>
+ <annotation cp="🥷🏻" type="tts">နင်ဂျာ − အသားဖြူရောင်</annotation>
+ <annotation cp="🥷🏼">နင်ဂျာ | ဖိုက်တာ၊ ဖုံးကွယ်၊ လျို့ဝှက် | အသားနုရောင်</annotation>
+ <annotation cp="🥷🏼" type="tts">နင်ဂျာ − အသားနုရောင်</annotation>
+ <annotation cp="🥷🏽">နင်ဂျာ | ဖိုက်တာ၊ ဖုံးကွယ်၊ လျို့ဝှက် | အသားလတ်ရောင်</annotation>
+ <annotation cp="🥷🏽" type="tts">နင်ဂျာ − အသားလတ်ရောင်</annotation>
+ <annotation cp="🥷🏾">နင်ဂျာ | ဖိုက်တာ၊ ဖုံးကွယ်၊ လျို့ဝှက် | အသားညိုရောင်</annotation>
+ <annotation cp="🥷🏾" type="tts">နင်ဂျာ − အသားညိုရောင်</annotation>
+ <annotation cp="🥷🏿">နင်ဂျာ | ဖိုက်တာ၊ ဖုံးကွယ်၊ လျို့ဝှက် | အသားမဲရောင်</annotation>
+ <annotation cp="🥷🏿" type="tts">နင်ဂျာ − အသားမဲရောင်</annotation>
<annotation cp="👋🏻">လက် | လက်ဝှေ့ယမ်းပြနေသည့်ပုံ | ဝှေ့ယမ်းနေသည့် လက် | အသားဖြူရောင်</annotation>
<annotation cp="👋🏻" type="tts">ဝှေ့ယမ်းနေသည့် လက် − အသားဖြူရောင်</annotation>
<annotation cp="👋🏼">လက် | လက်ဝှေ့ယမ်းပြနေသည့်ပုံ | ဝှေ့ယမ်းနေသည့် လက် | အသားနုရောင်</annotation>
diff --git a/common/annotationsDerived/nb.xml b/common/annotationsDerived/nb.xml
index 46476bf..5857840 100644
--- a/common/annotationsDerived/nb.xml
+++ b/common/annotationsDerived/nb.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">hånd med fingertuppene sammen: hudtype 5</annotation>
<annotation cp="🤌🏿">fingre | fingrene sammen | hånd | hånd med fingertuppene sammen | hudtype 6 | sarkastisk | spørsmål</annotation>
<annotation cp="🤌🏿" type="tts">hånd med fingertuppene sammen: hudtype 6</annotation>
+ <annotation cp="🥷🏻">hudtype 1–2 | kampkunst | kriger | ninja | skjult</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: hudtype 1–2</annotation>
+ <annotation cp="🥷🏼">hudtype 3 | kampkunst | kriger | ninja | skjult</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: hudtype 3</annotation>
+ <annotation cp="🥷🏽">hudtype 4 | kampkunst | kriger | ninja | skjult</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: hudtype 4</annotation>
+ <annotation cp="🥷🏾">hudtype 5 | kampkunst | kriger | ninja | skjult</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: hudtype 5</annotation>
+ <annotation cp="🥷🏿">hudtype 6 | kampkunst | kriger | ninja | skjult</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: hudtype 6</annotation>
<annotation cp="👋🏻">hånd | hudtype 1–2 | vinke | vinkende hånd | vinking</annotation>
<annotation cp="👋🏻" type="tts">vinkende hånd: hudtype 1–2</annotation>
<annotation cp="👋🏼">hånd | hudtype 3 | vinke | vinkende hånd | vinking</annotation>
diff --git a/common/annotationsDerived/ne.xml b/common/annotationsDerived/ne.xml
index f335eab..438ae6d 100644
--- a/common/annotationsDerived/ne.xml
+++ b/common/annotationsDerived/ne.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">चिमोटिएका औँलाहरू: छालाको प्रकार-५</annotation>
<annotation cp="🤌🏿">चिमोटिएका औँलाहरू | छालाको प्रकार-६</annotation>
<annotation cp="🤌🏿" type="tts">चिमोटिएका औँलाहरू: छालाको प्रकार-६</annotation>
+ <annotation cp="🥷🏻">चालबाजी | छालाको प्रकार-१-२ | निन्जा | फाइटर | लुकेको</annotation>
+ <annotation cp="🥷🏻" type="tts">निन्जा: छालाको प्रकार-१-२</annotation>
+ <annotation cp="🥷🏼">चालबाजी | छालाको प्रकार-३ | निन्जा | फाइटर | लुकेको</annotation>
+ <annotation cp="🥷🏼" type="tts">निन्जा: छालाको प्रकार-३</annotation>
+ <annotation cp="🥷🏽">चालबाजी | छालाको प्रकार-४ | निन्जा | फाइटर | लुकेको</annotation>
+ <annotation cp="🥷🏽" type="tts">निन्जा: छालाको प्रकार-४</annotation>
+ <annotation cp="🥷🏾">चालबाजी | छालाको प्रकार-५ | निन्जा | फाइटर | लुकेको</annotation>
+ <annotation cp="🥷🏾" type="tts">निन्जा: छालाको प्रकार-५</annotation>
+ <annotation cp="🥷🏿">चालबाजी | छालाको प्रकार-६ | निन्जा | फाइटर | लुकेको</annotation>
+ <annotation cp="🥷🏿" type="tts">निन्जा: छालाको प्रकार-६</annotation>
<annotation cp="👋🏻">छालाको प्रकार-१-२ | शरीर | हल्लाइरहेको | हल्लेको | हात</annotation>
<annotation cp="👋🏻" type="tts">हल्लाइरहेको हात: छालाको प्रकार-१-२</annotation>
<annotation cp="👋🏼">छालाको प्रकार-३ | शरीर | हल्लाइरहेको | हल्लेको | हात</annotation>
diff --git a/common/annotationsDerived/nl.xml b/common/annotationsDerived/nl.xml
index 7388ec5..b8df791 100644
--- a/common/annotationsDerived/nl.xml
+++ b/common/annotationsDerived/nl.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">samengeknepen vingers: donkergetinte huidskleur</annotation>
<annotation cp="🤌🏿">donkere huidskleur | handgebaar | ondervraging | samengeknepen | sarcastisch | vingers</annotation>
<annotation cp="🤌🏿" type="tts">samengeknepen vingers: donkere huidskleur</annotation>
+ <annotation cp="🥷🏻">geheim | krijger | lichte huidskleur | ninja | verborgen</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: lichte huidskleur</annotation>
+ <annotation cp="🥷🏼">geheim | krijger | lichtgetinte huidskleur | ninja | verborgen</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: lichtgetinte huidskleur</annotation>
+ <annotation cp="🥷🏽">geheim | getinte huidskleur | krijger | ninja | verborgen</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: getinte huidskleur</annotation>
+ <annotation cp="🥷🏾">donkergetinte huidskleur | geheim | krijger | ninja | verborgen</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: donkergetinte huidskleur</annotation>
+ <annotation cp="🥷🏿">donkere huidskleur | geheim | krijger | ninja | verborgen</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: donkere huidskleur</annotation>
<annotation cp="👋🏻">hand | lichte huidskleur | zwaai | zwaaien | zwaaiende hand</annotation>
<annotation cp="👋🏻" type="tts">zwaaiende hand: lichte huidskleur</annotation>
<annotation cp="👋🏼">hand | lichtgetinte huidskleur | zwaai | zwaaien | zwaaiende hand</annotation>
diff --git a/common/annotationsDerived/or.xml b/common/annotationsDerived/or.xml
index 19bdd8d..5a40b07 100644
--- a/common/annotationsDerived/or.xml
+++ b/common/annotationsDerived/or.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ଆଙ୍ଗୁଠିଗୁଡ଼ିକରେ ଚିମୁଟିବା: ମଧ୍ୟମ-ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
<annotation cp="🤌🏿">ଆଙ୍ଗୁଠିଗୁଡ଼ିକ | ଆଙ୍ଗୁଠିଗୁଡ଼ିକରେ ଚିମୁଟିବା | ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ | ଚିମୁଟିବା | ପ୍ରଶ୍ନ କରିବା | ବିଦ୍ରୁପାତ୍ମକ | ହାତର ଇଙ୍ଗିତ</annotation>
<annotation cp="🤌🏿" type="tts">ଆଙ୍ଗୁଠିଗୁଡ଼ିକରେ ଚିମୁଟିବା: ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏻">ଗୁପ୍ତ ବ୍ୟବହାର | ନିଞ୍ଜା | ଯୋଦ୍ଧା | ଲୁକ୍କାୟିତ | ହାଲକା ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏻" type="tts">ନିଞ୍ଜା: ହାଲକା ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏼">ଗୁପ୍ତ ବ୍ୟବହାର | ନିଞ୍ଜା | ମଧ୍ୟମ-ହାଲକା ଚର୍ମ ରଙ୍ଗ | ଯୋଦ୍ଧା | ଲୁକ୍କାୟିତ</annotation>
+ <annotation cp="🥷🏼" type="tts">ନିଞ୍ଜା: ମଧ୍ୟମ-ହାଲକା ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏽">ଗୁପ୍ତ ବ୍ୟବହାର | ନିଞ୍ଜା | ମଧ୍ୟମ ଚର୍ମ ରଙ୍ଗ | ଯୋଦ୍ଧା | ଲୁକ୍କାୟିତ</annotation>
+ <annotation cp="🥷🏽" type="tts">ନିଞ୍ଜା: ମଧ୍ୟମ ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏾">ଗୁପ୍ତ ବ୍ୟବହାର | ନିଞ୍ଜା | ମଧ୍ୟମ-ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ | ଯୋଦ୍ଧା | ଲୁକ୍କାୟିତ</annotation>
+ <annotation cp="🥷🏾" type="tts">ନିଞ୍ଜା: ମଧ୍ୟମ-ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
+ <annotation cp="🥷🏿">ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ | ଗୁପ୍ତ ବ୍ୟବହାର | ନିଞ୍ଜା | ଯୋଦ୍ଧା | ଲୁକ୍କାୟିତ</annotation>
+ <annotation cp="🥷🏿" type="tts">ନିଞ୍ଜା: ଗାଢ଼ ଚର୍ମ ରଙ୍ଗ</annotation>
<annotation cp="👋🏻">ଦୋଳାୟମାନ ହାତ | ହଲାଇବା | ହାତ | ହାଲକା ଚର୍ମ ରଙ୍ଗ</annotation>
<annotation cp="👋🏻" type="tts">ଦୋଳାୟମାନ ହାତ: ହାଲକା ଚର୍ମ ରଙ୍ଗ</annotation>
<annotation cp="👋🏼">ଦୋଳାୟମାନ ହାତ | ମଧ୍ୟମ-ହାଲକା ଚର୍ମ ରଙ୍ଗ | ହଲାଇବା | ହାତ</annotation>
diff --git a/common/annotationsDerived/pa.xml b/common/annotationsDerived/pa.xml
index f51cfac..176f318 100644
--- a/common/annotationsDerived/pa.xml
+++ b/common/annotationsDerived/pa.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ਇਕੱਠੀਆਂ ਉਂਗਲਾਂ: ਦਰਮਿਆਨਾ ਕਾਲਾ ਰੰਗ</annotation>
<annotation cp="🤌🏿">ਇਕੱਠੀਆਂ ਉਂਗਲਾਂ | ਕਾਲਾ ਰੰਗ</annotation>
<annotation cp="🤌🏿" type="tts">ਇਕੱਠੀਆਂ ਉਂਗਲਾਂ: ਕਾਲਾ ਰੰਗ</annotation>
+ <annotation cp="🥷🏻">ਸੂਰਬੀਰ | ਹਿਡਨ | ਗੋਰਾ ਰੰਗ | ਨਿੰਜਾ | ਭੇਤ</annotation>
+ <annotation cp="🥷🏻" type="tts">ਨਿੰਜਾ: ਗੋਰਾ ਰੰਗ</annotation>
+ <annotation cp="🥷🏼">ਸੂਰਬੀਰ | ਹਲਕਾ ਕਣਕਵੰਨਾ ਰੰਗ | ਹਿਡਨ | ਨਿੰਜਾ | ਭੇਤ</annotation>
+ <annotation cp="🥷🏼" type="tts">ਨਿੰਜਾ: ਹਲਕਾ ਕਣਕਵੰਨਾ ਰੰਗ</annotation>
+ <annotation cp="🥷🏽">ਸੂਰਬੀਰ | ਹਿਡਨ | ਕਣਕਵੰਨਾ ਰੰਗ | ਨਿੰਜਾ | ਭੇਤ</annotation>
+ <annotation cp="🥷🏽" type="tts">ਨਿੰਜਾ: ਕਣਕਵੰਨਾ ਰੰਗ</annotation>
+ <annotation cp="🥷🏾">ਸੂਰਬੀਰ | ਹਿਡਨ | ਦਰਮਿਆਨਾ ਕਾਲਾ ਰੰਗ | ਨਿੰਜਾ | ਭੇਤ</annotation>
+ <annotation cp="🥷🏾" type="tts">ਨਿੰਜਾ: ਦਰਮਿਆਨਾ ਕਾਲਾ ਰੰਗ</annotation>
+ <annotation cp="🥷🏿">ਸੂਰਬੀਰ | ਹਿਡਨ | ਕਾਲਾ ਰੰਗ | ਨਿੰਜਾ | ਭੇਤ</annotation>
+ <annotation cp="🥷🏿" type="tts">ਨਿੰਜਾ: ਕਾਲਾ ਰੰਗ</annotation>
<annotation cp="👋🏻">ਹੱਥ | ਹੱਥ ਹਿਲਾਉਣਾ | ਗੋਰਾ ਰੰਗ | ਲਹਿਰਾਉਣਾ</annotation>
<annotation cp="👋🏻" type="tts">ਹੱਥ ਹਿਲਾਉਣਾ: ਗੋਰਾ ਰੰਗ</annotation>
<annotation cp="👋🏼">ਹੱਥ | ਹੱਥ ਹਿਲਾਉਣਾ | ਹਲਕਾ ਕਣਕਵੰਨਾ ਰੰਗ | ਲਹਿਰਾਉਣਾ</annotation>
diff --git a/common/annotationsDerived/pcm.xml b/common/annotationsDerived/pcm.xml
new file mode 100644
index 0000000..7f79bb7
--- /dev/null
+++ b/common/annotationsDerived/pcm.xml
@@ -0,0 +1,3624 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<!-- Derived short names and annotations, using GenerateDerivedAnnotations.java. See warnings in /annotations/ file. -->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="pcm"/>
+ </identity>
+ <annotations>
+ <annotation cp="🤌🏻">Fínga-dẹm | Laít Skín Ton | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌🏻" type="tts">Pinch Fínga: Laít Skín Ton</annotation>
+ <annotation cp="🤌🏼">Fínga-dẹm | Mídíọ́m-Laít Skín Ton | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌🏼" type="tts">Pinch Fínga: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤌🏽">Fínga-dẹm | Mídíọ́m Skín Ton | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌🏽" type="tts">Pinch Fínga: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤌🏾">Fínga-dẹm | Mídíọ́m Dák Skín Ton | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌🏾" type="tts">Pinch Fínga: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤌🏿">Dák Skín Ton | Fínga-dẹm | Pinch | Pinch Fínga</annotation>
+ <annotation cp="🤌🏿" type="tts">Pinch Fínga: Dák Skín Ton</annotation>
+ <annotation cp="🥷🏻">Faíta | Haid | Laít Skín Ton | Nínja</annotation>
+ <annotation cp="🥷🏻" type="tts">Nínja: Laít Skín Ton</annotation>
+ <annotation cp="🥷🏼">Faíta | Haid | Mídíọ́m-Laít Skín Ton | Nínja</annotation>
+ <annotation cp="🥷🏼" type="tts">Nínja: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🥷🏽">Faíta | Haid | Mídíọ́m Skín Ton | Nínja</annotation>
+ <annotation cp="🥷🏽" type="tts">Nínja: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🥷🏾">Faíta | Haid | Mídíọ́m Dák Skín Ton | Nínja</annotation>
+ <annotation cp="🥷🏾" type="tts">Nínja: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🥷🏿">Dák Skín Ton | Faíta | Haid | Nínja</annotation>
+ <annotation cp="🥷🏿" type="tts">Nínja: Dák Skín Ton</annotation>
+ <annotation cp="👋🏻">Hand | Hand Wé De Wev | Laít Skín Ton | Wev</annotation>
+ <annotation cp="👋🏻" type="tts">Hand Wé De Wev: Laít Skín Ton</annotation>
+ <annotation cp="👋🏼">Hand | Hand Wé De Wev | Mídíọ́m-Laít Skín Ton | Wev</annotation>
+ <annotation cp="👋🏼" type="tts">Hand Wé De Wev: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👋🏽">Hand | Hand Wé De Wev | Mídíọ́m Skín Ton | Wev</annotation>
+ <annotation cp="👋🏽" type="tts">Hand Wé De Wev: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👋🏾">Hand | Hand Wé De Wev | Mídíọ́m Dák Skín Ton | Wev</annotation>
+ <annotation cp="👋🏾" type="tts">Hand Wé De Wev: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👋🏿">Dák Skín Ton | Hand | Hand Wé De Wev | Wev</annotation>
+ <annotation cp="👋🏿" type="tts">Hand Wé De Wev: Dák Skín Ton</annotation>
+ <annotation cp="🤚🏻">Bak | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🤚🏻" type="tts">Hand Im Bak Wé Dẹm Réz Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🤚🏼">Bak | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Mídíọ́m-Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🤚🏼" type="tts">Hand Im Bak Wé Dẹm Réz Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤚🏽">Bak | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Mídíọ́m Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🤚🏽" type="tts">Hand Im Bak Wé Dẹm Réz Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤚🏾">Bak | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Mídíọ́m Dák Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🤚🏾" type="tts">Hand Im Bak Wé Dẹm Réz Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤚🏿">Bak | Dák Skín Ton | Hand | Hand Im Bak Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="🤚🏿" type="tts">Hand Im Bak Wé Dẹm Réz Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🖐🏻">Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Laít Skín Ton | Sprẹd</annotation>
+ <annotation cp="🖐🏻" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm: Laít Skín Ton</annotation>
+ <annotation cp="🖐🏼">Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Mídíọ́m-Laít Skín Ton | Sprẹd</annotation>
+ <annotation cp="🖐🏼" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🖐🏽">Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Mídíọ́m Skín Ton | Sprẹd</annotation>
+ <annotation cp="🖐🏽" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🖐🏾">Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Mídíọ́m Dák Skín Ton | Sprẹd</annotation>
+ <annotation cp="🖐🏾" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🖐🏿">Dák Skín Ton | Fínga | Hand | Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm | Sprẹd</annotation>
+ <annotation cp="🖐🏿" type="tts">Hand Wé Dẹm Sprẹ́d Di Fínga-dẹm: Dák Skín Ton</annotation>
+ <annotation cp="✋🏻">Hand | Hand Wé Dẹm Réz Ọp | Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✋🏻" type="tts">Hand Wé Dẹm Réz Ọp: Laít Skín Ton</annotation>
+ <annotation cp="✋🏼">Hand | Hand Wé Dẹm Réz Ọp | Mídíọ́m-Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✋🏼" type="tts">Hand Wé Dẹm Réz Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="✋🏽">Hand | Hand Wé Dẹm Réz Ọp | Mídíọ́m Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✋🏽" type="tts">Hand Wé Dẹm Réz Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="✋🏾">Hand | Hand Wé Dẹm Réz Ọp | Mídíọ́m Dák Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✋🏾" type="tts">Hand Wé Dẹm Réz Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="✋🏿">Dák Skín Ton | Hand | Hand Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="✋🏿" type="tts">Hand Wé Dẹm Réz Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🖖🏻">Fínga | Hand | Laít Skín Ton | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖🏻" type="tts">Vọ́lkán Salut: Laít Skín Ton</annotation>
+ <annotation cp="🖖🏼">Fínga | Hand | Mídíọ́m-Laít Skín Ton | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖🏼" type="tts">Vọ́lkán Salut: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🖖🏽">Fínga | Hand | Mídíọ́m Skín Ton | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖🏽" type="tts">Vọ́lkán Salut: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🖖🏾">Fínga | Hand | Mídíọ́m Dák Skín Ton | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖🏾" type="tts">Vọ́lkán Salut: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🖖🏿">Dák Skín Ton | Fínga | Hand | Salut | Vọ́lkan | Vọ́lkán Salut</annotation>
+ <annotation cp="🖖🏿" type="tts">Vọ́lkán Salut: Dák Skín Ton</annotation>
+ <annotation cp="👌🏻">Hand | Laít Skín Ton | OK</annotation>
+ <annotation cp="👌🏻" type="tts">OK Hand: Laít Skín Ton</annotation>
+ <annotation cp="👌🏼">Hand | Mídíọ́m-Laít Skín Ton | OK</annotation>
+ <annotation cp="👌🏼" type="tts">OK Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👌🏽">Hand | Mídíọ́m Skín Ton | OK</annotation>
+ <annotation cp="👌🏽" type="tts">OK Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👌🏾">Hand | Mídíọ́m Dák Skín Ton | OK</annotation>
+ <annotation cp="👌🏾" type="tts">OK Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👌🏿">Dák Skín Ton | Hand | OK</annotation>
+ <annotation cp="👌🏿" type="tts">OK Hand: Dák Skín Ton</annotation>
+ <annotation cp="🤏🏻">Hand | Hand Wé De Pinch | Laít Skín Ton | Pinch</annotation>
+ <annotation cp="🤏🏻" type="tts">Hand Wé De Pinch: Laít Skín Ton</annotation>
+ <annotation cp="🤏🏼">Hand | Hand Wé De Pinch | Mídíọ́m-Laít Skín Ton | Pinch</annotation>
+ <annotation cp="🤏🏼" type="tts">Hand Wé De Pinch: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤏🏽">Hand | Hand Wé De Pinch | Mídíọ́m Skín Ton | Pinch</annotation>
+ <annotation cp="🤏🏽" type="tts">Hand Wé De Pinch: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤏🏾">Hand | Hand Wé De Pinch | Mídíọ́m Dák Skín Ton | Pinch</annotation>
+ <annotation cp="🤏🏾" type="tts">Hand Wé De Pinch: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤏🏿">Dák Skín Ton | Hand | Hand Wé De Pinch | Pinch</annotation>
+ <annotation cp="🤏🏿" type="tts">Hand Wé De Pinch: Dák Skín Ton</annotation>
+ <annotation cp="✌🏻">Hand | Laít Skín Ton | Wíktri | Win</annotation>
+ <annotation cp="✌🏻" type="tts">Wíktri Hand: Laít Skín Ton</annotation>
+ <annotation cp="✌🏼">Hand | Mídíọ́m-Laít Skín Ton | Wíktri | Win</annotation>
+ <annotation cp="✌🏼" type="tts">Wíktri Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="✌🏽">Hand | Mídíọ́m Skín Ton | Wíktri | Win</annotation>
+ <annotation cp="✌🏽" type="tts">Wíktri Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="✌🏾">Hand | Mídíọ́m Dák Skín Ton | Wíktri | Win</annotation>
+ <annotation cp="✌🏾" type="tts">Wíktri Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="✌🏿">Dák Skín Ton | Hand | Wíktri | Win</annotation>
+ <annotation cp="✌🏿" type="tts">Wíktri Hand: Dák Skín Ton</annotation>
+ <annotation cp="🤞🏻">Fínga | Hand | Krọs | Krọ́s Fínga-dẹm | Laít Skín Ton</annotation>
+ <annotation cp="🤞🏻" type="tts">Krọ́s Fínga-dẹm: Laít Skín Ton</annotation>
+ <annotation cp="🤞🏼">Fínga | Hand | Krọs | Krọ́s Fínga-dẹm | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤞🏼" type="tts">Krọ́s Fínga-dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤞🏽">Fínga | Hand | Krọs | Krọ́s Fínga-dẹm | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤞🏽" type="tts">Krọ́s Fínga-dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤞🏾">Fínga | Hand | Krọs | Krọ́s Fínga-dẹm | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤞🏾" type="tts">Krọ́s Fínga-dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤞🏿">Dák Skín Ton | Fínga | Hand | Krọs | Krọ́s Fínga-dẹm</annotation>
+ <annotation cp="🤞🏿" type="tts">Krọ́s Fínga-dẹm: Dák Skín Ton</annotation>
+ <annotation cp="🤟🏻">A Lọ́v Yu Sain | ALY | Hand | Laít Skín Ton | Lọv | Sain</annotation>
+ <annotation cp="🤟🏻" type="tts">A Lọ́v Yu Sain: Laít Skín Ton</annotation>
+ <annotation cp="🤟🏼">A Lọ́v Yu Sain | ALY | Hand | Lọv | Mídíọ́m-Laít Skín Ton | Sain</annotation>
+ <annotation cp="🤟🏼" type="tts">A Lọ́v Yu Sain: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤟🏽">A Lọ́v Yu Sain | ALY | Hand | Lọv | Mídíọ́m Skín Ton | Sain</annotation>
+ <annotation cp="🤟🏽" type="tts">A Lọ́v Yu Sain: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤟🏾">A Lọ́v Yu Sain | ALY | Hand | Lọv | Mídíọ́m Dák Skín Ton | Sain</annotation>
+ <annotation cp="🤟🏾" type="tts">A Lọ́v Yu Sain: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤟🏿">A Lọ́v Yu Sain | ALY | Dák Skín Ton | Hand | Lọv | Sain</annotation>
+ <annotation cp="🤟🏿" type="tts">A Lọ́v Yu Sain: Dák Skín Ton</annotation>
+ <annotation cp="🤘🏻">Fínga | Hand | Họ́n | Laít Skín Ton | Sain</annotation>
+ <annotation cp="🤘🏻" type="tts">Họ́n Sain: Laít Skín Ton</annotation>
+ <annotation cp="🤘🏼">Fínga | Hand | Họ́n | Mídíọ́m-Laít Skín Ton | Sain</annotation>
+ <annotation cp="🤘🏼" type="tts">Họ́n Sain: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤘🏽">Fínga | Hand | Họ́n | Mídíọ́m Skín Ton | Sain</annotation>
+ <annotation cp="🤘🏽" type="tts">Họ́n Sain: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤘🏾">Fínga | Hand | Họ́n | Mídíọ́m Dák Skín Ton | Sain</annotation>
+ <annotation cp="🤘🏾" type="tts">Họ́n Sain: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤘🏿">Dák Skín Ton | Fínga | Hand | Họ́n | Sain</annotation>
+ <annotation cp="🤘🏿" type="tts">Họ́n Sain: Dák Skín Ton</annotation>
+ <annotation cp="🤙🏻">Fon | Hand | Laít Skín Ton | Mék Yu Fón Mí Hand</annotation>
+ <annotation cp="🤙🏻" type="tts">Mék Yu Fón Mí Hand: Laít Skín Ton</annotation>
+ <annotation cp="🤙🏼">Fon | Hand | Mék Yu Fón Mí Hand | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤙🏼" type="tts">Mék Yu Fón Mí Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤙🏽">Fon | Hand | Mék Yu Fón Mí Hand | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤙🏽" type="tts">Mék Yu Fón Mí Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤙🏾">Fon | Hand | Mék Yu Fón Mí Hand | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤙🏾" type="tts">Mék Yu Fón Mí Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤙🏿">Dák Skín Ton | Fon | Hand | Mék Yu Fón Mí Hand</annotation>
+ <annotation cp="🤙🏿" type="tts">Mék Yu Fón Mí Hand: Dák Skín Ton</annotation>
+ <annotation cp="👈🏻">Bakhand | Fínga | Fínga De Pọínt Lẹft | Hand | Laít Skín Ton | Lẹft | Tọmb</annotation>
+ <annotation cp="👈🏻" type="tts">Fínga De Pọínt Lẹft: Laít Skín Ton</annotation>
+ <annotation cp="👈🏼">Bakhand | Fínga | Fínga De Pọínt Lẹft | Hand | Lẹft | Mídíọ́m-Laít Skín Ton | Tọmb</annotation>
+ <annotation cp="👈🏼" type="tts">Fínga De Pọínt Lẹft: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👈🏽">Bakhand | Fínga | Fínga De Pọínt Lẹft | Hand | Lẹft | Mídíọ́m Skín Ton | Tọmb</annotation>
+ <annotation cp="👈🏽" type="tts">Fínga De Pọínt Lẹft: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👈🏾">Bakhand | Fínga | Fínga De Pọínt Lẹft | Hand | Lẹft | Mídíọ́m Dák Skín Ton | Tọmb</annotation>
+ <annotation cp="👈🏾" type="tts">Fínga De Pọínt Lẹft: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👈🏿">Bakhand | Dák Skín Ton | Fínga | Fínga De Pọínt Lẹft | Hand | Lẹft | Tọmb</annotation>
+ <annotation cp="👈🏿" type="tts">Fínga De Pọínt Lẹft: Dák Skín Ton</annotation>
+ <annotation cp="👉🏻">Bakhand | Fínga | Fínga De Pọínt Rait | Hand | Laít Skín Ton | Rait | Tọmb</annotation>
+ <annotation cp="👉🏻" type="tts">Fínga De Pọínt Rait: Laít Skín Ton</annotation>
+ <annotation cp="👉🏼">Bakhand | Fínga | Fínga De Pọínt Rait | Hand | Mídíọ́m-Laít Skín Ton | Rait | Tọmb</annotation>
+ <annotation cp="👉🏼" type="tts">Fínga De Pọínt Rait: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👉🏽">Bakhand | Fínga | Fínga De Pọínt Rait | Hand | Mídíọ́m Skín Ton | Rait | Tọmb</annotation>
+ <annotation cp="👉🏽" type="tts">Fínga De Pọínt Rait: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👉🏾">Bakhand | Fínga | Fínga De Pọínt Rait | Hand | Mídíọ́m Dák Skín Ton | Rait | Tọmb</annotation>
+ <annotation cp="👉🏾" type="tts">Fínga De Pọínt Rait: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👉🏿">Bakhand | Dák Skín Ton | Fínga | Fínga De Pọínt Rait | Hand | Rait | Tọmb</annotation>
+ <annotation cp="👉🏿" type="tts">Fínga De Pọínt Rait: Dák Skín Ton</annotation>
+ <annotation cp="👆🏻">Bakhand | Fínga | Fínga De Pọínt Ọp | Hand | Laít Skín Ton | Ọp | Tọmb</annotation>
+ <annotation cp="👆🏻" type="tts">Fínga De Pọínt Ọp: Laít Skín Ton</annotation>
+ <annotation cp="👆🏼">Bakhand | Fínga | Fínga De Pọínt Ọp | Hand | Mídíọ́m-Laít Skín Ton | Ọp | Tọmb</annotation>
+ <annotation cp="👆🏼" type="tts">Fínga De Pọínt Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👆🏽">Bakhand | Fínga | Fínga De Pọínt Ọp | Hand | Mídíọ́m Skín Ton | Ọp | Tọmb</annotation>
+ <annotation cp="👆🏽" type="tts">Fínga De Pọínt Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👆🏾">Bakhand | Fínga | Fínga De Pọínt Ọp | Hand | Mídíọ́m Dák Skín Ton | Ọp | Tọmb</annotation>
+ <annotation cp="👆🏾" type="tts">Fínga De Pọínt Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👆🏿">Bakhand | Dák Skín Ton | Fínga | Fínga De Pọínt Ọp | Hand | Ọp | Tọmb</annotation>
+ <annotation cp="👆🏿" type="tts">Fínga De Pọínt Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🖕🏻">Fínga | Hand | Laít Skín Ton | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕🏻" type="tts">Mídúl Fínga: Laít Skín Ton</annotation>
+ <annotation cp="🖕🏼">Fínga | Hand | Mídíọ́m-Laít Skín Ton | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕🏼" type="tts">Mídúl Fínga: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🖕🏽">Fínga | Hand | Mídíọ́m Skín Ton | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕🏽" type="tts">Mídúl Fínga: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🖕🏾">Fínga | Hand | Mídíọ́m Dák Skín Ton | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕🏾" type="tts">Mídúl Fínga: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🖕🏿">Dák Skín Ton | Fínga | Hand | Mídul | Mídúl Fínga</annotation>
+ <annotation cp="🖕🏿" type="tts">Mídúl Fínga: Dák Skín Ton</annotation>
+ <annotation cp="👇🏻">Bakhand | Daun | Fínga | Fínga De Pọínt Daun | Hand | Laít Skín Ton | Tọmb</annotation>
+ <annotation cp="👇🏻" type="tts">Fínga De Pọínt Daun: Laít Skín Ton</annotation>
+ <annotation cp="👇🏼">Bakhand | Daun | Fínga | Fínga De Pọínt Daun | Hand | Mídíọ́m-Laít Skín Ton | Tọmb</annotation>
+ <annotation cp="👇🏼" type="tts">Fínga De Pọínt Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👇🏽">Bakhand | Daun | Fínga | Fínga De Pọínt Daun | Hand | Mídíọ́m Skín Ton | Tọmb</annotation>
+ <annotation cp="👇🏽" type="tts">Fínga De Pọínt Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👇🏾">Bakhand | Daun | Fínga | Fínga De Pọínt Daun | Hand | Mídíọ́m Dák Skín Ton | Tọmb</annotation>
+ <annotation cp="👇🏾" type="tts">Fínga De Pọínt Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👇🏿">Bakhand | Dák Skín Ton | Daun | Fínga | Fínga De Pọínt Daun | Hand | Tọmb</annotation>
+ <annotation cp="👇🏿" type="tts">Fínga De Pọínt Daun: Dák Skín Ton</annotation>
+ <annotation cp="☝🏻">Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Laít Skín Ton | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝🏻" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp: Laít Skín Ton</annotation>
+ <annotation cp="☝🏼">Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Mídíọ́m-Laít Skín Ton | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝🏼" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="☝🏽">Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Mídíọ́m Skín Ton | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝🏽" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="☝🏾">Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Mídíọ́m Dák Skín Ton | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝🏾" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="☝🏿">Dák Skín Ton | Fínga | Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp | Hand | Ọp | Pọint | Tọmb</annotation>
+ <annotation cp="☝🏿" type="tts">Fínga Wé Dé Niá Di Tọmb De Pọínt Ọp: Dák Skín Ton</annotation>
+ <annotation cp="👍🏻">Hand | Laít Skín Ton | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍🏻" type="tts">Tọ́mbs Ọp: Laít Skín Ton</annotation>
+ <annotation cp="👍🏼">Hand | Mídíọ́m-Laít Skín Ton | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍🏼" type="tts">Tọ́mbs Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👍🏽">Hand | Mídíọ́m Skín Ton | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍🏽" type="tts">Tọ́mbs Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👍🏾">Hand | Mídíọ́m Dák Skín Ton | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍🏾" type="tts">Tọ́mbs Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👍🏿">Dák Skín Ton | Hand | Ọp | Tọmb | Tọ́mbs Ọp</annotation>
+ <annotation cp="👍🏿" type="tts">Tọ́mbs Ọp: Dák Skín Ton</annotation>
+ <annotation cp="👎🏻">Daun | Hand | Laít Skín Ton | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎🏻" type="tts">Tọ́mbs Daun: Laít Skín Ton</annotation>
+ <annotation cp="👎🏼">Daun | Hand | Mídíọ́m-Laít Skín Ton | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎🏼" type="tts">Tọ́mbs Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👎🏽">Daun | Hand | Mídíọ́m Skín Ton | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎🏽" type="tts">Tọ́mbs Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👎🏾">Daun | Hand | Mídíọ́m Dák Skín Ton | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎🏾" type="tts">Tọ́mbs Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👎🏿">Dák Skín Ton | Daun | Hand | Tọmb | Tọ́mbs Daun</annotation>
+ <annotation cp="👎🏿" type="tts">Tọ́mbs Daun: Dák Skín Ton</annotation>
+ <annotation cp="✊🏻">Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✊🏻" type="tts">Dẹm Réz Klóz Hand Ọp: Laít Skín Ton</annotation>
+ <annotation cp="✊🏼">Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Mídíọ́m-Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✊🏼" type="tts">Dẹm Réz Klóz Hand Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="✊🏽">Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Mídíọ́m Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✊🏽" type="tts">Dẹm Réz Klóz Hand Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="✊🏾">Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Mídíọ́m Dák Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="✊🏾" type="tts">Dẹm Réz Klóz Hand Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="✊🏿">Dák Skín Ton | Dẹm Réz Klóz Hand Ọp | Hand | Kloz | Ọp | Rez</annotation>
+ <annotation cp="✊🏿" type="tts">Dẹm Réz Klóz Hand Ọp: Dák Skín Ton</annotation>
+ <annotation cp="👊🏻">Blo | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="👊🏻" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo: Laít Skín Ton</annotation>
+ <annotation cp="👊🏼">Blo | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="👊🏼" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👊🏽">Blo | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="👊🏽" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👊🏾">Blo | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="👊🏾" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👊🏿">Blo | Dák Skín Ton | Klóz Hand | Klóz Hand Wán Gív Pẹ́sin Blo | Pẹ́sin</annotation>
+ <annotation cp="👊🏿" type="tts">Klóz Hand Wán Gív Pẹ́sin Blo: Dák Skín Ton</annotation>
+ <annotation cp="🤛🏻">Fes | Hand | Klós Hand Wé De Fés Lẹft | Laít Skín Ton | Lẹft | Lẹ́ft Said</annotation>
+ <annotation cp="🤛🏻" type="tts">Klós Hand Wé De Fés Lẹft: Laít Skín Ton</annotation>
+ <annotation cp="🤛🏼">Fes | Hand | Klós Hand Wé De Fés Lẹft | Lẹft | Lẹ́ft Said | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤛🏼" type="tts">Klós Hand Wé De Fés Lẹft: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤛🏽">Fes | Hand | Klós Hand Wé De Fés Lẹft | Lẹft | Lẹ́ft Said | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤛🏽" type="tts">Klós Hand Wé De Fés Lẹft: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤛🏾">Fes | Hand | Klós Hand Wé De Fés Lẹft | Lẹft | Lẹ́ft Said | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤛🏾" type="tts">Klós Hand Wé De Fés Lẹft: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤛🏿">Dák Skín Ton | Fes | Hand | Klós Hand Wé De Fés Lẹft | Lẹft | Lẹ́ft Said</annotation>
+ <annotation cp="🤛🏿" type="tts">Klós Hand Wé De Fés Lẹft: Dák Skín Ton</annotation>
+ <annotation cp="🤜🏻">Fes | Hand | Klós Hand Wé De Fés Rait | Laít Skín Ton | Rait | Raít Said</annotation>
+ <annotation cp="🤜🏻" type="tts">Klós Hand Wé De Fés Rait: Laít Skín Ton</annotation>
+ <annotation cp="🤜🏼">Fes | Hand | Klós Hand Wé De Fés Rait | Mídíọ́m-Laít Skín Ton | Rait | Raít Said</annotation>
+ <annotation cp="🤜🏼" type="tts">Klós Hand Wé De Fés Rait: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤜🏽">Fes | Hand | Klós Hand Wé De Fés Rait | Mídíọ́m Skín Ton | Rait | Raít Said</annotation>
+ <annotation cp="🤜🏽" type="tts">Klós Hand Wé De Fés Rait: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤜🏾">Fes | Hand | Klós Hand Wé De Fés Rait | Mídíọ́m Dák Skín Ton | Rait | Raít Said</annotation>
+ <annotation cp="🤜🏾" type="tts">Klós Hand Wé De Fés Rait: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤜🏿">Dák Skín Ton | Fes | Hand | Klós Hand Wé De Fés Rait | Rait | Raít Said</annotation>
+ <annotation cp="🤜🏿" type="tts">Klós Hand Wé De Fés Rait: Dák Skín Ton</annotation>
+ <annotation cp="👏🏻">Hand | Hand-dẹm Wé De Klap | Klap | Laít Skín Ton</annotation>
+ <annotation cp="👏🏻" type="tts">Hand-dẹm Wé De Klap: Laít Skín Ton</annotation>
+ <annotation cp="👏🏼">Hand | Hand-dẹm Wé De Klap | Klap | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👏🏼" type="tts">Hand-dẹm Wé De Klap: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👏🏽">Hand | Hand-dẹm Wé De Klap | Klap | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👏🏽" type="tts">Hand-dẹm Wé De Klap: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👏🏾">Hand | Hand-dẹm Wé De Klap | Klap | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👏🏾" type="tts">Hand-dẹm Wé De Klap: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👏🏿">Dák Skín Ton | Hand | Hand-dẹm Wé De Klap | Klap</annotation>
+ <annotation cp="👏🏿" type="tts">Hand-dẹm Wé De Klap: Dák Skín Ton</annotation>
+ <annotation cp="🙌🏻">Hand | Hand-dẹm Wé Dẹm Réz Ọp | Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙌🏻" type="tts">Hand-dẹm Wé Dẹm Réz Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🙌🏼">Hand | Hand-dẹm Wé Dẹm Réz Ọp | Mídíọ́m-Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙌🏼" type="tts">Hand-dẹm Wé Dẹm Réz Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙌🏽">Hand | Hand-dẹm Wé Dẹm Réz Ọp | Mídíọ́m Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙌🏽" type="tts">Hand-dẹm Wé Dẹm Réz Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙌🏾">Hand | Hand-dẹm Wé Dẹm Réz Ọp | Mídíọ́m Dák Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙌🏾" type="tts">Hand-dẹm Wé Dẹm Réz Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙌🏿">Dák Skín Ton | Hand | Hand-dẹm Wé Dẹm Réz Ọp | Ọp | Rez</annotation>
+ <annotation cp="🙌🏿" type="tts">Hand-dẹm Wé Dẹm Réz Ọp: Dák Skín Ton</annotation>
+ <annotation cp="👐🏻">Hand | Laít Skín Ton | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐🏻" type="tts">Ópún Hand-dẹm: Laít Skín Ton</annotation>
+ <annotation cp="👐🏼">Hand | Mídíọ́m-Laít Skín Ton | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐🏼" type="tts">Ópún Hand-dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👐🏽">Hand | Mídíọ́m Skín Ton | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐🏽" type="tts">Ópún Hand-dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👐🏾">Hand | Mídíọ́m Dák Skín Ton | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐🏾" type="tts">Ópún Hand-dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👐🏿">Dák Skín Ton | Hand | Ópún Hand-dẹm</annotation>
+ <annotation cp="👐🏿" type="tts">Ópún Hand-dẹm: Dák Skín Ton</annotation>
+ <annotation cp="🤲🏻">Hand | Laít Skín Ton | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲🏻" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da: Laít Skín Ton</annotation>
+ <annotation cp="🤲🏼">Hand | Mídíọ́m-Laít Skín Ton | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲🏼" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤲🏽">Hand | Mídíọ́m Skín Ton | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲🏽" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤲🏾">Hand | Mídíọ́m Dák Skín Ton | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲🏾" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤲🏿">Dák Skín Ton | Hand | Ópun | Ópún Hand-dẹm Wé Dé Togẹ́da | Togẹ́da</annotation>
+ <annotation cp="🤲🏿" type="tts">Ópún Hand-dẹm Wé Dé Togẹ́da: Dák Skín Ton</annotation>
+ <annotation cp="🙏🏻">Abẹg | Hand | Hand-dẹm Wé Dẹm Fold | Laít Skín Ton | Prè</annotation>
+ <annotation cp="🙏🏻" type="tts">Hand-dẹm Wé Dẹm Fold: Laít Skín Ton</annotation>
+ <annotation cp="🙏🏼">Abẹg | Hand | Hand-dẹm Wé Dẹm Fold | Mídíọ́m-Laít Skín Ton | Prè</annotation>
+ <annotation cp="🙏🏼" type="tts">Hand-dẹm Wé Dẹm Fold: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙏🏽">Abẹg | Hand | Hand-dẹm Wé Dẹm Fold | Mídíọ́m Skín Ton | Prè</annotation>
+ <annotation cp="🙏🏽" type="tts">Hand-dẹm Wé Dẹm Fold: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙏🏾">Abẹg | Hand | Hand-dẹm Wé Dẹm Fold | Mídíọ́m Dák Skín Ton | Prè</annotation>
+ <annotation cp="🙏🏾" type="tts">Hand-dẹm Wé Dẹm Fold: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙏🏿">Abẹg | Dák Skín Ton | Hand | Hand-dẹm Wé Dẹm Fold | Prè</annotation>
+ <annotation cp="🙏🏿" type="tts">Hand-dẹm Wé Dẹm Fold: Dák Skín Ton</annotation>
+ <annotation cp="✍🏻">Hand | Hand Wé De Raít Sọ́mtin | Laít Skín Ton | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍🏻" type="tts">Hand Wé De Raít Sọ́mtin: Laít Skín Ton</annotation>
+ <annotation cp="✍🏼">Hand | Hand Wé De Raít Sọ́mtin | Mídíọ́m-Laít Skín Ton | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍🏼" type="tts">Hand Wé De Raít Sọ́mtin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="✍🏽">Hand | Hand Wé De Raít Sọ́mtin | Mídíọ́m Skín Ton | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍🏽" type="tts">Hand Wé De Raít Sọ́mtin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="✍🏾">Hand | Hand Wé De Raít Sọ́mtin | Mídíọ́m Dák Skín Ton | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍🏾" type="tts">Hand Wé De Raít Sọ́mtin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="✍🏿">Dák Skín Ton | Hand | Hand Wé De Raít Sọ́mtin | Rait | Sọ́mtin</annotation>
+ <annotation cp="✍🏿" type="tts">Hand Wé De Raít Sọ́mtin: Dák Skín Ton</annotation>
+ <annotation cp="💅🏻">Kọsmẹ́tiks | Laít Skín Ton | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅🏻" type="tts">Nél Pọ́lish: Laít Skín Ton</annotation>
+ <annotation cp="💅🏼">Kọsmẹ́tiks | Mídíọ́m-Laít Skín Ton | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅🏼" type="tts">Nél Pọ́lish: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💅🏽">Kọsmẹ́tiks | Mídíọ́m Skín Ton | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅🏽" type="tts">Nél Pọ́lish: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💅🏾">Kọsmẹ́tiks | Mídíọ́m Dák Skín Ton | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅🏾" type="tts">Nél Pọ́lish: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💅🏿">Dák Skín Ton | Kọsmẹ́tiks | Nel | Nél Pọ́lish | Pọ́lish</annotation>
+ <annotation cp="💅🏿" type="tts">Nél Pọ́lish: Dák Skín Ton</annotation>
+ <annotation cp="🤳🏻">Fon | Kámẹ́ra | Laít Skín Ton | Sẹ́lfi</annotation>
+ <annotation cp="🤳🏻" type="tts">Sẹ́lfi: Laít Skín Ton</annotation>
+ <annotation cp="🤳🏼">Fon | Kámẹ́ra | Mídíọ́m-Laít Skín Ton | Sẹ́lfi</annotation>
+ <annotation cp="🤳🏼" type="tts">Sẹ́lfi: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤳🏽">Fon | Kámẹ́ra | Mídíọ́m Skín Ton | Sẹ́lfi</annotation>
+ <annotation cp="🤳🏽" type="tts">Sẹ́lfi: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤳🏾">Fon | Kámẹ́ra | Mídíọ́m Dák Skín Ton | Sẹ́lfi</annotation>
+ <annotation cp="🤳🏾" type="tts">Sẹ́lfi: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤳🏿">Dák Skín Ton | Fon | Kámẹ́ra | Sẹ́lfi</annotation>
+ <annotation cp="🤳🏿" type="tts">Sẹ́lfi: Dák Skín Ton</annotation>
+ <annotation cp="💪🏻">Bẹnd | Hand | Hánd Mọ́zul Wé Bẹnd | Laít Skín Ton | Mọ́zul</annotation>
+ <annotation cp="💪🏻" type="tts">Hánd Mọ́zul Wé Bẹnd: Laít Skín Ton</annotation>
+ <annotation cp="💪🏼">Bẹnd | Hand | Hánd Mọ́zul Wé Bẹnd | Mídíọ́m-Laít Skín Ton | Mọ́zul</annotation>
+ <annotation cp="💪🏼" type="tts">Hánd Mọ́zul Wé Bẹnd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💪🏽">Bẹnd | Hand | Hánd Mọ́zul Wé Bẹnd | Mídíọ́m Skín Ton | Mọ́zul</annotation>
+ <annotation cp="💪🏽" type="tts">Hánd Mọ́zul Wé Bẹnd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💪🏾">Bẹnd | Hand | Hánd Mọ́zul Wé Bẹnd | Mídíọ́m Dák Skín Ton | Mọ́zul</annotation>
+ <annotation cp="💪🏾" type="tts">Hánd Mọ́zul Wé Bẹnd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💪🏿">Bẹnd | Dák Skín Ton | Hand | Hánd Mọ́zul Wé Bẹnd | Mọ́zul</annotation>
+ <annotation cp="💪🏿" type="tts">Hánd Mọ́zul Wé Bẹnd: Dák Skín Ton</annotation>
+ <annotation cp="🦵🏻">Kik | Laít Skín Ton | Lẹg</annotation>
+ <annotation cp="🦵🏻" type="tts">Lẹg: Laít Skín Ton</annotation>
+ <annotation cp="🦵🏼">Kik | Lẹg | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦵🏼" type="tts">Lẹg: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦵🏽">Kik | Lẹg | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦵🏽" type="tts">Lẹg: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦵🏾">Kik | Lẹg | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦵🏾" type="tts">Lẹg: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦵🏿">Dák Skín Ton | Kik | Lẹg</annotation>
+ <annotation cp="🦵🏿" type="tts">Lẹg: Dák Skín Ton</annotation>
+ <annotation cp="🦶🏻">Daunlẹg | Kik | Laít Skín Ton</annotation>
+ <annotation cp="🦶🏻" type="tts">Daunlẹg: Laít Skín Ton</annotation>
+ <annotation cp="🦶🏼">Daunlẹg | Kik | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦶🏼" type="tts">Daunlẹg: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦶🏽">Daunlẹg | Kik | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦶🏽" type="tts">Daunlẹg: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦶🏾">Daunlẹg | Kik | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦶🏾" type="tts">Daunlẹg: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦶🏿">Dák Skín Ton | Daunlẹg | Kik</annotation>
+ <annotation cp="🦶🏿" type="tts">Daunlẹg: Dák Skín Ton</annotation>
+ <annotation cp="👂🏻">Bọdí Pat | Hia | Ia | Laít Skín Ton</annotation>
+ <annotation cp="👂🏻" type="tts">Ia: Laít Skín Ton</annotation>
+ <annotation cp="👂🏼">Bọdí Pat | Hia | Ia | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👂🏼" type="tts">Ia: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👂🏽">Bọdí Pat | Hia | Ia | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👂🏽" type="tts">Ia: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👂🏾">Bọdí Pat | Hia | Ia | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👂🏾" type="tts">Ia: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👂🏿">Bọdí Pat | Dák Skín Ton | Hia | Ia</annotation>
+ <annotation cp="👂🏿" type="tts">Ia: Dák Skín Ton</annotation>
+ <annotation cp="🦻🏻">Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🦻🏻" type="tts">Ia Wit Iá Hẹ́lẹp: Laít Skín Ton</annotation>
+ <annotation cp="🦻🏼">Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🦻🏼" type="tts">Ia Wit Iá Hẹ́lẹp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦻🏽">Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🦻🏽" type="tts">Ia Wit Iá Hẹ́lẹp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦻🏾">Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🦻🏾" type="tts">Ia Wit Iá Hẹ́lẹp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦻🏿">Dák Skín Ton | Hẹ́lẹ́p | Hia | Ia | Ia Wit Iá Hẹ́lẹp | Pẹ́sin</annotation>
+ <annotation cp="🦻🏿" type="tts">Ia Wit Iá Hẹ́lẹp: Dák Skín Ton</annotation>
+ <annotation cp="👃🏻">Bọdí Pat | Laít Skín Ton | Noz</annotation>
+ <annotation cp="👃🏻" type="tts">Noz: Laít Skín Ton</annotation>
+ <annotation cp="👃🏼">Bọdí Pat | Mídíọ́m-Laít Skín Ton | Noz</annotation>
+ <annotation cp="👃🏼" type="tts">Noz: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👃🏽">Bọdí Pat | Mídíọ́m Skín Ton | Noz</annotation>
+ <annotation cp="👃🏽" type="tts">Noz: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👃🏾">Bọdí Pat | Mídíọ́m Dák Skín Ton | Noz</annotation>
+ <annotation cp="👃🏾" type="tts">Noz: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👃🏿">Bọdí Pat | Dák Skín Ton | Noz</annotation>
+ <annotation cp="👃🏿" type="tts">Noz: Dák Skín Ton</annotation>
+ <annotation cp="👶🏻">Bebí | Laít Skín Ton | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶🏻" type="tts">Taata: Laít Skín Ton</annotation>
+ <annotation cp="👶🏼">Bebí | Mídíọ́m-Laít Skín Ton | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶🏼" type="tts">Taata: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👶🏽">Bebí | Mídíọ́m Skín Ton | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶🏽" type="tts">Taata: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👶🏾">Bebí | Mídíọ́m Dák Skín Ton | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶🏾" type="tts">Taata: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👶🏿">Bebí | Dák Skín Ton | Píkin Wé Stíl De Sọ́k Brẹst | Taata | Yọng</annotation>
+ <annotation cp="👶🏿" type="tts">Taata: Dák Skín Ton</annotation>
+ <annotation cp="🧒🏻">Laít Skín Ton | Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒🏻" type="tts">Smọ́l Pikin: Laít Skín Ton</annotation>
+ <annotation cp="🧒🏼">Mídíọ́m-Laít Skín Ton | Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒🏼" type="tts">Smọ́l Pikin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧒🏽">Mídíọ́m Skín Ton | Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒🏽" type="tts">Smọ́l Pikin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧒🏾">Mídíọ́m Dák Skín Ton | Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒🏾" type="tts">Smọ́l Pikin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧒🏿">Dák Skín Ton | Pikin | Smọ́l Pikin | Yọng</annotation>
+ <annotation cp="🧒🏿" type="tts">Smọ́l Pikin: Dák Skín Ton</annotation>
+ <annotation cp="👦🏻">Bọi | Laít Skín Ton | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦🏻" type="tts">Smọ́l Bọi: Laít Skín Ton</annotation>
+ <annotation cp="👦🏼">Bọi | Mídíọ́m-Laít Skín Ton | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦🏼" type="tts">Smọ́l Bọi: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👦🏽">Bọi | Mídíọ́m Skín Ton | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦🏽" type="tts">Smọ́l Bọi: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👦🏾">Bọi | Mídíọ́m Dák Skín Ton | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦🏾" type="tts">Smọ́l Bọi: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👦🏿">Bọi | Dák Skín Ton | Smọ́l Bọi | Yọng</annotation>
+ <annotation cp="👦🏿" type="tts">Smọ́l Bọi: Dák Skín Ton</annotation>
+ <annotation cp="👧🏻">Gẹl | Laít Skín Ton | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧🏻" type="tts">Smọ́l Gẹl: Laít Skín Ton</annotation>
+ <annotation cp="👧🏼">Gẹl | Mídíọ́m-Laít Skín Ton | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧🏼" type="tts">Smọ́l Gẹl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👧🏽">Gẹl | Mídíọ́m Skín Ton | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧🏽" type="tts">Smọ́l Gẹl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👧🏾">Gẹl | Mídíọ́m Dák Skín Ton | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧🏾" type="tts">Smọ́l Gẹl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👧🏿">Dák Skín Ton | Gẹl | Smọ́l Gẹl | Yọng</annotation>
+ <annotation cp="👧🏿" type="tts">Smọ́l Gẹl: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏻" type="tts">Pẹ́sin: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏼" type="tts">Pẹ́sin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏽" type="tts">Pẹ́sin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏾" type="tts">Pẹ́sin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏿" type="tts">Pẹ́sin: Dák Skín Ton</annotation>
+ <annotation cp="👱🏻">Hea | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏻" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea: Laít Skín Ton</annotation>
+ <annotation cp="👱🏼">Hea | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏼" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👱🏽">Hea | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏽" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👱🏾">Hea | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏾" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👱🏿">Dák Skín Ton | Hea | Pẹ́sin | Pẹ́sin Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏿" type="tts">Pẹ́sin Wé Gẹ́t Blọ́nd Hea: Dák Skín Ton</annotation>
+ <annotation cp="🧑🦰">Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🦰" type="tts">Pẹ́sin: Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏻🦰">Laít Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏻🦰" type="tts">Pẹ́sin: Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏼🦰">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏼🦰" type="tts">Pẹ́sin: Mídíọ́m-Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏽🦰">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Skín Ton | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏽🦰" type="tts">Pẹ́sin: Mídíọ́m Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏾🦰">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Dák Skín Ton | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏾🦰" type="tts">Pẹ́sin: Mídíọ́m Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏿🦰">Dák Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Rẹ́d Hea</annotation>
+ <annotation cp="🧑🏿🦰" type="tts">Pẹ́sin: Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="🧑🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🦱" type="tts">Pẹ́sin: Kọ́lí Hea</annotation>
+ <annotation cp="🧑🏻🦱">Kọ́lí Hea | Laít Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏻🦱" type="tts">Pẹ́sin: Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="🧑🏼🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏼🦱" type="tts">Pẹ́sin: Mídíọ́m-Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="🧑🏽🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏽🦱" type="tts">Pẹ́sin: Mídíọ́m Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="🧑🏾🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏾🦱" type="tts">Pẹ́sin: Mídíọ́m Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="🧑🏿🦱">Dák Skín Ton | Kọ́lí Hea | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏿🦱" type="tts">Pẹ́sin: Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="🧑🦳">Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🦳" type="tts">Pẹ́sin: Waít Hea</annotation>
+ <annotation cp="🧑🏻🦳">Laít Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🏻🦳" type="tts">Pẹ́sin: Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="🧑🏼🦳">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🏼🦳" type="tts">Pẹ́sin: Mídíọ́m-Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="🧑🏽🦳">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Skín Ton | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🏽🦳" type="tts">Pẹ́sin: Mídíọ́m Skín Ton, Waít Hea</annotation>
+ <annotation cp="🧑🏾🦳">Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Dák Skín Ton | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🏾🦳" type="tts">Pẹ́sin: Mídíọ́m Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="🧑🏿🦳">Dák Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin | Waít Hea</annotation>
+ <annotation cp="🧑🏿🦳" type="tts">Pẹ́sin: Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="🧑🦲">Bọld | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🦲" type="tts">Pẹ́sin: Bọld</annotation>
+ <annotation cp="🧑🏻🦲">Bọld | Laít Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏻🦲" type="tts">Pẹ́sin: Laít Skín Ton, Bọld</annotation>
+ <annotation cp="🧑🏼🦲">Bọld | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏼🦲" type="tts">Pẹ́sin: Mídíọ́m-Laít Skín Ton, Bọld</annotation>
+ <annotation cp="🧑🏽🦲">Bọld | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏽🦲" type="tts">Pẹ́sin: Mídíọ́m Skín Ton, Bọld</annotation>
+ <annotation cp="🧑🏾🦲">Bọld | Machọ́ Pẹ́sin | Mán Ọ Wúman | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧑🏾🦲" type="tts">Pẹ́sin: Mídíọ́m Dák Skín Ton, Bọld</annotation>
+ <annotation cp="🧑🏿🦲">Bọld | Dák Skín Ton | Machọ́ Pẹ́sin | Mán Ọ Wúman | Pẹ́sin</annotation>
+ <annotation cp="🧑🏿🦲" type="tts">Pẹ́sin: Dák Skín Ton, Bọld</annotation>
+ <annotation cp="🧑🏻🍼">Bẹbí | Chọp | Giv | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🏻🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🍼">Bẹbí | Chọp | Giv | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🏼🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🍼">Bẹbí | Chọp | Giv | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🏽🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🍼">Bẹbí | Chọp | Giv | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🏾🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🍼">Bẹbí | Chọp | Dák Skín Ton | Giv | Pẹ́sin | Pẹ́sin Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="🧑🏿🍼" type="tts">Pẹ́sin Wé De Gív Pikin Chọp: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🎄">Klọz | Krísmas | Laít Skín Ton | Mx Klọz</annotation>
+ <annotation cp="🧑🏻🎄" type="tts">Mx Klọz: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🎄">Klọz | Krísmas | Mídíọ́m-Laít Skín Ton | Mx Klọz</annotation>
+ <annotation cp="🧑🏼🎄" type="tts">Mx Klọz: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🎄">Klọz | Krísmas | Mídíọ́m Skín Ton | Mx Klọz</annotation>
+ <annotation cp="🧑🏽🎄" type="tts">Mx Klọz: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🎄">Klọz | Krísmas | Mídíọ́m Dák Skín Ton | Mx Klọz</annotation>
+ <annotation cp="🧑🏾🎄" type="tts">Mx Klọz: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🎄">Dák Skín Ton | Klọz | Krísmas | Mx Klọz</annotation>
+ <annotation cp="🧑🏿🎄" type="tts">Mx Klọz: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏻" type="tts">Man: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼">Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼" type="tts">Man: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽">Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽" type="tts">Man: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾">Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾" type="tts">Man: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏿" type="tts">Man: Dák Skín Ton</annotation>
+ <annotation cp="🧔🏻">Biabiá | Laít Skín Ton | Man | Man: Biabiá | Pẹ́sin</annotation>
+ <annotation cp="🧔🏻" type="tts">Man: Laít Skín Ton, Biabiá</annotation>
+ <annotation cp="🧔🏼">Biabiá | Man | Man: Biabiá | Mídíọ́m-Laít Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧔🏼" type="tts">Man: Mídíọ́m-Laít Skín Ton, Biabiá</annotation>
+ <annotation cp="🧔🏽">Biabiá | Man | Man: Biabiá | Mídíọ́m Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧔🏽" type="tts">Man: Mídíọ́m Skín Ton, Biabiá</annotation>
+ <annotation cp="🧔🏾">Biabiá | Man | Man: Biabiá | Mídíọ́m Dák Skín Ton | Pẹ́sin</annotation>
+ <annotation cp="🧔🏾" type="tts">Man: Mídíọ́m Dák Skín Ton, Biabiá</annotation>
+ <annotation cp="🧔🏿">Biabiá | Dák Skín Ton | Man | Man: Biabiá | Pẹ́sin</annotation>
+ <annotation cp="🧔🏿" type="tts">Man: Dák Skín Ton, Biabiá</annotation>
+ <annotation cp="👱🏻♂">Blọnd | Blọnd Heá Man | Hea | Laít Skín Ton | Man | Man Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏻♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea: Laít Skín Ton</annotation>
+ <annotation cp="👱🏼♂">Blọnd | Blọnd Heá Man | Hea | Man | Man Wé Gẹ́t Blọ́nd Hea | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👱🏼♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👱🏽♂">Blọnd | Blọnd Heá Man | Hea | Man | Man Wé Gẹ́t Blọ́nd Hea | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👱🏽♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👱🏾♂">Blọnd | Blọnd Heá Man | Hea | Man | Man Wé Gẹ́t Blọ́nd Hea | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👱🏾♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👱🏿♂">Blọnd | Blọnd Heá Man | Dák Skín Ton | Hea | Man | Man Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏿♂" type="tts">Man Wé Gẹ́t Blọ́nd Hea: Dák Skín Ton</annotation>
+ <annotation cp="👨🦰">Machọ́ Pẹ́sin | Man | Rẹ́d Hea</annotation>
+ <annotation cp="👨🦰" type="tts">Man: Rẹ́d Hea</annotation>
+ <annotation cp="👨🏻🦰">Laít Skín Ton | Machọ́ Pẹ́sin | Man | Rẹ́d Hea</annotation>
+ <annotation cp="👨🏻🦰" type="tts">Man: Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👨🏼🦰">Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton | Rẹ́d Hea</annotation>
+ <annotation cp="👨🏼🦰" type="tts">Man: Mídíọ́m-Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👨🏽🦰">Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton | Rẹ́d Hea</annotation>
+ <annotation cp="👨🏽🦰" type="tts">Man: Mídíọ́m Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👨🏾🦰">Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton | Rẹ́d Hea</annotation>
+ <annotation cp="👨🏾🦰" type="tts">Man: Mídíọ́m Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👨🏿🦰">Dák Skín Ton | Machọ́ Pẹ́sin | Man | Rẹ́d Hea</annotation>
+ <annotation cp="👨🏿🦰" type="tts">Man: Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👨🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🦱" type="tts">Man: Kọ́lí Hea</annotation>
+ <annotation cp="👨🏻🦱">Kọ́lí Hea | Laít Skín Ton | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏻🦱" type="tts">Man: Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👨🏼🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🦱" type="tts">Man: Mídíọ́m-Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👨🏽🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🦱" type="tts">Man: Mídíọ́m Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👨🏾🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🦱" type="tts">Man: Mídíọ́m Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👨🏿🦱">Dák Skín Ton | Kọ́lí Hea | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏿🦱" type="tts">Man: Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👨🦳">Machọ́ Pẹ́sin | Man | Waít Hea</annotation>
+ <annotation cp="👨🦳" type="tts">Man: Waít Hea</annotation>
+ <annotation cp="👨🏻🦳">Laít Skín Ton | Machọ́ Pẹ́sin | Man | Waít Hea</annotation>
+ <annotation cp="👨🏻🦳" type="tts">Man: Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="👨🏼🦳">Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton | Waít Hea</annotation>
+ <annotation cp="👨🏼🦳" type="tts">Man: Mídíọ́m-Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="👨🏽🦳">Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton | Waít Hea</annotation>
+ <annotation cp="👨🏽🦳" type="tts">Man: Mídíọ́m Skín Ton, Waít Hea</annotation>
+ <annotation cp="👨🏾🦳">Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton | Waít Hea</annotation>
+ <annotation cp="👨🏾🦳" type="tts">Man: Mídíọ́m Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="👨🏿🦳">Dák Skín Ton | Machọ́ Pẹ́sin | Man | Waít Hea</annotation>
+ <annotation cp="👨🏿🦳" type="tts">Man: Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="👨🦲">Bọld | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🦲" type="tts">Man: Bọld</annotation>
+ <annotation cp="👨🏻🦲">Bọld | Laít Skín Ton | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏻🦲" type="tts">Man: Laít Skín Ton, Bọld</annotation>
+ <annotation cp="👨🏼🦲">Bọld | Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🦲" type="tts">Man: Mídíọ́m-Laít Skín Ton, Bọld</annotation>
+ <annotation cp="👨🏽🦲">Bọld | Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🦲" type="tts">Man: Mídíọ́m Skín Ton, Bọld</annotation>
+ <annotation cp="👨🏾🦲">Bọld | Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🦲" type="tts">Man: Mídíọ́m Dák Skín Ton, Bọld</annotation>
+ <annotation cp="👨🏿🦲">Bọld | Dák Skín Ton | Machọ́ Pẹ́sin | Man</annotation>
+ <annotation cp="👨🏿🦲" type="tts">Man: Dák Skín Ton, Bọld</annotation>
+ <annotation cp="👨🏻🍼">Bẹbí | Chọp | Giv | Laít Skín Ton | Man | Man Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="👨🏻🍼" type="tts">Man Wé De Gív Pikin Chọp: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🍼">Bẹbí | Chọp | Giv | Man | Man Wé De Gív Pikin Chọp | Mídíọ́m-Laít Skín Ton | Pikin</annotation>
+ <annotation cp="👨🏼🍼" type="tts">Man Wé De Gív Pikin Chọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🍼">Bẹbí | Chọp | Giv | Man | Man Wé De Gív Pikin Chọp | Mídíọ́m Skín Ton | Pikin</annotation>
+ <annotation cp="👨🏽🍼" type="tts">Man Wé De Gív Pikin Chọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🍼">Bẹbí | Chọp | Giv | Man | Man Wé De Gív Pikin Chọp | Mídíọ́m Dák Skín Ton | Pikin</annotation>
+ <annotation cp="👨🏾🍼" type="tts">Man Wé De Gív Pikin Chọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🍼">Bẹbí | Chọp | Dák Skín Ton | Giv | Man | Man Wé De Gív Pikin Chọp | Pikin</annotation>
+ <annotation cp="👨🏿🍼" type="tts">Man Wé De Gív Pikin Chọp: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏻" type="tts">Wúman: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼">Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏼" type="tts">Wúman: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽">Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏽" type="tts">Wúman: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾">Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏾" type="tts">Wúman: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏿" type="tts">Wúman: Dák Skín Ton</annotation>
+ <annotation cp="👱🏻♀">Blọnd | Blọ́nd Heá Wúman | Hea | Laít Skín Ton | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏻♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea: Laít Skín Ton</annotation>
+ <annotation cp="👱🏼♀">Blọnd | Blọ́nd Heá Wúman | Hea | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏼♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👱🏽♀">Blọnd | Blọ́nd Heá Wúman | Hea | Mídíọ́m Skín Ton | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏽♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👱🏾♀">Blọnd | Blọ́nd Heá Wúman | Hea | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏾♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👱🏿♀">Blọnd | Blọ́nd Heá Wúman | Dák Skín Ton | Hea | Wúman | Wúman Wé Gẹ́t Blọ́nd Hea</annotation>
+ <annotation cp="👱🏿♀" type="tts">Wúman Wé Gẹ́t Blọ́nd Hea: Dák Skín Ton</annotation>
+ <annotation cp="👩🦰">Machọ́ Pẹ́sin | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🦰" type="tts">Wúman: Rẹ́d Hea</annotation>
+ <annotation cp="👩🏻🦰">Laít Skín Ton | Machọ́ Pẹ́sin | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🏻🦰" type="tts">Wúman: Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👩🏼🦰">Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🏼🦰" type="tts">Wúman: Mídíọ́m-Laít Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👩🏽🦰">Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🏽🦰" type="tts">Wúman: Mídíọ́m Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👩🏾🦰">Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🏾🦰" type="tts">Wúman: Mídíọ́m Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👩🏿🦰">Dák Skín Ton | Machọ́ Pẹ́sin | Rẹ́d Hea | Wúman</annotation>
+ <annotation cp="👩🏿🦰" type="tts">Wúman: Dák Skín Ton, Rẹ́d Hea</annotation>
+ <annotation cp="👩🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🦱" type="tts">Wúman: Kọ́lí Hea</annotation>
+ <annotation cp="👩🏻🦱">Kọ́lí Hea | Laít Skín Ton | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏻🦱" type="tts">Wúman: Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👩🏼🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏼🦱" type="tts">Wúman: Mídíọ́m-Laít Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👩🏽🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏽🦱" type="tts">Wúman: Mídíọ́m Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👩🏾🦱">Kọ́lí Hea | Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏾🦱" type="tts">Wúman: Mídíọ́m Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👩🏿🦱">Dák Skín Ton | Kọ́lí Hea | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏿🦱" type="tts">Wúman: Dák Skín Ton, Kọ́lí Hea</annotation>
+ <annotation cp="👩🦳">Machọ́ Pẹ́sin | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🦳" type="tts">Wúman: Waít Hea</annotation>
+ <annotation cp="👩🏻🦳">Laít Skín Ton | Machọ́ Pẹ́sin | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🏻🦳" type="tts">Wúman: Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="👩🏼🦳">Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🏼🦳" type="tts">Wúman: Mídíọ́m-Laít Skín Ton, Waít Hea</annotation>
+ <annotation cp="👩🏽🦳">Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🏽🦳" type="tts">Wúman: Mídíọ́m Skín Ton, Waít Hea</annotation>
+ <annotation cp="👩🏾🦳">Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🏾🦳" type="tts">Wúman: Mídíọ́m Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="👩🏿🦳">Dák Skín Ton | Machọ́ Pẹ́sin | Waít Hea | Wúman</annotation>
+ <annotation cp="👩🏿🦳" type="tts">Wúman: Dák Skín Ton, Waít Hea</annotation>
+ <annotation cp="👩🦲">Bọld | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🦲" type="tts">Wúman: Bọld</annotation>
+ <annotation cp="👩🏻🦲">Bọld | Laít Skín Ton | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏻🦲" type="tts">Wúman: Laít Skín Ton, Bọld</annotation>
+ <annotation cp="👩🏼🦲">Bọld | Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏼🦲" type="tts">Wúman: Mídíọ́m-Laít Skín Ton, Bọld</annotation>
+ <annotation cp="👩🏽🦲">Bọld | Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏽🦲" type="tts">Wúman: Mídíọ́m Skín Ton, Bọld</annotation>
+ <annotation cp="👩🏾🦲">Bọld | Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Wúman</annotation>
+ <annotation cp="👩🏾🦲" type="tts">Wúman: Mídíọ́m Dák Skín Ton, Bọld</annotation>
+ <annotation cp="👩🏿🦲">Bọld | Dák Skín Ton | Machọ́ Pẹ́sin | Wúman</annotation>
+ <annotation cp="👩🏿🦲" type="tts">Wúman: Dák Skín Ton, Bọld</annotation>
+ <annotation cp="👩🏻🍼">Bẹbí | Chọp | Giv | Laít Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🏻🍼" type="tts">Wúman Wé De Gív Pikin Chọp: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🍼">Bẹbí | Chọp | Giv | Mídíọ́m-Laít Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🏼🍼" type="tts">Wúman Wé De Gív Pikin Chọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🍼">Bẹbí | Chọp | Giv | Mídíọ́m Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🏽🍼" type="tts">Wúman Wé De Gív Pikin Chọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🍼">Bẹbí | Chọp | Giv | Mídíọ́m Dák Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🏾🍼" type="tts">Wúman Wé De Gív Pikin Chọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🍼">Bẹbí | Chọp | Dák Skín Ton | Giv | Pikin | Wúman | Wúman Wé De Gív Pikin Chọp</annotation>
+ <annotation cp="👩🏿🍼" type="tts">Wúman Wé De Gív Pikin Chọp: Dák Skín Ton</annotation>
+ <annotation cp="🧓🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓🏻" type="tts">Síniọ́ Pẹ́sin: Laít Skín Ton</annotation>
+ <annotation cp="🧓🏼">Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓🏼" type="tts">Síniọ́ Pẹ́sin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧓🏽">Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓🏽" type="tts">Síniọ́ Pẹ́sin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧓🏾">Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓🏾" type="tts">Síniọ́ Pẹ́sin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧓🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Old | Óld Pẹ́sin | Síniọ́ Pẹ́sin</annotation>
+ <annotation cp="🧓🏿" type="tts">Síniọ́ Pẹ́sin: Dák Skín Ton</annotation>
+ <annotation cp="👴🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Man | Old | Óld Man</annotation>
+ <annotation cp="👴🏻" type="tts">Óld Man: Laít Skín Ton</annotation>
+ <annotation cp="👴🏼">Machọ́ Pẹ́sin | Man | Mídíọ́m-Laít Skín Ton | Old | Óld Man</annotation>
+ <annotation cp="👴🏼" type="tts">Óld Man: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👴🏽">Machọ́ Pẹ́sin | Man | Mídíọ́m Skín Ton | Old | Óld Man</annotation>
+ <annotation cp="👴🏽" type="tts">Óld Man: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👴🏾">Machọ́ Pẹ́sin | Man | Mídíọ́m Dák Skín Ton | Old | Óld Man</annotation>
+ <annotation cp="👴🏾" type="tts">Óld Man: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👴🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Man | Old | Óld Man</annotation>
+ <annotation cp="👴🏿" type="tts">Óld Man: Dák Skín Ton</annotation>
+ <annotation cp="👵🏻">Laít Skín Ton | Machọ́ Pẹ́sin | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵🏻" type="tts">Óld Wúman: Laít Skín Ton</annotation>
+ <annotation cp="👵🏼">Machọ́ Pẹ́sin | Mídíọ́m-Laít Skín Ton | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵🏼" type="tts">Óld Wúman: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👵🏽">Machọ́ Pẹ́sin | Mídíọ́m Skín Ton | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵🏽" type="tts">Óld Wúman: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👵🏾">Machọ́ Pẹ́sin | Mídíọ́m Dák Skín Ton | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵🏾" type="tts">Óld Wúman: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👵🏿">Dák Skín Ton | Machọ́ Pẹ́sin | Old | Óld Wúman | Wúman</annotation>
+ <annotation cp="👵🏿" type="tts">Óld Wúman: Dák Skín Ton</annotation>
+ <annotation cp="🙍🏻">Fes | Fraun | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏻" type="tts">Pẹ́sin Wé De Fraún Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙍🏼">Fes | Fraun | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏼" type="tts">Pẹ́sin Wé De Fraún Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙍🏽">Fes | Fraun | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏽" type="tts">Pẹ́sin Wé De Fraún Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙍🏾">Fes | Fraun | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏾" type="tts">Pẹ́sin Wé De Fraún Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙍🏿">Dák Skín Ton | Fes | Fraun | Pẹ́sin | Pẹ́sin Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏿" type="tts">Pẹ́sin Wé De Fraún Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙍🏻♂">Fes | Fraun | Laít Skín Ton | Man | Man Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏻♂" type="tts">Man Wé De Fraún Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙍🏼♂">Fes | Fraun | Man | Man Wé De Fraún Im Fes | Mídíọ́m-Laít Skín Ton | Skwíz Fes</annotation>
+ <annotation cp="🙍🏼♂" type="tts">Man Wé De Fraún Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙍🏽♂">Fes | Fraun | Man | Man Wé De Fraún Im Fes | Mídíọ́m Skín Ton | Skwíz Fes</annotation>
+ <annotation cp="🙍🏽♂" type="tts">Man Wé De Fraún Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙍🏾♂">Fes | Fraun | Man | Man Wé De Fraún Im Fes | Mídíọ́m Dák Skín Ton | Skwíz Fes</annotation>
+ <annotation cp="🙍🏾♂" type="tts">Man Wé De Fraún Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙍🏿♂">Dák Skín Ton | Fes | Fraun | Man | Man Wé De Fraún Im Fes | Skwíz Fes</annotation>
+ <annotation cp="🙍🏿♂" type="tts">Man Wé De Fraún Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙍🏻♀">Fraun | Laít Skín Ton | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍🏻♀" type="tts">Wúman Wé De Fraún Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙍🏼♀">Fraun | Mídíọ́m-Laít Skín Ton | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍🏼♀" type="tts">Wúman Wé De Fraún Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙍🏽♀">Fraun | Mídíọ́m Skín Ton | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍🏽♀" type="tts">Wúman Wé De Fraún Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙍🏾♀">Fraun | Mídíọ́m Dák Skín Ton | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍🏾♀" type="tts">Wúman Wé De Fraún Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙍🏿♀">Dák Skín Ton | Fraun | Skwíz Fes | Wúman | Wúman Wé De Fraún Im Fes</annotation>
+ <annotation cp="🙍🏿♀" type="tts">Wúman Wé De Fraún Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙎🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏻" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙎🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏼" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙎🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏽" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙎🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏾" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙎🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏿" type="tts">Pẹ́sin Wé De Mék Lọ́ng Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙎🏻♂">Laít Skín Ton | Man | Man Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏻♂" type="tts">Man Wé De Mék Lọ́ng Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙎🏼♂">Man | Man Wé De Mék Lọ́ng Fes | Mídíọ́m-Laít Skín Ton | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏼♂" type="tts">Man Wé De Mék Lọ́ng Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙎🏽♂">Man | Man Wé De Mék Lọ́ng Fes | Mídíọ́m Skín Ton | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏽♂" type="tts">Man Wé De Mék Lọ́ng Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙎🏾♂">Man | Man Wé De Mék Lọ́ng Fes | Mídíọ́m Dák Skín Ton | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏾♂" type="tts">Man Wé De Mék Lọ́ng Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙎🏿♂">Dák Skín Ton | Man | Man Wé De Mék Lọ́ng Fes | To Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏿♂" type="tts">Man Wé De Mék Lọ́ng Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙎🏻♀">Laít Skín Ton | To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏻♀" type="tts">Wúman Wé De Mék Lọ́ng Fes: Laít Skín Ton</annotation>
+ <annotation cp="🙎🏼♀">Mídíọ́m-Laít Skín Ton | To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏼♀" type="tts">Wúman Wé De Mék Lọ́ng Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙎🏽♀">Mídíọ́m Skín Ton | To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏽♀" type="tts">Wúman Wé De Mék Lọ́ng Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙎🏾♀">Mídíọ́m Dák Skín Ton | To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏾♀" type="tts">Wúman Wé De Mék Lọ́ng Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙎🏿♀">Dák Skín Ton | To Mék Lọ́ng Fes | Wúman | Wúman Wé De Mék Lọ́ng Fes</annotation>
+ <annotation cp="🙎🏿♀" type="tts">Wúman Wé De Mék Lọ́ng Fes: Dák Skín Ton</annotation>
+ <annotation cp="🙅🏻">Hand | Laít Skín Ton | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏻" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙅🏼">Hand | Mídíọ́m-Laít Skín Ton | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏼" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙅🏽">Hand | Mídíọ́m Skín Ton | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏽" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙅🏾">Hand | Mídíọ́m Dák Skín Ton | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏾" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙅🏿">Dák Skín Ton | Hand | Min | NO | Pẹsin | Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏿" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na NO I Min: Dák Skín Ton</annotation>
+ <annotation cp="🙅🏻♂">Hand | Laít Skín Ton | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Min | NO</annotation>
+ <annotation cp="🙅🏻♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙅🏼♂">Hand | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Mídíọ́m-Laít Skín Ton | Min | NO</annotation>
+ <annotation cp="🙅🏼♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙅🏽♂">Hand | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Mídíọ́m Skín Ton | Min | NO</annotation>
+ <annotation cp="🙅🏽♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙅🏾♂">Hand | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Mídíọ́m Dák Skín Ton | Min | NO</annotation>
+ <annotation cp="🙅🏾♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙅🏿♂">Dák Skín Ton | Hand | Man | Man Tẹk Hand De Shó Sé Na NO I Min | Min | NO</annotation>
+ <annotation cp="🙅🏿♂" type="tts">Man Tẹk Hand De Shó Sé Na NO I Min: Dák Skín Ton</annotation>
+ <annotation cp="🙅🏻♀">Hand | Laít Skín Ton | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏻♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙅🏼♀">Hand | Mídíọ́m-Laít Skín Ton | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏼♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙅🏽♀">Hand | Mídíọ́m Skín Ton | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏽♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙅🏾♀">Hand | Mídíọ́m Dák Skín Ton | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏾♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙅🏿♀">Dák Skín Ton | Hand | Min | NO | Wúman | Wúman Tẹk Hand De Shó Sé Na NO I Min</annotation>
+ <annotation cp="🙅🏿♀" type="tts">Wúman Tẹk Hand De Shó Sé Na NO I Min: Dák Skín Ton</annotation>
+ <annotation cp="🙆🏻">Hand | Laít Skín Ton | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏻" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙆🏼">Hand | Mídíọ́m-Laít Skín Ton | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏼" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙆🏽">Hand | Mídíọ́m Skín Ton | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏽" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙆🏾">Hand | Mídíọ́m Dák Skín Ton | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏾" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙆🏿">Dák Skín Ton | Hand | Min | OK | Pẹ́sin | Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏿" type="tts">Pẹ́sin Tẹk Hand De Shó Sé Na OK I Min: Dák Skín Ton</annotation>
+ <annotation cp="🙆🏻♂">Hand | Laít Skín Ton | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Min | OK</annotation>
+ <annotation cp="🙆🏻♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙆🏼♂">Hand | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Mídíọ́m-Laít Skín Ton | Min | OK</annotation>
+ <annotation cp="🙆🏼♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙆🏽♂">Hand | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Mídíọ́m Skín Ton | Min | OK</annotation>
+ <annotation cp="🙆🏽♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙆🏾♂">Hand | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Mídíọ́m Dák Skín Ton | Min | OK</annotation>
+ <annotation cp="🙆🏾♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙆🏿♂">Dák Skín Ton | Hand | Man | Man Tẹk Hand De Shó Sé Na OK I Min | Min | OK</annotation>
+ <annotation cp="🙆🏿♂" type="tts">Man Tẹk Hand De Shó Sé Na OK I Min: Dák Skín Ton</annotation>
+ <annotation cp="🙆🏻♀">Hand | Laít Skín Ton | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏻♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min: Laít Skín Ton</annotation>
+ <annotation cp="🙆🏼♀">Hand | Mídíọ́m-Laít Skín Ton | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏼♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙆🏽♀">Hand | Mídíọ́m Skín Ton | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏽♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙆🏾♀">Hand | Mídíọ́m Dák Skín Ton | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏾♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙆🏿♀">Dák Skín Ton | Hand | Min | OK | Wúman | Wúman Tẹk Hand De Shó Sé Na OK I Min</annotation>
+ <annotation cp="🙆🏿♀" type="tts">Wúman Tẹk Hand De Shó Sé Na OK I Min: Dák Skín Ton</annotation>
+ <annotation cp="💁🏻">Hand | Laít Skín Ton | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏻" type="tts">Pẹ́sin De Tró Im Hand: Laít Skín Ton</annotation>
+ <annotation cp="💁🏼">Hand | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏼" type="tts">Pẹ́sin De Tró Im Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💁🏽">Hand | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏽" type="tts">Pẹ́sin De Tró Im Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💁🏾">Hand | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏾" type="tts">Pẹ́sin De Tró Im Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💁🏿">Dák Skín Ton | Hand | Pẹ́sin | Pẹ́sin De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏿" type="tts">Pẹ́sin De Tró Im Hand: Dák Skín Ton</annotation>
+ <annotation cp="💁🏻♂">Hand | Laít Skín Ton | Man | Man De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏻♂" type="tts">Man De Tró Im Hand: Laít Skín Ton</annotation>
+ <annotation cp="💁🏼♂">Hand | Man | Man De Tró Im Hand | Mídíọ́m-Laít Skín Ton | Tro</annotation>
+ <annotation cp="💁🏼♂" type="tts">Man De Tró Im Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💁🏽♂">Hand | Man | Man De Tró Im Hand | Mídíọ́m Skín Ton | Tro</annotation>
+ <annotation cp="💁🏽♂" type="tts">Man De Tró Im Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💁🏾♂">Hand | Man | Man De Tró Im Hand | Mídíọ́m Dák Skín Ton | Tro</annotation>
+ <annotation cp="💁🏾♂" type="tts">Man De Tró Im Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💁🏿♂">Dák Skín Ton | Hand | Man | Man De Tró Im Hand | Tro</annotation>
+ <annotation cp="💁🏿♂" type="tts">Man De Tró Im Hand: Dák Skín Ton</annotation>
+ <annotation cp="💁🏻♀">Hand | Laít Skín Ton | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁🏻♀" type="tts">Wúman De Tró Im Hand: Laít Skín Ton</annotation>
+ <annotation cp="💁🏼♀">Hand | Mídíọ́m-Laít Skín Ton | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁🏼♀" type="tts">Wúman De Tró Im Hand: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💁🏽♀">Hand | Mídíọ́m Skín Ton | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁🏽♀" type="tts">Wúman De Tró Im Hand: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💁🏾♀">Hand | Mídíọ́m Dák Skín Ton | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁🏾♀" type="tts">Wúman De Tró Im Hand: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💁🏿♀">Dák Skín Ton | Hand | Tro | Wúman | Wúman De Tró Im Hand</annotation>
+ <annotation cp="💁🏿♀" type="tts">Wúman De Tró Im Hand: Dák Skín Ton</annotation>
+ <annotation cp="🙋🏻">Hand | Hápi | Laít Skín Ton | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋🏻" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🙋🏼">Hand | Hápi | Mídíọ́m-Laít Skín Ton | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋🏼" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙋🏽">Hand | Hápi | Mídíọ́m Skín Ton | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋🏽" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙋🏾">Hand | Hápi | Mídíọ́m Dák Skín Ton | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋🏾" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙋🏿">Dák Skín Ton | Hand | Hápi | Ọp | Pẹ́sin | Pẹ́sin Wé De Réz Im Hand Ọp | Rez</annotation>
+ <annotation cp="🙋🏿" type="tts">Pẹ́sin Wé De Réz Im Hand Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🙋🏻♂">Hand | Hápi | Laít Skín Ton | Man | Man Wé De Réz Im Hand Ọp | Ọp | Rez</annotation>
+ <annotation cp="🙋🏻♂" type="tts">Man Wé De Réz Im Hand Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🙋🏼♂">Hand | Hápi | Man | Man Wé De Réz Im Hand Ọp | Mídíọ́m-Laít Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙋🏼♂" type="tts">Man Wé De Réz Im Hand Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙋🏽♂">Hand | Hápi | Man | Man Wé De Réz Im Hand Ọp | Mídíọ́m Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙋🏽♂" type="tts">Man Wé De Réz Im Hand Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙋🏾♂">Hand | Hápi | Man | Man Wé De Réz Im Hand Ọp | Mídíọ́m Dák Skín Ton | Ọp | Rez</annotation>
+ <annotation cp="🙋🏾♂" type="tts">Man Wé De Réz Im Hand Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙋🏿♂">Dák Skín Ton | Hand | Hápi | Man | Man Wé De Réz Im Hand Ọp | Ọp | Rez</annotation>
+ <annotation cp="🙋🏿♂" type="tts">Man Wé De Réz Im Hand Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🙋🏻♀">Hand | Hápi | Laít Skín Ton | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋🏻♀" type="tts">Wúman Wé De Réz Im Hand Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🙋🏼♀">Hand | Hápi | Mídíọ́m-Laít Skín Ton | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋🏼♀" type="tts">Wúman Wé De Réz Im Hand Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙋🏽♀">Hand | Hápi | Mídíọ́m Skín Ton | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋🏽♀" type="tts">Wúman Wé De Réz Im Hand Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙋🏾♀">Hand | Hápi | Mídíọ́m Dák Skín Ton | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋🏾♀" type="tts">Wúman Wé De Réz Im Hand Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙋🏿♀">Dák Skín Ton | Hand | Hápi | Ọp | Rez | Wúman | Wúman Wé De Réz Im Hand Ọp</annotation>
+ <annotation cp="🙋🏿♀" type="tts">Wúman Wé De Réz Im Hand Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🧏🏻">Hia | Ia | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏻" type="tts">Pẹ́sin Wé Nọ́ Fít Hia: Laít Skín Ton</annotation>
+ <annotation cp="🧏🏼">Hia | Ia | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏼" type="tts">Pẹ́sin Wé Nọ́ Fít Hia: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧏🏽">Hia | Ia | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏽" type="tts">Pẹ́sin Wé Nọ́ Fít Hia: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧏🏾">Hia | Ia | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏾" type="tts">Pẹ́sin Wé Nọ́ Fít Hia: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧏🏿">Dák Skín Ton | Hia | Ia | Pẹ́sin | Pẹ́sin Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏿" type="tts">Pẹ́sin Wé Nọ́ Fít Hia: Dák Skín Ton</annotation>
+ <annotation cp="🧏🏻♂">Hia | Ia | Laít Skín Ton | Man | Man Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏻♂" type="tts">Man Wé Nọ́ Fít Hia: Laít Skín Ton</annotation>
+ <annotation cp="🧏🏼♂">Hia | Ia | Man | Man Wé Nọ́ Fít Hia | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧏🏼♂" type="tts">Man Wé Nọ́ Fít Hia: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧏🏽♂">Hia | Ia | Man | Man Wé Nọ́ Fít Hia | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧏🏽♂" type="tts">Man Wé Nọ́ Fít Hia: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧏🏾♂">Hia | Ia | Man | Man Wé Nọ́ Fít Hia | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧏🏾♂" type="tts">Man Wé Nọ́ Fít Hia: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧏🏿♂">Dák Skín Ton | Hia | Ia | Man | Man Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏿♂" type="tts">Man Wé Nọ́ Fít Hia: Dák Skín Ton</annotation>
+ <annotation cp="🧏🏻♀">Hia | Ia | Laít Skín Ton | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏻♀" type="tts">Wúman Wé Nọ́ Fít Hia: Laít Skín Ton</annotation>
+ <annotation cp="🧏🏼♀">Hia | Ia | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏼♀" type="tts">Wúman Wé Nọ́ Fít Hia: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧏🏽♀">Hia | Ia | Mídíọ́m Skín Ton | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏽♀" type="tts">Wúman Wé Nọ́ Fít Hia: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧏🏾♀">Hia | Ia | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏾♀" type="tts">Wúman Wé Nọ́ Fít Hia: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧏🏿♀">Dák Skín Ton | Hia | Ia | Wúman | Wúman Wé Nọ́ Fít Hia</annotation>
+ <annotation cp="🧏🏿♀" type="tts">Wúman Wé Nọ́ Fít Hia: Dák Skín Ton</annotation>
+ <annotation cp="🙇🏻">Abẹg Sọ́ri | Bau | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏻" type="tts">Pẹ́sin Wé De Baú Daun: Laít Skín Ton</annotation>
+ <annotation cp="🙇🏼">Abẹg Sọ́ri | Bau | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏼" type="tts">Pẹ́sin Wé De Baú Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙇🏽">Abẹg Sọ́ri | Bau | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏽" type="tts">Pẹ́sin Wé De Baú Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙇🏾">Abẹg Sọ́ri | Bau | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏾" type="tts">Pẹ́sin Wé De Baú Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙇🏿">Abẹg Sọ́ri | Bau | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏿" type="tts">Pẹ́sin Wé De Baú Daun: Dák Skín Ton</annotation>
+ <annotation cp="🙇🏻♂">Abẹg Sọ́ri | Bau | Laít Skín Ton | Man | Man Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏻♂" type="tts">Man Wé De Baú Daun: Laít Skín Ton</annotation>
+ <annotation cp="🙇🏼♂">Abẹg Sọ́ri | Bau | Man | Man Wé De Baú Daun | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙇🏼♂" type="tts">Man Wé De Baú Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙇🏽♂">Abẹg Sọ́ri | Bau | Man | Man Wé De Baú Daun | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙇🏽♂" type="tts">Man Wé De Baú Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙇🏾♂">Abẹg Sọ́ri | Bau | Man | Man Wé De Baú Daun | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙇🏾♂" type="tts">Man Wé De Baú Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙇🏿♂">Abẹg Sọ́ri | Bau | Dák Skín Ton | Man | Man Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏿♂" type="tts">Man Wé De Baú Daun: Dák Skín Ton</annotation>
+ <annotation cp="🙇🏻♀">Abẹg Sọ́ri | Bau | Laít Skín Ton | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏻♀" type="tts">Wúman Wé De Baú Daun: Laít Skín Ton</annotation>
+ <annotation cp="🙇🏼♀">Abẹg Sọ́ri | Bau | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏼♀" type="tts">Wúman Wé De Baú Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🙇🏽♀">Abẹg Sọ́ri | Bau | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏽♀" type="tts">Wúman Wé De Baú Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🙇🏾♀">Abẹg Sọ́ri | Bau | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏾♀" type="tts">Wúman Wé De Baú Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🙇🏿♀">Abẹg Sọ́ri | Bau | Dák Skín Ton | Wúman | Wúman Wé De Baú Daun</annotation>
+ <annotation cp="🙇🏿♀" type="tts">Wúman Wé De Baú Daun: Dák Skín Ton</annotation>
+ <annotation cp="🤦🏻">Fes | Hand | Laít Skín Ton | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏻" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🤦🏼">Fes | Hand | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏼" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤦🏽">Fes | Hand | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏽" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤦🏾">Fes | Hand | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏾" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤦🏿">Dák Skín Ton | Fes | Hand | Pẹ́sin | Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏿" type="tts">Pẹ́sin Ték Wọ́n Hand Kọ́vá Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🤦🏻♂">Fes | Hand | Laít Skín Ton | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏻♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🤦🏼♂">Fes | Hand | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Mídíọ́m-Laít Skín Ton | Wọn</annotation>
+ <annotation cp="🤦🏼♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤦🏽♂">Fes | Hand | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Mídíọ́m Skín Ton | Wọn</annotation>
+ <annotation cp="🤦🏽♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤦🏾♂">Fes | Hand | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Mídíọ́m Dák Skín Ton | Wọn</annotation>
+ <annotation cp="🤦🏾♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤦🏿♂">Dák Skín Ton | Fes | Hand | Man | Man Ték Wọ́n Hand Kọ́vá Im Fes | Wọn</annotation>
+ <annotation cp="🤦🏿♂" type="tts">Man Ték Wọ́n Hand Kọ́vá Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🤦🏻♀">Fes | Hand | Laít Skín Ton | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦🏻♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes: Laít Skín Ton</annotation>
+ <annotation cp="🤦🏼♀">Fes | Hand | Mídíọ́m-Laít Skín Ton | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦🏼♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤦🏽♀">Fes | Hand | Mídíọ́m Skín Ton | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦🏽♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤦🏾♀">Fes | Hand | Mídíọ́m Dák Skín Ton | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦🏾♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤦🏿♀">Dák Skín Ton | Fes | Hand | Wọn | Wúman | Wúman Ték Wọ́n Hand Kọ́vá Im Fes</annotation>
+ <annotation cp="🤦🏿♀" type="tts">Wúman Ték Wọ́n Hand Kọ́vá Im Fes: Dák Skín Ton</annotation>
+ <annotation cp="🤷🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏻" type="tts">Pẹ́sin De Shrọ́g Im Shólda: Laít Skín Ton</annotation>
+ <annotation cp="🤷🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏼" type="tts">Pẹ́sin De Shrọ́g Im Shólda: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤷🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏽" type="tts">Pẹ́sin De Shrọ́g Im Shólda: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤷🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏾" type="tts">Pẹ́sin De Shrọ́g Im Shólda: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤷🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏿" type="tts">Pẹ́sin De Shrọ́g Im Shólda: Dák Skín Ton</annotation>
+ <annotation cp="🤷🏻♂">Laít Skín Ton | Man | Man De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏻♂" type="tts">Man De Shrọ́g Im Shólda: Laít Skín Ton</annotation>
+ <annotation cp="🤷🏼♂">Man | Man De Shrọ́g Im Shólda | Mídíọ́m-Laít Skín Ton | Shrọg</annotation>
+ <annotation cp="🤷🏼♂" type="tts">Man De Shrọ́g Im Shólda: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤷🏽♂">Man | Man De Shrọ́g Im Shólda | Mídíọ́m Skín Ton | Shrọg</annotation>
+ <annotation cp="🤷🏽♂" type="tts">Man De Shrọ́g Im Shólda: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤷🏾♂">Man | Man De Shrọ́g Im Shólda | Mídíọ́m Dák Skín Ton | Shrọg</annotation>
+ <annotation cp="🤷🏾♂" type="tts">Man De Shrọ́g Im Shólda: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤷🏿♂">Dák Skín Ton | Man | Man De Shrọ́g Im Shólda | Shrọg</annotation>
+ <annotation cp="🤷🏿♂" type="tts">Man De Shrọ́g Im Shólda: Dák Skín Ton</annotation>
+ <annotation cp="🤷🏻♀">Laít Skín Ton | Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷🏻♀" type="tts">Wúman De Shrọ́g Im Shólda: Laít Skín Ton</annotation>
+ <annotation cp="🤷🏼♀">Mídíọ́m-Laít Skín Ton | Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷🏼♀" type="tts">Wúman De Shrọ́g Im Shólda: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤷🏽♀">Mídíọ́m Skín Ton | Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷🏽♀" type="tts">Wúman De Shrọ́g Im Shólda: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤷🏾♀">Mídíọ́m Dák Skín Ton | Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷🏾♀" type="tts">Wúman De Shrọ́g Im Shólda: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤷🏿♀">Dák Skín Ton | Shrọg | Wúman | Wúman De Shrọ́g Im Shólda</annotation>
+ <annotation cp="🤷🏿♀" type="tts">Wúman De Shrọ́g Im Shólda: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻⚕">Dọ́ktọ | Laít Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🏻⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼⚕">Dọ́ktọ | Mídíọ́m-Laít Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🏼⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽⚕">Dọ́ktọ | Mídíọ́m Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🏽⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾⚕">Dọ́ktọ | Mídíọ́m Dák Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🏾⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿⚕">Dák Skín Ton | Dọ́ktọ | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="🧑🏿⚕" type="tts">Wọ́ka Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻⚕">Dọ́ktọ | Laít Skín Ton | Man | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨🏻⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼⚕">Dọ́ktọ | Man | Mídíọ́m-Laít Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨🏼⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽⚕">Dọ́ktọ | Man | Mídíọ́m Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨🏽⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾⚕">Dọ́ktọ | Man | Mídíọ́m Dák Skín Ton | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨🏾⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿⚕">Dák Skín Ton | Dọ́ktọ | Man | Nọs | Pípol | Síknẹs | Wọ́k | Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👨🏿⚕" type="tts">Wọ́kman Fọ Wiá Dẹm De Lúk Áftá Sík Pípol: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻⚕">Dọ́ktọ | Laít Skín Ton | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩🏻⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼⚕">Dọ́ktọ | Mídíọ́m-Laít Skín Ton | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩🏼⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽⚕">Dọ́ktọ | Mídíọ́m Skín Ton | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩🏽⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾⚕">Dọ́ktọ | Mídíọ́m Dák Skín Ton | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩🏾⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿⚕">Dák Skín Ton | Dọ́ktọ | Nọs | Pípol | Síknẹs | Wọ́ka | Wúman | Wúman Wé De Lúk Áftá Sík Pípol</annotation>
+ <annotation cp="👩🏿⚕" type="tts">Wúman Wé De Lúk Áftá Sík Pípol: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🎓">Grájúet | Laít Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="🧑🏻🎓" type="tts">Stúdẹnt: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🎓">Grájúet | Mídíọ́m-Laít Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="🧑🏼🎓" type="tts">Stúdẹnt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🎓">Grájúet | Mídíọ́m Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="🧑🏽🎓" type="tts">Stúdẹnt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🎓">Grájúet | Mídíọ́m Dák Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="🧑🏾🎓" type="tts">Stúdẹnt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🎓">Dák Skín Ton | Grájúet | Stúdẹnt</annotation>
+ <annotation cp="🧑🏿🎓" type="tts">Stúdẹnt: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🎓">Grájúet | Laít Skín Ton | Man | Mán Stúdẹnt | Stúdẹnt</annotation>
+ <annotation cp="👨🏻🎓" type="tts">Mán Stúdẹnt: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🎓">Grájúet | Man | Mán Stúdẹnt | Mídíọ́m-Laít Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="👨🏼🎓" type="tts">Mán Stúdẹnt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🎓">Grájúet | Man | Mán Stúdẹnt | Mídíọ́m Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="👨🏽🎓" type="tts">Mán Stúdẹnt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🎓">Grájúet | Man | Mán Stúdẹnt | Mídíọ́m Dák Skín Ton | Stúdẹnt</annotation>
+ <annotation cp="👨🏾🎓" type="tts">Mán Stúdẹnt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🎓">Dák Skín Ton | Grájúet | Man | Mán Stúdẹnt | Stúdẹnt</annotation>
+ <annotation cp="👨🏿🎓" type="tts">Mán Stúdẹnt: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🎓">Grájuet | Laít Skín Ton | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🏻🎓" type="tts">Wúmán Stúdẹnt: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🎓">Grájuet | Mídíọ́m-Laít Skín Ton | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🏼🎓" type="tts">Wúmán Stúdẹnt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🎓">Grájuet | Mídíọ́m Skín Ton | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🏽🎓" type="tts">Wúmán Stúdẹnt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🎓">Grájuet | Mídíọ́m Dák Skín Ton | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🏾🎓" type="tts">Wúmán Stúdẹnt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🎓">Dák Skín Ton | Grájuet | Stúdẹnt | Wúman | Wúmán Stúdẹnt</annotation>
+ <annotation cp="👩🏿🎓" type="tts">Wúmán Stúdẹnt: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🏫">Ínstrọ́ktọ | Laít Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏻🏫" type="tts">Tícha: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🏫">Ínstrọ́ktọ | Mídíọ́m-Laít Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏼🏫" type="tts">Tícha: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🏫">Ínstrọ́ktọ | Mídíọ́m Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏽🏫" type="tts">Tícha: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🏫">Ínstrọ́ktọ | Mídíọ́m Dák Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏾🏫" type="tts">Tícha: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🏫">Dák Skín Ton | Ínstrọ́ktọ | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="🧑🏿🏫" type="tts">Tícha: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🏫">Ínstrọ́ktọ | Laít Skín Ton | Man | Mán Tícha | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏻🏫" type="tts">Mán Tícha: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🏫">Ínstrọ́ktọ | Man | Mán Tícha | Mídíọ́m-Laít Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏼🏫" type="tts">Mán Tícha: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🏫">Ínstrọ́ktọ | Man | Mán Tícha | Mídíọ́m Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏽🏫" type="tts">Mán Tícha: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🏫">Ínstrọ́ktọ | Man | Mán Tícha | Mídíọ́m Dák Skín Ton | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏾🏫" type="tts">Mán Tícha: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🏫">Dák Skín Ton | Ínstrọ́ktọ | Man | Mán Tícha | Prọfẹ́sọ | Tícha</annotation>
+ <annotation cp="👨🏿🏫" type="tts">Mán Tícha: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🏫">Ínstrọ́ktọ | Laít Skín Ton | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏻🏫" type="tts">Wúmán Tícha: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🏫">Ínstrọ́ktọ | Mídíọ́m-Laít Skín Ton | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏼🏫" type="tts">Wúmán Tícha: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🏫">Ínstrọ́ktọ | Mídíọ́m Skín Ton | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏽🏫" type="tts">Wúmán Tícha: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🏫">Ínstrọ́ktọ | Mídíọ́m Dák Skín Ton | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏾🏫" type="tts">Wúmán Tícha: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🏫">Dák Skín Ton | Ínstrọ́ktọ | Prọfẹ́sọ | Tícha | Wúman | Wúmán Tícha</annotation>
+ <annotation cp="👩🏿🏫" type="tts">Wúmán Tícha: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻⚖">Jọj | Laít Skín Ton | Skel</annotation>
+ <annotation cp="🧑🏻⚖" type="tts">Jọj: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼⚖">Jọj | Mídíọ́m-Laít Skín Ton | Skel</annotation>
+ <annotation cp="🧑🏼⚖" type="tts">Jọj: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽⚖">Jọj | Mídíọ́m Skín Ton | Skel</annotation>
+ <annotation cp="🧑🏽⚖" type="tts">Jọj: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾⚖">Jọj | Mídíọ́m Dák Skín Ton | Skel</annotation>
+ <annotation cp="🧑🏾⚖" type="tts">Jọj: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿⚖">Dák Skín Ton | Jọj | Skel</annotation>
+ <annotation cp="🧑🏿⚖" type="tts">Jọj: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻⚖">Jọj | Laít Skín Ton | Man | Mán Jọj | Skel</annotation>
+ <annotation cp="👨🏻⚖" type="tts">Mán Jọj: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼⚖">Jọj | Man | Mán Jọj | Mídíọ́m-Laít Skín Ton | Skel</annotation>
+ <annotation cp="👨🏼⚖" type="tts">Mán Jọj: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽⚖">Jọj | Man | Mán Jọj | Mídíọ́m Skín Ton | Skel</annotation>
+ <annotation cp="👨🏽⚖" type="tts">Mán Jọj: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾⚖">Jọj | Man | Mán Jọj | Mídíọ́m Dák Skín Ton | Skel</annotation>
+ <annotation cp="👨🏾⚖" type="tts">Mán Jọj: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿⚖">Dák Skín Ton | Jọj | Man | Mán Jọj | Skel</annotation>
+ <annotation cp="👨🏿⚖" type="tts">Mán Jọj: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻⚖">Jọj | Laít Skín Ton | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩🏻⚖" type="tts">Wúmán Jọj: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼⚖">Jọj | Mídíọ́m-Laít Skín Ton | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩🏼⚖" type="tts">Wúmán Jọj: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽⚖">Jọj | Mídíọ́m Skín Ton | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩🏽⚖" type="tts">Wúmán Jọj: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾⚖">Jọj | Mídíọ́m Dák Skín Ton | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩🏾⚖" type="tts">Wúmán Jọj: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿⚖">Dák Skín Ton | Jọj | Skel | Wúman | Wúmán Jọj</annotation>
+ <annotation cp="👩🏿⚖" type="tts">Wúmán Jọj: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🌾">Fáma | Gádína | Laít Skín Ton</annotation>
+ <annotation cp="🧑🏻🌾" type="tts">Fáma: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🌾">Fáma | Gádína | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🌾" type="tts">Fáma: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🌾">Fáma | Gádína | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏽🌾" type="tts">Fáma: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🌾">Fáma | Gádína | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏾🌾" type="tts">Fáma: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🌾">Dák Skín Ton | Fáma | Gádína</annotation>
+ <annotation cp="🧑🏿🌾" type="tts">Fáma: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🌾">Fáma | Gádína | Laít Skín Ton | Man | Mán Fáma</annotation>
+ <annotation cp="👨🏻🌾" type="tts">Mán Fáma: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🌾">Fáma | Gádína | Man | Mán Fáma | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🌾" type="tts">Mán Fáma: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🌾">Fáma | Gádína | Man | Mán Fáma | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🌾" type="tts">Mán Fáma: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🌾">Fáma | Gádína | Man | Mán Fáma | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🌾" type="tts">Mán Fáma: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🌾">Dák Skín Ton | Fáma | Gádína | Man | Mán Fáma</annotation>
+ <annotation cp="👨🏿🌾" type="tts">Mán Fáma: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🌾">Fáma | Gádína | Laít Skín Ton | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🏻🌾" type="tts">Wúmán Fáma: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🌾">Fáma | Gádína | Mídíọ́m-Laít Skín Ton | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🏼🌾" type="tts">Wúmán Fáma: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🌾">Fáma | Gádína | Mídíọ́m Skín Ton | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🏽🌾" type="tts">Wúmán Fáma: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🌾">Fáma | Gádína | Mídíọ́m Dák Skín Ton | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🏾🌾" type="tts">Wúmán Fáma: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🌾">Dák Skín Ton | Fáma | Gádína | Wúman | Wúmán Fáma</annotation>
+ <annotation cp="👩🏿🌾" type="tts">Wúmán Fáma: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🍳">Chẹf | Kuk | Laít Skín Ton</annotation>
+ <annotation cp="🧑🏻🍳" type="tts">Kuk: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🍳">Chẹf | Kuk | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🍳" type="tts">Kuk: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🍳">Chẹf | Kuk | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏽🍳" type="tts">Kuk: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🍳">Chẹf | Kuk | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏾🍳" type="tts">Kuk: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🍳">Chẹf | Dák Skín Ton | Kuk</annotation>
+ <annotation cp="🧑🏿🍳" type="tts">Kuk: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🍳">Chẹf | Kuk | Laít Skín Ton | Man | Mán Kuk</annotation>
+ <annotation cp="👨🏻🍳" type="tts">Mán Kuk: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🍳">Chẹf | Kuk | Man | Mán Kuk | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🍳" type="tts">Mán Kuk: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🍳">Chẹf | Kuk | Man | Mán Kuk | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🍳" type="tts">Mán Kuk: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🍳">Chẹf | Kuk | Man | Mán Kuk | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🍳" type="tts">Mán Kuk: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🍳">Chẹf | Dák Skín Ton | Kuk | Man | Mán Kuk</annotation>
+ <annotation cp="👨🏿🍳" type="tts">Mán Kuk: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🍳">Chẹf | Kuk | Laít Skín Ton | Wúmán</annotation>
+ <annotation cp="👩🏻🍳" type="tts">Wúmán Kuk: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🍳">Chẹf | Kuk | Mídíọ́m-Laít Skín Ton | Wúmán</annotation>
+ <annotation cp="👩🏼🍳" type="tts">Wúmán Kuk: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🍳">Chẹf | Kuk | Mídíọ́m Skín Ton | Wúmán</annotation>
+ <annotation cp="👩🏽🍳" type="tts">Wúmán Kuk: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🍳">Chẹf | Kuk | Mídíọ́m Dák Skín Ton | Wúmán</annotation>
+ <annotation cp="👩🏾🍳" type="tts">Wúmán Kuk: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🍳">Chẹf | Dák Skín Ton | Kuk | Wúmán</annotation>
+ <annotation cp="👩🏿🍳" type="tts">Wúmán Kuk: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🔧">Ẹlẹktríshan | Kráftspẹ́sin | Laít Skín Ton | Mékánik | Mẹkánik | Plọ́mba</annotation>
+ <annotation cp="🧑🏻🔧" type="tts">Mẹkánik: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🔧">Ẹlẹktríshan | Kráftspẹ́sin | Mékánik | Mẹkánik | Mídíọ́m-Laít Skín Ton | Plọ́mba</annotation>
+ <annotation cp="🧑🏼🔧" type="tts">Mẹkánik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🔧">Ẹlẹktríshan | Kráftspẹ́sin | Mékánik | Mẹkánik | Mídíọ́m Skín Ton | Plọ́mba</annotation>
+ <annotation cp="🧑🏽🔧" type="tts">Mẹkánik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🔧">Ẹlẹktríshan | Kráftspẹ́sin | Mékánik | Mẹkánik | Mídíọ́m Dák Skín Ton | Plọ́mba</annotation>
+ <annotation cp="🧑🏾🔧" type="tts">Mẹkánik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🔧">Dák Skín Ton | Ẹlẹktríshan | Kráftspẹ́sin | Mékánik | Mẹkánik | Plọ́mba</annotation>
+ <annotation cp="🧑🏿🔧" type="tts">Mẹkánik: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🔧">Ẹlẹktríshan | Kráftsman | Laít Skín Ton | Man | Mán Mẹkánik | Mékánik | Plọ́mba</annotation>
+ <annotation cp="👨🏻🔧" type="tts">Mán Mẹkánik: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🔧">Ẹlẹktríshan | Kráftsman | Man | Mán Mẹkánik | Mékánik | Mídíọ́m-Laít Skín Ton | Plọ́mba</annotation>
+ <annotation cp="👨🏼🔧" type="tts">Mán Mẹkánik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🔧">Ẹlẹktríshan | Kráftsman | Man | Mán Mẹkánik | Mékánik | Mídíọ́m Skín Ton | Plọ́mba</annotation>
+ <annotation cp="👨🏽🔧" type="tts">Mán Mẹkánik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🔧">Ẹlẹktríshan | Kráftsman | Man | Mán Mẹkánik | Mékánik | Mídíọ́m Dák Skín Ton | Plọ́mba</annotation>
+ <annotation cp="👨🏾🔧" type="tts">Mán Mẹkánik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🔧">Dák Skín Ton | Ẹlẹktríshan | Kráftsman | Man | Mán Mẹkánik | Mékánik | Plọ́mba</annotation>
+ <annotation cp="👨🏿🔧" type="tts">Mán Mẹkánik: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🔧">Ẹlẹktríshan | Kráftswúman | Laít Skín Ton | Mékánik | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🏻🔧" type="tts">Wúmán Mẹkánik: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🔧">Ẹlẹktríshan | Kráftswúman | Mékánik | Mídíọ́m-Laít Skín Ton | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🏼🔧" type="tts">Wúmán Mẹkánik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🔧">Ẹlẹktríshan | Kráftswúman | Mékánik | Mídíọ́m Skín Ton | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🏽🔧" type="tts">Wúmán Mẹkánik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🔧">Ẹlẹktríshan | Kráftswúman | Mékánik | Mídíọ́m Dák Skín Ton | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🏾🔧" type="tts">Wúmán Mẹkánik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🔧">Dák Skín Ton | Ẹlẹktríshan | Kráftswúman | Mékánik | Plọ́mba | Wúman | Wúmán Mẹkánik</annotation>
+ <annotation cp="👩🏿🔧" type="tts">Wúmán Mẹkánik: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🏭">Fáktri | Fáktrí Wọ́ka | Laít Skín Ton | Wọ́ka</annotation>
+ <annotation cp="🧑🏻🏭" type="tts">Fáktrí Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🏭">Fáktri | Fáktrí Wọ́ka | Mídíọ́m-Laít Skín Ton | Wọ́ka</annotation>
+ <annotation cp="🧑🏼🏭" type="tts">Fáktrí Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🏭">Fáktri | Fáktrí Wọ́ka | Mídíọ́m Skín Ton | Wọ́ka</annotation>
+ <annotation cp="🧑🏽🏭" type="tts">Fáktrí Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🏭">Fáktri | Fáktrí Wọ́ka | Mídíọ́m Dák Skín Ton | Wọ́ka</annotation>
+ <annotation cp="🧑🏾🏭" type="tts">Fáktrí Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🏭">Dák Skín Ton | Fáktri | Fáktrí Wọ́ka | Wọ́ka</annotation>
+ <annotation cp="🧑🏿🏭" type="tts">Fáktrí Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🏭">Fáktri | Laít Skín Ton | Man | Mán Fáktrí Wọ́ka | Wọ́ka</annotation>
+ <annotation cp="👨🏻🏭" type="tts">Mán Fáktrí Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🏭">Fáktri | Man | Mán Fáktrí Wọ́ka | Mídíọ́m-Laít Skín Ton | Wọ́ka</annotation>
+ <annotation cp="👨🏼🏭" type="tts">Mán Fáktrí Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🏭">Fáktri | Man | Mán Fáktrí Wọ́ka | Mídíọ́m Skín Ton | Wọ́ka</annotation>
+ <annotation cp="👨🏽🏭" type="tts">Mán Fáktrí Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🏭">Fáktri | Man | Mán Fáktrí Wọ́ka | Mídíọ́m Dák Skín Ton | Wọ́ka</annotation>
+ <annotation cp="👨🏾🏭" type="tts">Mán Fáktrí Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🏭">Dák Skín Ton | Fáktri | Man | Mán Fáktrí Wọ́ka | Wọ́ka</annotation>
+ <annotation cp="👨🏿🏭" type="tts">Mán Fáktrí Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🏭">Fáktri | Laít Skín Ton | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏻🏭" type="tts">Wúmán Fáktrí Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🏭">Fáktri | Mídíọ́m-Laít Skín Ton | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏼🏭" type="tts">Wúmán Fáktrí Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🏭">Fáktri | Mídíọ́m Skín Ton | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏽🏭" type="tts">Wúmán Fáktrí Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🏭">Fáktri | Mídíọ́m Dák Skín Ton | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏾🏭" type="tts">Wúmán Fáktrí Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🏭">Dák Skín Ton | Fáktri | Wọ́ka | Wúman | Wúmán Fáktrí Wọ́ka</annotation>
+ <annotation cp="👩🏿🏭" type="tts">Wúmán Fáktrí Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻💼">Ákítẹkt | Bízẹs | Laít Skín Ton | Máníja | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🏻💼" type="tts">Ọ́fís Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m-Laít Skín Ton | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🏼💼" type="tts">Ọ́fís Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m Skín Ton | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🏽💼" type="tts">Ọ́fís Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m Dák Skín Ton | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🏾💼" type="tts">Ọ́fís Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿💼">Ákítẹkt | Bízẹs | Dák Skín Ton | Máníja | Ọfis | Ọ́fís Wọ́ka</annotation>
+ <annotation cp="🧑🏿💼" type="tts">Ọ́fís Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻💼">Ákítẹkt | Bízẹs | Laít Skín Ton | Man | Mán Ọ́fís Wọ́ka | Máníja | Ọfis</annotation>
+ <annotation cp="👨🏻💼" type="tts">Mán Ọ́fís Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼💼">Ákítẹkt | Bízẹs | Man | Mán Ọ́fís Wọ́ka | Máníja | Mídíọ́m-Laít Skín Ton | Ọfis</annotation>
+ <annotation cp="👨🏼💼" type="tts">Mán Ọ́fís Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽💼">Ákítẹkt | Bízẹs | Man | Mán Ọ́fís Wọ́ka | Máníja | Mídíọ́m Skín Ton | Ọfis</annotation>
+ <annotation cp="👨🏽💼" type="tts">Mán Ọ́fís Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾💼">Ákítẹkt | Bízẹs | Man | Mán Ọ́fís Wọ́ka | Máníja | Mídíọ́m Dák Skín Ton | Ọfis</annotation>
+ <annotation cp="👨🏾💼" type="tts">Mán Ọ́fís Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿💼">Ákítẹkt | Bízẹs | Dák Skín Ton | Man | Mán Ọ́fís Wọ́ka | Máníja | Ọfis</annotation>
+ <annotation cp="👨🏿💼" type="tts">Mán Ọ́fís Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻💼">Ákítẹkt | Bízẹs | Laít Skín Ton | Máníja | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩🏻💼" type="tts">Wúmán Ọ́fís Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m-Laít Skín Ton | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩🏼💼" type="tts">Wúmán Ọ́fís Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m Skín Ton | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩🏽💼" type="tts">Wúmán Ọ́fís Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾💼">Ákítẹkt | Bízẹs | Máníja | Mídíọ́m Dák Skín Ton | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩🏾💼" type="tts">Wúmán Ọ́fís Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿💼">Ákítẹkt | Bízẹs | Dák Skín Ton | Máníja | Ọfis | Wúman | Wúmán Ọ́fís Wọ́ka</annotation>
+ <annotation cp="👩🏿💼" type="tts">Wúmán Ọ́fís Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Laít Skín Ton | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🏻🔬" type="tts">Sáyẹ́ns Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m-Laít Skín Ton | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🏼🔬" type="tts">Sáyẹ́ns Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m Skín Ton | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🏽🔬" type="tts">Sáyẹ́ns Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m Dák Skín Ton | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🏾🔬" type="tts">Sáyẹ́ns Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🔬">Bayọ́lọ́jí Ẹ́spat | Dák Skín Ton | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="🧑🏿🔬" type="tts">Sáyẹ́ns Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🔬">Bayọ́lọ́gí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Laít Skín Ton | Man | Mán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👨🏻🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🔬">Bayọ́lọ́gí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Man | Mán Sáyẹ́ns Ẹ́spat | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🔬">Bayọ́lọ́gí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Man | Mán Sáyẹ́ns Ẹ́spat | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🔬">Bayọ́lọ́gí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Man | Mán Sáyẹ́ns Ẹ́spat | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🔬">Bayọ́lọ́gí Ẹ́spat | Dák Skín Ton | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Man | Mán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👨🏿🔬" type="tts">Mán Sáyẹ́ns Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Laít Skín Ton | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🏻🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m-Laít Skín Ton | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🏼🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m Skín Ton | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🏽🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🔬">Bayọ́lọ́jí Ẹ́spat | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Mídíọ́m Dák Skín Ton | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🏾🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🔬">Bayọ́lọ́jí Ẹ́spat | Dák Skín Ton | Ẹnjinia | Fízíks Ẹ́spat | Kẹ́místrí Ẹ́spat | Wúman | Wúmán Sáyẹ́ns Ẹ́spat</annotation>
+ <annotation cp="👩🏿🔬" type="tts">Wúmán Sáyẹ́ns Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Laít Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🏻💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🏼💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🏽💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🏾💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿💻">Dák Skín Ton | Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="🧑🏿💻" type="tts">Tẹknọ́lọ́jí Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Laít Skín Ton | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨🏻💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨🏼💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Mídíọ́m Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨🏽💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨🏾💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿💻">Dák Skín Ton | Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Man | Mán Tẹknọ́lọ́jí Ẹ́spat | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod</annotation>
+ <annotation cp="👨🏿💻" type="tts">Mán Tẹknọ́lọ́jí Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Laít Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩🏻💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩🏼💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩🏽💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾💻">Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩🏾💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿💻">Dák Skín Ton | Kọmpútá Kọd | Kọmpútá Sọ́ftwea | Pẹ́sin Wé De Mék Sọ́ftwea | Pẹ́sin Wé De Raít Kod | Wúman | Wúman Tẹknọ́lọ́jí Ẹ́spat</annotation>
+ <annotation cp="👩🏿💻" type="tts">Wúman Tẹknọ́lọ́jí Ẹ́spat: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🎤">Áktọ | Dans | Laít Skín Ton | Maikrofon | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🏻🎤" type="tts">Sínga: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🎤">Áktọ | Dans | Maikrofon | Mídíọ́m-Laít Skín Ton | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🏼🎤" type="tts">Sínga: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🎤">Áktọ | Dans | Maikrofon | Mídíọ́m Skín Ton | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🏽🎤" type="tts">Sínga: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🎤">Áktọ | Dans | Maikrofon | Mídíọ́m Dák Skín Ton | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🏾🎤" type="tts">Sínga: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🎤">Áktọ | Dák Skín Ton | Dans | Maikrofon | Miúzik | Sínga | Sta</annotation>
+ <annotation cp="🧑🏿🎤" type="tts">Sínga: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🎤">Áktọ | Jíta | Laít Skín Ton | Man | Mán Sínga | Miúzik | Sta</annotation>
+ <annotation cp="👨🏻🎤" type="tts">Mán Sínga: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🎤">Áktọ | Jíta | Man | Mán Sínga | Mídíọ́m-Laít Skín Ton | Miúzik | Sta</annotation>
+ <annotation cp="👨🏼🎤" type="tts">Mán Sínga: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🎤">Áktọ | Jíta | Man | Mán Sínga | Mídíọ́m Skín Ton | Miúzik | Sta</annotation>
+ <annotation cp="👨🏽🎤" type="tts">Mán Sínga: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🎤">Áktọ | Jíta | Man | Mán Sínga | Mídíọ́m Dák Skín Ton | Miúzik | Sta</annotation>
+ <annotation cp="👨🏾🎤" type="tts">Mán Sínga: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🎤">Áktọ | Dák Skín Ton | Jíta | Man | Mán Sínga | Miúzik | Sta</annotation>
+ <annotation cp="👨🏿🎤" type="tts">Mán Sínga: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🎤">Áktọ | Dans | Jíta | Laít Skín Ton | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🏻🎤" type="tts">Wúmán Sínga: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🎤">Áktọ | Dans | Jíta | Mídíọ́m-Laít Skín Ton | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🏼🎤" type="tts">Wúmán Sínga: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🎤">Áktọ | Dans | Jíta | Mídíọ́m Skín Ton | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🏽🎤" type="tts">Wúmán Sínga: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🎤">Áktọ | Dans | Jíta | Mídíọ́m Dák Skín Ton | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🏾🎤" type="tts">Wúmán Sínga: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🎤">Áktọ | Dák Skín Ton | Dans | Jíta | Miúzik | Wúman | Wúmán Sínga</annotation>
+ <annotation cp="👩🏿🎤" type="tts">Wúmán Sínga: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🎨">Átist | Brọsh | Laít Skín Ton | Pént Plet</annotation>
+ <annotation cp="🧑🏻🎨" type="tts">Átist: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🎨">Átist | Brọsh | Mídíọ́m-Laít Skín Ton | Pént Plet</annotation>
+ <annotation cp="🧑🏼🎨" type="tts">Átist: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🎨">Átist | Brọsh | Mídíọ́m Skín Ton | Pént Plet</annotation>
+ <annotation cp="🧑🏽🎨" type="tts">Átist: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🎨">Átist | Brọsh | Mídíọ́m Dák Skín Ton | Pént Plet</annotation>
+ <annotation cp="🧑🏾🎨" type="tts">Átist: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🎨">Átist | Brọsh | Dák Skín Ton | Pént Plet</annotation>
+ <annotation cp="🧑🏿🎨" type="tts">Átist: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🎨">Átist | Brọsh | Laít Skín Ton | Man | Mán Átist | Pént Plet</annotation>
+ <annotation cp="👨🏻🎨" type="tts">Mán Átist: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🎨">Átist | Brọsh | Man | Mán Átist | Mídíọ́m-Laít Skín Ton | Pént Plet</annotation>
+ <annotation cp="👨🏼🎨" type="tts">Mán Átist: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🎨">Átist | Brọsh | Man | Mán Átist | Mídíọ́m Skín Ton | Pént Plet</annotation>
+ <annotation cp="👨🏽🎨" type="tts">Mán Átist: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🎨">Átist | Brọsh | Man | Mán Átist | Mídíọ́m Dák Skín Ton | Pént Plet</annotation>
+ <annotation cp="👨🏾🎨" type="tts">Mán Átist: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🎨">Átist | Brọsh | Dák Skín Ton | Man | Mán Átist | Pént Plet</annotation>
+ <annotation cp="👨🏿🎨" type="tts">Mán Átist: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🎨">Átist | Brọsh | Laít Skín Ton | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🏻🎨" type="tts">Wúmán Átist: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🎨">Átist | Brọsh | Mídíọ́m-Laít Skín Ton | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🏼🎨" type="tts">Wúmán Átist: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🎨">Átist | Brọsh | Mídíọ́m Skín Ton | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🏽🎨" type="tts">Wúmán Átist: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🎨">Átist | Brọsh | Mídíọ́m Dák Skín Ton | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🏾🎨" type="tts">Wúmán Átist: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🎨">Átist | Brọsh | Dák Skín Ton | Pént Plet | Wúman | Wúmán Átist</annotation>
+ <annotation cp="👩🏿🎨" type="tts">Wúmán Átist: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻✈">Eroplen | Káptin | Laít Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑🏻✈" type="tts">Paílọt: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼✈">Eroplen | Káptin | Mídíọ́m-Laít Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑🏼✈" type="tts">Paílọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽✈">Eroplen | Káptin | Mídíọ́m Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑🏽✈" type="tts">Paílọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾✈">Eroplen | Káptin | Mídíọ́m Dák Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑🏾✈" type="tts">Paílọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿✈">Dák Skín Ton | Eroplen | Káptin | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="🧑🏿✈" type="tts">Paílọt: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻✈">Eroplen | Káptin | Laít Skín Ton | Man | Mán Paílọt | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨🏻✈" type="tts">Mán Paílọt: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼✈">Eroplen | Káptin | Man | Mán Paílọt | Mídíọ́m-Laít Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨🏼✈" type="tts">Mán Paílọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽✈">Eroplen | Káptin | Man | Mán Paílọt | Mídíọ́m Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨🏽✈" type="tts">Mán Paílọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾✈">Eroplen | Káptin | Man | Mán Paílọt | Mídíọ́m Dák Skín Ton | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨🏾✈" type="tts">Mán Paílọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿✈">Dák Skín Ton | Eroplen | Káptin | Man | Mán Paílọt | Paílọt | Pásẹ́nja</annotation>
+ <annotation cp="👨🏿✈" type="tts">Mán Paílọt: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻✈">Eroplen | Káptin | Laít Skín Ton | Man | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩🏻✈" type="tts">Wúmán Paílọt: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼✈">Eroplen | Káptin | Man | Mídíọ́m-Laít Skín Ton | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩🏼✈" type="tts">Wúmán Paílọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽✈">Eroplen | Káptin | Man | Mídíọ́m Skín Ton | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩🏽✈" type="tts">Wúmán Paílọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾✈">Eroplen | Káptin | Man | Mídíọ́m Dák Skín Ton | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩🏾✈" type="tts">Wúmán Paílọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿✈">Dák Skín Ton | Eroplen | Káptin | Man | Paílọt | Pásẹ́nja | Wúman | Wúmán Paílọt</annotation>
+ <annotation cp="👩🏿✈" type="tts">Wúmán Paílọt: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🚀">Ástrọ́nọt | Laít Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🏻🚀" type="tts">Ástrọ́nọt: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🚀">Ástrọ́nọt | Mídíọ́m-Laít Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🏼🚀" type="tts">Ástrọ́nọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🚀">Ástrọ́nọt | Mídíọ́m Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🏽🚀" type="tts">Ástrọ́nọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🚀">Ástrọ́nọt | Mídíọ́m Dák Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🏾🚀" type="tts">Ástrọ́nọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🚀">Ástrọ́nọt | Dák Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="🧑🏿🚀" type="tts">Ástrọ́nọt: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🚀">Ástrọ́nọt | Laít Skín Ton | Man | Mán Ástrọ́nọt | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🏻🚀" type="tts">Mán Ástrọ́nọt: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🚀">Ástrọ́nọt | Man | Mán Ástrọ́nọt | Mídíọ́m-Laít Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🏼🚀" type="tts">Mán Ástrọ́nọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🚀">Ástrọ́nọt | Man | Mán Ástrọ́nọt | Mídíọ́m Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🏽🚀" type="tts">Mán Ástrọ́nọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🚀">Ástrọ́nọt | Man | Mán Ástrọ́nọt | Mídíọ́m Dák Skín Ton | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🏾🚀" type="tts">Mán Ástrọ́nọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🚀">Ástrọ́nọt | Dák Skín Ton | Man | Mán Ástrọ́nọt | Mun | Rọ́kẹt | Spes</annotation>
+ <annotation cp="👨🏿🚀" type="tts">Mán Ástrọ́nọt: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🚀">Ástrọ́nọt | Laít Skín Ton | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🏻🚀" type="tts">Wúmán Ástrọ́nọt: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🚀">Ástrọ́nọt | Mídíọ́m-Laít Skín Ton | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🏼🚀" type="tts">Wúmán Ástrọ́nọt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🚀">Ástrọ́nọt | Mídíọ́m Skín Ton | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🏽🚀" type="tts">Wúmán Ástrọ́nọt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🚀">Ástrọ́nọt | Mídíọ́m Dák Skín Ton | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🏾🚀" type="tts">Wúmán Ástrọ́nọt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🚀">Ástrọ́nọt | Dák Skín Ton | Mun | Rọ́kẹt | Spes | Wúman | Wúmán Ástrọ́nọt</annotation>
+ <annotation cp="👩🏿🚀" type="tts">Wúmán Ástrọ́nọt: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🚒">Fáyáfaíta | Fáyámóto | Laít Skín Ton</annotation>
+ <annotation cp="🧑🏻🚒" type="tts">Fáyáfaíta: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🚒">Fáyáfaíta | Fáyámóto | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🚒" type="tts">Fáyáfaíta: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🚒">Fáyáfaíta | Fáyámóto | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏽🚒" type="tts">Fáyáfaíta: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🚒">Fáyáfaíta | Fáyámóto | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏾🚒" type="tts">Fáyáfaíta: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🚒">Dák Skín Ton | Fáyáfaíta | Fáyámóto</annotation>
+ <annotation cp="🧑🏿🚒" type="tts">Fáyáfaíta: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🚒">Fáyámóto | Laít Skín Ton | Man | Mán Fáyáfaíta</annotation>
+ <annotation cp="👨🏻🚒" type="tts">Mán Fáyáfaíta: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🚒">Fáyámóto | Man | Mán Fáyáfaíta | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🚒" type="tts">Mán Fáyáfaíta: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🚒">Fáyámóto | Man | Mán Fáyáfaíta | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🚒" type="tts">Mán Fáyáfaíta: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🚒">Fáyámóto | Man | Mán Fáyáfaíta | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🚒" type="tts">Mán Fáyáfaíta: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🚒">Dák Skín Ton | Fáyámóto | Man | Mán Fáyáfaíta</annotation>
+ <annotation cp="👨🏿🚒" type="tts">Mán Fáyáfaíta: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🚒">Fáyámóto | Laít Skín Ton | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🏻🚒" type="tts">Wúmán Fáyáfaíta: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🚒">Fáyámóto | Mídíọ́m-Laít Skín Ton | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🏼🚒" type="tts">Wúmán Fáyáfaíta: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🚒">Fáyámóto | Mídíọ́m Skín Ton | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🏽🚒" type="tts">Wúmán Fáyáfaíta: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🚒">Fáyámóto | Mídíọ́m Dák Skín Ton | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🏾🚒" type="tts">Wúmán Fáyáfaíta: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🚒">Dák Skín Ton | Fáyámóto | Wúman | Wúmán Fáyáfaíta</annotation>
+ <annotation cp="👩🏿🚒" type="tts">Wúmán Fáyáfaíta: Dák Skín Ton</annotation>
+ <annotation cp="👮🏻">Laít Skín Ton | Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮🏻" type="tts">Polís Ọ́físa: Laít Skín Ton</annotation>
+ <annotation cp="👮🏼">Mídíọ́m-Laít Skín Ton | Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮🏼" type="tts">Polís Ọ́físa: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👮🏽">Mídíọ́m Skín Ton | Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮🏽" type="tts">Polís Ọ́físa: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👮🏾">Mídíọ́m Dák Skín Ton | Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮🏾" type="tts">Polís Ọ́físa: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👮🏿">Dák Skín Ton | Ọ́físa | Polis | Polís Ọ́físa</annotation>
+ <annotation cp="👮🏿" type="tts">Polís Ọ́físa: Dák Skín Ton</annotation>
+ <annotation cp="👮🏻♂">Laít Skín Ton | Man | Man Polís Ọ́físa | Ọ́físa | Polis</annotation>
+ <annotation cp="👮🏻♂" type="tts">Man Polís Ọ́físa: Laít Skín Ton</annotation>
+ <annotation cp="👮🏼♂">Man | Man Polís Ọ́físa | Mídíọ́m-Laít Skín Ton | Ọ́físa | Polis</annotation>
+ <annotation cp="👮🏼♂" type="tts">Man Polís Ọ́físa: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👮🏽♂">Man | Man Polís Ọ́físa | Mídíọ́m Skín Ton | Ọ́físa | Polis</annotation>
+ <annotation cp="👮🏽♂" type="tts">Man Polís Ọ́físa: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👮🏾♂">Man | Man Polís Ọ́físa | Mídíọ́m Dák Skín Ton | Ọ́físa | Polis</annotation>
+ <annotation cp="👮🏾♂" type="tts">Man Polís Ọ́físa: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👮🏿♂">Dák Skín Ton | Man | Man Polís Ọ́físa | Ọ́físa | Polis</annotation>
+ <annotation cp="👮🏿♂" type="tts">Man Polís Ọ́físa: Dák Skín Ton</annotation>
+ <annotation cp="👮🏻♀">Laít Skín Ton | Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮🏻♀" type="tts">Wúmán Polís Ọ́físa: Laít Skín Ton</annotation>
+ <annotation cp="👮🏼♀">Mídíọ́m-Laít Skín Ton | Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮🏼♀" type="tts">Wúmán Polís Ọ́físa: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👮🏽♀">Mídíọ́m Skín Ton | Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮🏽♀" type="tts">Wúmán Polís Ọ́físa: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👮🏾♀">Mídíọ́m Dák Skín Ton | Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮🏾♀" type="tts">Wúmán Polís Ọ́físa: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👮🏿♀">Dák Skín Ton | Ọ́físa | Polis | Wúman | Wúmán Polís Ọ́físa</annotation>
+ <annotation cp="👮🏿♀" type="tts">Wúmán Polís Ọ́físa: Dák Skín Ton</annotation>
+ <annotation cp="🕵🏻">Ditẹ́ktiv | Kraim | Laít Skín Ton</annotation>
+ <annotation cp="🕵🏻" type="tts">Ditẹ́ktiv: Laít Skín Ton</annotation>
+ <annotation cp="🕵🏼">Ditẹ́ktiv | Kraim | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕵🏼" type="tts">Ditẹ́ktiv: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕵🏽">Ditẹ́ktiv | Kraim | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕵🏽" type="tts">Ditẹ́ktiv: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕵🏾">Ditẹ́ktiv | Kraim | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕵🏾" type="tts">Ditẹ́ktiv: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕵🏿">Dák Skín Ton | Ditẹ́ktiv | Kraim</annotation>
+ <annotation cp="🕵🏿" type="tts">Ditẹ́ktiv: Dák Skín Ton</annotation>
+ <annotation cp="🕵🏻♂">Ditẹ́ktiv | Kraim | Laít Skín Ton | Man | Mán Ditẹ́ktiv | Spai</annotation>
+ <annotation cp="🕵🏻♂" type="tts">Mán Ditẹ́ktiv: Laít Skín Ton</annotation>
+ <annotation cp="🕵🏼♂">Ditẹ́ktiv | Kraim | Man | Mán Ditẹ́ktiv | Mídíọ́m-Laít Skín Ton | Spai</annotation>
+ <annotation cp="🕵🏼♂" type="tts">Mán Ditẹ́ktiv: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕵🏽♂">Ditẹ́ktiv | Kraim | Man | Mán Ditẹ́ktiv | Mídíọ́m Skín Ton | Spai</annotation>
+ <annotation cp="🕵🏽♂" type="tts">Mán Ditẹ́ktiv: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕵🏾♂">Ditẹ́ktiv | Kraim | Man | Mán Ditẹ́ktiv | Mídíọ́m Dák Skín Ton | Spai</annotation>
+ <annotation cp="🕵🏾♂" type="tts">Mán Ditẹ́ktiv: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕵🏿♂">Dák Skín Ton | Ditẹ́ktiv | Kraim | Man | Mán Ditẹ́ktiv | Spai</annotation>
+ <annotation cp="🕵🏿♂" type="tts">Mán Ditẹ́ktiv: Dák Skín Ton</annotation>
+ <annotation cp="🕵🏻♀">Ditẹ́ktiv | Kraim | Laít Skín Ton | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵🏻♀" type="tts">Wúmán Ditẹ́ktiv: Laít Skín Ton</annotation>
+ <annotation cp="🕵🏼♀">Ditẹ́ktiv | Kraim | Mídíọ́m-Laít Skín Ton | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵🏼♀" type="tts">Wúmán Ditẹ́ktiv: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕵🏽♀">Ditẹ́ktiv | Kraim | Mídíọ́m Skín Ton | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵🏽♀" type="tts">Wúmán Ditẹ́ktiv: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕵🏾♀">Ditẹ́ktiv | Kraim | Mídíọ́m Dák Skín Ton | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵🏾♀" type="tts">Wúmán Ditẹ́ktiv: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕵🏿♀">Dák Skín Ton | Ditẹ́ktiv | Kraim | Spai | Wúman | Wúmán Ditẹ́ktiv</annotation>
+ <annotation cp="🕵🏿♀" type="tts">Wúmán Ditẹ́ktiv: Dák Skín Ton</annotation>
+ <annotation cp="💂🏻">Gad | Laít Skín Ton</annotation>
+ <annotation cp="💂🏻" type="tts">Gad: Laít Skín Ton</annotation>
+ <annotation cp="💂🏼">Gad | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💂🏼" type="tts">Gad: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💂🏽">Gad | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💂🏽" type="tts">Gad: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💂🏾">Gad | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💂🏾" type="tts">Gad: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💂🏿">Dák Skín Ton | Gad</annotation>
+ <annotation cp="💂🏿" type="tts">Gad: Dák Skín Ton</annotation>
+ <annotation cp="💂🏻♂">Gad | Laít Skín Ton | Man | Mán Gad</annotation>
+ <annotation cp="💂🏻♂" type="tts">Mán Gad: Laít Skín Ton</annotation>
+ <annotation cp="💂🏼♂">Gad | Man | Mán Gad | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💂🏼♂" type="tts">Mán Gad: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💂🏽♂">Gad | Man | Mán Gad | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💂🏽♂" type="tts">Mán Gad: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💂🏾♂">Gad | Man | Mán Gad | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💂🏾♂" type="tts">Mán Gad: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💂🏿♂">Dák Skín Ton | Gad | Man | Mán Gad</annotation>
+ <annotation cp="💂🏿♂" type="tts">Mán Gad: Dák Skín Ton</annotation>
+ <annotation cp="💂🏻♀">Gad | Laít Skín Ton | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂🏻♀" type="tts">Wúmán Gad: Laít Skín Ton</annotation>
+ <annotation cp="💂🏼♀">Gad | Mídíọ́m-Laít Skín Ton | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂🏼♀" type="tts">Wúmán Gad: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💂🏽♀">Gad | Mídíọ́m Skín Ton | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂🏽♀" type="tts">Wúmán Gad: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💂🏾♀">Gad | Mídíọ́m Dák Skín Ton | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂🏾♀" type="tts">Wúmán Gad: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💂🏿♀">Dák Skín Ton | Gad | Wúman | Wúmán Gad</annotation>
+ <annotation cp="💂🏿♀" type="tts">Wúmán Gad: Dák Skín Ton</annotation>
+ <annotation cp="👷🏻">Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Laít Skín Ton | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏻" type="tts">Kọnstrọ́kshọ́n Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👷🏼">Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m-Laít Skín Ton | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏼" type="tts">Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👷🏽">Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m Skín Ton | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏽" type="tts">Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👷🏾">Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m Dák Skín Ton | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏾" type="tts">Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👷🏿">Dák Skín Ton | Hat | Hẹd Pan | Kọnstrọ́kshọ́n Wọ́ka | Sait | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏿" type="tts">Kọnstrọ́kshọ́n Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👷🏻♂">Hat | Hẹd Pan | Laít Skín Ton | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏻♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👷🏼♂">Hat | Hẹd Pan | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m-Laít Skín Ton | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏼♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👷🏽♂">Hat | Hẹd Pan | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m Skín Ton | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏽♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👷🏾♂">Hat | Hẹd Pan | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Mídíọ́m Dák Skín Ton | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏾♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👷🏿♂">Dák Skín Ton | Hat | Hẹd Pan | Man | Mán Kọnstrọ́kshọ́n Wọ́ka | Shọ́vẹl | Wọ́ka</annotation>
+ <annotation cp="👷🏿♂" type="tts">Mán Kọnstrọ́kshọ́n Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="👷🏻♀">Hat | Hẹd Pan | Laít Skín Ton | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷🏻♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka: Laít Skín Ton</annotation>
+ <annotation cp="👷🏼♀">Hat | Hẹd Pan | Mídíọ́m-Laít Skín Ton | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷🏼♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👷🏽♀">Hat | Hẹd Pan | Mídíọ́m Skín Ton | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷🏽♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👷🏾♀">Hat | Hẹd Pan | Mídíọ́m Dák Skín Ton | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷🏾♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👷🏿♀">Dák Skín Ton | Hat | Hẹd Pan | Shọ́vẹl | Wọ́ka | Wúman | Wúmán Kọnstrọ́kshọ́n Wọ́ka</annotation>
+ <annotation cp="👷🏿♀" type="tts">Wúmán Kọnstrọ́kshọ́n Wọ́ka: Dák Skín Ton</annotation>
+ <annotation cp="🤴🏻">Kraun | Laít Skín Ton | Prins</annotation>
+ <annotation cp="🤴🏻" type="tts">Prins: Laít Skín Ton</annotation>
+ <annotation cp="🤴🏼">Kraun | Mídíọ́m-Laít Skín Ton | Prins</annotation>
+ <annotation cp="🤴🏼" type="tts">Prins: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤴🏽">Kraun | Mídíọ́m Skín Ton | Prins</annotation>
+ <annotation cp="🤴🏽" type="tts">Prins: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤴🏾">Kraun | Mídíọ́m Dák Skín Ton | Prins</annotation>
+ <annotation cp="🤴🏾" type="tts">Prins: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤴🏿">Dák Skín Ton | Kraun | Prins</annotation>
+ <annotation cp="🤴🏿" type="tts">Prins: Dák Skín Ton</annotation>
+ <annotation cp="👸🏻">Kraun | Laít Skín Ton | Prínsẹs</annotation>
+ <annotation cp="👸🏻" type="tts">Prínsẹs: Laít Skín Ton</annotation>
+ <annotation cp="👸🏼">Kraun | Mídíọ́m-Laít Skín Ton | Prínsẹs</annotation>
+ <annotation cp="👸🏼" type="tts">Prínsẹs: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👸🏽">Kraun | Mídíọ́m Skín Ton | Prínsẹs</annotation>
+ <annotation cp="👸🏽" type="tts">Prínsẹs: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👸🏾">Kraun | Mídíọ́m Dák Skín Ton | Prínsẹs</annotation>
+ <annotation cp="👸🏾" type="tts">Prínsẹs: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👸🏿">Dák Skín Ton | Kraun | Prínsẹs</annotation>
+ <annotation cp="👸🏿" type="tts">Prínsẹs: Dák Skín Ton</annotation>
+ <annotation cp="👳🏻">Hẹ́d-Klọt | Laít Skín Ton | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏻" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd: Laít Skín Ton</annotation>
+ <annotation cp="👳🏼">Hẹ́d-Klọt | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏼" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👳🏽">Hẹ́d-Klọt | Mídíọ́m Skín Ton | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏽" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👳🏾">Hẹ́d-Klọt | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏾" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👳🏿">Dák Skín Ton | Hẹ́d-Klọt | Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏿" type="tts">Pẹ́sin Wé Taí Hẹ́d-Klọt Fọ Hẹd: Dák Skín Ton</annotation>
+ <annotation cp="👳🏻♂">Hẹ́d-Klọt | Laít Skín Ton | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏻♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd: Laít Skín Ton</annotation>
+ <annotation cp="👳🏼♂">Hẹ́d-Klọt | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👳🏼♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👳🏽♂">Hẹ́d-Klọt | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👳🏽♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👳🏾♂">Hẹ́d-Klọt | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👳🏾♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👳🏿♂">Dák Skín Ton | Hẹ́d-Klọt | Man | Man Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏿♂" type="tts">Man Wé Taí Hẹ́d-Klọt Fọ Hẹd: Dák Skín Ton</annotation>
+ <annotation cp="👳🏻♀">Hẹ́d-Klọt | Laít Skín Ton | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏻♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd: Laít Skín Ton</annotation>
+ <annotation cp="👳🏼♀">Hẹ́d-Klọt | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏼♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👳🏽♀">Hẹ́d-Klọt | Mídíọ́m Skín Ton | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏽♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👳🏾♀">Hẹ́d-Klọt | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏾♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👳🏿♀">Dák Skín Ton | Hẹ́d-Klọt | Wúman | Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd</annotation>
+ <annotation cp="👳🏿♀" type="tts">Wúman Wé Taí Hẹ́d-Klọt Fọ Hẹd: Dák Skín Ton</annotation>
+ <annotation cp="👲🏻">Hat | Kap | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲🏻" type="tts">Pẹ́sin Wé Wiá Skọ́lkap: Laít Skín Ton</annotation>
+ <annotation cp="👲🏼">Hat | Kap | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲🏼" type="tts">Pẹ́sin Wé Wiá Skọ́lkap: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👲🏽">Hat | Kap | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲🏽" type="tts">Pẹ́sin Wé Wiá Skọ́lkap: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👲🏾">Hat | Kap | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲🏾" type="tts">Pẹ́sin Wé Wiá Skọ́lkap: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👲🏿">Dák Skín Ton | Hat | Kap | Pẹ́sin | Pẹ́sin Wé Wiá Skọ́lkap | Skọ́lkap | Wia</annotation>
+ <annotation cp="👲🏿" type="tts">Pẹ́sin Wé Wiá Skọ́lkap: Dák Skín Ton</annotation>
+ <annotation cp="🧕🏻">Hẹdtai | Hijab | Laít Skín Ton | Mantíla | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕🏻" type="tts">Wúman Wé Taí Hẹdtai: Laít Skín Ton</annotation>
+ <annotation cp="🧕🏼">Hẹdtai | Hijab | Mantíla | Mídíọ́m-Laít Skín Ton | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕🏼" type="tts">Wúman Wé Taí Hẹdtai: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧕🏽">Hẹdtai | Hijab | Mantíla | Mídíọ́m Skín Ton | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕🏽" type="tts">Wúman Wé Taí Hẹdtai: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧕🏾">Hẹdtai | Hijab | Mantíla | Mídíọ́m Dák Skín Ton | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕🏾" type="tts">Wúman Wé Taí Hẹdtai: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧕🏿">Dák Skín Ton | Hẹdtai | Hijab | Mantíla | Tai | Wúman | Wúman Wé Taí Hẹdtai</annotation>
+ <annotation cp="🧕🏿" type="tts">Wúman Wé Taí Hẹdtai: Dák Skín Ton</annotation>
+ <annotation cp="🤵🏻">Laít Skín Ton | Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏻" type="tts">Pẹ́sin Wé Wiá Tọksído: Laít Skín Ton</annotation>
+ <annotation cp="🤵🏼">Mídíọ́m-Laít Skín Ton | Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏼" type="tts">Pẹ́sin Wé Wiá Tọksído: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤵🏽">Mídíọ́m Skín Ton | Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏽" type="tts">Pẹ́sin Wé Wiá Tọksído: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤵🏾">Mídíọ́m Dák Skín Ton | Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏾" type="tts">Pẹ́sin Wé Wiá Tọksído: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤵🏿">Dák Skín Ton | Niú Họ́zband | Pẹ́sin | Pẹ́sin Wé Wiá | Pẹ́sin Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏿" type="tts">Pẹ́sin Wé Wiá Tọksído: Dák Skín Ton</annotation>
+ <annotation cp="🤵🏻♀">Laít Skín Ton | Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏻♀" type="tts">Wúman Wé Wiá Tọksído: Laít Skín Ton</annotation>
+ <annotation cp="🤵🏼♀">Mídíọ́m-Laít Skín Ton | Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏼♀" type="tts">Wúman Wé Wiá Tọksído: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤵🏽♀">Mídíọ́m Skín Ton | Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏽♀" type="tts">Wúman Wé Wiá Tọksído: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤵🏾♀">Mídíọ́m Dák Skín Ton | Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏾♀" type="tts">Wúman Wé Wiá Tọksído: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤵🏿♀">Dák Skín Ton | Tọksído | Wúman | Wúman Wé Wiá Tọksído</annotation>
+ <annotation cp="🤵🏿♀" type="tts">Wúman Wé Wiá Tọksído: Dák Skín Ton</annotation>
+ <annotation cp="🤵🏻♂">Laít Skín Ton | Man | Man Wé Wiá Tọksído | Tọksído</annotation>
+ <annotation cp="🤵🏻♂" type="tts">Man Wé Wiá Tọksído: Laít Skín Ton</annotation>
+ <annotation cp="🤵🏼♂">Man | Man Wé Wiá Tọksído | Mídíọ́m-Laít Skín Ton | Tọksído</annotation>
+ <annotation cp="🤵🏼♂" type="tts">Man Wé Wiá Tọksído: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤵🏽♂">Man | Man Wé Wiá Tọksído | Mídíọ́m Skín Ton | Tọksído</annotation>
+ <annotation cp="🤵🏽♂" type="tts">Man Wé Wiá Tọksído: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤵🏾♂">Man | Man Wé Wiá Tọksído | Mídíọ́m Dák Skín Ton | Tọksído</annotation>
+ <annotation cp="🤵🏾♂" type="tts">Man Wé Wiá Tọksído: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤵🏿♂">Dák Skín Ton | Man | Man Wé Wiá Tọksído | Tọksído</annotation>
+ <annotation cp="🤵🏿♂" type="tts">Man Wé Wiá Tọksído: Dák Skín Ton</annotation>
+ <annotation cp="👰🏻">Braid | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏻" type="tts">Pẹ́sin Wé Wiá Vẹl: Laít Skín Ton</annotation>
+ <annotation cp="👰🏼">Braid | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏼" type="tts">Pẹ́sin Wé Wiá Vẹl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👰🏽">Braid | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏽" type="tts">Pẹ́sin Wé Wiá Vẹl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👰🏾">Braid | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏾" type="tts">Pẹ́sin Wé Wiá Vẹl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👰🏿">Braid | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏿" type="tts">Pẹ́sin Wé Wiá Vẹl: Dák Skín Ton</annotation>
+ <annotation cp="👰🏻♀">Laít Skín Ton | Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰🏻♀" type="tts">Wúman Wé Wiá Vẹl: Laít Skín Ton</annotation>
+ <annotation cp="👰🏼♀">Mídíọ́m-Laít Skín Ton | Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰🏼♀" type="tts">Wúman Wé Wiá Vẹl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👰🏽♀">Mídíọ́m Skín Ton | Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰🏽♀" type="tts">Wúman Wé Wiá Vẹl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👰🏾♀">Mídíọ́m Dák Skín Ton | Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰🏾♀" type="tts">Wúman Wé Wiá Vẹl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👰🏿♀">Dák Skín Ton | Vẹl | Wúman | Wúman Wé Wiá Vẹl</annotation>
+ <annotation cp="👰🏿♀" type="tts">Wúman Wé Wiá Vẹl: Dák Skín Ton</annotation>
+ <annotation cp="👰🏻♂">Laít Skín Ton | Man | Man Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏻♂" type="tts">Man Wé Wiá Vẹl: Laít Skín Ton</annotation>
+ <annotation cp="👰🏼♂">Man | Man Wé Wiá Vẹl | Mídíọ́m-Laít Skín Ton | Vẹl</annotation>
+ <annotation cp="👰🏼♂" type="tts">Man Wé Wiá Vẹl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👰🏽♂">Man | Man Wé Wiá Vẹl | Mídíọ́m Skín Ton | Vẹl</annotation>
+ <annotation cp="👰🏽♂" type="tts">Man Wé Wiá Vẹl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👰🏾♂">Man | Man Wé Wiá Vẹl | Mídíọ́m Dák Skín Ton | Vẹl</annotation>
+ <annotation cp="👰🏾♂" type="tts">Man Wé Wiá Vẹl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👰🏿♂">Dák Skín Ton | Man | Man Wé Wiá Vẹl | Vẹl</annotation>
+ <annotation cp="👰🏿♂" type="tts">Man Wé Wiá Vẹl: Dák Skín Ton</annotation>
+ <annotation cp="🤰🏻">Bẹlẹ́ | Laít Skín Ton | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰🏻" type="tts">Wúman Wé Gẹ́t Bẹlẹ́: Laít Skín Ton</annotation>
+ <annotation cp="🤰🏼">Bẹlẹ́ | Mídíọ́m-Laít Skín Ton | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰🏼" type="tts">Wúman Wé Gẹ́t Bẹlẹ́: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤰🏽">Bẹlẹ́ | Mídíọ́m Skín Ton | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰🏽" type="tts">Wúman Wé Gẹ́t Bẹlẹ́: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤰🏾">Bẹlẹ́ | Mídíọ́m Dák Skín Ton | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰🏾" type="tts">Wúman Wé Gẹ́t Bẹlẹ́: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤰🏿">Bẹlẹ́ | Dák Skín Ton | Prẹ́gnant | Waif | Wúman | Wúman Wé Gẹ́t Bẹlẹ́</annotation>
+ <annotation cp="🤰🏿" type="tts">Wúman Wé Gẹ́t Bẹlẹ́: Dák Skín Ton</annotation>
+ <annotation cp="🤱🏻">Bẹbí | Brẹst | Chọp | Laít Skín Ton | Mamá | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱🏻" type="tts">Wúman Wé De Gív Pikin Brẹst: Laít Skín Ton</annotation>
+ <annotation cp="🤱🏼">Bẹbí | Brẹst | Chọp | Mamá | Mídíọ́m-Laít Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱🏼" type="tts">Wúman Wé De Gív Pikin Brẹst: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤱🏽">Bẹbí | Brẹst | Chọp | Mamá | Mídíọ́m Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱🏽" type="tts">Wúman Wé De Gív Pikin Brẹst: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤱🏾">Bẹbí | Brẹst | Chọp | Mamá | Mídíọ́m Dák Skín Ton | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱🏾" type="tts">Wúman Wé De Gív Pikin Brẹst: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤱🏿">Bẹbí | Brẹst | Chọp | Dák Skín Ton | Mamá | Pikin | Wúman | Wúman Wé De Gív Pikin Brẹst</annotation>
+ <annotation cp="🤱🏿" type="tts">Wúman Wé De Gív Pikin Brẹst: Dák Skín Ton</annotation>
+ <annotation cp="👼🏻">Bẹ́bí Énjẹl | Énjẹl | Fes | Laít Skín Ton</annotation>
+ <annotation cp="👼🏻" type="tts">Bẹ́bí Énjẹl: Laít Skín Ton</annotation>
+ <annotation cp="👼🏼">Bẹ́bí Énjẹl | Énjẹl | Fes | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👼🏼" type="tts">Bẹ́bí Énjẹl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👼🏽">Bẹ́bí Énjẹl | Énjẹl | Fes | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👼🏽" type="tts">Bẹ́bí Énjẹl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👼🏾">Bẹ́bí Énjẹl | Énjẹl | Fes | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👼🏾" type="tts">Bẹ́bí Énjẹl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👼🏿">Bẹ́bí Énjẹl | Dák Skín Ton | Énjẹl | Fes</annotation>
+ <annotation cp="👼🏿" type="tts">Bẹ́bí Énjẹl: Dák Skín Ton</annotation>
+ <annotation cp="🎅🏻">Krísmas | Laít Skín Ton | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅🏻" type="tts">Sántá Klọz: Laít Skín Ton</annotation>
+ <annotation cp="🎅🏼">Krísmas | Mídíọ́m-Laít Skín Ton | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅🏼" type="tts">Sántá Klọz: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🎅🏽">Krísmas | Mídíọ́m Skín Ton | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅🏽" type="tts">Sántá Klọz: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🎅🏾">Krísmas | Mídíọ́m Dák Skín Ton | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅🏾" type="tts">Sántá Klọz: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🎅🏿">Dák Skín Ton | Krísmas | Papá | Patí | Sánta | Sántá Klọz | Sẹlẹbréshọn</annotation>
+ <annotation cp="🎅🏿" type="tts">Sántá Klọz: Dák Skín Ton</annotation>
+ <annotation cp="🤶🏻">Krísmas | Laít Skín Ton | Mamá | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶🏻" type="tts">Misis Klọz: Laít Skín Ton</annotation>
+ <annotation cp="🤶🏼">Krísmas | Mamá | Mídíọ́m-Laít Skín Ton | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶🏼" type="tts">Misis Klọz: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤶🏽">Krísmas | Mamá | Mídíọ́m Skín Ton | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶🏽" type="tts">Misis Klọz: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤶🏾">Krísmas | Mamá | Mídíọ́m Dák Skín Ton | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶🏾" type="tts">Misis Klọz: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤶🏿">Dák Skín Ton | Krísmas | Mamá | Misis | Misis Klọz | Mrs.</annotation>
+ <annotation cp="🤶🏿" type="tts">Misis Klọz: Dák Skín Ton</annotation>
+ <annotation cp="🦸🏻">Bẹtá | Gud | Laít Skín Ton | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸🏻" type="tts">Supahíro: Laít Skín Ton</annotation>
+ <annotation cp="🦸🏼">Bẹtá | Gud | Mídíọ́m-Laít Skín Ton | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸🏼" type="tts">Supahíro: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦸🏽">Bẹtá | Gud | Mídíọ́m Skín Ton | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸🏽" type="tts">Supahíro: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦸🏾">Bẹtá | Gud | Mídíọ́m Dák Skín Ton | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸🏾" type="tts">Supahíro: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦸🏿">Bẹtá | Dák Skín Ton | Gud | Supahíro | Supapáwa | Wúmán Híro</annotation>
+ <annotation cp="🦸🏿" type="tts">Supahíro: Dák Skín Ton</annotation>
+ <annotation cp="🦸🏻♂">Bẹtá | Gud | Laít Skín Ton | Man | Man Híro | Mán Supahíro | Supapáwa</annotation>
+ <annotation cp="🦸🏻♂" type="tts">Mán Supahíro: Laít Skín Ton</annotation>
+ <annotation cp="🦸🏼♂">Bẹtá | Gud | Man | Man Híro | Mán Supahíro | Mídíọ́m-Laít Skín Ton | Supapáwa</annotation>
+ <annotation cp="🦸🏼♂" type="tts">Mán Supahíro: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦸🏽♂">Bẹtá | Gud | Man | Man Híro | Mán Supahíro | Mídíọ́m Skín Ton | Supapáwa</annotation>
+ <annotation cp="🦸🏽♂" type="tts">Mán Supahíro: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦸🏾♂">Bẹtá | Gud | Man | Man Híro | Mán Supahíro | Mídíọ́m Dák Skín Ton | Supapáwa</annotation>
+ <annotation cp="🦸🏾♂" type="tts">Mán Supahíro: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦸🏿♂">Bẹtá | Dák Skín Ton | Gud | Man | Man Híro | Mán Supahíro | Supapáwa</annotation>
+ <annotation cp="🦸🏿♂" type="tts">Mán Supahíro: Dák Skín Ton</annotation>
+ <annotation cp="🦸🏻♀">Bẹtá | Gud | Laít Skín Ton | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸🏻♀" type="tts">Wúmán Supahíro: Laít Skín Ton</annotation>
+ <annotation cp="🦸🏼♀">Bẹtá | Gud | Mídíọ́m-Laít Skín Ton | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸🏼♀" type="tts">Wúmán Supahíro: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦸🏽♀">Bẹtá | Gud | Mídíọ́m Skín Ton | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸🏽♀" type="tts">Wúmán Supahíro: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦸🏾♀">Bẹtá | Gud | Mídíọ́m Dák Skín Ton | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸🏾♀" type="tts">Wúmán Supahíro: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦸🏿♀">Bẹtá | Dák Skín Ton | Gud | Supapáwa | Wúman | Wúmán Híro | Wúmán Supahíro</annotation>
+ <annotation cp="🦸🏿♀" type="tts">Wúmán Supahíro: Dák Skín Ton</annotation>
+ <annotation cp="🦹🏻">Ívul | Krímínal | Laít Skín Ton | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹🏻" type="tts">Wíkẹ́d Krímínal: Laít Skín Ton</annotation>
+ <annotation cp="🦹🏼">Ívul | Krímínal | Mídíọ́m-Laít Skín Ton | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹🏼" type="tts">Wíkẹ́d Krímínal: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦹🏽">Ívul | Krímínal | Mídíọ́m Skín Ton | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹🏽" type="tts">Wíkẹ́d Krímínal: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦹🏾">Ívul | Krímínal | Mídíọ́m Dák Skín Ton | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹🏾" type="tts">Wíkẹ́d Krímínal: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦹🏿">Dák Skín Ton | Ívul | Krímínal | Supapáwa | Wíkẹ́d Krímínal</annotation>
+ <annotation cp="🦹🏿" type="tts">Wíkẹ́d Krímínal: Dák Skín Ton</annotation>
+ <annotation cp="🦹🏻♂">Ívul | Krímínal | Laít Skín Ton | Man | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹🏻♂" type="tts">Wíkẹ́d Mán Krímínal: Laít Skín Ton</annotation>
+ <annotation cp="🦹🏼♂">Ívul | Krímínal | Man | Mídíọ́m-Laít Skín Ton | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹🏼♂" type="tts">Wíkẹ́d Mán Krímínal: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦹🏽♂">Ívul | Krímínal | Man | Mídíọ́m Skín Ton | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹🏽♂" type="tts">Wíkẹ́d Mán Krímínal: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦹🏾♂">Ívul | Krímínal | Man | Mídíọ́m Dák Skín Ton | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹🏾♂" type="tts">Wíkẹ́d Mán Krímínal: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦹🏿♂">Dák Skín Ton | Ívul | Krímínal | Man | Wíkẹ́d Mán Krímínal</annotation>
+ <annotation cp="🦹🏿♂" type="tts">Wíkẹ́d Mán Krímínal: Dák Skín Ton</annotation>
+ <annotation cp="🦹🏻♀">Ívul | Krímínal | Laít Skín Ton | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹🏻♀" type="tts">Wíkẹ́d Wúmán Krímínal: Laít Skín Ton</annotation>
+ <annotation cp="🦹🏼♀">Ívul | Krímínal | Mídíọ́m-Laít Skín Ton | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹🏼♀" type="tts">Wíkẹ́d Wúmán Krímínal: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🦹🏽♀">Ívul | Krímínal | Mídíọ́m Skín Ton | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹🏽♀" type="tts">Wíkẹ́d Wúmán Krímínal: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🦹🏾♀">Ívul | Krímínal | Mídíọ́m Dák Skín Ton | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹🏾♀" type="tts">Wíkẹ́d Wúmán Krímínal: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🦹🏿♀">Dák Skín Ton | Ívul | Krímínal | Wíkẹ́d Wúmán Krímínal | Wúman</annotation>
+ <annotation cp="🦹🏿♀" type="tts">Wíkẹ́d Wúmán Krímínal: Dák Skín Ton</annotation>
+ <annotation cp="🧙🏻">Jujúman | Laít Skín Ton | Majíshan | Wich</annotation>
+ <annotation cp="🧙🏻" type="tts">Majíshan: Laít Skín Ton</annotation>
+ <annotation cp="🧙🏼">Jujúman | Majíshan | Mídíọ́m-Laít Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏼" type="tts">Majíshan: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧙🏽">Jujúman | Majíshan | Mídíọ́m Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏽" type="tts">Majíshan: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧙🏾">Jujúman | Majíshan | Mídíọ́m Dák Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏾" type="tts">Majíshan: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧙🏿">Dák Skín Ton | Jujúman | Majíshan | Wich</annotation>
+ <annotation cp="🧙🏿" type="tts">Majíshan: Dák Skín Ton</annotation>
+ <annotation cp="🧙🏻♂">Jujúman | Laít Skín Ton | Majíshan | Man | Mán Majíshan | Wich</annotation>
+ <annotation cp="🧙🏻♂" type="tts">Mán Majíshan: Laít Skín Ton</annotation>
+ <annotation cp="🧙🏼♂">Jujúman | Majíshan | Man | Mán Majíshan | Mídíọ́m-Laít Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏼♂" type="tts">Mán Majíshan: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧙🏽♂">Jujúman | Majíshan | Man | Mán Majíshan | Mídíọ́m Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏽♂" type="tts">Mán Majíshan: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧙🏾♂">Jujúman | Majíshan | Man | Mán Majíshan | Mídíọ́m Dák Skín Ton | Wich</annotation>
+ <annotation cp="🧙🏾♂" type="tts">Mán Majíshan: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧙🏿♂">Dák Skín Ton | Jujúman | Majíshan | Man | Mán Majíshan | Wich</annotation>
+ <annotation cp="🧙🏿♂" type="tts">Mán Majíshan: Dák Skín Ton</annotation>
+ <annotation cp="🧙🏻♀">Jujúwúman | Laít Skín Ton | Majíshan | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙🏻♀" type="tts">Wúmán Majíshan: Laít Skín Ton</annotation>
+ <annotation cp="🧙🏼♀">Jujúwúman | Majíshan | Mídíọ́m-Laít Skín Ton | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙🏼♀" type="tts">Wúmán Majíshan: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧙🏽♀">Jujúwúman | Majíshan | Mídíọ́m Skín Ton | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙🏽♀" type="tts">Wúmán Majíshan: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧙🏾♀">Jujúwúman | Majíshan | Mídíọ́m Dák Skín Ton | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙🏾♀" type="tts">Wúmán Majíshan: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧙🏿♀">Dák Skín Ton | Jujúwúman | Majíshan | Wich | Wúman | Wúmán Majíshan</annotation>
+ <annotation cp="🧙🏿♀" type="tts">Wúmán Majíshan: Dák Skín Ton</annotation>
+ <annotation cp="🧚🏻">Laít Skín Ton | Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚🏻" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin: Laít Skín Ton</annotation>
+ <annotation cp="🧚🏼">Mídíọ́m-Laít Skín Ton | Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚🏼" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧚🏽">Mídíọ́m Skín Ton | Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚🏽" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧚🏾">Mídíọ́m Dák Skín Ton | Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚🏾" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧚🏿">Dák Skín Ton | Óbẹ́rọn | Spírit | Spírit Wé Rizẹ́mbúl Taíní Húmánbin</annotation>
+ <annotation cp="🧚🏿" type="tts">Spírit Wé Rizẹ́mbúl Taíní Húmánbin: Dák Skín Ton</annotation>
+ <annotation cp="🧚🏻♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Laít Skín Ton | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚🏻♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man: Laít Skín Ton</annotation>
+ <annotation cp="🧚🏼♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Mídíọ́m-Laít Skín Ton | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚🏼♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧚🏽♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Mídíọ́m Skín Ton | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚🏽♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧚🏾♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Mídíọ́m Dák Skín Ton | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚🏾♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧚🏿♂">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Man | Dák Skín Ton | Óbẹ́rọn | Spírit</annotation>
+ <annotation cp="🧚🏿♂" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Man: Dák Skín Ton</annotation>
+ <annotation cp="🧚🏻♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Laít Skín Ton | Spírit | Wúman</annotation>
+ <annotation cp="🧚🏻♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán: Laít Skín Ton</annotation>
+ <annotation cp="🧚🏼♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Mídíọ́m-Laít Skín Ton | Spírit | Wúman</annotation>
+ <annotation cp="🧚🏼♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧚🏽♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Mídíọ́m Skín Ton | Spírit | Wúman</annotation>
+ <annotation cp="🧚🏽♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧚🏾♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Mídíọ́m Dák Skín Ton | Spírit | Wúman</annotation>
+ <annotation cp="🧚🏾♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧚🏿♀">Bad | Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán | Dák Skín Ton | Spírit | Wúman</annotation>
+ <annotation cp="🧚🏿♀" type="tts">Bád Spírit Wé Rizẹ́mbúl Smọ́l Wúmán: Dák Skín Ton</annotation>
+ <annotation cp="🧛🏻">Drakúla | Laít Skín Ton | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏻" type="tts">Vámpáya: Laít Skín Ton</annotation>
+ <annotation cp="🧛🏼">Drakúla | Mídíọ́m-Laít Skín Ton | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏼" type="tts">Vámpáya: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧛🏽">Drakúla | Mídíọ́m Skín Ton | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏽" type="tts">Vámpáya: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧛🏾">Drakúla | Mídíọ́m Dák Skín Ton | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏾" type="tts">Vámpáya: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧛🏿">Dák Skín Ton | Drakúla | Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏿" type="tts">Vámpáya: Dák Skín Ton</annotation>
+ <annotation cp="🧛🏻♂">Drakúla | Laít Skín Ton | Mán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏻♂" type="tts">Mán Vámpáya: Laít Skín Ton</annotation>
+ <annotation cp="🧛🏼♂">Drakúla | Mán Vámpáya | Mídíọ́m-Laít Skín Ton | Zombí</annotation>
+ <annotation cp="🧛🏼♂" type="tts">Mán Vámpáya: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧛🏽♂">Drakúla | Mán Vámpáya | Mídíọ́m Skín Ton | Zombí</annotation>
+ <annotation cp="🧛🏽♂" type="tts">Mán Vámpáya: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧛🏾♂">Drakúla | Mán Vámpáya | Mídíọ́m Dák Skín Ton | Zombí</annotation>
+ <annotation cp="🧛🏾♂" type="tts">Mán Vámpáya: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧛🏿♂">Dák Skín Ton | Drakúla | Mán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏿♂" type="tts">Mán Vámpáya: Dák Skín Ton</annotation>
+ <annotation cp="🧛🏻♀">Drakúla | Laít Skín Ton | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏻♀" type="tts">Wúmán Vámpáya: Laít Skín Ton</annotation>
+ <annotation cp="🧛🏼♀">Drakúla | Mídíọ́m-Laít Skín Ton | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏼♀" type="tts">Wúmán Vámpáya: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧛🏽♀">Drakúla | Mídíọ́m Skín Ton | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏽♀" type="tts">Wúmán Vámpáya: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧛🏾♀">Drakúla | Mídíọ́m Dák Skín Ton | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏾♀" type="tts">Wúmán Vámpáya: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧛🏿♀">Dák Skín Ton | Drakúla | Wúmán Vámpáya | Zombí</annotation>
+ <annotation cp="🧛🏿♀" type="tts">Wúmán Vámpáya: Dák Skín Ton</annotation>
+ <annotation cp="🧜🏻">Bád Spírit | Laít Skín Ton | Mamíwọtá | Mán Mamíwọtá | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏻" type="tts">Pẹ́sin Wé Bi Mamíwọtá: Laít Skín Ton</annotation>
+ <annotation cp="🧜🏼">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏼" type="tts">Pẹ́sin Wé Bi Mamíwọtá: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧜🏽">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m Skín Ton | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏽" type="tts">Pẹ́sin Wé Bi Mamíwọtá: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧜🏾">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏾" type="tts">Pẹ́sin Wé Bi Mamíwọtá: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧜🏿">Bád Spírit | Dák Skín Ton | Mamíwọtá | Mán Mamíwọtá | Pẹ́sin Wé Bi Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏿" type="tts">Pẹ́sin Wé Bi Mamíwọtá: Dák Skín Ton</annotation>
+ <annotation cp="🧜🏻♂">Bád Spírit | Laít Skín Ton | Mamíwọtá | Mán Mamíwọtá | Spírit</annotation>
+ <annotation cp="🧜🏻♂" type="tts">Mán Mamíwọtá: Laít Skín Ton</annotation>
+ <annotation cp="🧜🏼♂">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m-Laít Skín Ton | Spírit</annotation>
+ <annotation cp="🧜🏼♂" type="tts">Mán Mamíwọtá: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧜🏽♂">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m Skín Ton | Spírit</annotation>
+ <annotation cp="🧜🏽♂" type="tts">Mán Mamíwọtá: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧜🏾♂">Bád Spírit | Mamíwọtá | Mán Mamíwọtá | Mídíọ́m Dák Skín Ton | Spírit</annotation>
+ <annotation cp="🧜🏾♂" type="tts">Mán Mamíwọtá: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧜🏿♂">Bád Spírit | Dák Skín Ton | Mamíwọtá | Mán Mamíwọtá | Spírit</annotation>
+ <annotation cp="🧜🏿♂" type="tts">Mán Mamíwọtá: Dák Skín Ton</annotation>
+ <annotation cp="🧜🏻♀">Laít Skín Ton | Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏻♀" type="tts">Wúmán Mamíwọtá: Laít Skín Ton</annotation>
+ <annotation cp="🧜🏼♀">Mamíwọtá | Mídíọ́m-Laít Skín Ton | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏼♀" type="tts">Wúmán Mamíwọtá: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧜🏽♀">Mamíwọtá | Mídíọ́m Skín Ton | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏽♀" type="tts">Wúmán Mamíwọtá: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧜🏾♀">Mamíwọtá | Mídíọ́m Dák Skín Ton | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏾♀" type="tts">Wúmán Mamíwọtá: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧜🏿♀">Dák Skín Ton | Mamíwọtá | Wúmán Mamíwọtá</annotation>
+ <annotation cp="🧜🏿♀" type="tts">Wúmán Mamíwọtá: Dák Skín Ton</annotation>
+ <annotation cp="🧝🏻">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Laít Skín Ton | Májik | Sétan</annotation>
+ <annotation cp="🧝🏻" type="tts">Ẹlf: Laít Skín Ton</annotation>
+ <annotation cp="🧝🏼">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m-Laít Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏼" type="tts">Ẹlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧝🏽">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏽" type="tts">Ẹlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧝🏾">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m Dák Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏾" type="tts">Ẹlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧝🏿">Bád Spírit | Dák Skín Ton | Dẹ́vul | Ẹlf | Jujú | Májik | Sétan</annotation>
+ <annotation cp="🧝🏿" type="tts">Ẹlf: Dák Skín Ton</annotation>
+ <annotation cp="🧝🏻♂">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Laít Skín Ton | Májik | Mán Ẹlf | Sétan</annotation>
+ <annotation cp="🧝🏻♂" type="tts">Mán Ẹlf: Laít Skín Ton</annotation>
+ <annotation cp="🧝🏼♂">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mán Ẹlf | Mídíọ́m-Laít Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏼♂" type="tts">Mán Ẹlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧝🏽♂">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mán Ẹlf | Mídíọ́m Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏽♂" type="tts">Mán Ẹlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧝🏾♂">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mán Ẹlf | Mídíọ́m Dák Skín Ton | Sétan</annotation>
+ <annotation cp="🧝🏾♂" type="tts">Mán Ẹlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧝🏿♂">Bád Spírit | Dák Skín Ton | Dẹ́vul | Ẹlf | Jujú | Májik | Mán Ẹlf | Sétan</annotation>
+ <annotation cp="🧝🏿♂" type="tts">Mán Ẹlf: Dák Skín Ton</annotation>
+ <annotation cp="🧝🏻♀">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Laít Skín Ton | Májik | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝🏻♀" type="tts">Wúmán Ẹlf: Laít Skín Ton</annotation>
+ <annotation cp="🧝🏼♀">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m-Laít Skín Ton | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝🏼♀" type="tts">Wúmán Ẹlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧝🏽♀">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m Skín Ton | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝🏽♀" type="tts">Wúmán Ẹlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧝🏾♀">Bád Spírit | Dẹ́vul | Ẹlf | Jujú | Májik | Mídíọ́m Dák Skín Ton | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝🏾♀" type="tts">Wúmán Ẹlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧝🏿♀">Bád Spírit | Dák Skín Ton | Dẹ́vul | Ẹlf | Jujú | Májik | Sétan | Wúmán Ẹlf</annotation>
+ <annotation cp="🧝🏿♀" type="tts">Wúmán Ẹlf: Dák Skín Ton</annotation>
+ <annotation cp="💆🏻">Fes | Laít Skín Ton | Masaj | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆🏻" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí: Laít Skín Ton</annotation>
+ <annotation cp="💆🏼">Fes | Masaj | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆🏼" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💆🏽">Fes | Masaj | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆🏽" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💆🏾">Fes | Masaj | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆🏾" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💆🏿">Dák Skín Ton | Fes | Masaj | Pẹ́sin | Pẹ́sin Wé Dẹm De Masáj Im Bọdí | Salọn</annotation>
+ <annotation cp="💆🏿" type="tts">Pẹ́sin Wé Dẹm De Masáj Im Bọdí: Dák Skín Ton</annotation>
+ <annotation cp="💆🏻♂">Fes | Laít Skín Ton | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Salọn</annotation>
+ <annotation cp="💆🏻♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí: Laít Skín Ton</annotation>
+ <annotation cp="💆🏼♂">Fes | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Mídíọ́m-Laít Skín Ton | Salọn</annotation>
+ <annotation cp="💆🏼♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💆🏽♂">Fes | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Mídíọ́m Skín Ton | Salọn</annotation>
+ <annotation cp="💆🏽♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💆🏾♂">Fes | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Mídíọ́m Dák Skín Ton | Salọn</annotation>
+ <annotation cp="💆🏾♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💆🏿♂">Dák Skín Ton | Fes | Man | Man Wé Dẹm De Masáj Im Bọdí | Masaj | Salọn</annotation>
+ <annotation cp="💆🏿♂" type="tts">Man Wé Dẹm De Masáj Im Bọdí: Dák Skín Ton</annotation>
+ <annotation cp="💆🏻♀">Fes | Laít Skín Ton | Masaj | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆🏻♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí: Laít Skín Ton</annotation>
+ <annotation cp="💆🏼♀">Fes | Masaj | Mídíọ́m-Laít Skín Ton | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆🏼♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💆🏽♀">Fes | Masaj | Mídíọ́m Skín Ton | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆🏽♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💆🏾♀">Fes | Masaj | Mídíọ́m Dák Skín Ton | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆🏾♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💆🏿♀">Dák Skín Ton | Fes | Masaj | Salọn | Wúman | Wúman Wé Dẹm De Masáj Im Bọdí</annotation>
+ <annotation cp="💆🏿♀" type="tts">Wúman Wé Dẹm De Masáj Im Bọdí: Dák Skín Ton</annotation>
+ <annotation cp="💇🏻">Bab | Bába | Bábá Shọp | Laít Skín Ton | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏻" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea: Laít Skín Ton</annotation>
+ <annotation cp="💇🏼">Bab | Bába | Bábá Shọp | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏼" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💇🏽">Bab | Bába | Bábá Shọp | Mídíọ́m Skín Ton | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏽" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💇🏾">Bab | Bába | Bábá Shọp | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏾" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💇🏿">Bab | Bába | Bábá Shọp | Dák Skín Ton | Pẹ́sin Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏿" type="tts">Pẹ́sin Wé Dẹm De Báb Im Hea: Dák Skín Ton</annotation>
+ <annotation cp="💇🏻♂">Bab | Bába | Bábá Shọp | Laít Skín Ton | Man | Man Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏻♂" type="tts">Man Wé Dẹm De Báb Im Hea: Laít Skín Ton</annotation>
+ <annotation cp="💇🏼♂">Bab | Bába | Bábá Shọp | Man | Man Wé Dẹm De Báb Im Hea | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💇🏼♂" type="tts">Man Wé Dẹm De Báb Im Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💇🏽♂">Bab | Bába | Bábá Shọp | Man | Man Wé Dẹm De Báb Im Hea | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💇🏽♂" type="tts">Man Wé Dẹm De Báb Im Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💇🏾♂">Bab | Bába | Bábá Shọp | Man | Man Wé Dẹm De Báb Im Hea | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💇🏾♂" type="tts">Man Wé Dẹm De Báb Im Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💇🏿♂">Bab | Bába | Bábá Shọp | Dák Skín Ton | Man | Man Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏿♂" type="tts">Man Wé Dẹm De Báb Im Hea: Dák Skín Ton</annotation>
+ <annotation cp="💇🏻♀">Bab | Bába | Bábá Shọp | Laít Skín Ton | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏻♀" type="tts">Wúman Wé Dẹm De Báb Im Hea: Laít Skín Ton</annotation>
+ <annotation cp="💇🏼♀">Bab | Bába | Bábá Shọp | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏼♀" type="tts">Wúman Wé Dẹm De Báb Im Hea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💇🏽♀">Bab | Bába | Bábá Shọp | Mídíọ́m Skín Ton | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏽♀" type="tts">Wúman Wé Dẹm De Báb Im Hea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💇🏾♀">Bab | Bába | Bábá Shọp | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏾♀" type="tts">Wúman Wé Dẹm De Báb Im Hea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💇🏿♀">Bab | Bába | Bábá Shọp | Dák Skín Ton | Wúman | Wúman Wé Dẹm De Báb Im Hea</annotation>
+ <annotation cp="💇🏿♀" type="tts">Wúman Wé Dẹm De Báb Im Hea: Dák Skín Ton</annotation>
+ <annotation cp="🚶🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏻" type="tts">Pẹ́sin Wé De Waká: Laít Skín Ton</annotation>
+ <annotation cp="🚶🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏼" type="tts">Pẹ́sin Wé De Waká: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚶🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏽" type="tts">Pẹ́sin Wé De Waká: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚶🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏾" type="tts">Pẹ́sin Wé De Waká: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚶🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏿" type="tts">Pẹ́sin Wé De Waká: Dák Skín Ton</annotation>
+ <annotation cp="🚶🏻♂">Laít Skín Ton | Man | Man Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏻♂" type="tts">Man Wé De Waká: Laít Skín Ton</annotation>
+ <annotation cp="🚶🏼♂">Man | Man Wé De Waká | Mídíọ́m-Laít Skín Ton | Waká</annotation>
+ <annotation cp="🚶🏼♂" type="tts">Man Wé De Waká: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚶🏽♂">Man | Man Wé De Waká | Mídíọ́m Skín Ton | Waká</annotation>
+ <annotation cp="🚶🏽♂" type="tts">Man Wé De Waká: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚶🏾♂">Man | Man Wé De Waká | Mídíọ́m Dák Skín Ton | Waká</annotation>
+ <annotation cp="🚶🏾♂" type="tts">Man Wé De Waká: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚶🏿♂">Dák Skín Ton | Man | Man Wé De Waká | Waká</annotation>
+ <annotation cp="🚶🏿♂" type="tts">Man Wé De Waká: Dák Skín Ton</annotation>
+ <annotation cp="🚶🏻♀">Laít Skín Ton | Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶🏻♀" type="tts">Wúman Wé De Waká: Laít Skín Ton</annotation>
+ <annotation cp="🚶🏼♀">Mídíọ́m-Laít Skín Ton | Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶🏼♀" type="tts">Wúman Wé De Waká: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚶🏽♀">Mídíọ́m Skín Ton | Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶🏽♀" type="tts">Wúman Wé De Waká: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚶🏾♀">Mídíọ́m Dák Skín Ton | Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶🏾♀" type="tts">Wúman Wé De Waká: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚶🏿♀">Dák Skín Ton | Waká | Wúman | Wúman Wé De Waká</annotation>
+ <annotation cp="🚶🏿♀" type="tts">Wúman Wé De Waká: Dák Skín Ton</annotation>
+ <annotation cp="🧍🏻">Laít Skín Ton | Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏻" type="tts">Pẹ́sín Wé De Stánd Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🧍🏼">Mídíọ́m-Laít Skín Ton | Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏼" type="tts">Pẹ́sín Wé De Stánd Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧍🏽">Mídíọ́m Skín Ton | Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏽" type="tts">Pẹ́sín Wé De Stánd Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧍🏾">Mídíọ́m Dák Skín Ton | Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏾" type="tts">Pẹ́sín Wé De Stánd Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧍🏿">Dák Skín Ton | Ọp | Pẹ́sin | Pẹ́sín Wé De Stánd Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏿" type="tts">Pẹ́sín Wé De Stánd Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🧍🏻♂">Laít Skín Ton | Man | Man Wé De Stánd Ọp | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏻♂" type="tts">Man Wé De Stánd Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🧍🏼♂">Man | Man Wé De Stánd Ọp | Mídíọ́m-Laít Skín Ton | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏼♂" type="tts">Man Wé De Stánd Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧍🏽♂">Man | Man Wé De Stánd Ọp | Mídíọ́m Skín Ton | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏽♂" type="tts">Man Wé De Stánd Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧍🏾♂">Man | Man Wé De Stánd Ọp | Mídíọ́m Dák Skín Ton | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏾♂" type="tts">Man Wé De Stánd Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧍🏿♂">Dák Skín Ton | Man | Man Wé De Stánd Ọp | Ọp | Stand | Stánd Ọp</annotation>
+ <annotation cp="🧍🏿♂" type="tts">Man Wé De Stánd Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🧍🏻♀">Laít Skín Ton | Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍🏻♀" type="tts">Wúman Wé De Stánd Ọp: Laít Skín Ton</annotation>
+ <annotation cp="🧍🏼♀">Mídíọ́m-Laít Skín Ton | Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍🏼♀" type="tts">Wúman Wé De Stánd Ọp: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧍🏽♀">Mídíọ́m Skín Ton | Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍🏽♀" type="tts">Wúman Wé De Stánd Ọp: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧍🏾♀">Mídíọ́m Dák Skín Ton | Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍🏾♀" type="tts">Wúman Wé De Stánd Ọp: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧍🏿♀">Dák Skín Ton | Ọp | Stand | Wúman | Wúman Wé De Stánd Ọp</annotation>
+ <annotation cp="🧍🏿♀" type="tts">Wúman Wé De Stánd Ọp: Dák Skín Ton</annotation>
+ <annotation cp="🧎🏻">Daun | Laít Skín Ton | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎🏻" type="tts">Pẹ́sin Wé Níl Daun: Laít Skín Ton</annotation>
+ <annotation cp="🧎🏼">Daun | Mídíọ́m-Laít Skín Ton | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎🏼" type="tts">Pẹ́sin Wé Níl Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧎🏽">Daun | Mídíọ́m Skín Ton | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎🏽" type="tts">Pẹ́sin Wé Níl Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧎🏾">Daun | Mídíọ́m Dák Skín Ton | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎🏾" type="tts">Pẹ́sin Wé Níl Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧎🏿">Dák Skín Ton | Daun | Nil | Pẹ́sin | Pẹ́sin Wé Níl Daun</annotation>
+ <annotation cp="🧎🏿" type="tts">Pẹ́sin Wé Níl Daun: Dák Skín Ton</annotation>
+ <annotation cp="🧎🏻♂">Daun | Laít Skín Ton | Man | Man Wé Níl Daun | Nil</annotation>
+ <annotation cp="🧎🏻♂" type="tts">Man Wé Níl Daun: Laít Skín Ton</annotation>
+ <annotation cp="🧎🏼♂">Daun | Man | Man Wé Níl Daun | Mídíọ́m-Laít Skín Ton | Nil</annotation>
+ <annotation cp="🧎🏼♂" type="tts">Man Wé Níl Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧎🏽♂">Daun | Man | Man Wé Níl Daun | Mídíọ́m Skín Ton | Nil</annotation>
+ <annotation cp="🧎🏽♂" type="tts">Man Wé Níl Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧎🏾♂">Daun | Man | Man Wé Níl Daun | Mídíọ́m Dák Skín Ton | Nil</annotation>
+ <annotation cp="🧎🏾♂" type="tts">Man Wé Níl Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧎🏿♂">Dák Skín Ton | Daun | Man | Man Wé Níl Daun | Nil</annotation>
+ <annotation cp="🧎🏿♂" type="tts">Man Wé Níl Daun: Dák Skín Ton</annotation>
+ <annotation cp="🧎🏻♀">Daun | Laít Skín Ton | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎🏻♀" type="tts">Wúman Wé Níl Daun: Laít Skín Ton</annotation>
+ <annotation cp="🧎🏼♀">Daun | Mídíọ́m-Laít Skín Ton | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎🏼♀" type="tts">Wúman Wé Níl Daun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧎🏽♀">Daun | Mídíọ́m Skín Ton | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎🏽♀" type="tts">Wúman Wé Níl Daun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧎🏾♀">Daun | Mídíọ́m Dák Skín Ton | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎🏾♀" type="tts">Wúman Wé Níl Daun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧎🏿♀">Dák Skín Ton | Daun | Nil | Wúman | Wúman Wé Níl Daun</annotation>
+ <annotation cp="🧎🏿♀" type="tts">Wúman Wé Níl Daun: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🦯">Blaind | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🏻🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🦯">Blaind | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🏼🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🦯">Blaind | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🏽🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🦯">Blaind | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🏾🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🦯">Blaind | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="🧑🏿🦯" type="tts">Pẹ́sin Wit Waít Wọkín-Stik: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🦯">Blaind | Laít Skín Ton | Man | Man Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🏻🦯" type="tts">Man Wit Waít Wọkín-Stik: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🦯">Blaind | Man | Man Wit Waít Wọkín-Stik | Mídíọ́m-Laít Skín Ton | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🏼🦯" type="tts">Man Wit Waít Wọkín-Stik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🦯">Blaind | Man | Man Wit Waít Wọkín-Stik | Mídíọ́m Skín Ton | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🏽🦯" type="tts">Man Wit Waít Wọkín-Stik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🦯">Blaind | Man | Man Wit Waít Wọkín-Stik | Mídíọ́m Dák Skín Ton | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🏾🦯" type="tts">Man Wit Waít Wọkín-Stik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🦯">Blaind | Dák Skín Ton | Man | Man Wit Waít Wọkín-Stik | Waít Wọkín-Stik</annotation>
+ <annotation cp="👨🏿🦯" type="tts">Man Wit Waít Wọkín-Stik: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🦯">Blaind | Laít Skín Ton | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🏻🦯" type="tts">Wúman Wit Waít Wọkín-Stik: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🦯">Blaind | Mídíọ́m-Laít Skín Ton | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🏼🦯" type="tts">Wúman Wit Waít Wọkín-Stik: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🦯">Blaind | Mídíọ́m Skín Ton | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🏽🦯" type="tts">Wúman Wit Waít Wọkín-Stik: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🦯">Blaind | Mídíọ́m Dák Skín Ton | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🏾🦯" type="tts">Wúman Wit Waít Wọkín-Stik: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🦯">Blaind | Dák Skín Ton | Waít Wọkín-Stik | Wúman | Wúman Wit Waít Wọkín-Stik</annotation>
+ <annotation cp="👩🏿🦯" type="tts">Wúman Wit Waít Wọkín-Stik: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🦼">Ẹ́njin | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏻🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🦼">Ẹ́njin | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏼🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🦼">Ẹ́njin | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏽🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🦼">Ẹ́njin | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏾🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🦼">Dák Skín Ton | Ẹ́njin | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏿🦼" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🦼">Ẹ́njin | Laít Skín Ton | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🏻🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🦼">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Mídíọ́m-Laít Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏼🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🦼">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Mídíọ́m Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏽🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🦼">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Mídíọ́m Dák Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏾🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🦼">Dák Skín Ton | Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🏿🦼" type="tts">Man Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🦼">Ẹ́njin | Laít Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏻🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🦼">Ẹ́njin | Mídíọ́m-Laít Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏼🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🦼">Ẹ́njin | Mídíọ́m Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏽🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🦼">Ẹ́njin | Mídíọ́m Dák Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏾🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🦼">Dák Skín Ton | Ẹ́njin | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏿🦼" type="tts">Wúman Wé Dé Fọ Wílchia Wé Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🦽">Ẹ́njin | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏻🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🦽">Ẹ́njin | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏼🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🦽">Ẹ́njin | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏽🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🦽">Ẹ́njin | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏾🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🦽">Dák Skín Ton | Ẹ́njin | Pẹ́sin | Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="🧑🏿🦽" type="tts">Pẹ́sin Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🦽">Ẹ́njin | Laít Skín Ton | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🏻🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🦽">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Mídíọ́m-Laít Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏼🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🦽">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Mídíọ́m Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏽🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏾🦽">Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Mídíọ́m Dák Skín Ton | Wílchia</annotation>
+ <annotation cp="👨🏾🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🦽">Dák Skín Ton | Ẹ́njin | Man | Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin | Wílchia</annotation>
+ <annotation cp="👨🏿🦽" type="tts">Man Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🦽">Ẹ́njin | Laít Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏻🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🦽">Ẹ́njin | Mídíọ́m-Laít Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏼🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🦽">Ẹ́njin | Mídíọ́m Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏽🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏾🦽">Ẹ́njin | Mídíọ́m Dák Skín Ton | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏾🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🦽">Dák Skín Ton | Ẹ́njin | Wílchia | Wúman | Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin</annotation>
+ <annotation cp="👩🏿🦽" type="tts">Wúman Wé Dé Fọ Wílchia Wé Nọ́ Gẹ́t Ẹ́njin: Dák Skín Ton</annotation>
+ <annotation cp="🏃🏻">Laít Skín Ton | Márátọn | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃🏻" type="tts">Pẹ́sin Wé De Rọn: Laít Skín Ton</annotation>
+ <annotation cp="🏃🏼">Márátọn | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃🏼" type="tts">Pẹ́sin Wé De Rọn: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏃🏽">Márátọn | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃🏽" type="tts">Pẹ́sin Wé De Rọn: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏃🏾">Márátọn | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃🏾" type="tts">Pẹ́sin Wé De Rọn: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏃🏿">Dák Skín Ton | Márátọn | Pẹ́sin | Pẹ́sin Wé De Rọn | Run</annotation>
+ <annotation cp="🏃🏿" type="tts">Pẹ́sin Wé De Rọn: Dák Skín Ton</annotation>
+ <annotation cp="🏃🏻♂">Laít Skín Ton | Man | Man Wé De Rọn | Márátọn | Run</annotation>
+ <annotation cp="🏃🏻♂" type="tts">Man Wé De Rọn: Laít Skín Ton</annotation>
+ <annotation cp="🏃🏼♂">Man | Man Wé De Rọn | Márátọn | Mídíọ́m-Laít Skín Ton | Run</annotation>
+ <annotation cp="🏃🏼♂" type="tts">Man Wé De Rọn: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏃🏽♂">Man | Man Wé De Rọn | Márátọn | Mídíọ́m Skín Ton | Run</annotation>
+ <annotation cp="🏃🏽♂" type="tts">Man Wé De Rọn: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏃🏾♂">Man | Man Wé De Rọn | Márátọn | Mídíọ́m Dák Skín Ton | Run</annotation>
+ <annotation cp="🏃🏾♂" type="tts">Man Wé De Rọn: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏃🏿♂">Dák Skín Ton | Man | Man Wé De Rọn | Márátọn | Run</annotation>
+ <annotation cp="🏃🏿♂" type="tts">Man Wé De Rọn: Dák Skín Ton</annotation>
+ <annotation cp="🏃🏻♀">Laít Skín Ton | Márátọn | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃🏻♀" type="tts">Wúman Wé De Rọn: Laít Skín Ton</annotation>
+ <annotation cp="🏃🏼♀">Márátọn | Mídíọ́m-Laít Skín Ton | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃🏼♀" type="tts">Wúman Wé De Rọn: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏃🏽♀">Márátọn | Mídíọ́m Skín Ton | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃🏽♀" type="tts">Wúman Wé De Rọn: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏃🏾♀">Márátọn | Mídíọ́m Dák Skín Ton | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃🏾♀" type="tts">Wúman Wé De Rọn: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏃🏿♀">Dák Skín Ton | Márátọn | Rọn | Wúman | Wúman Wé De Rọn</annotation>
+ <annotation cp="🏃🏿♀" type="tts">Wúman Wé De Rọn: Dák Skín Ton</annotation>
+ <annotation cp="💃🏻">Dans | Laít Skín Ton | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃🏻" type="tts">Wúman Wé De Dans: Laít Skín Ton</annotation>
+ <annotation cp="💃🏼">Dans | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃🏼" type="tts">Wúman Wé De Dans: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="💃🏽">Dans | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃🏽" type="tts">Wúman Wé De Dans: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="💃🏾">Dans | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃🏾" type="tts">Wúman Wé De Dans: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="💃🏿">Dák Skín Ton | Dans | Wúman | Wúman Wé De Dans</annotation>
+ <annotation cp="💃🏿" type="tts">Wúman Wé De Dans: Dák Skín Ton</annotation>
+ <annotation cp="🕺🏻">Dans | Laít Skín Ton | Man | Man Wé De Dans</annotation>
+ <annotation cp="🕺🏻" type="tts">Man Wé De Dans: Laít Skín Ton</annotation>
+ <annotation cp="🕺🏼">Dans | Man | Man Wé De Dans | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕺🏼" type="tts">Man Wé De Dans: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕺🏽">Dans | Man | Man Wé De Dans | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕺🏽" type="tts">Man Wé De Dans: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕺🏾">Dans | Man | Man Wé De Dans | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕺🏾" type="tts">Man Wé De Dans: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕺🏿">Dák Skín Ton | Dans | Man | Man Wé De Dans</annotation>
+ <annotation cp="🕺🏿" type="tts">Man Wé De Dans: Dák Skín Ton</annotation>
+ <annotation cp="🕴🏻">Flot | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴🏻" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea: Laít Skín Ton</annotation>
+ <annotation cp="🕴🏼">Flot | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴🏼" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🕴🏽">Flot | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴🏽" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🕴🏾">Flot | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴🏾" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🕴🏿">Dák Skín Ton | Flot | Pẹ́sin | Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea | Sút-An-Sut</annotation>
+ <annotation cp="🕴🏿" type="tts">Pẹ́sin Wé Wiá Sút-An-Sut An De Flọt Fọ Ea: Dák Skín Ton</annotation>
+ <annotation cp="🧖🏻">Laít Skín Ton | Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏻" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè: Laít Skín Ton</annotation>
+ <annotation cp="🧖🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏼" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧖🏽">Mídíọ́m Skín Ton | Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏽" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧖🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏾" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧖🏿">Dák Skín Ton | Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏿" type="tts">Pẹ́sin Wé Dé Ínsaíd Rum Wiá Stim Dè: Dák Skín Ton</annotation>
+ <annotation cp="🧖🏻♂">Laít Skín Ton | Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏻♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè: Laít Skín Ton</annotation>
+ <annotation cp="🧖🏼♂">Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Mídíọ́m-Laít Skín Ton | Rum | Stim</annotation>
+ <annotation cp="🧖🏼♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧖🏽♂">Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Mídíọ́m Skín Ton | Rum | Stim</annotation>
+ <annotation cp="🧖🏽♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧖🏾♂">Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Mídíọ́m Dák Skín Ton | Rum | Stim</annotation>
+ <annotation cp="🧖🏾♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧖🏿♂">Dák Skín Ton | Man | Man Wé Dé Ínsaíd Rum Wiá Stim Dè | Rum | Stim</annotation>
+ <annotation cp="🧖🏿♂" type="tts">Man Wé Dé Ínsaíd Rum Wiá Stim Dè: Dák Skín Ton</annotation>
+ <annotation cp="🧖🏻♀">Laít Skín Ton | Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖🏻♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè: Laít Skín Ton</annotation>
+ <annotation cp="🧖🏼♀">Mídíọ́m-Laít Skín Ton | Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖🏼♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧖🏽♀">Mídíọ́m Skín Ton | Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖🏽♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧖🏾♀">Mídíọ́m Dák Skín Ton | Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖🏾♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧖🏿♀">Dák Skín Ton | Rum | Stim | Wúman | Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè</annotation>
+ <annotation cp="🧖🏿♀" type="tts">Wúman Wé Dé Ínsaíd Rum Wiá Stim Dè: Dák Skín Ton</annotation>
+ <annotation cp="🧗🏻">Klaimb | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗🏻" type="tts">Pẹ́sin Wé De Klaimb: Laít Skín Ton</annotation>
+ <annotation cp="🧗🏼">Klaimb | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗🏼" type="tts">Pẹ́sin Wé De Klaimb: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧗🏽">Klaimb | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗🏽" type="tts">Pẹ́sin Wé De Klaimb: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧗🏾">Klaimb | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗🏾" type="tts">Pẹ́sin Wé De Klaimb: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧗🏿">Dák Skín Ton | Klaimb | Pẹ́sin | Pẹ́sin Wé De Klaimb</annotation>
+ <annotation cp="🧗🏿" type="tts">Pẹ́sin Wé De Klaimb: Dák Skín Ton</annotation>
+ <annotation cp="🧗🏻♂">Klaimb | Laít Skín Ton | Man | Man Wé De Klaimb</annotation>
+ <annotation cp="🧗🏻♂" type="tts">Man Wé De Klaimb: Laít Skín Ton</annotation>
+ <annotation cp="🧗🏼♂">Klaimb | Man | Man Wé De Klaimb | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧗🏼♂" type="tts">Man Wé De Klaimb: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧗🏽♂">Klaimb | Man | Man Wé De Klaimb | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧗🏽♂" type="tts">Man Wé De Klaimb: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧗🏾♂">Klaimb | Man | Man Wé De Klaimb | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧗🏾♂" type="tts">Man Wé De Klaimb: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧗🏿♂">Dák Skín Ton | Klaimb | Man | Man Wé De Klaimb</annotation>
+ <annotation cp="🧗🏿♂" type="tts">Man Wé De Klaimb: Dák Skín Ton</annotation>
+ <annotation cp="🧗🏻♀">Klaimb | Laít Skín Ton | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗🏻♀" type="tts">Wúman Wé De Klaimb: Laít Skín Ton</annotation>
+ <annotation cp="🧗🏼♀">Klaimb | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗🏼♀" type="tts">Wúman Wé De Klaimb: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧗🏽♀">Klaimb | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗🏽♀" type="tts">Wúman Wé De Klaimb: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧗🏾♀">Klaimb | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗🏾♀" type="tts">Wúman Wé De Klaimb: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧗🏿♀">Dák Skín Ton | Klaimb | Wúman | Wúman Wé De Klaimb</annotation>
+ <annotation cp="🧗🏿♀" type="tts">Wúman Wé De Klaimb: Dák Skín Ton</annotation>
+ <annotation cp="🏇🏻">Họs | Jọkii | Laít Skín Ton | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇🏻" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs: Laít Skín Ton</annotation>
+ <annotation cp="🏇🏼">Họs | Jọkii | Mídíọ́m-Laít Skín Ton | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇🏼" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏇🏽">Họs | Jọkii | Mídíọ́m Skín Ton | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇🏽" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏇🏾">Họs | Jọkii | Mídíọ́m Dák Skín Ton | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇🏾" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏇🏿">Dák Skín Ton | Họs | Jọkii | Pẹ́sin Wé De Rọ́n Wit Họs | Rọn</annotation>
+ <annotation cp="🏇🏿" type="tts">Pẹ́sin Wé De Rọ́n Wit Họs: Dák Skín Ton</annotation>
+ <annotation cp="🏂🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂🏻" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno: Laít Skín Ton</annotation>
+ <annotation cp="🏂🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂🏼" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏂🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂🏽" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏂🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂🏾" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏂🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno | Raid | Sno | Wúdín-Bọd</annotation>
+ <annotation cp="🏂🏿" type="tts">Pẹ́sin Wé De Raíd Wúdín-Bọd Ọn Tọ́p Sno: Dák Skín Ton</annotation>
+ <annotation cp="🏌🏻">Bọl | Gọlf | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏻" type="tts">Pẹ́sin Wé De Plé Gọlf: Laít Skín Ton</annotation>
+ <annotation cp="🏌🏼">Bọl | Gọlf | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏼" type="tts">Pẹ́sin Wé De Plé Gọlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏌🏽">Bọl | Gọlf | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏽" type="tts">Pẹ́sin Wé De Plé Gọlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏌🏾">Bọl | Gọlf | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏾" type="tts">Pẹ́sin Wé De Plé Gọlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏌🏿">Bọl | Dák Skín Ton | Gọlf | Pẹ́sin | Pẹ́sin Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏿" type="tts">Pẹ́sin Wé De Plé Gọlf: Dák Skín Ton</annotation>
+ <annotation cp="🏌🏻♂">Bọl | Gọlf | Laít Skín Ton | Man | Man Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏻♂" type="tts">Man Wé De Plé Gọlf: Laít Skín Ton</annotation>
+ <annotation cp="🏌🏼♂">Bọl | Gọlf | Man | Man Wé De Plé Gọlf | Mídíọ́m-Laít Skín Ton | Ple</annotation>
+ <annotation cp="🏌🏼♂" type="tts">Man Wé De Plé Gọlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏌🏽♂">Bọl | Gọlf | Man | Man Wé De Plé Gọlf | Mídíọ́m Skín Ton | Ple</annotation>
+ <annotation cp="🏌🏽♂" type="tts">Man Wé De Plé Gọlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏌🏾♂">Bọl | Gọlf | Man | Man Wé De Plé Gọlf | Mídíọ́m Dák Skín Ton | Ple</annotation>
+ <annotation cp="🏌🏾♂" type="tts">Man Wé De Plé Gọlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏌🏿♂">Bọl | Dák Skín Ton | Gọlf | Man | Man Wé De Plé Gọlf | Ple</annotation>
+ <annotation cp="🏌🏿♂" type="tts">Man Wé De Plé Gọlf: Dák Skín Ton</annotation>
+ <annotation cp="🏌🏻♀">Bọl | Gọlf | Laít Skín Ton | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌🏻♀" type="tts">Wúman Wé De Plé Gọlf: Laít Skín Ton</annotation>
+ <annotation cp="🏌🏼♀">Bọl | Gọlf | Mídíọ́m-Laít Skín Ton | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌🏼♀" type="tts">Wúman Wé De Plé Gọlf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏌🏽♀">Bọl | Gọlf | Mídíọ́m Skín Ton | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌🏽♀" type="tts">Wúman Wé De Plé Gọlf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏌🏾♀">Bọl | Gọlf | Mídíọ́m Dák Skín Ton | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌🏾♀" type="tts">Wúman Wé De Plé Gọlf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏌🏿♀">Bọl | Dák Skín Ton | Gọlf | Ple | Wúman | Wúman Wé De Plé Gọlf</annotation>
+ <annotation cp="🏌🏿♀" type="tts">Wúman Wé De Plé Gọlf: Dák Skín Ton</annotation>
+ <annotation cp="🏄🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏻" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd: Laít Skín Ton</annotation>
+ <annotation cp="🏄🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏼" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏄🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏽" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏄🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏾" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏄🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏿" type="tts">Pẹ́sin Wé De Raíd Wọtá Sọ́fín-Bọd: Dák Skín Ton</annotation>
+ <annotation cp="🏄🏻♂">Laít Skín Ton | Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏻♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd: Laít Skín Ton</annotation>
+ <annotation cp="🏄🏼♂">Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Mídíọ́m-Laít Skín Ton | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏼♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏄🏽♂">Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Mídíọ́m Skín Ton | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏽♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏄🏾♂">Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Mídíọ́m Dák Skín Ton | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏾♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏄🏿♂">Dák Skín Ton | Man | Man Wé De Raíd Wọtá Sọ́fín-Bọd | Raid | Sọ́f</annotation>
+ <annotation cp="🏄🏿♂" type="tts">Man Wé De Raíd Wọtá Sọ́fín-Bọd: Dák Skín Ton</annotation>
+ <annotation cp="🏄🏻♀">Laít Skín Ton | Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄🏻♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd: Laít Skín Ton</annotation>
+ <annotation cp="🏄🏼♀">Mídíọ́m-Laít Skín Ton | Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄🏼♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏄🏽♀">Mídíọ́m Skín Ton | Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄🏽♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏄🏾♀">Mídíọ́m Dák Skín Ton | Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄🏾♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏄🏿♀">Dák Skín Ton | Raid | Sọ́f | Wúman | Wúman Wé De Raíd Wọtá Sọ́fín-Bọd</annotation>
+ <annotation cp="🏄🏿♀" type="tts">Wúman Wé De Raíd Wọtá Sọ́fín-Bọd: Dák Skín Ton</annotation>
+ <annotation cp="🚣🏻">Bot | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏻" type="tts">Pẹ́sin Wé De Ró Bot: Laít Skín Ton</annotation>
+ <annotation cp="🚣🏼">Bot | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏼" type="tts">Pẹ́sin Wé De Ró Bot: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚣🏽">Bot | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏽" type="tts">Pẹ́sin Wé De Ró Bot: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚣🏾">Bot | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏾" type="tts">Pẹ́sin Wé De Ró Bot: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚣🏿">Bot | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏿" type="tts">Pẹ́sin Wé De Ró Bot: Dák Skín Ton</annotation>
+ <annotation cp="🚣🏻♂">Bot | Laít Skín Ton | Man | Man Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏻♂" type="tts">Man Wé De Ró Bot: Laít Skín Ton</annotation>
+ <annotation cp="🚣🏼♂">Bot | Man | Man Wé De Ró Bot | Mídíọ́m-Laít Skín Ton | Ró bot</annotation>
+ <annotation cp="🚣🏼♂" type="tts">Man Wé De Ró Bot: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚣🏽♂">Bot | Man | Man Wé De Ró Bot | Mídíọ́m Skín Ton | Ró bot</annotation>
+ <annotation cp="🚣🏽♂" type="tts">Man Wé De Ró Bot: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚣🏾♂">Bot | Man | Man Wé De Ró Bot | Mídíọ́m Dák Skín Ton | Ró bot</annotation>
+ <annotation cp="🚣🏾♂" type="tts">Man Wé De Ró Bot: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚣🏿♂">Bot | Dák Skín Ton | Man | Man Wé De Ró Bot | Ró bot</annotation>
+ <annotation cp="🚣🏿♂" type="tts">Man Wé De Ró Bot: Dák Skín Ton</annotation>
+ <annotation cp="🚣🏻♀">Bot | Laít Skín Ton | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣🏻♀" type="tts">Wúman Wé De Ró Bot: Laít Skín Ton</annotation>
+ <annotation cp="🚣🏼♀">Bot | Mídíọ́m-Laít Skín Ton | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣🏼♀" type="tts">Wúman Wé De Ró Bot: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚣🏽♀">Bot | Mídíọ́m Skín Ton | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣🏽♀" type="tts">Wúman Wé De Ró Bot: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚣🏾♀">Bot | Mídíọ́m Dák Skín Ton | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣🏾♀" type="tts">Wúman Wé De Ró Bot: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚣🏿♀">Bot | Dák Skín Ton | Ró bot | Wúman | Wúman Wé De Ró Bot</annotation>
+ <annotation cp="🚣🏿♀" type="tts">Wúman Wé De Ró Bot: Dák Skín Ton</annotation>
+ <annotation cp="🏊🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏻" type="tts">Pẹ́sin Wé De Swim: Laít Skín Ton</annotation>
+ <annotation cp="🏊🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏼" type="tts">Pẹ́sin Wé De Swim: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏊🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏽" type="tts">Pẹ́sin Wé De Swim: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏊🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏾" type="tts">Pẹ́sin Wé De Swim: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏊🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏿" type="tts">Pẹ́sin Wé De Swim: Dák Skín Ton</annotation>
+ <annotation cp="🏊🏻♂">Laít Skín Ton | Man | Man Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏻♂" type="tts">Man Wé De Swim: Laít Skín Ton</annotation>
+ <annotation cp="🏊🏼♂">Man | Man Wé De Swim | Mídíọ́m-Laít Skín Ton | Swim | Wọta</annotation>
+ <annotation cp="🏊🏼♂" type="tts">Man Wé De Swim: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏊🏽♂">Man | Man Wé De Swim | Mídíọ́m Skín Ton | Swim | Wọta</annotation>
+ <annotation cp="🏊🏽♂" type="tts">Man Wé De Swim: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏊🏾♂">Man | Man Wé De Swim | Mídíọ́m Dák Skín Ton | Swim | Wọta</annotation>
+ <annotation cp="🏊🏾♂" type="tts">Man Wé De Swim: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏊🏿♂">Dák Skín Ton | Man | Man Wé De Swim | Swim | Wọta</annotation>
+ <annotation cp="🏊🏿♂" type="tts">Man Wé De Swim: Dák Skín Ton</annotation>
+ <annotation cp="🏊🏻♀">Laít Skín Ton | Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊🏻♀" type="tts">Wúman Wé De Swim: Laít Skín Ton</annotation>
+ <annotation cp="🏊🏼♀">Mídíọ́m-Laít Skín Ton | Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊🏼♀" type="tts">Wúman Wé De Swim: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏊🏽♀">Mídíọ́m Skín Ton | Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊🏽♀" type="tts">Wúman Wé De Swim: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏊🏾♀">Mídíọ́m Dák Skín Ton | Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊🏾♀" type="tts">Wúman Wé De Swim: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏊🏿♀">Dák Skín Ton | Swim | Wọta | Wúman | Wúman Wé De Swim</annotation>
+ <annotation cp="🏊🏿♀" type="tts">Wúman Wé De Swim: Dák Skín Ton</annotation>
+ <annotation cp="⛹🏻">Bauns | Bọl | Graun | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏻" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun: Laít Skín Ton</annotation>
+ <annotation cp="⛹🏼">Bauns | Bọl | Graun | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏼" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="⛹🏽">Bauns | Bọl | Graun | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏽" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="⛹🏾">Bauns | Bọl | Graun | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏾" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="⛹🏿">Bauns | Bọl | Dák Skín Ton | Graun | Pẹ́sin | Pẹ́sin Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏿" type="tts">Pẹ́sin Wé De Baúns Bọl Fọ Graun: Dák Skín Ton</annotation>
+ <annotation cp="⛹🏻♂">Bauns | Bọl | Graun | Laít Skín Ton | Man | Man Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏻♂" type="tts">Man Wé De Baúns Bọl Fọ Graun: Laít Skín Ton</annotation>
+ <annotation cp="⛹🏼♂">Bauns | Bọl | Graun | Man | Man Wé De Baúns Bọl Fọ Graun | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="⛹🏼♂" type="tts">Man Wé De Baúns Bọl Fọ Graun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="⛹🏽♂">Bauns | Bọl | Graun | Man | Man Wé De Baúns Bọl Fọ Graun | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="⛹🏽♂" type="tts">Man Wé De Baúns Bọl Fọ Graun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="⛹🏾♂">Bauns | Bọl | Graun | Man | Man Wé De Baúns Bọl Fọ Graun | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="⛹🏾♂" type="tts">Man Wé De Baúns Bọl Fọ Graun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="⛹🏿♂">Bauns | Bọl | Dák Skín Ton | Graun | Man | Man Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏿♂" type="tts">Man Wé De Baúns Bọl Fọ Graun: Dák Skín Ton</annotation>
+ <annotation cp="⛹🏻♀">Bauns | Bọl | Graun | Laít Skín Ton | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏻♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun: Laít Skín Ton</annotation>
+ <annotation cp="⛹🏼♀">Bauns | Bọl | Graun | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏼♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="⛹🏽♀">Bauns | Bọl | Graun | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏽♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="⛹🏾♀">Bauns | Bọl | Graun | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏾♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="⛹🏿♀">Bauns | Bọl | Dák Skín Ton | Graun | Wúman | Wúman Wé De Baúns Bọl Fọ Graun</annotation>
+ <annotation cp="⛹🏿♀" type="tts">Wúman Wé De Baúns Bọl Fọ Graun: Dák Skín Ton</annotation>
+ <annotation cp="🏋🏻">Laít Skín Ton | Lift | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏻" type="tts">Pẹ́sin Wé De Líft Wẹt: Laít Skín Ton</annotation>
+ <annotation cp="🏋🏼">Lift | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏼" type="tts">Pẹ́sin Wé De Líft Wẹt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏋🏽">Lift | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏽" type="tts">Pẹ́sin Wé De Líft Wẹt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏋🏾">Lift | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏾" type="tts">Pẹ́sin Wé De Líft Wẹt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏋🏿">Dák Skín Ton | Lift | Pẹ́sin | Pẹ́sin Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏿" type="tts">Pẹ́sin Wé De Líft Wẹt: Dák Skín Ton</annotation>
+ <annotation cp="🏋🏻♂">Laít Skín Ton | Lift | Man | Man Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏻♂" type="tts">Man Wé De Líft Wẹt: Laít Skín Ton</annotation>
+ <annotation cp="🏋🏼♂">Lift | Man | Man Wé De Líft Wẹt | Mídíọ́m-Laít Skín Ton | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏼♂" type="tts">Man Wé De Líft Wẹt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏋🏽♂">Lift | Man | Man Wé De Líft Wẹt | Mídíọ́m Skín Ton | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏽♂" type="tts">Man Wé De Líft Wẹt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏋🏾♂">Lift | Man | Man Wé De Líft Wẹt | Mídíọ́m Dák Skín Ton | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏾♂" type="tts">Man Wé De Líft Wẹt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏋🏿♂">Dák Skín Ton | Lift | Man | Man Wé De Líft Wẹt | Wẹt | Wẹ́t Lífta</annotation>
+ <annotation cp="🏋🏿♂" type="tts">Man Wé De Líft Wẹt: Dák Skín Ton</annotation>
+ <annotation cp="🏋🏻♀">Laít Skín Ton | Lift | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋🏻♀" type="tts">Wúman Wé De Líft Wẹt: Laít Skín Ton</annotation>
+ <annotation cp="🏋🏼♀">Lift | Mídíọ́m-Laít Skín Ton | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋🏼♀" type="tts">Wúman Wé De Líft Wẹt: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🏋🏽♀">Lift | Mídíọ́m Skín Ton | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋🏽♀" type="tts">Wúman Wé De Líft Wẹt: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🏋🏾♀">Lift | Mídíọ́m Dák Skín Ton | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋🏾♀" type="tts">Wúman Wé De Líft Wẹt: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🏋🏿♀">Dák Skín Ton | Lift | Wẹt | Wẹ́t Lífta | Wúman | Wúman Wé De Líft Wẹt</annotation>
+ <annotation cp="🏋🏿♀" type="tts">Wúman Wé De Líft Wẹt: Dák Skín Ton</annotation>
+ <annotation cp="🚴🏻">Bísíkul | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏻" type="tts">Pẹ́sin Wé De Raíd Baísíkul: Laít Skín Ton</annotation>
+ <annotation cp="🚴🏼">Bísíkul | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏼" type="tts">Pẹ́sin Wé De Raíd Baísíkul: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚴🏽">Bísíkul | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏽" type="tts">Pẹ́sin Wé De Raíd Baísíkul: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚴🏾">Bísíkul | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏾" type="tts">Pẹ́sin Wé De Raíd Baísíkul: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚴🏿">Bísíkul | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏿" type="tts">Pẹ́sin Wé De Raíd Baísíkul: Dák Skín Ton</annotation>
+ <annotation cp="🚴🏻♂">Bísíkul | Laít Skín Ton | Man | Man Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏻♂" type="tts">Man Wé De Raíd Baísíkul: Laít Skín Ton</annotation>
+ <annotation cp="🚴🏼♂">Bísíkul | Man | Man Wé De Raíd Baísíkul | Mídíọ́m-Laít Skín Ton | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏼♂" type="tts">Man Wé De Raíd Baísíkul: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚴🏽♂">Bísíkul | Man | Man Wé De Raíd Baísíkul | Mídíọ́m Skín Ton | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏽♂" type="tts">Man Wé De Raíd Baísíkul: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚴🏾♂">Bísíkul | Man | Man Wé De Raíd Baísíkul | Mídíọ́m Dák Skín Ton | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏾♂" type="tts">Man Wé De Raíd Baísíkul: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚴🏿♂">Bísíkul | Dák Skín Ton | Man | Man Wé De Raíd Baísíkul | Raid | Saiklist</annotation>
+ <annotation cp="🚴🏿♂" type="tts">Man Wé De Raíd Baísíkul: Dák Skín Ton</annotation>
+ <annotation cp="🚴🏻♀">Bísíkul | Laít Skín Ton | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴🏻♀" type="tts">Wúman Wé De Raíd Baísíkul: Laít Skín Ton</annotation>
+ <annotation cp="🚴🏼♀">Bísíkul | Mídíọ́m-Laít Skín Ton | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴🏼♀" type="tts">Wúman Wé De Raíd Baísíkul: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚴🏽♀">Bísíkul | Mídíọ́m Skín Ton | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴🏽♀" type="tts">Wúman Wé De Raíd Baísíkul: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚴🏾♀">Bísíkul | Mídíọ́m Dák Skín Ton | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴🏾♀" type="tts">Wúman Wé De Raíd Baísíkul: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚴🏿♀">Bísíkul | Dák Skín Ton | Raid | Saiklist | Wúman | Wúman Wé De Raíd Baísíkul</annotation>
+ <annotation cp="🚴🏿♀" type="tts">Wúman Wé De Raíd Baísíkul: Dák Skín Ton</annotation>
+ <annotation cp="🚵🏻">Baísíkul | Laít Skín Ton | Maúntin | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵🏻" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Laít Skín Ton</annotation>
+ <annotation cp="🚵🏼">Baísíkul | Maúntin | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵🏼" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚵🏽">Baísíkul | Maúntin | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵🏽" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚵🏾">Baísíkul | Maúntin | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵🏾" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚵🏿">Baísíkul | Dák Skín Ton | Maúntin | Pẹ́sin | Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Raid</annotation>
+ <annotation cp="🚵🏿" type="tts">Pẹ́sin Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Dák Skín Ton</annotation>
+ <annotation cp="🚵🏻♂">Baísíkul | Laít Skín Ton | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Raíd</annotation>
+ <annotation cp="🚵🏻♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Laít Skín Ton</annotation>
+ <annotation cp="🚵🏼♂">Baísíkul | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Mídíọ́m-Laít Skín Ton | Raíd</annotation>
+ <annotation cp="🚵🏼♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚵🏽♂">Baísíkul | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Mídíọ́m Skín Ton | Raíd</annotation>
+ <annotation cp="🚵🏽♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚵🏾♂">Baísíkul | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Mídíọ́m Dák Skín Ton | Raíd</annotation>
+ <annotation cp="🚵🏾♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚵🏿♂">Baísíkul | Dák Skín Ton | Man | Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin | Maúntin | Raíd</annotation>
+ <annotation cp="🚵🏿♂" type="tts">Man Wé De Raíd Baísíkul Ọn Tọ́p Maúntin: Dák Skín Ton</annotation>
+ <annotation cp="🚵🏻♀">Baísíkul | Laít Skín Ton | Maúntin | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵🏻♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin: Laít Skín Ton</annotation>
+ <annotation cp="🚵🏼♀">Baísíkul | Maúntin | Mídíọ́m-Laít Skín Ton | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵🏼♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🚵🏽♀">Baísíkul | Maúntin | Mídíọ́m Skín Ton | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵🏽♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🚵🏾♀">Baísíkul | Maúntin | Mídíọ́m Dák Skín Ton | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵🏾♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🚵🏿♀">Baísíkul | Dák Skín Ton | Maúntin | Raíd | Wúman | Wúman De Raíd Baísíkul Fọ Maúntin</annotation>
+ <annotation cp="🚵🏿♀" type="tts">Wúman De Raíd Baísíkul Fọ Maúntin: Dák Skín Ton</annotation>
+ <annotation cp="🤸🏻">Kátwil | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏻" type="tts">Pẹ́sin Wé De Dú Kátwil: Laít Skín Ton</annotation>
+ <annotation cp="🤸🏼">Kátwil | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏼" type="tts">Pẹ́sin Wé De Dú Kátwil: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤸🏽">Kátwil | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏽" type="tts">Pẹ́sin Wé De Dú Kátwil: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤸🏾">Kátwil | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏾" type="tts">Pẹ́sin Wé De Dú Kátwil: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤸🏿">Dák Skín Ton | Kátwil | Pẹ́sin | Pẹ́sin Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏿" type="tts">Pẹ́sin Wé De Dú Kátwil: Dák Skín Ton</annotation>
+ <annotation cp="🤸🏻♂">Kátwil | Laít Skín Ton | Man | Man Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏻♂" type="tts">Man Wé De Dú Kátwil: Laít Skín Ton</annotation>
+ <annotation cp="🤸🏼♂">Kátwil | Man | Man Wé De Dú Kátwil | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤸🏼♂" type="tts">Man Wé De Dú Kátwil: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤸🏽♂">Kátwil | Man | Man Wé De Dú Kátwil | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤸🏽♂" type="tts">Man Wé De Dú Kátwil: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤸🏾♂">Kátwil | Man | Man Wé De Dú Kátwil | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤸🏾♂" type="tts">Man Wé De Dú Kátwil: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤸🏿♂">Dák Skín Ton | Kátwil | Man | Man Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏿♂" type="tts">Man Wé De Dú Kátwil: Dák Skín Ton</annotation>
+ <annotation cp="🤸🏻♀">Kátwil | Laít Skín Ton | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏻♀" type="tts">Wúman Wé De Dú Kátwil: Laít Skín Ton</annotation>
+ <annotation cp="🤸🏼♀">Kátwil | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏼♀" type="tts">Wúman Wé De Dú Kátwil: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤸🏽♀">Kátwil | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏽♀" type="tts">Wúman Wé De Dú Kátwil: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤸🏾♀">Kátwil | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏾♀" type="tts">Wúman Wé De Dú Kátwil: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤸🏿♀">Dák Skín Ton | Kátwil | Wúman | Wúman Wé De Dú Kátwil</annotation>
+ <annotation cp="🤸🏿♀" type="tts">Wúman Wé De Dú Kátwil: Dák Skín Ton</annotation>
+ <annotation cp="🤽🏻">Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏻" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló: Laít Skín Ton</annotation>
+ <annotation cp="🤽🏼">Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏼" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤽🏽">Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏽" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤽🏾">Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏾" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤽🏿">Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏿" type="tts">Pẹ́sin Wé De Plé Wọ́tá Poló: Dák Skín Ton</annotation>
+ <annotation cp="🤽🏻♂">Laít Skín Ton | Man | Man Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏻♂" type="tts">Man Wé De Plé Wọ́tá Poló: Laít Skín Ton</annotation>
+ <annotation cp="🤽🏼♂">Man | Man Wé De Plé Wọ́tá Poló | Mídíọ́m-Laít Skín Ton | Poló | Wọta</annotation>
+ <annotation cp="🤽🏼♂" type="tts">Man Wé De Plé Wọ́tá Poló: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤽🏽♂">Man | Man Wé De Plé Wọ́tá Poló | Mídíọ́m Skín Ton | Poló | Wọta</annotation>
+ <annotation cp="🤽🏽♂" type="tts">Man Wé De Plé Wọ́tá Poló: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤽🏾♂">Man | Man Wé De Plé Wọ́tá Poló | Mídíọ́m Dák Skín Ton | Poló | Wọta</annotation>
+ <annotation cp="🤽🏾♂" type="tts">Man Wé De Plé Wọ́tá Poló: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤽🏿♂">Dák Skín Ton | Man | Man Wé De Plé Wọ́tá Poló | Poló | Wọta</annotation>
+ <annotation cp="🤽🏿♂" type="tts">Man Wé De Plé Wọ́tá Poló: Dák Skín Ton</annotation>
+ <annotation cp="🤽🏻♀">Laít Skín Ton | Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽🏻♀" type="tts">Wúman Wé De Plé Wọ́tá Poló: Laít Skín Ton</annotation>
+ <annotation cp="🤽🏼♀">Mídíọ́m-Laít Skín Ton | Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽🏼♀" type="tts">Wúman Wé De Plé Wọ́tá Poló: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤽🏽♀">Mídíọ́m Skín Ton | Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽🏽♀" type="tts">Wúman Wé De Plé Wọ́tá Poló: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤽🏾♀">Mídíọ́m Dák Skín Ton | Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽🏾♀" type="tts">Wúman Wé De Plé Wọ́tá Poló: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤽🏿♀">Dák Skín Ton | Poló | Wọta | Wúman | Wúman Wé De Plé Wọ́tá Poló</annotation>
+ <annotation cp="🤽🏿♀" type="tts">Wúman Wé De Plé Wọ́tá Poló: Dák Skín Ton</annotation>
+ <annotation cp="🤾🏻">Hándbọl | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏻" type="tts">Pẹ́sin Wé De Plé Hándbọl: Laít Skín Ton</annotation>
+ <annotation cp="🤾🏼">Hándbọl | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏼" type="tts">Pẹ́sin Wé De Plé Hándbọl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤾🏽">Hándbọl | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏽" type="tts">Pẹ́sin Wé De Plé Hándbọl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤾🏾">Hándbọl | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏾" type="tts">Pẹ́sin Wé De Plé Hándbọl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤾🏿">Dák Skín Ton | Hándbọl | Pẹ́sin | Pẹ́sin Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏿" type="tts">Pẹ́sin Wé De Plé Hándbọl: Dák Skín Ton</annotation>
+ <annotation cp="🤾🏻♂">Hándbọl | Laít Skín Ton | Man | Man Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏻♂" type="tts">Man Wé De Plé Hándbọl: Laít Skín Ton</annotation>
+ <annotation cp="🤾🏼♂">Hándbọl | Man | Man Wé De Plé Hándbọl | Mídíọ́m-Laít Skín Ton | Ple</annotation>
+ <annotation cp="🤾🏼♂" type="tts">Man Wé De Plé Hándbọl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤾🏽♂">Hándbọl | Man | Man Wé De Plé Hándbọl | Mídíọ́m Skín Ton | Ple</annotation>
+ <annotation cp="🤾🏽♂" type="tts">Man Wé De Plé Hándbọl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤾🏾♂">Hándbọl | Man | Man Wé De Plé Hándbọl | Mídíọ́m Dák Skín Ton | Ple</annotation>
+ <annotation cp="🤾🏾♂" type="tts">Man Wé De Plé Hándbọl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤾🏿♂">Dák Skín Ton | Hándbọl | Man | Man Wé De Plé Hándbọl | Ple</annotation>
+ <annotation cp="🤾🏿♂" type="tts">Man Wé De Plé Hándbọl: Dák Skín Ton</annotation>
+ <annotation cp="🤾🏻♀">Hándbọl | Laít Skín Ton | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾🏻♀" type="tts">Wúman Wé De Plé Hándbọl: Laít Skín Ton</annotation>
+ <annotation cp="🤾🏼♀">Hándbọl | Mídíọ́m-Laít Skín Ton | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾🏼♀" type="tts">Wúman Wé De Plé Hándbọl: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤾🏽♀">Hándbọl | Mídíọ́m Skín Ton | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾🏽♀" type="tts">Wúman Wé De Plé Hándbọl: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤾🏾♀">Hándbọl | Mídíọ́m Dák Skín Ton | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾🏾♀" type="tts">Wúman Wé De Plé Hándbọl: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤾🏿♀">Dák Skín Ton | Hándbọl | Ple | Wúman | Wúman Wé De Plé Hándbọl</annotation>
+ <annotation cp="🤾🏿♀" type="tts">Wúman Wé De Plé Hándbọl: Dák Skín Ton</annotation>
+ <annotation cp="🤹🏻">Jọ́gul | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏻" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm: Laít Skín Ton</annotation>
+ <annotation cp="🤹🏼">Jọ́gul | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏼" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤹🏽">Jọ́gul | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏽" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤹🏾">Jọ́gul | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏾" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤹🏿">Dák Skín Ton | Jọ́gul | Pẹ́sin | Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏿" type="tts">Pẹ́sin Wé De Jọ́gúl Bọl-Dẹm: Dák Skín Ton</annotation>
+ <annotation cp="🤹🏻♂">Jọ́gul | Laít Skín Ton | Man | Man Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏻♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm: Laít Skín Ton</annotation>
+ <annotation cp="🤹🏼♂">Jọ́gul | Man | Man Wé De Jọ́gúl Bọl-Dẹm | Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤹🏼♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤹🏽♂">Jọ́gul | Man | Man Wé De Jọ́gúl Bọl-Dẹm | Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤹🏽♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤹🏾♂">Jọ́gul | Man | Man Wé De Jọ́gúl Bọl-Dẹm | Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤹🏾♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤹🏿♂">Dák Skín Ton | Jọ́gul | Man | Man Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏿♂" type="tts">Man Wé De Jọ́gúl Bọl-Dẹm: Dák Skín Ton</annotation>
+ <annotation cp="🤹🏻♀">Jọ́gul | Laít Skín Ton | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏻♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm: Laít Skín Ton</annotation>
+ <annotation cp="🤹🏼♀">Jọ́gul | Mídíọ́m-Laít Skín Ton | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏼♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🤹🏽♀">Jọ́gul | Mídíọ́m Skín Ton | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏽♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🤹🏾♀">Jọ́gul | Mídíọ́m Dák Skín Ton | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏾♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🤹🏿♀">Dák Skín Ton | Jọ́gul | Wúman | Wúman Wé De Jọ́gúl Bọl-Dẹm</annotation>
+ <annotation cp="🤹🏿♀" type="tts">Wúman Wé De Jọ́gúl Bọl-Dẹm: Dák Skín Ton</annotation>
+ <annotation cp="🧘🏻">Graun | Laít Skín Ton | Lótus | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏻" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Laít Skín Ton</annotation>
+ <annotation cp="🧘🏼">Graun | Lótus | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏼" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧘🏽">Graun | Lótus | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏽" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧘🏾">Graun | Lótus | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏾" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧘🏿">Dák Skín Ton | Graun | Lótus | Pẹ́sin | Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏿" type="tts">Pẹ́sin Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Dák Skín Ton</annotation>
+ <annotation cp="🧘🏻♂">Graun | Laít Skín Ton | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏻♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Laít Skín Ton</annotation>
+ <annotation cp="🧘🏼♂">Graun | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Mídíọ́m-Laít Skín Ton | Sidọn</annotation>
+ <annotation cp="🧘🏼♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧘🏽♂">Graun | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Mídíọ́m Skín Ton | Sidọn</annotation>
+ <annotation cp="🧘🏽♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧘🏾♂">Graun | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Mídíọ́m Dák Skín Ton | Sidọn</annotation>
+ <annotation cp="🧘🏾♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧘🏿♂">Dák Skín Ton | Graun | Lótus | Man | Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè | Sidọn</annotation>
+ <annotation cp="🧘🏿♂" type="tts">Man Wé Sidọ́n Fọ Graun Fọ Lótús Wè: Dák Skín Ton</annotation>
+ <annotation cp="🧘🏻♀">Graun | Laít Skín Ton | Lótus | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘🏻♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè: Laít Skín Ton</annotation>
+ <annotation cp="🧘🏼♀">Graun | Lótus | Mídíọ́m-Laít Skín Ton | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘🏼♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧘🏽♀">Graun | Lótus | Mídíọ́m Skín Ton | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘🏽♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧘🏾♀">Graun | Lótus | Mídíọ́m Dák Skín Ton | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘🏾♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧘🏿♀">Dák Skín Ton | Graun | Lótus | Sidọn | Wúman | Wúman Sidọ́n Fọ Graun Fọ Lótús Wè</annotation>
+ <annotation cp="🧘🏿♀" type="tts">Wúman Sidọ́n Fọ Graun Fọ Lótús Wè: Dák Skín Ton</annotation>
+ <annotation cp="🛀🏻">Baf | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀🏻" type="tts">Pẹ́sin Wé De Baf: Laít Skín Ton</annotation>
+ <annotation cp="🛀🏼">Baf | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀🏼" type="tts">Pẹ́sin Wé De Baf: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🛀🏽">Baf | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀🏽" type="tts">Pẹ́sin Wé De Baf: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🛀🏾">Baf | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀🏾" type="tts">Pẹ́sin Wé De Baf: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🛀🏿">Baf | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Baf | Wọtá</annotation>
+ <annotation cp="🛀🏿" type="tts">Pẹ́sin Wé De Baf: Dák Skín Ton</annotation>
+ <annotation cp="🛌🏻">Bẹd | Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌🏻" type="tts">Pẹ́sin Wé De Slip: Laít Skín Ton</annotation>
+ <annotation cp="🛌🏼">Bẹd | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌🏼" type="tts">Pẹ́sin Wé De Slip: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🛌🏽">Bẹd | Mídíọ́m Skín Ton | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌🏽" type="tts">Pẹ́sin Wé De Slip: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🛌🏾">Bẹd | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌🏾" type="tts">Pẹ́sin Wé De Slip: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🛌🏿">Bẹd | Dák Skín Ton | Pẹ́sin | Pẹ́sin Wé De Slip | Slip</annotation>
+ <annotation cp="🛌🏿" type="tts">Pẹ́sin Wé De Slip: Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🤝🧑🏻">Hand | Hól | Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏻🤝🧑🏻" type="tts">Pípul Wé Hól Han: Laít Skín Ton</annotation>
+ <annotation cp="🧑🏻🤝🧑🏼">Hand | Hól | Laít Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏻🤝🧑🏼" type="tts">Pípul Wé Hól Han: Laít Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏻🤝🧑🏽">Hand | Hól | Laít Skín Ton | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏻🤝🧑🏽" type="tts">Pípul Wé Hól Han: Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏻🤝🧑🏾">Hand | Hól | Laít Skín Ton | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏻🤝🧑🏾" type="tts">Pípul Wé Hól Han: Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏻🤝🧑🏿">Dák Skín Ton | Hand | Hól | Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏻🤝🧑🏿" type="tts">Pípul Wé Hól Han: Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="🧑🏼🤝🧑🏻">Hand | Hól | Laít Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏼🤝🧑🏻" type="tts">Pípul Wé Hól Han: Mídíọ́m-Laít Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🤝🧑🏼">Hand | Hól | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏼🤝🧑🏼" type="tts">Pípul Wé Hól Han: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏼🤝🧑🏽">Hand | Hól | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏼🤝🧑🏽" type="tts">Pípul Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏼🤝🧑🏾">Hand | Hól | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏼🤝🧑🏾" type="tts">Pípul Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏼🤝🧑🏿">Dák Skín Ton | Hand | Hól | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏼🤝🧑🏿" type="tts">Pípul Wé Hól Han: Mídíọ́m-Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="🧑🏽🤝🧑🏻">Hand | Hól | Laít Skín Ton | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏽🤝🧑🏻" type="tts">Pípul Wé Hól Han: Mídíọ́m Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🤝🧑🏼">Hand | Hól | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏽🤝🧑🏼" type="tts">Pípul Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏽🤝🧑🏽">Hand | Hól | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏽🤝🧑🏽" type="tts">Pípul Wé Hól Han: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏽🤝🧑🏾">Hand | Hól | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏽🤝🧑🏾" type="tts">Pípul Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏽🤝🧑🏿">Dák Skín Ton | Hand | Hól | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏽🤝🧑🏿" type="tts">Pípul Wé Hól Han: Mídíọ́m Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="🧑🏾🤝🧑🏻">Hand | Hól | Laít Skín Ton | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏾🤝🧑🏻" type="tts">Pípul Wé Hól Han: Mídíọ́m Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="🧑🏾🤝🧑🏼">Hand | Hól | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏾🤝🧑🏼" type="tts">Pípul Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏾🤝🧑🏽">Hand | Hól | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏾🤝🧑🏽" type="tts">Pípul Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏾🤝🧑🏾">Hand | Hól | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏾🤝🧑🏾" type="tts">Pípul Wé Hól Han: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏾🤝🧑🏿">Dák Skín Ton | Hand | Hól | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏾🤝🧑🏿" type="tts">Pípul Wé Hól Han: Mídíọ́m Dák Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🤝🧑🏻">Dák Skín Ton | Hand | Hól | Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏿🤝🧑🏻" type="tts">Pípul Wé Hól Han: Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="🧑🏿🤝🧑🏼">Dák Skín Ton | Hand | Hól | Mídíọ́m-Laít Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏿🤝🧑🏼" type="tts">Pípul Wé Hól Han: Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="🧑🏿🤝🧑🏽">Dák Skín Ton | Hand | Hól | Mídíọ́m Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏿🤝🧑🏽" type="tts">Pípul Wé Hól Han: Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="🧑🏿🤝🧑🏾">Dák Skín Ton | Hand | Hól | Mídíọ́m Dák Skín Ton | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏿🤝🧑🏾" type="tts">Pípul Wé Hól Han: Dák Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="🧑🏿🤝🧑🏿">Dák Skín Ton | Hand | Hól | Pẹ́sin | Pípul Wé Hól Han | Tú Pípol</annotation>
+ <annotation cp="🧑🏿🤝🧑🏿" type="tts">Pípul Wé Hól Han: Dák Skín Ton</annotation>
+ <annotation cp="👭🏻">Hand | Hol | Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭🏻" type="tts">Wúman-dẹm Wé Hól Han: Laít Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👩🏼">Hand | Hol | Laít Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👩🏼" type="tts">Wúman-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👩🏽">Hand | Hol | Laít Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👩🏽" type="tts">Wúman-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👩🏾">Hand | Hol | Laít Skín Ton | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👩🏾" type="tts">Wúman-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👩🏿">Dák Skín Ton | Hand | Hol | Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👩🏿" type="tts">Wúman-dẹm Wé Hól Han: Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👩🏻">Hand | Hol | Laít Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👩🏻" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👭🏼">Hand | Hol | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭🏼" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👩🏽">Hand | Hol | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👩🏽" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👩🏾">Hand | Hol | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👩🏾" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👩🏿">Dák Skín Ton | Hand | Hol | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👩🏿" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👩🏻">Hand | Hol | Laít Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👩🏻" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👩🏼">Hand | Hol | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👩🏼" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👭🏽">Hand | Hol | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭🏽" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👩🏾">Hand | Hol | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👩🏾" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👩🏿">Dák Skín Ton | Hand | Hol | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👩🏿" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👩🏻">Hand | Hol | Laít Skín Ton | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👩🏻" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👩🏼">Hand | Hol | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👩🏼" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👩🏽">Hand | Hol | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👩🏽" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👭🏾">Hand | Hol | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭🏾" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👩🏿">Dák Skín Ton | Hand | Hol | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👩🏿" type="tts">Wúman-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👩🏻">Dák Skín Ton | Hand | Hol | Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👩🏻" type="tts">Wúman-dẹm Wé Hól Han: Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👩🏼">Dák Skín Ton | Hand | Hol | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👩🏼" type="tts">Wúman-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👩🏽">Dák Skín Ton | Hand | Hol | Mídíọ́m Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👩🏽" type="tts">Wúman-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👩🏾">Dák Skín Ton | Hand | Hol | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👩🏾" type="tts">Wúman-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👭🏿">Dák Skín Ton | Hand | Hol | Tú Pípol | Wúman-dẹm | Wúman-dẹm Wé Hól Han</annotation>
+ <annotation cp="👭🏿" type="tts">Wúman-dẹm Wé Hól Han: Dák Skín Ton</annotation>
+ <annotation cp="👫🏻">Hand | Hol | Laít Skín Ton | Man | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫🏻" type="tts">Wúman An Man Wé Hól Han: Laít Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👨🏼">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👨🏼" type="tts">Wúman An Man Wé Hól Han: Laít Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👨🏽">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👨🏽" type="tts">Wúman An Man Wé Hól Han: Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👨🏾">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👨🏾" type="tts">Wúman An Man Wé Hól Han: Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏻🤝👨🏿">Dák Skín Ton | Hand | Hol | Laít Skín Ton | Man | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏻🤝👨🏿" type="tts">Wúman An Man Wé Hól Han: Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👨🏻">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👨🏻" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m-Laít Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👫🏼">Hand | Hol | Man | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫🏼" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👨🏽">Hand | Hol | Man | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👨🏽" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👨🏾">Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👨🏾" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏼🤝👨🏿">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏼🤝👨🏿" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m-Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👨🏻">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👨🏻" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👨🏼">Hand | Hol | Man | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👨🏼" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👫🏽">Hand | Hol | Man | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫🏽" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👨🏾">Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👨🏾" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏽🤝👨🏿">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏽🤝👨🏿" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👨🏻">Hand | Hol | Laít Skín Ton | Man | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👨🏻" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👨🏼">Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👨🏼" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👨🏽">Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👨🏽" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👫🏾">Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫🏾" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👩🏾🤝👨🏿">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏾🤝👨🏿" type="tts">Wúman An Man Wé Hól Han: Mídíọ́m Dák Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👨🏻">Dák Skín Ton | Hand | Hol | Laít Skín Ton | Man | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👨🏻" type="tts">Wúman An Man Wé Hól Han: Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👨🏼">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m-Laít Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👨🏼" type="tts">Wúman An Man Wé Hól Han: Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👨🏽">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👨🏽" type="tts">Wúman An Man Wé Hól Han: Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👩🏿🤝👨🏾">Dák Skín Ton | Hand | Hol | Man | Mídíọ́m Dák Skín Ton | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👩🏿🤝👨🏾" type="tts">Wúman An Man Wé Hól Han: Dák Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👫🏿">Dák Skín Ton | Hand | Hol | Man | Tú Pípol | Wúman | Wúman An Man Wé Hól Han</annotation>
+ <annotation cp="👫🏿" type="tts">Wúman An Man Wé Hól Han: Dák Skín Ton</annotation>
+ <annotation cp="👬🏻">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬🏻" type="tts">Man-dẹm Wé Hól Han: Laít Skín Ton</annotation>
+ <annotation cp="👨🏻🤝👨🏼">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏻🤝👨🏼" type="tts">Man-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏻🤝👨🏽">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏻🤝👨🏽" type="tts">Man-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏻🤝👨🏾">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏻🤝👨🏾" type="tts">Man-dẹm Wé Hól Han: Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏻🤝👨🏿">Dák Skín Ton | Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏻🤝👨🏿" type="tts">Man-dẹm Wé Hól Han: Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👨🏼🤝👨🏻">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏼🤝👨🏻" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👬🏼">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬🏼" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏼🤝👨🏽">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏼🤝👨🏽" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏼🤝👨🏾">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏼🤝👨🏾" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏼🤝👨🏿">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏼🤝👨🏿" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m-Laít Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👨🏽🤝👨🏻">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏽🤝👨🏻" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👨🏽🤝👨🏼">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏽🤝👨🏼" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👬🏽">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬🏽" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏽🤝👨🏾">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏽🤝👨🏾" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏽🤝👨🏿">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏽🤝👨🏿" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🤝👨🏻">Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏾🤝👨🏻" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👨🏾🤝👨🏼">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏾🤝👨🏼" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏾🤝👨🏽">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏾🤝👨🏽" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👬🏾">Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬🏾" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👨🏾🤝👨🏿">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏾🤝👨🏿" type="tts">Man-dẹm Wé Hól Han: Mídíọ́m Dák Skín Ton, Dák Skín Ton</annotation>
+ <annotation cp="👨🏿🤝👨🏻">Dák Skín Ton | Hól Hand | Laít Skín Ton | Man | Man-dẹm Wé Hól Han | Mẹn | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏿🤝👨🏻" type="tts">Man-dẹm Wé Hól Han: Dák Skín Ton, Laít Skín Ton</annotation>
+ <annotation cp="👨🏿🤝👨🏼">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m-Laít Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏿🤝👨🏼" type="tts">Man-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m-Laít Skín Ton</annotation>
+ <annotation cp="👨🏿🤝👨🏽">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏿🤝👨🏽" type="tts">Man-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m Skín Ton</annotation>
+ <annotation cp="👨🏿🤝👨🏾">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Mídíọ́m Dák Skín Ton | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👨🏿🤝👨🏾" type="tts">Man-dẹm Wé Hól Han: Dák Skín Ton, Mídíọ́m Dák Skín Ton</annotation>
+ <annotation cp="👬🏿">Dák Skín Ton | Hól Hand | Man | Man-dẹm Wé Hól Han | Mẹn | Tú Pípol | Twin-dẹm</annotation>
+ <annotation cp="👬🏿" type="tts">Man-dẹm Wé Hól Han: Dák Skín Ton</annotation>
+ <annotation cp="👩❤💋👨">Kis | Man | Tú Pípol | Wúman</annotation>
+ <annotation cp="👩❤💋👨" type="tts">Kis: Wúman, Man</annotation>
+ <annotation cp="👨❤💋👨">Kis | Man | Tú Pípol</annotation>
+ <annotation cp="👨❤💋👨" type="tts">Kis: Man, Man</annotation>
+ <annotation cp="👩❤💋👩">Kis | Tú Pípol | Wúman</annotation>
+ <annotation cp="👩❤💋👩" type="tts">Kis: Wúman, Wúman</annotation>
+ <annotation cp="👩❤👨">Lọv | Man | Tú Pípol | Tú Pípol Wit Hat | Wúman</annotation>
+ <annotation cp="👩❤👨" type="tts">Tú Pípol Wit Hat: Wúman, Man</annotation>
+ <annotation cp="👨❤👨">Lọv | Man | Tú Pípol | Tú Pípol Wit Hat</annotation>
+ <annotation cp="👨❤👨" type="tts">Tú Pípol Wit Hat: Man, Man</annotation>
+ <annotation cp="👩❤👩">Lọv | Tú Pípol | Tú Pípol Wit Hat | Wúman</annotation>
+ <annotation cp="👩❤👩" type="tts">Tú Pípol Wit Hat: Wúman, Wúman</annotation>
+ <annotation cp="👨👩👦">Fámíli | Man | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👨👩👦" type="tts">Fámíli: Man, Wúman, Smọ́l Bọi</annotation>
+ <annotation cp="👨👩👧">Fámíli | Man | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👨👩👧" type="tts">Fámíli: Man, Wúman, Smọ́l Gẹl</annotation>
+ <annotation cp="👨👩👧👦">Fámíli | Man | Smọ́l Bọi | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👨👩👧👦" type="tts">Fámíli: Man, Wúman, Smọ́l Gẹl, Smọ́l Bọi</annotation>
+ <annotation cp="👨👩👦👦">Fámíli | Man | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👨👩👦👦" type="tts">Fámíli: Man, Wúman, Smọ́l Bọi, Smọ́l Bọi</annotation>
+ <annotation cp="👨👩👧👧">Fámíli | Man | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👨👩👧👧" type="tts">Fámíli: Man, Wúman, Smọ́l Gẹl, Smọ́l Gẹl</annotation>
+ <annotation cp="👨👨👦">Fámíli | Man | Smọ́l Bọi</annotation>
+ <annotation cp="👨👨👦" type="tts">Fámíli: Man, Man, Smọ́l Bọi</annotation>
+ <annotation cp="👨👨👧">Fámíli | Man | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👨👧" type="tts">Fámíli: Man, Man, Smọ́l Gẹl</annotation>
+ <annotation cp="👨👨👧👦">Fámíli | Man | Smọ́l Bọi | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👨👧👦" type="tts">Fámíli: Man, Man, Smọ́l Gẹl, Smọ́l Bọi</annotation>
+ <annotation cp="👨👨👦👦">Fámíli | Man | Smọ́l Bọi</annotation>
+ <annotation cp="👨👨👦👦" type="tts">Fámíli: Man, Man, Smọ́l Bọi, Smọ́l Bọi</annotation>
+ <annotation cp="👨👨👧👧">Fámíli | Man | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👨👧👧" type="tts">Fámíli: Man, Man, Smọ́l Gẹl, Smọ́l Gẹl</annotation>
+ <annotation cp="👩👩👦">Fámíli | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👩👩👦" type="tts">Fámíli: Wúman, Wúman, Smọ́l Bọi</annotation>
+ <annotation cp="👩👩👧">Fámíli | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👩👧" type="tts">Fámíli: Wúman, Wúman, Smọ́l Gẹl</annotation>
+ <annotation cp="👩👩👧👦">Fámíli | Smọ́l Bọi | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👩👧👦" type="tts">Fámíli: Wúman, Wúman, Smọ́l Gẹl, Smọ́l Bọi</annotation>
+ <annotation cp="👩👩👦👦">Fámíli | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👩👩👦👦" type="tts">Fámíli: Wúman, Wúman, Smọ́l Bọi, Smọ́l Bọi</annotation>
+ <annotation cp="👩👩👧👧">Fámíli | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👩👧👧" type="tts">Fámíli: Wúman, Wúman, Smọ́l Gẹl, Smọ́l Gẹl</annotation>
+ <annotation cp="👨👦">Fámíli | Man | Smọ́l Bọi</annotation>
+ <annotation cp="👨👦" type="tts">Fámíli: Man, Smọ́l Bọi</annotation>
+ <annotation cp="👨👦👦">Fámíli | Man | Smọ́l Bọi</annotation>
+ <annotation cp="👨👦👦" type="tts">Fámíli: Man, Smọ́l Bọi, Smọ́l Bọi</annotation>
+ <annotation cp="👨👧">Fámíli | Man | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👧" type="tts">Fámíli: Man, Smọ́l Gẹl</annotation>
+ <annotation cp="👨👧👦">Fámíli | Man | Smọ́l Bọi | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👧👦" type="tts">Fámíli: Man, Smọ́l Gẹl, Smọ́l Bọi</annotation>
+ <annotation cp="👨👧👧">Fámíli | Man | Smọ́l Gẹl</annotation>
+ <annotation cp="👨👧👧" type="tts">Fámíli: Man, Smọ́l Gẹl, Smọ́l Gẹl</annotation>
+ <annotation cp="👩👦">Fámíli | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👩👦" type="tts">Fámíli: Wúman, Smọ́l Bọi</annotation>
+ <annotation cp="👩👦👦">Fámíli | Smọ́l Bọi | Wúman</annotation>
+ <annotation cp="👩👦👦" type="tts">Fámíli: Wúman, Smọ́l Bọi, Smọ́l Bọi</annotation>
+ <annotation cp="👩👧">Fámíli | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👧" type="tts">Fámíli: Wúman, Smọ́l Gẹl</annotation>
+ <annotation cp="👩👧👦">Fámíli | Smọ́l Bọi | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👧👦" type="tts">Fámíli: Wúman, Smọ́l Gẹl, Smọ́l Bọi</annotation>
+ <annotation cp="👩👧👧">Fámíli | Smọ́l Gẹl | Wúman</annotation>
+ <annotation cp="👩👧👧" type="tts">Fámíli: Wúman, Smọ́l Gẹl, Smọ́l Gẹl</annotation>
+ <annotation cp="#⃣">Kíkap</annotation>
+ <annotation cp="#⃣" type="tts">Kíkap: #</annotation>
+ <annotation cp="*⃣">Kíkap</annotation>
+ <annotation cp="*⃣" type="tts">Kíkap: *</annotation>
+ <annotation cp="🔟">Kíkap</annotation>
+ <annotation cp="🔟" type="tts">Kíkap: 10</annotation>
+ <annotation cp="🇦🇨">Flag</annotation>
+ <annotation cp="🇦🇨" type="tts">Flag: Asẹ́nshọ́n Aíland</annotation>
+ <annotation cp="🇦🇩">Flag</annotation>
+ <annotation cp="🇦🇩" type="tts">Flag: Andọ́ra</annotation>
+ <annotation cp="🇦🇪">Flag</annotation>
+ <annotation cp="🇦🇪" type="tts">Flag: Yunaítẹ́d Áráb Ẹ́mírets</annotation>
+ <annotation cp="🇦🇫">Flag</annotation>
+ <annotation cp="🇦🇫" type="tts">Flag: Afgánístan</annotation>
+ <annotation cp="🇦🇬">Flag</annotation>
+ <annotation cp="🇦🇬" type="tts">Flag: Antígwua & Barbúda</annotation>
+ <annotation cp="🇦🇮">Flag</annotation>
+ <annotation cp="🇦🇮" type="tts">Flag: Angwíla</annotation>
+ <annotation cp="🇦🇱">Flag</annotation>
+ <annotation cp="🇦🇱" type="tts">Flag: Albénia</annotation>
+ <annotation cp="🇦🇲">Flag</annotation>
+ <annotation cp="🇦🇲" type="tts">Flag: Armẹ́niá</annotation>
+ <annotation cp="🇦🇴">Flag</annotation>
+ <annotation cp="🇦🇴" type="tts">Flag: Angóla</annotation>
+ <annotation cp="🇦🇶">Flag</annotation>
+ <annotation cp="🇦🇶" type="tts">Flag: Antáktíka</annotation>
+ <annotation cp="🇦🇷">Flag</annotation>
+ <annotation cp="🇦🇷" type="tts">Flag: Ajẹntína</annotation>
+ <annotation cp="🇦🇸">Flag</annotation>
+ <annotation cp="🇦🇸" type="tts">Flag: Amẹ́ríká Samoa</annotation>
+ <annotation cp="🇦🇹">Flag</annotation>
+ <annotation cp="🇦🇹" type="tts">Flag: Ọ́stria</annotation>
+ <annotation cp="🇦🇺">Flag</annotation>
+ <annotation cp="🇦🇺" type="tts">Flag: Ọstrélia</annotation>
+ <annotation cp="🇦🇼">Flag</annotation>
+ <annotation cp="🇦🇼" type="tts">Flag: Arúba</annotation>
+ <annotation cp="🇦🇽">Flag</annotation>
+ <annotation cp="🇦🇽" type="tts">Flag: Ọ́lánd Aílands</annotation>
+ <annotation cp="🇦🇿">Flag</annotation>
+ <annotation cp="🇦🇿" type="tts">Flag: Azẹrbaijan</annotation>
+ <annotation cp="🇧🇦">Flag</annotation>
+ <annotation cp="🇧🇦" type="tts">Flag: Bọ́zniá & Hẹzẹgovína</annotation>
+ <annotation cp="🇧🇧">Flag</annotation>
+ <annotation cp="🇧🇧" type="tts">Flag: Barbédọs</annotation>
+ <annotation cp="🇧🇩">Flag</annotation>
+ <annotation cp="🇧🇩" type="tts">Flag: Bangladẹsh</annotation>
+ <annotation cp="🇧🇪">Flag</annotation>
+ <annotation cp="🇧🇪" type="tts">Flag: Bẹ́ljọm</annotation>
+ <annotation cp="🇧🇫">Flag</annotation>
+ <annotation cp="🇧🇫" type="tts">Flag: Burkína Fáso</annotation>
+ <annotation cp="🇧🇬">Flag</annotation>
+ <annotation cp="🇧🇬" type="tts">Flag: Bọlgéria</annotation>
+ <annotation cp="🇧🇭">Flag</annotation>
+ <annotation cp="🇧🇭" type="tts">Flag: Barein</annotation>
+ <annotation cp="🇧🇮">Flag</annotation>
+ <annotation cp="🇧🇮" type="tts">Flag: Burúndi</annotation>
+ <annotation cp="🇧🇯">Flag</annotation>
+ <annotation cp="🇧🇯" type="tts">Flag: Binin</annotation>
+ <annotation cp="🇧🇱">Flag</annotation>
+ <annotation cp="🇧🇱" type="tts">Flag: Sént Batẹlẹ́mi</annotation>
+ <annotation cp="🇧🇲">Flag</annotation>
+ <annotation cp="🇧🇲" type="tts">Flag: Bẹmiúda</annotation>
+ <annotation cp="🇧🇳">Flag</annotation>
+ <annotation cp="🇧🇳" type="tts">Flag: Brunẹi</annotation>
+ <annotation cp="🇧🇴">Flag</annotation>
+ <annotation cp="🇧🇴" type="tts">Flag: Bolívia</annotation>
+ <annotation cp="🇧🇶">Flag</annotation>
+ <annotation cp="🇧🇶" type="tts">Flag: Karíbián Nẹ́dalands</annotation>
+ <annotation cp="🇧🇷">Flag</annotation>
+ <annotation cp="🇧🇷" type="tts">Flag: Brázil</annotation>
+ <annotation cp="🇧🇸">Flag</annotation>
+ <annotation cp="🇧🇸" type="tts">Flag: Bahámas</annotation>
+ <annotation cp="🇧🇹">Flag</annotation>
+ <annotation cp="🇧🇹" type="tts">Flag: Butan</annotation>
+ <annotation cp="🇧🇻">Flag</annotation>
+ <annotation cp="🇧🇻" type="tts">Flag: Buvẹ́ Aíland</annotation>
+ <annotation cp="🇧🇼">Flag</annotation>
+ <annotation cp="🇧🇼" type="tts">Flag: Botswána</annotation>
+ <annotation cp="🇧🇾">Flag</annotation>
+ <annotation cp="🇧🇾" type="tts">Flag: Bẹ́larus</annotation>
+ <annotation cp="🇧🇿">Flag</annotation>
+ <annotation cp="🇧🇿" type="tts">Flag: Bẹliz</annotation>
+ <annotation cp="🇨🇦">Flag</annotation>
+ <annotation cp="🇨🇦" type="tts">Flag: Kánáda</annotation>
+ <annotation cp="🇨🇨">Flag</annotation>
+ <annotation cp="🇨🇨" type="tts">Flag: Kókós Aílands</annotation>
+ <annotation cp="🇨🇩">Flag</annotation>
+ <annotation cp="🇨🇩" type="tts">Flag: Kóngó – Kinshása</annotation>
+ <annotation cp="🇨🇫">Flag</annotation>
+ <annotation cp="🇨🇫" type="tts">Flag: Sẹ́ntrál Áfríkán Ripọ́blik</annotation>
+ <annotation cp="🇨🇬">Flag</annotation>
+ <annotation cp="🇨🇬" type="tts">Flag: Kóngo – Brázavil</annotation>
+ <annotation cp="🇨🇭">Flag</annotation>
+ <annotation cp="🇨🇭" type="tts">Flag: Swítsaland</annotation>
+ <annotation cp="🇨🇮">Flag</annotation>
+ <annotation cp="🇨🇮" type="tts">Flag: Aívri Kost</annotation>
+ <annotation cp="🇨🇰">Flag</annotation>
+ <annotation cp="🇨🇰" type="tts">Flag: Kúk Aílands</annotation>
+ <annotation cp="🇨🇱">Flag</annotation>
+ <annotation cp="🇨🇱" type="tts">Flag: Chílẹ</annotation>
+ <annotation cp="🇨🇲">Flag</annotation>
+ <annotation cp="🇨🇲" type="tts">Flag: Kamẹrun</annotation>
+ <annotation cp="🇨🇳">Flag</annotation>
+ <annotation cp="🇨🇳" type="tts">Flag: Chaína</annotation>
+ <annotation cp="🇨🇴">Flag</annotation>
+ <annotation cp="🇨🇴" type="tts">Flag: Kolómbia</annotation>
+ <annotation cp="🇨🇵">Flag</annotation>
+ <annotation cp="🇨🇵" type="tts">Flag: Klipatọ́n Aíland</annotation>
+ <annotation cp="🇨🇷">Flag</annotation>
+ <annotation cp="🇨🇷" type="tts">Flag: Kósta Ríka</annotation>
+ <annotation cp="🇨🇺">Flag</annotation>
+ <annotation cp="🇨🇺" type="tts">Flag: Kiúbá</annotation>
+ <annotation cp="🇨🇻">Flag</annotation>
+ <annotation cp="🇨🇻" type="tts">Flag: Kép Vẹ́d</annotation>
+ <annotation cp="🇨🇼">Flag</annotation>
+ <annotation cp="🇨🇼" type="tts">Flag: Kiurásao</annotation>
+ <annotation cp="🇨🇽">Flag</annotation>
+ <annotation cp="🇨🇽" type="tts">Flag: Krísmás Aíland</annotation>
+ <annotation cp="🇨🇾">Flag</annotation>
+ <annotation cp="🇨🇾" type="tts">Flag: Saíprọs</annotation>
+ <annotation cp="🇨🇿">Flag</annotation>
+ <annotation cp="🇨🇿" type="tts">Flag: Chẹ́kia</annotation>
+ <annotation cp="🇩🇪">Flag</annotation>
+ <annotation cp="🇩🇪" type="tts">Flag: Jámáni</annotation>
+ <annotation cp="🇩🇬">Flag</annotation>
+ <annotation cp="🇩🇬" type="tts">Flag: Diẹ́gó Garsia</annotation>
+ <annotation cp="🇩🇯">Flag</annotation>
+ <annotation cp="🇩🇯" type="tts">Flag: Jibúti</annotation>
+ <annotation cp="🇩🇰">Flag</annotation>
+ <annotation cp="🇩🇰" type="tts">Flag: Dẹ́nmak</annotation>
+ <annotation cp="🇩🇲">Flag</annotation>
+ <annotation cp="🇩🇲" type="tts">Flag: Dọmíníka</annotation>
+ <annotation cp="🇩🇴">Flag</annotation>
+ <annotation cp="🇩🇴" type="tts">Flag: Dọmíníka Ripọ́blik</annotation>
+ <annotation cp="🇩🇿">Flag</annotation>
+ <annotation cp="🇩🇿" type="tts">Flag: Aljíria</annotation>
+ <annotation cp="🇪🇦">Flag</annotation>
+ <annotation cp="🇪🇦" type="tts">Flag: Sẹúta & Mẹ́líla</annotation>
+ <annotation cp="🇪🇨">Flag</annotation>
+ <annotation cp="🇪🇨" type="tts">Flag: Ẹ́kwuádọ</annotation>
+ <annotation cp="🇪🇪">Flag</annotation>
+ <annotation cp="🇪🇪" type="tts">Flag: Ẹstónia</annotation>
+ <annotation cp="🇪🇬">Flag</annotation>
+ <annotation cp="🇪🇬" type="tts">Flag: Íjipt</annotation>
+ <annotation cp="🇪🇭">Flag</annotation>
+ <annotation cp="🇪🇭" type="tts">Flag: Wẹ́stán Sahára</annotation>
+ <annotation cp="🇪🇷">Flag</annotation>
+ <annotation cp="🇪🇷" type="tts">Flag: Ẹritrẹ́a</annotation>
+ <annotation cp="🇪🇸">Flag</annotation>
+ <annotation cp="🇪🇸" type="tts">Flag: Spen</annotation>
+ <annotation cp="🇪🇹">Flag</annotation>
+ <annotation cp="🇪🇹" type="tts">Flag: Ẹtiópia</annotation>
+ <annotation cp="🇪🇺">Flag</annotation>
+ <annotation cp="🇪🇺" type="tts">Flag: Yurópián Yúniọ́n</annotation>
+ <annotation cp="🇫🇮">Flag</annotation>
+ <annotation cp="🇫🇮" type="tts">Flag: Fínland</annotation>
+ <annotation cp="🇫🇯">Flag</annotation>
+ <annotation cp="🇫🇯" type="tts">Flag: Fíji</annotation>
+ <annotation cp="🇫🇰">Flag</annotation>
+ <annotation cp="🇫🇰" type="tts">Flag: Fọ́klánd Aílands</annotation>
+ <annotation cp="🇫🇲">Flag</annotation>
+ <annotation cp="🇫🇲" type="tts">Flag: Maikroníshia</annotation>
+ <annotation cp="🇫🇴">Flag</annotation>
+ <annotation cp="🇫🇴" type="tts">Flag: Fáro Aílands</annotation>
+ <annotation cp="🇫🇷">Flag</annotation>
+ <annotation cp="🇫🇷" type="tts">Flag: Frans</annotation>
+ <annotation cp="🇬🇦">Flag</annotation>
+ <annotation cp="🇬🇦" type="tts">Flag: Gabọn</annotation>
+ <annotation cp="🇬🇧">Flag</annotation>
+ <annotation cp="🇬🇧" type="tts">Flag: Yunáítẹ́d Kíndọm</annotation>
+ <annotation cp="🇬🇩">Flag</annotation>
+ <annotation cp="🇬🇩" type="tts">Flag: Grẹnéda</annotation>
+ <annotation cp="🇬🇪">Flag</annotation>
+ <annotation cp="🇬🇪" type="tts">Flag: Jọ́jia</annotation>
+ <annotation cp="🇬🇫">Flag</annotation>
+ <annotation cp="🇬🇫" type="tts">Flag: Frẹ́nch Giána</annotation>
+ <annotation cp="🇬🇬">Flag</annotation>
+ <annotation cp="🇬🇬" type="tts">Flag: Guẹnzi</annotation>
+ <annotation cp="🇬🇭">Flag</annotation>
+ <annotation cp="🇬🇭" type="tts">Flag: Gána</annotation>
+ <annotation cp="🇬🇮">Flag</annotation>
+ <annotation cp="🇬🇮" type="tts">Flag: Jibrọ́lta</annotation>
+ <annotation cp="🇬🇱">Flag</annotation>
+ <annotation cp="🇬🇱" type="tts">Flag: Grínland</annotation>
+ <annotation cp="🇬🇲">Flag</annotation>
+ <annotation cp="🇬🇲" type="tts">Flag: Gámbia</annotation>
+ <annotation cp="🇬🇳">Flag</annotation>
+ <annotation cp="🇬🇳" type="tts">Flag: Gíni</annotation>
+ <annotation cp="🇬🇵">Flag</annotation>
+ <annotation cp="🇬🇵" type="tts">Flag: Guadalúpẹ</annotation>
+ <annotation cp="🇬🇶">Flag</annotation>
+ <annotation cp="🇬🇶" type="tts">Flag: Ikwétóriál Gíni</annotation>
+ <annotation cp="🇬🇷">Flag</annotation>
+ <annotation cp="🇬🇷" type="tts">Flag: Gris</annotation>
+ <annotation cp="🇬🇸">Flag</annotation>
+ <annotation cp="🇬🇸" type="tts">Flag: Saút Jọ́jia an Saút Sándwích Aílands</annotation>
+ <annotation cp="🇬🇹">Flag</annotation>
+ <annotation cp="🇬🇹" type="tts">Flag: Guátẹmála</annotation>
+ <annotation cp="🇬🇺">Flag</annotation>
+ <annotation cp="🇬🇺" type="tts">Flag: Guam</annotation>
+ <annotation cp="🇬🇼">Flag</annotation>
+ <annotation cp="🇬🇼" type="tts">Flag: Gíní-Bisáu</annotation>
+ <annotation cp="🇬🇾">Flag</annotation>
+ <annotation cp="🇬🇾" type="tts">Flag: Gayána</annotation>
+ <annotation cp="🇭🇰">Flag</annotation>
+ <annotation cp="🇭🇰" type="tts">Flag: Họng Kọng SAR</annotation>
+ <annotation cp="🇭🇲">Flag</annotation>
+ <annotation cp="🇭🇲" type="tts">Flag: Hiád & MakDónáld Aílands</annotation>
+ <annotation cp="🇭🇳">Flag</annotation>
+ <annotation cp="🇭🇳" type="tts">Flag: Họndúras</annotation>
+ <annotation cp="🇭🇷">Flag</annotation>
+ <annotation cp="🇭🇷" type="tts">Flag: Kroéshia</annotation>
+ <annotation cp="🇭🇹">Flag</annotation>
+ <annotation cp="🇭🇹" type="tts">Flag: Haíti</annotation>
+ <annotation cp="🇭🇺">Flag</annotation>
+ <annotation cp="🇭🇺" type="tts">Flag: Họ́ngári</annotation>
+ <annotation cp="🇮🇨">Flag</annotation>
+ <annotation cp="🇮🇨" type="tts">Flag: Kenerí Aílands</annotation>
+ <annotation cp="🇮🇩">Flag</annotation>
+ <annotation cp="🇮🇩" type="tts">Flag: Indoníshia</annotation>
+ <annotation cp="🇮🇪">Flag</annotation>
+ <annotation cp="🇮🇪" type="tts">Flag: Ayaland</annotation>
+ <annotation cp="🇮🇱">Flag</annotation>
+ <annotation cp="🇮🇱" type="tts">Flag: Ízrẹl</annotation>
+ <annotation cp="🇮🇲">Flag</annotation>
+ <annotation cp="🇮🇲" type="tts">Flag: Aíl ọf Man</annotation>
+ <annotation cp="🇮🇳">Flag</annotation>
+ <annotation cp="🇮🇳" type="tts">Flag: Índia</annotation>
+ <annotation cp="🇮🇴">Flag</annotation>
+ <annotation cp="🇮🇴" type="tts">Flag: Brítísh Índián Óshen Tẹ́rẹ́tri</annotation>
+ <annotation cp="🇮🇶">Flag</annotation>
+ <annotation cp="🇮🇶" type="tts">Flag: Irak</annotation>
+ <annotation cp="🇮🇷">Flag</annotation>
+ <annotation cp="🇮🇷" type="tts">Flag: Iran</annotation>
+ <annotation cp="🇮🇸">Flag</annotation>
+ <annotation cp="🇮🇸" type="tts">Flag: Aísland</annotation>
+ <annotation cp="🇮🇹">Flag</annotation>
+ <annotation cp="🇮🇹" type="tts">Flag: Ítáli</annotation>
+ <annotation cp="🇯🇪">Flag</annotation>
+ <annotation cp="🇯🇪" type="tts">Flag: Jẹ́si</annotation>
+ <annotation cp="🇯🇲">Flag</annotation>
+ <annotation cp="🇯🇲" type="tts">Flag: Jamaíka</annotation>
+ <annotation cp="🇯🇴">Flag</annotation>
+ <annotation cp="🇯🇴" type="tts">Flag: Jọ́dan</annotation>
+ <annotation cp="🇯🇵">Flag</annotation>
+ <annotation cp="🇯🇵" type="tts">Flag: Japan</annotation>
+ <annotation cp="🇰🇪">Flag</annotation>
+ <annotation cp="🇰🇪" type="tts">Flag: Kẹ́nya</annotation>
+ <annotation cp="🇰🇬">Flag</annotation>
+ <annotation cp="🇰🇬" type="tts">Flag: Kẹjístan</annotation>
+ <annotation cp="🇰🇭">Flag</annotation>
+ <annotation cp="🇰🇭" type="tts">Flag: Kambódia</annotation>
+ <annotation cp="🇰🇮">Flag</annotation>
+ <annotation cp="🇰🇮" type="tts">Flag: Kiribáti</annotation>
+ <annotation cp="🇰🇲">Flag</annotation>
+ <annotation cp="🇰🇲" type="tts">Flag: Kọ́mọ́ros</annotation>
+ <annotation cp="🇰🇳">Flag</annotation>
+ <annotation cp="🇰🇳" type="tts">Flag: Sent Kits & Nẹ́vis</annotation>
+ <annotation cp="🇰🇵">Flag</annotation>
+ <annotation cp="🇰🇵" type="tts">Flag: Nọ́t Koria</annotation>
+ <annotation cp="🇰🇷">Flag</annotation>
+ <annotation cp="🇰🇷" type="tts">Flag: Saút Koria</annotation>
+ <annotation cp="🇰🇼">Flag</annotation>
+ <annotation cp="🇰🇼" type="tts">Flag: Kuwét</annotation>
+ <annotation cp="🇰🇾">Flag</annotation>
+ <annotation cp="🇰🇾" type="tts">Flag: Kéman Aílands</annotation>
+ <annotation cp="🇰🇿">Flag</annotation>
+ <annotation cp="🇰🇿" type="tts">Flag: Kazakstan</annotation>
+ <annotation cp="🇱🇦">Flag</annotation>
+ <annotation cp="🇱🇦" type="tts">Flag: Laos</annotation>
+ <annotation cp="🇱🇧">Flag</annotation>
+ <annotation cp="🇱🇧" type="tts">Flag: Lẹ́bánọn</annotation>
+ <annotation cp="🇱🇨">Flag</annotation>
+ <annotation cp="🇱🇨" type="tts">Flag: Sent Lúshia</annotation>
+ <annotation cp="🇱🇮">Flag</annotation>
+ <annotation cp="🇱🇮" type="tts">Flag: Líktẹ́nstain</annotation>
+ <annotation cp="🇱🇰">Flag</annotation>
+ <annotation cp="🇱🇰" type="tts">Flag: Sri Lánka</annotation>
+ <annotation cp="🇱🇷">Flag</annotation>
+ <annotation cp="🇱🇷" type="tts">Flag: Laibẹ́ria</annotation>
+ <annotation cp="🇱🇸">Flag</annotation>
+ <annotation cp="🇱🇸" type="tts">Flag: Lẹsóto</annotation>
+ <annotation cp="🇱🇹">Flag</annotation>
+ <annotation cp="🇱🇹" type="tts">Flag: Lituénia</annotation>
+ <annotation cp="🇱🇺">Flag</annotation>
+ <annotation cp="🇱🇺" type="tts">Flag: Lọ́ksẹ́mbọg</annotation>
+ <annotation cp="🇱🇻">Flag</annotation>
+ <annotation cp="🇱🇻" type="tts">Flag: Látvia</annotation>
+ <annotation cp="🇱🇾">Flag</annotation>
+ <annotation cp="🇱🇾" type="tts">Flag: Líbia</annotation>
+ <annotation cp="🇲🇦">Flag</annotation>
+ <annotation cp="🇲🇦" type="tts">Flag: Morọko</annotation>
+ <annotation cp="🇲🇨">Flag</annotation>
+ <annotation cp="🇲🇨" type="tts">Flag: Mọ́náko</annotation>
+ <annotation cp="🇲🇩">Flag</annotation>
+ <annotation cp="🇲🇩" type="tts">Flag: Mọldóva</annotation>
+ <annotation cp="🇲🇪">Flag</annotation>
+ <annotation cp="🇲🇪" type="tts">Flag: Mọntinígro</annotation>
+ <annotation cp="🇲🇫">Flag</annotation>
+ <annotation cp="🇲🇫" type="tts">Flag: Sent Mátin</annotation>
+ <annotation cp="🇲🇬">Flag</annotation>
+ <annotation cp="🇲🇬" type="tts">Flag: Madagáska</annotation>
+ <annotation cp="🇲🇭">Flag</annotation>
+ <annotation cp="🇲🇭" type="tts">Flag: Máshál Aílands</annotation>
+ <annotation cp="🇲🇰">Flag</annotation>
+ <annotation cp="🇲🇰" type="tts">Flag: Nọ́t Masidónia</annotation>
+ <annotation cp="🇲🇱">Flag</annotation>
+ <annotation cp="🇲🇱" type="tts">Flag: Máli</annotation>
+ <annotation cp="🇲🇲">Flag</annotation>
+ <annotation cp="🇲🇲" type="tts">Flag: Miánma (Bọ́ma)</annotation>
+ <annotation cp="🇲🇳">Flag</annotation>
+ <annotation cp="🇲🇳" type="tts">Flag: Mọngólia</annotation>
+ <annotation cp="🇲🇴">Flag</annotation>
+ <annotation cp="🇲🇴" type="tts">Flag: Makáo SAR Chaína</annotation>
+ <annotation cp="🇲🇵">Flag</annotation>
+ <annotation cp="🇲🇵" type="tts">Flag: Nọ́tán Mariána Aílands</annotation>
+ <annotation cp="🇲🇶">Flag</annotation>
+ <annotation cp="🇲🇶" type="tts">Flag: Matínik</annotation>
+ <annotation cp="🇲🇷">Flag</annotation>
+ <annotation cp="🇲🇷" type="tts">Flag: Mọriténia</annotation>
+ <annotation cp="🇲🇸">Flag</annotation>
+ <annotation cp="🇲🇸" type="tts">Flag: Mọntsẹrat</annotation>
+ <annotation cp="🇲🇹">Flag</annotation>
+ <annotation cp="🇲🇹" type="tts">Flag: Mọ́lta</annotation>
+ <annotation cp="🇲🇺">Flag</annotation>
+ <annotation cp="🇲🇺" type="tts">Flag: Mọríshọs</annotation>
+ <annotation cp="🇲🇻">Flag</annotation>
+ <annotation cp="🇲🇻" type="tts">Flag: Mọ́ldivs</annotation>
+ <annotation cp="🇲🇼">Flag</annotation>
+ <annotation cp="🇲🇼" type="tts">Flag: Maláwi</annotation>
+ <annotation cp="🇲🇽">Flag</annotation>
+ <annotation cp="🇲🇽" type="tts">Flag: Mẹ́ksíko</annotation>
+ <annotation cp="🇲🇾">Flag</annotation>
+ <annotation cp="🇲🇾" type="tts">Flag: Maléshia</annotation>
+ <annotation cp="🇲🇿">Flag</annotation>
+ <annotation cp="🇲🇿" type="tts">Flag: Mozámbik</annotation>
+ <annotation cp="🇳🇦">Flag</annotation>
+ <annotation cp="🇳🇦" type="tts">Flag: Namíbia</annotation>
+ <annotation cp="🇳🇨">Flag</annotation>
+ <annotation cp="🇳🇨" type="tts">Flag: Niú Kalẹdónia</annotation>
+ <annotation cp="🇳🇪">Flag</annotation>
+ <annotation cp="🇳🇪" type="tts">Flag: Nizhẹr</annotation>
+ <annotation cp="🇳🇫">Flag</annotation>
+ <annotation cp="🇳🇫" type="tts">Flag: Nọ́fọlk Aíland</annotation>
+ <annotation cp="🇳🇬">Flag</annotation>
+ <annotation cp="🇳🇬" type="tts">Flag: Naijíria</annotation>
+ <annotation cp="🇳🇮">Flag</annotation>
+ <annotation cp="🇳🇮" type="tts">Flag: Nikarágwua</annotation>
+ <annotation cp="🇳🇱">Flag</annotation>
+ <annotation cp="🇳🇱" type="tts">Flag: Nẹ́dalands</annotation>
+ <annotation cp="🇳🇴">Flag</annotation>
+ <annotation cp="🇳🇴" type="tts">Flag: Nọ́we</annotation>
+ <annotation cp="🇳🇵">Flag</annotation>
+ <annotation cp="🇳🇵" type="tts">Flag: Nẹ́pal</annotation>
+ <annotation cp="🇳🇷">Flag</annotation>
+ <annotation cp="🇳🇷" type="tts">Flag: Náuru</annotation>
+ <annotation cp="🇳🇺">Flag</annotation>
+ <annotation cp="🇳🇺" type="tts">Flag: Niúẹ</annotation>
+ <annotation cp="🇳🇿">Flag</annotation>
+ <annotation cp="🇳🇿" type="tts">Flag: Niú Zíland</annotation>
+ <annotation cp="🇴🇲">Flag</annotation>
+ <annotation cp="🇴🇲" type="tts">Flag: Oman</annotation>
+ <annotation cp="🇵🇦">Flag</annotation>
+ <annotation cp="🇵🇦" type="tts">Flag: Pánáma</annotation>
+ <annotation cp="🇵🇪">Flag</annotation>
+ <annotation cp="🇵🇪" type="tts">Flag: Pẹ́ru</annotation>
+ <annotation cp="🇵🇫">Flag</annotation>
+ <annotation cp="🇵🇫" type="tts">Flag: Frẹ́nch Poliníshia</annotation>
+ <annotation cp="🇵🇬">Flag</annotation>
+ <annotation cp="🇵🇬" type="tts">Flag: Pápuá Niú Gíni</annotation>
+ <annotation cp="🇵🇭">Flag</annotation>
+ <annotation cp="🇵🇭" type="tts">Flag: Fílípins</annotation>
+ <annotation cp="🇵🇰">Flag</annotation>
+ <annotation cp="🇵🇰" type="tts">Flag: Pakístan</annotation>
+ <annotation cp="🇵🇱">Flag</annotation>
+ <annotation cp="🇵🇱" type="tts">Flag: Póland</annotation>
+ <annotation cp="🇵🇲">Flag</annotation>
+ <annotation cp="🇵🇲" type="tts">Flag: Sent Piẹr & Míkẹlọn</annotation>
+ <annotation cp="🇵🇳">Flag</annotation>
+ <annotation cp="🇵🇳" type="tts">Flag: Pítkén Aílands</annotation>
+ <annotation cp="🇵🇷">Flag</annotation>
+ <annotation cp="🇵🇷" type="tts">Flag: Puẹ́rto Ríkọ</annotation>
+ <annotation cp="🇵🇸">Flag</annotation>
+ <annotation cp="🇵🇸" type="tts">Flag: Pálẹ́staín Éria-dẹm</annotation>
+ <annotation cp="🇵🇹">Flag</annotation>
+ <annotation cp="🇵🇹" type="tts">Flag: Pọ́túgal</annotation>
+ <annotation cp="🇵🇼">Flag</annotation>
+ <annotation cp="🇵🇼" type="tts">Flag: Palau</annotation>
+ <annotation cp="🇵🇾">Flag</annotation>
+ <annotation cp="🇵🇾" type="tts">Flag: Párágwue</annotation>
+ <annotation cp="🇶🇦">Flag</annotation>
+ <annotation cp="🇶🇦" type="tts">Flag: Kata</annotation>
+ <annotation cp="🇷🇪">Flag</annotation>
+ <annotation cp="🇷🇪" type="tts">Flag: Réyúniọn</annotation>
+ <annotation cp="🇷🇴">Flag</annotation>
+ <annotation cp="🇷🇴" type="tts">Flag: Ruménia</annotation>
+ <annotation cp="🇷🇸">Flag</annotation>
+ <annotation cp="🇷🇸" type="tts">Flag: Sẹ́bia</annotation>
+ <annotation cp="🇷🇺">Flag</annotation>
+ <annotation cp="🇷🇺" type="tts">Flag: Rọ́shia</annotation>
+ <annotation cp="🇷🇼">Flag</annotation>
+ <annotation cp="🇷🇼" type="tts">Flag: Ruwánda</annotation>
+ <annotation cp="🇸🇦">Flag</annotation>
+ <annotation cp="🇸🇦" type="tts">Flag: Saúdí Arébia</annotation>
+ <annotation cp="🇸🇧">Flag</annotation>
+ <annotation cp="🇸🇧" type="tts">Flag: Sólómọ́n Aílands</annotation>
+ <annotation cp="🇸🇨">Flag</annotation>
+ <annotation cp="🇸🇨" type="tts">Flag: Sẹ́chẹls</annotation>
+ <annotation cp="🇸🇩">Flag</annotation>
+ <annotation cp="🇸🇩" type="tts">Flag: Sudan</annotation>
+ <annotation cp="🇸🇪">Flag</annotation>
+ <annotation cp="🇸🇪" type="tts">Flag: Swídẹn</annotation>
+ <annotation cp="🇸🇬">Flag</annotation>
+ <annotation cp="🇸🇬" type="tts">Flag: Singapọ</annotation>
+ <annotation cp="🇸🇭">Flag</annotation>
+ <annotation cp="🇸🇭" type="tts">Flag: Sent Hẹlẹ́na</annotation>
+ <annotation cp="🇸🇮">Flag</annotation>
+ <annotation cp="🇸🇮" type="tts">Flag: Slovẹ́nia</annotation>
+ <annotation cp="🇸🇯">Flag</annotation>
+ <annotation cp="🇸🇯" type="tts">Flag: Sválbad & Jén Meyẹn</annotation>
+ <annotation cp="🇸🇰">Flag</annotation>
+ <annotation cp="🇸🇰" type="tts">Flag: Slovékia</annotation>
+ <annotation cp="🇸🇱">Flag</annotation>
+ <annotation cp="🇸🇱" type="tts">Flag: Siẹ́ra Líon</annotation>
+ <annotation cp="🇸🇲">Flag</annotation>
+ <annotation cp="🇸🇲" type="tts">Flag: San Maríno</annotation>
+ <annotation cp="🇸🇳">Flag</annotation>
+ <annotation cp="🇸🇳" type="tts">Flag: Sẹ́nẹ́gal</annotation>
+ <annotation cp="🇸🇴">Flag</annotation>
+ <annotation cp="🇸🇴" type="tts">Flag: Sọmália</annotation>
+ <annotation cp="🇸🇷">Flag</annotation>
+ <annotation cp="🇸🇷" type="tts">Flag: Súrínam</annotation>
+ <annotation cp="🇸🇸">Flag</annotation>
+ <annotation cp="🇸🇸" type="tts">Flag: Saút Sudan</annotation>
+ <annotation cp="🇸🇹">Flag</annotation>
+ <annotation cp="🇸🇹" type="tts">Flag: Sao Tómé & Prínsípẹ</annotation>
+ <annotation cp="🇸🇻">Flag</annotation>
+ <annotation cp="🇸🇻" type="tts">Flag: El Sálvádọ</annotation>
+ <annotation cp="🇸🇽">Flag</annotation>
+ <annotation cp="🇸🇽" type="tts">Flag: Sint Mátin</annotation>
+ <annotation cp="🇸🇾">Flag</annotation>
+ <annotation cp="🇸🇾" type="tts">Flag: Síria</annotation>
+ <annotation cp="🇸🇿">Flag</annotation>
+ <annotation cp="🇸🇿" type="tts">Flag: Ẹswatíni</annotation>
+ <annotation cp="🇹🇦">Flag</annotation>
+ <annotation cp="🇹🇦" type="tts">Flag: Trístán da Kúna</annotation>
+ <annotation cp="🇹🇨">Flag</annotation>
+ <annotation cp="🇹🇨" type="tts">Flag: Tọks an Kaíkọ́s Aílands</annotation>
+ <annotation cp="🇹🇩">Flag</annotation>
+ <annotation cp="🇹🇩" type="tts">Flag: Chad</annotation>
+ <annotation cp="🇹🇫">Flag</annotation>
+ <annotation cp="🇹🇫" type="tts">Flag: Frẹ́nch Saútán Tẹ́rẹ́tris</annotation>
+ <annotation cp="🇹🇬">Flag</annotation>
+ <annotation cp="🇹🇬" type="tts">Flag: Tógo</annotation>
+ <annotation cp="🇹🇭">Flag</annotation>
+ <annotation cp="🇹🇭" type="tts">Flag: Taíland</annotation>
+ <annotation cp="🇹🇯">Flag</annotation>
+ <annotation cp="🇹🇯" type="tts">Flag: Tajíkstan</annotation>
+ <annotation cp="🇹🇰">Flag</annotation>
+ <annotation cp="🇹🇰" type="tts">Flag: Tókẹ́lau</annotation>
+ <annotation cp="🇹🇱">Flag</annotation>
+ <annotation cp="🇹🇱" type="tts">Flag: Íst Tímọ</annotation>
+ <annotation cp="🇹🇲">Flag</annotation>
+ <annotation cp="🇹🇲" type="tts">Flag: Tọkmẹ́nístan</annotation>
+ <annotation cp="🇹🇳">Flag</annotation>
+ <annotation cp="🇹🇳" type="tts">Flag: Tuníshia</annotation>
+ <annotation cp="🇹🇴">Flag</annotation>
+ <annotation cp="🇹🇴" type="tts">Flag: Tónga</annotation>
+ <annotation cp="🇹🇷">Flag</annotation>
+ <annotation cp="🇹🇷" type="tts">Flag: Tọ́ki</annotation>
+ <annotation cp="🇹🇹">Flag</annotation>
+ <annotation cp="🇹🇹" type="tts">Flag: Trínídad & Tobágo</annotation>
+ <annotation cp="🇹🇻">Flag</annotation>
+ <annotation cp="🇹🇻" type="tts">Flag: Tuválu</annotation>
+ <annotation cp="🇹🇼">Flag</annotation>
+ <annotation cp="🇹🇼" type="tts">Flag: Taiwan</annotation>
+ <annotation cp="🇹🇿">Flag</annotation>
+ <annotation cp="🇹🇿" type="tts">Flag: Tanzánia</annotation>
+ <annotation cp="🇺🇦">Flag</annotation>
+ <annotation cp="🇺🇦" type="tts">Flag: Yukrein</annotation>
+ <annotation cp="🇺🇬">Flag</annotation>
+ <annotation cp="🇺🇬" type="tts">Flag: Yugánda</annotation>
+ <annotation cp="🇺🇲">Flag</annotation>
+ <annotation cp="🇺🇲" type="tts">Flag: U.S. Faá Faá Aílands</annotation>
+ <annotation cp="🇺🇳">Flag</annotation>
+ <annotation cp="🇺🇳" type="tts">Flag: Yunaítẹd Néshọns</annotation>
+ <annotation cp="🇺🇸">Flag</annotation>
+ <annotation cp="🇺🇸" type="tts">Flag: Yunaítẹ́d Stets</annotation>
+ <annotation cp="🇺🇾">Flag</annotation>
+ <annotation cp="🇺🇾" type="tts">Flag: Yúrugwue</annotation>
+ <annotation cp="🇺🇿">Flag</annotation>
+ <annotation cp="🇺🇿" type="tts">Flag: Uzbẹ́kistan</annotation>
+ <annotation cp="🇻🇦">Flag</annotation>
+ <annotation cp="🇻🇦" type="tts">Flag: Vátíkán Síti</annotation>
+ <annotation cp="🇻🇨">Flag</annotation>
+ <annotation cp="🇻🇨" type="tts">Flag: Sent Vínsẹnt & Grẹ́nádians</annotation>
+ <annotation cp="🇻🇪">Flag</annotation>
+ <annotation cp="🇻🇪" type="tts">Flag: Vẹnẹzuẹ́la</annotation>
+ <annotation cp="🇻🇬">Flag</annotation>
+ <annotation cp="🇻🇬" type="tts">Flag: Brítísh Vájín Aílands</annotation>
+ <annotation cp="🇻🇮">Flag</annotation>
+ <annotation cp="🇻🇮" type="tts">Flag: U.S. Vájín Aílands</annotation>
+ <annotation cp="🇻🇳">Flag</annotation>
+ <annotation cp="🇻🇳" type="tts">Flag: Viẹ́tnam</annotation>
+ <annotation cp="🇻🇺">Flag</annotation>
+ <annotation cp="🇻🇺" type="tts">Flag: Vanuátu</annotation>
+ <annotation cp="🇼🇫">Flag</annotation>
+ <annotation cp="🇼🇫" type="tts">Flag: Wọ́lis & Fiutúna</annotation>
+ <annotation cp="🇼🇸">Flag</annotation>
+ <annotation cp="🇼🇸" type="tts">Flag: Samóa</annotation>
+ <annotation cp="🇽🇰">Flag</annotation>
+ <annotation cp="🇽🇰" type="tts">Flag: Kósóvo</annotation>
+ <annotation cp="🇾🇪">Flag</annotation>
+ <annotation cp="🇾🇪" type="tts">Flag: Yẹ́mẹn</annotation>
+ <annotation cp="🇾🇹">Flag</annotation>
+ <annotation cp="🇾🇹" type="tts">Flag: Meyọt</annotation>
+ <annotation cp="🇿🇦">Flag</annotation>
+ <annotation cp="🇿🇦" type="tts">Flag: Saút Áfríka</annotation>
+ <annotation cp="🇿🇲">Flag</annotation>
+ <annotation cp="🇿🇲" type="tts">Flag: Zámbia</annotation>
+ <annotation cp="🇿🇼">Flag</annotation>
+ <annotation cp="🇿🇼" type="tts">Flag: Zimbábwẹ</annotation>
+ <annotation cp="0⃣">Kíkap</annotation>
+ <annotation cp="0⃣" type="tts">Kíkap: 0</annotation>
+ <annotation cp="1⃣">Kíkap</annotation>
+ <annotation cp="1⃣" type="tts">Kíkap: 1</annotation>
+ <annotation cp="2⃣">Kíkap</annotation>
+ <annotation cp="2⃣" type="tts">Kíkap: 2</annotation>
+ <annotation cp="3⃣">Kíkap</annotation>
+ <annotation cp="3⃣" type="tts">Kíkap: 3</annotation>
+ <annotation cp="4⃣">Kíkap</annotation>
+ <annotation cp="4⃣" type="tts">Kíkap: 4</annotation>
+ <annotation cp="5⃣">Kíkap</annotation>
+ <annotation cp="5⃣" type="tts">Kíkap: 5</annotation>
+ <annotation cp="6⃣">Kíkap</annotation>
+ <annotation cp="6⃣" type="tts">Kíkap: 6</annotation>
+ <annotation cp="7⃣">Kíkap</annotation>
+ <annotation cp="7⃣" type="tts">Kíkap: 7</annotation>
+ <annotation cp="8⃣">Kíkap</annotation>
+ <annotation cp="8⃣" type="tts">Kíkap: 8</annotation>
+ <annotation cp="9⃣">Kíkap</annotation>
+ <annotation cp="9⃣" type="tts">Kíkap: 9</annotation>
+ </annotations>
+</ldml>
diff --git a/common/annotationsDerived/pl.xml b/common/annotationsDerived/pl.xml
index eab64f2..48482b2 100644
--- a/common/annotationsDerived/pl.xml
+++ b/common/annotationsDerived/pl.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">złączone palce: karnacja średnio ciemna</annotation>
<annotation cp="🤌🏿">gest | karnacja ciemna | palce | przesłuchanie | sarkazm | złączone palce</annotation>
<annotation cp="🤌🏿" type="tts">złączone palce: karnacja ciemna</annotation>
+ <annotation cp="🥷🏻">karnacja jasna | niewidoczny | ninja | skradać się | ukryty | wojownik</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: karnacja jasna</annotation>
+ <annotation cp="🥷🏼">karnacja średnio jasna | niewidoczny | ninja | skradać się | ukryty | wojownik</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: karnacja średnio jasna</annotation>
+ <annotation cp="🥷🏽">karnacja średnia | niewidoczny | ninja | skradać się | ukryty | wojownik</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: karnacja średnia</annotation>
+ <annotation cp="🥷🏾">karnacja średnio ciemna | niewidoczny | ninja | skradać się | ukryty | wojownik</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: karnacja średnio ciemna</annotation>
+ <annotation cp="🥷🏿">karnacja ciemna | niewidoczny | ninja | skradać się | ukryty | wojownik</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: karnacja ciemna</annotation>
<annotation cp="👋🏻">karnacja jasna | machająca dłoń</annotation>
<annotation cp="👋🏻" type="tts">machająca dłoń: karnacja jasna</annotation>
<annotation cp="👋🏼">karnacja średnio jasna | machająca dłoń</annotation>
diff --git a/common/annotationsDerived/pt.xml b/common/annotationsDerived/pt.xml
index 02ea2af..bbaee5e 100644
--- a/common/annotationsDerived/pt.xml
+++ b/common/annotationsDerived/pt.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">dedos comprimidos: pele morena escura</annotation>
<annotation cp="🤌🏿">beliscado | dedos | dedos comprimidos | gesto de mão | interrogação | pele escura | sarcástico</annotation>
<annotation cp="🤌🏿" type="tts">dedos comprimidos: pele escura</annotation>
+ <annotation cp="🥷🏻">furtividade | lutador | ninja | oculto | pele clara</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: pele clara</annotation>
+ <annotation cp="🥷🏼">furtividade | lutador | ninja | oculto | pele morena clara</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: pele morena clara</annotation>
+ <annotation cp="🥷🏽">furtividade | lutador | ninja | oculto | pele morena</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: pele morena</annotation>
+ <annotation cp="🥷🏾">furtividade | lutador | ninja | oculto | pele morena escura</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: pele morena escura</annotation>
+ <annotation cp="🥷🏿">furtividade | lutador | ninja | oculto | pele escura</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: pele escura</annotation>
<annotation cp="👋🏻">aceno | mão | mão acenando | pele clara</annotation>
<annotation cp="👋🏻" type="tts">mão acenando: pele clara</annotation>
<annotation cp="👋🏼">aceno | mão | mão acenando | pele morena clara</annotation>
diff --git a/common/annotationsDerived/pt_PT.xml b/common/annotationsDerived/pt_PT.xml
index 894e840..fe4bfa9 100644
--- a/common/annotationsDerived/pt_PT.xml
+++ b/common/annotationsDerived/pt_PT.xml
@@ -24,6 +24,16 @@
<annotation cp="🤌🏾" type="tts">dedos comprimidos: tipo de pele 5</annotation>
<annotation cp="🤌🏿">beliscado | dedos | dedos comprimidos | gesto de mão | interrogação | sarcástico | tipo de pele 6</annotation>
<annotation cp="🤌🏿" type="tts">dedos comprimidos: tipo de pele 6</annotation>
+ <annotation cp="🥷🏻">escondido | lutador | ninja | oculto | tipo de pele 1–2</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: tipo de pele 1–2</annotation>
+ <annotation cp="🥷🏼">escondido | lutador | ninja | oculto | tipo de pele 3</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: tipo de pele 3</annotation>
+ <annotation cp="🥷🏽">escondido | lutador | ninja | oculto | tipo de pele 4</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: tipo de pele 4</annotation>
+ <annotation cp="🥷🏾">escondido | lutador | ninja | oculto | tipo de pele 5</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: tipo de pele 5</annotation>
+ <annotation cp="🥷🏿">escondido | lutador | ninja | oculto | tipo de pele 6</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: tipo de pele 6</annotation>
<annotation cp="👋🏻">acenar | aceno | corpo | mão | mão a acenar | tipo de pele 1–2</annotation>
<annotation cp="👋🏻" type="tts">mão a acenar: tipo de pele 1–2</annotation>
<annotation cp="👋🏼">acenar | aceno | corpo | mão | mão a acenar | tipo de pele 3</annotation>
diff --git a/common/annotationsDerived/ro.xml b/common/annotationsDerived/ro.xml
index 63ceb19..d60522e 100644
--- a/common/annotationsDerived/ro.xml
+++ b/common/annotationsDerived/ro.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">degete strânse: ton semi‑închis al pielii</annotation>
<annotation cp="🤌🏿">degete | degete strânse | gest cu mâna | interogație | sarcastic | ton închis al pielii</annotation>
<annotation cp="🤌🏿" type="tts">degete strânse: ton închis al pielii</annotation>
+ <annotation cp="🥷🏻">ascuns | invizibil | luptător | ninja | ton deschis al pielii</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ton deschis al pielii</annotation>
+ <annotation cp="🥷🏼">ascuns | invizibil | luptător | ninja | ton semi‑deschis al pielii</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: ton semi‑deschis al pielii</annotation>
+ <annotation cp="🥷🏽">ascuns | invizibil | luptător | ninja | ton mediu al pielii</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: ton mediu al pielii</annotation>
+ <annotation cp="🥷🏾">ascuns | invizibil | luptător | ninja | ton semi‑închis al pielii</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: ton semi‑închis al pielii</annotation>
+ <annotation cp="🥷🏿">ascuns | invizibil | luptător | ninja | ton închis al pielii</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: ton închis al pielii</annotation>
<annotation cp="👋🏻">despărțire | mână | mână fluturată | semn | ton deschis al pielii</annotation>
<annotation cp="👋🏻" type="tts">mână fluturată: ton deschis al pielii</annotation>
<annotation cp="👋🏼">despărțire | mână | mână fluturată | semn | ton semi‑deschis al pielii</annotation>
diff --git a/common/annotationsDerived/ru.xml b/common/annotationsDerived/ru.xml
index 626e0bf..80b27ae 100644
--- a/common/annotationsDerived/ru.xml
+++ b/common/annotationsDerived/ru.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">щепоть: темный тон кожи</annotation>
<annotation cp="🤌🏿">вопрос | жест | очень темный тон кожи | пальцы | рега | сарказм | щепотка | щепоть</annotation>
<annotation cp="🤌🏿" type="tts">щепоть: очень темный тон кожи</annotation>
+ <annotation cp="🥷🏻">диверсант | ниндзя | очень светлый тон кожи | синоби | скрытный | шпион</annotation>
+ <annotation cp="🥷🏻" type="tts">ниндзя: очень светлый тон кожи</annotation>
+ <annotation cp="🥷🏼">диверсант | ниндзя | светлый тон кожи | синоби | скрытный | шпион</annotation>
+ <annotation cp="🥷🏼" type="tts">ниндзя: светлый тон кожи</annotation>
+ <annotation cp="🥷🏽">диверсант | ниндзя | синоби | скрытный | средний тон кожи | шпион</annotation>
+ <annotation cp="🥷🏽" type="tts">ниндзя: средний тон кожи</annotation>
+ <annotation cp="🥷🏾">диверсант | ниндзя | синоби | скрытный | темный тон кожи | шпион</annotation>
+ <annotation cp="🥷🏾" type="tts">ниндзя: темный тон кожи</annotation>
+ <annotation cp="🥷🏿">диверсант | ниндзя | очень темный тон кожи | синоби | скрытный | шпион</annotation>
+ <annotation cp="🥷🏿" type="tts">ниндзя: очень темный тон кожи</annotation>
<annotation cp="👋🏻">взмах | машет рукой | очень светлый тон кожи | привет | приветствие | рука</annotation>
<annotation cp="👋🏻" type="tts">машет рукой: очень светлый тон кожи</annotation>
<annotation cp="👋🏼">взмах | машет рукой | привет | приветствие | рука | светлый тон кожи</annotation>
diff --git a/common/annotationsDerived/sd.xml b/common/annotationsDerived/sd.xml
index 434f8ac..0b588c0 100644
--- a/common/annotationsDerived/sd.xml
+++ b/common/annotationsDerived/sd.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">پنچ ٿيل آڱريون: وچولو ڪارو رنگ</annotation>
<annotation cp="🤌🏿">آڱريون | انٽيروگيشن | پنچ ٿيل | پنچ ٿيل آڱريون | سارڪيسٽڪ | ڪارو رنگ | هٿ جو اشرو</annotation>
<annotation cp="🤌🏿" type="tts">پنچ ٿيل آڱريون: ڪارو رنگ</annotation>
+ <annotation cp="🥷🏻">اسٽيلٿ | گوري رنگت | لڪيل | ننجا | ويڙهاڪ</annotation>
+ <annotation cp="🥷🏻" type="tts">ننجا: گوري رنگت</annotation>
+ <annotation cp="🥷🏼">اسٽيلٿ | لڪيل | ننجا | وچولي گوري رنگت | ويڙهاڪ</annotation>
+ <annotation cp="🥷🏼" type="tts">ننجا: وچولي گوري رنگت</annotation>
+ <annotation cp="🥷🏽">اسٽيلٿ | پڪو رنگ | لڪيل | ننجا | ويڙهاڪ</annotation>
+ <annotation cp="🥷🏽" type="tts">ننجا: پڪو رنگ</annotation>
+ <annotation cp="🥷🏾">اسٽيلٿ | لڪيل | ننجا | وچولو ڪارو رنگ | ويڙهاڪ</annotation>
+ <annotation cp="🥷🏾" type="tts">ننجا: وچولو ڪارو رنگ</annotation>
+ <annotation cp="🥷🏿">اسٽيلٿ | ڪارو رنگ | لڪيل | ننجا | ويڙهاڪ</annotation>
+ <annotation cp="🥷🏿" type="tts">ننجا: ڪارو رنگ</annotation>
<annotation cp="👋🏻">گوري رنگت | لڏندڙ هٿ | لڏڻ | لهر | هٿ</annotation>
<annotation cp="👋🏻" type="tts">لڏندڙ هٿ: گوري رنگت</annotation>
<annotation cp="👋🏼">لڏندڙ هٿ | لڏڻ | لهر | هٿ | وچولي گوري رنگت</annotation>
diff --git a/common/annotationsDerived/si.xml b/common/annotationsDerived/si.xml
index b27857a..21cc7cf 100644
--- a/common/annotationsDerived/si.xml
+++ b/common/annotationsDerived/si.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">වකුටු කළ ඇඟිලි: සමෙහි වර්ගය-5</annotation>
<annotation cp="🤌🏿">අත් ඉඟිය | ඇඟිලි | උපහාසාත්මක | ප්රශ්න කිරීම | වකුටු කළ | වකුටු කළ ඇඟිලි | සමෙහි වර්ගය-6</annotation>
<annotation cp="🤌🏿" type="tts">වකුටු කළ ඇඟිලි: සමෙහි වර්ගය-6</annotation>
+ <annotation cp="🥷🏻">නින්ජා | රහසිගත | සටන්කරුවා | සමෙහි වර්ගය-1-2 | සැඟවුණු</annotation>
+ <annotation cp="🥷🏻" type="tts">නින්ජා: සමෙහි වර්ගය-1-2</annotation>
+ <annotation cp="🥷🏼">නින්ජා | රහසිගත | සටන්කරුවා | සමෙහි වර්ගය-3 | සැඟවුණු</annotation>
+ <annotation cp="🥷🏼" type="tts">නින්ජා: සමෙහි වර්ගය-3</annotation>
+ <annotation cp="🥷🏽">නින්ජා | රහසිගත | සටන්කරුවා | සමෙහි වර්ගය-4 | සැඟවුණු</annotation>
+ <annotation cp="🥷🏽" type="tts">නින්ජා: සමෙහි වර්ගය-4</annotation>
+ <annotation cp="🥷🏾">නින්ජා | රහසිගත | සටන්කරුවා | සමෙහි වර්ගය-5 | සැඟවුණු</annotation>
+ <annotation cp="🥷🏾" type="tts">නින්ජා: සමෙහි වර්ගය-5</annotation>
+ <annotation cp="🥷🏿">නින්ජා | රහසිගත | සටන්කරුවා | සමෙහි වර්ගය-6 | සැඟවුණු</annotation>
+ <annotation cp="🥷🏿" type="tts">නින්ජා: සමෙහි වර්ගය-6</annotation>
<annotation cp="👋🏻">අත | අත වනමින් | අත වැනීම | සමෙහි වර්ගය-1-2</annotation>
<annotation cp="👋🏻" type="tts">අත වැනීම: සමෙහි වර්ගය-1-2</annotation>
<annotation cp="👋🏼">අත | අත වනමින් | අත වැනීම | සමෙහි වර්ගය-3</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">වැඩිහිටියා: සමෙහි වර්ගය-5 සහ තට්ට</annotation>
<annotation cp="🧑🏿🦲">තට්ට | නම් නොකළ ස්ත්රී පුරුෂ භාවය | පුද්ගලයා | වැඩිහිටි | වැඩිහිටියා | සමෙහි වර්ගය-6 | ස්ත්රී පුරුෂ භාවය උදාසීන</annotation>
<annotation cp="🧑🏿🦲" type="tts">වැඩිහිටියා: සමෙහි වර්ගය-6 සහ තට්ට</annotation>
- <annotation cp="🧑🏻🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | සමෙහි වර්ගය-1-2 | ළදරුවා</annotation>
+ <annotation cp="🧑🏻🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | බබා පෝෂණය කරන පුද්ගලයා | සමෙහි වර්ගය-1-2 | ළදරුවා</annotation>
<annotation cp="🧑🏻🍼" type="tts">බබා පෝෂණය කරන පුද්ගලයා: සමෙහි වර්ගය-1-2</annotation>
- <annotation cp="🧑🏼🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | සමෙහි වර්ගය-3 | ළදරුවා</annotation>
+ <annotation cp="🧑🏼🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | බබා පෝෂණය කරන පුද්ගලයා | සමෙහි වර්ගය-3 | ළදරුවා</annotation>
<annotation cp="🧑🏼🍼" type="tts">බබා පෝෂණය කරන පුද්ගලයා: සමෙහි වර්ගය-3</annotation>
- <annotation cp="🧑🏽🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | සමෙහි වර්ගය-4 | ළදරුවා</annotation>
+ <annotation cp="🧑🏽🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | බබා පෝෂණය කරන පුද්ගලයා | සමෙහි වර්ගය-4 | ළදරුවා</annotation>
<annotation cp="🧑🏽🍼" type="tts">බබා පෝෂණය කරන පුද්ගලයා: සමෙහි වර්ගය-4</annotation>
- <annotation cp="🧑🏾🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | සමෙහි වර්ගය-5 | ළදරුවා</annotation>
+ <annotation cp="🧑🏾🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | බබා පෝෂණය කරන පුද්ගලයා | සමෙහි වර්ගය-5 | ළදරුවා</annotation>
<annotation cp="🧑🏾🍼" type="tts">බබා පෝෂණය කරන පුද්ගලයා: සමෙහි වර්ගය-5</annotation>
- <annotation cp="🧑🏿🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | සමෙහි වර්ගය-6 | ළදරුවා</annotation>
+ <annotation cp="🧑🏿🍼">කිරි දීම | දරුවා පෝෂණය කරන පුද්ගලයා | පුද්ගලයා | පෝෂණය | බබා පෝෂණය කරන පුද්ගලයා | සමෙහි වර්ගය-6 | ළදරුවා</annotation>
<annotation cp="🧑🏿🍼" type="tts">බබා පෝෂණය කරන පුද්ගලයා: සමෙහි වර්ගය-6</annotation>
<annotation cp="🧑🏻🎄">නත්තල් සීය | නත්තල් සීයා | සමෙහි වර්ගය-1-2 | සීයා, නත්තල</annotation>
<annotation cp="🧑🏻🎄" type="tts">නත්තල් සීය: සමෙහි වර්ගය-1-2</annotation>
diff --git a/common/annotationsDerived/sk.xml b/common/annotationsDerived/sk.xml
index 2e2cfbc..8f23683 100644
--- a/common/annotationsDerived/sk.xml
+++ b/common/annotationsDerived/sk.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">štipka: stredne tmavý tón pleti</annotation>
<annotation cp="🤌🏿">málo | prsty | štipka | tmavý tón pleti | trocha | troška</annotation>
<annotation cp="🤌🏿" type="tts">štipka: tmavý tón pleti</annotation>
+ <annotation cp="🥷🏻">bojovník | nindža | skrytý | svetlý tón pleti | utajený</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: svetlý tón pleti</annotation>
+ <annotation cp="🥷🏼">bojovník | nindža | skrytý | stredne svetlý tón pleti | utajený</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: stredne svetlý tón pleti</annotation>
+ <annotation cp="🥷🏽">bojovník | nindža | skrytý | stredný tón pleti | utajený</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: stredný tón pleti</annotation>
+ <annotation cp="🥷🏾">bojovník | nindža | skrytý | stredne tmavý tón pleti | utajený</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: stredne tmavý tón pleti</annotation>
+ <annotation cp="🥷🏿">bojovník | nindža | skrytý | tmavý tón pleti | utajený</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: tmavý tón pleti</annotation>
<annotation cp="👋🏻">mávajúca ruka | mávať | ruka | svetlý tón pleti</annotation>
<annotation cp="👋🏻" type="tts">mávajúca ruka: svetlý tón pleti</annotation>
<annotation cp="👋🏼">mávajúca ruka | mávať | ruka | stredne svetlý tón pleti</annotation>
diff --git a/common/annotationsDerived/sl.xml b/common/annotationsDerived/sl.xml
index 14805b5..cf95119 100644
--- a/common/annotationsDerived/sl.xml
+++ b/common/annotationsDerived/sl.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">prsti, stisnjeni skupaj: srednje temen ten kože</annotation>
<annotation cp="🤌🏿">izpraševanje | kretnja z roko | prsti | prsti, stisnjeni skupaj | sarkastično | stisnjen | temen ten kože</annotation>
<annotation cp="🤌🏿" type="tts">prsti, stisnjeni skupaj: temen ten kože</annotation>
+ <annotation cp="🥷🏻">bojevnik | nindža | prikrivanje | skrivanje | svetel ten kože</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: svetel ten kože</annotation>
+ <annotation cp="🥷🏼">bojevnik | nindža | prikrivanje | skrivanje | srednje svetel ten kože</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: srednje svetel ten kože</annotation>
+ <annotation cp="🥷🏽">bojevnik | nindža | prikrivanje | skrivanje | srednji ten kože</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: srednji ten kože</annotation>
+ <annotation cp="🥷🏾">bojevnik | nindža | prikrivanje | skrivanje | srednje temen ten kože</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: srednje temen ten kože</annotation>
+ <annotation cp="🥷🏿">bojevnik | nindža | prikrivanje | skrivanje | temen ten kože</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: temen ten kože</annotation>
<annotation cp="👋🏻">dlan | mahajoča dlan | mahanje | mahati | svetel ten kože | telo</annotation>
<annotation cp="👋🏻" type="tts">mahajoča dlan: svetel ten kože</annotation>
<annotation cp="👋🏼">dlan | mahajoča dlan | mahanje | mahati | srednje svetel ten kože | telo</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">odrasla oseba: srednje temen ten kože in plešast</annotation>
<annotation cp="🧑🏿🦲">odrasla oseba | plešast | temen ten kože</annotation>
<annotation cp="🧑🏿🦲" type="tts">odrasla oseba: temen ten kože in plešast</annotation>
- <annotation cp="🧑🏻🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | svetel ten kože</annotation>
+ <annotation cp="🧑🏻🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | oseba, ki hrani dojenčka | svetel ten kože</annotation>
<annotation cp="🧑🏻🍼" type="tts">oseba, ki hrani dojenčka: svetel ten kože</annotation>
- <annotation cp="🧑🏼🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | srednje svetel ten kože</annotation>
+ <annotation cp="🧑🏼🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | oseba, ki hrani dojenčka | srednje svetel ten kože</annotation>
<annotation cp="🧑🏼🍼" type="tts">oseba, ki hrani dojenčka: srednje svetel ten kože</annotation>
- <annotation cp="🧑🏽🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | srednji ten kože</annotation>
+ <annotation cp="🧑🏽🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | oseba, ki hrani dojenčka | srednji ten kože</annotation>
<annotation cp="🧑🏽🍼" type="tts">oseba, ki hrani dojenčka: srednji ten kože</annotation>
- <annotation cp="🧑🏾🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | srednje temen ten kože</annotation>
+ <annotation cp="🧑🏾🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | oseba, ki hrani dojenčka | srednje temen ten kože</annotation>
<annotation cp="🧑🏾🍼" type="tts">oseba, ki hrani dojenčka: srednje temen ten kože</annotation>
- <annotation cp="🧑🏿🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | temen ten kože</annotation>
+ <annotation cp="🧑🏿🍼">dojenček | dojenje | hranjenje | oseba | oseba, ki hrani doječnka | oseba, ki hrani dojenčka | temen ten kože</annotation>
<annotation cp="🧑🏿🍼" type="tts">oseba, ki hrani dojenčka: temen ten kože</annotation>
<annotation cp="🧑🏻🎄">božiček, božič | mx božiček | svetel ten kože</annotation>
<annotation cp="🧑🏻🎄" type="tts">mx božiček: svetel ten kože</annotation>
diff --git a/common/annotationsDerived/sq.xml b/common/annotationsDerived/sq.xml
index c5099cb..e84a8e5 100644
--- a/common/annotationsDerived/sq.xml
+++ b/common/annotationsDerived/sq.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">gishta të mbledhur: nuancë lëkure gjysmë e errët</annotation>
<annotation cp="🤌🏿">gishta | gishta të mbledhur | gjest me dorë | hetim | mbledhur | nuancë lëkure e errët | sarkastik</annotation>
<annotation cp="🤌🏿" type="tts">gishta të mbledhur: nuancë lëkure e errët</annotation>
+ <annotation cp="🥷🏻">fshehtësi | i fshehur | luftëtar | ninxhë | nuancë lëkure e çelët</annotation>
+ <annotation cp="🥷🏻" type="tts">ninxhë: nuancë lëkure e çelët</annotation>
+ <annotation cp="🥷🏼">fshehtësi | i fshehur | luftëtar | ninxhë | nuancë lëkure gjysmë e çelët</annotation>
+ <annotation cp="🥷🏼" type="tts">ninxhë: nuancë lëkure gjysmë e çelët</annotation>
+ <annotation cp="🥷🏽">fshehtësi | i fshehur | luftëtar | ninxhë | nuancë lëkure zeshkane</annotation>
+ <annotation cp="🥷🏽" type="tts">ninxhë: nuancë lëkure zeshkane</annotation>
+ <annotation cp="🥷🏾">fshehtësi | i fshehur | luftëtar | ninxhë | nuancë lëkure gjysmë e errët</annotation>
+ <annotation cp="🥷🏾" type="tts">ninxhë: nuancë lëkure gjysmë e errët</annotation>
+ <annotation cp="🥷🏿">fshehtësi | i fshehur | luftëtar | ninxhë | nuancë lëkure e errët</annotation>
+ <annotation cp="🥷🏿" type="tts">ninxhë: nuancë lëkure e errët</annotation>
<annotation cp="👋🏻">dorë | dorë që tundet | nuancë lëkure e çelët | që tundet | trup | tund</annotation>
<annotation cp="👋🏻" type="tts">dorë që tundet: nuancë lëkure e çelët</annotation>
<annotation cp="👋🏼">dorë | dorë që tundet | nuancë lëkure gjysmë e çelët | që tundet | trup | tund</annotation>
diff --git a/common/annotationsDerived/sr.xml b/common/annotationsDerived/sr.xml
index 0aa8137..03bae28 100644
--- a/common/annotationsDerived/sr.xml
+++ b/common/annotationsDerived/sr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">скупљени прсти: средње тамна кожа</annotation>
<annotation cp="🤌🏿">знак руком | саркастично | скупљени прсти | тамна кожа | упитно</annotation>
<annotation cp="🤌🏿" type="tts">скупљени прсти: тамна кожа</annotation>
+ <annotation cp="🥷🏻">борац | невидљив | нинџа | светла кожа | скривен</annotation>
+ <annotation cp="🥷🏻" type="tts">нинџа: светла кожа</annotation>
+ <annotation cp="🥷🏼">борац | невидљив | нинџа | скривен | средње светла кожа</annotation>
+ <annotation cp="🥷🏼" type="tts">нинџа: средње светла кожа</annotation>
+ <annotation cp="🥷🏽">борац | невидљив | ни светла ни тамна кожа | нинџа | скривен</annotation>
+ <annotation cp="🥷🏽" type="tts">нинџа: ни светла ни тамна кожа</annotation>
+ <annotation cp="🥷🏾">борац | невидљив | нинџа | скривен | средње тамна кожа</annotation>
+ <annotation cp="🥷🏾" type="tts">нинџа: средње тамна кожа</annotation>
+ <annotation cp="🥷🏿">борац | невидљив | нинџа | скривен | тамна кожа</annotation>
+ <annotation cp="🥷🏿" type="tts">нинџа: тамна кожа</annotation>
<annotation cp="👋🏻">мaхaњe | рукa | рука која маше | светла кожа | тело | шaкa</annotation>
<annotation cp="👋🏻" type="tts">рука која маше: светла кожа</annotation>
<annotation cp="👋🏼">мaхaњe | рукa | рука која маше | средње светла кожа | тело | шaкa</annotation>
diff --git a/common/annotationsDerived/sr_Cyrl.xml b/common/annotationsDerived/sr_Cyrl.xml
index 5875c14..4a77e2a 100644
--- a/common/annotationsDerived/sr_Cyrl.xml
+++ b/common/annotationsDerived/sr_Cyrl.xml
@@ -23,6 +23,16 @@
<annotation cp="🤌🏾" type="tts">скупљени прсти: средње тамна кожа</annotation>
<annotation cp="🤌🏿">знак руком | саркастично | скупљени прсти | тамна кожа | упитно</annotation>
<annotation cp="🤌🏿" type="tts">скупљени прсти: тамна кожа</annotation>
+ <annotation cp="🥷🏻">борац | невидљив | нинџа | светла кожа | скривен</annotation>
+ <annotation cp="🥷🏻" type="tts">нинџа: светла кожа</annotation>
+ <annotation cp="🥷🏼">борац | невидљив | нинџа | скривен | средње светла кожа</annotation>
+ <annotation cp="🥷🏼" type="tts">нинџа: средње светла кожа</annotation>
+ <annotation cp="🥷🏽">борац | невидљив | ни светла ни тамна кожа | нинџа | скривен</annotation>
+ <annotation cp="🥷🏽" type="tts">нинџа: ни светла ни тамна кожа</annotation>
+ <annotation cp="🥷🏾">борац | невидљив | нинџа | скривен | средње тамна кожа</annotation>
+ <annotation cp="🥷🏾" type="tts">нинџа: средње тамна кожа</annotation>
+ <annotation cp="🥷🏿">борац | невидљив | нинџа | скривен | тамна кожа</annotation>
+ <annotation cp="🥷🏿" type="tts">нинџа: тамна кожа</annotation>
<annotation cp="👋🏻">мaхaњe | рукa | рука која маше | светла кожа | тело | шaкa</annotation>
<annotation cp="👋🏻" type="tts">рука која маше: светла кожа</annotation>
<annotation cp="👋🏼">мaхaњe | рукa | рука која маше | средње светла кожа | тело | шaкa</annotation>
diff --git a/common/annotationsDerived/sr_Cyrl_BA.xml b/common/annotationsDerived/sr_Cyrl_BA.xml
index e63f455..fb43c08 100644
--- a/common/annotationsDerived/sr_Cyrl_BA.xml
+++ b/common/annotationsDerived/sr_Cyrl_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/sr_Latn.xml b/common/annotationsDerived/sr_Latn.xml
index cb8859d..240ca2d 100644
--- a/common/annotationsDerived/sr_Latn.xml
+++ b/common/annotationsDerived/sr_Latn.xml
@@ -23,6 +23,16 @@
<annotation cp="🤌🏾" type="tts">skupljeni prsti: srednje tamna koža</annotation>
<annotation cp="🤌🏿">sarkastično | skupljeni prsti | tamna koža | upitno | znak rukom</annotation>
<annotation cp="🤌🏿" type="tts">skupljeni prsti: tamna koža</annotation>
+ <annotation cp="🥷🏻">borac | nevidljiv | nindža | skriven | svetla koža</annotation>
+ <annotation cp="🥷🏻" type="tts">nindža: svetla koža</annotation>
+ <annotation cp="🥷🏼">borac | nevidljiv | nindža | skriven | srednje svetla koža</annotation>
+ <annotation cp="🥷🏼" type="tts">nindža: srednje svetla koža</annotation>
+ <annotation cp="🥷🏽">borac | nevidljiv | ni svetla ni tamna koža | nindža | skriven</annotation>
+ <annotation cp="🥷🏽" type="tts">nindža: ni svetla ni tamna koža</annotation>
+ <annotation cp="🥷🏾">borac | nevidljiv | nindža | skriven | srednje tamna koža</annotation>
+ <annotation cp="🥷🏾" type="tts">nindža: srednje tamna koža</annotation>
+ <annotation cp="🥷🏿">borac | nevidljiv | nindža | skriven | tamna koža</annotation>
+ <annotation cp="🥷🏿" type="tts">nindža: tamna koža</annotation>
<annotation cp="👋🏻">mahanje | ruka | ruka koja maše | šaka | svetla koža | telo</annotation>
<annotation cp="👋🏻" type="tts">ruka koja maše: svetla koža</annotation>
<annotation cp="👋🏼">mahanje | ruka | ruka koja maše | šaka | srednje svetla koža | telo</annotation>
diff --git a/common/annotationsDerived/sr_Latn_BA.xml b/common/annotationsDerived/sr_Latn_BA.xml
index db92c7f..f0d408e 100644
--- a/common/annotationsDerived/sr_Latn_BA.xml
+++ b/common/annotationsDerived/sr_Latn_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/annotationsDerived/sv.xml b/common/annotationsDerived/sv.xml
index 4e760bd..7fff214 100644
--- a/common/annotationsDerived/sv.xml
+++ b/common/annotationsDerived/sv.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">fingerportmonnä: mellanmörk hy</annotation>
<annotation cp="🤌🏿">fingerportmonnä | fingrar | frågande | handgest | knyten | mörk hy | sarkastisk</annotation>
<annotation cp="🤌🏿" type="tts">fingerportmonnä: mörk hy</annotation>
+ <annotation cp="🥷🏻">flygare | hemligt | ljus hy | ninja | pilot</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ljus hy</annotation>
+ <annotation cp="🥷🏼">flygare | hemligt | mellanljus hy | ninja | pilot</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: mellanljus hy</annotation>
+ <annotation cp="🥷🏽">flygare | hemligt | mellanfärgad hy | ninja | pilot</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: mellanfärgad hy</annotation>
+ <annotation cp="🥷🏾">flygare | hemligt | mellanmörk hy | ninja | pilot</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: mellanmörk hy</annotation>
+ <annotation cp="🥷🏿">flygare | hemligt | mörk hy | ninja | pilot</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: mörk hy</annotation>
<annotation cp="👋🏻">hand | ljus hy | vinka | vinkande hand</annotation>
<annotation cp="👋🏻" type="tts">vinkande hand: ljus hy</annotation>
<annotation cp="👋🏼">hand | mellanljus hy | vinka | vinkande hand</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">person: mellanmörk hy, skallig</annotation>
<annotation cp="🧑🏿🦲">könsneutral | mörk hy | person | skallig | vuxen</annotation>
<annotation cp="🧑🏿🦲" type="tts">person: mörk hy, skallig</annotation>
- <annotation cp="🧑🏻🍼">amma | ljus hy | mata | person | person matar spädbarn | spädbarn</annotation>
+ <annotation cp="🧑🏻🍼">amma | ljus hy | mata | person | person ammar spädbarn | person matar spädbarn | spädbarn</annotation>
<annotation cp="🧑🏻🍼" type="tts">person ammar spädbarn: ljus hy</annotation>
- <annotation cp="🧑🏼🍼">amma | mata | mellanljus hy | person | person matar spädbarn | spädbarn</annotation>
+ <annotation cp="🧑🏼🍼">amma | mata | mellanljus hy | person | person ammar spädbarn | person matar spädbarn | spädbarn</annotation>
<annotation cp="🧑🏼🍼" type="tts">person ammar spädbarn: mellanljus hy</annotation>
- <annotation cp="🧑🏽🍼">amma | mata | mellanfärgad hy | person | person matar spädbarn | spädbarn</annotation>
+ <annotation cp="🧑🏽🍼">amma | mata | mellanfärgad hy | person | person ammar spädbarn | person matar spädbarn | spädbarn</annotation>
<annotation cp="🧑🏽🍼" type="tts">person ammar spädbarn: mellanfärgad hy</annotation>
- <annotation cp="🧑🏾🍼">amma | mata | mellanmörk hy | person | person matar spädbarn | spädbarn</annotation>
+ <annotation cp="🧑🏾🍼">amma | mata | mellanmörk hy | person | person ammar spädbarn | person matar spädbarn | spädbarn</annotation>
<annotation cp="🧑🏾🍼" type="tts">person ammar spädbarn: mellanmörk hy</annotation>
- <annotation cp="🧑🏿🍼">amma | mata | mörk hy | person | person matar spädbarn | spädbarn</annotation>
+ <annotation cp="🧑🏿🍼">amma | mata | mörk hy | person | person ammar spädbarn | person matar spädbarn | spädbarn</annotation>
<annotation cp="🧑🏿🍼" type="tts">person ammar spädbarn: mörk hy</annotation>
<annotation cp="🧑🏻🎄">könsneutral tomte | ljus hy | tomte, jul</annotation>
<annotation cp="🧑🏻🎄" type="tts">könsneutral tomte: ljus hy</annotation>
diff --git a/common/annotationsDerived/sw.xml b/common/annotationsDerived/sw.xml
index f7e61b8..09b5a25 100644
--- a/common/annotationsDerived/sw.xml
+++ b/common/annotationsDerived/sw.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">mkono wenye vidole vinavyobana: ngozi nyeusi kiasi</annotation>
<annotation cp="🤌🏿">ishara ya mkono | kejeli | kubanwa | kuuliza | mkono wenye vidole vinavyobana | ngozi nyeusi | vidole</annotation>
<annotation cp="🤌🏿" type="tts">mkono wenye vidole vinavyobana: ngozi nyeusi</annotation>
+ <annotation cp="🥷🏻">chinichini | mpiganaji | ngozi nyeupe | ninja | siri</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: ngozi nyeupe</annotation>
+ <annotation cp="🥷🏼">chinichini | mpiganaji | ngozi nyeupe kiasi | ninja | siri</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: ngozi nyeupe kiasi</annotation>
+ <annotation cp="🥷🏽">chinichini | mpiganaji | ngozi ya kahawia | ninja | siri</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: ngozi ya kahawia</annotation>
+ <annotation cp="🥷🏾">chinichini | mpiganaji | ngozi nyeusi kiasi | ninja | siri</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: ngozi nyeusi kiasi</annotation>
+ <annotation cp="🥷🏿">chinichini | mpiganaji | ngozi nyeusi | ninja | siri</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: ngozi nyeusi</annotation>
<annotation cp="👋🏻">kupunga | mkono | mkono unaopunga | mwili | ngozi nyeupe | punga</annotation>
<annotation cp="👋🏻" type="tts">mkono unaopunga: ngozi nyeupe</annotation>
<annotation cp="👋🏼">kupunga | mkono | mkono unaopunga | mwili | ngozi nyeupe kiasi | punga</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">mtu mzima: ngozi nyeusi kiasi na upara</annotation>
<annotation cp="🧑🏿🦲">asiyejitambulisha na jinsia yoyote | mtu mzima | ngozi nyeusi | upara</annotation>
<annotation cp="🧑🏿🦲" type="tts">mtu mzima: ngozi nyeusi na upara</annotation>
- <annotation cp="🧑🏻🍼">kulisha | kutunza | mtoto | mtu | mtu anayemlisha mtoto | ngozi nyeupe</annotation>
+ <annotation cp="🧑🏻🍼">kulisha | kutunza | mtoto | mtu | mtu anamyelisha mtoto | mtu anayemlisha mtoto | ngozi nyeupe</annotation>
<annotation cp="🧑🏻🍼" type="tts">mtu anamyelisha mtoto: ngozi nyeupe</annotation>
- <annotation cp="🧑🏼🍼">kulisha | kutunza | mtoto | mtu | mtu anayemlisha mtoto | ngozi nyeupe kiasi</annotation>
+ <annotation cp="🧑🏼🍼">kulisha | kutunza | mtoto | mtu | mtu anamyelisha mtoto | mtu anayemlisha mtoto | ngozi nyeupe kiasi</annotation>
<annotation cp="🧑🏼🍼" type="tts">mtu anamyelisha mtoto: ngozi nyeupe kiasi</annotation>
- <annotation cp="🧑🏽🍼">kulisha | kutunza | mtoto | mtu | mtu anayemlisha mtoto | ngozi ya kahawia</annotation>
+ <annotation cp="🧑🏽🍼">kulisha | kutunza | mtoto | mtu | mtu anamyelisha mtoto | mtu anayemlisha mtoto | ngozi ya kahawia</annotation>
<annotation cp="🧑🏽🍼" type="tts">mtu anamyelisha mtoto: ngozi ya kahawia</annotation>
- <annotation cp="🧑🏾🍼">kulisha | kutunza | mtoto | mtu | mtu anayemlisha mtoto | ngozi nyeusi kiasi</annotation>
+ <annotation cp="🧑🏾🍼">kulisha | kutunza | mtoto | mtu | mtu anamyelisha mtoto | mtu anayemlisha mtoto | ngozi nyeusi kiasi</annotation>
<annotation cp="🧑🏾🍼" type="tts">mtu anamyelisha mtoto: ngozi nyeusi kiasi</annotation>
- <annotation cp="🧑🏿🍼">kulisha | kutunza | mtoto | mtu | mtu anayemlisha mtoto | ngozi nyeusi</annotation>
+ <annotation cp="🧑🏿🍼">kulisha | kutunza | mtoto | mtu | mtu anamyelisha mtoto | mtu anayemlisha mtoto | ngozi nyeusi</annotation>
<annotation cp="🧑🏿🍼" type="tts">mtu anamyelisha mtoto: ngozi nyeusi</annotation>
<annotation cp="🧑🏻🎄">kichimbakazi yeyote | kichimbakazi, krismasi | ngozi nyeupe</annotation>
<annotation cp="🧑🏻🎄" type="tts">kichimbakazi yeyote: ngozi nyeupe</annotation>
diff --git a/common/annotationsDerived/ta.xml b/common/annotationsDerived/ta.xml
index 264a1f1..46e750a 100644
--- a/common/annotationsDerived/ta.xml
+++ b/common/annotationsDerived/ta.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">பிணைக்கப்பட்ட விரல்கள்: வகை 5</annotation>
<annotation cp="🤌🏿">கிண்டலான | கிள்ளியது | கை சைகை | பிணைக்கப்பட்ட விரல்கள் | வகை 6 | விரல்கள்</annotation>
<annotation cp="🤌🏿" type="tts">பிணைக்கப்பட்ட விரல்கள்: வகை 6</annotation>
+ <annotation cp="🥷🏻">நிஞ்சா | போராளி | மறைமுகமானவன் | வகை 1–2</annotation>
+ <annotation cp="🥷🏻" type="tts">நிஞ்சா: வகை 1–2</annotation>
+ <annotation cp="🥷🏼">நிஞ்சா | போராளி | மறைமுகமானவன் | வகை 3</annotation>
+ <annotation cp="🥷🏼" type="tts">நிஞ்சா: வகை 3</annotation>
+ <annotation cp="🥷🏽">நிஞ்சா | போராளி | மறைமுகமானவன் | வகை 4</annotation>
+ <annotation cp="🥷🏽" type="tts">நிஞ்சா: வகை 4</annotation>
+ <annotation cp="🥷🏾">நிஞ்சா | போராளி | மறைமுகமானவன் | வகை 5</annotation>
+ <annotation cp="🥷🏾" type="tts">நிஞ்சா: வகை 5</annotation>
+ <annotation cp="🥷🏿">நிஞ்சா | போராளி | மறைமுகமானவன் | வகை 6</annotation>
+ <annotation cp="🥷🏿" type="tts">நிஞ்சா: வகை 6</annotation>
<annotation cp="👋🏻">கை | கையசைக்கும் சின்னம் | கையசைத்தல் | சின்னம் | டாட்டா | வகை 1–2</annotation>
<annotation cp="👋🏻" type="tts">கையசைத்தல்: வகை 1–2</annotation>
<annotation cp="👋🏼">கை | கையசைக்கும் சின்னம் | கையசைத்தல் | சின்னம் | டாட்டா | வகை 3</annotation>
diff --git a/common/annotationsDerived/te.xml b/common/annotationsDerived/te.xml
index 4a503d1..9a5495d 100644
--- a/common/annotationsDerived/te.xml
+++ b/common/annotationsDerived/te.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">గిచ్చుతున్నట్లు ఉండే వేళ్లు: మధ్యస్థంగా ముదురు చర్మపు రంగు</annotation>
<annotation cp="🤌🏿">గిచ్చడం | గిచ్చుతున్నట్లు ఉండే వేళ్లు | చేతి సైగ | ప్రశ్నించడం | ముదురు చర్మపు రంగు | వంటివి చేయడం | వేళ్లు</annotation>
<annotation cp="🤌🏿" type="tts">గిచ్చుతున్నట్లు ఉండే వేళ్లు: ముదురు చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏻">నింజా | యోధుడు | లేత చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏻" type="tts">నింజా: లేత చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏼">నింజా | మధ్యస్థంగా లేత చర్మపు రంగు | యోధుడు</annotation>
+ <annotation cp="🥷🏼" type="tts">నింజా: మధ్యస్థంగా లేత చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏽">నింజా | మధ్యస్థ చర్మపు రంగు | యోధుడు</annotation>
+ <annotation cp="🥷🏽" type="tts">నింజా: మధ్యస్థ చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏾">నింజా | మధ్యస్థంగా ముదురు చర్మపు రంగు | యోధుడు</annotation>
+ <annotation cp="🥷🏾" type="tts">నింజా: మధ్యస్థంగా ముదురు చర్మపు రంగు</annotation>
+ <annotation cp="🥷🏿">నింజా | ముదురు చర్మపు రంగు | యోధుడు</annotation>
+ <annotation cp="🥷🏿" type="tts">నింజా: ముదురు చర్మపు రంగు</annotation>
<annotation cp="👋🏻">ఊపడం | చేయి | లేత చర్మపు రంగు</annotation>
<annotation cp="👋🏻" type="tts">చేయి ఊపడం: లేత చర్మపు రంగు</annotation>
<annotation cp="👋🏼">ఊపడం | చేయి | మధ్యస్థంగా లేత చర్మపు రంగు</annotation>
diff --git a/common/annotationsDerived/th.xml b/common/annotationsDerived/th.xml
index c05ed23..d45db46 100644
--- a/common/annotationsDerived/th.xml
+++ b/common/annotationsDerived/th.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">หุบนิ้ว: โทนผิวสีแทน</annotation>
<annotation cp="🤌🏿">การถาม | ท่าทางมือ | โทนผิวสีเข้ม | นิ้ว | ปากจัด | หุบนิ้ว</annotation>
<annotation cp="🤌🏿" type="tts">หุบนิ้ว: โทนผิวสีเข้ม</annotation>
+ <annotation cp="🥷🏻">ซ่อน | โทนผิวสีขาว | นักสู้ | นินจา | พรางตัว</annotation>
+ <annotation cp="🥷🏻" type="tts">นินจา: โทนผิวสีขาว</annotation>
+ <annotation cp="🥷🏼">ซ่อน | โทนผิวสีขาวเหลือง | นักสู้ | นินจา | พรางตัว</annotation>
+ <annotation cp="🥷🏼" type="tts">นินจา: โทนผิวสีขาวเหลือง</annotation>
+ <annotation cp="🥷🏽">ซ่อน | โทนผิวสีเหลือง | นักสู้ | นินจา | พรางตัว</annotation>
+ <annotation cp="🥷🏽" type="tts">นินจา: โทนผิวสีเหลือง</annotation>
+ <annotation cp="🥷🏾">ซ่อน | โทนผิวสีแทน | นักสู้ | นินจา | พรางตัว</annotation>
+ <annotation cp="🥷🏾" type="tts">นินจา: โทนผิวสีแทน</annotation>
+ <annotation cp="🥷🏿">ซ่อน | โทนผิวสีเข้ม | นักสู้ | นินจา | พรางตัว</annotation>
+ <annotation cp="🥷🏿" type="tts">นินจา: โทนผิวสีเข้ม</annotation>
<annotation cp="👋🏻">โทนผิวสีขาว | โบก | โบกมือ | มือ | อวัยวะ</annotation>
<annotation cp="👋🏻" type="tts">โบกมือ: โทนผิวสีขาว</annotation>
<annotation cp="👋🏼">โทนผิวสีขาวเหลือง | โบก | โบกมือ | มือ | อวัยวะ</annotation>
diff --git a/common/annotationsDerived/tk.xml b/common/annotationsDerived/tk.xml
index d7fcf48..b8a96a5 100644
--- a/common/annotationsDerived/tk.xml
+++ b/common/annotationsDerived/tk.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">gysylan barmaklar: orta goýy deri reňki</annotation>
<annotation cp="🤌🏿">barmaklar | el hereketi | goýy deri reňki | gysylan | soramak | teýeneli</annotation>
<annotation cp="🤌🏿" type="tts">gysylan barmaklar: goýy deri reňki</annotation>
+ <annotation cp="🥷🏻">açyk deri reňki | gizlenen | gizlin | nindzýa | urşujy</annotation>
+ <annotation cp="🥷🏻" type="tts">nindzýa: açyk deri reňki</annotation>
+ <annotation cp="🥷🏼">gizlenen | gizlin | nindzýa | orta açyk deri reňki | urşujy</annotation>
+ <annotation cp="🥷🏼" type="tts">nindzýa: orta açyk deri reňki</annotation>
+ <annotation cp="🥷🏽">gizlenen | gizlin | nindzýa | orta deri reňki | urşujy</annotation>
+ <annotation cp="🥷🏽" type="tts">nindzýa: orta deri reňki</annotation>
+ <annotation cp="🥷🏾">gizlenen | gizlin | nindzýa | orta goýy deri reňki | urşujy</annotation>
+ <annotation cp="🥷🏾" type="tts">nindzýa: orta goýy deri reňki</annotation>
+ <annotation cp="🥷🏿">gizlenen | gizlin | goýy deri reňki | nindzýa | urşujy</annotation>
+ <annotation cp="🥷🏿" type="tts">nindzýa: goýy deri reňki</annotation>
<annotation cp="👋🏻">açyk deri reňki | el | galgatmak | galgaýan</annotation>
<annotation cp="👋🏻" type="tts">galgaýan el: açyk deri reňki</annotation>
<annotation cp="👋🏼">el | galgatmak | galgaýan | orta açyk deri reňki</annotation>
diff --git a/common/annotationsDerived/to.xml b/common/annotationsDerived/to.xml
index e964f27..4a6c277 100644
--- a/common/annotationsDerived/to.xml
+++ b/common/annotationsDerived/to.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">louhiʻinima fakamaʻopoʻopo: kili melomelo-ʻuliʻuli</annotation>
<annotation cp="🤌🏿">kili ʻuliʻuli | louhiʻinima fakamaʻopoʻopo</annotation>
<annotation cp="🤌🏿" type="tts">louhiʻinima fakamaʻopoʻopo: kili ʻuliʻuli</annotation>
+ <annotation cp="🥷🏻">kili hinehina | mata ninisā</annotation>
+ <annotation cp="🥷🏻" type="tts">mata ninisā: kili hinehina</annotation>
+ <annotation cp="🥷🏼">kili kelokelo | mata ninisā</annotation>
+ <annotation cp="🥷🏼" type="tts">mata ninisā: kili kelokelo</annotation>
+ <annotation cp="🥷🏽">kili melomelo | mata ninisā</annotation>
+ <annotation cp="🥷🏽" type="tts">mata ninisā: kili melomelo</annotation>
+ <annotation cp="🥷🏾">kili melomelo-ʻuliʻuli | mata ninisā</annotation>
+ <annotation cp="🥷🏾" type="tts">mata ninisā: kili melomelo-ʻuliʻuli</annotation>
+ <annotation cp="🥷🏿">kili ʻuliʻuli | mata ninisā</annotation>
+ <annotation cp="🥷🏿" type="tts">mata ninisā: kili ʻuliʻuli</annotation>
<annotation cp="👋🏻">kili hinehina | nima taʻataʻalo</annotation>
<annotation cp="👋🏻" type="tts">nima taʻataʻalo: kili hinehina</annotation>
<annotation cp="👋🏼">kili kelokelo | nima taʻataʻalo</annotation>
diff --git a/common/annotationsDerived/tr.xml b/common/annotationsDerived/tr.xml
index e8ffc7a..ad7222e 100644
--- a/common/annotationsDerived/tr.xml
+++ b/common/annotationsDerived/tr.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">kıstırma hareketi yapan parmaklar: orta koyu cilt tonu</annotation>
<annotation cp="🤌🏿">bravo | çok güzel | harika | kıstırma hareketi yapan parmaklar | koyu cilt tonu | lezzetli | parmaklar</annotation>
<annotation cp="🤌🏿" type="tts">kıstırma hareketi yapan parmaklar: koyu cilt tonu</annotation>
+ <annotation cp="🥷🏻">açık cilt tonu | dövüşçü | gizli | ninja | saklı</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: açık cilt tonu</annotation>
+ <annotation cp="🥷🏼">dövüşçü | gizli | ninja | orta açık cilt tonu | saklı</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: orta açık cilt tonu</annotation>
+ <annotation cp="🥷🏽">dövüşçü | gizli | ninja | orta cilt tonu | saklı</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: orta cilt tonu</annotation>
+ <annotation cp="🥷🏾">dövüşçü | gizli | ninja | orta koyu cilt tonu | saklı</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: orta koyu cilt tonu</annotation>
+ <annotation cp="🥷🏿">dövüşçü | gizli | koyu cilt tonu | ninja | saklı</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: koyu cilt tonu</annotation>
<annotation cp="👋🏻">açık cilt tonu | el | sallama</annotation>
<annotation cp="👋🏻" type="tts">el sallama: açık cilt tonu</annotation>
<annotation cp="👋🏼">el | orta açık cilt tonu | sallama</annotation>
diff --git a/common/annotationsDerived/uk.xml b/common/annotationsDerived/uk.xml
index 275f7ae..8509ad5 100644
--- a/common/annotationsDerived/uk.xml
+++ b/common/annotationsDerived/uk.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">зведені пальці: помірно темний тон шкіри</annotation>
<annotation cp="🤌🏿">жест рукою | запитання | зведені | пальці | сарказм | темний тон шкіри</annotation>
<annotation cp="🤌🏿" type="tts">зведені пальці: темний тон шкіри</annotation>
+ <annotation cp="🥷🏻">боєць | невидимка | ніндзя | покрадьки | світлий тон шкіри</annotation>
+ <annotation cp="🥷🏻" type="tts">ніндзя: світлий тон шкіри</annotation>
+ <annotation cp="🥷🏼">боєць | невидимка | ніндзя | покрадьки | помірно світлий тон шкіри</annotation>
+ <annotation cp="🥷🏼" type="tts">ніндзя: помірно світлий тон шкіри</annotation>
+ <annotation cp="🥷🏽">боєць | невидимка | ніндзя | покрадьки | помірний тон шкіри</annotation>
+ <annotation cp="🥷🏽" type="tts">ніндзя: помірний тон шкіри</annotation>
+ <annotation cp="🥷🏾">боєць | невидимка | ніндзя | покрадьки | помірно темний тон шкіри</annotation>
+ <annotation cp="🥷🏾" type="tts">ніндзя: помірно темний тон шкіри</annotation>
+ <annotation cp="🥷🏿">боєць | невидимка | ніндзя | покрадьки | темний тон шкіри</annotation>
+ <annotation cp="🥷🏿" type="tts">ніндзя: темний тон шкіри</annotation>
<annotation cp="👋🏻">махати | помах | рука | рука, що махає | світлий тон шкіри | тіло</annotation>
<annotation cp="👋🏻" type="tts">рука, що махає: світлий тон шкіри</annotation>
<annotation cp="👋🏼">махати | помах | помірно світлий тон шкіри | рука | рука, що махає | тіло</annotation>
diff --git a/common/annotationsDerived/ur.xml b/common/annotationsDerived/ur.xml
index aa03ea5..5589f42 100644
--- a/common/annotationsDerived/ur.xml
+++ b/common/annotationsDerived/ur.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">بھینچی ہوئی انگلیاں: جلد کی درمیانی سیاہ رنگت</annotation>
<annotation cp="🤌🏿">انگلیاں | بھینچی ہوئی انگلیاں | تفتیش | جلد کی سیاہ رنگت | طنزیہ | ہاتھ کا اشارہ</annotation>
<annotation cp="🤌🏿" type="tts">بھینچی ہوئی انگلیاں: جلد کی سیاہ رنگت</annotation>
+ <annotation cp="🥷🏻">پوشیدگی | جلد کی ہلکی رنگت | خفیہ | لڑاکا | ننجا</annotation>
+ <annotation cp="🥷🏻" type="tts">ننجا: جلد کی ہلکی رنگت</annotation>
+ <annotation cp="🥷🏼">پوشیدگی | جلد کی درمیانی -ہلکی رنگت | خفیہ | لڑاکا | ننجا</annotation>
+ <annotation cp="🥷🏼" type="tts">ننجا: جلد کی درمیانی -ہلکی رنگت</annotation>
+ <annotation cp="🥷🏽">پوشیدگی | جلد کی درمیانی رنگت | خفیہ | لڑاکا | ننجا</annotation>
+ <annotation cp="🥷🏽" type="tts">ننجا: جلد کی درمیانی رنگت</annotation>
+ <annotation cp="🥷🏾">پوشیدگی | جلد کی درمیانی سیاہ رنگت | خفیہ | لڑاکا | ننجا</annotation>
+ <annotation cp="🥷🏾" type="tts">ننجا: جلد کی درمیانی سیاہ رنگت</annotation>
+ <annotation cp="🥷🏿">پوشیدگی | جلد کی سیاہ رنگت | خفیہ | لڑاکا | ننجا</annotation>
+ <annotation cp="🥷🏿" type="tts">ننجا: جلد کی سیاہ رنگت</annotation>
<annotation cp="👋🏻">جسم | جلد کی ہلکی رنگت | لہرانا | ہاتھ</annotation>
<annotation cp="👋🏻" type="tts">ہاتھ لہرانا: جلد کی ہلکی رنگت</annotation>
<annotation cp="👋🏼">جسم | جلد کی درمیانی -ہلکی رنگت | لہرانا | ہاتھ</annotation>
diff --git a/common/annotationsDerived/uz.xml b/common/annotationsDerived/uz.xml
index 4b87c12..be4b1c9 100644
--- a/common/annotationsDerived/uz.xml
+++ b/common/annotationsDerived/uz.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">chimdilgan barmoqlar: 5-teri turi</annotation>
<annotation cp="🤌🏿">6-teri turi | barmoqlar | chimdilgan | istehzoli | juftlangan | qoʻl ishorasi | soʻroq</annotation>
<annotation cp="🤌🏿" type="tts">chimdilgan barmoqlar: 6-teri turi</annotation>
+ <annotation cp="🥷🏻">1–2-teri turi | jangchi | koʻrinmas | ninza | yashirin</annotation>
+ <annotation cp="🥷🏻" type="tts">ninza: 1–2-teri turi</annotation>
+ <annotation cp="🥷🏼">3-teri turi | jangchi | koʻrinmas | ninza | yashirin</annotation>
+ <annotation cp="🥷🏼" type="tts">ninza: 3-teri turi</annotation>
+ <annotation cp="🥷🏽">4-teri turi | jangchi | koʻrinmas | ninza | yashirin</annotation>
+ <annotation cp="🥷🏽" type="tts">ninza: 4-teri turi</annotation>
+ <annotation cp="🥷🏾">5-teri turi | jangchi | koʻrinmas | ninza | yashirin</annotation>
+ <annotation cp="🥷🏾" type="tts">ninza: 5-teri turi</annotation>
+ <annotation cp="🥷🏿">6-teri turi | jangchi | koʻrinmas | ninza | yashirin</annotation>
+ <annotation cp="🥷🏿" type="tts">ninza: 6-teri turi</annotation>
<annotation cp="👋🏻">1–2-teri turi | qoʻl | shapaloq | silkitish | siltash</annotation>
<annotation cp="👋🏻" type="tts">shapaloq: 1–2-teri turi</annotation>
<annotation cp="👋🏼">3-teri turi | qoʻl | shapaloq | silkitish | siltash</annotation>
diff --git a/common/annotationsDerived/vi.xml b/common/annotationsDerived/vi.xml
index 8b9c33f..1079d5b 100644
--- a/common/annotationsDerived/vi.xml
+++ b/common/annotationsDerived/vi.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">ngón tay khum lại: màu da tối trung bình</annotation>
<annotation cp="🤌🏿">cử chỉ tay | khum lại | màu da tối | mỉa mai | ngón tay | ngón tay khum lại | thẩm vấn</annotation>
<annotation cp="🤌🏿" type="tts">ngón tay khum lại: màu da tối</annotation>
+ <annotation cp="🥷🏻">ẩn | đấu sĩ | màu da sáng | ninja | tàng hình</annotation>
+ <annotation cp="🥷🏻" type="tts">ninja: màu da sáng</annotation>
+ <annotation cp="🥷🏼">ẩn | đấu sĩ | màu da sáng trung bình | ninja | tàng hình</annotation>
+ <annotation cp="🥷🏼" type="tts">ninja: màu da sáng trung bình</annotation>
+ <annotation cp="🥷🏽">ẩn | đấu sĩ | màu da trung bình | ninja | tàng hình</annotation>
+ <annotation cp="🥷🏽" type="tts">ninja: màu da trung bình</annotation>
+ <annotation cp="🥷🏾">ẩn | đấu sĩ | màu da tối trung bình | ninja | tàng hình</annotation>
+ <annotation cp="🥷🏾" type="tts">ninja: màu da tối trung bình</annotation>
+ <annotation cp="🥷🏿">ẩn | đấu sĩ | màu da tối | ninja | tàng hình</annotation>
+ <annotation cp="🥷🏿" type="tts">ninja: màu da tối</annotation>
<annotation cp="👋🏻">đang vẫy | màu da sáng | tay | vẫy</annotation>
<annotation cp="👋🏻" type="tts">vẫy tay: màu da sáng</annotation>
<annotation cp="👋🏼">đang vẫy | màu da sáng trung bình | tay | vẫy</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">người: màu da tối trung bình và hói</annotation>
<annotation cp="🧑🏿🦲">giới tính chung | giới tính không xác định | hói | màu da tối | người | người lớn</annotation>
<annotation cp="🧑🏿🦲" type="tts">người: màu da tối và hói</annotation>
- <annotation cp="🧑🏻🍼">cho bú | cho con bú | em bé | màu da sáng | người | người cho con bú</annotation>
+ <annotation cp="🧑🏻🍼">cho bú | cho con bú | em bé | màu da sáng | người | người cho con bú | người cho em bé bú</annotation>
<annotation cp="🧑🏻🍼" type="tts">người cho em bé bú: màu da sáng</annotation>
- <annotation cp="🧑🏼🍼">cho bú | cho con bú | em bé | màu da sáng trung bình | người | người cho con bú</annotation>
+ <annotation cp="🧑🏼🍼">cho bú | cho con bú | em bé | màu da sáng trung bình | người | người cho con bú | người cho em bé bú</annotation>
<annotation cp="🧑🏼🍼" type="tts">người cho em bé bú: màu da sáng trung bình</annotation>
- <annotation cp="🧑🏽🍼">cho bú | cho con bú | em bé | màu da trung bình | người | người cho con bú</annotation>
+ <annotation cp="🧑🏽🍼">cho bú | cho con bú | em bé | màu da trung bình | người | người cho con bú | người cho em bé bú</annotation>
<annotation cp="🧑🏽🍼" type="tts">người cho em bé bú: màu da trung bình</annotation>
- <annotation cp="🧑🏾🍼">cho bú | cho con bú | em bé | màu da tối trung bình | người | người cho con bú</annotation>
+ <annotation cp="🧑🏾🍼">cho bú | cho con bú | em bé | màu da tối trung bình | người | người cho con bú | người cho em bé bú</annotation>
<annotation cp="🧑🏾🍼" type="tts">người cho em bé bú: màu da tối trung bình</annotation>
- <annotation cp="🧑🏿🍼">cho bú | cho con bú | em bé | màu da tối | người | người cho con bú</annotation>
+ <annotation cp="🧑🏿🍼">cho bú | cho con bú | em bé | màu da tối | người | người cho con bú | người cho em bé bú</annotation>
<annotation cp="🧑🏿🍼" type="tts">người cho em bé bú: màu da tối</annotation>
<annotation cp="🧑🏻🎄">bà già Noel | màu da sáng | Noel, giáng sinh</annotation>
<annotation cp="🧑🏻🎄" type="tts">bà già Noel: màu da sáng</annotation>
diff --git a/common/annotationsDerived/yue.xml b/common/annotationsDerived/yue.xml
index 7951c41..f6df855 100644
--- a/common/annotationsDerived/yue.xml
+++ b/common/annotationsDerived/yue.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">卒手指: 中深膚色</annotation>
<annotation cp="🤌🏿">卒 | 卒手指 | 嘲笑 | 手勢 | 手指 | 深膚色 | 質問</annotation>
<annotation cp="🤌🏿" type="tts">卒手指: 深膚色</annotation>
+ <annotation cp="🥷🏻">忍者 | 戰鬥機 | 淺膚色 | 隱形</annotation>
+ <annotation cp="🥷🏻" type="tts">忍者: 淺膚色</annotation>
+ <annotation cp="🥷🏼">中淺膚色 | 忍者 | 戰鬥機 | 隱形</annotation>
+ <annotation cp="🥷🏼" type="tts">忍者: 中淺膚色</annotation>
+ <annotation cp="🥷🏽">中膚色 | 忍者 | 戰鬥機 | 隱形</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 中膚色</annotation>
+ <annotation cp="🥷🏾">中深膚色 | 忍者 | 戰鬥機 | 隱形</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: 中深膚色</annotation>
+ <annotation cp="🥷🏿">忍者 | 戰鬥機 | 深膚色 | 隱形</annotation>
+ <annotation cp="🥷🏿" type="tts">忍者: 深膚色</annotation>
<annotation cp="👋🏻">手 | 揮手 | 揮緊手 | 淺膚色</annotation>
<annotation cp="👋🏻" type="tts">揮手: 淺膚色</annotation>
<annotation cp="👋🏼">中淺膚色 | 手 | 揮手 | 揮緊手</annotation>
diff --git a/common/annotationsDerived/yue_Hans.xml b/common/annotationsDerived/yue_Hans.xml
index a803f08..8a41f7b 100644
--- a/common/annotationsDerived/yue_Hans.xml
+++ b/common/annotationsDerived/yue_Hans.xml
@@ -23,6 +23,16 @@
<annotation cp="🤌🏾" type="tts">卒手指: 中深肤色</annotation>
<annotation cp="🤌🏿">卒 | 卒手指 | 嘲笑 | 手势 | 手指 | 深肤色 | 质问</annotation>
<annotation cp="🤌🏿" type="tts">卒手指: 深肤色</annotation>
+ <annotation cp="🥷🏻">忍者 | 战斗机 | 浅肤色 | 隐形</annotation>
+ <annotation cp="🥷🏻" type="tts">忍者: 浅肤色</annotation>
+ <annotation cp="🥷🏼">中浅肤色 | 忍者 | 战斗机 | 隐形</annotation>
+ <annotation cp="🥷🏼" type="tts">忍者: 中浅肤色</annotation>
+ <annotation cp="🥷🏽">中肤色 | 忍者 | 战斗机 | 隐形</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 中肤色</annotation>
+ <annotation cp="🥷🏾">中深肤色 | 忍者 | 战斗机 | 隐形</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: 中深肤色</annotation>
+ <annotation cp="🥷🏿">忍者 | 战斗机 | 深肤色 | 隐形</annotation>
+ <annotation cp="🥷🏿" type="tts">忍者: 深肤色</annotation>
<annotation cp="👋🏻">手 | 挥手 | 挥紧手 | 浅肤色</annotation>
<annotation cp="👋🏻" type="tts">挥手: 浅肤色</annotation>
<annotation cp="👋🏼">中浅肤色 | 手 | 挥手 | 挥紧手</annotation>
diff --git a/common/annotationsDerived/zh.xml b/common/annotationsDerived/zh.xml
index 95a9af5..69dbff6 100644
--- a/common/annotationsDerived/zh.xml
+++ b/common/annotationsDerived/zh.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">捏手指: 中等-深肤色</annotation>
<annotation cp="🤌🏿">匮乏 | 审讯 | 手势 | 手指 | 挖苦 | 捏手指 | 较深肤色</annotation>
<annotation cp="🤌🏿" type="tts">捏手指: 较深肤色</annotation>
+ <annotation cp="🥷🏻">忍者 | 打斗 | 较浅肤色 | 隐藏 | 隐身</annotation>
+ <annotation cp="🥷🏻" type="tts">忍者: 较浅肤色</annotation>
+ <annotation cp="🥷🏼">中等-浅肤色 | 忍者 | 打斗 | 隐藏 | 隐身</annotation>
+ <annotation cp="🥷🏼" type="tts">忍者: 中等-浅肤色</annotation>
+ <annotation cp="🥷🏽">中等肤色 | 忍者 | 打斗 | 隐藏 | 隐身</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 中等肤色</annotation>
+ <annotation cp="🥷🏾">中等-深肤色 | 忍者 | 打斗 | 隐藏 | 隐身</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: 中等-深肤色</annotation>
+ <annotation cp="🥷🏿">忍者 | 打斗 | 较深肤色 | 隐藏 | 隐身</annotation>
+ <annotation cp="🥷🏿" type="tts">忍者: 较深肤色</annotation>
<annotation cp="👋🏻">你好 | 再见 | 挥手 | 较浅肤色</annotation>
<annotation cp="👋🏻" type="tts">挥手: 较浅肤色</annotation>
<annotation cp="👋🏼">中等-浅肤色 | 你好 | 再见 | 挥手</annotation>
diff --git a/common/annotationsDerived/zh_Hant.xml b/common/annotationsDerived/zh_Hant.xml
index a8910b2..5a71c2c 100644
--- a/common/annotationsDerived/zh_Hant.xml
+++ b/common/annotationsDerived/zh_Hant.xml
@@ -23,6 +23,16 @@
<annotation cp="🤌🏾" type="tts">捏手指: 褐皮膚</annotation>
<annotation cp="🤌🏿">手勢 | 手指 | 捏 | 捏手指 | 疑問 | 黑皮膚</annotation>
<annotation cp="🤌🏿" type="tts">捏手指: 黑皮膚</annotation>
+ <annotation cp="🥷🏻">偷偷 | 忍者 | 武者 | 白皮膚 | 隱身</annotation>
+ <annotation cp="🥷🏻" type="tts">忍者: 白皮膚</annotation>
+ <annotation cp="🥷🏼">偷偷 | 忍者 | 武者 | 隱身 | 黃皮膚</annotation>
+ <annotation cp="🥷🏼" type="tts">忍者: 黃皮膚</annotation>
+ <annotation cp="🥷🏽">偷偷 | 忍者 | 武者 | 淺褐皮膚 | 隱身</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 淺褐皮膚</annotation>
+ <annotation cp="🥷🏾">偷偷 | 忍者 | 武者 | 褐皮膚 | 隱身</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: 褐皮膚</annotation>
+ <annotation cp="🥷🏿">偷偷 | 忍者 | 武者 | 隱身 | 黑皮膚</annotation>
+ <annotation cp="🥷🏿" type="tts">忍者: 黑皮膚</annotation>
<annotation cp="👋🏻">手 | 揮手 | 白皮膚</annotation>
<annotation cp="👋🏻" type="tts">揮手: 白皮膚</annotation>
<annotation cp="👋🏼">手 | 揮手 | 黃皮膚</annotation>
diff --git a/common/annotationsDerived/zh_Hant_HK.xml b/common/annotationsDerived/zh_Hant_HK.xml
index 86cc457..3d3efbf 100644
--- a/common/annotationsDerived/zh_Hant_HK.xml
+++ b/common/annotationsDerived/zh_Hant_HK.xml
@@ -19,6 +19,10 @@
<annotation cp="🤌🏽" type="tts">捏手指: 中等皮膚</annotation>
<annotation cp="🤌🏾">中深皮膚 | 手勢 | 手指 | 捏 | 捏手指 | 疑問</annotation>
<annotation cp="🤌🏾" type="tts">捏手指: 中深皮膚</annotation>
+ <annotation cp="🥷🏽">中等皮膚 | 偷偷 | 忍者 | 武者 | 隱身</annotation>
+ <annotation cp="🥷🏽" type="tts">忍者: 中等皮膚</annotation>
+ <annotation cp="🥷🏾">中深皮膚 | 偷偷 | 忍者 | 武者 | 隱身</annotation>
+ <annotation cp="🥷🏾" type="tts">忍者: 中深皮膚</annotation>
<annotation cp="👋🏽">中等皮膚 | 手 | 揮手</annotation>
<annotation cp="👋🏽" type="tts">揮手: 中等皮膚</annotation>
<annotation cp="👋🏾">中深皮膚 | 手 | 揮手</annotation>
diff --git a/common/annotationsDerived/zu.xml b/common/annotationsDerived/zu.xml
index 2427fc9..75e648c 100644
--- a/common/annotationsDerived/zu.xml
+++ b/common/annotationsDerived/zu.xml
@@ -22,6 +22,16 @@
<annotation cp="🤌🏾" type="tts">iminwe encinziwe: uhlobo-5</annotation>
<annotation cp="🤌🏿">iminwe | iminwe encinziwe | ncinziwe | uhlobo-6 | ukubhuqa | ukuphenywa | ukwenza ngezandla</annotation>
<annotation cp="🤌🏿" type="tts">iminwe encinziwe: uhlobo-6</annotation>
+ <annotation cp="🥷🏻">fihliwe | i-fighter | i-stealth | ininja | uhlobo-1-2</annotation>
+ <annotation cp="🥷🏻" type="tts">ininja: uhlobo-1-2</annotation>
+ <annotation cp="🥷🏼">fihliwe | i-fighter | i-stealth | ininja | uhlobo-3</annotation>
+ <annotation cp="🥷🏼" type="tts">ininja: uhlobo-3</annotation>
+ <annotation cp="🥷🏽">fihliwe | i-fighter | i-stealth | ininja | uhlobo-4</annotation>
+ <annotation cp="🥷🏽" type="tts">ininja: uhlobo-4</annotation>
+ <annotation cp="🥷🏾">fihliwe | i-fighter | i-stealth | ininja | uhlobo-5</annotation>
+ <annotation cp="🥷🏾" type="tts">ininja: uhlobo-5</annotation>
+ <annotation cp="🥷🏿">fihliwe | i-fighter | i-stealth | ininja | uhlobo-6</annotation>
+ <annotation cp="🥷🏿" type="tts">ininja: uhlobo-6</annotation>
<annotation cp="👋🏻">isandla | uhlobo-1-2 | ukuphakamisa isandla | umzimba</annotation>
<annotation cp="👋🏻" type="tts">ukuphakamisa isandla: uhlobo-1-2</annotation>
<annotation cp="👋🏼">isandla | uhlobo-3 | ukuphakamisa isandla | umzimba</annotation>
@@ -510,15 +520,15 @@
<annotation cp="🧑🏾🦲" type="tts">mdala: uhlobo-5, imbungculu</annotation>
<annotation cp="🧑🏿🦲">imbungculu | mdala | ubulili-phakathi | uhlobo-6</annotation>
<annotation cp="🧑🏿🦲" type="tts">mdala: uhlobo-6, imbungculu</annotation>
- <annotation cp="🧑🏻🍼">ingane | uhlobo-1-2 | ukunakekela | ukuncelisa | umuntu | umuntu uncelisa ingane</annotation>
+ <annotation cp="🧑🏻🍼">ingane | uhlobo-1-2 | ukunakekela | ukuncelisa | umuntu | umuntu oncelisa ingane | umuntu uncelisa ingane</annotation>
<annotation cp="🧑🏻🍼" type="tts">umuntu oncelisa ingane: uhlobo-1-2</annotation>
- <annotation cp="🧑🏼🍼">ingane | uhlobo-3 | ukunakekela | ukuncelisa | umuntu | umuntu uncelisa ingane</annotation>
+ <annotation cp="🧑🏼🍼">ingane | uhlobo-3 | ukunakekela | ukuncelisa | umuntu | umuntu oncelisa ingane | umuntu uncelisa ingane</annotation>
<annotation cp="🧑🏼🍼" type="tts">umuntu oncelisa ingane: uhlobo-3</annotation>
- <annotation cp="🧑🏽🍼">ingane | uhlobo-4 | ukunakekela | ukuncelisa | umuntu | umuntu uncelisa ingane</annotation>
+ <annotation cp="🧑🏽🍼">ingane | uhlobo-4 | ukunakekela | ukuncelisa | umuntu | umuntu oncelisa ingane | umuntu uncelisa ingane</annotation>
<annotation cp="🧑🏽🍼" type="tts">umuntu oncelisa ingane: uhlobo-4</annotation>
- <annotation cp="🧑🏾🍼">ingane | uhlobo-5 | ukunakekela | ukuncelisa | umuntu | umuntu uncelisa ingane</annotation>
+ <annotation cp="🧑🏾🍼">ingane | uhlobo-5 | ukunakekela | ukuncelisa | umuntu | umuntu oncelisa ingane | umuntu uncelisa ingane</annotation>
<annotation cp="🧑🏾🍼" type="tts">umuntu oncelisa ingane: uhlobo-5</annotation>
- <annotation cp="🧑🏿🍼">ingane | uhlobo-6 | ukunakekela | ukuncelisa | umuntu | umuntu uncelisa ingane</annotation>
+ <annotation cp="🧑🏿🍼">ingane | uhlobo-6 | ukunakekela | ukuncelisa | umuntu | umuntu oncelisa ingane | umuntu uncelisa ingane</annotation>
<annotation cp="🧑🏿🍼" type="tts">umuntu oncelisa ingane: uhlobo-6</annotation>
<annotation cp="🧑🏻🎄">Claus, ukhisimusi | mx claus | u-mx claus | uhlobo-1-2</annotation>
<annotation cp="🧑🏻🎄" type="tts">u-mx claus: uhlobo-1-2</annotation>
diff --git a/common/bcp47/number.xml b/common/bcp47/number.xml
index c3d31d5..40aa716 100644
--- a/common/bcp47/number.xml
+++ b/common/bcp47/number.xml
@@ -80,6 +80,7 @@
<type name="roman" description="Roman upper case numerals — algorithmic"/>
<type name="romanlow" description="Roman lowercase numerals — algorithmic"/>
<type name="saur" description="Saurashtra digits" since="21"/>
+ <type name="segment" description="Legacy computing segmented digits" since="37"/>
<type name="shrd" description="Sharada digits" since="21"/>
<type name="sind" description="Khudawadi digits" since="28"/>
<type name="sinh" description="Sinhala Lith digits" since="28"/>
diff --git a/seed/casing/ff_Adlm.xml b/common/casing/ff_Adlm.xml
similarity index 100%
rename from seed/casing/ff_Adlm.xml
rename to common/casing/ff_Adlm.xml
diff --git a/seed/main/mni_IN.xml b/common/collation/ff.xml
similarity index 62%
copy from seed/main/mni_IN.xml
copy to common/collation/ff.xml
index 01c64c4..ae34ccb 100644
--- a/seed/main/mni_IN.xml
+++ b/common/collation/ff.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+<!--
+Copyright © 1991-2014 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$"/>
- <language type="mni"/>
- <territory type="IN"/>
+ <language type="ff" />
</identity>
</ldml>
diff --git a/common/collation/ff_Adlm.xml b/common/collation/ff_Adlm.xml
new file mode 100644
index 0000000..7122c36
--- /dev/null
+++ b/common/collation/ff_Adlm.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!--
+Copyright © 1991-2014 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$"/>
+ <language type="ff" />
+ <script type="Adlm" />
+ </identity>
+ <collations>
+ <collation type="standard" draft="contributed">
+ <cr><![CDATA[
+ ## alifs (2)
+ # “𞤢” U+1E922 ADLAM SMALL LETTER ALIF
+ &𞤀<𞤀𞥄
+ &𞤀𞥄=𞤀𞤀
+ &𞤢<𞤢𞥄
+ &𞤢𞥄=𞤢𞤢
+ ## consonants (58)
+ # “𞤣” U+1E923 ADLAM SMALL LETTER DAALI
+ &𞤁<𞤁𞥆
+ &𞤁𞥆=𞤁𞤁
+ &𞤣<𞤣𞥆
+ &𞤣𞥆=𞤣𞤣
+ # “𞤤” U+1E924 ADLAM SMALL LETTER LAAM
+ &𞤂<𞤂𞥆
+ &𞤂𞥆=𞤂𞤂
+ &𞤤<𞤤𞥆
+ &𞤤𞥆=𞤤𞤤
+ # “𞤥” U+1E925 ADLAM SMALL LETTER MIIM
+ &𞤃<𞤃𞥆
+ &𞤃𞥆=𞤃𞤃
+ &𞤥<𞤥𞥆
+ &𞤥𞥆=𞤥𞤥
+ # “𞤦” U+1E926 ADLAM SMALL LETTER BA
+ &𞤄<𞤄𞥆
+ &𞤄𞥆=𞤄𞤄
+ &𞤦<𞤦𞥆
+ &𞤦𞥆=𞤦𞤦
+ # “𞤧” U+1E927 ADLAM SMALL LETTER SINNYIIYHE
+ &𞤅<𞤅𞥆
+ &𞤅𞥆=𞤅𞤅
+ &𞤧<𞤧𞥆
+ &𞤧𞥆=𞤧𞤧
+ # “𞤨” U+1E928 ADLAM SMALL LETTER PE
+ &𞤆<𞤆𞥆
+ &𞤆𞥆=𞤆𞤆
+ &𞤨<𞤨𞥆
+ &𞤨𞥆=𞤨𞤨
+ # “𞤩” U+1E929 ADLAM SMALL LETTER BHE
+ &𞤇<𞤇𞥆
+ &𞤇𞥆=𞤇𞤇
+ &𞤩<𞤩𞥆
+ &𞤩𞥆=𞤩𞤩
+ # “𞤪” U+1E92A ADLAM SMALL LETTER RA
+ &𞤈<𞤈𞥆
+ &𞤈𞥆=𞤈𞤈
+ &𞤪<𞤪𞥆
+ &𞤪𞥆=𞤪𞤪
+ # “𞤬” U+1E92C ADLAM SMALL LETTER FA
+ &𞤊<𞤊𞥆
+ &𞤊𞥆=𞤊𞤊
+ &𞤬<𞤬𞥆
+ &𞤬𞥆=𞤬𞤬
+ # “𞤯” U+1E92F ADLAM SMALL LETTER DHA
+ &𞤍<𞤍𞥆
+ &𞤍𞥆=𞤍𞤍
+ &𞤯<𞤯𞥆
+ &𞤯𞥆=𞤯𞤯
+ # “𞤰” U+1E930 ADLAM SMALL LETTER YHE
+ &𞤎<𞤎𞥆
+ &𞤎𞥆=𞤎𞤎
+ &𞤰<𞤰𞥆
+ &𞤰𞥆=𞤰𞤰
+ # “𞤱” U+1E931 ADLAM SMALL LETTER WAW
+ &𞤏<𞤏𞥆
+ &𞤏𞥆=𞤏𞤏
+ &𞤱<𞤱𞥆
+ &𞤱𞥆=𞤱𞤱
+ # “𞤲” U+1E932 ADLAM SMALL LETTER NUN
+ &𞤐<𞤐𞥆
+ &𞤐𞥆=𞤐𞤐
+ &𞤲<𞤲𞥆
+ &𞤲𞥆=𞤲𞤲
+ # “𞤳” U+1E933 ADLAM SMALL LETTER KAF
+ &𞤑<𞤑𞥆
+ &𞤑𞥆=𞤑𞤑
+ &𞤳<𞤳𞥆
+ &𞤳𞥆=𞤳𞤳
+ # “𞤴” U+1E934 ADLAM SMALL LETTER YA
+ &𞤒<𞤒𞥆
+ &𞤒𞥆=𞤒𞤒
+ &𞤴<𞤴𞥆
+ &𞤴𞥆=𞤴𞤴
+ # “𞤶” U+1E936 ADLAM SMALL LETTER JIIM
+ &𞤔<𞤔𞥆
+ &𞤔𞥆=𞤔𞤔
+ &𞤶<𞤶𞥆
+ &𞤶𞥆=𞤶𞤶
+ # “𞤷” U+1E937 ADLAM SMALL LETTER CHI
+ &𞤕<𞤕𞥆
+ &𞤕𞥆=𞤕𞤕
+ &𞤷<𞤷𞥆
+ &𞤷𞥆=𞤷𞤷
+ # “𞤸” U+1E938 ADLAM SMALL LETTER HA
+ &𞤖<𞤖𞥆
+ &𞤖𞥆=𞤖𞤖
+ &𞤸<𞤸𞥆
+ &𞤸𞥆=𞤸𞤸
+ # “𞤹” U+1E939 ADLAM SMALL LETTER QAAF
+ &𞤗<𞤗𞥆
+ &𞤗𞥆=𞤗𞤗
+ &𞤹<𞤹𞥆
+ &𞤹𞥆=𞤹𞤹
+ # “𞤺” U+1E93A ADLAM SMALL LETTER GA
+ &𞤘<𞤘𞥆
+ &𞤘𞥆=𞤘𞤘
+ &𞤺<𞤺𞥆
+ &𞤺𞥆=𞤺𞤺
+ # “𞤻” U+1E93B ADLAM SMALL LETTER NYA
+ &𞤙<𞤙𞥆
+ &𞤙𞥆=𞤙𞤙
+ &𞤻<𞤻𞥆
+ &𞤻𞥆=𞤻𞤻
+ # “𞤼” U+1E93C ADLAM SMALL LETTER TU
+ &𞤚<𞤚𞥆
+ &𞤚𞥆=𞤚𞤚
+ &𞤼<𞤼𞥆
+ &𞤼𞥆=𞤼𞤼
+ # “𞤽” U+1E93D ADLAM SMALL LETTER NHA
+ &𞤛<𞤛𞥆
+ &𞤛𞥆=𞤛𞤛
+ &𞤽<𞤽𞥆
+ &𞤽𞥆=𞤽𞤽
+ # “𞤾” U+1E93E ADLAM SMALL LETTER VA
+ &𞤜<𞤜𞥆
+ &𞤜𞥆=𞤜𞤜
+ &𞤾<𞤾𞥆
+ &𞤾𞥆=𞤾𞤾
+ # “𞤿” U+1E93F ADLAM SMALL LETTER KHA
+ &𞤝<𞤝𞥆
+ &𞤝𞥆=𞤝𞤝
+ &𞤿<𞤿𞥆
+ &𞤿𞥆=𞤿𞤿
+ # “𞥀” U+1E940 ADLAM SMALL LETTER GBE
+ &𞤞<𞤞𞥆
+ &𞤞𞥆=𞤞𞤞
+ &𞥀<𞥀𞥆
+ &𞥀𞥆=𞥀𞥀
+ # “𞥁” U+1E941 ADLAM SMALL LETTER ZAL
+ &𞤟<𞤟𞥆
+ &𞤟𞥆=𞤟𞤟
+ &𞥁<𞥁𞥆
+ &𞥁𞥆=𞥁𞥁
+ # “𞥂” U+1E942 ADLAM SMALL LETTER KPO
+ &𞤠<𞤠𞥆
+ &𞤠𞥆=𞤠𞤠
+ &𞥂<𞥂𞥆
+ &𞥂𞥆=𞥂𞥂
+ # “𞥃” U+1E943 ADLAM SMALL LETTER SHA
+ &𞤡<𞤡𞥆
+ &𞤡𞥆=𞤡𞤡
+ &𞥃<𞥃𞥆
+ &𞥃𞥆=𞥃𞥃
+ ## othervowels (8)
+ # “𞤫” U+1E92B ADLAM SMALL LETTER E
+ &𞤉<𞤉𞥅
+ &𞤉𞥅<<𞤉𞤉
+ &𞤫<𞤫𞥅
+ &𞤫𞥅<<𞤫𞤫
+ # “𞤭” U+1E92D ADLAM SMALL LETTER I
+ &𞤋<𞤋𞥅
+ &𞤋𞥅<<𞤋𞤋
+ &𞤭<𞤭𞥅
+ &𞤭𞥅<<𞤭𞤭
+ # “𞤮” U+1E92E ADLAM SMALL LETTER O
+ &𞤌<𞤌𞥅
+ &𞤌𞥅<<𞤌𞤌
+ &𞤮<𞤮𞥅
+ &𞤮𞥅<<𞤮𞤮
+ # “𞤵” U+1E935 ADLAM SMALL LETTER U
+ &𞤓<𞤓𞥅
+ &𞤓𞥅<<𞤓𞤓
+ &𞤵<𞤵𞥅
+ &𞤵𞥅<<𞤵𞤵
+ ]]></cr>
+ </collation>
+ </collations>
+</ldml>
diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd
index e2782b1..f22fdcb 100644
--- a/common/dtd/ldml.dtd
+++ b/common/dtd/ldml.dtd
@@ -46,7 +46,7 @@
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "36.1" >
+<!ATTLIST version cldrVersion CDATA #FIXED "37" >
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -67,7 +67,7 @@
<!ATTLIST language type NMTOKEN #REQUIRED >
<!--@MATCH:validity/locale-->
<!ATTLIST language alt NMTOKENS #IMPLIED >
- <!--@MATCH:literal/long, secondary, short, variant-->
+ <!--@MATCH:literal/long, secondary, short, variant, menu-->
<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
@@ -213,7 +213,7 @@
<!ELEMENT subdivision ( #PCDATA ) >
<!ATTLIST subdivision type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/subdivision-->
+ <!--@MATCH:or/validity/subdivision||literal/AS, AW, AX, BL, CP, CW, GF, GP, GU, HK, IC, MF, MO, MP, MQ, NC, PF, PM, PR, RE, SX, TA, TF, TW, UM, VI, WF, YT, itsd, no50-->
<!ATTLIST subdivision alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ATTLIST subdivision draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -251,7 +251,7 @@
<!ELEMENT key ( #PCDATA ) >
<!ATTLIST key type NMTOKEN #REQUIRED >
- <!--@MATCH:bcp47/anykey-->
+ <!--@MATCH:or/bcp47/anykey||literal/t-->
<!ATTLIST key alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ATTLIST key draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -1607,7 +1607,7 @@
<!ELEMENT intervalFormatItem ( alias | ( greatestDifference*, special* ) ) >
<!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
<!-- TODO: check to see if this should be minimized -->
- <!--@MATCH:literal/Bh, Bhm, Gy, GyM, GyMEd, GyMMM, GyMMMEd, GyMMMd, GyMd, H, Hm, Hmv, Hv, M, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEd, MMMMd, MMMd, Md, d, h, hm, hmv, hv, y, yM, yMEd, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMd, yMMMd, yMd-->
+ <!--@MATCH:literal/Bh, Bhm, Gy, GyM, GyMEd, GyMMM, GyMMMEd, GyMMMd, GyMd, H, Hm, Hmv, Hv, M, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEd, MMMMd, MMMd, Md, d, h, hm, hmv, hv, y, yM, yMEd, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMd, yMMMd, yMd, GGGGGyM, GGGGGyMEd, GGGGGyMd, GyMMMM, GyMMMMEd, GyMMMMd-->
<!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ATTLIST intervalFormatItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -2541,9 +2541,9 @@
<!--@VALUE-->
<!--@DEPRECATED-->
-<!ELEMENT compoundUnit ( alias | ( compoundUnitPattern*, special* ) ) >
+<!ELEMENT compoundUnit ( alias | ( compoundUnitPattern1*, compoundUnitPattern*, unitPrefixPattern*, special* ) ) >
<!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
- <!--@MATCH:literal/per, times-->
+ <!--@MATCH:or/regex/10p-?[0-9]{1,2}||literal/per, times, power2, power3-->
<!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ATTLIST compoundUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -2555,6 +2555,15 @@
<!--@VALUE-->
<!--@DEPRECATED-->
+<!ELEMENT compoundUnitPattern1 ( #PCDATA ) >
+<!ATTLIST compoundUnitPattern1 count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
+<!ATTLIST compoundUnitPattern1 alt NMTOKENS #IMPLIED >
+ <!--@MATCH:literal/variant-->
+<!ATTLIST compoundUnitPattern1 draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+ <!--@METADATA-->
+<!ATTLIST compoundUnitPattern1 references CDATA #IMPLIED >
+ <!--@METADATA-->
+
<!ELEMENT compoundUnitPattern ( #PCDATA ) >
<!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
@@ -2566,6 +2575,14 @@
<!--@VALUE-->
<!--@DEPRECATED-->
+<!ELEMENT unitPrefixPattern ( #PCDATA ) >
+<!ATTLIST unitPrefixPattern alt NMTOKENS #IMPLIED >
+ <!--@MATCH:literal/variant-->
+<!ATTLIST unitPrefixPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+ <!--@METADATA-->
+<!ATTLIST unitPrefixPattern references CDATA #IMPLIED >
+ <!--@METADATA-->
+
<!ELEMENT coordinateUnit ( alias | ( displayName*, coordinateUnitPattern*, special* ) ) >
<!ATTLIST coordinateUnit alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd
index 510fe34..5dcbb60 100644
--- a/common/dtd/ldmlBCP47.dtd
+++ b/common/dtd/ldmlBCP47.dtd
@@ -16,7 +16,7 @@
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "36.1" >
+<!ATTLIST version cldrVersion CDATA #FIXED "37" >
<!--@MATCH:version-->
<!--@VALUE-->
diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd
index 50e6646..02f4cb9 100644
--- a/common/dtd/ldmlSupplemental.dtd
+++ b/common/dtd/ldmlSupplemental.dtd
@@ -10,18 +10,18 @@
$Revision$
-->
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups? ) >
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
<!ELEMENT version EMPTY >
<!--@METADATA-->
<!ATTLIST version number CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "36.1" >
- <!--@MATCH:version-->
+<!ATTLIST version cldrVersion CDATA #FIXED "37" >
+ <!--@MATCH:version-->
<!--@VALUE-->
-<!ATTLIST version unicodeVersion CDATA #FIXED "13.0" >
- <!--@MATCH:version-->
+<!ATTLIST version unicodeVersion CDATA #FIXED "13.0.0" >
+ <!--@MATCH:version-->
<!--@VALUE-->
<!ELEMENT generation EMPTY >
@@ -49,18 +49,18 @@
<!ELEMENT info EMPTY >
<!ATTLIST info iso4217 NMTOKEN #REQUIRED >
- <!--@MATCH:or/validity/currency||literal/DEFAULT-->
+ <!--@MATCH:or/validity/currency||literal/DEFAULT-->
<!ATTLIST info digits NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~5-->
+ <!--@MATCH:range/0~5-->
<!--@VALUE-->
<!ATTLIST info rounding NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~5-->
+ <!--@MATCH:range/0~5-->
<!--@VALUE-->
<!ATTLIST info cashDigits NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~100-->
+ <!--@MATCH:range/0~100-->
<!--@VALUE-->
<!ATTLIST info cashRounding NMTOKEN #IMPLIED >
- <!--@MATCH:literal/0, 5, 50-->
+ <!--@MATCH:literal/0, 5, 50-->
<!--@VALUE-->
<!ATTLIST info draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -70,7 +70,7 @@
<!ELEMENT region ( currency* ) >
<!ATTLIST region iso3166 NMTOKEN #REQUIRED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!ATTLIST region draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -81,11 +81,11 @@
<!--@VALUE-->
<!--@DEPRECATED-->
<!ATTLIST currency from NMTOKEN #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd-->
+ <!--@MATCH:time/yyyy-MM-dd-->
<!ATTLIST currency to NMTOKEN #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd-->
+ <!--@MATCH:time/yyyy-MM-dd-->
<!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
- <!--@MATCH:validity/currency-->
+ <!--@MATCH:validity/currency-->
<!ATTLIST currency digits NMTOKEN #IMPLIED >
<!--@VALUE-->
<!ATTLIST currency rounding NMTOKEN #IMPLIED >
@@ -110,9 +110,9 @@
<!ELEMENT group EMPTY >
<!ATTLIST group type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!ATTLIST group contains NMTOKENS #IMPLIED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST group grouping (true | false) #IMPLIED >
<!--@VALUE-->
@@ -127,23 +127,23 @@
<!ELEMENT subgroup EMPTY >
<!ATTLIST subgroup type NMTOKEN #REQUIRED >
- <!--@MATCH:or/validity/region||validity/subdivision-->
+ <!--@MATCH:or/validity/region||validity/subdivision-->
<!ATTLIST subgroup subtype NMTOKEN #IMPLIED >
<!--@DEPRECATED-->
<!ATTLIST subgroup contains NMTOKENS #IMPLIED >
- <!--@MATCH:set/validity/subdivision-->
+ <!--@MATCH:set/or/validity/subdivision||literal/itca, itnu, itor, itsd, itss, no01, no02, no03, no04, no05, no06, no07, no08, no09, no10, no11, no12, no14, no15, no18, no19, no20, no21, no22, no50-->
<!--@VALUE-->
<!ELEMENT languageData ( language* ) >
<!ELEMENT language EMPTY >
<!ATTLIST language type NMTOKEN #REQUIRED >
- <!--@MATCH:set/validity/language-->
+ <!--@MATCH:set/validity/language-->
<!ATTLIST language scripts NMTOKENS #IMPLIED >
- <!--@MATCH:set/validity/script-->
+ <!--@MATCH:set/validity/script-->
<!--@VALUE-->
<!ATTLIST language territories NMTOKENS #IMPLIED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST language variants NMTOKENS #IMPLIED >
<!--@VALUE-->
@@ -166,36 +166,36 @@
<!ELEMENT territory ( languagePopulation* ) >
<!ATTLIST territory type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!ATTLIST territory gdp NMTOKEN #REQUIRED >
- <!--@MATCH:range/0~100000000000000-->
+ <!--@MATCH:range/0~100000000000000-->
<!--@VALUE-->
<!ATTLIST territory literacyPercent NMTOKEN #REQUIRED >
- <!--@MATCH:range/0.0~100.0-->
+ <!--@MATCH:range/0.0~100.0-->
<!--@VALUE-->
<!ATTLIST territory population NMTOKEN #REQUIRED >
- <!--@MATCH:range/0~10000000000-->
+ <!--@MATCH:range/0~10000000000-->
<!--@VALUE-->
<!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
<!ATTLIST territory references CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ATTLIST territory alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
<!ELEMENT languagePopulation EMPTY >
<!ATTLIST languagePopulation type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/locale-->
+ <!--@MATCH:validity/locale-->
<!ATTLIST languagePopulation literacyPercent NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~100-->
+ <!--@MATCH:range/0~100-->
<!--@VALUE-->
<!ATTLIST languagePopulation writingPercent NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~100-->
+ <!--@MATCH:range/0~100-->
<!--@VALUE-->
<!ATTLIST languagePopulation populationPercent NMTOKEN #REQUIRED >
- <!--@MATCH:range/0.0~100.0-->
+ <!--@MATCH:range/0.0~100.0-->
<!--@VALUE-->
<!ATTLIST languagePopulation officialStatus (de_facto_official | official | official_regional | official_minority) #IMPLIED >
<!--@VALUE-->
@@ -203,7 +203,7 @@
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
<!ATTLIST languagePopulation references CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ATTLIST languagePopulation alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
@@ -223,7 +223,7 @@
<!ELEMENT calendar ( calendarSystem?, eras? ) >
<!ATTLIST calendar type NMTOKEN #REQUIRED >
- <!--@MATCH:bcp47/ca-->
+ <!--@MATCH:bcp47/ca-->
<!ATTLIST calendar territories NMTOKENS #IMPLIED >
<!-- use ordering attribute in calendarPreference element instead. -->
<!--@VALUE-->
@@ -248,12 +248,12 @@
<!ELEMENT era EMPTY >
<!ATTLIST era type NMTOKEN #REQUIRED >
- <!--@MATCH:range/0~250-->
+ <!--@MATCH:range/0~250-->
<!ATTLIST era start CDATA #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd-->
+ <!--@MATCH:time/yyyy-MM-dd-->
<!--@VALUE-->
<!ATTLIST era end CDATA #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd-->
+ <!--@MATCH:time/yyyy-MM-dd-->
<!--@VALUE-->
<!ATTLIST era named (true | false) #IMPLIED >
<!--@VALUE-->
@@ -262,9 +262,9 @@
<!ELEMENT calendarPreference EMPTY >
<!ATTLIST calendarPreference territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!ATTLIST calendarPreference ordering NMTOKENS #REQUIRED >
- <!--@MATCH:set/bcp47/ca-->
+ <!--@MATCH:set/bcp47/ca-->
<!--@VALUE-->
<!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd*, weekOfPreference* ) >
@@ -272,7 +272,7 @@
<!ELEMENT minDays EMPTY >
<!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
<!ATTLIST minDays territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -285,13 +285,13 @@
<!ELEMENT firstDay EMPTY >
<!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
<!ATTLIST firstDay territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
<!ATTLIST firstDay references CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ATTLIST firstDay alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
@@ -299,7 +299,7 @@
<!ELEMENT weekendStart EMPTY >
<!ATTLIST weekendStart day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
<!ATTLIST weekendStart territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -312,7 +312,7 @@
<!ELEMENT weekendEnd EMPTY >
<!ATTLIST weekendEnd day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
<!ATTLIST weekendEnd territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -324,20 +324,20 @@
<!ELEMENT weekOfPreference EMPTY >
<!ATTLIST weekOfPreference locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!ATTLIST weekOfPreference ordering NMTOKENS #REQUIRED >
- <!--@MATCH:set/literal/weekOfDate, weekOfInterval, weekOfMonth, weekOfYear-->
+ <!--@MATCH:set/literal/weekOfDate, weekOfInterval, weekOfMonth, weekOfYear-->
<!--@VALUE-->
<!ELEMENT timeData ( hours* ) >
<!ELEMENT hours EMPTY >
<!ATTLIST hours allowed NMTOKENS #REQUIRED >
- <!--@MATCH:set/literal/H, h, K, k, hB, hb-->
+ <!--@MATCH:set/literal/H, h, K, k, hB, hb-->
<!ATTLIST hours preferred NMTOKEN #REQUIRED >
- <!--@MATCH:literal/H, h-->
+ <!--@MATCH:literal/H, h-->
<!ATTLIST hours regions NMTOKENS #REQUIRED >
- <!--@MATCH:set/or/validity/region||validity/locale-->
+ <!--@MATCH:set/or/validity/region||validity/locale-->
<!--@VALUE-->
<!ATTLIST hours draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
@@ -350,7 +350,7 @@
<!ATTLIST measurementSystem type (metric | US | UK) #REQUIRED >
<!ATTLIST measurementSystem category (temperature) #IMPLIED >
<!ATTLIST measurementSystem territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -363,7 +363,7 @@
<!ELEMENT paperSize EMPTY >
<!ATTLIST paperSize type (A4 | US-Letter) #REQUIRED >
<!ATTLIST paperSize territories NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -373,18 +373,72 @@
<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/variant-->
+<!ELEMENT unitConstants ( unitConstant* ) >
+
+<!ELEMENT unitConstant EMPTY >
+<!ATTLIST unitConstant constant NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][_A-Za-z0-9]*-->
+<!ATTLIST unitConstant value CDATA #REQUIRED >
+ <!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
+ <!--@VALUE-->
+<!ATTLIST unitConstant status NMTOKEN #IMPLIED >
+ <!--@MATCH:literal/approximate, exact-->
+ <!--@VALUE-->
+
+<!ELEMENT unitQuantities ( unitQuantity* ) >
+
+<!ELEMENT unitQuantity EMPTY >
+<!ATTLIST unitQuantity baseUnit NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+<!ATTLIST unitQuantity quantity NMTOKENS #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+ <!--@VALUE-->
+<!ATTLIST unitQuantity status NMTOKEN #IMPLIED >
+ <!--@MATCH:regex/simple-->
+ <!--@VALUE-->
+
+<!ELEMENT convertUnits ( convertUnit* ) >
+
+<!ELEMENT convertUnit EMPTY >
+<!ATTLIST convertUnit source NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/(100-)?[A-Za-z][-A-Za-z0-9]*-->
+<!ATTLIST convertUnit baseUnit NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+ <!--@VALUE-->
+<!ATTLIST convertUnit factor CDATA #IMPLIED >
+ <!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
+ <!--@VALUE-->
+<!ATTLIST convertUnit offset CDATA #IMPLIED >
+ <!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
+ <!--@VALUE-->
+<!ATTLIST convertUnit systems NMTOKENS #IMPLIED >
+ <!--@MATCH:set/literal/ussystem, uksystem-->
+ <!--@VALUE-->
+
<!ELEMENT unitPreferenceData ( unitPreferences* ) >
+<!ATTLIST unitPreferenceData draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+ <!--@METADATA-->
<!ELEMENT unitPreferences ( unitPreference* ) >
<!ATTLIST unitPreferences category NMTOKEN #REQUIRED >
- <!--@MATCH:literal/area, concentr, consumption, duration, energy, length, mass, pressure, speed, temperature, volume-->
+ <!--@MATCH:regex/[a-z]+([-][a-z]+)*-->
<!ATTLIST unitPreferences usage NMTOKENS #REQUIRED >
- <!--@MATCH:literal/baromtrc, blood-glucose, food, land-agricult, land-commercl, land-residntl, music-track, person, person-age, person-usage, rainfall, road, road-travel, snowfall, tv-program, vehicle, vehicle-fuel, visiblty, weather, wind-->
+ <!--@MATCH:regex/[a-z]+([-][a-z]+)*-->
<!ATTLIST unitPreferences scope (small) #IMPLIED >
+ <!--@DEPRECATED-->
+<!ATTLIST unitPreferences draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+ <!--@METADATA-->
+ <!--@DEPRECATED-->
<!ELEMENT unitPreference ( #PCDATA ) >
+ <!--@ORDERED-->
<!ATTLIST unitPreference regions NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
+<!ATTLIST unitPreference geq NMTOKEN #IMPLIED >
+ <!--@MATCH:any-->
+<!ATTLIST unitPreference skeleton CDATA #IMPLIED >
+ <!--@MATCH:any-->
+ <!--@VALUE-->
<!ATTLIST unitPreference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
<!ATTLIST unitPreference references CDATA #IMPLIED >
@@ -397,27 +451,27 @@
<!ELEMENT mapTimezones ( mapZone* ) >
<!ATTLIST mapTimezones type NMTOKEN #IMPLIED >
- <!--@MATCH:literal/metazones-->
+ <!--@MATCH:literal/metazones-->
<!ATTLIST mapTimezones otherVersion CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ATTLIST mapTimezones typeVersion CDATA #IMPLIED >
- <!--@MATCH:regex/[0-9]{4}[a-z]+-->
+ <!--@MATCH:regex/[0-9]{4}[a-z]+-->
<!--@METADATA-->
<!ATTLIST mapTimezones references CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ELEMENT mapZone EMPTY >
<!ATTLIST mapZone type CDATA #REQUIRED >
- <!--@MATCH:set/bcp47/tz-->
+ <!--@MATCH:set/bcp47/tz-->
<!--@VALUE-->
<!ATTLIST mapZone other CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST mapZone territory CDATA #IMPLIED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!ATTLIST mapZone references CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@METADATA-->
<!ELEMENT zoneFormatting ( zoneItem* ) >
@@ -455,7 +509,7 @@
<!ELEMENT character ( substitute* ) >
<!ATTLIST character value CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST character draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -484,17 +538,17 @@
<!ELEMENT transform ( ( comment | tRule )* ) >
<!ATTLIST transform source CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ATTLIST transform target CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ATTLIST transform variant CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ATTLIST transform direction (forward | backward | both) "both" >
<!ATTLIST transform alias CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!--@VALUE-->
<!ATTLIST transform backwardAlias CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!--@VALUE-->
<!ATTLIST transform visibility (internal | external) "external" >
<!--@VALUE-->
@@ -544,13 +598,13 @@
<!ELEMENT attributes EMPTY >
<!--@ORDERED-->
<!ATTLIST attributes element NMTOKENS #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributes attribute NMTOKENS #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributes attributeValue CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributes draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -565,10 +619,10 @@
<!ELEMENT variable ( #PCDATA ) >
<!--@ORDERED-->
<!ATTLIST variable type NMTOKEN #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST variable id CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
@@ -576,81 +630,99 @@
<!ELEMENT attributeValues ( #PCDATA ) >
<!--@ORDERED-->
<!ATTLIST attributeValues dtds NMTOKEN #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST attributeValues type NMTOKEN #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST attributeValues elements NMTOKENS #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributeValues attributes NMTOKENS #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributeValues order NMTOKEN #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST attributeValues draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
-<!ELEMENT alias ( languageAlias*, scriptAlias*, territoryAlias*, subdivisionAlias*, variantAlias*, zoneAlias* ) >
+<!ELEMENT alias ( languageAlias*, scriptAlias*, territoryAlias*, subdivisionAlias*, variantAlias*, zoneAlias*, unitAlias*, usageAlias* ) >
<!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
<!ELEMENT languageAlias EMPTY >
<!ATTLIST languageAlias type NMTOKEN #REQUIRED >
- <!--@MATCH:or/validity/locale||literal/aa_SAAHO, aar, abk, afr, aka, alb, amh, ara, arg, arm, art_lojban, asm, ava, ave, aym, aze, bak, bam, baq, bel, ben, bih, bis, bod, bos, bre, bul, bur, cat, ces, cha, che, chi, chu, chv, cor, cos, cre, cym, cze, dan, deu, div, dut, dzo, ell, eng, epo, est, eus, ewe, fao, fas, fij, fin, fra, fre, fry, ful, geo, ger, gla, gle, glg, glv, gre, grn, guj, hat, hau, hbs, heb, her, hin, hmo, hrv, hun, hye, i_ami, i_bnn, i_hak, i_klingon, i_lux, i_navajo, i_pwn, i_tao, i_tay, i_tsu, ibo, ice, ido, iii, iku, ile, ina, ind, ipk, isl, ita, jav, jpn, kal, kan, kas, kat, kau, kaz, khm, kik, kin, kir, kom, kon, kor, kua, kur, lao, lat, lav, lim, lin, lit, ltz, lub, lug, mac, mah, mal, mao, mar, may, mkd, mlg, mlt, mol, mon, mri, msa, mya, nau, nav, nbl, nde, ndo, nep, nld, nno, no_BOKMAL, no_NYNORSK, no_bok, no_nyn, nob, nor, nya, oci, oji, ori, orm, oss, pan, per, pli, pol, por, pus, que, roh, ron, rum, run, rus, sag, san, scc, scr, sgn_BE_FR, sgn_BE_NL, sgn_CH_DE, sin, slk, slo, slv, sme, smo, sna, snd, som, sot, spa, sqi, srd, srp, ssw, sun, swa, swe, tah, tam, tat, tel, tgk, tgl, tha, tib, tir, ton, tsn, tso, tuk, tur, twi, uig, ukr, urd, uzb, ven, vie, vol, wel, wln, wol, xho, yid, yor, zh_guoyu, zh_hakka, zh_min_nan, zh_xiang, zha, zho, zul-->
+ <!--@MATCH:or/validity/locale||literal/aa_SAAHO, aar, abk, afr, aka, alb, amh, ara, arg, arm, art_lojban, asm, ava, ave, aym, aze, bak, bam, baq, bel, ben, bih, bis, bod, bos, bre, bul, bur, cat, ces, cha, che, chi, chu, chv, cor, cos, cre, cym, cze, dan, deu, div, dut, dzo, ell, eng, epo, est, eus, ewe, fao, fas, fij, fin, fra, fre, fry, ful, geo, ger, gla, gle, glg, glv, gre, grn, guj, hat, hau, hbs, heb, her, hin, hmo, hrv, hun, hye, i_ami, i_bnn, i_hak, i_klingon, i_lux, i_navajo, i_pwn, i_tao, i_tay, i_tsu, ibo, ice, ido, iii, iku, ile, ina, ind, ipk, isl, ita, jav, jpn, kal, kan, kas, kat, kau, kaz, khm, kik, kin, kir, kom, kon, kor, kua, kur, lao, lat, lav, lim, lin, lit, ltz, lub, lug, mac, mah, mal, mao, mar, may, mkd, mlg, mlt, mol, mon, mri, msa, mya, nau, nav, nbl, nde, ndo, nep, nld, nno, no_BOKMAL, no_NYNORSK, no_bok, no_nyn, nob, nor, nya, oci, oji, ori, orm, oss, pan, per, pli, pol, por, pus, que, roh, ron, rum, run, rus, sag, san, scc, scr, sgn_BE_FR, sgn_BE_NL, sgn_CH_DE, sin, slk, slo, slv, sme, smo, sna, snd, som, sot, spa, sqi, srd, srp, ssw, sun, swa, swe, tah, tam, tat, tel, tgk, tgl, tha, tib, tir, ton, tsn, tso, tuk, tur, twi, uig, ukr, urd, uzb, ven, vie, vol, wel, wln, wol, xho, yid, yor, zh_guoyu, zh_hakka, zh_min_nan, zh_xiang, zha, zho, zul, cel-gaulish, i-default, i-enochian, i-mingo, zh-min-->
<!ATTLIST languageAlias replacement NMTOKEN #REQUIRED >
- <!--@MATCH:validity/locale-->
+ <!--@MATCH:or/validity/locale||literal/en-x-i-default, nan-x-zh-min, see-x-i-mingo, und-x-i-enochian, xtg-x-cel-gaulish-->
<!--@VALUE-->
<!ATTLIST languageAlias reason (deprecated | overlong | macrolanguage | legacy | bibliographic) #IMPLIED >
<!--@VALUE-->
<!ELEMENT scriptAlias EMPTY >
<!ATTLIST scriptAlias type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/script-->
+ <!--@MATCH:validity/script-->
<!ATTLIST scriptAlias replacement NMTOKEN #REQUIRED >
- <!--@MATCH:validity/script-->
+ <!--@MATCH:validity/script-->
<!--@VALUE-->
<!ATTLIST scriptAlias reason (deprecated | overlong) #IMPLIED >
<!--@VALUE-->
<!ELEMENT territoryAlias EMPTY >
<!ATTLIST territoryAlias type NMTOKEN #REQUIRED >
- <!--@MATCH:set/or/validity/region||regex/[0-9]{3}|[A-Z]{3}||literal/CT, DY, FQ, HV, JT, MI, NH, NQ, PC, PU, PZ, RH, UK, VD, WK-->
+ <!--@MATCH:set/or/validity/region||regex/[0-9]{3}|[A-Z]{3}||literal/CT, DY, FQ, HV, JT, MI, NH, NQ, PC, PU, PZ, RH, UK, VD, WK-->
<!ATTLIST territoryAlias replacement NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/region-->
+ <!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST territoryAlias reason (deprecated | overlong) #IMPLIED >
<!--@VALUE-->
<!ELEMENT subdivisionAlias EMPTY >
<!ATTLIST subdivisionAlias type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/subdivision-->
+ <!--@MATCH:validity/subdivision-->
<!ATTLIST subdivisionAlias replacement NMTOKENS #REQUIRED >
- <!--@MATCH:set/or/validity/region||validity/subdivision-->
+ <!--@MATCH:set/or/validity/region||validity/subdivision||literal/cnmn, cz663, no50-->
<!--@VALUE-->
<!ATTLIST subdivisionAlias reason (deprecated | overlong) #IMPLIED >
<!--@VALUE-->
<!ELEMENT variantAlias EMPTY >
<!ATTLIST variantAlias type NMTOKEN #REQUIRED >
- <!--@MATCH:or/validity/variant||literal/AALAND, POLYTONI-->
+ <!--@MATCH:or/validity/variant||literal/AALAND, POLYTONI-->
<!ATTLIST variantAlias replacement NMTOKEN #REQUIRED >
- <!--@MATCH:or/validity/variant||validity/region-->
+ <!--@MATCH:or/validity/variant||validity/region||literal/hy, hyw-->
<!--@VALUE-->
<!ATTLIST variantAlias reason (deprecated | overlong) #IMPLIED >
<!--@VALUE-->
<!ELEMENT zoneAlias EMPTY >
<!ATTLIST zoneAlias type CDATA #REQUIRED >
- <!--@MATCH:or/bcp47/tz||literal/SystemV/AST4, SystemV/AST4ADT, SystemV/CST6, SystemV/CST6CDT, SystemV/EST5, SystemV/EST5EDT, SystemV/HST10, SystemV/MST7, SystemV/MST7MDT, SystemV/PST8, SystemV/PST8PDT, SystemV/YST9, SystemV/YST9YDT-->
+ <!--@MATCH:or/bcp47/tz||literal/SystemV/AST4, SystemV/AST4ADT, SystemV/CST6, SystemV/CST6CDT, SystemV/EST5, SystemV/EST5EDT, SystemV/HST10, SystemV/MST7, SystemV/MST7MDT, SystemV/PST8, SystemV/PST8PDT, SystemV/YST9, SystemV/YST9YDT-->
<!ATTLIST zoneAlias replacement CDATA #REQUIRED >
- <!--@MATCH:bcp47/tz-->
+ <!--@MATCH:bcp47/tz-->
<!--@VALUE-->
<!ATTLIST zoneAlias reason (deprecated | overlong) #IMPLIED >
<!--@VALUE-->
+<!ELEMENT unitAlias EMPTY >
+<!ATTLIST unitAlias type NMTOKEN #REQUIRED >
+ <!--@MATCH:validity/short-unit/deprecated-->
+<!ATTLIST unitAlias replacement NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+ <!--@VALUE-->
+<!ATTLIST unitAlias reason (deprecated) #IMPLIED >
+ <!--@VALUE-->
+
+<!ELEMENT usageAlias EMPTY >
+<!ATTLIST usageAlias type NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+<!ATTLIST usageAlias replacement NMTOKEN #REQUIRED >
+ <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+ <!--@VALUE-->
+<!ATTLIST usageAlias reason (deprecated) #IMPLIED >
+ <!--@VALUE-->
+
<!ELEMENT deprecated ( deprecatedItems* ) >
<!--@DEPRECATED-->
<!ATTLIST deprecated draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -778,7 +850,7 @@
<!ELEMENT defaultContent EMPTY >
<!ATTLIST defaultContent locales NMTOKENS #IMPLIED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!--@VALUE-->
<!ELEMENT codeMappings ( languageCodes*, territoryCodes*, currencyCodes* ) >
@@ -793,15 +865,15 @@
<!ELEMENT territoryCodes EMPTY >
<!ATTLIST territoryCodes type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!ATTLIST territoryCodes numeric NMTOKEN #IMPLIED >
- <!--@MATCH:range/1~999-->
+ <!--@MATCH:range/1~999-->
<!--@VALUE-->
<!ATTLIST territoryCodes alpha3 NMTOKEN #IMPLIED >
- <!--@MATCH:regex/[A-Z]{3}-->
+ <!--@MATCH:regex/[A-Z]{3}-->
<!--@VALUE-->
<!ATTLIST territoryCodes fips10 NMTOKEN #IMPLIED >
- <!--@MATCH:regex/[A-Z]{2}-->
+ <!--@MATCH:regex/[A-Z]{2}-->
<!--@VALUE-->
<!ATTLIST territoryCodes internet NMTOKENS #IMPLIED >
<!--@VALUE-->
@@ -809,9 +881,9 @@
<!ELEMENT currencyCodes EMPTY >
<!ATTLIST currencyCodes type NMTOKEN #REQUIRED >
- <!--@MATCH:validity/currency-->
+ <!--@MATCH:validity/currency-->
<!ATTLIST currencyCodes numeric NMTOKEN #REQUIRED >
- <!--@MATCH:range/1~999-->
+ <!--@MATCH:range/1~999-->
<!--@VALUE-->
<!-- # Parent locales -->
@@ -820,32 +892,33 @@
<!ELEMENT parentLocale EMPTY >
<!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
- <!--@MATCH:validity/locale-->
+ <!--@MATCH:validity/locale-->
<!ATTLIST parentLocale locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!--@VALUE-->
<!ELEMENT likelySubtags ( likelySubtag* ) >
<!ELEMENT likelySubtag EMPTY >
<!ATTLIST likelySubtag from NMTOKEN #REQUIRED >
- <!--@MATCH:validity/locale-->
+ <!--@MATCH:validity/locale-->
<!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
- <!--@MATCH:validity/locale-->
+ <!--@MATCH:validity/locale-->
<!--@VALUE-->
<!ELEMENT metazoneInfo ( timezone* ) >
<!ELEMENT timezone ( usesMetazone* ) >
<!ATTLIST timezone type CDATA #REQUIRED >
- <!--@MATCH:bcp47/tz-->
+ <!--@MATCH:bcp47/tz-->
+
<!ELEMENT usesMetazone EMPTY >
<!ATTLIST usesMetazone from CDATA #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd HH:mm-->
+ <!--@MATCH:time/yyyy-MM-dd HH:mm-->
<!ATTLIST usesMetazone to CDATA #IMPLIED >
- <!--@MATCH:time/yyyy-MM-dd HH:mm-->
+ <!--@MATCH:time/yyyy-MM-dd HH:mm-->
<!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
- <!--@MATCH:metazone-->
+ <!--@MATCH:metazone-->
<!--@VALUE-->
<!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
@@ -859,7 +932,7 @@
<!ELEMENT pluralRules ( pluralRule* ) >
<!ATTLIST pluralRules locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!ATTLIST pluralRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -877,7 +950,7 @@
<!ELEMENT pluralRanges ( pluralRange* ) >
<!ATTLIST pluralRanges locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!ATTLIST pluralRanges draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -937,14 +1010,14 @@
<!ATTLIST numberingSystem type (numeric | algorithmic) #REQUIRED >
<!--@VALUE-->
<!ATTLIST numberingSystem id NMTOKEN #REQUIRED >
- <!--@MATCH:bcp47/nu-->
+ <!--@MATCH:bcp47/nu-->
<!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
<!--@VALUE-->
<!ATTLIST numberingSystem digits CDATA #IMPLIED >
- <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U0001E140-\U0001E149][\U0001E2F0-\U0001E2F9]]-->
+ <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U0001E140-\U0001E149][\U0001E2F0-\U0001E2F9]]-->
<!--@VALUE-->
<!ATTLIST numberingSystem rules CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST numberingSystem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
@@ -983,7 +1056,7 @@
<!ELEMENT personList EMPTY >
<!ATTLIST personList type (neutral | mixedNeutral | maleTaints) #REQUIRED >
<!ATTLIST personList locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!--@VALUE-->
<!ELEMENT references ( reference* ) >
@@ -992,9 +1065,9 @@
<!ELEMENT reference ( #PCDATA ) >
<!--@METADATA-->
<!ATTLIST reference type NMTOKEN #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST reference uri CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
@@ -1009,31 +1082,31 @@
<!ELEMENT languageMatches ( paradigmLocales*, matchVariable*, languageMatch* ) >
<!ATTLIST languageMatches type NMTOKEN #REQUIRED >
- <!--@MATCH:literal/written, written_new-->
+ <!--@MATCH:literal/written, written_new-->
<!ELEMENT paradigmLocales EMPTY >
<!ATTLIST paradigmLocales locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!--@VALUE-->
<!ELEMENT matchVariable EMPTY >
<!ATTLIST matchVariable id CDATA #REQUIRED >
- <!--@MATCH:regex/\$[a-zA-Z0-9_]+-->
+ <!--@MATCH:regex/\$[a-zA-Z0-9_]+-->
<!ATTLIST matchVariable value CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ELEMENT languageMatch EMPTY >
<!--@ORDERED-->
<!ATTLIST languageMatch desired CDATA #REQUIRED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ATTLIST languageMatch supported CDATA #REQUIRED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ATTLIST languageMatch percent NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~100-->
+ <!--@MATCH:range/0~100-->
<!--@VALUE-->
<!ATTLIST languageMatch distance NMTOKEN #IMPLIED >
- <!--@MATCH:range/0~100-->
+ <!--@MATCH:range/0~100-->
<!--@VALUE-->
<!ATTLIST languageMatch oneway (true | false) #IMPLIED >
<!--@VALUE-->
@@ -1042,7 +1115,7 @@
<!ELEMENT dayPeriodRuleSet ( dayPeriodRules* ) >
<!ATTLIST dayPeriodRuleSet type NMTOKEN #IMPLIED >
- <!--@MATCH:literal/selection-->
+ <!--@MATCH:literal/selection-->
<!ATTLIST dayPeriodRuleSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -1051,7 +1124,7 @@
<!ELEMENT dayPeriodRules ( dayPeriodRule* ) >
<!ATTLIST dayPeriodRules locales NMTOKENS #REQUIRED >
- <!--@MATCH:set/validity/locale-->
+ <!--@MATCH:set/validity/locale-->
<!ATTLIST dayPeriodRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED-->
@@ -1060,22 +1133,22 @@
<!ELEMENT dayPeriodRule EMPTY >
<!ATTLIST dayPeriodRule type NMTOKEN #REQUIRED >
- <!--@MATCH:literal/afternoon1, afternoon2, am, evening1, evening2, midnight, morning1, morning2, night1, night2, noon, pm-->
+ <!--@MATCH:literal/afternoon1, afternoon2, am, evening1, evening2, midnight, morning1, morning2, night1, night2, noon, pm-->
<!ATTLIST dayPeriodRule at NMTOKEN #IMPLIED >
- <!--@MATCH:time/HH:mm-->
+ <!--@MATCH:time/HH:mm-->
<!--@VALUE-->
<!ATTLIST dayPeriodRule after NMTOKEN #IMPLIED >
- <!--@MATCH:time/HH:mm-->
+ <!--@MATCH:time/HH:mm-->
<!--@VALUE-->
<!--@DEPRECATED-->
<!ATTLIST dayPeriodRule before NMTOKEN #IMPLIED >
- <!--@MATCH:time/HH:mm-->
+ <!--@MATCH:time/HH:mm-->
<!--@VALUE-->
<!ATTLIST dayPeriodRule from NMTOKEN #IMPLIED >
- <!--@MATCH:time/HH:mm-->
+ <!--@MATCH:time/HH:mm-->
<!--@VALUE-->
<!ATTLIST dayPeriodRule to NMTOKEN #IMPLIED >
- <!--@MATCH:time/HH:mm-->
+ <!--@MATCH:time/HH:mm-->
<!--@VALUE-->
<!--@DEPRECATED-->
<!ATTLIST dayPeriodRule draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -1089,7 +1162,7 @@
<!ELEMENT primaryZone ( #PCDATA ) >
<!ATTLIST primaryZone iso3166 NMTOKEN #REQUIRED >
- <!--@MATCH:validity/region-->
+ <!--@MATCH:validity/region-->
<!-- # Time Zones -->
@@ -1104,48 +1177,48 @@
<!ELEMENT approvalRequirement EMPTY >
<!ATTLIST approvalRequirement votes CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST approvalRequirement locales CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST approvalRequirement paths CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ELEMENT coverageVariable EMPTY >
<!--@ORDERED-->
<!ATTLIST coverageVariable key CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST coverageVariable value CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ELEMENT coverageLevel EMPTY >
<!--@ORDERED-->
<!ATTLIST coverageLevel inLanguage CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST coverageLevel inScript CDATA #IMPLIED >
- <!--@MATCH:validity/script-->
+ <!--@MATCH:validity/script-->
<!ATTLIST coverageLevel inTerritory CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST coverageLevel value CDATA #REQUIRED >
- <!--@MATCH:literal/basic, core, minimal, moderate, modern, posix-->
+ <!--@MATCH:literal/basic, core, minimal, moderate, modern, posix-->
<!--@VALUE-->
<!ATTLIST coverageLevel match CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ELEMENT idValidity ( id* ) >
<!ELEMENT id ( #PCDATA ) >
<!ATTLIST id type NMTOKEN #REQUIRED >
- <!--@MATCH:literal/currency, language, region, script, subdivision, unit, variant-->
+ <!--@MATCH:literal/currency, language, region, script, subdivision, unit, variant-->
<!ATTLIST id idStatus NMTOKEN #REQUIRED >
- <!--@MATCH:literal/deprecated, macroregion, private_use, regular, reserved, special, unknown-->
+ <!--@MATCH:literal/deprecated, macroregion, private_use, regular, reserved, special, unknown-->
<!ELEMENT rgScope ( rgPath* ) >
<!ELEMENT rgPath EMPTY >
<!ATTLIST rgPath path CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST rgPath draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
<!--@METADATA-->
@@ -1153,4 +1226,29 @@
<!ELEMENT languageGroup ( #PCDATA ) >
<!ATTLIST languageGroup parent NMTOKEN #REQUIRED >
- <!--@MATCH:validity/language-->
+ <!--@MATCH:validity/language-->
+
+<!-- # Grammatical Features -->
+
+<!ELEMENT grammaticalData ( grammaticalFeatures* ) >
+
+<!ELEMENT grammaticalFeatures ( grammaticalCase?, grammaticalGender?, grammaticalDefiniteness? ) >
+<!ATTLIST grammaticalFeatures targets NMTOKENS #REQUIRED >
+ <!--@MATCH:set/literal/nominal-->
+<!ATTLIST grammaticalFeatures locales NMTOKENS #REQUIRED >
+ <!--@MATCH:set/validity/language-->
+
+<!ELEMENT grammaticalCase EMPTY >
+<!ATTLIST grammaticalCase values NMTOKENS #REQUIRED >
+ <!--@MATCH:set/literal/ablative, accusative, comitative, dative, ergative, genitive, instrumental, locative, locativecopulative, nominative, oblique, partitive, prepositional, sociative, vocative-->
+ <!--@VALUE-->
+
+<!ELEMENT grammaticalGender EMPTY >
+<!ATTLIST grammaticalGender values NMTOKENS #REQUIRED >
+ <!--@MATCH:set/literal/animate, common, feminine, inanimate, masculine, neuter, personal-->
+ <!--@VALUE-->
+
+<!ELEMENT grammaticalDefiniteness EMPTY >
+<!ATTLIST grammaticalDefiniteness values NMTOKENS #REQUIRED >
+ <!--@MATCH:set/literal/definite, indefinite, unspecified, construct-->
+ <!--@VALUE-->
diff --git a/common/main/af.xml b/common/main/af.xml
index d78851f..e5ad533 100644
--- a/common/main/af.xml
+++ b/common/main/af.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -91,6 +91,8 @@
<language type="dar">Dakota</language>
<language type="dav">Taita</language>
<language type="de">Duits</language>
+ <language type="de_AT">↑↑↑</language>
+ <language type="de_CH">↑↑↑</language>
<language type="dgr">Dogrib</language>
<language type="dje">Zarma</language>
<language type="dsb">Benedesorbies</language>
@@ -106,16 +108,22 @@
<language type="eka">Ekajuk</language>
<language type="el">Grieks</language>
<language type="en">Engels</language>
+ <language type="en_AU">↑↑↑</language>
+ <language type="en_CA">↑↑↑</language>
<language type="en_GB">Engels (VK)</language>
<language type="en_GB" alt="short">Engels (VK)</language>
<language type="en_US">Engels (VSA)</language>
<language type="en_US" alt="short">Engels (VSA)</language>
<language type="eo">Esperanto</language>
<language type="es">Spaans</language>
+ <language type="es_419">↑↑↑</language>
+ <language type="es_ES">↑↑↑</language>
+ <language type="es_MX">↑↑↑</language>
<language type="et">Estnies</language>
<language type="eu">Baskies</language>
<language type="ewo">Ewondo</language>
<language type="fa">Persies</language>
+ <language type="fa_AF">Dari</language>
<language type="ff">Fulah</language>
<language type="fi">Fins</language>
<language type="fil">Filippyns</language>
@@ -123,6 +131,8 @@
<language type="fo">Faroëes</language>
<language type="fon">Fon</language>
<language type="fr">Frans</language>
+ <language type="fr_CA">↑↑↑</language>
+ <language type="fr_CH">↑↑↑</language>
<language type="fur">Friuliaans</language>
<language type="fy">Fries</language>
<language type="ga">Iers</language>
@@ -310,6 +320,8 @@
<language type="ps">Pasjto</language>
<language type="ps" alt="variant">Pushto</language>
<language type="pt">Portugees</language>
+ <language type="pt_BR">↑↑↑</language>
+ <language type="pt_PT">↑↑↑</language>
<language type="qu">Quechua</language>
<language type="quc">K’iche’</language>
<language type="rap">Rapanui</language>
@@ -421,7 +433,9 @@
<language type="zgh">Standaard Marokkaanse Tamazight</language>
<language type="zh">Chinees</language>
<language type="zh" alt="menu">Mandarynse Chinees</language>
+ <language type="zh_Hans">↑↑↑</language>
<language type="zh_Hans" alt="long">Mandarynse Chinees (Vereenvoudigd)</language>
+ <language type="zh_Hant">↑↑↑</language>
<language type="zh_Hant" alt="long">Mandarynse Chinees (Tradisioneel)</language>
<language type="zu">Zoeloe</language>
<language type="zun">Zuni</language>
@@ -955,6 +969,30 @@
<ellipsis type="word-initial">… {0}</ellipsis>
<ellipsis type="word-medial">{0} … {1}</ellipsis>
<moreInformation>?</moreInformation>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample=":" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="$" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="£" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₹" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="+" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
</characters>
<delimiters>
<quotationStart>“</quotationStart>
@@ -4356,7 +4394,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkeiland-tyd</standard>
+ <generic draft="contributed">Norfolkeiland-tyd</generic>
+ <standard draft="contributed">Norfolkeiland-standaardtyd</standard>
+ <daylight draft="contributed">Norfolkeiland-dagligtyd</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5869,9 +5909,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>vierkante {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">vierkante {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">vierkante {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubieke {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubieke {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubieke {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5880,7 +5990,7 @@
<unitPattern count="one">{0} swaartekrag</unitPattern>
<unitPattern count="other">{0} swaartekrag</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per vierkante sekonde</displayName>
<unitPattern count="one">{0} meter per vierkante sekonde</unitPattern>
<unitPattern count="other">{0} meter per vierkante sekonde</unitPattern>
@@ -5980,7 +6090,7 @@
<unitPattern count="one">{0} millimol per liter</unitPattern>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>dele per miljoen</displayName>
<unitPattern count="one">{0} deel per miljoen</unitPattern>
<unitPattern count="other">{0} dele per miljoen</unitPattern>
@@ -6010,7 +6120,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
@@ -6486,17 +6596,17 @@
<unitPattern count="one">{0} perdekrag</unitPattern>
<unitPattern count="other">{0} perdekrag</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter kwik</displayName>
<unitPattern count="one">{0} millimeter kwik</unitPattern>
<unitPattern count="other">{0} millimeter kwik</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pond per vierkante duim</displayName>
<unitPattern count="one">{0} pond per vierkante duim</unitPattern>
<unitPattern count="other">{0} pond per vierkante duim</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>duim kwik</displayName>
<unitPattern count="one">{0} duim kwik</unitPattern>
<unitPattern count="other">{0} duim kwik</unitPattern>
@@ -6576,7 +6686,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pondvoet</displayName>
<unitPattern count="one">{0} pondvoet</unitPattern>
<unitPattern count="other">{0} pondvoet</unitPattern>
@@ -6730,9 +6840,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6741,7 +6921,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6841,7 +7021,7 @@
<unitPattern count="one">{0} mmol/ℓ</unitPattern>
<unitPattern count="other">{0} mmol/ℓ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>dele/miljoen</displayName>
<unitPattern count="one">{0} d.p.m.</unitPattern>
<unitPattern count="other">{0} d.p.m.</unitPattern>
@@ -6871,7 +7051,7 @@
<unitPattern count="one">{0} ℓ/km</unitPattern>
<unitPattern count="other">{0} ℓ/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ℓ/100 km</displayName>
<unitPattern count="one">{0} ℓ/100 km</unitPattern>
<unitPattern count="other">{0} ℓ/100 km</unitPattern>
@@ -7347,17 +7527,17 @@
<unitPattern count="one">{0} pk.</unitPattern>
<unitPattern count="other">{0} pk.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb./vk. duim</displayName>
<unitPattern count="one">{0} pd.vk.dm.</unitPattern>
<unitPattern count="other">{0} pd.vk.dm.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>duim Hg</displayName>
<unitPattern count="one">{0} duim Hg</unitPattern>
<unitPattern count="other">{0} duim Hg</unitPattern>
@@ -7437,7 +7617,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lb.vt.</displayName>
<unitPattern count="one">{0} lb.vt.</unitPattern>
<unitPattern count="other">{0} lb.vt.</unitPattern>
@@ -7591,9 +7771,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7642,7 +7892,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ℓ/100 km</displayName>
<unitPattern count="one">{0} ℓ/100 km</unitPattern>
<unitPattern count="other">{0} ℓ/100 km</unitPattern>
@@ -7761,7 +8011,7 @@
<unitPattern count="one">{0}pk.</unitPattern>
<unitPattern count="other">{0}pk.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} dm.Hg</unitPattern>
<unitPattern count="other">{0} dm.Hg</unitPattern>
</unit>
diff --git a/common/main/af_NA.xml b/common/main/af_NA.xml
index 8ada9e0..6647103 100644
--- a/common/main/af_NA.xml
+++ b/common/main/af_NA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/af_ZA.xml b/common/main/af_ZA.xml
index 89b0ef4..5c5b109 100644
--- a/common/main/af_ZA.xml
+++ b/common/main/af_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/agq.xml b/common/main/agq.xml
index e0fe486..be03134 100644
--- a/common/main/agq.xml
+++ b/common/main/agq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/agq_CM.xml b/common/main/agq_CM.xml
index 497a0b6..1054b10 100644
--- a/common/main/agq_CM.xml
+++ b/common/main/agq_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ak.xml b/common/main/ak.xml
index 13e6803..f636372 100644
--- a/common/main/ak.xml
+++ b/common/main/ak.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ak_GH.xml b/common/main/ak_GH.xml
index 52cdae7..da51f2c 100644
--- a/common/main/ak_GH.xml
+++ b/common/main/ak_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/am.xml b/common/main/am.xml
index 9836e6b..6f8386b 100644
--- a/common/main/am.xml
+++ b/common/main/am.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -165,6 +165,7 @@
<language type="eu">ባስክኛ</language>
<language type="ewo">ኤዎንዶ</language>
<language type="fa">ፐርሺያኛ</language>
+ <language type="fa_AF">ዳሪኛ</language>
<language type="ff">ፉላህ</language>
<language type="fi">ፊኒሽ</language>
<language type="fil">ፊሊፒንኛ</language>
@@ -561,6 +562,7 @@
<script type="Vaii" draft="unconfirmed">ቫይ</script>
<script type="Yiii" draft="unconfirmed">ዪ</script>
<script type="Zinh" draft="unconfirmed">የተወረሰ</script>
+ <script type="Zmth">የሂሳብ መግለጫ</script>
<script type="Zsye">ኢሞጂ</script>
<script type="Zsym">ምልክቶች</script>
<script type="Zxxx">ያልተጻፈ</script>
@@ -1037,8 +1039,13 @@
</parseLenients>
<parseLenients scope="general" level="lenient">
<parseLenient sample="." draft="contributed">[.․。︒﹒．｡]</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="$" draft="contributed">[\$﹩＄$]</parseLenient>
<parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
</parseLenients>
<parseLenients scope="number" level="lenient">
@@ -2084,7 +2091,7 @@
<era type="0">ዓ/ዓ</era>
<era type="0" alt="variant">↑↑↑</era>
<era type="1">ዓ/ም</era>
- <era type="1" alt="variant" draft="contributed">CE</era>
+ <era type="1" alt="variant">CE</era>
</eraAbbr>
<eraNarrow>
<era type="0">ዓ/ዓ</era>
@@ -2204,8 +2211,8 @@
<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
- <dateFormatItem id="yw" count="one" draft="contributed">'week' w 'of' Y</dateFormatItem>
- <dateFormatItem id="yw" count="other" draft="contributed">'week' w 'of' Y</dateFormatItem>
+ <dateFormatItem id="yw" count="one">'week' w 'of' Y</dateFormatItem>
+ <dateFormatItem id="yw" count="other">'week' w 'of' Y</dateFormatItem>
</availableFormats>
<appendItems>
<appendItem request="Timezone">{0} {1}</appendItem>
@@ -4974,7 +4981,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>የኖርፎልክ ደሴቶች ሰዓት</standard>
+ <generic draft="contributed">የኖርፎልክ ደሴቶች ሰዓት</generic>
+ <standard draft="contributed">የኖርፎልክ ደሴቶች መደበኛ የሰዓት አቆጣጠር</standard>
+ <daylight draft="contributed">የኖርፎልክ ደሴቶች የቀን የሰዓት አቆጣጠር</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5248,6 +5257,45 @@
<traditional>ethi</traditional>
</otherNumberingSystems>
<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+ <symbols numberSystem="adlm">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="arab">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="arabext">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="bali">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="beng">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="brah">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="cakm">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="cham">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="deva">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="fullwide">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="gong">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="gujr">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="hanidec">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
<symbols numberSystem="latn">
<decimal draft="contributed">.</decimal>
<group draft="contributed">,</group>
@@ -5769,6 +5817,7 @@
<symbol alt="narrow" draft="contributed">L</symbol>
</currency>
<currency type="HRK">
+ <displayName>የክሮሽያ ኩና</displayName>
<displayName count="one">የክሮሽያ ኩና</displayName>
<displayName count="other">የክሮሽያ ኩና</displayName>
<symbol draft="contributed">HRK</symbol>
@@ -6481,9 +6530,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ደሲ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ሴንቲ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ሚሊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ናኖ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ፒኮ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ፌምቶ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>አቶ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ዜብቶ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ዮክቶ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ዴካ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ሄክቶ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ኪሎ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ሜጋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} በ{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6492,7 +6611,7 @@
<unitPattern count="one">{0} ጂ-ኃይል</unitPattern>
<unitPattern count="other">{0} ጂ-ኃይል</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ሜ/ሰ²</displayName>
<unitPattern count="one">{0} ሜ/ሰ²</unitPattern>
<unitPattern count="other">{0} ሜ/ሰ²</unitPattern>
@@ -6592,7 +6711,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6622,7 +6741,7 @@
<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
<unitPattern count="other">{0} ሊ/ኪሜ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ሊትሮች በ100 ኪሎሜትሮች</displayName>
<unitPattern count="one">{0} ሊትር በ100 ኪሎሜትሮች</unitPattern>
<unitPattern count="other">{0} ሊትሮች በ100 ኪሎሜትሮች</unitPattern>
@@ -7098,17 +7217,17 @@
<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
<unitPattern count="other">{0} የፈረስ ጉልበት</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ኢንች ሜርኩሪ</displayName>
<unitPattern count="one">{0} ኢንች ሜርኩሪ</unitPattern>
<unitPattern count="other">{0} ኢንች ሜርኩሪ</unitPattern>
@@ -7188,7 +7307,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -7342,9 +7461,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ደ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ሴ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ሚ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ና{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ፒ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ፌ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>አ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ዜ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ዮ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ዴ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ሄ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ኪ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ሜ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7353,7 +7542,7 @@
<unitPattern count="one">{0} ጂ</unitPattern>
<unitPattern count="other">{0} ጂ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ሜ/ሰ²</displayName>
<unitPattern count="one">{0} ሜ/ሰ²</unitPattern>
<unitPattern count="other">{0} ሜ/ሰ²</unitPattern>
@@ -7453,7 +7642,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7483,7 +7672,7 @@
<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
<unitPattern count="other">{0} ሊ/ኪሜ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ሊትር በ100 ኪሎሜትሮች</displayName>
<unitPattern count="one">{0} ሊ/100ኪሜ</unitPattern>
<unitPattern count="other">{0} ሊ/100ኪሜ</unitPattern>
@@ -7959,17 +8148,17 @@
<unitPattern count="one">{0} የፈጉ</unitPattern>
<unitPattern count="other">{0} የፈጉ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ኢንች ሜርኩሪ</displayName>
<unitPattern count="one">{0} ኢሜ</unitPattern>
<unitPattern count="other">{0} ኢንሜር</unitPattern>
@@ -8049,7 +8238,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8203,9 +8392,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ደ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ሴ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ሚ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ና{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ፒ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ፌ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>አ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ዜ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ዮ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ዴ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ሄ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ኪ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ሜ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8254,7 +8513,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ሊትር በ100 ኪሎሜትሮች</displayName>
<unitPattern count="one">{0}ሊበ100ኪሜ</unitPattern>
<unitPattern count="other">{0}ሊበ100ኪሜ</unitPattern>
@@ -8356,6 +8615,11 @@
<unitPattern count="one">{0} ግ</unitPattern>
<unitPattern count="other">{0} ግ</unitPattern>
</unit>
+ <unit type="mass-ton">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="mass-pound">
<unitPattern count="one">{0} ፓውንድ</unitPattern>
<unitPattern count="other">{0} ፓውንድ</unitPattern>
@@ -8376,7 +8640,7 @@
<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
<unitPattern count="other">{0} የፈረስ ኃይል</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -8602,4 +8866,74 @@
<characterLabel type="western_asian_scripts">ምእራባዊ ኤስያ ስክሪፕት</characterLabel>
<characterLabel type="whitespace">ባዶ ቦታ</characterLabel>
</characterLabels>
+ <typographicNames>
+ <axisName type="ital">ኢታሊክ</axisName>
+ <axisName type="opsz">ኦፕቲካል ሳይዝ</axisName>
+ <axisName type="slnt">የተጣመመ</axisName>
+ <axisName type="wdth">ወርድ</axisName>
+ <axisName type="wght">ክብደት</axisName>
+ <styleName type="ital" subtype="1">ቅጥልጥል</styleName>
+ <styleName type="opsz" subtype="8">መግለጫ ጽሑፍ</styleName>
+ <styleName type="opsz" subtype="12">ቴክስት</styleName>
+ <styleName type="opsz" subtype="18">ርእስ</styleName>
+ <styleName type="opsz" subtype="72">ማሳያ</styleName>
+ <styleName type="opsz" subtype="144">ፖስተር</styleName>
+ <styleName type="slnt" subtype="-12">ወደኋላ የተጣመመ</styleName>
+ <styleName type="slnt" subtype="0">የተቃና</styleName>
+ <styleName type="slnt" subtype="12">የተጣመመ</styleName>
+ <styleName type="slnt" subtype="24">ተጨማሪ-የተጣመመ</styleName>
+ <styleName type="wdth" subtype="50">እጅግ በጣም የተጠጋጋ</styleName>
+ <styleName type="wdth" subtype="50" alt="compressed">እጅግ በጣም የታመቀ</styleName>
+ <styleName type="wdth" subtype="50" alt="narrow">እጅግ በጣም ጠባብ</styleName>
+ <styleName type="wdth" subtype="62.5">በተጨማሪ-የተጠጋጋ</styleName>
+ <styleName type="wdth" subtype="62.5" alt="compressed">በተጨማሪ-የታመቀ</styleName>
+ <styleName type="wdth" subtype="62.5" alt="narrow">በተጨማሪ-የጠበበ</styleName>
+ <styleName type="wdth" subtype="75">የተጠጋጋ</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">የታመቀ</styleName>
+ <styleName type="wdth" subtype="75" alt="narrow">ጠባብ</styleName>
+ <styleName type="wdth" subtype="87.5">በከፊል የተጠጋጋ</styleName>
+ <styleName type="wdth" subtype="87.5" alt="compressed">በከፊል የታመቀ</styleName>
+ <styleName type="wdth" subtype="87.5" alt="narrow">በከፊል ጠባብ</styleName>
+ <styleName type="wdth" subtype="100">ኖርማል</styleName>
+ <styleName type="wdth" subtype="112.5">በከፊል የተለጠጠ</styleName>
+ <styleName type="wdth" subtype="112.5" alt="extended">በከፊል የተዘረጋ</styleName>
+ <styleName type="wdth" subtype="112.5" alt="wide">በከፊል ሰፊ</styleName>
+ <styleName type="wdth" subtype="125">የለጠጠ</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">የተዘረጋ</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">ሰፊ</styleName>
+ <styleName type="wdth" subtype="150">በተጨማሪ-የተለጠጠ</styleName>
+ <styleName type="wdth" subtype="150" alt="extended">በተጨማሪ የተዘረጋ</styleName>
+ <styleName type="wdth" subtype="150" alt="wide">በተጨማሪ ሰፊ</styleName>
+ <styleName type="wdth" subtype="200">እጅግ በጣም የለጠጠ</styleName>
+ <styleName type="wdth" subtype="200" alt="extended">እጅግ በጣም የተዘረጋ</styleName>
+ <styleName type="wdth" subtype="200" alt="wide">እጅግ በጣም ሰፊ</styleName>
+ <styleName type="wght" subtype="100">ቀጭን</styleName>
+ <styleName type="wght" subtype="200">በተጨማሪ ቀላል</styleName>
+ <styleName type="wght" subtype="200" alt="ultra">እጅግ በጣም ቀላል</styleName>
+ <styleName type="wght" subtype="300">ቀላል</styleName>
+ <styleName type="wght" subtype="350">በከፊል ቀላል</styleName>
+ <styleName type="wght" subtype="380">መጽሐፍ</styleName>
+ <styleName type="wght" subtype="400">መደበኛ</styleName>
+ <styleName type="wght" subtype="500">መካከለኛ</styleName>
+ <styleName type="wght" subtype="600">በከፊል ደማቅ</styleName>
+ <styleName type="wght" subtype="600" alt="demi">በትንሹ ደማቅ</styleName>
+ <styleName type="wght" subtype="700">ደማቅ</styleName>
+ <styleName type="wght" subtype="800">በተጨማሪ ደማቅ</styleName>
+ <styleName type="wght" subtype="900">ጥቁር</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">ከባድ</styleName>
+ <styleName type="wght" subtype="950">በተጨማሪ ጥቁር</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">እጅግ በጣም ጥቁር</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">እጅግ በጣም ከባድ</styleName>
+ <featureName type="afrc">ሽቅብታዊ ክፍልፋይ</featureName>
+ <featureName type="cpsp">ዋና ክፍተት</featureName>
+ <featureName type="dlig">አማራች ሊጋቸሮች</featureName>
+ <featureName type="frac">አግድም ክፍልፋዮች</featureName>
+ <featureName type="lnum">የቁጥሮች ሽፋን</featureName>
+ <featureName type="onum">የድሮ ስትይል አኃዝ</featureName>
+ <featureName type="ordn">ኦርዲናሎች</featureName>
+ <featureName type="pnum">ተመጣጣኝ ቁጥሮች</featureName>
+ <featureName type="smcp">ትናንሽ ካፒታሎች</featureName>
+ <featureName type="tnum">የሰንጠረዥ ቁጥሮች</featureName>
+ <featureName type="zero">እዝባር ያለው ዜሮ</featureName>
+ </typographicNames>
</ldml>
diff --git a/common/main/am_ET.xml b/common/main/am_ET.xml
index 69212b9..14fc53b 100644
--- a/common/main/am_ET.xml
+++ b/common/main/am_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar.xml b/common/main/ar.xml
index c45794e..e23ae5e 100644
--- a/common/main/ar.xml
+++ b/common/main/ar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">المابودونغونية</language>
<language type="arp">الأراباهو</language>
<language type="ars">اللهجة النجدية</language>
+ <language type="ars" alt="menu">العربية، النجدية</language>
<language type="arw">الأراواكية</language>
<language type="as">الأسامية</language>
<language type="asa">الآسو</language>
@@ -105,6 +106,7 @@
<language type="chr">الشيروكي</language>
<language type="chy">الشايان</language>
<language type="ckb">السورانية الكردية</language>
+ <language type="ckb" alt="menu">الكردية، السورانية</language>
<language type="co">الكورسيكية</language>
<language type="cop">القبطية</language>
<language type="cr">الكرى</language>
@@ -160,6 +162,7 @@
<language type="eu">الباسكية</language>
<language type="ewo">الإيوندو</language>
<language type="fa">الفارسية</language>
+ <language type="fa_AF">الدارية</language>
<language type="fan">الفانج</language>
<language type="fat">الفانتي</language>
<language type="ff">الفولانية</language>
@@ -563,6 +566,7 @@
<scripts>
<script type="Arab">العربية</script>
<script type="Arab" alt="variant">العربية الفارسية</script>
+ <script type="Aran" draft="contributed">نستعليق</script>
<script type="Armn">الأرمينية</script>
<script type="Bali">البالية</script>
<script type="Batk">الباتاك</script>
@@ -636,10 +640,12 @@
<script type="Mlym">الماليالام</script>
<script type="Mong">المغولية</script>
<script type="Moon">مون</script>
+ <script type="Mtei" draft="contributed">ميتي ماييك</script>
<script type="Mymr">الميانمار</script>
<script type="Narb">العربية الشمالية القديمة</script>
<script type="Nkoo">أنكو</script>
<script type="Ogam">الأوجهام</script>
+ <script type="Olck" draft="contributed">أول تشيكي</script>
<script type="Orkh">الأورخون</script>
<script type="Orya">الأوريا</script>
<script type="Osma">الأوسمانيا</script>
@@ -647,6 +653,7 @@
<script type="Phag">الفاجسبا</script>
<script type="Phnx">الفينيقية</script>
<script type="Plrd">الصوتيات الجماء</script>
+ <script type="Qaag" draft="contributed">زوجيي</script>
<script type="Roro">رنجورنجو</script>
<script type="Runr">الروني</script>
<script type="Sara">الساراتي</script>
@@ -983,6 +990,8 @@
<territory type="VU">فانواتو</territory>
<territory type="WF">جزر والس وفوتونا</territory>
<territory type="WS">ساموا</territory>
+ <territory type="XA">لكنات تجريبية غير أصلية</territory>
+ <territory type="XB">لكنات تجريبية ثنائية الاتجاه</territory>
<territory type="XK">كوسوفو</territory>
<territory type="YE">اليمن</territory>
<territory type="YT">مايوت</territory>
@@ -5651,7 +5660,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>توقيت جزيرة نورفولك</standard>
+ <generic draft="contributed">توقيت جزيرة نورفولك</generic>
+ <standard draft="contributed">توقيت جزيرة نورفولك الرسمي</standard>
+ <daylight draft="contributed">توقيت جزيرة نورفولك الصيفي</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8556,9 +8567,87 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ديسي{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سنتي{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ملّي{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ميكرو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نانو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>بيكو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فيمتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>أتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زيبتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>يوكتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ديكا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>هكتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>كيلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ميغا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>غيغا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>تيرا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>بيتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>إكسا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زيتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>يوتا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} لكل {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} مربّع</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} مربّع</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} مربّع</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} مكعّب</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} مكعّب</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} مكعّب</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8571,7 +8660,7 @@
<unitPattern count="many">{0} قوة تسارع</unitPattern>
<unitPattern count="other">{0} قوة تسارع</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>متر في الثانية المربعة</displayName>
<unitPattern count="zero">{0} متر في الثانية المربعة</unitPattern>
<unitPattern count="one">{0} متر في الثانية المربعة</unitPattern>
@@ -8747,7 +8836,7 @@
<unitPattern count="many">{0} ملي مول/لتر</unitPattern>
<unitPattern count="other">{0} ملي مول/لتر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>جزء في المليون</displayName>
<unitPattern count="zero">{0} جزء في المليون</unitPattern>
<unitPattern count="one">{0} جزء في المليون</unitPattern>
@@ -8801,7 +8890,7 @@
<unitPattern count="many">{0} لترًا لكل كيلومتر</unitPattern>
<unitPattern count="other">{0} لتر لكل كيلومتر</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لتر لكل ١٠٠ كيلومتر</displayName>
<unitPattern count="zero">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
<unitPattern count="one">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
@@ -9645,7 +9734,7 @@
<unitPattern count="many">{0} قوة حصان</unitPattern>
<unitPattern count="other">{0} قوة حصان</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>مليمتر زئبقي</displayName>
<unitPattern count="zero">{0} مليمتر زئبقي</unitPattern>
<unitPattern count="one">{0} مليمتر زئبقي</unitPattern>
@@ -9654,7 +9743,7 @@
<unitPattern count="many">{0} مليمتر زئبقي</unitPattern>
<unitPattern count="other">{0} مليمتر زئبقي</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>رطل لكل بوصة مربعة</displayName>
<unitPattern count="zero">{0} رطل لكل بوصة مربعة</unitPattern>
<unitPattern count="one">{0} رطل لكل بوصة مربعة</unitPattern>
@@ -9663,7 +9752,7 @@
<unitPattern count="many">{0} رطل لكل بوصة مربعة</unitPattern>
<unitPattern count="other">{0} رطل لكل بوصة مربعة</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>بوصة زئبقية</displayName>
<unitPattern count="zero">{0} بوصة زئبقية</unitPattern>
<unitPattern count="one">{0} بوصة زئبقية</unitPattern>
@@ -9807,7 +9896,7 @@
<unitPattern count="many">{0} درجة كلفن</unitPattern>
<unitPattern count="other">{0} درجة كلفن</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>باوند قدم</displayName>
<unitPattern count="zero">{0} باوند قدم</unitPattern>
<unitPattern count="one">{0} باوند قدم</unitPattern>
@@ -10073,9 +10162,87 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>د{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>س{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>م{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>مك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ن{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ب{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ف{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>أ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زيب{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>يك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>دا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ه{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مغ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>غ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ت{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>بتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>إ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زت{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>يو{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -10088,7 +10255,7 @@
<unitPattern count="many">{0} قوة تسارع</unitPattern>
<unitPattern count="other">{0} قوة تسارع</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>م/ث²</displayName>
<unitPattern count="zero">{0} م/ث²</unitPattern>
<unitPattern count="one">{0} م/ث²</unitPattern>
@@ -10264,7 +10431,7 @@
<unitPattern count="many">{0} م.مول/ل</unitPattern>
<unitPattern count="other">{0} م.مول/ل</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>جزء/مليون</displayName>
<unitPattern count="zero">{0} جزء/مليون</unitPattern>
<unitPattern count="one">{0} جزء/مليون</unitPattern>
@@ -10284,12 +10451,12 @@
</unit>
<unit type="concentr-permille">
<displayName>في الألف</displayName>
- <unitPattern count="zero" draft="provisional">{0}؉</unitPattern>
- <unitPattern count="one" draft="provisional">{0}؉</unitPattern>
- <unitPattern count="two" draft="provisional">{0}؉</unitPattern>
- <unitPattern count="few" draft="provisional">{0}؉</unitPattern>
- <unitPattern count="many" draft="provisional">{0}؉</unitPattern>
- <unitPattern count="other" draft="provisional">{0}؉</unitPattern>
+ <unitPattern count="zero">{0}؉</unitPattern>
+ <unitPattern count="one">{0}؉</unitPattern>
+ <unitPattern count="two">{0}؉</unitPattern>
+ <unitPattern count="few">{0}؉</unitPattern>
+ <unitPattern count="many">{0}؉</unitPattern>
+ <unitPattern count="other">{0}؉</unitPattern>
</unit>
<unit type="concentr-permyriad">
<displayName draft="contributed">↑↑↑</displayName>
@@ -10318,7 +10485,7 @@
<unitPattern count="many">{0} لتر/كم</unitPattern>
<unitPattern count="other">{0} لتر/كم</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لتر/١٠٠ كم</displayName>
<unitPattern count="zero">{0} لتر/١٠٠ كم</unitPattern>
<unitPattern count="one">{0} لتر/١٠٠ كم</unitPattern>
@@ -11162,7 +11329,7 @@
<unitPattern count="many">{0} حصان</unitPattern>
<unitPattern count="other">{0} حصان</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ملم زئبقي</displayName>
<unitPattern count="zero">{0} ملم زئبقي</unitPattern>
<unitPattern count="one">{0} ملم زئبقي</unitPattern>
@@ -11171,7 +11338,7 @@
<unitPattern count="many">{0} ملم زئبقي</unitPattern>
<unitPattern count="other">{0} ملم زئبقي</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>رطل/بوصة مربعة</displayName>
<unitPattern count="zero">{0} رطل/بوصة²</unitPattern>
<unitPattern count="one">{0} رطل/بوصة²</unitPattern>
@@ -11180,7 +11347,7 @@
<unitPattern count="many">{0} رطل/بوصة²</unitPattern>
<unitPattern count="other">{0} رطل/بوصة²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ب. زئبقية</displayName>
<unitPattern count="zero">{0} ب. زئبقية</unitPattern>
<unitPattern count="one">{0} ب. زئبقية</unitPattern>
@@ -11324,7 +11491,7 @@
<unitPattern count="many">{0} د كلفن</unitPattern>
<unitPattern count="other">{0} د كلفن</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>باوند قدم</displayName>
<unitPattern count="zero">{0} باوند قدم</unitPattern>
<unitPattern count="one">{0} باوند قدم</unitPattern>
@@ -11590,9 +11757,87 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>د{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>س{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>م{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>مك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ن{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ب{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ف{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>أ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زيب{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>يك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>دا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ه{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ك{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مغ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>غ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ت{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>بتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>إ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زت{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>يو{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -11685,7 +11930,7 @@
<unitPattern count="many">{0}٪</unitPattern>
<unitPattern count="other">{0}٪</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ل/١٠٠كم</displayName>
<unitPattern count="zero">{0} ل/١٠٠كم</unitPattern>
<unitPattern count="one">{0} ل/١٠٠كم</unitPattern>
@@ -11910,7 +12155,7 @@
<unitPattern count="many" draft="contributed">{0} قوة حصان</unitPattern>
<unitPattern count="other" draft="contributed">{0} قوة حصان</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="zero">{0} ب ز</unitPattern>
<unitPattern count="one">{0} ب ز</unitPattern>
<unitPattern count="two">{0} ب ز</unitPattern>
diff --git a/common/main/ar_001.xml b/common/main/ar_001.xml
index 5816dcb..ac16ce8 100644
--- a/common/main/ar_001.xml
+++ b/common/main/ar_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_AE.xml b/common/main/ar_AE.xml
index 5e367d0..eee974b 100644
--- a/common/main/ar_AE.xml
+++ b/common/main/ar_AE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_BH.xml b/common/main/ar_BH.xml
index 179169e..ea437e6 100644
--- a/common/main/ar_BH.xml
+++ b/common/main/ar_BH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_DJ.xml b/common/main/ar_DJ.xml
index 1c21b0a..191790a 100644
--- a/common/main/ar_DJ.xml
+++ b/common/main/ar_DJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_DZ.xml b/common/main/ar_DZ.xml
index 3270ce4..070eadb 100644
--- a/common/main/ar_DZ.xml
+++ b/common/main/ar_DZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_EG.xml b/common/main/ar_EG.xml
index 54af55a..09feca8 100644
--- a/common/main/ar_EG.xml
+++ b/common/main/ar_EG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_EH.xml b/common/main/ar_EH.xml
index 1163c63..7ab0d52 100644
--- a/common/main/ar_EH.xml
+++ b/common/main/ar_EH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_ER.xml b/common/main/ar_ER.xml
index 2414f8f..cb344b4 100644
--- a/common/main/ar_ER.xml
+++ b/common/main/ar_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_IL.xml b/common/main/ar_IL.xml
index 4c05e8b..fe42396 100644
--- a/common/main/ar_IL.xml
+++ b/common/main/ar_IL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_IQ.xml b/common/main/ar_IQ.xml
index a10600d..d32cb5a 100644
--- a/common/main/ar_IQ.xml
+++ b/common/main/ar_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_JO.xml b/common/main/ar_JO.xml
index 85b19ea..21670bc 100644
--- a/common/main/ar_JO.xml
+++ b/common/main/ar_JO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_KM.xml b/common/main/ar_KM.xml
index 433ccf3..adad3fd 100644
--- a/common/main/ar_KM.xml
+++ b/common/main/ar_KM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_KW.xml b/common/main/ar_KW.xml
index ccab868..10b0368 100644
--- a/common/main/ar_KW.xml
+++ b/common/main/ar_KW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_LB.xml b/common/main/ar_LB.xml
index 6c37638..095a967 100644
--- a/common/main/ar_LB.xml
+++ b/common/main/ar_LB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_LY.xml b/common/main/ar_LY.xml
index bccfacf..9d69a2b 100644
--- a/common/main/ar_LY.xml
+++ b/common/main/ar_LY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_MA.xml b/common/main/ar_MA.xml
index 2b52be1..52c24f5 100644
--- a/common/main/ar_MA.xml
+++ b/common/main/ar_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_MR.xml b/common/main/ar_MR.xml
index 3717095..ec0618b 100644
--- a/common/main/ar_MR.xml
+++ b/common/main/ar_MR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_OM.xml b/common/main/ar_OM.xml
index a0b2c8c..136d621 100644
--- a/common/main/ar_OM.xml
+++ b/common/main/ar_OM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_PS.xml b/common/main/ar_PS.xml
index 5924a9d..f1811b8 100644
--- a/common/main/ar_PS.xml
+++ b/common/main/ar_PS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_QA.xml b/common/main/ar_QA.xml
index ca9c2ca..b4ce9dc 100644
--- a/common/main/ar_QA.xml
+++ b/common/main/ar_QA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_SA.xml b/common/main/ar_SA.xml
index 2df190d..5d164db 100644
--- a/common/main/ar_SA.xml
+++ b/common/main/ar_SA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1463,7 +1463,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -1639,7 +1639,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -1693,7 +1693,7 @@
<unitPattern count="many" draft="contributed">{0} لترًا لكل كيلومتر</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -2537,7 +2537,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -2546,7 +2546,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -2555,7 +2555,7 @@
<unitPattern count="many" draft="contributed">{0} رطلًا لكل بوصة مربعة</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -2699,7 +2699,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -2980,7 +2980,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -3156,7 +3156,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -3210,7 +3210,7 @@
<unitPattern count="many" draft="contributed">{0} لترًا/كم</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -4054,7 +4054,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -4063,7 +4063,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -4072,7 +4072,7 @@
<unitPattern count="many" draft="contributed">{0} رطلًا/بوصة²</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
@@ -4216,7 +4216,7 @@
<unitPattern count="many" draft="contributed">{0} درجة كلفن</unitPattern>
<unitPattern count="other" draft="contributed">{0} درجة كلفن</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">باوند قدم</displayName>
<unitPattern count="zero" draft="contributed">{0} باوند قدم</unitPattern>
<unitPattern count="one" draft="contributed">{0} باوند قدم</unitPattern>
@@ -4497,7 +4497,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="zero" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
diff --git a/common/main/ar_SD.xml b/common/main/ar_SD.xml
index 9d735f6..7d76fd3 100644
--- a/common/main/ar_SD.xml
+++ b/common/main/ar_SD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_SO.xml b/common/main/ar_SO.xml
index c1bfd72..2eb43d0 100644
--- a/common/main/ar_SO.xml
+++ b/common/main/ar_SO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_SS.xml b/common/main/ar_SS.xml
index 7e9675a..b10b055 100644
--- a/common/main/ar_SS.xml
+++ b/common/main/ar_SS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_SY.xml b/common/main/ar_SY.xml
index 807e4a0..9e7ebea 100644
--- a/common/main/ar_SY.xml
+++ b/common/main/ar_SY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_TD.xml b/common/main/ar_TD.xml
index 776eabd..c62ca56 100644
--- a/common/main/ar_TD.xml
+++ b/common/main/ar_TD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_TN.xml b/common/main/ar_TN.xml
index 888b156..6888935 100644
--- a/common/main/ar_TN.xml
+++ b/common/main/ar_TN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ar_YE.xml b/common/main/ar_YE.xml
index d2d2f74..e47031c 100644
--- a/common/main/ar_YE.xml
+++ b/common/main/ar_YE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/as.xml b/common/main/as.xml
index aeda719..5d85794 100644
--- a/common/main/as.xml
+++ b/common/main/as.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -118,6 +118,7 @@
<language type="eu">বাস্ক</language>
<language type="ewo">ইওন্দো</language>
<language type="fa">ফাৰ্ছী</language>
+ <language type="fa_AF">দাৰি</language>
<language type="ff">ফুলাহ</language>
<language type="fi">ফিনিচ</language>
<language type="fil">ফিলিপিনো</language>
@@ -4205,7 +4206,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ন’ৰফ’ক দ্বীপৰ সময়</standard>
+ <generic draft="contributed">ন’ৰফ’ক দ্বীপৰ সময়</generic>
+ <standard draft="contributed">ন’ৰফ’ক দ্বীপৰ মান সময়</standard>
+ <daylight draft="contributed">ন’ৰফ’ক দ্বীপৰ সময় গ্ৰীষ্মকালীন সময়</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5712,9 +5715,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডেচি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>চেণ্টি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মিলি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>মাইক্ৰ’{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>নেনো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পিকো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফেমটো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>অটো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জেপ্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>য়ক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডেকা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হেক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কিলো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মেগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গিগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টেৰা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পেটা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এক্সা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জেতা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>য়োটা{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>প্ৰতি {1}ত {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>বৰ্গ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">বৰ্গ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">বৰ্গ {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ঘন {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ঘন {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ঘন {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5723,7 +5796,7 @@
<unitPattern count="one">{0} জি-বল</unitPattern>
<unitPattern count="other">{0} জি-বল</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড</displayName>
<unitPattern count="one">{0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড</unitPattern>
<unitPattern count="other">{0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড</unitPattern>
@@ -5823,7 +5896,7 @@
<unitPattern count="one">প্ৰতি লিটাৰত {0} মিলিমোল</unitPattern>
<unitPattern count="other">প্ৰতি লিটাৰত {0} মিলিমোল</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>প্ৰতি মিলিয়নত ভাগ</displayName>
<unitPattern count="one">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
<unitPattern count="other">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
@@ -5853,7 +5926,7 @@
<unitPattern count="one">প্ৰতি কিলোমিটাৰত {0} লিটাৰ</unitPattern>
<unitPattern count="other">প্ৰতি কিলোমিটাৰত {0} লিটাৰ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>প্ৰতি ১০০ কিলোমিটাৰত লিটাৰ</displayName>
<unitPattern count="one">প্ৰতি ১০০ কিলোমিটাৰত {0} লিটাৰ</unitPattern>
<unitPattern count="other">প্ৰতি ১০০ কিলোমিটাৰত {0} লিটাৰ</unitPattern>
@@ -6329,17 +6402,17 @@
<unitPattern count="one">{0} অশ্বক্ষমতা</unitPattern>
<unitPattern count="other">{0} অশ্বক্ষমতা</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>মিলিমিটাৰ মাৰ্কিউৰী</displayName>
<unitPattern count="one">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
<unitPattern count="other">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড</displayName>
<unitPattern count="one">{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড</unitPattern>
<unitPattern count="other">{0} প্ৰতি বৰ্গ ইঞ্চি পাউণ্ড</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ইঞ্চি মাৰ্কিউৰী</displayName>
<unitPattern count="one">{0} ইঞ্চি মাৰ্কিউৰী</unitPattern>
<unitPattern count="other">{0} ইঞ্চি মাৰ্কিউৰী</unitPattern>
@@ -6419,7 +6492,7 @@
<unitPattern count="one">{0} কেলভিন</unitPattern>
<unitPattern count="other">{0} কেলভিন</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>পাউণ্ড-ফুট</displayName>
<unitPattern count="one">{0} পাউণ্ড-ফুট</unitPattern>
<unitPattern count="other">{0} পাউণ্ড-ফুট</unitPattern>
@@ -6573,9 +6646,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডেঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>চেঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মিঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>নে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পি.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফেম.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>অ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>য়.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কিঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গি.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পে.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>য়ো.{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6584,7 +6727,7 @@
<unitPattern count="one">{0} জি</unitPattern>
<unitPattern count="other">{0} জি</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>মিটাৰ/বৰ্গ ছেকেণ্ড</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6684,7 +6827,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ভাগ/মিলিয়ন</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6714,7 +6857,7 @@
<unitPattern count="one">{0} লিঃ/কিঃ মিঃ</unitPattern>
<unitPattern count="other">{0} লিঃ/কিঃ মিঃ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>লিঃ/১০০ কিঃ মিঃ</displayName>
<unitPattern count="one">{0} ল/১০০ ক.ম.</unitPattern>
<unitPattern count="other">{0} ল/১০০ ক.ম.</unitPattern>
@@ -7190,17 +7333,17 @@
<unitPattern count="one">{0} অশ্বক্ষমতা</unitPattern>
<unitPattern count="other">{0} অশ্বক্ষমতা</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7280,7 +7423,7 @@
<unitPattern count="one">{0} কেলভিন</unitPattern>
<unitPattern count="other">{0} কেলভিন</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7434,9 +7577,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডেচি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>চেণ্টি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মিলি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>নেনো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পিকো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফেমটো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>অটো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জেপ্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>য়ক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডেকা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হেক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কিলো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মেগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গিগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টেৰা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পেটা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এক্সা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জেতা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>য়োটা{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7445,7 +7658,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ল/১০০ ক.ম.</displayName>
<unitPattern count="one">{0} ল/১০০ ক.ম.</unitPattern>
<unitPattern count="other">{0} ল/১০০ ক.ম.</unitPattern>
diff --git a/common/main/as_IN.xml b/common/main/as_IN.xml
index eb9c73e..db13ddc 100644
--- a/common/main/as_IN.xml
+++ b/common/main/as_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/asa.xml b/common/main/asa.xml
index 688369b..5b5b4ac 100644
--- a/common/main/asa.xml
+++ b/common/main/asa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/asa_TZ.xml b/common/main/asa_TZ.xml
index e2b8b9e..e3836be 100644
--- a/common/main/asa_TZ.xml
+++ b/common/main/asa_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ast.xml b/common/main/ast.xml
index 857b0b8..1ad8571 100644
--- a/common/main/ast.xml
+++ b/common/main/ast.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -6755,7 +6755,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Hora de la Islla Norfolk</standard>
+ <generic draft="contributed">Hora de la Islla Norfolk</generic>
+ <standard draft="contributed">Hora estándar de la Islla Norfolk</standard>
+ <daylight draft="contributed">Hora braniega de la Islla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -9131,7 +9133,7 @@
<unitPattern count="one">{0} fuercia g</unitPattern>
<unitPattern count="other">{0} fuercies gues</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros per segundu al cuadráu</displayName>
<unitPattern count="one">{0} metru per segundu al cuadráu</unitPattern>
<unitPattern count="other">{0} metros por segundu al cuadráu</unitPattern>
@@ -9226,7 +9228,7 @@
<unitPattern count="one">{0} milimol per llitru</unitPattern>
<unitPattern count="other">{0} milimoles per llitru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes per millón</displayName>
<unitPattern count="one">{0} parte per millón</unitPattern>
<unitPattern count="other">{0} partes per millón</unitPattern>
@@ -9236,7 +9238,7 @@
<unitPattern count="one">{0} llitru per quilómetru</unitPattern>
<unitPattern count="other">{0} llitros per quilómetru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>llitros per 100 quilómetros</displayName>
<unitPattern count="one">{0} llitru per 100 quilómetros</unitPattern>
<unitPattern count="other">{0} llitros per 100 quilómetros</unitPattern>
@@ -9632,17 +9634,17 @@
<unitPattern count="one">{0} caballu de fuerza</unitPattern>
<unitPattern count="other">{0} caballos de fuerza</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetros de mercuriu</displayName>
<unitPattern count="one">{0} milímetru de mercuriu</unitPattern>
<unitPattern count="other">{0} milímetros de mercuriu</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>llibres per pulgada cuadrada</displayName>
<unitPattern count="one">{0} llibra per pulgada cuadrada</unitPattern>
<unitPattern count="other">{0} llibres per pulgada cuadrada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pulgaes de mercuriu</displayName>
<unitPattern count="one">{0} pulgada de mercuriu</unitPattern>
<unitPattern count="other">{0} pulgaes de mercuriu</unitPattern>
@@ -9843,7 +9845,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} Gs</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -9938,7 +9940,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -9948,7 +9950,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -10344,17 +10346,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -10555,7 +10557,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}Gs</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="other">{0}m/s²</unitPattern>
@@ -10650,7 +10652,7 @@
<unitPattern count="one">{0}mmol/L</unitPattern>
<unitPattern count="other">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0}ppm</unitPattern>
<unitPattern count="other">{0}ppm</unitPattern>
@@ -10660,7 +10662,7 @@
<unitPattern count="one">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -11051,17 +11053,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0}mm Hg</unitPattern>
<unitPattern count="other">{0}mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>″ Hg</displayName>
<unitPattern count="one">{0}″ Hg</unitPattern>
<unitPattern count="other">{0}″ Hg</unitPattern>
diff --git a/common/main/ast_ES.xml b/common/main/ast_ES.xml
index 32c2d5d..aaafb54 100644
--- a/common/main/ast_ES.xml
+++ b/common/main/ast_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/az.xml b/common/main/az.xml
index 79e1241..3e0bd27 100644
--- a/common/main/az.xml
+++ b/common/main/az.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -152,6 +152,7 @@
<language type="eu">bask</language>
<language type="ewo">evondo</language>
<language type="fa">fars</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -4641,7 +4642,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Adası Vaxtı</standard>
+ <generic draft="contributed">Norfolk Adası Vaxtı</generic>
+ <standard draft="contributed">Norfolk Adası Standart Vaxtı</standard>
+ <daylight draft="contributed">Norfolk Adası Yay Vaxtı</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6666,9 +6669,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>santi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>meqa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giqa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadrat {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadrat {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kub {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kub {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kub {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6677,7 +6750,7 @@
<unitPattern count="one">{0} g qüvvəsi</unitPattern>
<unitPattern count="other">{0} g qüvvəsi</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metr saniyə kvadratı</displayName>
<unitPattern count="one">{0} metr saniyə kvadratı</unitPattern>
<unitPattern count="other">{0} metr saniyə kvadratı</unitPattern>
@@ -6777,7 +6850,7 @@
<unitPattern count="one">{0} millimol/litr</unitPattern>
<unitPattern count="other">{0} millimol/litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milyonda hissəcik</displayName>
<unitPattern count="one">milyonda {0} hissəcik</unitPattern>
<unitPattern count="other">milyonda {0} hissəcik</unitPattern>
@@ -6807,7 +6880,7 @@
<unitPattern count="one">{0} litr/kilometr</unitPattern>
<unitPattern count="other">{0} litr/kilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 kilometrə litr</displayName>
<unitPattern count="one">100 kilometrə {0} litr</unitPattern>
<unitPattern count="other">100 kilometrə {0} litr</unitPattern>
@@ -7288,17 +7361,17 @@
<unitPattern count="one">{0} at gücü</unitPattern>
<unitPattern count="other">{0} at gücü</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetr civə sütunu</displayName>
<unitPattern count="one">{0} millimetr civə sütunu</unitPattern>
<unitPattern count="other">{0} millimetr civə sütunu</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funt/kvadrat düym</displayName>
<unitPattern count="one">{0} funt/kvadrat düym</unitPattern>
<unitPattern count="other">{0} funt/kvadrat düym</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>civə düymü</displayName>
<unitPattern count="one">{0} civə düymü</unitPattern>
<unitPattern count="other">{0} civə düymü</unitPattern>
@@ -7378,7 +7451,7 @@
<unitPattern count="one">{0} dərəcə Kelvin</unitPattern>
<unitPattern count="other">{0} dərəcə Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funt-fut</displayName>
<unitPattern count="one">{0} funt-fut</unitPattern>
<unitPattern count="other">{0} funt-fut</unitPattern>
@@ -7532,9 +7605,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7543,7 +7686,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7643,7 +7786,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>hissəcik/milyon</displayName>
<unitPattern count="one">{0} hs/mln</unitPattern>
<unitPattern count="other">{0} hs/mln</unitPattern>
@@ -7673,7 +7816,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -8154,17 +8297,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>civə düymü</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8244,7 +8387,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8398,9 +8541,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8449,7 +8662,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -8571,7 +8784,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/az_Cyrl.xml b/common/main/az_Cyrl.xml
index f5c2e2c..ef1fbfe 100644
--- a/common/main/az_Cyrl.xml
+++ b/common/main/az_Cyrl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/az_Cyrl_AZ.xml b/common/main/az_Cyrl_AZ.xml
index 7e9bdb7..80e761d 100644
--- a/common/main/az_Cyrl_AZ.xml
+++ b/common/main/az_Cyrl_AZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/az_Latn.xml b/common/main/az_Latn.xml
index 4dd60a9..17de7cd 100644
--- a/common/main/az_Latn.xml
+++ b/common/main/az_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/az_Latn_AZ.xml b/common/main/az_Latn_AZ.xml
index ec12b44..363bff6 100644
--- a/common/main/az_Latn_AZ.xml
+++ b/common/main/az_Latn_AZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bas.xml b/common/main/bas.xml
index b259b0b..d06da59 100644
--- a/common/main/bas.xml
+++ b/common/main/bas.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bas_CM.xml b/common/main/bas_CM.xml
index a89d682..eccbc33 100644
--- a/common/main/bas_CM.xml
+++ b/common/main/bas_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/be.xml b/common/main/be.xml
index 8143244..4b5d1ec 100644
--- a/common/main/be.xml
+++ b/common/main/be.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -126,6 +126,7 @@
<language type="eu">баскская</language>
<language type="ewo">эвонда</language>
<language type="fa">фарсі</language>
+ <language type="fa_AF">дары</language>
<language type="ff">фула</language>
<language type="fi">фінская</language>
<language type="fil">філіпінская</language>
@@ -4490,7 +4491,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Час вострава Норфалк</standard>
+ <generic draft="contributed">Час вострава Норфалк</generic>
+ <standard draft="contributed">Стандартны час вострава Норфалк</standard>
+ <daylight draft="contributed">Летні час вострава Норфалк</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6354,9 +6357,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>дэцы{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>санты{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мілі{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мікра{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нана{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>піка{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ата{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зэпта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ёкта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дэка{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>гекта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кіла{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гіга{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тэра{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>экса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зэта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ёта{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадратныя {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">квадратны {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">квадратныя {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">квадратных {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кв. {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубічныя {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кубічны {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">куб. {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6367,7 +6444,7 @@
<unitPattern count="many">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>м/с²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="few">{0} м/с²</unitPattern>
@@ -6505,7 +6582,7 @@
<unitPattern count="many">{0} мілімоляў на літр</unitPattern>
<unitPattern count="other">{0} мілімоля на літр</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>частак на мільён</displayName>
<unitPattern count="one">{0} частка на мільён</unitPattern>
<unitPattern count="few">{0} часткі на мільён</unitPattern>
@@ -6547,7 +6624,7 @@
<unitPattern count="many">{0} літраў на кіламетр</unitPattern>
<unitPattern count="other">{0} літра на кіламетр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>літры на 100 кіламетраў</displayName>
<unitPattern count="one">{0} літр на 100 кіламетраў</unitPattern>
<unitPattern count="few">{0} літры на 100 кіламетраў</unitPattern>
@@ -7207,21 +7284,21 @@
<unitPattern count="many">{0} конскіх сіл</unitPattern>
<unitPattern count="other">{0} конскай сілы</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>міліметры ртутнага слупа</displayName>
<unitPattern count="one">{0} міліметр ртутнага слупа</unitPattern>
<unitPattern count="few">{0} міліметры ртутнага слупа</unitPattern>
<unitPattern count="many">{0} міліметраў ртутнага слупа</unitPattern>
<unitPattern count="other">{0} міліметра ртутнага слупа</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунты на квадратную цалю</displayName>
<unitPattern count="one">{0} фунт на квадратную цалю</unitPattern>
<unitPattern count="few">{0} фунты на квадратную цалю</unitPattern>
<unitPattern count="many">{0} фунтаў на квадратную цалю</unitPattern>
<unitPattern count="other">{0} фунта на квадратную цалю</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>цалі ртутнага слупа</displayName>
<unitPattern count="one">{0} цаля ртутнага слупа</unitPattern>
<unitPattern count="few">{0} цалі ртутнага слупа</unitPattern>
@@ -7333,7 +7410,7 @@
<unitPattern count="many">{0} кельвінаў</unitPattern>
<unitPattern count="other">{0} кельвіна</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-футы</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="few">{0} фунт-футы</unitPattern>
@@ -7543,9 +7620,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ё{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Ё{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7556,7 +7707,7 @@
<unitPattern count="many">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>м/с²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="few">{0} м/с²</unitPattern>
@@ -7694,7 +7845,7 @@
<unitPattern count="many">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -7736,7 +7887,7 @@
<unitPattern count="many">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
@@ -8396,21 +8547,21 @@
<unitPattern count="many">{0} к. с.</unitPattern>
<unitPattern count="other">{0} к. с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм рт. сл.</displayName>
<unitPattern count="one">{0} мм рт. сл.</unitPattern>
<unitPattern count="few">{0} мм рт. сл.</unitPattern>
<unitPattern count="many">{0} мм рт. сл.</unitPattern>
<unitPattern count="other">{0} мм рт. сл.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунты на кв. цалю</displayName>
<unitPattern count="one">{0} фунт на кв. цалю</unitPattern>
<unitPattern count="few">{0} фунты на кв. цалю</unitPattern>
<unitPattern count="many">{0} фунтаў на кв. цалю</unitPattern>
<unitPattern count="other">{0} фунта на кв. цалю</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>цалі рт. сл.</displayName>
<unitPattern count="one">{0} цаля рт. сл.</unitPattern>
<unitPattern count="few">{0} цалі рт. сл.</unitPattern>
@@ -8522,7 +8673,7 @@
<unitPattern count="many">{0} К</unitPattern>
<unitPattern count="other">{0} К</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-футы</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="few">{0} фунт-футы</unitPattern>
@@ -8732,9 +8883,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ё{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Ё{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8745,7 +8970,7 @@
<unitPattern count="many">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
diff --git a/common/main/be_BY.xml b/common/main/be_BY.xml
index 1664a67..731b208 100644
--- a/common/main/be_BY.xml
+++ b/common/main/be_BY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bem.xml b/common/main/bem.xml
index a681bb7..4d994f4 100644
--- a/common/main/bem.xml
+++ b/common/main/bem.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bem_ZM.xml b/common/main/bem_ZM.xml
index c674300..2d2de85 100644
--- a/common/main/bem_ZM.xml
+++ b/common/main/bem_ZM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bez.xml b/common/main/bez.xml
index b48ecea..1f39df2 100644
--- a/common/main/bez.xml
+++ b/common/main/bez.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bez_TZ.xml b/common/main/bez_TZ.xml
index d10f92d..f482582 100644
--- a/common/main/bez_TZ.xml
+++ b/common/main/bez_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bg.xml b/common/main/bg.xml
index 9bb25ff..a7acded 100644
--- a/common/main/bg.xml
+++ b/common/main/bg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -81,6 +81,7 @@
<language type="cad">каддо</language>
<language type="car">карибски</language>
<language type="cch">атсам</language>
+ <language type="ccp">чакма</language>
<language type="ce">чеченски</language>
<language type="ceb">себуански</language>
<language type="cgg">чига</language>
@@ -110,6 +111,8 @@
<language type="dar">даргински</language>
<language type="dav">таита</language>
<language type="de">немски</language>
+ <language type="de_AT">↑↑↑</language>
+ <language type="de_CH">↑↑↑</language>
<language type="del">делауер</language>
<language type="den">слейви</language>
<language type="dgr">догриб</language>
@@ -132,6 +135,8 @@
<language type="el">гръцки</language>
<language type="elx">еламитски</language>
<language type="en">английски</language>
+ <language type="en_AU">↑↑↑</language>
+ <language type="en_CA">↑↑↑</language>
<language type="en_GB">английски (Обединено кралство)</language>
<language type="en_GB" alt="short">английски (UK)</language>
<language type="en_US">английски (САЩ)</language>
@@ -139,10 +144,14 @@
<language type="enm">средновековен английски</language>
<language type="eo">есперанто</language>
<language type="es">испански</language>
+ <language type="es_419">↑↑↑</language>
+ <language type="es_ES">↑↑↑</language>
+ <language type="es_MX">↑↑↑</language>
<language type="et">естонски</language>
<language type="eu">баски</language>
<language type="ewo">евондо</language>
<language type="fa">персийски</language>
+ <language type="fa_AF">дари</language>
<language type="fan">фанг</language>
<language type="fat">фанти</language>
<language type="ff">фула</language>
@@ -152,6 +161,8 @@
<language type="fo">фарьорски</language>
<language type="fon">фон</language>
<language type="fr">френски</language>
+ <language type="fr_CA">↑↑↑</language>
+ <language type="fr_CH">↑↑↑</language>
<language type="frm">средновековен френски</language>
<language type="fro">старофренски</language>
<language type="frr">северен фризски</language>
@@ -377,6 +388,8 @@
<language type="ps">пущу</language>
<language type="ps" alt="variant">пущунски</language>
<language type="pt">португалски</language>
+ <language type="pt_BR">↑↑↑</language>
+ <language type="pt_PT">↑↑↑</language>
<language type="qu">кечуа</language>
<language type="quc">киче</language>
<language type="raj">раджастански</language>
@@ -510,6 +523,7 @@
<language type="yi">идиш</language>
<language type="yo">йоруба</language>
<language type="yue">кантонски</language>
+ <language type="yue" alt="menu">↑↑↑</language>
<language type="za">зуанг</language>
<language type="zap">запотек</language>
<language type="zbl">блис символи</language>
@@ -519,6 +533,7 @@
<language type="zh" alt="menu">китайски, мандарин</language>
<language type="zh_Hans">китайски (опростен)</language>
<language type="zh_Hans" alt="long">китайски, мандарин (опростен)</language>
+ <language type="zh_Hant">китайски (традиционен)</language>
<language type="zh_Hant" alt="long">китайски, мандарин (традиционен)</language>
<language type="zu">зулуски</language>
<language type="zun">зуни</language>
@@ -4659,7 +4674,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолкско време</standard>
+ <generic draft="contributed">Норфолкско време</generic>
+ <standard draft="contributed">Норфолкско стандартно време</standard>
+ <daylight draft="contributed">Норфолкско лятно часово време</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6621,9 +6638,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>санти{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мили{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ато{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>йокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>хекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>екса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>йота{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} на {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадратни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">квадратен {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">квадратни {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубични {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кубичен {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кубични {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6632,7 +6719,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри за секунда на квадрат</displayName>
<unitPattern count="one">{0} метър за секунда на квадрат</unitPattern>
<unitPattern count="other">{0} метра за секунда на квадрат</unitPattern>
@@ -6732,7 +6819,7 @@
<unitPattern count="one">{0} милимол на литър</unitPattern>
<unitPattern count="other">{0} милимола на литър</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>части на милион</displayName>
<unitPattern count="one">{0} част на милион</unitPattern>
<unitPattern count="other">{0} части на милион</unitPattern>
@@ -6762,7 +6849,7 @@
<unitPattern count="one">{0} литър на километър</unitPattern>
<unitPattern count="other">{0} литра на километър</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>литри на 100 километра</displayName>
<unitPattern count="one">{0} литър на 100 километра</unitPattern>
<unitPattern count="other">{0} литра на 100 километра</unitPattern>
@@ -7238,17 +7325,17 @@
<unitPattern count="one">{0} конска сила</unitPattern>
<unitPattern count="other">{0} конски сили</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>милиметри живачен стълб</displayName>
<unitPattern count="one">{0} мм живачен стълб</unitPattern>
<unitPattern count="other">{0} мм живачен стълб</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунтове на квадратен инч</displayName>
<unitPattern count="one">{0} фунт на квадратен инч</unitPattern>
<unitPattern count="other">{0} фунта на квадратен инч</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>инчове живачен стълб</displayName>
<unitPattern count="one">{0} инч живачен стълб</unitPattern>
<unitPattern count="other">{0} инча живачен стълб</unitPattern>
@@ -7328,7 +7415,7 @@
<unitPattern count="one">{0} келвин</unitPattern>
<unitPattern count="other">{0} келвина</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-футове</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="other">{0} фунт-фута</unitPattern>
@@ -7482,9 +7569,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>х{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Е{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7493,7 +7650,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7593,7 +7750,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7623,7 +7780,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8099,17 +8256,17 @@
<unitPattern count="one">{0} к. с.</unitPattern>
<unitPattern count="other">{0} к. с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8189,7 +8346,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -8343,9 +8500,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>х{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Е{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8394,7 +8621,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8513,7 +8740,7 @@
<unitPattern count="one">{0} к.с.</unitPattern>
<unitPattern count="other">{0} к.с.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/bg_BG.xml b/common/main/bg_BG.xml
index bda10eb..70a6844 100644
--- a/common/main/bg_BG.xml
+++ b/common/main/bg_BG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bm.xml b/common/main/bm.xml
index 58e1cd6..a7c8662 100644
--- a/common/main/bm.xml
+++ b/common/main/bm.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bm_ML.xml b/common/main/bm_ML.xml
index f524f59..9e53c20 100644
--- a/common/main/bm_ML.xml
+++ b/common/main/bm_ML.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bn.xml b/common/main/bn.xml
index 37daff6..09c6b3a 100644
--- a/common/main/bn.xml
+++ b/common/main/bn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -151,6 +151,7 @@
<language type="eu">বাস্ক</language>
<language type="ewo">ইওন্ডো</language>
<language type="fa">ফার্সি</language>
+ <language type="fa_AF">দারি</language>
<language type="fan">ফ্যাঙ্গ</language>
<language type="fat">ফান্তি</language>
<language type="ff">ফুলাহ্</language>
@@ -5503,7 +5504,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>নরফোক দ্বীপ সময়</standard>
+ <generic draft="contributed">নরফোক দ্বীপ সময়</generic>
+ <standard draft="contributed">নরফোক দ্বীপ মানক সময়</standard>
+ <daylight draft="contributed">নরফোক দ্বীপ দিবালোক সময়</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7385,9 +7388,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডেসি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>সেন্টি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মিলি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>মাইক্রো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ন্যানো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পিকো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফেমটো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>এট্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জেপ্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ইয়োক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডেকা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হেক্টো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কিলো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মেগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গিগা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টেরা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পেটা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এক্সা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জেট্টা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ইয়োট্টা{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1} প্রতি {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>বর্গ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">বর্গ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">বর্গ{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>কিউবিক {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ঘন {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ঘন {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7396,7 +7469,7 @@
<unitPattern count="one">{0} জি-বল</unitPattern>
<unitPattern count="other">{0} জি-বল</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>মিটার প্রতি বর্গ সেকেন্ডে</displayName>
<unitPattern count="one">{0} মিটার প্রতি বর্গ সেকেন্ডে</unitPattern>
<unitPattern count="other">{0} মিটার প্রতি বর্গ সেকেন্ডে</unitPattern>
@@ -7496,7 +7569,7 @@
<unitPattern count="one">{0} মিলিমোল, প্রতি লিটারে</unitPattern>
<unitPattern count="other">{0} মিলিমোল, প্রতি লিটারে</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ভাগ, প্রতি মিলিয়নে</displayName>
<unitPattern count="one">{0} ভাগ, প্রতি মিলিয়নে</unitPattern>
<unitPattern count="other">{0} ভাগ, প্রতি মিলিয়নে</unitPattern>
@@ -7526,7 +7599,7 @@
<unitPattern count="one">{0} লিটার, প্রতি কিলোমিটারে</unitPattern>
<unitPattern count="other">{0} লিটার, প্রতি কিলোমিটারে</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>লিটার, প্রতি ১০০ কিলোমিটারে</displayName>
<unitPattern count="one">{0} লিটার, প্রতি ১০০ কিলোমিটারে</unitPattern>
<unitPattern count="other">{0} লিটার, প্রতি ১০০ কিলোমিটারে</unitPattern>
@@ -8017,17 +8090,17 @@
<unitPattern count="one">{0} হর্সপাওয়ার</unitPattern>
<unitPattern count="other">{0} হর্সপাওয়ার</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>মিলিমিটার পারদ</displayName>
<unitPattern count="one">{0} মিলিমিটার পারদ</unitPattern>
<unitPattern count="other">{0} মিলিমিটার পারদ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>বর্গইঞ্চি প্রতি পাউন্ড</displayName>
<unitPattern count="one">{0} বর্গইঞ্চি প্রতি পাউন্ড</unitPattern>
<unitPattern count="other">{0} বর্গইঞ্চি প্রতি পাউন্ড</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ইঞ্চি পারদ</displayName>
<unitPattern count="one">{0} ইঞ্চি পারদ</unitPattern>
<unitPattern count="other">{0} ইঞ্চি পারদ</unitPattern>
@@ -8107,7 +8180,7 @@
<unitPattern count="one">{0} কেলভিন</unitPattern>
<unitPattern count="other">{0} কেলভিন</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8261,9 +8334,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>সে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মি {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ন্যা {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পি {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>এ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ইয়ো {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডা {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গি {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জেঃ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ইঃ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8272,7 +8415,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8372,7 +8515,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8402,7 +8545,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -8893,17 +9036,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8983,7 +9126,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -9137,9 +9280,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ডে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>সে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>মি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ন্যা{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>পি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ফে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>এ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>জে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ইয়ো{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ডে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>হে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>কি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>মে {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>গি{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>টে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>পে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>এ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>জে{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ই{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9148,7 +9361,7 @@
<unitPattern count="one">{0} জি-বল</unitPattern>
<unitPattern count="other">{0} জি-বল</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -9194,7 +9407,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -9436,17 +9649,17 @@
<unitPattern count="one" draft="contributed">{0} hp</unitPattern>
<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
diff --git a/common/main/bn_BD.xml b/common/main/bn_BD.xml
index 4f327a3..a79855e 100644
--- a/common/main/bn_BD.xml
+++ b/common/main/bn_BD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bn_IN.xml b/common/main/bn_IN.xml
index 02ef49e..b36f703 100644
--- a/common/main/bn_IN.xml
+++ b/common/main/bn_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bo.xml b/common/main/bo.xml
index 0da366f..97c3098 100644
--- a/common/main/bo.xml
+++ b/common/main/bo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bo_CN.xml b/common/main/bo_CN.xml
index 4376be9..ec1bf47 100644
--- a/common/main/bo_CN.xml
+++ b/common/main/bo_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bo_IN.xml b/common/main/bo_IN.xml
index 2d7036f..9b2509d 100644
--- a/common/main/bo_IN.xml
+++ b/common/main/bo_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/br.xml b/common/main/br.xml
index 4fa381e..ae8a795 100644
--- a/common/main/br.xml
+++ b/common/main/br.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8811,7 +8811,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>eur Enez Norfolk</standard>
+ <generic draft="contributed">eur Enez Norfolk</generic>
+ <standard draft="contributed">eur cʼhoañv Enez Norfolk</standard>
+ <daylight draft="contributed">eur hañv Enez Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -12129,7 +12131,7 @@
<compoundUnit type="times">
<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
</compoundUnit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metroù dre eilenn garrez</displayName>
<unitPattern count="one">{0} metr dre eilenn garrez</unitPattern>
<unitPattern count="two">{0} vetr dre eilenn garrez</unitPattern>
@@ -12310,7 +12312,7 @@
<unitPattern count="many">{0} a litroù dre gilometr</unitPattern>
<unitPattern count="other">{0} litr dre gilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litroù dre 100 kilometr</displayName>
<unitPattern count="one">{0} litr dre 100 kilometr</unitPattern>
<unitPattern count="two">{0} litr dre 100 kilometr</unitPattern>
@@ -13062,7 +13064,7 @@
<unitPattern count="many">{0} a varc'hadoù nerzh</unitPattern>
<unitPattern count="other">{0} marc'had nerzh</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lurioù dre veutad karrez</displayName>
<unitPattern count="one">{0} lur dre veutad karrez</unitPattern>
<unitPattern count="two">{0} lur dre veutad karrez</unitPattern>
@@ -13433,7 +13435,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -13630,7 +13632,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="two">{0} l/100km</unitPattern>
@@ -14406,7 +14408,7 @@
<unitPattern count="many">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="two">{0} mmHg</unitPattern>
@@ -14414,7 +14416,7 @@
<unitPattern count="many">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb/in²</displayName>
<unitPattern count="one">{0} lb/in²</unitPattern>
<unitPattern count="two">{0} lb/in²</unitPattern>
@@ -14422,7 +14424,7 @@
<unitPattern count="many">{0} lb/in²</unitPattern>
<unitPattern count="other">{0} lb/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -14550,7 +14552,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="two">↑↑↑</unitPattern>
@@ -14809,7 +14811,7 @@
<unitPattern count="many">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="two">{0}m/s²</unitPattern>
@@ -15006,7 +15008,7 @@
<unitPattern count="many">{0}l/km</unitPattern>
<unitPattern count="other">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="two">{0}l/100km</unitPattern>
@@ -15782,7 +15784,7 @@
<unitPattern count="many">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0}mmHg</unitPattern>
<unitPattern count="two">{0}mmHg</unitPattern>
@@ -15790,7 +15792,7 @@
<unitPattern count="many">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb/in²</displayName>
<unitPattern count="one">{0}lb/in²</unitPattern>
<unitPattern count="two">{0}lb/in²</unitPattern>
@@ -15798,7 +15800,7 @@
<unitPattern count="many">{0}lb/in²</unitPattern>
<unitPattern count="other">{0}lb/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>″Hg</displayName>
<unitPattern count="one">{0}″Hg</unitPattern>
<unitPattern count="two">{0}″Hg</unitPattern>
@@ -15926,7 +15928,7 @@
<unitPattern count="many">{0}K</unitPattern>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}lbf⋅ft</unitPattern>
<unitPattern count="two">{0}lbf⋅ft</unitPattern>
diff --git a/common/main/br_FR.xml b/common/main/br_FR.xml
index a38b843..71b896e 100644
--- a/common/main/br_FR.xml
+++ b/common/main/br_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/brx.xml b/common/main/brx.xml
index fac197a..249b3cb 100644
--- a/common/main/brx.xml
+++ b/common/main/brx.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2984,7 +2984,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>नॉरफोक स्टैंडर्ड टाईम</standard>
+ <generic draft="contributed">नॉरफोक टाईम</generic>
+ <standard draft="contributed">नॉरफोक स्टैंडर्ड टाईम</standard>
+ <daylight draft="contributed">नॉरफोक डेलाईट टाईम</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/brx_IN.xml b/common/main/brx_IN.xml
index acff99e..4fbe2fd 100644
--- a/common/main/brx_IN.xml
+++ b/common/main/brx_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bs.xml b/common/main/bs.xml
index 339f99a..03d84fb 100644
--- a/common/main/bs.xml
+++ b/common/main/bs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,8 @@
<language type="dar">dargva</language>
<language type="dav">taita</language>
<language type="de">njemački</language>
+ <language type="de_AT">↑↑↑</language>
+ <language type="de_CH">visoki njemački (Švicarska)</language>
<language type="del">delaver</language>
<language type="den">slave</language>
<language type="dgr">dogrib</language>
@@ -141,15 +143,23 @@
<language type="el">grčki</language>
<language type="elx">elamitski</language>
<language type="en">engleski</language>
+ <language type="en_AU">↑↑↑</language>
+ <language type="en_CA">↑↑↑</language>
+ <language type="en_GB">↑↑↑</language>
<language type="en_GB" alt="short">engleski (UK)</language>
+ <language type="en_US">↑↑↑</language>
<language type="en_US" alt="short">engleski (SAD)</language>
<language type="enm">srednjovjekovni engleski</language>
<language type="eo">esperanto</language>
<language type="es">španski</language>
+ <language type="es_419">↑↑↑</language>
+ <language type="es_ES">↑↑↑</language>
+ <language type="es_MX">↑↑↑</language>
<language type="et">estonski</language>
<language type="eu">baskijski</language>
<language type="ewo">evondo</language>
<language type="fa">perzijski</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulah</language>
@@ -159,6 +169,8 @@
<language type="fo">farski</language>
<language type="fon">fon</language>
<language type="fr">francuski</language>
+ <language type="fr_CA">↑↑↑</language>
+ <language type="fr_CH">↑↑↑</language>
<language type="frm">srednjovjekovni francuski</language>
<language type="fro">starofrancuski</language>
<language type="frr">sjeverni frizijski</language>
@@ -389,6 +401,8 @@
<language type="ps">paštu</language>
<language type="ps" alt="variant">pušto</language>
<language type="pt">portugalski</language>
+ <language type="pt_BR">↑↑↑</language>
+ <language type="pt_PT">↑↑↑</language>
<language type="qu">kečua</language>
<language type="quc">kiče</language>
<language type="raj">rajastani</language>
@@ -976,6 +990,7 @@
<territory type="TJ">Tadžikistan</territory>
<territory type="TK">Tokelau</territory>
<territory type="TL">Istočni Timor</territory>
+ <territory type="TL" alt="variant">↑↑↑</territory>
<territory type="TM">Turkmenistan</territory>
<territory type="TN">Tunis</territory>
<territory type="TO">Tonga</territory>
@@ -1002,6 +1017,8 @@
<territory type="VU">Vanuatu</territory>
<territory type="WF">Ostrva Valis i Futuna</territory>
<territory type="WS">Samoa</territory>
+ <territory type="XA">Pseudo naglasci</territory>
+ <territory type="XB">Pseudo bidi</territory>
<territory type="XK">Kosovo</territory>
<territory type="YE">Jemen</territory>
<territory type="YT">Majote</territory>
@@ -4959,7 +4976,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolško vrijeme</standard>
+ <generic draft="contributed">Norfolško vrijeme</generic>
+ <standard draft="contributed">Norfolško standardno vrijeme</standard>
+ <daylight draft="contributed">Norfolško ljetno vrijeme</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7476,9 +7495,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadratni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kvadratna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadratnih {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kubna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubnih {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7488,7 +7579,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri u sekundi na kvadrat</displayName>
<unitPattern count="one">{0} metar u sekundi na kvadrat</unitPattern>
<unitPattern count="few">{0} metra u sekundi na kvadrat</unitPattern>
@@ -7607,7 +7698,7 @@
<unitPattern count="few">{0} milimola po litru</unitPattern>
<unitPattern count="other">{0} milimola po litru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>dijelovi na milion</displayName>
<unitPattern count="one">{0} dio na milion</unitPattern>
<unitPattern count="few">{0} dijela na milion</unitPattern>
@@ -7643,7 +7734,7 @@
<unitPattern count="few">{0} litra po kilometru</unitPattern>
<unitPattern count="other">{0} litara po kilometru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litri na 100 kilometara</displayName>
<unitPattern count="one">{0} litar na 100 kilometara</unitPattern>
<unitPattern count="few">{0} litra na 100 kilometara</unitPattern>
@@ -8211,19 +8302,19 @@
<unitPattern count="few">{0} konjske snage</unitPattern>
<unitPattern count="other">{0} konjskih snaga</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetri živinog stuba</displayName>
<unitPattern count="one">{0} milimetar živinog stuba</unitPattern>
<unitPattern count="few">{0} milimetra živinog stuba</unitPattern>
<unitPattern count="other">{0} milimetara živinog stuba</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funte po kvadratnom inču</displayName>
<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inči živinog stuba</displayName>
<unitPattern count="one">{0} inč živinog stuba</unitPattern>
<unitPattern count="few">{0} inča živinog stuba</unitPattern>
@@ -8319,7 +8410,7 @@
<unitPattern count="few">{0} kelvina</unitPattern>
<unitPattern count="other">{0} kelvina</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funte sile po stopi</displayName>
<unitPattern count="one">{0} funta sile po stopi</unitPattern>
<unitPattern count="few">{0} funte sile po stopi</unitPattern>
@@ -8501,9 +8592,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8513,7 +8676,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -8632,7 +8795,7 @@
<unitPattern count="few">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>dijelovi/milion</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -8668,7 +8831,7 @@
<unitPattern count="few">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="few">{0} L/100 km</unitPattern>
@@ -9236,19 +9399,19 @@
<unitPattern count="few">{0} ks</unitPattern>
<unitPattern count="other">{0} ks</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -9344,7 +9507,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="few">{0} lbf⋅ft</unitPattern>
@@ -9526,9 +9689,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9588,7 +9823,7 @@
<unitPattern count="few">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="few">{0} L/100 km</unitPattern>
@@ -9733,7 +9968,7 @@
<unitPattern count="few" draft="provisional">{0} KS</unitPattern>
<unitPattern count="other" draft="provisional">{0} KS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="provisional">{0} inHg</unitPattern>
<unitPattern count="few" draft="provisional">{0} inHg</unitPattern>
<unitPattern count="other" draft="provisional">{0} inHg</unitPattern>
diff --git a/common/main/bs_Cyrl.xml b/common/main/bs_Cyrl.xml
index 109b630..35e79a7 100644
--- a/common/main/bs_Cyrl.xml
+++ b/common/main/bs_Cyrl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5113,7 +5113,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк Острво вријеме</standard>
+ <generic draft="contributed">Норфолк Острво вријеме</generic>
+ <standard draft="contributed">Норфолк Острво стандардно вријеме</standard>
+ <daylight draft="contributed">Норфолк Острво љетње рачунање вријеме</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/bs_Cyrl_BA.xml b/common/main/bs_Cyrl_BA.xml
index 031c666..b63d2db 100644
--- a/common/main/bs_Cyrl_BA.xml
+++ b/common/main/bs_Cyrl_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bs_Latn.xml b/common/main/bs_Latn.xml
index d46e543..3fb313c 100644
--- a/common/main/bs_Latn.xml
+++ b/common/main/bs_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/bs_Latn_BA.xml b/common/main/bs_Latn_BA.xml
index 0127783..13019a0 100644
--- a/common/main/bs_Latn_BA.xml
+++ b/common/main/bs_Latn_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ca.xml b/common/main/ca.xml
index 10702a0..83d05b8 100644
--- a/common/main/ca.xml
+++ b/common/main/ca.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -113,6 +113,7 @@
<language type="chr">cherokee</language>
<language type="chy">xeiene</language>
<language type="ckb">kurd central</language>
+ <language type="ckb" alt="variant">kurd sorani</language>
<language type="co">cors</language>
<language type="cop">copte</language>
<language type="cr">cree</language>
@@ -170,6 +171,7 @@
<language type="ewo">ewondo</language>
<language type="ext">extremeny</language>
<language type="fa">persa</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">ful</language>
@@ -608,6 +610,7 @@
<script type="Ahom" draft="contributed">ahom</script>
<script type="Arab">àrab</script>
<script type="Arab" alt="variant">persoaràbic</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">arameu imperial</script>
<script type="Armn">armeni</script>
<script type="Avst">avèstic</script>
@@ -728,6 +731,7 @@
<script type="Phnx">fenici</script>
<script type="Plrd">pollard miao</script>
<script type="Prti">parthià inscripcional</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Roro">rongo-rongo</script>
<script type="Runr">rúnic</script>
@@ -4987,7 +4991,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Hora de les illes Norfolk</standard>
+ <generic draft="contributed">Hora de les illes Norfolk</generic>
+ <standard draft="contributed">Hora estàndard de les illes Norfolk</standard>
+ <daylight draft="contributed">Hora d’estiu de les illes Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7164,9 +7170,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>decí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mil·lí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micrò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nanò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>picò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femtò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>attò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zeptò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yoctò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>decà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hectò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>quilò{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>megà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>gigà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>terà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>petà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetà{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotà{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} quadrats</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} quadrat</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} quadrats</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} cúbics</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cúbic</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cúbics</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7175,7 +7251,7 @@
<unitPattern count="one">{0} força G</unitPattern>
<unitPattern count="other">{0} força G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metres per segon al quadrat</displayName>
<unitPattern count="one">{0} metre per segon al quadrat</unitPattern>
<unitPattern count="other">{0} metres per segon al quadrat</unitPattern>
@@ -7275,7 +7351,7 @@
<unitPattern count="one">{0} mil·limol per litre</unitPattern>
<unitPattern count="other">{0} mil·limols per litre</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts per milió</displayName>
<unitPattern count="one">{0} part per milió</unitPattern>
<unitPattern count="other">{0} parts per milió</unitPattern>
@@ -7305,7 +7381,7 @@
<unitPattern count="one">{0} litre per quilòmetre</unitPattern>
<unitPattern count="other">{0} litres per quilòmetre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litres per 100 quilòmetres</displayName>
<unitPattern count="one">{0} litre per 100 quilòmetres</unitPattern>
<unitPattern count="other">{0} litres per 100 quilòmetres</unitPattern>
@@ -7781,17 +7857,17 @@
<unitPattern count="one">{0} cavall de vapor</unitPattern>
<unitPattern count="other">{0} cavalls de vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mil·límetres de mercuri</displayName>
<unitPattern count="one">mil·límetre de mercuri</unitPattern>
<unitPattern count="other">{0} mil·límetres de mercuri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lliures per polzada quadrada</displayName>
<unitPattern count="one">{0} lliura per polzada quadrada</unitPattern>
<unitPattern count="other">{0} lliures per polzada quadrada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>polzades de mercuri</displayName>
<unitPattern count="one">{0} polzada de mercuri</unitPattern>
<unitPattern count="other">{0} polzades de mercuri</unitPattern>
@@ -7871,7 +7947,7 @@
<unitPattern count="one">{0} Kelvin</unitPattern>
<unitPattern count="other">{0} Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lliures-peu</displayName>
<unitPattern count="one">{0} lliura-peu</unitPattern>
<unitPattern count="other">{0} lliures-peu</unitPattern>
@@ -8025,9 +8101,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8036,7 +8182,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8136,7 +8282,7 @@
<unitPattern count="one">{0} mM/l</unitPattern>
<unitPattern count="other">{0} mM/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8166,7 +8312,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8642,17 +8788,17 @@
<unitPattern count="one">{0} CV</unitPattern>
<unitPattern count="other">{0} CV</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8732,7 +8878,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -8886,9 +9032,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8938,7 +9154,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
diff --git a/common/main/ca_AD.xml b/common/main/ca_AD.xml
index ad72b69..2091d67 100644
--- a/common/main/ca_AD.xml
+++ b/common/main/ca_AD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ca_ES.xml b/common/main/ca_ES.xml
index 39a08be..4291587 100644
--- a/common/main/ca_ES.xml
+++ b/common/main/ca_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ca_ES_VALENCIA.xml b/common/main/ca_ES_VALENCIA.xml
index c914825..1dcec34 100644
--- a/common/main/ca_ES_VALENCIA.xml
+++ b/common/main/ca_ES_VALENCIA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ca_FR.xml b/common/main/ca_FR.xml
index 532b276..a8dfdda 100644
--- a/common/main/ca_FR.xml
+++ b/common/main/ca_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ca_IT.xml b/common/main/ca_IT.xml
index 023ca92..1e64b6e 100644
--- a/common/main/ca_IT.xml
+++ b/common/main/ca_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ccp.xml b/common/main/ccp.xml
index 7983526..7064607 100644
--- a/common/main/ccp.xml
+++ b/common/main/ccp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4455,7 +4455,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>𑄚𑄧𑄢𑄴𑄜𑄮𑄇𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
+ <generic draft="contributed">𑄚𑄧𑄢𑄴𑄜𑄮𑄇𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
+ <standard draft="contributed">𑄚𑄧𑄢𑄴𑄜𑄮𑄇𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
+ <daylight draft="contributed">𑄚𑄧𑄢𑄴𑄜𑄮𑄇𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄘𑄨𑄚𑄮𑄃𑄣𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6216,7 +6218,7 @@
<unitPattern count="one">{0} 𑄎𑄨-𑄝𑄧𑄣𑄴</unitPattern>
<unitPattern count="other">{0} 𑄎𑄨-𑄝𑄧𑄣𑄴</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄳𑄓𑄴</displayName>
<unitPattern count="one">{0} 𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄴𑄓𑄬</unitPattern>
<unitPattern count="other">{0} 𑄟𑄨𑄑𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄧𑄢𑄴𑄉𑄧 𑄥𑄬𑄇𑄬𑄚𑄴𑄓𑄬</unitPattern>
@@ -6311,7 +6313,7 @@
<unitPattern count="one">{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬</unitPattern>
<unitPattern count="other">{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>𑄞𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄬𑄉</displayName>
<unitPattern count="one">{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬</unitPattern>
<unitPattern count="other">{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬</unitPattern>
@@ -6321,7 +6323,7 @@
<unitPattern count="one">{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬</unitPattern>
<unitPattern count="other">{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬</displayName>
<unitPattern count="one">{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬</unitPattern>
<unitPattern count="other">{0} 𑄣𑄨𑄑𑄢𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄷𑄶𑄶 𑄇𑄨𑄣𑄮𑄟𑄨𑄑𑄢𑄬</unitPattern>
@@ -6697,17 +6699,17 @@
<unitPattern count="one">{0} 𑄦𑄧𑄢𑄴𑄥𑄴𑄛𑄤𑄢𑄴</unitPattern>
<unitPattern count="other">{0} 𑄦𑄧𑄢𑄴𑄥𑄴𑄛𑄤𑄢𑄴</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴</displayName>
<unitPattern count="one">{0} 𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴</unitPattern>
<unitPattern count="other">{0} 𑄟𑄨𑄣𑄨𑄟𑄨𑄑𑄢𑄴 𑄛𑄢𑄧𑄖𑄴</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴</displayName>
<unitPattern count="one">{0} 𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴</unitPattern>
<unitPattern count="other">{0} 𑄝𑄧𑄢𑄴𑄉𑄧𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄳𑄢𑄧𑄖𑄨 𑄛𑄅𑄪𑄚𑄳𑄓𑄴</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴</displayName>
<unitPattern count="one">{0} 𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴</unitPattern>
<unitPattern count="other">{0} 𑄃𑄨𑄚𑄴𑄌𑄨 𑄛𑄢𑄧𑄖𑄴</unitPattern>
@@ -6903,7 +6905,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6998,7 +7000,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7008,7 +7010,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7384,17 +7386,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7625,7 +7627,7 @@
<unitPattern count="one">{0} 𑄝𑄧𑄢𑄴𑄉𑄧 𑄜𑄪𑄖𑄴</unitPattern>
<unitPattern count="other">{0} 𑄝𑄧𑄢𑄴𑄉𑄧 𑄜𑄪𑄖𑄴</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7744,7 +7746,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/ccp_BD.xml b/common/main/ccp_BD.xml
index a81455e..c595c65 100644
--- a/common/main/ccp_BD.xml
+++ b/common/main/ccp_BD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ccp_IN.xml b/common/main/ccp_IN.xml
index 01ef55c..6282af8 100644
--- a/common/main/ccp_IN.xml
+++ b/common/main/ccp_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ce.xml b/common/main/ce.xml
index 2917fc7..73eeb9c 100644
--- a/common/main/ce.xml
+++ b/common/main/ce.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3490,7 +3490,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк</standard>
+ <generic draft="contributed">Норфолк</generic>
+ <standard draft="contributed">Норфолк, стандартан хан</standard>
+ <daylight draft="contributed">Норфолк, аьхкенан хан</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/ce_RU.xml b/common/main/ce_RU.xml
index f511765..88376c3 100644
--- a/common/main/ce_RU.xml
+++ b/common/main/ce_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ceb.xml b/common/main/ceb.xml
index 53290bd..4caf1a8 100644
--- a/common/main/ceb.xml
+++ b/common/main/ceb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -21,47 +21,47 @@
</localeDisplayPattern>
<languages>
<language type="ar">Arabic</language>
- <language type="ar_001">Modern Standard Arabic</language>
+ <language type="ar_001">Modernong Tamdanang Arabic</language>
<language type="bn">Bangla</language>
<language type="ceb">Binisaya</language>
<language type="de">Aleman</language>
- <language type="de_AT">Aleman (Austriano)</language>
- <language type="de_CH">Aleman (Swiss Hataas nga Aleman)</language>
+ <language type="de_AT">Austriano nga Aleman</language>
+ <language type="de_CH">Swiss nga Taas nga Aleman</language>
<language type="en">Ingles</language>
- <language type="en_AU">Australyanong Ingles</language>
- <language type="en_CA">Ingles (Kanada)</language>
- <language type="en_GB">Ingles (Britaniko)</language>
- <language type="en_GB" alt="short">Ingles (Britaniko)</language>
- <language type="en_US">Ingles (Amerika)</language>
- <language type="en_US" alt="short">Ingles (Amerika)</language>
+ <language type="en_AU">Ingles sa Australia</language>
+ <language type="en_CA">Ingles sa Canada</language>
+ <language type="en_GB">Britanikong Ingles</language>
+ <language type="en_GB" alt="short">Ingles sa UK</language>
+ <language type="en_US">Ingles sa Amerika</language>
+ <language type="en_US" alt="short">Ingles sa US</language>
<language type="es">Espanyol</language>
- <language type="es_419">Espanyol (Latino Amerikano)</language>
- <language type="es_ES">Espanyol (Uropanhon)</language>
- <language type="es_MX">Espanyol (Mexicano)</language>
- <language type="fr">Pransesa</language>
- <language type="fr_CA">Pranses (Kanada)</language>
- <language type="fr_CH">Pransesa (Swiss)</language>
+ <language type="es_419">Espanyol sa Latin Amerika</language>
+ <language type="es_ES">Espanyol sa Europe</language>
+ <language type="es_MX">Espanyol sa Mexico</language>
+ <language type="fr">Pranses</language>
+ <language type="fr_CA">Pranses sa Canada</language>
+ <language type="fr_CH">Swiss nga Pranses</language>
<language type="hi">Hindi</language>
<language type="id">Indonesian</language>
<language type="it">Italiano</language>
- <language type="ja">Nipponggo</language>
+ <language type="ja">Hinapon</language>
<language type="ko">Korean</language>
<language type="nl">Dutch</language>
<language type="nl_BE">Flemish</language>
<language type="pl">Polish</language>
<language type="pt">Portuguese</language>
- <language type="pt_BR">Portuguese (Brazilyano)</language>
- <language type="pt_PT">Portuguese (Uropanhon)</language>
+ <language type="pt_BR">Brazilyanong Portuguese</language>
+ <language type="pt_PT">Portuguese sa Europe</language>
<language type="ru">Ruso</language>
<language type="th">Thai</language>
<language type="tr">Turkish</language>
- <language type="und">Wala Mailhing Pinulongan</language>
- <language type="zh">Intsik</language>
- <language type="zh" alt="menu">Chinese, Mandarin</language>
- <language type="zh_Hans">Pinasimpleng Intsik</language>
- <language type="zh_Hans" alt="long">Simplified Mandarin Chinese</language>
- <language type="zh_Hant">Tradisyonal Intsik</language>
- <language type="zh_Hant" alt="long">Traditional Mandarin Chinese</language>
+ <language type="und">Wala Mailhing Lengguwahe</language>
+ <language type="zh">Inintsik</language>
+ <language type="zh" alt="menu">Inintsik, Mandarin</language>
+ <language type="zh_Hans">Pinasimpleng Inintsik</language>
+ <language type="zh_Hans" alt="long">Pinasimpleng Mandarin nga Inintsik</language>
+ <language type="zh_Hant">Tradisyonal nga Ininstsik</language>
+ <language type="zh_Hant" alt="long">Tradisyonal nga Mandarin nga Inintsik</language>
</languages>
<scripts>
<script type="Arab">Arabo</script>
@@ -70,11 +70,11 @@
<script type="Hans" alt="stand-alone">Pinasimpleng Han</script>
<script type="Hant">Tradisyonal</script>
<script type="Hant" alt="stand-alone">Tradisyonal nga Han</script>
- <script type="Jpan">Japanese</script>
+ <script type="Jpan">Hinapon</script>
<script type="Kore">Korean</script>
<script type="Latn">Latin</script>
- <script type="Zxxx">Dili-sinulat</script>
- <script type="Zzzz">Wala Mailihing Alpabeto</script>
+ <script type="Zxxx">Dili Sinulat</script>
+ <script type="Zzzz">Wala Mailhing Script</script>
</scripts>
<territories>
<territory type="001">Kalibutan</territory>
@@ -88,7 +88,7 @@
<territory type="015">Northern Africa</territory>
<territory type="017">Middle Africa</territory>
<territory type="018">Southern Africa</territory>
- <territory type="019">Americas</territory>
+ <territory type="019">Mga Amerika</territory>
<territory type="021">Northern America</territory>
<territory type="029">Caribbean</territory>
<territory type="030">Eastern Asia</territory>
@@ -193,9 +193,9 @@
<territory type="FK" alt="variant">Falkland Islands (Islas Malvinas)</territory>
<territory type="FM">Micronesia</territory>
<territory type="FO">Faroe Islands</territory>
- <territory type="FR">Pransiya</territory>
+ <territory type="FR">Pransya</territory>
<territory type="GA">Gabon</territory>
- <territory type="GB">Hiniusang Gingharian</territory>
+ <territory type="GB">United Kingdom</territory>
<territory type="GB" alt="short">UK</territory>
<territory type="GD">Grenada</territory>
<territory type="GE">Georgia</territory>
@@ -235,7 +235,7 @@
<territory type="JE">Jersey</territory>
<territory type="JM">Jamaica</territory>
<territory type="JO">Jordan</territory>
- <territory type="JP">Hapon</territory>
+ <territory type="JP">Japan</territory>
<territory type="KE">Kenya</territory>
<territory type="KG">Kyrgyzstan</territory>
<territory type="KH">Cambodia</territory>
@@ -362,7 +362,7 @@
<territory type="UM">U.S. Outlying Islands</territory>
<territory type="UN">United Nations</territory>
<territory type="US">Estados Unidos</territory>
- <territory type="US" alt="short">↑↑↑</territory>
+ <territory type="US" alt="short">US</territory>
<territory type="UY">Uruguay</territory>
<territory type="UZ">Uzbekistan</territory>
<territory type="VA">Vatican City</territory>
@@ -382,7 +382,7 @@
<territory type="ZA">South Africa</territory>
<territory type="ZM">Zambia</territory>
<territory type="ZW">Zimbabwe</territory>
- <territory type="ZZ">Wala-mailhing Rehiyon</territory>
+ <territory type="ZZ">Wala Mailhing Rehiyon</territory>
</territories>
<subdivisions>
<subdivision type="gbeng">Inglatera</subdivision>
@@ -392,8 +392,8 @@
<types>
<type key="calendar" type="gregorian">Gregorian nga Kalendaryo</type>
<type key="calendar" type="iso8601">Kalendaryo sa ISO-8601</type>
- <type key="collation" type="standard">Standard nga Paagi sa Pagpihig</type>
- <type key="numbers" type="latn">Kasadpanhong mga Digit</type>
+ <type key="collation" type="standard">Tamdanang Paagi sa Paghan-ay</type>
+ <type key="numbers" type="latn">Mga Western Digit</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Metric</measurementSystemName>
@@ -401,9 +401,9 @@
<measurementSystemName type="US">US</measurementSystemName>
</measurementSystemNames>
<codePatterns>
- <codePattern type="language">Pinulongan: {0}</codePattern>
- <codePattern type="script">Alpabeto {0}</codePattern>
- <codePattern type="territory">Rehiyon {0}</codePattern>
+ <codePattern type="language">Lengguwahe: {0}</codePattern>
+ <codePattern type="script">Script: {0}</codePattern>
+ <codePattern type="territory">Rehiyon: {0}</codePattern>
</codePatterns>
</localeDisplayNames>
<layout>
@@ -414,10 +414,41 @@
</layout>
<characters>
<exemplarCharacters>[a b d e g h i k l m n o p r s t u w y]</exemplarCharacters>
- <exemplarCharacters type="auxiliary">[c f j q v x z]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[c f j ñ q v x z]</exemplarCharacters>
<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
<exemplarCharacters type="numbers">↑↑↑</exemplarCharacters>
<exemplarCharacters type="punctuation" draft="contributed">[\- ‑ , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]</exemplarCharacters>
+ <ellipsis type="final">↑↑↑</ellipsis>
+ <ellipsis type="initial">↑↑↑</ellipsis>
+ <ellipsis type="medial">↑↑↑</ellipsis>
+ <ellipsis type="word-final">↑↑↑</ellipsis>
+ <ellipsis type="word-initial">↑↑↑</ellipsis>
+ <ellipsis type="word-medial">↑↑↑</ellipsis>
+ <moreInformation>↑↑↑</moreInformation>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample=":" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="$" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="£" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₹" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="+" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
</characters>
<delimiters>
<quotationStart>“</quotationStart>
@@ -512,7 +543,7 @@
<intervalFormats>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
<intervalFormatItem id="d">
- <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="d">d – d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G">y G – y G</greatestDifference>
@@ -660,18 +691,18 @@
</monthContext>
<monthContext type="stand-alone">
<monthWidth type="abbreviated">
- <month type="1" draft="contributed">En</month>
- <month type="2" draft="contributed">Peb</month>
- <month type="3" draft="contributed">↑↑↑</month>
- <month type="4" draft="contributed">↑↑↑</month>
- <month type="5" draft="contributed">↑↑↑</month>
- <month type="6" draft="contributed">↑↑↑</month>
- <month type="7" draft="contributed">↑↑↑</month>
- <month type="8" draft="contributed">↑↑↑</month>
- <month type="9" draft="contributed">↑↑↑</month>
- <month type="10" draft="contributed">↑↑↑</month>
- <month type="11" draft="contributed">↑↑↑</month>
- <month type="12" draft="contributed">↑↑↑</month>
+ <month type="1">Ene</month>
+ <month type="2">Peb</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">Abr</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">Ago</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
</monthWidth>
<monthWidth type="narrow">
<month type="1">E</month>
@@ -709,10 +740,10 @@
<day type="sun">Dom</day>
<day type="mon">Lun</day>
<day type="tue">Mar</day>
- <day type="wed">Mks</day>
- <day type="thu">Hu</day>
- <day type="fri">Bi</day>
- <day type="sat">Sa</day>
+ <day type="wed">Miy</day>
+ <day type="thu">Huw</day>
+ <day type="fri">Biy</day>
+ <day type="sat">Sab</day>
</dayWidth>
<dayWidth type="narrow">
<day type="sun">D</day>
@@ -747,10 +778,10 @@
<day type="sun">↑↑↑</day>
<day type="mon">↑↑↑</day>
<day type="tue">↑↑↑</day>
- <day type="wed">↑↑↑</day>
- <day type="thu">↑↑↑</day>
- <day type="fri">↑↑↑</day>
- <day type="sat">↑↑↑</day>
+ <day type="wed">Miy</day>
+ <day type="thu">Huw</day>
+ <day type="fri">Biy</day>
+ <day type="sat">Sab</day>
</dayWidth>
<dayWidth type="narrow">
<day type="sun">D</day>
@@ -804,10 +835,10 @@
</quarterContext>
<quarterContext type="stand-alone">
<quarterWidth type="abbreviated">
- <quarter type="1" draft="contributed">Q1</quarter>
- <quarter type="2" draft="contributed">↑↑↑</quarter>
- <quarter type="3" draft="contributed">↑↑↑</quarter>
- <quarter type="4" draft="contributed">↑↑↑</quarter>
+ <quarter type="1">Q1</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
</quarterWidth>
<quarterWidth type="narrow">
<quarter type="1">↑↑↑</quarter>
@@ -855,14 +886,16 @@
</dayPeriods>
<eras>
<eraNames>
+ <era type="0">Sa Wala Pa Si Kristo</era>
<era type="0" alt="variant">Sa Wala Pa ang Common Era</era>
+ <era type="1">Anno Domini</era>
<era type="1" alt="variant">Common Era</era>
</eraNames>
<eraAbbr>
- <era type="0">WK</era>
- <era type="0" alt="variant">WKP</era>
+ <era type="0">BC</era>
+ <era type="0" alt="variant">BCE</era>
<era type="1">KP</era>
- <era type="1" alt="variant">↑↑↑</era>
+ <era type="1" alt="variant">CE</era>
</eraAbbr>
</eras>
<dateFormats>
@@ -944,9 +977,9 @@
<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="GyMMM">MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
<dateFormatItem id="h">h a</dateFormatItem>
<dateFormatItem id="H">HH</dateFormatItem>
<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -986,7 +1019,7 @@
<intervalFormats>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
<intervalFormatItem id="d">
- <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="d">d – d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G">y G – y G</greatestDifference>
@@ -1028,14 +1061,14 @@
</intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">↑↑↑</greatestDifference>
- <greatestDifference id="h">↑↑↑</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">↑↑↑</greatestDifference>
- <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="h">h:mm – h:mm a</greatestDifference>
<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Hm">
@@ -1073,7 +1106,7 @@
<greatestDifference id="M">MMM – MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMd">
- <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="d">MMM d – d</greatestDifference>
<greatestDifference id="M">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMEd">
@@ -1081,7 +1114,7 @@
<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="y">
- <greatestDifference id="y">↑↑↑</greatestDifference>
+ <greatestDifference id="y">y – y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yM">
<greatestDifference id="M">M/y – M/y</greatestDifference>
@@ -1248,31 +1281,1296 @@
<hourFormat>+HH:mm;-HH:mm</hourFormat>
<gmtFormat>GMT {0}</gmtFormat>
<gmtZeroFormat>GMT</gmtZeroFormat>
- <regionFormat>Oras {0}</regionFormat>
- <regionFormat type="daylight">Tag-init Oras {0}</regionFormat>
- <regionFormat type="standard">Sukdanang Oras {0}</regionFormat>
+ <regionFormat>{0} Oras</regionFormat>
+ <regionFormat type="daylight">{0} Oras sa Tag-init</regionFormat>
+ <regionFormat type="standard">{0} Tamdanang Oras</regionFormat>
<fallbackFormat>{1} {0}</fallbackFormat>
<zone type="Etc/UTC">
<long>
- <standard>Koordinado nga Unibersohanong Oras</standard>
+ <standard>Gikoordinar nga Kinatibuk-ang Oras</standard>
</long>
</zone>
<zone type="Etc/Unknown">
- <exemplarCity>Wala Mailhing Siyudad</exemplarCity>
+ <exemplarCity>Wala Mailhing Lungsod</exemplarCity>
+ </zone>
+ <zone type="Europe/Andorra">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Dubai">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Kabul">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Antigua">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Anguilla">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Tirane">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Yerevan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Luanda">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Rothera">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Palmer">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Troll">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Syowa">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Mawson">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Davis">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Vostok">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Casey">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/DumontDUrville">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/McMurdo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Rio_Gallegos">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Mendoza">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/San_Juan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Ushuaia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/La_Rioja">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/San_Luis">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Catamarca">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Salta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Jujuy">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Tucuman">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cordoba">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Buenos_Aires">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Pago_Pago">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Vienna">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Perth">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Eucla">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Darwin">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Adelaide">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Broken_Hill">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Currie">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Melbourne">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Hobart">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Lindeman">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Sydney">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Brisbane">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Macquarie">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Australia/Lord_Howe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Aruba">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Mariehamn">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Baku">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Sarajevo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Barbados">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Dhaka">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Brussels">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Ouagadougou">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Sofia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Bahrain">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Bujumbura">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Porto-Novo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Barthelemy">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Bermuda">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Brunei">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/La_Paz">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Kralendijk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Eirunepe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Rio_Branco">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Porto_Velho">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Boa_Vista">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Manaus">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cuiaba">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Santarem">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Campo_Grande">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Belem">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Araguaina">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Sao_Paulo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Bahia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Fortaleza">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Maceio">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Recife">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Noronha">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Nassau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Thimphu">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Gaborone">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Minsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Belize">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Dawson">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Whitehorse">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Inuvik">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Vancouver">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Fort_Nelson">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Dawson_Creek">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Creston">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Yellowknife">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Edmonton">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Swift_Current">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cambridge_Bay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Regina">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Winnipeg">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Resolute">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Rainy_River">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Rankin_Inlet">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Coral_Harbour">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Thunder_Bay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Nipigon">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Toronto">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Iqaluit">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Pangnirtung">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Moncton">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Halifax">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Goose_Bay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Glace_Bay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Blanc-Sablon">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Johns">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Cocos">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Kinshasa">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Lubumbashi">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Bangui">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Brazzaville">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Zurich">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Abidjan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Rarotonga">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Easter">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Punta_Arenas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Santiago">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Douala">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Urumqi">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Shanghai">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Bogota">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Costa_Rica">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Havana">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Cape_Verde">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Curacao">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Christmas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Nicosia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Famagusta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Prague">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Busingen">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Berlin">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Djibouti">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Copenhagen">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Dominica">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Santo_Domingo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Algiers">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Galapagos">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Guayaquil">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Tallinn">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Cairo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/El_Aaiun">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Asmera">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Canary">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Ceuta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Madrid">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Addis_Ababa">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Helsinki">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Fiji">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Stanley">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Truk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Ponape">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kosrae">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Faeroe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Paris">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Libreville">
+ <exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Europe/London">
<long>
<daylight>Oras sa Tag-init sa British</daylight>
</long>
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Grenada">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Tbilisi">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cayenne">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Guernsey">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Accra">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Gibraltar">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Thule">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Godthab">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Scoresbysund">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Danmarkshavn">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Banjul">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Conakry">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Guadeloupe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Malabo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Athens">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/South_Georgia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Guatemala">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Guam">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Bissau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Guyana">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Hong_Kong">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Tegucigalpa">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Zagreb">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Port-au-Prince">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Budapest">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Jakarta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Pontianak">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Makassar">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Jayapura">
+ <exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Europe/Dublin">
<long>
<daylight>Tamdanang Oras sa Irish</daylight>
</long>
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Jerusalem">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Isle_of_Man">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Calcutta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Chagos">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Baghdad">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Tehran">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Reykjavik">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Rome">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Jersey">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Jamaica">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Amman">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Tokyo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Nairobi">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Bishkek">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Phnom_Penh">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Enderbury">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kiritimati">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tarawa">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Comoro">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Kitts">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Pyongyang">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Seoul">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuwait">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cayman">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Aqtau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Oral">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Atyrau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Aqtobe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Qostanay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Qyzylorda">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Almaty">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Vientiane">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Beirut">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Lucia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Vaduz">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Colombo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Monrovia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Maseru">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Vilnius">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Luxembourg">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Riga">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Tripoli">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Casablanca">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Monaco">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Chisinau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Podgorica">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Marigot">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Antananarivo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kwajalein">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Majuro">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Skopje">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Bamako">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Rangoon">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Hovd">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Ulaanbaatar">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Choibalsan">
+ <exemplarCity>↑↑↑</exemplarCity>
</zone>
<zone type="Asia/Macau">
<exemplarCity>↑↑↑</exemplarCity>
</zone>
+ <zone type="Pacific/Saipan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Martinique">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Nouakchott">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Montserrat">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Malta">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Mauritius">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Maldives">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Blantyre">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Tijuana">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Hermosillo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Mazatlan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Chihuahua">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Bahia_Banderas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Ojinaga">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Monterrey">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Mexico_City">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Matamoros">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Merida">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Cancun">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuala_Lumpur">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuching">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Maputo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Windhoek">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Noumea">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Niamey">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Norfolk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Lagos">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Managua">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Amsterdam">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Oslo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Katmandu">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Nauru">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Niue">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Chatham">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Auckland">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Muscat">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Panama">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Lima">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tahiti">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Marquesas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Gambier">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Port_Moresby">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Bougainville">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Manila">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Karachi">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Warsaw">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Miquelon">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Pitcairn">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Puerto_Rico">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Gaza">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Hebron">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Azores">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Madeira">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Lisbon">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Palau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Asuncion">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Qatar">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Reunion">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Bucharest">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Belgrade">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Kaliningrad">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Simferopol">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Moscow">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Volgograd">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Saratov">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Astrakhan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Ulyanovsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Kirov">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Samara">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Yekaterinburg">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Omsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Novosibirsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Barnaul">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Tomsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Novokuznetsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Krasnoyarsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Irkutsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Chita">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Yakutsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Vladivostok">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Khandyga">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Sakhalin">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Ust-Nera">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Magadan">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Srednekolymsk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Kamchatka">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Anadyr">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Kigali">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Riyadh">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Guadalcanal">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Mahe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Khartoum">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Stockholm">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Singapore">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Atlantic/St_Helena">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Ljubljana">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Arctic/Longyearbyen">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Bratislava">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Freetown">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/San_Marino">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Dakar">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Mogadishu">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Paramaribo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Juba">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Sao_Tome">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/El_Salvador">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Lower_Princes">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Damascus">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Mbabane">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Grand_Turk">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Ndjamena">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Kerguelen">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Lome">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Bangkok">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Dushanbe">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Fakaofo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Dili">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Ashgabat">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Tunis">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tongatapu">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Istanbul">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Port_of_Spain">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Funafuti">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Taipei">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Dar_es_Salaam">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Uzhgorod">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Kiev">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Zaporozhye">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Kampala">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Midway">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Wake">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Adak">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Nome">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Johnston">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Anchorage">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Yakutat">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Sitka">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Juneau">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Metlakatla">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Los_Angeles">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Boise">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Phoenix">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Denver">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/Beulah">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/New_Salem">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/Center">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Chicago">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Menominee">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Vincennes">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Petersburg">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Tell_City">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Knox">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Winamac">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Marengo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indianapolis">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Louisville">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Vevay">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Kentucky/Monticello">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Detroit">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/New_York">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Montevideo">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Samarkand">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Tashkent">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Europe/Vatican">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Vincent">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Caracas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/Tortola">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="America/St_Thomas">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Efate">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Wallis">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Pacific/Apia">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Asia/Aden">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Indian/Mayotte">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Johannesburg">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Lusaka">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
+ <zone type="Africa/Harare">
+ <exemplarCity>↑↑↑</exemplarCity>
+ </zone>
<metazone type="Afghanistan">
<long>
<standard>Oras sa Afghanistan</standard>
@@ -1304,7 +2602,7 @@
<long>
<generic>Oras sa Alaska</generic>
<standard>Tamdanang Oras sa Alaska</standard>
- <daylight>Oras sa Adlawan sa Alaska</daylight>
+ <daylight>Oras sa Tag-init sa Alaska</daylight>
</long>
</metazone>
<metazone type="Amazon">
@@ -1316,37 +2614,37 @@
</metazone>
<metazone type="America_Central">
<long>
- <generic>Taliwala nga Oras Norte Amerika</generic>
- <standard>Taliwala nga Sukdanang Oras Norte Amerika</standard>
- <daylight>Taliwala sa Kahayag sa Adlawng Oras Norte Amerika</daylight>
+ <generic>Sentrong Oras</generic>
+ <standard>Sentong Tamdanan nga Oras</standard>
+ <daylight>Sentrong Oras sa Tag-init</daylight>
</long>
</metazone>
<metazone type="America_Eastern">
<long>
- <generic>Norte Amerika Oras sa Sidlakan</generic>
- <standard>Norte Amerika Sukdanang Oras</standard>
- <daylight>Norte Amerika Oras sa Sidlakan sa Kahayag sa Adlaw</daylight>
+ <generic>Oras sa Sidlakan</generic>
+ <standard>Tamdanan nga Oras sa Sidlakan</standard>
+ <daylight>Oras sa Tag-init sa Sidlakan</daylight>
</long>
</metazone>
<metazone type="America_Mountain">
<long>
- <generic>Norte Amerika Oras sa Kabukiran</generic>
- <standard>Norte Amerika Sukdanang Oras sa Kabukiran</standard>
- <daylight>Norte Amerika Oras sa Kahayag sa Adlaw sa Kabukiran</daylight>
+ <generic>Oras sa Kabukiran</generic>
+ <standard>Tamdanang Oras sa Kabukiran</standard>
+ <daylight>Oras sa Tag-init sa Kabukiran</daylight>
</long>
</metazone>
<metazone type="America_Pacific">
<long>
- <generic>Norte Amerika Oras sa Pasipiko</generic>
- <standard>Norte Amerika Sukdanang Oras sa Pasipiko</standard>
- <daylight>Norte Amerika Oras sa Kahayag sa Adlaw sa Pasipiko</daylight>
+ <generic>Oras sa Pasipiko</generic>
+ <standard>Tamdanang Oras sa Pasipiko</standard>
+ <daylight>Oras sa Tag-init sa Pasipiko</daylight>
</long>
</metazone>
<metazone type="Apia">
<long>
<generic>Oras sa Apia</generic>
<standard>Tamdanang Oras sa Apia</standard>
- <daylight>Oras sa Adlawan sa Apia</daylight>
+ <daylight>Oras sa Tag-init sa Apia</daylight>
</long>
</metazone>
<metazone type="Arabian">
@@ -1379,37 +2677,37 @@
</metazone>
<metazone type="Atlantic">
<long>
- <generic>Norte Amerika Oras sa Atlantiko</generic>
- <standard>Norte Amerika Sukdanang Oras sa Atlantiko</standard>
- <daylight>Norte Amerika Oras sa Kahayag sa Adlaw sa Atlantiko</daylight>
+ <generic>Oras sa Atlantiko</generic>
+ <standard>Tamdanang Oras sa Atlantiko</standard>
+ <daylight>Oras sa Tag-init sa Atlantiko</daylight>
</long>
</metazone>
<metazone type="Australia_Central">
<long>
<generic>Oras sa Central Australia</generic>
<standard>Tamdanang Oras sa Central Australia</standard>
- <daylight>Oras sa Adlawan sa Central Australia</daylight>
+ <daylight>Oras sa Tag-init sa Central Australia</daylight>
</long>
</metazone>
<metazone type="Australia_CentralWestern">
<long>
<generic>Oras sa Central Western Australia</generic>
<standard>Tamdanang Oras sa Central Western Australia</standard>
- <daylight>Oras sa Adlawan sa Central Western Australia</daylight>
+ <daylight>Oras sa Tag-init sa Central Western Australia</daylight>
</long>
</metazone>
<metazone type="Australia_Eastern">
<long>
<generic>Oras sa Eastern Australia</generic>
<standard>Tamdanang Oras sa Eastern Australia</standard>
- <daylight>Oras sa Adlawan sa Eastern Australia</daylight>
+ <daylight>Oras sa Tag-init sa Eastern Australia</daylight>
</long>
</metazone>
<metazone type="Australia_Western">
<long>
<generic>Oras sa Western Australia</generic>
<standard>Tamdanang Oras sa Western Australia</standard>
- <daylight>Oras sa Adlawan sa Western Australia</daylight>
+ <daylight>Oras sa Tag-init sa Western Australia</daylight>
</long>
</metazone>
<metazone type="Azerbaijan">
@@ -1471,7 +2769,7 @@
<long>
<generic>Oras sa Chatham</generic>
<standard>Tamdanang Oras sa Chatham</standard>
- <daylight>Oras sa Adlawan sa Chatham</daylight>
+ <daylight>Oras sa Tag-init sa Chatham</daylight>
</long>
</metazone>
<metazone type="Chile">
@@ -1523,7 +2821,7 @@
<long>
<generic>Oras sa Cuba</generic>
<standard>Tamdanang Oras sa Cuba</standard>
- <daylight>Oras sa Adlawan sa Cuba</daylight>
+ <daylight>Oras sa Tag-init sa Cuba</daylight>
</long>
</metazone>
<metazone type="Davis">
@@ -1555,16 +2853,16 @@
</metazone>
<metazone type="Europe_Central">
<long>
- <generic>Oras sa Europa sa Taliwala sa Adlaw</generic>
- <standard>Sukdanang Oras sa Europa sa Taliwala sa Adlaw</standard>
- <daylight>Oras sa Europa Taliwala sa Adlaw sa Tag-init</daylight>
+ <generic>Oras sa Central Europe</generic>
+ <standard>Tamdanang Oras sa Central Europe</standard>
+ <daylight>Oras sa Tag-init sa Central Europe</daylight>
</long>
</metazone>
<metazone type="Europe_Eastern">
<long>
- <generic>Oras sa Taga-Oryente sa Europa</generic>
- <standard>Sukdanang Oras sa Taga-Oryente sa Europa</standard>
- <daylight>Oras sa Taga-Oryente sa Europa sa Tag-int</daylight>
+ <generic>Oras sa Eastern Europe</generic>
+ <standard>Tamdanang Oras sa Eastern Europe</standard>
+ <daylight>Oras sa Tag-init sa Eastern Europe</daylight>
</long>
</metazone>
<metazone type="Europe_Further_Eastern">
@@ -1574,9 +2872,9 @@
</metazone>
<metazone type="Europe_Western">
<long>
- <generic>Oras sa Kasadpanon sa Europa</generic>
- <standard>Sukadanang Oras sa Kasadpanon sa Europa</standard>
- <daylight>Oras sa Kasadpanon sa Europa sa Tag-init</daylight>
+ <generic>Oras sa Western Europe</generic>
+ <standard>Tamdanang Oras sa Western Europe</standard>
+ <daylight>Oras sa Tag-init sa Western Europe</daylight>
</long>
</metazone>
<metazone type="Falkland">
@@ -1627,7 +2925,7 @@
</metazone>
<metazone type="GMT">
<long>
- <standard>Kasarangang Oras sa Greenwich</standard>
+ <standard>Oras sa Greenwich Mean</standard>
</long>
</metazone>
<metazone type="Greenland_Eastern">
@@ -1658,7 +2956,7 @@
<long>
<generic>Oras sa Hawaii-Aleutian</generic>
<standard>Tamdanang Oras sa Hawaii-Aleutian</standard>
- <daylight>Oras sa Adlawan sa Hawaii-Aleutian</daylight>
+ <daylight>Oras sa Tag-init sa Hawaii-Aleutian</daylight>
</long>
</metazone>
<metazone type="Hong_Kong">
@@ -1776,7 +3074,7 @@
<long>
<generic>Oras sa Lord Howe</generic>
<standard>Tamdanang Oras sa Lord Howe</standard>
- <daylight>Oras sa Adlawan sa Lord Howe</daylight>
+ <daylight>Oras sa Tag-init sa Lord Howe</daylight>
</long>
</metazone>
<metazone type="Macquarie">
@@ -1827,14 +3125,14 @@
<long>
<generic>Oras sa Northwest Mexico</generic>
<standard>Tamdanang Oras sa Northwest Mexico</standard>
- <daylight>Oras sa Adlawan sa Northwest Mexico</daylight>
+ <daylight>Oras sa Tag-init sa Northwest Mexico</daylight>
</long>
</metazone>
<metazone type="Mexico_Pacific">
<long>
<generic>Oras sa Mexican Pacific</generic>
<standard>Tamdanang Oras sa Mexican Pacific</standard>
- <daylight>Oras sa Adlawan sa Mexican Pacific</daylight>
+ <daylight>Oras sa Tag-init sa Mexican Pacific</daylight>
</long>
</metazone>
<metazone type="Mongolia">
@@ -1877,14 +3175,14 @@
<long>
<generic>Oras sa New Zealand</generic>
<standard>Tamdanang Oras sa New Zealand</standard>
- <daylight>Oras sa Adlawan sa New Zealand</daylight>
+ <daylight>Oras sa Tag-init sa New Zealand</daylight>
</long>
</metazone>
<metazone type="Newfoundland">
<long>
<generic>Oras sa Newfoundland</generic>
<standard>Tamdanang Oras sa Newfoundland</standard>
- <daylight>Oras sa Adlawan sa Newfoundland</daylight>
+ <daylight>Oras sa Tag-init sa Newfoundland</daylight>
</long>
</metazone>
<metazone type="Niue">
@@ -1894,7 +3192,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Oras sa Norfolk Island</standard>
+ <generic draft="contributed">Oras sa Norfolk Island</generic>
+ <standard draft="contributed">Tamdanang Oras sa Norfolk Island</standard>
+ <daylight draft="contributed">Oras sa Tag-init sa Norfolk Island</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -1965,7 +3265,7 @@
<long>
<generic>Oras sa St. Pierre & Miquelon</generic>
<standard>Tamdanang Oras sa St. Pierre & Miquelon</standard>
- <daylight>Oras sa Adlawan sa St. Pierre & Miquelon</daylight>
+ <daylight>Oras sa Tag-init sa St.Pierre & Miquelon</daylight>
</long>
</metazone>
<metazone type="Pitcairn">
@@ -2004,7 +3304,7 @@
<long>
<generic>Oras sa Samoa</generic>
<standard>Tamdanang Oras sa Samoa</standard>
- <daylight>Oras sa Adlawan sa Samoa</daylight>
+ <daylight>Oras sa Tag-init sa Samoa</daylight>
</long>
</metazone>
<metazone type="Seychelles">
@@ -2210,101 +3510,129 @@
<displayName>United Arab Emirates Dirham</displayName>
<displayName count="one">UAE dirham</displayName>
<displayName count="other">Mga UAE dirham</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AFN">
<displayName>Afghan Afghani</displayName>
<displayName count="one">Afghan Afghani</displayName>
<displayName count="other">Mga Afghan Afghani</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
<displayName>Albanian Lek</displayName>
<displayName count="one">Albanian lek</displayName>
<displayName count="other">Albanian leke</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AMD">
<displayName>Armenian Dram</displayName>
<displayName count="one">Armenian dram</displayName>
<displayName count="other">Mga Armenian dram</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ANG">
<displayName>Netherlands Antillean Guilder</displayName>
<displayName count="one">Netherlands Antillean guilder</displayName>
<displayName count="other">Mga Netherlands Antillean guilder</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AOA">
<displayName>Angolan Kwanza</displayName>
<displayName count="one">Angolan kwanza</displayName>
<displayName count="other">Mga Angolan kwanza</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ARS">
<displayName>Argentine Peso</displayName>
<displayName count="one">Argentine peso</displayName>
<displayName count="other">Mga Argentine peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AUD">
<displayName>Australian Dollar</displayName>
<displayName count="one">Australian dollar</displayName>
<displayName count="other">Mga Australian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AWG">
<displayName>Aruban Florin</displayName>
<displayName count="one">Aruban florin</displayName>
<displayName count="other">Aruban florin</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AZN">
<displayName>Azerbaijani Manat</displayName>
<displayName count="one">Azerbaijani manat</displayName>
<displayName count="other">Mga Azerbaijani manat</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BAM">
<displayName>Bosnia-Herzegovina Convertible Mark</displayName>
<displayName count="one">Bosnia-Herzegovina convertible mark</displayName>
<displayName count="other">Mga Bosnia-Herzegovina convertible mark</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BBD">
<displayName>Barbadian Dollar</displayName>
<displayName count="one">Barbadian dollar</displayName>
<displayName count="other">Mga Barbadian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BDT">
<displayName>Bangladeshi Taka</displayName>
<displayName count="one">Bangladeshi taka</displayName>
<displayName count="other">Mga Bangladeshi taka</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BGN">
<displayName>Bulgarian Lev</displayName>
<displayName count="one">Bulgarian lev</displayName>
<displayName count="other">Bulgarian leva</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BHD">
<displayName>Bahraini Dinar</displayName>
<displayName count="one">Bahraini dinar</displayName>
<displayName count="other">Mga Bahraini dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BIF">
<displayName>Burundian Franc</displayName>
<displayName count="one">Burundian franc</displayName>
<displayName count="other">Mga Burundian franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BMD">
<displayName>Bermudan Dollar</displayName>
<displayName count="one">Bermudan dollar</displayName>
<displayName count="other">Mga Bermudan dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BND">
<displayName>Brunei Dollar</displayName>
<displayName count="one">Brunei dollar</displayName>
<displayName count="other">Mga Brunei dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BOB">
<displayName>Bolivian Boliviano</displayName>
<displayName count="one">Bolivian boliviano</displayName>
<displayName count="other">Mga Bolivian boliviano</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BRL">
<displayName>Brazilian Real</displayName>
<displayName count="one">Brazilian real</displayName>
- <displayName count="other">Brazilian reals</displayName>
+ <displayName count="other">Mga Brazilian real</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -2312,56 +3640,72 @@
<displayName>Bahamian Dollar</displayName>
<displayName count="one">Bahamian dollar</displayName>
<displayName count="other">Mga Bahamian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BTN">
<displayName>Bhutanese Ngultrum</displayName>
<displayName count="one">Bhutanese ngultrum</displayName>
<displayName count="other">Mga Bhutanese ngultrum</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BWP">
<displayName>Botswanan Pula</displayName>
<displayName count="one">Botswanan pula</displayName>
<displayName count="other">Mga Botswanan pula</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BYN">
<displayName>Belarusian Ruble</displayName>
<displayName count="one">Belarusian ruble</displayName>
<displayName count="other">Mga Belarusian ruble</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BZD">
<displayName>Belize Dollar</displayName>
<displayName count="one">Belize dollar</displayName>
<displayName count="other">Mga Belize dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CAD">
<displayName>Canadian Dollar</displayName>
<displayName count="one">Canadian dollar</displayName>
<displayName count="other">Mga Canadian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CDF">
<displayName>Congolese Franc</displayName>
<displayName count="one">Congolese franc</displayName>
<displayName count="other">Mga Congolese franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CHF">
<displayName>Swiss Franc</displayName>
<displayName count="one">Swiss franc</displayName>
- <displayName count="other">Swiss francs</displayName>
+ <displayName count="other">Mga Swiss franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CLP">
<displayName>Chilean Peso</displayName>
<displayName count="one">Chilean peso</displayName>
<displayName count="other">Mga Chilean peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNH">
<displayName>Chinese Yuan (layo sa baybayon)</displayName>
<displayName count="one">Chinese yuan (layo sa baybayon)</displayName>
<displayName count="other">Chinese yuan (layo sa baybayon)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNY">
- <displayName>Intsik nga Yuan</displayName>
- <displayName count="one" draft="contributed">Intsik ng yuan</displayName>
- <displayName count="other" draft="contributed">Intsik ng yuan</displayName>
+ <displayName>Chinese Yuan</displayName>
+ <displayName count="one">Chinese yuan</displayName>
+ <displayName count="other">Chinese yuan</displayName>
<symbol>↑↑↑</symbol>
<symbol alt="narrow">↑↑↑</symbol>
</currency>
@@ -2369,66 +3713,87 @@
<displayName>Colombian Peso</displayName>
<displayName count="one">Colombian peso</displayName>
<displayName count="other">Mga Colombian peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CRC">
<displayName>Costa Rican Colon</displayName>
<displayName count="one">Costa Rican colon</displayName>
<displayName count="other">Mga Costa Rican colon</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
<displayName>Cuban Convertible Peso</displayName>
<displayName count="one">Cuban convertible peso</displayName>
<displayName count="other">Mga Cuban convertible peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUP">
<displayName>Cuban Peso</displayName>
<displayName count="one">Cuban peso</displayName>
<displayName count="other">Mga Cuban peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CVE">
<displayName>Cape Verdean Escudo</displayName>
<displayName count="one">Cape Verdean escudo</displayName>
<displayName count="other">Mga Cape Verdean escudo</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CZK">
<displayName>Czech Koruna</displayName>
<displayName count="one">Czech koruna</displayName>
<displayName count="other">Mga Czech koruna</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DJF">
<displayName>Djiboutian Franc</displayName>
<displayName count="one">Djiboutian franc</displayName>
<displayName count="other">Mga Djiboutian franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DKK">
<displayName>Danish Krone</displayName>
<displayName count="one">Danish krone</displayName>
<displayName count="other">Danish kroner</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DOP">
<displayName>Dominican Peso</displayName>
<displayName count="one">Dominican peso</displayName>
<displayName count="other">Mga Dominican peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DZD">
<displayName>Algerian Dinar</displayName>
<displayName count="one">Algerian dinar</displayName>
<displayName count="other">Mga Algerian dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="EGP">
<displayName>Egyptian Pound</displayName>
<displayName count="one">Egyptian pound</displayName>
<displayName count="other">Mga Egyptian pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ERN">
<displayName>Eritrean Nakfa</displayName>
<displayName count="one">Eritrean nakfa</displayName>
<displayName count="other">Mga Eritrean nakfa</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ETB">
<displayName>Ethiopian Birr</displayName>
<displayName count="one">Ethiopian birr</displayName>
<displayName count="other">Mga Ethiopian birr</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="EUR">
<displayName>Euro</displayName>
@@ -2441,16 +3806,20 @@
<displayName>Fijian Dollar</displayName>
<displayName count="one">Fijian dollar</displayName>
<displayName count="other">Mga Fijian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FKP">
<displayName>Falkland Islands Pound</displayName>
<displayName count="one">Falkland Islands pound</displayName>
<displayName count="other">Mga Falkland Islands pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GBP">
- <displayName>Inglatera nga Libra</displayName>
- <displayName count="one">Inglatera nga libra</displayName>
- <displayName count="other">Inglatera nga libra</displayName>
+ <displayName>British Pound</displayName>
+ <displayName count="one">British pound</displayName>
+ <displayName count="other">Mga British pound</displayName>
<symbol>↑↑↑</symbol>
<symbol alt="narrow">↑↑↑</symbol>
</currency>
@@ -2458,76 +3827,101 @@
<displayName>Georgian Lari</displayName>
<displayName count="one">Georgian lari</displayName>
<displayName count="other">Mga Georgian lari</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GHS">
<displayName>Ghanaian Cedi</displayName>
<displayName count="one">Ghanaian cedi</displayName>
<displayName count="other">Mga Ghanaian cedi</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GIP">
<displayName>Gibraltar Pound</displayName>
<displayName count="one">Gibraltar pound</displayName>
<displayName count="other">Mga Gibraltar pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GMD">
<displayName>Gambian Dalasi</displayName>
<displayName count="one">Gambian dalasi</displayName>
<displayName count="other">Mga Gambian dalasi</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GNF">
<displayName>Guinean Franc</displayName>
<displayName count="one">Guinean franc</displayName>
<displayName count="other">Mga Guinean franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GTQ">
<displayName>Guatemalan Quetzal</displayName>
<displayName count="one">Guatemalan quetzal</displayName>
<displayName count="other">Mga Guatemalan quetzal</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GYD">
<displayName>Guyanaese Dollar</displayName>
<displayName count="one">Guyanaese dollar</displayName>
<displayName count="other">Mga Guyanaese dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HKD">
<displayName>Hong Kong Dollar</displayName>
<displayName count="one">Hong Kong dollar</displayName>
<displayName count="other">Mga Hong Kong dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HNL">
<displayName>Honduran Lempira</displayName>
<displayName count="one">Honduran lempira</displayName>
<displayName count="other">Mga Honduran lempira</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HRK">
<displayName>Croatian Kuna</displayName>
<displayName count="one">Croatian kuna</displayName>
<displayName count="other">Mga Croatian kuna</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HTG">
<displayName>Haitian Gourde</displayName>
<displayName count="one">Haitian gourde</displayName>
<displayName count="other">Mga Haitian gourde</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HUF">
<displayName>Hungarian Forint</displayName>
<displayName count="one">Hungarian forint</displayName>
<displayName count="other">Mga Hungarian forint</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IDR">
<displayName>Indonesian Rupiah</displayName>
<displayName count="one">Indonesian rupiah</displayName>
<displayName count="other">Mga Indonesian rupiah</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ILS">
<displayName>Israeli New Shekel</displayName>
<displayName count="one">Israeli new shekel</displayName>
<displayName count="other">Mga Israeli new shekel</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="INR">
- <displayName>Rupee sa India</displayName>
- <displayName count="one">rupee sa India</displayName>
- <displayName count="other">Mga rupee sa India</displayName>
+ <displayName>Indian Rupee</displayName>
+ <displayName count="one">Indian rupee</displayName>
+ <displayName count="other">Mga Indian rupee</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -2535,31 +3929,38 @@
<displayName>Iraqi Dinar</displayName>
<displayName count="one">Iraqi dinar</displayName>
<displayName count="other">Mga Iraqi dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IRR">
<displayName>Iranian Rial</displayName>
<displayName count="one">Iranian rial</displayName>
<displayName count="other">Mga Iranian rial</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ISK">
<displayName>Icelandic Krona</displayName>
<displayName count="one">Icelandic krona</displayName>
<displayName count="other">Icelandic kronur</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
<displayName>Jamaican Dollar</displayName>
<displayName count="one">Jamaican dollar</displayName>
<displayName count="other">Mga Jamaican dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JOD">
<displayName>Jordanian Dinar</displayName>
<displayName count="one">Jordanian dinar</displayName>
<displayName count="other">Mga Jordanian dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JPY">
- <displayName>Hapon nga Yen</displayName>
- <displayName count="one" draft="contributed">Hapon nga yen</displayName>
- <displayName count="other" draft="contributed">Hapon nga yen</displayName>
+ <displayName>Japanese Yen</displayName>
+ <displayName count="one">Japanese yen</displayName>
+ <displayName count="other">Japanese yen</displayName>
<symbol>↑↑↑</symbol>
<symbol alt="narrow">↑↑↑</symbol>
</currency>
@@ -2567,232 +3968,303 @@
<displayName>Kenyan Shilling</displayName>
<displayName count="one">Kenyan shilling</displayName>
<displayName count="other">Mga Kenyan shilling</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KGS">
<displayName>Kyrgystani Som</displayName>
<displayName count="one">Kyrgystani som</displayName>
<displayName count="other">Mga Kyrgystani som</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KHR">
<displayName>Cambodian Riel</displayName>
<displayName count="one">Cambodian riel</displayName>
<displayName count="other">Mga Cambodian riel</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KMF">
<displayName>Comorian Franc</displayName>
<displayName count="one">Comorian franc</displayName>
<displayName count="other">Mga Comorian franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KPW">
<displayName>North Korean Won</displayName>
<displayName count="one">North Korean won</displayName>
<displayName count="other">North Korean won</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KRW">
<displayName>South Korean Won</displayName>
<displayName count="one">South Korean won</displayName>
<displayName count="other">South Korean won</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KWD">
<displayName>Kuwaiti Dinar</displayName>
<displayName count="one">Kuwaiti dinar</displayName>
<displayName count="other">Mga Kuwaiti dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KYD">
<displayName>Cayman Islands Dollar</displayName>
<displayName count="one">Cayman Islands dollar</displayName>
<displayName count="other">Mga Cayman Islands dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KZT">
<displayName>Kazakhstani Tenge</displayName>
<displayName count="one">Kazakhstani tenge</displayName>
<displayName count="other">Mga Kazakhstani tenge</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LAK">
<displayName>Laotian Kip</displayName>
<displayName count="one">Laotian kip</displayName>
<displayName count="other">Mga Laotian kip</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LBP">
<displayName>Lebanese Pound</displayName>
<displayName count="one">Lebanese pound</displayName>
<displayName count="other">Mga Lebanese pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LKR">
<displayName>Sri Lankan Rupee</displayName>
<displayName count="one">Sri Lankan rupee</displayName>
<displayName count="other">Mga Sri Lankan rupee</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LRD">
<displayName>Liberian Dollar</displayName>
<displayName count="one">Liberian dollar</displayName>
<displayName count="other">Mga Liberian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LYD">
<displayName>Libyan Dinar</displayName>
<displayName count="one">Libyan dinar</displayName>
<displayName count="other">Mga Libyan dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MAD">
<displayName>Moroccan Dirham</displayName>
<displayName count="one">Moroccan dirham</displayName>
<displayName count="other">Mga Moroccan dirham</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MDL">
<displayName>Moldovan Leu</displayName>
<displayName count="one">Moldovan leu</displayName>
<displayName count="other">Moldovan lei</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MGA">
<displayName>Malagasy Ariary</displayName>
<displayName count="one">Malagasy ariary</displayName>
<displayName count="other">Mga Malagasy ariary</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MKD">
<displayName>Macedonian Denar</displayName>
<displayName count="one">Macedonian denar</displayName>
<displayName count="other">Macedonian denari</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MMK">
<displayName>Myanmar Kyat</displayName>
<displayName count="one">Myanmar kyat</displayName>
<displayName count="other">Mga Myanmar kyat</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MNT">
<displayName>Mongolian Tugrik</displayName>
<displayName count="one">Mongolian tugrik</displayName>
<displayName count="other">Mga Mongolian tugrik</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MOP">
<displayName>Macanese Pataca</displayName>
<displayName count="one">Macanese pataca</displayName>
<displayName count="other">Mga Macanese pataca</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MRU">
<displayName>Mauritanian Ouguiya</displayName>
<displayName count="one">Mauritanian ouguiya</displayName>
<displayName count="other">Mga Mauritanian ouguiya</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MUR">
<displayName>Mauritian Rupee</displayName>
<displayName count="one">Mauritian rupee</displayName>
<displayName count="other">Mga Mauritian rupee</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVR">
<displayName>Maldivian Rufiyaa</displayName>
<displayName count="one">Maldivian rufiyaa</displayName>
<displayName count="other">Mga Maldivian rufiyaa</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MWK">
<displayName>Malawian Kwacha</displayName>
<displayName count="one">Malawian kwacha</displayName>
<displayName count="other">Mga Malawian kwacha</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MXN">
<displayName>Mexican Peso</displayName>
<displayName count="one">Mexican peso</displayName>
<displayName count="other">Mga Mexican peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MYR">
<displayName>Malaysian Ringgit</displayName>
<displayName count="one">Mga Malaysian ringgit</displayName>
<displayName count="other">Mga Malaysian ringgit</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MZN">
<displayName>Mozambican Metical</displayName>
<displayName count="one">Mozambican metical</displayName>
<displayName count="other">Mga Mozambican metical</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NAD">
<displayName>Namibian Dollar</displayName>
<displayName count="one">Namibian dollar</displayName>
<displayName count="other">Mga Namibian dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NGN">
<displayName>Nigerian Naira</displayName>
<displayName count="one">Nigerian naira</displayName>
<displayName count="other">Mga Nigerian naira</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NIO">
<displayName>Nicaraguan Cordoba</displayName>
<displayName count="one">Nicaraguan cordoba</displayName>
<displayName count="other">Mga Nicaraguan cordoba</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NOK">
<displayName>Norwegian Krone</displayName>
<displayName count="one">Norwegian krone</displayName>
<displayName count="other">Norwegian kroner</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NPR">
<displayName>Nepalese Rupee</displayName>
<displayName count="one">Nepalese rupee</displayName>
<displayName count="other">Mga Nepalese rupee</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NZD">
<displayName>New Zealand Dollar</displayName>
<displayName count="one">New Zealand dollar</displayName>
<displayName count="other">Mga New Zealand dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="OMR">
<displayName>Omani Rial</displayName>
<displayName count="one">Omani rial</displayName>
<displayName count="other">Mga Omani rial</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PAB">
<displayName>Panamanian Balboa</displayName>
<displayName count="one">Panamanian balboa</displayName>
<displayName count="other">Mga Panamanian balboa</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PEN">
<displayName>Peruvian Sol</displayName>
<displayName count="one">Peruvian sol</displayName>
<displayName count="other">Mga Peruvian sole</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PGK">
<displayName>Papua New Guinean Kina</displayName>
<displayName count="one">Papua New Guinean kina</displayName>
<displayName count="other">Papua New Guinean kina</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PHP">
<displayName>Philippine Piso</displayName>
<displayName count="one">Philippine piso</displayName>
<displayName count="other">Mga Philippine piso</displayName>
<symbol draft="contributed">₱</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PKR">
<displayName>Pakistani Rupee</displayName>
<displayName count="one">Pakistani rupee</displayName>
<displayName count="other">Mga Pakistani rupee</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PLN">
<displayName>Polish Zloty</displayName>
<displayName count="one">Polish zloty</displayName>
<displayName count="other">Mga Polish zloty</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PYG">
<displayName>Paraguayan Guarani</displayName>
<displayName count="one">Paraguayan guarani</displayName>
<displayName count="other">Mga Paraguayan guarani</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="QAR">
<displayName>Qatari Rial</displayName>
<displayName count="one">Qatari rial</displayName>
<displayName count="other">Mga Qatari rial</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RON">
<displayName>Romanian Leu</displayName>
<displayName count="one">Romanian leu</displayName>
<displayName count="other">Romanian lei</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RSD">
<displayName>Serbian Dinar</displayName>
<displayName count="one">Serbian dinar</displayName>
<displayName count="other">Mga Serbian dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RUB">
- <displayName>Rusong ruble</displayName>
- <displayName count="one" draft="contributed">Rusong ruble</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
+ <displayName>Russian Ruble</displayName>
+ <displayName count="one">Russian ruble</displayName>
+ <displayName count="other">Mga Russian ruble</displayName>
<symbol>↑↑↑</symbol>
<symbol alt="narrow">↑↑↑</symbol>
</currency>
@@ -2800,136 +4272,178 @@
<displayName>Rwandan Franc</displayName>
<displayName count="one">Rwandan franc</displayName>
<displayName count="other">Mga Rwandan franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SAR">
<displayName>Saudi Riyal</displayName>
<displayName count="one">Saudi riyal</displayName>
<displayName count="other">Mga Saudi riyal</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SBD">
<displayName>Solomon Islands Dollar</displayName>
<displayName count="one">Solomon Islands dollar</displayName>
<displayName count="other">Mga Solomon Islands dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SCR">
<displayName>Seychellois Rupee</displayName>
<displayName count="one">Seychellois rupee</displayName>
<displayName count="other">Mga Seychellois rupee</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SDG">
<displayName>Sudanese Pound</displayName>
<displayName count="one">Sudanese pound</displayName>
<displayName count="other">Mga Sudanese pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SEK">
<displayName>Swedish Krona</displayName>
<displayName count="one">Swedish krona</displayName>
<displayName count="other">Swedish kronor</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SGD">
<displayName>Singapore Dollar</displayName>
<displayName count="one">Singapore dollar</displayName>
<displayName count="other">Mga Singapore dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SHP">
<displayName>St. Helena Pound</displayName>
<displayName count="one">St. Helena pound</displayName>
<displayName count="other">Mga St. Helena pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SLL">
<displayName>Sierra Leonean Leone</displayName>
<displayName count="one">Sierra Leonean leone</displayName>
<displayName count="other">Mga Sierra Leonean leone</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SOS">
<displayName>Somali Shilling</displayName>
<displayName count="one">Somali shilling</displayName>
<displayName count="other">Mga Somali shilling</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SRD">
<displayName>Surinamese Dollar</displayName>
<displayName count="one">Surinamese dollar</displayName>
<displayName count="other">Mga Surinamese dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SSP">
<displayName>South Sudanese Pound</displayName>
<displayName count="one">South Sudanese pound</displayName>
<displayName count="other">Mga South Sudanese pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="STN">
<displayName>Sao Tome & Principe Dobra</displayName>
<displayName count="one">Sao Tome & Principe dobra</displayName>
<displayName count="other">Mga Sao Tome & Principe dobra</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SYP">
<displayName>Syrian Pound</displayName>
<displayName count="one">Syrian pound</displayName>
<displayName count="other">Mga Syrian pound</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SZL">
<displayName>Swazi Lilangeni</displayName>
<displayName count="one">Swazi lilangeni</displayName>
<displayName count="other">Swazi emalangeni</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="THB">
<displayName>Thai Baht</displayName>
<displayName count="one">Thai baht</displayName>
<displayName count="other">Thai baht</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TJS">
<displayName>Tajikistani Somoni</displayName>
<displayName count="one">Tajikistani somoni</displayName>
<displayName count="other">Mga Tajikistani somoni</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TMT">
<displayName>Turkmenistani Manat</displayName>
<displayName count="one">Turkmenistani manat</displayName>
<displayName count="other">Turkmenistani manat</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TND">
<displayName>Tunisian Dinar</displayName>
<displayName count="one">Tunisian dinar</displayName>
<displayName count="other">Mga Tunisian dinar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TOP">
<displayName>Tongan Paʻanga</displayName>
<displayName count="one">Tongan paʻanga</displayName>
<displayName count="other">Tongan paʻanga</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TRY">
<displayName>Turkish Lira</displayName>
<displayName count="one">Turkish lira</displayName>
<displayName count="other">Turkish Lira</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ <symbol alt="variant" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TTD">
<displayName>Trinidad & Tobago Dollar</displayName>
<displayName count="one">Trinidad & Tobago dollar</displayName>
<displayName count="other">Mga Trinidad & Tobago dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TWD">
<displayName>New Taiwan Dollar</displayName>
<displayName count="one">New Taiwan dollar</displayName>
<displayName count="other">Mga New Taiwan dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TZS">
<displayName>Tanzanian Shilling</displayName>
<displayName count="one">Tanzanian shilling</displayName>
<displayName count="other">Mga Tanzanian shilling</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UAH">
<displayName>Ukrainian Hryvnia</displayName>
<displayName count="one">Ukrainian hryvnia</displayName>
<displayName count="other">Mga Ukrainian hryvnia</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UGX">
<displayName>Ugandan Shilling</displayName>
<displayName count="one">Ugandan shilling</displayName>
<displayName count="other">Mga Ugandan shilling</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="USD">
- <displayName>Dolyar sa US</displayName>
- <displayName count="one">dolyar sa US</displayName>
- <displayName count="other">dolyares sa US</displayName>
+ <displayName>US Dollar</displayName>
+ <displayName count="one">US dollar</displayName>
+ <displayName count="other">Mga US dollar</displayName>
<symbol draft="contributed">US $</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -2937,51 +4451,64 @@
<displayName>Uruguayan Peso</displayName>
<displayName count="one">Uruguayan peso</displayName>
<displayName count="other">Mga Uruguayan peso</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
<displayName>Uzbekistani Som</displayName>
<displayName count="one">Uzbekistani som</displayName>
<displayName count="other">Uzbekistani som</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VES">
<displayName>Venezuelan Bolivar</displayName>
<displayName count="one">Venezuelan bolivar</displayName>
<displayName count="other">Mga Venezuelan bolivar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VND">
<displayName>Vietnamese Dong</displayName>
<displayName count="one">Vietnamese dong</displayName>
<displayName count="other">Vietnamese dong</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VUV">
<displayName>Vanuatu Vatu</displayName>
<displayName count="one">Vanuatu vatu</displayName>
<displayName count="other">Mga Vanuatu vatu</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="WST">
<displayName>Samoan Tala</displayName>
<displayName count="one">Samoan tala</displayName>
<displayName count="other">Samoan tala</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XAF">
<displayName>Central African CFA Franc</displayName>
<displayName count="one">Central African CFA franc</displayName>
<displayName count="other">Mga Central African CFA franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XCD">
<displayName>East Caribbean Dollar</displayName>
<displayName count="one">East Caribbean dollar</displayName>
<displayName count="other">Mga East Caribbean dollar</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XOF">
<displayName>West African CFA Franc</displayName>
<displayName count="one">West African CFA franc</displayName>
<displayName count="other">Mga West African CFA franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XPF">
<displayName>CFP Franc</displayName>
<displayName count="one">CFP franc</displayName>
<displayName count="other">Mga CFP franc</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XXX">
<displayName>Wala Nahibaluan nga Currency</displayName>
@@ -2992,16 +4519,21 @@
<displayName>Yemeni Rial</displayName>
<displayName count="one">Yemeni rial</displayName>
<displayName count="other">Mga Yemeni rial</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZAR">
<displayName>South African Rand</displayName>
<displayName count="one">South African rand</displayName>
<displayName count="other">South African rand</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZMW">
<displayName>Zambian Kwacha</displayName>
<displayName count="one">Zambian kwacha</displayName>
<displayName count="other">Mga Zambian kwacha</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
</currencies>
<miscPatterns numberSystem="latn">
@@ -3018,9 +4550,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} kada {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">square {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cubic {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -3029,7 +4631,7 @@
<unitPattern count="one">{0} g-force</unitPattern>
<unitPattern count="other">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mga metro kada second squared</displayName>
<unitPattern count="one">{0} ka metro kada second squared</unitPattern>
<unitPattern count="other">{0} ka mga metro kada second squared</unitPattern>
@@ -3129,7 +4731,7 @@
<unitPattern count="one">{0} ka millimole kada litro</unitPattern>
<unitPattern count="other">{0} ka mga millimole kada litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>mga part per million</displayName>
<unitPattern count="one">{0} ka part per million</unitPattern>
<unitPattern count="other">{0} ka mga part per million</unitPattern>
@@ -3159,7 +4761,7 @@
<unitPattern count="one">{0} litro kada kilometro</unitPattern>
<unitPattern count="other">{0} ka mga litro kada kilometro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>mga litro kada 100 kilometro</displayName>
<unitPattern count="one">{0} ka litro kada 100 kilometro</unitPattern>
<unitPattern count="other">{0} ka litro kada 100 kilometro</unitPattern>
@@ -3635,17 +5237,17 @@
<unitPattern count="one">{0} ka horsepower</unitPattern>
<unitPattern count="other">{0} ka horsepower</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mga millimetro sa mercury</displayName>
<unitPattern count="one">{0} ka millimetro sa mercury</unitPattern>
<unitPattern count="other">{0} ka mga millimetro sa mercury</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>mga pound kada kuwadradong pulgada</displayName>
<unitPattern count="one">{0} ka pound kada kuwadradong pulgada</unitPattern>
<unitPattern count="other">{0} ka mga pound kada kuwadradong pulgada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>mga pulgada sa mercury</displayName>
<unitPattern count="one">{0} ka pulgada sa mercury</unitPattern>
<unitPattern count="other">{0} ka mga pulgada sa mercury</unitPattern>
@@ -3725,10 +5327,10 @@
<unitPattern count="one">{0} ka kelvin</unitPattern>
<unitPattern count="other">{0} ka mga kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
- <displayName>mga pound-foot</displayName>
- <unitPattern count="one">{0} ka pound-foot</unitPattern>
- <unitPattern count="other">{0} ka mga pound-foot</unitPattern>
+ <unit type="torque-pound-force-foot">
+ <displayName>mga pound-force-foot</displayName>
+ <unitPattern count="one">{0} ka pound-force-foot</unitPattern>
+ <unitPattern count="other">{0} ka mga pound-force-foot</unitPattern>
</unit>
<unit type="torque-newton-meter">
<displayName>mga newton-meter</displayName>
@@ -3879,9 +5481,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -3890,7 +5562,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mga metro/sec²</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -3990,7 +5662,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>mga part/million</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -4020,7 +5692,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -4496,17 +6168,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -4586,7 +6258,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -4740,18 +6412,88 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
<unit type="concentr-percent">
- <displayName>↑↑↑</displayName>
+ <displayName>%</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -4784,7 +6526,7 @@
<unit type="duration-minute">
<displayName>minuto</displayName>
<unitPattern count="one">{0} minuto</unitPattern>
- <unitPattern count="other">{0}minuto</unitPattern>
+ <unitPattern count="other">{0} minuto</unitPattern>
</unit>
<unit type="duration-second">
<displayName>segundo</displayName>
@@ -4843,10 +6585,10 @@
</unit>
<coordinateUnit>
<displayName>direksyon</displayName>
- <coordinateUnitPattern type="east">↑↑↑</coordinateUnitPattern>
- <coordinateUnitPattern type="north">↑↑↑</coordinateUnitPattern>
- <coordinateUnitPattern type="south">↑↑↑</coordinateUnitPattern>
- <coordinateUnitPattern type="west">↑↑↑</coordinateUnitPattern>
+ <coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
</coordinateUnit>
</unitLength>
<durationUnit type="hm">
@@ -4863,8 +6605,8 @@
<listPattern>
<listPatternPart type="start">{0}, {1}</listPatternPart>
<listPatternPart type="middle">{0}, {1}</listPatternPart>
- <listPatternPart type="end">{0}, at {1}</listPatternPart>
- <listPatternPart type="2">{0} at {1}</listPatternPart>
+ <listPatternPart type="end">{0}, ug {1}</listPatternPart>
+ <listPatternPart type="2">{0} ug {1}</listPatternPart>
</listPattern>
<listPattern type="or">
<listPatternPart type="start">↑↑↑</listPatternPart>
diff --git a/common/main/ceb_PH.xml b/common/main/ceb_PH.xml
index 76c6cb7..b174513 100644
--- a/common/main/ceb_PH.xml
+++ b/common/main/ceb_PH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cgg.xml b/common/main/cgg.xml
index 5010da2..f126122 100644
--- a/common/main/cgg.xml
+++ b/common/main/cgg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cgg_UG.xml b/common/main/cgg_UG.xml
index b54b10a..c7e886b 100644
--- a/common/main/cgg_UG.xml
+++ b/common/main/cgg_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/chr.xml b/common/main/chr.xml
index 3c8a209..6653f94 100644
--- a/common/main/chr.xml
+++ b/common/main/chr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -117,6 +117,7 @@
<language type="eu">ᏆᏍᎨ</language>
<language type="ewo">ᎡᏬᏂᏙ</language>
<language type="fa">ᏇᏏᎠᏂ</language>
+ <language type="fa_AF">ᏓᎵ</language>
<language type="ff">ᏊᎳᏂ</language>
<language type="fi">ᏈᏂᏍ</language>
<language type="fil">ᎠᏈᎵᎩ</language>
@@ -4249,7 +4250,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ ᎠᏟᎢᎵᏒ</standard>
+ <generic draft="contributed">ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ ᎠᏟᎢᎵᏒ</generic>
+ <standard draft="contributed">ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ</standard>
+ <daylight draft="contributed">ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ ᎪᎩ ᎠᏟᎢᎵᏒ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5716,9 +5719,75 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ᎾᎿ {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ᏅᎩ ᏧᏅᏏᏯ {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>cubic {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5727,7 +5796,7 @@
<unitPattern count="one">{0} ᎠᏓᎾᏌᏁᏍᎩ-ᎦᏌᏙᏯᏍᏗ</unitPattern>
<unitPattern count="other">{0} ᎠᏓᎾᏌᏁᏍᎩ-ᎦᏌᏙᏯᏍᏗ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ᏗᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ</displayName>
<unitPattern count="one">{0} ᎠᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ</unitPattern>
<unitPattern count="other">{0} ᏗᏟᎶᏗ ᎠᏎᏢ ᎢᏳᏓᎵ ᏅᎩ ᏧᏅᏏᎩ</unitPattern>
@@ -5827,7 +5896,7 @@
<unitPattern count="one">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎼᎵ ᎵᏔᎢ ᎢᏳᏓᎵ</unitPattern>
<unitPattern count="other">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏂᎼᎵ ᎵᏔᎢ ᎢᏳᏓᎵ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</displayName>
<unitPattern count="one">{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</unitPattern>
<unitPattern count="other">{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</unitPattern>
@@ -5857,7 +5926,7 @@
<unitPattern count="one">{0} ᎵᏔᎢ ᎠᎦᏴᎵ ᎠᏟᎶᏍᏗ ᎢᏳᏓᎵ</unitPattern>
<unitPattern count="other">{0} ᏗᎵᏔᎢ ᎠᎦᏴᎵ ᎠᏟᎶᏍᏗ ᎢᏳᏓᎵ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ᏗᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ</displayName>
<unitPattern count="one">{0} ᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ</unitPattern>
<unitPattern count="other">{0} ᏗᎵᏔᎢ 100 ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ ᎢᏳᏓᎵ</unitPattern>
@@ -6333,17 +6402,17 @@
<unitPattern count="one">{0} ᏐᏈᎵ ᎢᏳᎳᏂᎩᏛ</unitPattern>
<unitPattern count="other">{0} ᏐᏈᎵ ᎢᏳᎳᏂᎩᏛ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ</displayName>
<unitPattern count="one">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
<unitPattern count="other">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ᎢᏧᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ</displayName>
<unitPattern count="one">{0} ᏑᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ</unitPattern>
<unitPattern count="other">{0} ᎢᏧᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ᎢᏏᏔᏗᏍᏗ ᎾᎿ ᎹᎫᎢ</displayName>
<unitPattern count="one">{0} ᎢᏗᎳᏏᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
<unitPattern count="other">{0} ᎢᏏᏔᏗᏍᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
@@ -6423,7 +6492,7 @@
<unitPattern count="one">{0} ᎨᎸᏂ</unitPattern>
<unitPattern count="other">{0} ᎢᏗᎨᎸᏂ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ᏑᏓᎨᏓ-ᏧᎳᏏᏕᏂ</displayName>
<unitPattern count="one">{0} ᏑᏓᎨᏓ-ᎤᎳᏏᏕᏂ</unitPattern>
<unitPattern count="other">{0} ᏑᏓᎨᏓ-ᏧᎳᏏᏕᏂ</unitPattern>
@@ -6577,9 +6646,75 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6588,7 +6723,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ᏗᏟᎶᏍᏗ/sec²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6688,7 +6823,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6718,7 +6853,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7194,17 +7329,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7284,7 +7419,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7438,9 +7573,75 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7449,7 +7650,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
diff --git a/common/main/chr_US.xml b/common/main/chr_US.xml
index 39d17ff..145c7d5 100644
--- a/common/main/chr_US.xml
+++ b/common/main/chr_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ckb.xml b/common/main/ckb.xml
index 5b5caf8..4435109 100644
--- a/common/main/ckb.xml
+++ b/common/main/ckb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -800,96 +800,6 @@
<dates>
<calendars>
<calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="abbreviated">
- <day type="sun" draft="unconfirmed">یەکشەممە</day>
- <day type="mon" draft="unconfirmed">دووشەممە</day>
- <day type="tue" draft="unconfirmed">سێشەممە</day>
- <day type="wed" draft="unconfirmed">چوارشەممە</day>
- <day type="thu" draft="unconfirmed">پێنجشەممە</day>
- <day type="fri" draft="unconfirmed">ھەینی</day>
- <day type="sat" draft="unconfirmed">شەممە</day>
- </dayWidth>
- <dayWidth type="narrow">
- <day type="sun" draft="unconfirmed">ی</day>
- <day type="mon" draft="unconfirmed">د</day>
- <day type="tue" draft="unconfirmed">س</day>
- <day type="wed" draft="unconfirmed">چ</day>
- <day type="thu" draft="unconfirmed">پ</day>
- <day type="fri" draft="unconfirmed">ھ</day>
- <day type="sat" draft="unconfirmed">ش</day>
- </dayWidth>
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">یەکشەممە</day>
- <day type="mon" draft="unconfirmed">دووشەممە</day>
- <day type="tue" draft="unconfirmed">سێشەممە</day>
- <day type="wed" draft="unconfirmed">چوارشەممە</day>
- <day type="thu" draft="unconfirmed">پێنجشەممە</day>
- <day type="fri" draft="unconfirmed">ھەینی</day>
- <day type="sat" draft="unconfirmed">شەممە</day>
- </dayWidth>
- </dayContext>
- <dayContext type="stand-alone">
- <dayWidth type="abbreviated">
- <day type="sun" draft="unconfirmed">یەکشەممە</day>
- <day type="mon" draft="unconfirmed">دووشەممە</day>
- <day type="tue" draft="unconfirmed">سێشەممە</day>
- <day type="wed" draft="unconfirmed">چوارشەممە</day>
- <day type="thu" draft="unconfirmed">پێنجشەممە</day>
- <day type="fri" draft="unconfirmed">ھەینی</day>
- <day type="sat" draft="unconfirmed">شەممە</day>
- </dayWidth>
- <dayWidth type="narrow">
- <day type="sun" draft="unconfirmed">ی</day>
- <day type="mon" draft="unconfirmed">د</day>
- <day type="tue" draft="unconfirmed">س</day>
- <day type="wed" draft="unconfirmed">چ</day>
- <day type="thu" draft="unconfirmed">پ</day>
- <day type="fri" draft="unconfirmed">ھ</day>
- <day type="sat" draft="unconfirmed">ش</day>
- </dayWidth>
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">یەکشەممە</day>
- <day type="mon" draft="unconfirmed">دووشەممە</day>
- <day type="tue" draft="unconfirmed">سێشەممە</day>
- <day type="wed" draft="unconfirmed">چوارشەممە</day>
- <day type="thu" draft="unconfirmed">پێنجشەممە</day>
- <day type="fri" draft="unconfirmed">ھەینی</day>
- <day type="sat" draft="unconfirmed">شەممە</day>
- </dayWidth>
- </dayContext>
- </days>
- <quarters>
- <quarterContext type="format">
- <quarterWidth type="wide">
- <quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
- <quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
- <quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
- <quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
- </quarterWidth>
- </quarterContext>
- <quarterContext type="stand-alone">
- <quarterWidth type="wide">
- <quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
- <quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
- <quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
- <quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
- </quarterWidth>
- </quarterContext>
- </quarters>
- <dayPeriods>
- <dayPeriodContext type="format">
- <dayPeriodWidth type="abbreviated">
- <dayPeriod type="am" draft="unconfirmed">ب.ن</dayPeriod>
- <dayPeriod type="pm" draft="unconfirmed">د.ن</dayPeriod>
- </dayPeriodWidth>
- <dayPeriodWidth type="wide">
- <dayPeriod type="am" draft="unconfirmed">ب.ن</dayPeriod>
- <dayPeriod type="pm" draft="unconfirmed">د.ن</dayPeriod>
- </dayPeriodWidth>
- </dayPeriodContext>
- </dayPeriods>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
diff --git a/common/main/ckb_IQ.xml b/common/main/ckb_IQ.xml
index 46dc460..9327f0b 100644
--- a/common/main/ckb_IQ.xml
+++ b/common/main/ckb_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ckb_IR.xml b/common/main/ckb_IR.xml
index e372aed..5501b3c 100644
--- a/common/main/ckb_IR.xml
+++ b/common/main/ckb_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cs.xml b/common/main/cs.xml
index 38aacad..83fbc72 100644
--- a/common/main/cs.xml
+++ b/common/main/cs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -182,6 +182,7 @@
<language type="ewo">ewondo</language>
<language type="ext">extremadurština</language>
<language type="fa">perština</language>
+ <language type="fa_AF">darí</language>
<language type="fan">fang</language>
<language type="fat">fantština</language>
<language type="ff">fulbština</language>
@@ -649,6 +650,7 @@
<script type="Aghb">kavkazskoalbánské</script>
<script type="Arab">arabské</script>
<script type="Arab" alt="variant">persko-arabské</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">aramejské (imperiální)</script>
<script type="Armn">arménské</script>
<script type="Avst">avestánské</script>
@@ -765,6 +767,7 @@
<script type="Phnx">fénické</script>
<script type="Plrd">Pollardova fonetická abeceda</script>
<script type="Prti">parthské klínové</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">redžanské</script>
<script type="Roro">rongorongo</script>
<script type="Runr">runové</script>
@@ -9351,7 +9354,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkský čas</standard>
+ <generic draft="contributed">Norfolkský čas</generic>
+ <standard draft="contributed">Norfolkský standardní čas</standard>
+ <daylight draft="contributed">Norfolkský letní čas</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -12512,9 +12517,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>čtvereční {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>krychlové {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -12525,7 +12604,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metr za sekundu na druhou</displayName>
<unitPattern count="one">{0} metr za sekundu na druhou</unitPattern>
<unitPattern count="few">{0} metry za sekundu na druhou</unitPattern>
@@ -12663,7 +12742,7 @@
<unitPattern count="many">{0} milimolu na litr</unitPattern>
<unitPattern count="other">{0} milimolů na litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>díly z milionu</displayName>
<unitPattern count="one">{0} díl z milionu</unitPattern>
<unitPattern count="few">{0} díly z milionu</unitPattern>
@@ -12705,7 +12784,7 @@
<unitPattern count="many">{0} litru na kilometr</unitPattern>
<unitPattern count="other">{0} litrů na kilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litry na sto kilometrů</displayName>
<unitPattern count="one">{0} litr na sto kilometrů</unitPattern>
<unitPattern count="few">{0} litry na sto kilometrů</unitPattern>
@@ -13386,21 +13465,21 @@
<unitPattern count="many">{0} koňské síly</unitPattern>
<unitPattern count="other">{0} koňských sil</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetry rtuti</displayName>
<unitPattern count="one">{0} milimetr rtuti</unitPattern>
<unitPattern count="few">{0} milimetry rtuti</unitPattern>
<unitPattern count="many">{0} milimetru rtuti</unitPattern>
<unitPattern count="other">{0} milimetrů rtuti</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libry na čtvereční palec</displayName>
<unitPattern count="one">{0} libra na čtvereční palec</unitPattern>
<unitPattern count="few">{0} libry na čtvereční palec</unitPattern>
<unitPattern count="many">{0} libry na čtvereční palec</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>palce rtuti</displayName>
<unitPattern count="one">{0} palec rtuti</unitPattern>
<unitPattern count="few">{0} palce rtuti</unitPattern>
@@ -13512,7 +13591,7 @@
<unitPattern count="many">{0} kelvinu</unitPattern>
<unitPattern count="other">{0} kelvinů</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>librostopy</displayName>
<unitPattern count="one">{0} librostopa</unitPattern>
<unitPattern count="few">{0} librostopy</unitPattern>
@@ -13729,9 +13808,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -13742,7 +13895,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -13880,7 +14033,7 @@
<unitPattern count="many">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -13922,7 +14075,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -14603,21 +14756,21 @@
<unitPattern count="many">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="many">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -14729,7 +14882,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="few">{0} lbf⋅ft</unitPattern>
@@ -14946,9 +15099,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -14959,7 +15186,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -15090,7 +15317,7 @@
<unitPattern count="many" draft="contributed">{0} mmol/l</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">ppm</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="few" draft="contributed">{0} ppm</unitPattern>
@@ -15111,7 +15338,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -15655,21 +15882,21 @@
<unitPattern count="many">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="many">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/cs_CZ.xml b/common/main/cs_CZ.xml
index e86e73f..bf3eef5 100644
--- a/common/main/cs_CZ.xml
+++ b/common/main/cs_CZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cu.xml b/common/main/cu.xml
index d1f9503..daa699d 100644
--- a/common/main/cu.xml
+++ b/common/main/cu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cu_RU.xml b/common/main/cu_RU.xml
index 72056b3..cf773d1 100644
--- a/common/main/cu_RU.xml
+++ b/common/main/cu_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/cy.xml b/common/main/cy.xml
index e59dcf1..6b55ee1 100644
--- a/common/main/cy.xml
+++ b/common/main/cy.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -158,6 +158,7 @@
<language type="ewo">Ewondo</language>
<language type="ext">Extremadureg</language>
<language type="fa">Perseg</language>
+ <language type="fa_AF">Dari</language>
<language type="fat">Ffanti</language>
<language type="ff">Ffwla</language>
<language type="fi">Ffinneg</language>
@@ -4843,7 +4844,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Amser Ynys Norfolk</standard>
+ <generic draft="contributed">Amser Ynys Norfolk</generic>
+ <standard draft="contributed">Amser Safonol Ynys Norfolk</standard>
+ <daylight draft="contributed">Amser Haf Ynys Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8150,9 +8153,87 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ffemto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>cilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} sgwâr</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} sgwâr</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} sgwâr</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} ciwbig</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} ciwbig</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} ciwbig</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8165,7 +8246,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} grym disgyrchedd</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrau yr eiliad sgwâr</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} metr yr eiliad sgwâr</unitPattern>
@@ -8341,7 +8422,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} milimôl y litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>rhannau pob miliwn</displayName>
<unitPattern count="zero">{0} rhan pob miliwn</unitPattern>
<unitPattern count="one">{0} rhan pob miliwn</unitPattern>
@@ -8395,7 +8476,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} litr y cilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litrau y 100 cilometr</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} litr y 100 cilometr</unitPattern>
@@ -9266,7 +9347,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} marchnerth</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetrau o fercwri</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} milimetr o fercwri</unitPattern>
@@ -9275,7 +9356,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} milimetr o fercwri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pwysau y fodfedd sgwar</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} pwys y fodfedd sgwar</unitPattern>
@@ -9284,7 +9365,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} pwys y fodfedd sgwar</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>modfeddi o fercwri</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} fodfedd o fercwri</unitPattern>
@@ -9428,7 +9509,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">{0} celfin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pwys-troedfeddi</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">{0} pwys-troedfedd</unitPattern>
@@ -9703,9 +9784,87 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9718,7 +9877,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrau/eil²</displayName>
<unitPattern count="zero">{0} m/eil²</unitPattern>
<unitPattern count="one">{0} m/eil²</unitPattern>
@@ -9894,7 +10053,7 @@
<unitPattern count="many">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>rhan/miliwn</displayName>
<unitPattern count="zero">{0} ppm</unitPattern>
<unitPattern count="one">{0} ppm</unitPattern>
@@ -9948,7 +10107,7 @@
<unitPattern count="many">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="zero">{0} L/100km</unitPattern>
<unitPattern count="one">{0} L/100km</unitPattern>
@@ -10813,7 +10972,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -10822,7 +10981,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="zero">{0} psi</unitPattern>
<unitPattern count="one">{0} psi</unitPattern>
@@ -10831,7 +10990,7 @@
<unitPattern count="many">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>" Hg</displayName>
<unitPattern count="zero">{0} ″ Hg</unitPattern>
<unitPattern count="one">{0} ″ Hg</unitPattern>
@@ -10975,7 +11134,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="zero">↑↑↑</unitPattern>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -11250,9 +11409,87 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -11380,7 +11617,7 @@
<unitPattern count="many">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="zero">{0}L/100km</unitPattern>
<unitPattern count="one">{0}L/100km</unitPattern>
@@ -11957,7 +12194,7 @@
<unitPattern count="many">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="zero">{0}mmHg</unitPattern>
<unitPattern count="one">{0}mmHg</unitPattern>
@@ -11966,7 +12203,7 @@
<unitPattern count="many">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="zero">{0}psi</unitPattern>
<unitPattern count="one">{0}psi</unitPattern>
@@ -11975,7 +12212,7 @@
<unitPattern count="many">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>″ Hg</displayName>
<unitPattern count="zero">{0}" Hg</unitPattern>
<unitPattern count="one">{0}" Hg</unitPattern>
diff --git a/common/main/cy_GB.xml b/common/main/cy_GB.xml
index d52381f..fef2d31 100644
--- a/common/main/cy_GB.xml
+++ b/common/main/cy_GB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/da.xml b/common/main/da.xml
index dde775c..ed2a69e 100644
--- a/common/main/da.xml
+++ b/common/main/da.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">mapudungun</language>
<language type="arp">arapaho</language>
<language type="ars">Najd-arabisk</language>
+ <language type="ars" alt="menu">arabisk, najdi</language>
<language type="arw">arawak</language>
<language type="as">assamesisk</language>
<language type="asa">asu</language>
@@ -105,6 +106,7 @@
<language type="chr">cherokee</language>
<language type="chy">cheyenne</language>
<language type="ckb">sorani</language>
+ <language type="ckb" alt="menu">kurdisk, sorani</language>
<language type="co">korsikansk</language>
<language type="cop">koptisk</language>
<language type="cr">cree</language>
@@ -149,6 +151,7 @@
<language type="en_GB">britisk engelsk</language>
<language type="en_GB" alt="short">engelsk (UK)</language>
<language type="en_US">amerikansk engelsk</language>
+ <language type="en_US" alt="short">amerikansk engelsk</language>
<language type="enm">middelengelsk</language>
<language type="eo">esperanto</language>
<language type="es">spansk</language>
@@ -159,6 +162,7 @@
<language type="eu">baskisk</language>
<language type="ewo">ewondo</language>
<language type="fa">persisk</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulah</language>
@@ -565,6 +569,7 @@
<script type="Afak" draft="contributed">afaka</script>
<script type="Arab">arabisk</script>
<script type="Arab" alt="variant">persisk-arabisk</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">armi</script>
<script type="Armn">armensk</script>
<script type="Avst">avestansk</script>
@@ -677,6 +682,7 @@
<script type="Phnx">fønikisk</script>
<script type="Plrd">pollardtegn</script>
<script type="Prti">prti</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Roro">rongo-rongo</script>
<script type="Runr">runer</script>
@@ -1293,8 +1299,13 @@
</parseLenients>
<parseLenients scope="general" level="lenient">
<parseLenient sample="." draft="contributed">[.․。︒﹒．｡]</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="$" draft="contributed">[\$﹩＄$]</parseLenient>
<parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
</parseLenients>
<parseLenients scope="number" level="lenient">
@@ -2077,19 +2088,19 @@
<greatestDifference id="y">y–y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
- <greatestDifference id="G">M/y GGGG–M/y GGGG</greatestDifference>
- <greatestDifference id="M">M/y–M/y GGGGG</greatestDifference>
- <greatestDifference id="y">M/y–M/y GGGGG</greatestDifference>
+ <greatestDifference id="G">MM.y GGGGG–MM.y GGGGG</greatestDifference>
+ <greatestDifference id="M">MM.y–MM.y GGGGG</greatestDifference>
+ <greatestDifference id="y">MM.y–MM.y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
- <greatestDifference id="d">d/M/y–d/M/y GGGGG</greatestDifference>
- <greatestDifference id="G">d/M/y GGGGG–d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="d">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
+ <greatestDifference id="G">dd.MM.y GGGGG–dd.MM.y GGGGG</greatestDifference>
<greatestDifference id="M">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
<greatestDifference id="y">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
- <greatestDifference id="d">E dd. MM. y–E dd. MM. y GGGGG</greatestDifference>
- <greatestDifference id="G">E, d/M/y GGGGG–E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="d">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
+ <greatestDifference id="G">E dd.MM.y GGGGG–E dd.MM.y GGGGG</greatestDifference>
<greatestDifference id="M">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
<greatestDifference id="y">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
</intervalFormatItem>
@@ -5030,7 +5041,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island-tid</standard>
+ <generic draft="contributed">Norfolk Island-tid</generic>
+ <standard draft="contributed">Norfolk Island-normaltid</standard>
+ <daylight draft="contributed">Norfolk Island-sommertid</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7170,9 +7183,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} pr. {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadrat{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubik{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0} gange {1}</compoundUnitPattern>
</compoundUnit>
@@ -7181,7 +7264,7 @@
<unitPattern count="one">{0} G-kraft</unitPattern>
<unitPattern count="other">{0} G-kraft</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter pr. sekund²</displayName>
<unitPattern count="one">{0} meter pr. sekund²</unitPattern>
<unitPattern count="other">{0} meter pr. sekund²</unitPattern>
@@ -7281,7 +7364,7 @@
<unitPattern count="one">{0} millimol pr. liter</unitPattern>
<unitPattern count="other">{0} millimol pr. liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts per million</displayName>
<unitPattern count="one">{0} parts per million</unitPattern>
<unitPattern count="other">{0} parts per million</unitPattern>
@@ -7311,7 +7394,7 @@
<unitPattern count="one">{0} liter pr. kilometer</unitPattern>
<unitPattern count="other">{0} liter pr. kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter pr. 100 kilometer</displayName>
<unitPattern count="one">{0} liter pr. 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter pr. 100 kilometer</unitPattern>
@@ -7787,17 +7870,17 @@
<unitPattern count="one">{0} hestekraft</unitPattern>
<unitPattern count="other">{0} hestekræfter</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter kviksølv</displayName>
<unitPattern count="one">{0} millimeter kviksølv</unitPattern>
<unitPattern count="other">{0} millimeter kviksølv</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pounds pr. kvadrattomme</displayName>
<unitPattern count="one">{0} pound pr. kvadrattomme</unitPattern>
<unitPattern count="other">{0} pounds pr. kvadrattommer</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tommer kviksølv</displayName>
<unitPattern count="one">{0} tomme kviksølv</unitPattern>
<unitPattern count="other">{0} tommer kviksølv</unitPattern>
@@ -7877,7 +7960,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8031,9 +8114,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0} ⋅ {1}</compoundUnitPattern>
</compoundUnit>
@@ -8042,7 +8195,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8142,7 +8295,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8172,7 +8325,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8648,17 +8801,17 @@
<unitPattern count="one">{0} hk</unitPattern>
<unitPattern count="other">{0} hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName># Hg</displayName>
<unitPattern count="one">{0} # Hg</unitPattern>
<unitPattern count="other">{0} # Hg</unitPattern>
@@ -8738,7 +8891,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8892,9 +9045,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8902,7 +9125,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
</unit>
@@ -8948,7 +9171,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">ppm</displayName>
<unitPattern count="one" draft="unconfirmed">{0} ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} ppm</unitPattern>
@@ -8958,7 +9181,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -9162,17 +9385,17 @@
<unitPattern count="one">{0}hk</unitPattern>
<unitPattern count="other">{0}hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed"># Hg</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
diff --git a/common/main/da_DK.xml b/common/main/da_DK.xml
index 45b27e8..d29ff30 100644
--- a/common/main/da_DK.xml
+++ b/common/main/da_DK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/da_GL.xml b/common/main/da_GL.xml
index e04a824..6b0f99a 100644
--- a/common/main/da_GL.xml
+++ b/common/main/da_GL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dav.xml b/common/main/dav.xml
index 0a3bfd4..69b6f6e 100644
--- a/common/main/dav.xml
+++ b/common/main/dav.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dav_KE.xml b/common/main/dav_KE.xml
index 8d29f9a..0f9c380 100644
--- a/common/main/dav_KE.xml
+++ b/common/main/dav_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de.xml b/common/main/de.xml
index 1b0ca0e..be99e1a 100644
--- a/common/main/de.xml
+++ b/common/main/de.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="chr">Cherokee</language>
<language type="chy">Cheyenne</language>
<language type="ckb">Zentralkurdisch</language>
+ <language type="ckb" alt="menu" draft="contributed">Kurdisch (Sorani)</language>
<language type="co">Korsisch</language>
<language type="cop">Koptisch</language>
<language type="cps">Capiznon</language>
@@ -164,17 +165,25 @@
<language type="el">Griechisch</language>
<language type="elx">Elamisch</language>
<language type="en">Englisch</language>
+ <language type="en_AU">↑↑↑</language>
+ <language type="en_CA">↑↑↑</language>
+ <language type="en_GB">↑↑↑</language>
<language type="en_GB" alt="short">Englisch (GB)</language>
+ <language type="en_US">↑↑↑</language>
<language type="en_US" alt="short">Englisch (USA)</language>
<language type="enm">Mittelenglisch</language>
<language type="eo">Esperanto</language>
<language type="es">Spanisch</language>
+ <language type="es_419">↑↑↑</language>
+ <language type="es_ES">↑↑↑</language>
+ <language type="es_MX">↑↑↑</language>
<language type="esu">Zentral-Alaska-Yupik</language>
<language type="et">Estnisch</language>
<language type="eu">Baskisch</language>
<language type="ewo">Ewondo</language>
<language type="ext">Extremadurisch</language>
<language type="fa">Persisch</language>
+ <language type="fa_AF">Dari</language>
<language type="fan">Pangwe</language>
<language type="fat">Fanti</language>
<language type="ff">Ful</language>
@@ -185,6 +194,8 @@
<language type="fo">Färöisch</language>
<language type="fon">Fon</language>
<language type="fr">Französisch</language>
+ <language type="fr_CA">↑↑↑</language>
+ <language type="fr_CH">↑↑↑</language>
<language type="frc">Cajun</language>
<language type="frm">Mittelfranzösisch</language>
<language type="fro">Altfranzösisch</language>
@@ -452,6 +463,8 @@
<language type="pro">Altprovenzalisch</language>
<language type="ps">Paschtu</language>
<language type="pt">Portugiesisch</language>
+ <language type="pt_BR">↑↑↑</language>
+ <language type="pt_PT">↑↑↑</language>
<language type="qu">Quechua</language>
<language type="quc">K’iche’</language>
<language type="qug">Chimborazo Hochland-Quechua</language>
@@ -627,6 +640,7 @@
<language type="zh_Hans">Chinesisch (vereinfacht)</language>
<language type="zh_Hans" alt="long">Mandarin (Vereinfacht)</language>
<language type="zh_Hant">Chinesisch (traditionell)</language>
+ <language type="zh_Hant" alt="long">Mandarin (traditionell)</language>
<language type="zu">Zulu</language>
<language type="zun">Zuni</language>
<language type="zxx">Keine Sprachinhalte</language>
@@ -639,6 +653,7 @@
<script type="Ahom" draft="unconfirmed">↑↑↑</script>
<script type="Arab">Arabisch</script>
<script type="Arab" alt="variant">Persisch</script>
+ <script type="Aran" draft="contributed">Nastaliq</script>
<script type="Armn">Armenisch</script>
<script type="Avst">Avestisch</script>
<script type="Bali">Balinesisch</script>
@@ -682,6 +697,7 @@
<script type="Grek">Griechisch</script>
<script type="Gujr">Gujarati</script>
<script type="Guru">Gurmukhi</script>
+ <script type="Hanb">Han mit Bopomofo</script>
<script type="Hang">Hangul</script>
<script type="Hani">Chinesisch</script>
<script type="Hano">Hanunoo</script>
@@ -765,6 +781,7 @@
<script type="Phnx">Phönizisch</script>
<script type="Plrd">Pollard Phonetisch</script>
<script type="Prti" draft="contributed">Parthisch</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Rejang</script>
<script type="Rohg" draft="unconfirmed">Hanifi Rohingya</script>
<script type="Roro">Rongorongo</script>
@@ -5488,7 +5505,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkinsel-Zeit</standard>
+ <generic draft="contributed">Norfolkinsel-Zeit</generic>
+ <standard draft="contributed">Norfolkinsel-Normalzeit</standard>
+ <daylight draft="contributed">Norfolkinsel-Sommerzeit</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7820,9 +7839,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>Dezi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>Zenti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>Milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>Mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>Nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>Piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>Femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>Atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>Zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>Yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>Deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>Hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>Kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>Mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>Peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} pro {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>Quadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">Quadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">Quadrat{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>Kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">Kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">Kubik{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7831,7 +7920,7 @@
<unitPattern count="one">{0}-fache Erdbeschleunigung</unitPattern>
<unitPattern count="other">{0}-fache Erdbeschleunigung</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>Meter pro Quadratsekunde</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7931,7 +8020,7 @@
<unitPattern count="one">{0} Millimol pro Liter</unitPattern>
<unitPattern count="other">{0} Millimol pro Liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>Parts per million</displayName>
<unitPattern count="one">{0} Parts per million</unitPattern>
<unitPattern count="other">{0} Parts per million</unitPattern>
@@ -7961,7 +8050,7 @@
<unitPattern count="one">{0} Liter pro Kilometer</unitPattern>
<unitPattern count="other">{0} Liter pro Kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>Liter auf 100 Kilometer</displayName>
<unitPattern count="one">{0} Liter auf 100 Kilometer</unitPattern>
<unitPattern count="other">{0} Liter auf 100 Kilometer</unitPattern>
@@ -8452,17 +8541,17 @@
<unitPattern count="one">{0} Pferdestärke</unitPattern>
<unitPattern count="other">{0} Pferdestärken</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>Millimeter Quecksilbersäule</displayName>
<unitPattern count="one">{0} Millimeter Quecksilbersäule</unitPattern>
<unitPattern count="other">{0} Millimeter Quecksilbersäule</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>Pfund pro Quadratzoll</displayName>
<unitPattern count="one">{0} Pfund pro Quadratzoll</unitPattern>
<unitPattern count="other">{0} Pfund pro Quadratzoll</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>Zoll Quecksilbersäule</displayName>
<unitPattern count="one">{0} Zoll Quecksilbersäule</unitPattern>
<unitPattern count="other">{0} Zoll Quecksilbersäule</unitPattern>
@@ -8542,7 +8631,7 @@
<unitPattern count="one">{0} Kelvin</unitPattern>
<unitPattern count="other">{0} Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8701,9 +8790,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8712,7 +8871,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8812,7 +8971,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts/million</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8842,7 +9001,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -9333,17 +9492,17 @@
<unitPattern count="one">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9423,7 +9582,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -9582,9 +9741,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9593,7 +9822,7 @@
<unitPattern count="one" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -9663,7 +9892,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
</unit>
@@ -9676,7 +9905,7 @@
<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -10015,17 +10244,17 @@
<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
diff --git a/common/main/de_AT.xml b/common/main/de_AT.xml
index 8b41199..31ce98a 100644
--- a/common/main/de_AT.xml
+++ b/common/main/de_AT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_BE.xml b/common/main/de_BE.xml
index 210a139..90daa2c 100644
--- a/common/main/de_BE.xml
+++ b/common/main/de_BE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_CH.xml b/common/main/de_CH.xml
index aec6b42..f2add78 100644
--- a/common/main/de_CH.xml
+++ b/common/main/de_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_DE.xml b/common/main/de_DE.xml
index 598236a..fa7198c 100644
--- a/common/main/de_DE.xml
+++ b/common/main/de_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_IT.xml b/common/main/de_IT.xml
index 3823a13..137de1b 100644
--- a/common/main/de_IT.xml
+++ b/common/main/de_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_LI.xml b/common/main/de_LI.xml
index b5da8f7..618b65a 100644
--- a/common/main/de_LI.xml
+++ b/common/main/de_LI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/de_LU.xml b/common/main/de_LU.xml
index a570570..8a0ecf6 100644
--- a/common/main/de_LU.xml
+++ b/common/main/de_LU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dje.xml b/common/main/dje.xml
index 714063e..16e5664 100644
--- a/common/main/dje.xml
+++ b/common/main/dje.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dje_NE.xml b/common/main/dje_NE.xml
index a6b58d6..f58eee7 100644
--- a/common/main/dje_NE.xml
+++ b/common/main/dje_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dsb.xml b/common/main/dsb.xml
index 527d7cb..6c9937b 100644
--- a/common/main/dsb.xml
+++ b/common/main/dsb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2793,7 +2793,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>cas kupy Norfolk</standard>
+ <generic draft="contributed">cas kupy Norfolk</generic>
+ <standard draft="contributed">standardny cas kupy Norfolk</standard>
+ <daylight draft="contributed">lěśojski cas kupy Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4603,7 +4605,7 @@
<unitPattern count="few">{0} jadnotki zemskego póspěšenja</unitPattern>
<unitPattern count="other">{0} jadnotkow zemskego póspěšenja</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metry na kwadratnu sekundu</displayName>
<unitPattern count="one">{0} meter na kwadratnu sekundu</unitPattern>
<unitPattern count="two">{0} metra na kwadratnu sekundu</unitPattern>
@@ -5193,21 +5195,21 @@
<unitPattern count="few">{0} kónjece mócy</unitPattern>
<unitPattern count="other">{0} kónjecych mócow</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetry słupika žywego slobra</displayName>
<unitPattern count="one">{0} milimeter słupika žywego slobra</unitPattern>
<unitPattern count="two">{0} milimetra słupika žywego slobra</unitPattern>
<unitPattern count="few">{0} milimetry słupika žywego slobra</unitPattern>
<unitPattern count="other">{0} milimetrow słupika žywego slobra</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>punty na kwadratny col</displayName>
<unitPattern count="one">{0} punt na kwadratny col</unitPattern>
<unitPattern count="two">{0} punta na kwadratny col</unitPattern>
<unitPattern count="few">{0} punty na kwadratny col</unitPattern>
<unitPattern count="other">{0} puntow na kwadratny col</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>cole žywoslobrowego słupika</displayName>
<unitPattern count="one">{0} col słupika žywego slobra</unitPattern>
<unitPattern count="two">{0} cola słupika žywego slobra</unitPattern>
@@ -5426,7 +5428,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -6016,21 +6018,21 @@
<unitPattern count="few">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="two">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="two">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -6466,7 +6468,7 @@
<unitPattern count="few">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/dsb_DE.xml b/common/main/dsb_DE.xml
index 48f3984..a5be83e 100644
--- a/common/main/dsb_DE.xml
+++ b/common/main/dsb_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dua.xml b/common/main/dua.xml
index f8e479c..33733bf 100644
--- a/common/main/dua.xml
+++ b/common/main/dua.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dua_CM.xml b/common/main/dua_CM.xml
index 172d270..6cd704d 100644
--- a/common/main/dua_CM.xml
+++ b/common/main/dua_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dyo.xml b/common/main/dyo.xml
index 270bf4f..757216a 100644
--- a/common/main/dyo.xml
+++ b/common/main/dyo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dyo_SN.xml b/common/main/dyo_SN.xml
index cca0607..4bd5a31 100644
--- a/common/main/dyo_SN.xml
+++ b/common/main/dyo_SN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dz.xml b/common/main/dz.xml
index fead92c..979eed5 100644
--- a/common/main/dz.xml
+++ b/common/main/dz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/dz_BT.xml b/common/main/dz_BT.xml
index 9a64f5b..8771ab5 100644
--- a/common/main/dz_BT.xml
+++ b/common/main/dz_BT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ebu.xml b/common/main/ebu.xml
index 60b47fa..3a166f1 100644
--- a/common/main/ebu.xml
+++ b/common/main/ebu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ebu_KE.xml b/common/main/ebu_KE.xml
index 3f4451e..ee831c7 100644
--- a/common/main/ebu_KE.xml
+++ b/common/main/ebu_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ee.xml b/common/main/ee.xml
index 02f3bd8..ee7c192 100644
--- a/common/main/ee.xml
+++ b/common/main/ee.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4255,7 +4255,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island gaƒoƒo me</standard>
+ <generic draft="contributed">Norfolk Island gaƒoƒo me</generic>
+ <standard draft="contributed">Norfolk Island nutome gaƒoƒo me</standard>
+ <daylight draft="contributed">Norfolk Island dzomeŋɔli gaƒoƒo me</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/ee_GH.xml b/common/main/ee_GH.xml
index 437bbc6..74151b7 100644
--- a/common/main/ee_GH.xml
+++ b/common/main/ee_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ee_TG.xml b/common/main/ee_TG.xml
index 97b1587..5a51241 100644
--- a/common/main/ee_TG.xml
+++ b/common/main/ee_TG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/el.xml b/common/main/el.xml
index 8812cec..0c31c52 100644
--- a/common/main/el.xml
+++ b/common/main/el.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -160,6 +160,7 @@
<language type="eu">Βασκικά</language>
<language type="ewo">Εγουόντο</language>
<language type="fa">Περσικά</language>
+ <language type="fa_AF">Νταρί</language>
<language type="fan">Φανγκ</language>
<language type="fat">Φάντι</language>
<language type="ff">Φουλά</language>
@@ -560,6 +561,7 @@
<scripts>
<script type="Arab">Αραβικό</script>
<script type="Arab" alt="variant">Περσικό-Αραβικό</script>
+ <script type="Aran" draft="contributed">Νασταλίκ</script>
<script type="Armi">Αυτοκρατορικό Αραμαϊκό</script>
<script type="Armn">Αρμενικό</script>
<script type="Avst">Αβεστάν</script>
@@ -5350,7 +5352,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Ώρα Νήσου Νόρφολκ</standard>
+ <generic draft="contributed">Ώρα Νήσου Νόρφολκ</generic>
+ <standard draft="contributed">Χειμερινή ώρα Νήσου Νόρφολκ</standard>
+ <daylight draft="contributed">Θερινή ώρα Νήσου Νόρφολκ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7453,9 +7457,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>δεκατο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>εκατοστο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>χιλιοστο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>μικρο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>νανο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>πικο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>φεμτο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>αττο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ζεπτο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>γιοκτο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>δεκα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>εκατο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>χιλιο-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>μεγα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>γιγα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>τερα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>πετα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>εξα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ζεττα-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>γιοττα-{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ανά {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>τετραγωνικό {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">τετραγωνικό {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">τετραγωνικά {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>κυβικό {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">κυβικό {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">κυβικά {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7464,7 +7538,7 @@
<unitPattern count="one">{0} δύναμη επιτάχυνσης</unitPattern>
<unitPattern count="other">{0} δύναμη επιτάχυνσης</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>μέτρα ανά τετραγωνικό δευτερόλεπτο</displayName>
<unitPattern count="one">{0} μέτρο ανά τετραγωνικό δευτερόλεπτο</unitPattern>
<unitPattern count="other">{0} μέτρα ανά τετραγωνικό δευτερόλεπτο</unitPattern>
@@ -7564,7 +7638,7 @@
<unitPattern count="one">{0} χιλιοστογραμμομόριο ανά λίτρο</unitPattern>
<unitPattern count="other">{0} χιλιοστογραμμομόρια ανά λίτρο</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>μέρη ανά εκατομμύριο</displayName>
<unitPattern count="one">{0} μέρος ανά εκατομμύριο</unitPattern>
<unitPattern count="other">{0} μέρη ανά εκατομμύριο</unitPattern>
@@ -7594,7 +7668,7 @@
<unitPattern count="one">{0} λίτρο ανά χιλιόμετρο</unitPattern>
<unitPattern count="other">{0} λίτρα ανά χιλιόμετρο</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>λίτρα ανά 100 χιλιόμετρα</displayName>
<unitPattern count="one">{0} λίτρο ανά 100 χιλιόμετρα</unitPattern>
<unitPattern count="other">{0} λίτρα ανά 100 χιλιόμετρα</unitPattern>
@@ -8070,17 +8144,17 @@
<unitPattern count="one">{0} ίππος</unitPattern>
<unitPattern count="other">{0} ίπποι</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>χιλιοστόμετρα στήλης υδραργύρου</displayName>
<unitPattern count="one">{0} χιλιοστόμετρο στήλης υδραργύρου</unitPattern>
<unitPattern count="other">{0} χιλιοστόμετρα στήλης υδραργύρου</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>λίβρες ανά τετραγωνική ίντσα</displayName>
<unitPattern count="one">{0} λίβρα ανά τετραγωνική ίντσα</unitPattern>
<unitPattern count="other">{0} λίβρες ανά τετραγωνική ίντσα</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ίντσες στήλης υδραργύρου</displayName>
<unitPattern count="one">{0} ίντσα στήλης υδραργύρου</unitPattern>
<unitPattern count="other">{0} ίντσες στήλης υδραργύρου</unitPattern>
@@ -8160,7 +8234,7 @@
<unitPattern count="one">{0} βαθμός Κέλβιν</unitPattern>
<unitPattern count="other">{0} βαθμοί Κέλβιν</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>λίβρες-πόδια</displayName>
<unitPattern count="one">{0} λίβρα-πόδι</unitPattern>
<unitPattern count="other">{0} λίβρες-πόδια</unitPattern>
@@ -8314,9 +8388,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>δκτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>εκστ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>χλστ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µκρ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>νν-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>πκ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>φμτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ατ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ζπτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>γκτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>δκ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>εκτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>χλ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>μγ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>γγ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>τρ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>πτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>εξ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ζτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>γττ-{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8325,7 +8469,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>μέτρα/τετρ. δευτ.</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8425,7 +8569,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8455,7 +8599,7 @@
<unitPattern count="one">{0} λίτρο/χλμ</unitPattern>
<unitPattern count="other">{0} λίτρα/χλμ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>λ./100 χλμ.</displayName>
<unitPattern count="one">{0} λ./100 χλμ.</unitPattern>
<unitPattern count="other">{0} λ./100 χλμ.</unitPattern>
@@ -8931,17 +9075,17 @@
<unitPattern count="one">{0} ίπ.</unitPattern>
<unitPattern count="other">{0} ίπ.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9021,7 +9165,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>λβρ⋅πδ</displayName>
<unitPattern count="one">{0} λβρ⋅πδ</unitPattern>
<unitPattern count="other">{0} λβρ⋅πδ</unitPattern>
@@ -9175,9 +9319,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>δεκατ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>εκατοστ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>χιλιοστ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>μικρ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ναν-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>πικ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>φεμτ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>αττ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ζεπ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>γιοκ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>δεκ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>εκατ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>χιλ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>μεγ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>γιγ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>τερ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>πετ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>εξ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ζετ-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>γιοτ-{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9226,7 +9440,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>λ/100 χλμ</displayName>
<unitPattern count="one">{0} λ/100 χλμ</unitPattern>
<unitPattern count="other">{0} λ/100 χλμ</unitPattern>
@@ -9345,7 +9559,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/el_CY.xml b/common/main/el_CY.xml
index b6b20e9..1a7c3cc 100644
--- a/common/main/el_CY.xml
+++ b/common/main/el_CY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/el_GR.xml b/common/main/el_GR.xml
index 891e1d0..4bc94d2 100644
--- a/common/main/el_GR.xml
+++ b/common/main/el_GR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en.xml b/common/main/en.xml
index 262089f..931edbf 100644
--- a/common/main/en.xml
+++ b/common/main/en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -52,6 +52,7 @@
<language type="arp">Arapaho</language>
<language type="arq">Algerian Arabic</language>
<language type="ars">Najdi Arabic</language>
+ <language type="ars" alt="menu">Arabic, Najdi</language>
<language type="arw">Arawak</language>
<language type="ary">Moroccan Arabic</language>
<language type="arz">Egyptian Arabic</language>
@@ -126,6 +127,8 @@
<language type="chy">Cheyenne</language>
<language type="cic">Chickasaw</language>
<language type="ckb">Central Kurdish</language>
+ <language type="ckb" alt="menu">Kurdish, Central</language>
+ <language type="ckb" alt="variant">Kurdish, Sorani</language>
<language type="co">Corsican</language>
<language type="cop">Coptic</language>
<language type="cps">Capiznon</language>
@@ -662,6 +665,7 @@
<script type="Ahom">Ahom</script>
<script type="Arab">Arabic</script>
<script type="Arab" alt="variant">Perso-Arabic</script>
+ <script type="Aran">Nastaliq</script>
<script type="Armi">Imperial Aramaic</script>
<script type="Armn">Armenian</script>
<script type="Avst">Avestan</script>
@@ -946,6 +950,7 @@
<territory type="CR">Costa Rica</territory>
<territory type="CU">Cuba</territory>
<territory type="CV">Cape Verde</territory>
+ <territory type="CV" alt="variant">Cabo Verde</territory>
<territory type="CW">Curaçao</territory>
<territory type="CX">Christmas Island</territory>
<territory type="CY">Cyprus</territory>
@@ -1504,6 +1509,7 @@
<type key="numbers" type="roman">Roman Numerals</type>
<type key="numbers" type="romanlow">Roman Lowercase Numerals</type>
<type key="numbers" type="saur">Saurashtra Digits</type>
+ <type key="numbers" type="segment">Segmented Digits</type>
<type key="numbers" type="shrd">Sharada Digits</type>
<type key="numbers" type="sind">Khudawadi Digits</type>
<type key="numbers" type="sinh">Sinhala Lith Digits</type>
@@ -4015,7 +4021,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic>Norfolk Island Time</generic>
+ <standard>Norfolk Island Standard Time</standard>
+ <daylight>Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5958,15 +5966,85 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">square {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cubic {0}</compoundUnitPattern1>
+ </compoundUnit>
<unit type="acceleration-g-force">
<displayName>g-force</displayName>
<unitPattern count="one">{0} g-force</unitPattern>
<unitPattern count="other">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meters per second squared</displayName>
<unitPattern count="one">{0} meter per second squared</unitPattern>
<unitPattern count="other">{0} meters per second squared</unitPattern>
@@ -6066,7 +6144,7 @@
<unitPattern count="one">{0} millimole per liter</unitPattern>
<unitPattern count="other">{0} millimoles per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts per million</displayName>
<unitPattern count="one">{0} part per million</unitPattern>
<unitPattern count="other">{0} parts per million</unitPattern>
@@ -6096,7 +6174,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liters per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liters per 100 kilometers</displayName>
<unitPattern count="one">{0} liter per 100 kilometers</unitPattern>
<unitPattern count="other">{0} liters per 100 kilometers</unitPattern>
@@ -6587,17 +6665,17 @@
<unitPattern count="one">{0} horsepower</unitPattern>
<unitPattern count="other">{0} horsepower</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeters of mercury</displayName>
<unitPattern count="one">{0} millimeter of mercury</unitPattern>
<unitPattern count="other">{0} millimeters of mercury</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pounds per square inch</displayName>
<unitPattern count="one">{0} pound per square inch</unitPattern>
<unitPattern count="other">{0} pounds per square inch</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inches of mercury</displayName>
<unitPattern count="one">{0} inch of mercury</unitPattern>
<unitPattern count="other">{0} inches of mercury</unitPattern>
@@ -6672,9 +6750,9 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound-feet</displayName>
- <unitPattern count="one">{0} pound-foot</unitPattern>
+ <unitPattern count="one">{0} pound-force-foot</unitPattern>
<unitPattern count="other">{0} pound-feet</unitPattern>
</unit>
<unit type="torque-newton-meter">
@@ -6839,7 +6917,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meters/sec²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6939,7 +7017,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts/million</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6969,7 +7047,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -7097,9 +7175,9 @@
<unitPattern count="other">{0} ms</unitPattern>
</unit>
<unit type="duration-microsecond">
- <displayName>μsecs</displayName>
- <unitPattern count="one">{0} μs</unitPattern>
- <unitPattern count="other">{0} μs</unitPattern>
+ <displayName>µsecs</displayName>
+ <unitPattern count="one">{0} µs</unitPattern>
+ <unitPattern count="other">{0} µs</unitPattern>
</unit>
<unit type="duration-nanosecond">
<displayName>nanosecs</displayName>
@@ -7460,17 +7538,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7478,7 +7556,7 @@
<unit type="pressure-bar">
<displayName>bar</displayName>
<unitPattern count="one">{0} bar</unitPattern>
- <unitPattern count="other">{0} bars</unitPattern>
+ <unitPattern count="other">{0} bar</unitPattern>
</unit>
<unit type="pressure-millibar">
<displayName>mbar</displayName>
@@ -7545,7 +7623,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7705,7 +7783,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}Gs</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="other">{0}m/s²</unitPattern>
@@ -7735,11 +7813,23 @@
<unitPattern count="one">{0}″</unitPattern>
<unitPattern count="other">{0}″</unitPattern>
</unit>
+ <unit type="area-square-kilometer">
+ <displayName>km²</displayName>
+ <unitPattern count="one">{0}km²</unitPattern>
+ <unitPattern count="other">{0}km²</unitPattern>
+ <perUnitPattern>{0}/km²</perUnitPattern>
+ </unit>
<unit type="area-hectare">
<displayName>hectare</displayName>
<unitPattern count="one">{0}ha</unitPattern>
<unitPattern count="other">{0}ha</unitPattern>
</unit>
+ <unit type="area-square-meter">
+ <displayName>meters²</displayName>
+ <unitPattern count="one">{0}m²</unitPattern>
+ <unitPattern count="other">{0}m²</unitPattern>
+ <perUnitPattern>{0}/m²</perUnitPattern>
+ </unit>
<unit type="area-square-centimeter">
<displayName>cm²</displayName>
<unitPattern count="one">{0}cm²</unitPattern>
@@ -7791,7 +7881,7 @@
<unitPattern count="one">{0}mmol/L</unitPattern>
<unitPattern count="other">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0}ppm</unitPattern>
<unitPattern count="other">{0}ppm</unitPattern>
@@ -7821,7 +7911,7 @@
<unitPattern count="one">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -7891,6 +7981,11 @@
<unitPattern count="one">{0}bit</unitPattern>
<unitPattern count="other">{0}bit</unitPattern>
</unit>
+ <unit type="duration-century">
+ <displayName>c</displayName>
+ <unitPattern count="one">{0}c</unitPattern>
+ <unitPattern count="other">{0}c</unitPattern>
+ </unit>
<unit type="duration-decade">
<displayName>dec</displayName>
<unitPattern count="one">{0}dec</unitPattern>
@@ -7938,8 +8033,8 @@
</unit>
<unit type="duration-microsecond">
<displayName>μsec</displayName>
- <unitPattern count="one">{0}μs</unitPattern>
- <unitPattern count="other">{0}μs</unitPattern>
+ <unitPattern count="one">{0}µs</unitPattern>
+ <unitPattern count="other">{0}µs</unitPattern>
</unit>
<unit type="duration-nanosecond">
<displayName>ns</displayName>
@@ -8291,17 +8386,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>″ Hg</displayName>
<unitPattern count="one">{0}″ Hg</unitPattern>
<unitPattern count="other">{0}″ Hg</unitPattern>
@@ -8309,7 +8404,7 @@
<unit type="pressure-bar">
<displayName>bar</displayName>
<unitPattern count="one">{0}bar</unitPattern>
- <unitPattern count="other">{0}bars</unitPattern>
+ <unitPattern count="other">{0}bar</unitPattern>
</unit>
<unit type="pressure-millibar">
<displayName>mbar</displayName>
@@ -8376,7 +8471,7 @@
<unitPattern count="one">{0}K</unitPattern>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0}lbf⋅ft</unitPattern>
<unitPattern count="other">{0}lbf⋅ft</unitPattern>
diff --git a/common/main/en_001.xml b/common/main/en_001.xml
index 131c79e..82836aa 100644
--- a/common/main/en_001.xml
+++ b/common/main/en_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -870,7 +870,7 @@
</numbers>
<units>
<unitLength type="long">
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metres per second squared</displayName>
<unitPattern count="one">{0} metre per second squared</unitPattern>
<unitPattern count="other">{0} metres per second squared</unitPattern>
@@ -923,7 +923,7 @@
<unitPattern count="one">{0} litre per kilometre</unitPattern>
<unitPattern count="other">{0} litres per kilometre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litres per 100 kilometres</displayName>
<unitPattern count="one">{0} litre per 100 kilometres</unitPattern>
<unitPattern count="other">{0} litres per 100 kilometres</unitPattern>
@@ -1001,7 +1001,7 @@
<unitPattern count="one">{0} stone</unitPattern>
<unitPattern count="other">{0} stone</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetres of mercury</displayName>
<unitPattern count="one">{0} millimetre of mercury</unitPattern>
<unitPattern count="other">{0} millimetres of mercury</unitPattern>
@@ -1098,7 +1098,7 @@
</unit>
</unitLength>
<unitLength type="short">
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metres/sec²</displayName>
</unit>
<unit type="area-square-meter">
@@ -1130,7 +1130,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -1168,12 +1168,12 @@
<unit type="mass-stone">
<displayName>stone</displayName>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHG</displayName>
</unit>
<unit type="speed-meter-per-second">
@@ -1251,7 +1251,7 @@
<unitPattern count="one">{0}l/km</unitPattern>
<unitPattern count="other">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
diff --git a/common/main/en_150.xml b/common/main/en_150.xml
index bcfb963..93b53b2 100644
--- a/common/main/en_150.xml
+++ b/common/main/en_150.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AE.xml b/common/main/en_AE.xml
index 2d20c41..d5949b7 100644
--- a/common/main/en_AE.xml
+++ b/common/main/en_AE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AG.xml b/common/main/en_AG.xml
index 154cb3f..99c4637 100644
--- a/common/main/en_AG.xml
+++ b/common/main/en_AG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AI.xml b/common/main/en_AI.xml
index d602552..d92e674 100644
--- a/common/main/en_AI.xml
+++ b/common/main/en_AI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AS.xml b/common/main/en_AS.xml
index b3ace2d..f7a909b 100644
--- a/common/main/en_AS.xml
+++ b/common/main/en_AS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AT.xml b/common/main/en_AT.xml
index 5d8e92c..ad1fc51 100644
--- a/common/main/en_AT.xml
+++ b/common/main/en_AT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_AU.xml b/common/main/en_AU.xml
index 1c02992..6e3340d 100644
--- a/common/main/en_AU.xml
+++ b/common/main/en_AU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -121,6 +121,8 @@
<language type="chr">↑↑↑</language>
<language type="chy">↑↑↑</language>
<language type="ckb">↑↑↑</language>
+ <language type="ckb" alt="menu">Kurdish (Central)</language>
+ <language type="ckb" alt="variant">Kurdish (Sorani)</language>
<language type="co">↑↑↑</language>
<language type="cop">↑↑↑</language>
<language type="cps">↑↑↑</language>
@@ -644,6 +646,7 @@
<language type="zh_Hans">Simplified Chinese</language>
<language type="zh_Hans" alt="long" draft="contributed">↑↑↑</language>
<language type="zh_Hant">Traditional Chinese</language>
+ <language type="zh_Hant" alt="long">↑↑↑</language>
<language type="zu">↑↑↑</language>
<language type="zun">↑↑↑</language>
<language type="zxx">↑↑↑</language>
@@ -1009,10 +1012,23 @@
<territory type="ZW">↑↑↑</territory>
<territory type="ZZ" draft="contributed">Unknown Region</territory>
</territories>
+ <subdivisions>
+ <subdivision type="gbeng">↑↑↑</subdivision>
+ <subdivision type="gbsct">↑↑↑</subdivision>
+ <subdivision type="gbwls">↑↑↑</subdivision>
+ </subdivisions>
<keys>
<key type="calendar" draft="contributed">Calendar</key>
<key type="cf">↑↑↑</key>
+ <key type="colAlternate">↑↑↑</key>
+ <key type="colBackwards">↑↑↑</key>
+ <key type="colCaseFirst">Upper case / Lower case Ordering</key>
+ <key type="colCaseLevel">↑↑↑</key>
<key type="collation" draft="contributed">Sort Order</key>
+ <key type="colNormalization">↑↑↑</key>
+ <key type="colNumeric">↑↑↑</key>
+ <key type="colReorder">↑↑↑</key>
+ <key type="colStrength">↑↑↑</key>
<key type="currency" draft="contributed">Currency</key>
<key type="d0">↑↑↑</key>
<key type="em">↑↑↑</key>
@@ -1021,6 +1037,7 @@
<key type="hc">↑↑↑</key>
<key type="i0">↑↑↑</key>
<key type="k0">↑↑↑</key>
+ <key type="kv">↑↑↑</key>
<key type="lb">↑↑↑</key>
<key type="lw">↑↑↑</key>
<key type="m0">↑↑↑</key>
@@ -1028,8 +1045,13 @@
<key type="numbers" draft="contributed">Numbers</key>
<key type="rg">↑↑↑</key>
<key type="s0">↑↑↑</key>
+ <key type="sd">↑↑↑</key>
<key type="ss">↑↑↑</key>
+ <key type="t">↑↑↑</key>
<key type="t0">↑↑↑</key>
+ <key type="timezone">↑↑↑</key>
+ <key type="va">↑↑↑</key>
+ <key type="x">↑↑↑</key>
<key type="x0">↑↑↑</key>
</keys>
<types>
@@ -1145,7 +1167,11 @@
</codePatterns>
</localeDisplayNames>
<characters>
+ <exemplarCharacters draft="contributed">↑↑↑</exemplarCharacters>
+ <exemplarCharacters type="auxiliary" draft="contributed">↑↑↑</exemplarCharacters>
+ <exemplarCharacters type="index" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="numbers" draft="contributed">[↑]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="contributed">↑↑↑</exemplarCharacters>
<ellipsis type="final">↑↑↑</ellipsis>
<ellipsis type="initial">↑↑↑</ellipsis>
<ellipsis type="medial">↑↑↑</ellipsis>
@@ -1403,6 +1429,44 @@
<intervalFormatItem id="d">
<greatestDifference id="d">↑↑↑</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="G">E dd/MM/y GGGGG – E dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="M">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="y">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+ <greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+ <greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+ <greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="M">
<greatestDifference id="M">↑↑↑</greatestDifference>
</intervalFormatItem>
@@ -2243,6 +2307,7 @@
<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM y G</dateFormatItem>
<dateFormatItem id="M" draft="contributed">LL</dateFormatItem>
<dateFormatItem id="Md" draft="contributed">dd/MM</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
<dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
<dateFormatItem id="MMMEd" draft="contributed">E, d MMM</dateFormatItem>
@@ -6333,9 +6398,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6344,7 +6479,7 @@
<unitPattern count="one" draft="contributed">{0} g-force</unitPattern>
<unitPattern count="other" draft="contributed">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">metres per second squared</displayName>
<unitPattern count="one" draft="contributed">{0} metre per second squared</unitPattern>
<unitPattern count="other" draft="contributed">{0} metres per second squared</unitPattern>
@@ -6444,7 +6579,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6474,7 +6609,7 @@
<unitPattern count="one" draft="contributed">{0} litre per kilometre</unitPattern>
<unitPattern count="other" draft="contributed">{0} litres per kilometre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="contributed">litres per 100 kilometres</displayName>
<unitPattern count="one" draft="contributed">{0} litre per 100 kilometres</unitPattern>
<unitPattern count="other" draft="contributed">{0} litres per 100 kilometres</unitPattern>
@@ -6549,6 +6684,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="duration-decade">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="duration-year">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -6666,6 +6806,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="energy-therm-us">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="force-pound-force">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -6696,6 +6841,41 @@
<unitPattern count="one" draft="contributed">{0} hertz</unitPattern>
<unitPattern count="other" draft="contributed">{0} hertz</unitPattern>
</unit>
+ <unit type="graphics-em">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-kilometer">
<displayName>kilometre</displayName>
<unitPattern count="one" draft="contributed">{0} kilometre</unitPattern>
@@ -6920,21 +7100,26 @@
<unitPattern count="one" draft="contributed">{0} horsepower</unitPattern>
<unitPattern count="other" draft="contributed">{0} horsepower</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">millimetres of mercury</displayName>
<unitPattern count="one" draft="contributed">{0} millimetre of mercury</unitPattern>
<unitPattern count="other" draft="contributed">{0} millimetres of mercury</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">pounds per square inch</displayName>
<unitPattern count="one" draft="contributed">{0} pound per square inch</unitPattern>
<unitPattern count="other" draft="contributed">{0} pounds per square inch</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inches of mercury</displayName>
<unitPattern count="one" draft="contributed">{0} inch of mercury</unitPattern>
<unitPattern count="other" draft="contributed">{0} inches of mercury</unitPattern>
</unit>
+ <unit type="pressure-bar">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-millibar">
<displayName draft="contributed">millibars</displayName>
<unitPattern count="one" draft="contributed">{0} millibar</unitPattern>
@@ -6945,6 +7130,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="pressure-pascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-hectopascal">
<displayName draft="contributed">hectopascals</displayName>
<unitPattern count="one" draft="contributed">{0} hectopascal</unitPattern>
@@ -7000,7 +7190,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7159,9 +7349,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7170,7 +7430,7 @@
<unitPattern count="one" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">metres/sec²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -7270,7 +7530,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7300,7 +7560,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -7375,6 +7635,11 @@
<unitPattern count="one">{0} C.</unitPattern>
<unitPattern count="other">{0} C.</unitPattern>
</unit>
+ <unit type="duration-decade">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="duration-year">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -7492,6 +7757,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="energy-therm-us">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="force-pound-force">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -7522,6 +7792,41 @@
<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
</unit>
+ <unit type="graphics-em">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-kilometer">
<displayName draft="contributed">km</displayName>
<unitPattern count="one" draft="contributed">{0} km</unitPattern>
@@ -7746,21 +8051,26 @@
<unitPattern count="one" draft="contributed">{0} hp</unitPattern>
<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">in Hg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
</unit>
+ <unit type="pressure-bar">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-millibar">
<displayName>mb</displayName>
<unitPattern count="one">{0} mb</unitPattern>
@@ -7771,6 +8081,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="pressure-pascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-hectopascal">
<displayName draft="contributed">hPa</displayName>
<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
@@ -7826,7 +8141,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7985,9 +8300,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8011,7 +8396,7 @@
<unitPattern count="one">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -8223,6 +8608,18 @@
<listPatternPart type="end">{0} or {1}</listPatternPart>
<listPatternPart type="2">↑↑↑</listPatternPart>
</listPattern>
+ <listPattern type="or-narrow">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
+ <listPattern type="or-short">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
<listPattern type="standard-narrow">
<listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">↑↑↑</listPatternPart>
diff --git a/common/main/en_BB.xml b/common/main/en_BB.xml
index d8c884d..b95903f 100644
--- a/common/main/en_BB.xml
+++ b/common/main/en_BB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BE.xml b/common/main/en_BE.xml
index eae228d..a8f3f07 100644
--- a/common/main/en_BE.xml
+++ b/common/main/en_BE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BI.xml b/common/main/en_BI.xml
index bcdc8b8..7767707 100644
--- a/common/main/en_BI.xml
+++ b/common/main/en_BI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BM.xml b/common/main/en_BM.xml
index e7a923e..f908da2 100644
--- a/common/main/en_BM.xml
+++ b/common/main/en_BM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BS.xml b/common/main/en_BS.xml
index b681385..bd3e47f 100644
--- a/common/main/en_BS.xml
+++ b/common/main/en_BS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BW.xml b/common/main/en_BW.xml
index c989034..48f03cb 100644
--- a/common/main/en_BW.xml
+++ b/common/main/en_BW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_BZ.xml b/common/main/en_BZ.xml
index 12807e0..ef426cd 100644
--- a/common/main/en_BZ.xml
+++ b/common/main/en_BZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CA.xml b/common/main/en_CA.xml
index 96e4d64..e75a3f7 100644
--- a/common/main/en_CA.xml
+++ b/common/main/en_CA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -121,6 +121,8 @@
<language type="chr">↑↑↑</language>
<language type="chy">↑↑↑</language>
<language type="ckb">↑↑↑</language>
+ <language type="ckb" alt="menu" draft="contributed">↑↑↑</language>
+ <language type="ckb" alt="variant" draft="contributed">↑↑↑</language>
<language type="co">↑↑↑</language>
<language type="cop" draft="contributed">↑↑↑</language>
<language type="cps" draft="contributed">↑↑↑</language>
@@ -6515,9 +6517,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6526,7 +6598,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6626,7 +6698,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6656,7 +6728,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7147,17 +7219,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7237,7 +7309,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7396,9 +7468,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7407,7 +7549,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">metres/sec.²</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7507,7 +7649,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7537,7 +7679,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -8028,17 +8170,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8118,7 +8260,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8277,9 +8419,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8303,7 +8515,7 @@
<unitPattern count="one">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
diff --git a/common/main/en_CC.xml b/common/main/en_CC.xml
index f2f29aa..a69bce4 100644
--- a/common/main/en_CC.xml
+++ b/common/main/en_CC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CH.xml b/common/main/en_CH.xml
index 3cee741..aadc03f 100644
--- a/common/main/en_CH.xml
+++ b/common/main/en_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CK.xml b/common/main/en_CK.xml
index 73d227d..26f5842 100644
--- a/common/main/en_CK.xml
+++ b/common/main/en_CK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CM.xml b/common/main/en_CM.xml
index 1480be2..ec62971 100644
--- a/common/main/en_CM.xml
+++ b/common/main/en_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CX.xml b/common/main/en_CX.xml
index e18381a..887c6b7 100644
--- a/common/main/en_CX.xml
+++ b/common/main/en_CX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_CY.xml b/common/main/en_CY.xml
index 91ec4b4..729bcdb 100644
--- a/common/main/en_CY.xml
+++ b/common/main/en_CY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_DE.xml b/common/main/en_DE.xml
index d6cc5f0..d350437 100644
--- a/common/main/en_DE.xml
+++ b/common/main/en_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_DG.xml b/common/main/en_DG.xml
index e27b7b3..2766834 100644
--- a/common/main/en_DG.xml
+++ b/common/main/en_DG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_DK.xml b/common/main/en_DK.xml
index 2d4e8fc..c675602 100644
--- a/common/main/en_DK.xml
+++ b/common/main/en_DK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_DM.xml b/common/main/en_DM.xml
index d695268..ff6af64 100644
--- a/common/main/en_DM.xml
+++ b/common/main/en_DM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_ER.xml b/common/main/en_ER.xml
index ac65c7b..a22a0f9 100644
--- a/common/main/en_ER.xml
+++ b/common/main/en_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_FI.xml b/common/main/en_FI.xml
index a841165..2fa111f 100644
--- a/common/main/en_FI.xml
+++ b/common/main/en_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_FJ.xml b/common/main/en_FJ.xml
index 8d9830e..f2f75e8 100644
--- a/common/main/en_FJ.xml
+++ b/common/main/en_FJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_FK.xml b/common/main/en_FK.xml
index 6dc9e1b..852785b 100644
--- a/common/main/en_FK.xml
+++ b/common/main/en_FK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_FM.xml b/common/main/en_FM.xml
index b63e706..05e9109 100644
--- a/common/main/en_FM.xml
+++ b/common/main/en_FM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GB.xml b/common/main/en_GB.xml
index 3800e46..80f4573 100644
--- a/common/main/en_GB.xml
+++ b/common/main/en_GB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -18,33 +18,33 @@
<localeKeyTypePattern draft="contributed">↑↑↑</localeKeyTypePattern>
</localeDisplayPattern>
<languages>
- <language type="aa" draft="contributed">Afar</language>
- <language type="ab" draft="contributed">Abkhazian</language>
- <language type="ace" draft="contributed">Achinese</language>
+ <language type="aa">Afar</language>
+ <language type="ab">Abkhazian</language>
+ <language type="ace">Achinese</language>
<language type="ach">↑↑↑</language>
- <language type="ada" draft="contributed">Adangme</language>
- <language type="ady" draft="contributed">Adyghe</language>
+ <language type="ada">Adangme</language>
+ <language type="ady">Adyghe</language>
<language type="ae">↑↑↑</language>
<language type="aeb">↑↑↑</language>
<language type="af">Afrikaans</language>
<language type="afh">↑↑↑</language>
<language type="agq">Aghem</language>
- <language type="ain" draft="contributed">Ainu</language>
+ <language type="ain">Ainu</language>
<language type="ak">Akan</language>
<language type="akk">↑↑↑</language>
<language type="akz">↑↑↑</language>
- <language type="ale" draft="contributed">Aleut</language>
+ <language type="ale">Aleut</language>
<language type="aln">↑↑↑</language>
- <language type="alt" draft="contributed">Southern Altai</language>
+ <language type="alt">Southern Altai</language>
<language type="am">Amharic</language>
- <language type="an" draft="contributed">Aragonese</language>
- <language type="anp" draft="contributed">Angika</language>
+ <language type="an">Aragonese</language>
+ <language type="anp">Angika</language>
<language type="ar">Arabic</language>
<language type="ar_001">Modern Standard Arabic</language>
<language type="arc">↑↑↑</language>
- <language type="arn" draft="contributed">Mapuche</language>
+ <language type="arn">Mapuche</language>
<language type="aro">↑↑↑</language>
- <language type="arp" draft="contributed">Arapaho</language>
+ <language type="arp">Arapaho</language>
<language type="arq">↑↑↑</language>
<language type="ars">↑↑↑</language>
<language type="arw">↑↑↑</language>
@@ -54,15 +54,15 @@
<language type="asa">Asu</language>
<language type="ase">↑↑↑</language>
<language type="ast">Asturian</language>
- <language type="av" draft="contributed">Avaric</language>
+ <language type="av">Avaric</language>
<language type="avk">↑↑↑</language>
- <language type="awa" draft="contributed">Awadhi</language>
- <language type="ay" draft="contributed">Aymara</language>
+ <language type="awa">Awadhi</language>
+ <language type="ay">Aymara</language>
<language type="az">Azerbaijani</language>
<language type="az" alt="short">Azeri</language>
- <language type="ba" draft="contributed">Bashkir</language>
+ <language type="ba">Bashkir</language>
<language type="bal">↑↑↑</language>
- <language type="ban" draft="contributed">Balinese</language>
+ <language type="ban">Balinese</language>
<language type="bar">↑↑↑</language>
<language type="bas">Basaa</language>
<language type="bax">Bamun</language>
@@ -77,13 +77,13 @@
<language type="bfq">↑↑↑</language>
<language type="bg">Bulgarian</language>
<language type="bgn">↑↑↑</language>
- <language type="bho" draft="contributed">Bhojpuri</language>
- <language type="bi" draft="contributed">Bislama</language>
+ <language type="bho">Bhojpuri</language>
+ <language type="bi">Bislama</language>
<language type="bik">↑↑↑</language>
- <language type="bin" draft="contributed">Bini</language>
+ <language type="bin">Bini</language>
<language type="bjn">↑↑↑</language>
<language type="bkm">Kom</language>
- <language type="bla" draft="contributed">Siksika</language>
+ <language type="bla">Siksika</language>
<language type="bm">Bambara</language>
<language type="bn">↑↑↑</language>
<language type="bo">Tibetan</language>
@@ -96,9 +96,9 @@
<language type="bs">Bosnian</language>
<language type="bss">Akoose</language>
<language type="bua">↑↑↑</language>
- <language type="bug" draft="contributed">Buginese</language>
+ <language type="bug">Buginese</language>
<language type="bum">Bulu</language>
- <language type="byn" draft="contributed">Blin</language>
+ <language type="byn">Blin</language>
<language type="byv">Medumba</language>
<language type="ca">Catalan</language>
<language type="cad">↑↑↑</language>
@@ -109,17 +109,19 @@
<language type="ce">Chechen</language>
<language type="ceb">Cebuano</language>
<language type="cgg">Chiga</language>
- <language type="ch" draft="contributed">Chamorro</language>
+ <language type="ch">Chamorro</language>
<language type="chb">↑↑↑</language>
<language type="chg">↑↑↑</language>
- <language type="chk" draft="contributed">Chuukese</language>
- <language type="chm" draft="contributed">Mari</language>
+ <language type="chk">Chuukese</language>
+ <language type="chm">Mari</language>
<language type="chn">↑↑↑</language>
- <language type="cho" draft="contributed">Choctaw</language>
+ <language type="cho">Choctaw</language>
<language type="chp">↑↑↑</language>
<language type="chr">Cherokee</language>
- <language type="chy" draft="contributed">Cheyenne</language>
+ <language type="chy">Cheyenne</language>
<language type="ckb">↑↑↑</language>
+ <language type="ckb" alt="menu">↑↑↑</language>
+ <language type="ckb" alt="variant">↑↑↑</language>
<language type="co">Corsican</language>
<language type="cop">↑↑↑</language>
<language type="cps">↑↑↑</language>
@@ -129,35 +131,35 @@
<language type="cs">Czech</language>
<language type="csb">↑↑↑</language>
<language type="cu">Church Slavic</language>
- <language type="cv" draft="contributed">Chuvash</language>
+ <language type="cv">Chuvash</language>
<language type="cy">Welsh</language>
<language type="da">Danish</language>
- <language type="dak" draft="contributed">Dakota</language>
- <language type="dar" draft="contributed">Dargwa</language>
+ <language type="dak">Dakota</language>
+ <language type="dar">Dargwa</language>
<language type="dav">Taita</language>
<language type="de">German</language>
<language type="de_AT">Austrian German</language>
<language type="de_CH">Swiss High German</language>
<language type="del">↑↑↑</language>
<language type="den">↑↑↑</language>
- <language type="dgr" draft="contributed">Dogrib</language>
+ <language type="dgr">Dogrib</language>
<language type="din">↑↑↑</language>
<language type="dje">Zarma</language>
<language type="doi">↑↑↑</language>
<language type="dsb">Lower Sorbian</language>
<language type="dtp">↑↑↑</language>
<language type="dua">Duala</language>
- <language type="dv" draft="contributed">Divehi</language>
+ <language type="dv">Divehi</language>
<language type="dyo">Jola-Fonyi</language>
<language type="dyu">↑↑↑</language>
<language type="dz">Dzongkha</language>
- <language type="dzg" draft="contributed">Dazaga</language>
+ <language type="dzg">Dazaga</language>
<language type="ebu">Embu</language>
<language type="ee">Ewe</language>
- <language type="efi" draft="contributed">Efik</language>
+ <language type="efi">Efik</language>
<language type="egl">↑↑↑</language>
<language type="egy">↑↑↑</language>
- <language type="eka" draft="contributed">Ekajuk</language>
+ <language type="eka">Ekajuk</language>
<language type="el">Greek</language>
<language type="elx">↑↑↑</language>
<language type="en">English</language>
@@ -178,16 +180,16 @@
<language type="ewo">Ewondo</language>
<language type="ext">↑↑↑</language>
<language type="fa">Persian</language>
- <language type="fa_AF" draft="contributed">Dari</language>
+ <language type="fa_AF">Dari</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">Fulah</language>
<language type="fi">Finnish</language>
<language type="fil">Filipino</language>
<language type="fit">↑↑↑</language>
- <language type="fj" draft="contributed">Fijian</language>
+ <language type="fj">Fijian</language>
<language type="fo">Faroese</language>
- <language type="fon" draft="contributed">Fon</language>
+ <language type="fon">Fon</language>
<language type="fr">French</language>
<language type="fr_CA">Canadian French</language>
<language type="fr_CH">Swiss French</language>
@@ -198,21 +200,21 @@
<language type="fur">Friulian</language>
<language type="fy">Western Frisian</language>
<language type="ga">Irish</language>
- <language type="gaa" draft="contributed">Ga</language>
+ <language type="gaa">Ga</language>
<language type="gag">↑↑↑</language>
<language type="gan">↑↑↑</language>
<language type="gay">↑↑↑</language>
<language type="gba">↑↑↑</language>
<language type="gbz">↑↑↑</language>
<language type="gd">Scottish Gaelic</language>
- <language type="gez" draft="contributed">Geez</language>
- <language type="gil" draft="contributed">Gilbertese</language>
+ <language type="gez">Geez</language>
+ <language type="gil">Gilbertese</language>
<language type="gl">Galician</language>
<language type="glk">↑↑↑</language>
- <language type="gn" draft="contributed">Guarani</language>
+ <language type="gn">Guarani</language>
<language type="gom">↑↑↑</language>
<language type="gon">↑↑↑</language>
- <language type="gor" draft="contributed">Gorontalo</language>
+ <language type="gor">Gorontalo</language>
<language type="got">↑↑↑</language>
<language type="grb">↑↑↑</language>
<language type="grc">↑↑↑</language>
@@ -222,7 +224,7 @@
<language type="gur">↑↑↑</language>
<language type="guz">Gusii</language>
<language type="gv">Manx</language>
- <language type="gwi" draft="contributed">Gwichʼin</language>
+ <language type="gwi">Gwichʼin</language>
<language type="ha">Hausa</language>
<language type="hai">↑↑↑</language>
<language type="hak">↑↑↑</language>
@@ -230,7 +232,7 @@
<language type="he">Hebrew</language>
<language type="hi">Hindi</language>
<language type="hif">↑↑↑</language>
- <language type="hil" draft="contributed">Hiligaynon</language>
+ <language type="hil">Hiligaynon</language>
<language type="hit">↑↑↑</language>
<language type="hmn">Hmong</language>
<language type="ho">↑↑↑</language>
@@ -239,27 +241,27 @@
<language type="hsn">↑↑↑</language>
<language type="ht">↑↑↑</language>
<language type="hu">Hungarian</language>
- <language type="hup" draft="contributed">Hupa</language>
+ <language type="hup">Hupa</language>
<language type="hy">Armenian</language>
- <language type="hz" draft="contributed">Herero</language>
+ <language type="hz">Herero</language>
<language type="ia">Interlingua</language>
- <language type="iba" draft="contributed">Iban</language>
+ <language type="iba">Iban</language>
<language type="ibb">Ibibio</language>
<language type="id">Indonesian</language>
<language type="ie">↑↑↑</language>
<language type="ig">Igbo</language>
<language type="ii">Sichuan Yi</language>
<language type="ik">↑↑↑</language>
- <language type="ilo" draft="contributed">Iloko</language>
- <language type="inh" draft="contributed">Ingush</language>
- <language type="io" draft="contributed">Ido</language>
+ <language type="ilo">Iloko</language>
+ <language type="inh">Ingush</language>
+ <language type="io">Ido</language>
<language type="is">Icelandic</language>
<language type="it">Italian</language>
- <language type="iu" draft="contributed">Inuktitut</language>
+ <language type="iu">Inuktitut</language>
<language type="izh">↑↑↑</language>
<language type="ja">Japanese</language>
<language type="jam">↑↑↑</language>
- <language type="jbo" draft="contributed">Lojban</language>
+ <language type="jbo">Lojban</language>
<language type="jgo">Ngomba</language>
<language type="jmc">Machame</language>
<language type="jpr">↑↑↑</language>
@@ -269,65 +271,65 @@
<language type="ka">Georgian</language>
<language type="kaa">↑↑↑</language>
<language type="kab">Kabyle</language>
- <language type="kac" draft="contributed">Kachin</language>
- <language type="kaj" draft="contributed">Jju</language>
+ <language type="kac">Kachin</language>
+ <language type="kaj">Jju</language>
<language type="kam">Kamba</language>
<language type="kaw">↑↑↑</language>
- <language type="kbd" draft="contributed">Kabardian</language>
+ <language type="kbd">Kabardian</language>
<language type="kbl">↑↑↑</language>
- <language type="kcg" draft="contributed">Tyap</language>
+ <language type="kcg">Tyap</language>
<language type="kde">Makonde</language>
<language type="kea">Kabuverdianu</language>
<language type="ken">↑↑↑</language>
- <language type="kfo" draft="contributed">Koro</language>
+ <language type="kfo">Koro</language>
<language type="kg">↑↑↑</language>
<language type="kgp">↑↑↑</language>
- <language type="kha" draft="contributed">Khasi</language>
+ <language type="kha">Khasi</language>
<language type="kho">↑↑↑</language>
<language type="khq">Koyra Chiini</language>
<language type="khw">↑↑↑</language>
<language type="ki">Kikuyu</language>
<language type="kiu">↑↑↑</language>
- <language type="kj" draft="contributed">Kuanyama</language>
+ <language type="kj">Kuanyama</language>
<language type="kk">Kazakh</language>
<language type="kkj">Kako</language>
<language type="kl">Kalaallisut</language>
<language type="kln">Kalenjin</language>
<language type="km">Khmer</language>
- <language type="kmb" draft="contributed">Kimbundu</language>
+ <language type="kmb">Kimbundu</language>
<language type="kn">Kannada</language>
<language type="ko">Korean</language>
<language type="koi">↑↑↑</language>
<language type="kok">Konkani</language>
<language type="kos">↑↑↑</language>
- <language type="kpe" draft="contributed">Kpelle</language>
+ <language type="kpe">Kpelle</language>
<language type="kr">Kanuri</language>
- <language type="krc" draft="contributed">Karachay-Balkar</language>
+ <language type="krc">Karachay-Balkar</language>
<language type="kri">↑↑↑</language>
<language type="krj">↑↑↑</language>
- <language type="krl" draft="contributed">Karelian</language>
- <language type="kru" draft="contributed">Kurukh</language>
+ <language type="krl">Karelian</language>
+ <language type="kru">Kurukh</language>
<language type="ks">Kashmiri</language>
<language type="ksb">Shambala</language>
<language type="ksf">Bafia</language>
<language type="ksh">Colognian</language>
<language type="ku">Kurdish</language>
- <language type="kum" draft="contributed">Kumyk</language>
+ <language type="kum">Kumyk</language>
<language type="kut">↑↑↑</language>
- <language type="kv" draft="contributed">Komi</language>
+ <language type="kv">Komi</language>
<language type="kw">Cornish</language>
<language type="ky">Kyrgyz</language>
<language type="ky" alt="variant">Kirghiz</language>
<language type="la">Latin</language>
- <language type="lad" draft="contributed">Ladino</language>
+ <language type="lad">Ladino</language>
<language type="lag">Langi</language>
<language type="lah">↑↑↑</language>
<language type="lam">↑↑↑</language>
<language type="lb">Luxembourgish</language>
- <language type="lez" draft="contributed">Lezghian</language>
+ <language type="lez">Lezghian</language>
<language type="lfn">↑↑↑</language>
<language type="lg">Ganda</language>
- <language type="li" draft="contributed">Limburgish</language>
+ <language type="li">Limburgish</language>
<language type="lij">↑↑↑</language>
<language type="liv">↑↑↑</language>
<language type="lkt">Lakota</language>
@@ -336,30 +338,30 @@
<language type="lo">Lao</language>
<language type="lol">↑↑↑</language>
<language type="lou">↑↑↑</language>
- <language type="loz" draft="contributed">Lozi</language>
+ <language type="loz">Lozi</language>
<language type="lrc">↑↑↑</language>
<language type="lt">Lithuanian</language>
<language type="ltg">↑↑↑</language>
<language type="lu">Luba-Katanga</language>
- <language type="lua" draft="contributed">Luba-Lulua</language>
+ <language type="lua">Luba-Lulua</language>
<language type="lui">↑↑↑</language>
- <language type="lun" draft="contributed">Lunda</language>
+ <language type="lun">Lunda</language>
<language type="luo">Luo</language>
<language type="lus">↑↑↑</language>
<language type="luy">Luyia</language>
<language type="lv">Latvian</language>
<language type="lzh">↑↑↑</language>
<language type="lzz">↑↑↑</language>
- <language type="mad" draft="contributed">Madurese</language>
+ <language type="mad">Madurese</language>
<language type="maf">Mafa</language>
- <language type="mag" draft="contributed">Magahi</language>
- <language type="mai" draft="contributed">Maithili</language>
- <language type="mak" draft="contributed">Makasar</language>
+ <language type="mag">Magahi</language>
+ <language type="mai">Maithili</language>
+ <language type="mak">Makasar</language>
<language type="man">↑↑↑</language>
<language type="mas">Masai</language>
- <language type="mdf" draft="contributed">Moksha</language>
+ <language type="mdf">Moksha</language>
<language type="mdr">↑↑↑</language>
- <language type="men" draft="contributed">Mende</language>
+ <language type="men">Mende</language>
<language type="mer">Meru</language>
<language type="mfe">Morisyen</language>
<language type="mg">Malagasy</language>
@@ -368,42 +370,42 @@
<language type="mh">↑↑↑</language>
<language type="mi">Maori</language>
<language type="mic">↑↑↑</language>
- <language type="min" draft="contributed">Minangkabau</language>
+ <language type="min">Minangkabau</language>
<language type="mk">Macedonian</language>
<language type="ml">Malayalam</language>
<language type="mn">Mongolian</language>
<language type="mnc">↑↑↑</language>
- <language type="mni" draft="contributed">Manipuri</language>
- <language type="moh" draft="contributed">Mohawk</language>
- <language type="mos" draft="contributed">Mossi</language>
+ <language type="mni">Manipuri</language>
+ <language type="moh">Mohawk</language>
+ <language type="mos">Mossi</language>
<language type="mr">Marathi</language>
<language type="mrj">↑↑↑</language>
<language type="ms">Malay</language>
<language type="mt">Maltese</language>
<language type="mua">Mundang</language>
<language type="mul">↑↑↑</language>
- <language type="mus" draft="contributed">Creek</language>
- <language type="mwl" draft="contributed">Mirandese</language>
+ <language type="mus">Creek</language>
+ <language type="mwl">Mirandese</language>
<language type="mwr">↑↑↑</language>
<language type="mwv">↑↑↑</language>
<language type="my">Burmese</language>
<language type="my" alt="variant">↑↑↑</language>
<language type="mye">↑↑↑</language>
- <language type="myv" draft="contributed">Erzya</language>
+ <language type="myv">Erzya</language>
<language type="mzn">↑↑↑</language>
- <language type="na" draft="contributed">Nauru</language>
+ <language type="na">Nauru</language>
<language type="nan">↑↑↑</language>
- <language type="nap" draft="contributed">Neapolitan</language>
+ <language type="nap">Neapolitan</language>
<language type="naq">Nama</language>
<language type="nb">Norwegian Bokmål</language>
<language type="nd">North Ndebele</language>
<language type="nds">↑↑↑</language>
<language type="nds_NL">West Low German</language>
<language type="ne">Nepali</language>
- <language type="new" draft="contributed">Newari</language>
- <language type="ng" draft="contributed">Ndonga</language>
- <language type="nia" draft="contributed">Nias</language>
- <language type="niu" draft="contributed">Niuean</language>
+ <language type="new">Newari</language>
+ <language type="ng">Ndonga</language>
+ <language type="nia">Nias</language>
+ <language type="niu">Niuean</language>
<language type="njo">↑↑↑</language>
<language type="nl">Dutch</language>
<language type="nl_BE">Flemish</language>
@@ -411,20 +413,20 @@
<language type="nn">Norwegian Nynorsk</language>
<language type="nnh">Ngiemboon</language>
<language type="no">↑↑↑</language>
- <language type="nog" draft="contributed">Nogai</language>
+ <language type="nog">Nogai</language>
<language type="nov">↑↑↑</language>
- <language type="nqo" draft="contributed">N’Ko</language>
- <language type="nr" draft="contributed">South Ndebele</language>
- <language type="nso" draft="contributed">Northern Sotho</language>
+ <language type="nqo">N’Ko</language>
+ <language type="nr">South Ndebele</language>
+ <language type="nso">Northern Sotho</language>
<language type="nus">Nuer</language>
- <language type="nv" draft="contributed">Navajo</language>
+ <language type="nv">Navajo</language>
<language type="nwc">↑↑↑</language>
<language type="ny">Nyanja</language>
<language type="nym">↑↑↑</language>
<language type="nyn">Nyankole</language>
<language type="nyo">↑↑↑</language>
<language type="nzi">↑↑↑</language>
- <language type="oc" draft="contributed">Occitan</language>
+ <language type="oc">Occitan</language>
<language type="oj">↑↑↑</language>
<language type="om">Oromo</language>
<language type="or">↑↑↑</language>
@@ -432,11 +434,11 @@
<language type="osa">↑↑↑</language>
<language type="ota">↑↑↑</language>
<language type="pa">Punjabi</language>
- <language type="pag" draft="contributed">Pangasinan</language>
+ <language type="pag">Pangasinan</language>
<language type="pal">↑↑↑</language>
- <language type="pam" draft="contributed">Pampanga</language>
- <language type="pap" draft="contributed">Papiamento</language>
- <language type="pau" draft="contributed">Palauan</language>
+ <language type="pam">Pampanga</language>
+ <language type="pap">Papiamento</language>
+ <language type="pau">Palauan</language>
<language type="pcd">↑↑↑</language>
<language type="pcm">↑↑↑</language>
<language type="pdc">↑↑↑</language>
@@ -455,40 +457,40 @@
<language type="pt_BR">Brazilian Portuguese</language>
<language type="pt_PT">European Portuguese</language>
<language type="qu">Quechua</language>
- <language type="quc" draft="contributed">Kʼicheʼ</language>
+ <language type="quc">Kʼicheʼ</language>
<language type="qug">↑↑↑</language>
<language type="raj">↑↑↑</language>
- <language type="rap" draft="contributed">Rapanui</language>
- <language type="rar" draft="contributed">Rarotongan</language>
+ <language type="rap">Rapanui</language>
+ <language type="rar">Rarotongan</language>
<language type="rgn">↑↑↑</language>
<language type="rif">↑↑↑</language>
<language type="rm">Romansh</language>
<language type="rn">Rundi</language>
<language type="ro">Romanian</language>
- <language type="ro_MD" draft="contributed">Moldavian</language>
+ <language type="ro_MD">Moldavian</language>
<language type="rof">Rombo</language>
<language type="rom">↑↑↑</language>
- <language type="root" draft="contributed">Root</language>
+ <language type="root">Root</language>
<language type="rtm">↑↑↑</language>
<language type="ru">Russian</language>
<language type="rue">↑↑↑</language>
<language type="rug">↑↑↑</language>
- <language type="rup" draft="contributed">Aromanian</language>
+ <language type="rup">Aromanian</language>
<language type="rw">Kinyarwanda</language>
<language type="rwk">Rwa</language>
<language type="sa">Sanskrit</language>
- <language type="sad" draft="contributed">Sandawe</language>
+ <language type="sad">Sandawe</language>
<language type="sah">Sakha</language>
<language type="sam">↑↑↑</language>
<language type="saq">Samburu</language>
<language type="sas">↑↑↑</language>
- <language type="sat" draft="contributed">Santali</language>
+ <language type="sat">Santali</language>
<language type="saz">↑↑↑</language>
- <language type="sba" draft="contributed">Ngambay</language>
+ <language type="sba">Ngambay</language>
<language type="sbp">Sangu</language>
- <language type="sc" draft="contributed">Sardinian</language>
- <language type="scn" draft="contributed">Sicilian</language>
- <language type="sco" draft="contributed">Scots</language>
+ <language type="sc">Sardinian</language>
+ <language type="scn">Sicilian</language>
+ <language type="sco">Scots</language>
<language type="sd">Sindhi</language>
<language type="sdc">↑↑↑</language>
<language type="sdh">↑↑↑</language>
@@ -502,7 +504,7 @@
<language type="sgs">↑↑↑</language>
<language type="sh">↑↑↑</language>
<language type="shi">Tachelhit</language>
- <language type="shn" draft="contributed">Shan</language>
+ <language type="shn">Shan</language>
<language type="shu">↑↑↑</language>
<language type="si">Sinhala</language>
<language type="sid">↑↑↑</language>
@@ -511,76 +513,76 @@
<language type="sli">↑↑↑</language>
<language type="sly">↑↑↑</language>
<language type="sm">Samoan</language>
- <language type="sma" draft="contributed">Southern Sami</language>
- <language type="smj" draft="contributed">Lule Sami</language>
+ <language type="sma">Southern Sami</language>
+ <language type="smj">Lule Sami</language>
<language type="smn">Inari Sami</language>
- <language type="sms" draft="contributed">Skolt Sami</language>
+ <language type="sms">Skolt Sami</language>
<language type="sn">Shona</language>
- <language type="snk" draft="contributed">Soninke</language>
+ <language type="snk">Soninke</language>
<language type="so">Somali</language>
<language type="sog">↑↑↑</language>
<language type="sq">Albanian</language>
<language type="sr">Serbian</language>
- <language type="srn" draft="contributed">Sranan Tongo</language>
+ <language type="srn">Sranan Tongo</language>
<language type="srr">↑↑↑</language>
- <language type="ss" draft="contributed">Swati</language>
- <language type="ssy" draft="contributed">Saho</language>
+ <language type="ss">Swati</language>
+ <language type="ssy">Saho</language>
<language type="st">Southern Sotho</language>
<language type="stq">↑↑↑</language>
<language type="su">Sundanese</language>
- <language type="suk" draft="contributed">Sukuma</language>
+ <language type="suk">Sukuma</language>
<language type="sus">↑↑↑</language>
<language type="sux">↑↑↑</language>
<language type="sv">Swedish</language>
<language type="sw">Swahili</language>
- <language type="sw_CD" draft="contributed">Congo Swahili</language>
- <language type="swb" draft="contributed">Comorian</language>
+ <language type="sw_CD">Congo Swahili</language>
+ <language type="swb">Comorian</language>
<language type="syc">↑↑↑</language>
- <language type="syr" draft="contributed">Syriac</language>
+ <language type="syr">Syriac</language>
<language type="szl">↑↑↑</language>
<language type="ta">Tamil</language>
<language type="tcy">↑↑↑</language>
<language type="te">Telugu</language>
- <language type="tem" draft="contributed">Timne</language>
+ <language type="tem">Timne</language>
<language type="teo">Teso</language>
- <language type="tet" draft="contributed">Tetum</language>
+ <language type="tet">Tetum</language>
<language type="tg">Tajik</language>
<language type="th">Thai</language>
<language type="ti">Tigrinya</language>
- <language type="tig" draft="contributed">Tigre</language>
+ <language type="tig">Tigre</language>
<language type="tk">Turkmen</language>
<language type="tkr">↑↑↑</language>
<language type="tl">↑↑↑</language>
- <language type="tlh" draft="contributed">Klingon</language>
+ <language type="tlh">Klingon</language>
<language type="tly">↑↑↑</language>
<language type="tmh">↑↑↑</language>
- <language type="tn" draft="contributed">Tswana</language>
+ <language type="tn">Tswana</language>
<language type="to">Tongan</language>
<language type="tog">↑↑↑</language>
- <language type="tpi" draft="contributed">Tok Pisin</language>
+ <language type="tpi">Tok Pisin</language>
<language type="tr">Turkish</language>
<language type="tru">↑↑↑</language>
- <language type="trv" draft="contributed">Taroko</language>
- <language type="ts" draft="contributed">Tsonga</language>
+ <language type="trv">Taroko</language>
+ <language type="ts">Tsonga</language>
<language type="tsd">↑↑↑</language>
<language type="tt">Tatar</language>
<language type="ttt">↑↑↑</language>
- <language type="tum" draft="contributed">Tumbuka</language>
- <language type="tvl" draft="contributed">Tuvalu</language>
+ <language type="tum">Tumbuka</language>
+ <language type="tvl">Tuvalu</language>
<language type="twq">Tasawaq</language>
- <language type="ty" draft="contributed">Tahitian</language>
- <language type="tyv" draft="contributed">Tuvinian</language>
+ <language type="ty">Tahitian</language>
+ <language type="tyv">Tuvinian</language>
<language type="tzm">Central Atlas Tamazight</language>
- <language type="udm" draft="contributed">Udmurt</language>
+ <language type="udm">Udmurt</language>
<language type="ug">Uyghur</language>
<language type="ug" alt="variant">Uighur</language>
<language type="uk">Ukrainian</language>
- <language type="umb" draft="contributed">Umbundu</language>
+ <language type="umb">Umbundu</language>
<language type="und">↑↑↑</language>
<language type="ur">Urdu</language>
<language type="uz">Uzbek</language>
<language type="vai">Vai</language>
- <language type="ve" draft="contributed">Venda</language>
+ <language type="ve">Venda</language>
<language type="vec">↑↑↑</language>
<language type="vep">↑↑↑</language>
<language type="vi">Vietnamese</language>
@@ -589,14 +591,14 @@
<language type="vo">Volapük</language>
<language type="vro">↑↑↑</language>
<language type="vun">Vunjo</language>
- <language type="wa" draft="contributed">Walloon</language>
+ <language type="wa">Walloon</language>
<language type="wae">Walser</language>
<language type="wal">↑↑↑</language>
- <language type="war" draft="contributed">Waray</language>
+ <language type="war">Waray</language>
<language type="wbp">↑↑↑</language>
<language type="wo">Wolof</language>
<language type="wuu">↑↑↑</language>
- <language type="xal" draft="contributed">Kalmyk</language>
+ <language type="xal">Kalmyk</language>
<language type="xh">Xhosa</language>
<language type="xmf">↑↑↑</language>
<language type="xog">Soga</language>
@@ -618,9 +620,9 @@
<language type="zh_Hant">Traditional Chinese</language>
<language type="zh_Hant" alt="long" draft="contributed">Traditional Mandarin Chinese</language>
<language type="zu">Zulu</language>
- <language type="zun" draft="contributed">Zuni</language>
+ <language type="zun">Zuni</language>
<language type="zxx">No linguistic content</language>
- <language type="zza" draft="contributed">Zaza</language>
+ <language type="zza">Zaza</language>
</languages>
<scripts>
<script type="Arab" draft="contributed">↑↑↑</script>
@@ -1785,8 +1787,8 @@
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">↑↑↑</greatestDifference>
- <greatestDifference id="M" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="y" draft="provisional">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
<greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
@@ -2316,9 +2318,9 @@
<greatestDifference id="y">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
- <greatestDifference id="G" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="M" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="y" draft="provisional">↑↑↑</greatestDifference>
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
<greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
@@ -5414,7 +5416,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic>Norfolk Island Time</generic>
+ <standard>Norfolk Island Standard Time</standard>
+ <daylight>Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6881,9 +6885,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6892,7 +6966,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -6992,7 +7066,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7022,7 +7096,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7513,17 +7587,17 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -7603,7 +7677,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -7762,9 +7836,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7773,7 +7917,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -7873,7 +8017,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7903,7 +8047,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8394,17 +8538,17 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHG</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8484,7 +8628,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -8643,9 +8787,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8654,7 +8868,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8705,7 +8919,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8940,17 +9154,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/en_GD.xml b/common/main/en_GD.xml
index b64ab9f..352e0e3 100644
--- a/common/main/en_GD.xml
+++ b/common/main/en_GD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GG.xml b/common/main/en_GG.xml
index 156205a..a5dcc21 100644
--- a/common/main/en_GG.xml
+++ b/common/main/en_GG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GH.xml b/common/main/en_GH.xml
index 8b11f6c..03ebf6a 100644
--- a/common/main/en_GH.xml
+++ b/common/main/en_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GI.xml b/common/main/en_GI.xml
index 8233f4c..b41334d 100644
--- a/common/main/en_GI.xml
+++ b/common/main/en_GI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GM.xml b/common/main/en_GM.xml
index a599d18..2685330 100644
--- a/common/main/en_GM.xml
+++ b/common/main/en_GM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GU.xml b/common/main/en_GU.xml
index e7a487b..15f0cda 100644
--- a/common/main/en_GU.xml
+++ b/common/main/en_GU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_GY.xml b/common/main/en_GY.xml
index 552d292..363ce0a 100644
--- a/common/main/en_GY.xml
+++ b/common/main/en_GY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_HK.xml b/common/main/en_HK.xml
index acb2029..a357ca1 100644
--- a/common/main/en_HK.xml
+++ b/common/main/en_HK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_IE.xml b/common/main/en_IE.xml
index b08ac07..c1a5db6 100644
--- a/common/main/en_IE.xml
+++ b/common/main/en_IE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_IL.xml b/common/main/en_IL.xml
index 9c2bb8c..118b777 100644
--- a/common/main/en_IL.xml
+++ b/common/main/en_IL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_IM.xml b/common/main/en_IM.xml
index 3446c3b..48f8c82 100644
--- a/common/main/en_IM.xml
+++ b/common/main/en_IM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_IN.xml b/common/main/en_IN.xml
index f60d0fb..4f18a53 100644
--- a/common/main/en_IN.xml
+++ b/common/main/en_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -60,7 +60,7 @@
<language type="awa">↑↑↑</language>
<language type="ay">↑↑↑</language>
<language type="az">↑↑↑</language>
- <language type="az" alt="short" draft="contributed">Azeri</language>
+ <language type="az" alt="short">Azeri</language>
<language type="ba">↑↑↑</language>
<language type="bal">↑↑↑</language>
<language type="ban">↑↑↑</language>
@@ -121,6 +121,8 @@
<language type="chr">↑↑↑</language>
<language type="chy">↑↑↑</language>
<language type="ckb">↑↑↑</language>
+ <language type="ckb" alt="menu">↑↑↑</language>
+ <language type="ckb" alt="variant">↑↑↑</language>
<language type="co">↑↑↑</language>
<language type="cop">↑↑↑</language>
<language type="cps">↑↑↑</language>
@@ -395,7 +397,7 @@
<language type="mwr">↑↑↑</language>
<language type="mwv">↑↑↑</language>
<language type="my">↑↑↑</language>
- <language type="my" alt="variant" draft="contributed">Myanmar Language</language>
+ <language type="my" alt="variant">Myanmar Language</language>
<language type="mye">↑↑↑</language>
<language type="myv">↑↑↑</language>
<language type="mzn">↑↑↑</language>
@@ -476,7 +478,7 @@
<language type="rm">↑↑↑</language>
<language type="rn">↑↑↑</language>
<language type="ro">↑↑↑</language>
- <language type="ro_MD" draft="contributed">Moldavian</language>
+ <language type="ro_MD">Moldavian</language>
<language type="rof">↑↑↑</language>
<language type="rom">↑↑↑</language>
<language type="root">↑↑↑</language>
@@ -1008,6 +1010,11 @@
<territory type="ZW">↑↑↑</territory>
<territory type="ZZ">↑↑↑</territory>
</territories>
+ <subdivisions>
+ <subdivision type="gbeng">↑↑↑</subdivision>
+ <subdivision type="gbsct">↑↑↑</subdivision>
+ <subdivision type="gbwls">↑↑↑</subdivision>
+ </subdivisions>
<keys>
<key type="calendar">↑↑↑</key>
<key type="cf">↑↑↑</key>
@@ -1362,13 +1369,13 @@
<dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
<dateFormatItem id="d">↑↑↑</dateFormatItem>
<dateFormatItem id="E">↑↑↑</dateFormatItem>
- <dateFormatItem id="EBhm" draft="contributed">E, h:mm B</dateFormatItem>
- <dateFormatItem id="EBhms" draft="contributed">E, h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
<dateFormatItem id="Ed">↑↑↑</dateFormatItem>
- <dateFormatItem id="Ehm" draft="contributed">E, h:mm a</dateFormatItem>
- <dateFormatItem id="EHm" draft="contributed">E, HH:mm</dateFormatItem>
- <dateFormatItem id="Ehms" draft="contributed">E, h:mm:ss a</dateFormatItem>
- <dateFormatItem id="EHms" draft="contributed">E, HH:mm:ss</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">↑↑↑</dateFormatItem>
<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
@@ -1381,7 +1388,7 @@
<dateFormatItem id="Hms">↑↑↑</dateFormatItem>
<dateFormatItem id="M">↑↑↑</dateFormatItem>
<dateFormatItem id="Md">d/M</dateFormatItem>
- <dateFormatItem id="MEd" draft="contributed">E, d/M</dateFormatItem>
+ <dateFormatItem id="MEd">E, d/M</dateFormatItem>
<dateFormatItem id="MMM">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
@@ -1415,6 +1422,41 @@
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="M">
<greatestDifference id="M">↑↑↑</greatestDifference>
@@ -1838,8 +1880,8 @@
<dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
<dateFormatItem id="d">↑↑↑</dateFormatItem>
<dateFormatItem id="E">↑↑↑</dateFormatItem>
- <dateFormatItem id="EBhm" draft="contributed">E, h:mm B</dateFormatItem>
- <dateFormatItem id="EBhms" draft="contributed">E, h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
<dateFormatItem id="Ed">↑↑↑</dateFormatItem>
<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
@@ -6305,7 +6347,7 @@
<pattern type="approximately" draft="contributed">↑↑↑</pattern>
<pattern type="atLeast">↑↑↑</pattern>
<pattern type="atMost" draft="contributed">↑↑↑</pattern>
- <pattern type="range" draft="contributed">{0}–{1}</pattern>
+ <pattern type="range">{0}–{1}</pattern>
</miscPatterns>
<minimalPairs>
<pluralMinimalPairs count="one">↑↑↑</pluralMinimalPairs>
@@ -6318,9 +6360,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6329,7 +6441,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6429,7 +6541,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6459,7 +6571,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6534,6 +6646,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="duration-decade">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="duration-year">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -6686,6 +6803,41 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="graphics-em">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -6910,17 +7062,22 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6935,6 +7092,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="pressure-pascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-hectopascal">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -6990,7 +7152,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7149,9 +7311,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7160,7 +7392,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7260,7 +7492,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7290,7 +7522,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7365,6 +7597,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="duration-decade">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="duration-year">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -7517,6 +7754,41 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="graphics-em">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -7741,17 +8013,22 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7766,6 +8043,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="pressure-pascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-hectopascal">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
@@ -7821,7 +8103,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7980,9 +8262,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7991,7 +8343,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/en_IO.xml b/common/main/en_IO.xml
index f371410..e2e84fb 100644
--- a/common/main/en_IO.xml
+++ b/common/main/en_IO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_JE.xml b/common/main/en_JE.xml
index 39ba487..6422fc4 100644
--- a/common/main/en_JE.xml
+++ b/common/main/en_JE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_JM.xml b/common/main/en_JM.xml
index f923c52..3ec14f5 100644
--- a/common/main/en_JM.xml
+++ b/common/main/en_JM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_KE.xml b/common/main/en_KE.xml
index 12d0b17..0f98ac1 100644
--- a/common/main/en_KE.xml
+++ b/common/main/en_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_KI.xml b/common/main/en_KI.xml
index 411ab4d..ac0a8f0 100644
--- a/common/main/en_KI.xml
+++ b/common/main/en_KI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_KN.xml b/common/main/en_KN.xml
index e12b7f6..a09e742 100644
--- a/common/main/en_KN.xml
+++ b/common/main/en_KN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_KY.xml b/common/main/en_KY.xml
index e785432..4f9cc25 100644
--- a/common/main/en_KY.xml
+++ b/common/main/en_KY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_LC.xml b/common/main/en_LC.xml
index 3b38e1d..f340ada 100644
--- a/common/main/en_LC.xml
+++ b/common/main/en_LC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_LR.xml b/common/main/en_LR.xml
index 2480e85..69e7058 100644
--- a/common/main/en_LR.xml
+++ b/common/main/en_LR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_LS.xml b/common/main/en_LS.xml
index 799abaf..acbba8f 100644
--- a/common/main/en_LS.xml
+++ b/common/main/en_LS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MG.xml b/common/main/en_MG.xml
index fd2ed64..c4d7ca2 100644
--- a/common/main/en_MG.xml
+++ b/common/main/en_MG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MH.xml b/common/main/en_MH.xml
index 546a2c7..6c42bdc 100644
--- a/common/main/en_MH.xml
+++ b/common/main/en_MH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MO.xml b/common/main/en_MO.xml
index 7c213e7..bd519c8 100644
--- a/common/main/en_MO.xml
+++ b/common/main/en_MO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MP.xml b/common/main/en_MP.xml
index 243a5b6..c9ecf83 100644
--- a/common/main/en_MP.xml
+++ b/common/main/en_MP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MS.xml b/common/main/en_MS.xml
index 92771c8..344ed5c 100644
--- a/common/main/en_MS.xml
+++ b/common/main/en_MS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MT.xml b/common/main/en_MT.xml
index fa8db97..365c1cf 100644
--- a/common/main/en_MT.xml
+++ b/common/main/en_MT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MU.xml b/common/main/en_MU.xml
index 57d57cd..833f9ac 100644
--- a/common/main/en_MU.xml
+++ b/common/main/en_MU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MW.xml b/common/main/en_MW.xml
index dff9a96..47b6d1c 100644
--- a/common/main/en_MW.xml
+++ b/common/main/en_MW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_MY.xml b/common/main/en_MY.xml
index a46201f..d437caf 100644
--- a/common/main/en_MY.xml
+++ b/common/main/en_MY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NA.xml b/common/main/en_NA.xml
index 58dca03..6e88bf5 100644
--- a/common/main/en_NA.xml
+++ b/common/main/en_NA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NF.xml b/common/main/en_NF.xml
index aa8bdee..3290488 100644
--- a/common/main/en_NF.xml
+++ b/common/main/en_NF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NG.xml b/common/main/en_NG.xml
index 63e3183..29e2e08 100644
--- a/common/main/en_NG.xml
+++ b/common/main/en_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NL.xml b/common/main/en_NL.xml
index 7e1c703..465278e 100644
--- a/common/main/en_NL.xml
+++ b/common/main/en_NL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NR.xml b/common/main/en_NR.xml
index b32572e..66cf076 100644
--- a/common/main/en_NR.xml
+++ b/common/main/en_NR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NU.xml b/common/main/en_NU.xml
index 1745831..edc493a 100644
--- a/common/main/en_NU.xml
+++ b/common/main/en_NU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_NZ.xml b/common/main/en_NZ.xml
index 366a018..597b172 100644
--- a/common/main/en_NZ.xml
+++ b/common/main/en_NZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PG.xml b/common/main/en_PG.xml
index cdfb8d4..bb0bca9 100644
--- a/common/main/en_PG.xml
+++ b/common/main/en_PG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PH.xml b/common/main/en_PH.xml
index f3c7333..e6bf159 100644
--- a/common/main/en_PH.xml
+++ b/common/main/en_PH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PK.xml b/common/main/en_PK.xml
index d92e63c..6fbb9da 100644
--- a/common/main/en_PK.xml
+++ b/common/main/en_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PN.xml b/common/main/en_PN.xml
index 50695a0..23a0054 100644
--- a/common/main/en_PN.xml
+++ b/common/main/en_PN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PR.xml b/common/main/en_PR.xml
index 6238c50..030550e 100644
--- a/common/main/en_PR.xml
+++ b/common/main/en_PR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_PW.xml b/common/main/en_PW.xml
index d7da350..7dd84fc 100644
--- a/common/main/en_PW.xml
+++ b/common/main/en_PW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_RW.xml b/common/main/en_RW.xml
index 2088208..321ce48 100644
--- a/common/main/en_RW.xml
+++ b/common/main/en_RW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SB.xml b/common/main/en_SB.xml
index a21c826..7e6eb4b 100644
--- a/common/main/en_SB.xml
+++ b/common/main/en_SB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SC.xml b/common/main/en_SC.xml
index 3ee1553..7813db9 100644
--- a/common/main/en_SC.xml
+++ b/common/main/en_SC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SD.xml b/common/main/en_SD.xml
index 2eef418..ca30915 100644
--- a/common/main/en_SD.xml
+++ b/common/main/en_SD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SE.xml b/common/main/en_SE.xml
index 44826f8..dc7b23d 100644
--- a/common/main/en_SE.xml
+++ b/common/main/en_SE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SG.xml b/common/main/en_SG.xml
index c2b4e9b..3d9c8cf 100644
--- a/common/main/en_SG.xml
+++ b/common/main/en_SG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SH.xml b/common/main/en_SH.xml
index 9f0a631..df54c07 100644
--- a/common/main/en_SH.xml
+++ b/common/main/en_SH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SI.xml b/common/main/en_SI.xml
index 7827b71..bd4658a 100644
--- a/common/main/en_SI.xml
+++ b/common/main/en_SI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SL.xml b/common/main/en_SL.xml
index 1ae14a9..15c25ad 100644
--- a/common/main/en_SL.xml
+++ b/common/main/en_SL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SS.xml b/common/main/en_SS.xml
index 93f5b69..5750f43 100644
--- a/common/main/en_SS.xml
+++ b/common/main/en_SS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SX.xml b/common/main/en_SX.xml
index 1de8fcb..daff6eb 100644
--- a/common/main/en_SX.xml
+++ b/common/main/en_SX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_SZ.xml b/common/main/en_SZ.xml
index 8357eb8..477a1ce 100644
--- a/common/main/en_SZ.xml
+++ b/common/main/en_SZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TC.xml b/common/main/en_TC.xml
index 08973cc..96b0b13 100644
--- a/common/main/en_TC.xml
+++ b/common/main/en_TC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TK.xml b/common/main/en_TK.xml
index 055a863..8114437 100644
--- a/common/main/en_TK.xml
+++ b/common/main/en_TK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TO.xml b/common/main/en_TO.xml
index a59238c..dd4df2c 100644
--- a/common/main/en_TO.xml
+++ b/common/main/en_TO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TT.xml b/common/main/en_TT.xml
index 4ec900a..ce8a6b5 100644
--- a/common/main/en_TT.xml
+++ b/common/main/en_TT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TV.xml b/common/main/en_TV.xml
index 17e13dd..3e8bff2 100644
--- a/common/main/en_TV.xml
+++ b/common/main/en_TV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_TZ.xml b/common/main/en_TZ.xml
index b451ec5..064bd44 100644
--- a/common/main/en_TZ.xml
+++ b/common/main/en_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_UG.xml b/common/main/en_UG.xml
index cc58aba..79f3234 100644
--- a/common/main/en_UG.xml
+++ b/common/main/en_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_UM.xml b/common/main/en_UM.xml
index 542c94e..33b0597 100644
--- a/common/main/en_UM.xml
+++ b/common/main/en_UM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_US.xml b/common/main/en_US.xml
index abfc0df..45615f0 100644
--- a/common/main/en_US.xml
+++ b/common/main/en_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_US_POSIX.xml b/common/main/en_US_POSIX.xml
index 7de2a80..72a0aca 100644
--- a/common/main/en_US_POSIX.xml
+++ b/common/main/en_US_POSIX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_VC.xml b/common/main/en_VC.xml
index 5c38871..24d0174 100644
--- a/common/main/en_VC.xml
+++ b/common/main/en_VC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_VG.xml b/common/main/en_VG.xml
index 67dcf62..bd54623 100644
--- a/common/main/en_VG.xml
+++ b/common/main/en_VG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_VI.xml b/common/main/en_VI.xml
index a4b107d..ec779be 100644
--- a/common/main/en_VI.xml
+++ b/common/main/en_VI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_VU.xml b/common/main/en_VU.xml
index dddfc5a..be3f694 100644
--- a/common/main/en_VU.xml
+++ b/common/main/en_VU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_WS.xml b/common/main/en_WS.xml
index 0d8013a..fff7517 100644
--- a/common/main/en_WS.xml
+++ b/common/main/en_WS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_ZA.xml b/common/main/en_ZA.xml
index 0a44436..1b91350 100644
--- a/common/main/en_ZA.xml
+++ b/common/main/en_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_ZM.xml b/common/main/en_ZM.xml
index bb7fcd1..5d38904 100644
--- a/common/main/en_ZM.xml
+++ b/common/main/en_ZM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/en_ZW.xml b/common/main/en_ZW.xml
index b19a0a7..8fd0ce7 100644
--- a/common/main/en_ZW.xml
+++ b/common/main/en_ZW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/eo.xml b/common/main/eo.xml
index 7263487..6b8085b 100644
--- a/common/main/eo.xml
+++ b/common/main/eo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -175,7 +175,6 @@
<language type="tr">turka</language>
<language type="ts">conga</language>
<language type="tt">tatara</language>
- <language type="tw">tw</language>
<language type="ug">ujgura</language>
<language type="uk">ukraina</language>
<language type="und">nekonata lingvo</language>
@@ -337,7 +336,6 @@
<territory type="MD">Moldavujo</territory>
<territory type="MG">Madagaskaro</territory>
<territory type="MH">Marŝaloj</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Malio</territory>
<territory type="MM">Mjanmao</territory>
<territory type="MN">Mongolujo</territory>
diff --git a/common/main/eo_001.xml b/common/main/eo_001.xml
index fe3717e..08de38c 100644
--- a/common/main/eo_001.xml
+++ b/common/main/eo_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es.xml b/common/main/es.xml
index 991d1ea..315e77f 100644
--- a/common/main/es.xml
+++ b/common/main/es.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -160,6 +160,7 @@
<language type="eu">euskera</language>
<language type="ewo">ewondo</language>
<language type="fa">persa</language>
+ <language type="fa_AF">darí</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -565,6 +566,7 @@
<scripts>
<script type="Arab">árabe</script>
<script type="Arab" alt="variant">perso-árabe</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armn">armenio</script>
<script type="Avst">avéstico</script>
<script type="Bali">balinés</script>
@@ -652,6 +654,7 @@
<script type="Phag">phags-pa</script>
<script type="Phnx">fenicio</script>
<script type="Plrd">Pollard Miao</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng" draft="contributed">rejang</script>
<script type="Roro" draft="contributed">rongo-rongo</script>
<script type="Runr">rúnico</script>
@@ -5472,7 +5475,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>hora de la isla Norfolk</standard>
+ <generic draft="contributed">hora de la isla Norfolk</generic>
+ <standard draft="contributed">hora estándar de la isla Norfolk</standard>
+ <daylight draft="contributed">hora de verano de la isla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7503,9 +7508,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} por {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7514,7 +7589,7 @@
<unitPattern count="one">{0} unidad de fuerza gravitacional</unitPattern>
<unitPattern count="other">{0} unidades de fuerza gravitacional</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros por segundo al cuadrado</displayName>
<unitPattern count="one">{0} metro por segundo al cuadrado</unitPattern>
<unitPattern count="other">{0} metros por segundo al cuadrado</unitPattern>
@@ -7614,7 +7689,7 @@
<unitPattern count="one">{0} milimol por litro</unitPattern>
<unitPattern count="other">{0} milimoles por litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes por millón</displayName>
<unitPattern count="one">{0} parte por millón</unitPattern>
<unitPattern count="other">{0} partes por millón</unitPattern>
@@ -7644,7 +7719,7 @@
<unitPattern count="one">{0} litro por kilómetro</unitPattern>
<unitPattern count="other">{0} litros por kilómetro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros por 100 kilómetros</displayName>
<unitPattern count="one">{0} litro por 100 kilómetros</unitPattern>
<unitPattern count="other">{0} litros por 100 kilómetros</unitPattern>
@@ -8120,17 +8195,17 @@
<unitPattern count="one">{0} caballo de vapor</unitPattern>
<unitPattern count="other">{0} caballos de vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetros de mercurio</displayName>
<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
<unitPattern count="other">{0} milímetros de mercurio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libras por pulgada cuadrada</displayName>
<unitPattern count="one">{0} libra por pulgada cuadrada</unitPattern>
<unitPattern count="other">{0} libras por pulgada cuadrada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pulgadas de mercurio</displayName>
<unitPattern count="one">{0} pulgada de mercurio</unitPattern>
<unitPattern count="other">{0} pulgadas de mercurio</unitPattern>
@@ -8210,7 +8285,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>libra pies</displayName>
<unitPattern count="one">{0} libra pie</unitPattern>
<unitPattern count="other">{0} libras pies</unitPattern>
@@ -8364,9 +8439,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8375,7 +8520,7 @@
<unitPattern count="one">{0} Fg</unitPattern>
<unitPattern count="other">{0} Fg</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8475,7 +8620,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8505,7 +8650,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8981,17 +9126,17 @@
<unitPattern count="one">{0} CV</unitPattern>
<unitPattern count="other">{0} CV</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9071,7 +9216,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf ft</displayName>
<unitPattern count="one">{0} lbf ft</unitPattern>
<unitPattern count="other">{0} lbf ft</unitPattern>
@@ -9225,9 +9370,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -9276,7 +9491,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
@@ -9468,17 +9683,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one">{0}inHg</unitPattern>
<unitPattern count="other">{0}inHg</unitPattern>
diff --git a/common/main/es_419.xml b/common/main/es_419.xml
index 709f2ff..631e7a7 100644
--- a/common/main/es_419.xml
+++ b/common/main/es_419.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -161,6 +161,7 @@
<language type="eu">vasco</language>
<language type="ewo">ewondo</language>
<language type="fa">persa</language>
+ <language type="fa_AF">darí</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">fula</language>
@@ -594,6 +595,7 @@
<script type="Mlym">malayalam</script>
<script type="Mong">mongol</script>
<script type="Mymr">birmano</script>
+ <script type="Olck" draft="contributed">ol chiki</script>
<script type="Orya">oriya</script>
<script type="Sinh">cingalés</script>
<script type="Taml">tamil</script>
@@ -953,9 +955,9 @@
<type key="calendar" type="indian">↑↑↑</type>
<type key="calendar" type="islamic">↑↑↑</type>
<type key="calendar" type="islamic-civil">↑↑↑</type>
- <type key="calendar" type="islamic-rgsa">↑↑↑</type>
- <type key="calendar" type="islamic-tbla">↑↑↑</type>
- <type key="calendar" type="islamic-umalqura" draft="contributed">islamic-umalqura</type>
+ <type key="calendar" type="islamic-rgsa">calendario islámico (Arabia Saudita)</type>
+ <type key="calendar" type="islamic-tbla">calendario islámico tabular</type>
+ <type key="calendar" type="islamic-umalqura">↑↑↑</type>
<type key="calendar" type="iso8601">↑↑↑</type>
<type key="calendar" type="japanese">↑↑↑</type>
<type key="calendar" type="persian">↑↑↑</type>
@@ -4792,7 +4794,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>hora de la Isla Norfolk</standard>
+ <generic draft="contributed">hora de la Isla Norfolk</generic>
+ <standard draft="contributed">hora estándar de la Isla Norfolk</standard>
+ <daylight draft="contributed">hora de verano de la Isla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6258,9 +6262,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6269,7 +6343,7 @@
<unitPattern count="one">{0} unidad de fuerza gravitacional</unitPattern>
<unitPattern count="other">{0} unidades de fuerza gravitacional</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros por segundo al cuadrado</displayName>
<unitPattern count="one">{0} metro por segundo al cuadrado</unitPattern>
<unitPattern count="other">{0} metros por segundo al cuadrado</unitPattern>
@@ -6369,7 +6443,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6399,7 +6473,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6880,17 +6954,17 @@
<unitPattern count="one">caballo de fuerza</unitPattern>
<unitPattern count="other">{0} caballos de fuerza</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6970,7 +7044,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7124,9 +7198,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7135,7 +7279,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7235,7 +7379,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7265,7 +7409,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7746,17 +7890,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7836,7 +7980,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7990,9 +8134,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8001,7 +8215,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
@@ -8011,7 +8225,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8219,17 +8433,17 @@
<unitPattern count="one" draft="contributed">{0}ct</unitPattern>
<unitPattern count="other" draft="contributed">{0}ct</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8524,7 +8738,7 @@
<styleName type="wght" subtype="600" alt="demi">seminegrita demi</styleName>
<styleName type="wght" subtype="700">↑↑↑</styleName>
<styleName type="wght" subtype="800">extranegrita</styleName>
- <styleName type="wght" subtype="800" alt="ultra" draft="contributed">ultra</styleName>
+ <styleName type="wght" subtype="800" alt="ultra">extra negrita</styleName>
<styleName type="wght" subtype="900">↑↑↑</styleName>
<styleName type="wght" subtype="900" alt="heavy" draft="contributed">pesada</styleName>
<styleName type="wght" subtype="950" draft="contributed">extranegra</styleName>
diff --git a/common/main/es_AR.xml b/common/main/es_AR.xml
index 529909c..e210019 100644
--- a/common/main/es_AR.xml
+++ b/common/main/es_AR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_BO.xml b/common/main/es_BO.xml
index 6308769..af05fe3 100644
--- a/common/main/es_BO.xml
+++ b/common/main/es_BO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_BR.xml b/common/main/es_BR.xml
index 9e8c352..bbcbc24 100644
--- a/common/main/es_BR.xml
+++ b/common/main/es_BR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_BZ.xml b/common/main/es_BZ.xml
index 87fb8cb..6f590e1 100644
--- a/common/main/es_BZ.xml
+++ b/common/main/es_BZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_CL.xml b/common/main/es_CL.xml
index 359a97b..fd3d7b5 100644
--- a/common/main/es_CL.xml
+++ b/common/main/es_CL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_CO.xml b/common/main/es_CO.xml
index 919dbed..6f567c8 100644
--- a/common/main/es_CO.xml
+++ b/common/main/es_CO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_CR.xml b/common/main/es_CR.xml
index 9495834..0e38695 100644
--- a/common/main/es_CR.xml
+++ b/common/main/es_CR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_CU.xml b/common/main/es_CU.xml
index 90b9857..63961fc 100644
--- a/common/main/es_CU.xml
+++ b/common/main/es_CU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_DO.xml b/common/main/es_DO.xml
index a85e0677..241a697 100644
--- a/common/main/es_DO.xml
+++ b/common/main/es_DO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_EA.xml b/common/main/es_EA.xml
index 5a04570..1673371 100644
--- a/common/main/es_EA.xml
+++ b/common/main/es_EA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_EC.xml b/common/main/es_EC.xml
index e9f7769..f2c6d2c 100644
--- a/common/main/es_EC.xml
+++ b/common/main/es_EC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_ES.xml b/common/main/es_ES.xml
index 7a95003..3688bd2 100644
--- a/common/main/es_ES.xml
+++ b/common/main/es_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_GQ.xml b/common/main/es_GQ.xml
index a902d5f..ecbab26 100644
--- a/common/main/es_GQ.xml
+++ b/common/main/es_GQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_GT.xml b/common/main/es_GT.xml
index b35f6d5..6009ce6 100644
--- a/common/main/es_GT.xml
+++ b/common/main/es_GT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_HN.xml b/common/main/es_HN.xml
index e291173..a73ed5d 100644
--- a/common/main/es_HN.xml
+++ b/common/main/es_HN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_IC.xml b/common/main/es_IC.xml
index 9205316..ed35976 100644
--- a/common/main/es_IC.xml
+++ b/common/main/es_IC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_MX.xml b/common/main/es_MX.xml
index e35b2e0..15934c2 100644
--- a/common/main/es_MX.xml
+++ b/common/main/es_MX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -159,6 +159,7 @@
<language type="eu">euskera</language>
<language type="ewo">↑↑↑</language>
<language type="fa">↑↑↑</language>
+ <language type="fa_AF" draft="contributed">↑↑↑</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">↑↑↑</language>
@@ -392,7 +393,7 @@
<language type="pam">↑↑↑</language>
<language type="pap">↑↑↑</language>
<language type="pau">↑↑↑</language>
- <language type="pcm">pcm</language>
+ <language type="pcm">↑↑↑</language>
<language type="peo">↑↑↑</language>
<language type="phn">↑↑↑</language>
<language type="pi">↑↑↑</language>
@@ -531,7 +532,7 @@
<language type="was">↑↑↑</language>
<language type="wbp">↑↑↑</language>
<language type="wo">↑↑↑</language>
- <language type="wuu" draft="contributed">wuu</language>
+ <language type="wuu">chino wu</language>
<language type="xal" draft="contributed">kalmyk</language>
<language type="xh">↑↑↑</language>
<language type="xog">↑↑↑</language>
@@ -1021,6 +1022,7 @@
</codePatterns>
</localeDisplayNames>
<characters>
+ <exemplarCharacters draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="auxiliary" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="index" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="numbers" draft="contributed">↑↑↑</exemplarCharacters>
@@ -2081,10 +2083,10 @@
<displayName>↑↑↑</displayName>
</field>
<field type="weekdayOfMonth-short">
- <displayName draft="provisional">día hábil del mes</displayName>
+ <displayName draft="contributed">día hábil del mes</displayName>
</field>
<field type="weekdayOfMonth-narrow">
- <displayName draft="provisional">día hábil del mes</displayName>
+ <displayName draft="contributed">día hábil del mes</displayName>
</field>
<field type="sun">
<relative type="-1">el domingo pasado</relative>
@@ -4404,7 +4406,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>hora de la isla Norfolk</standard>
+ <generic draft="contributed">hora de la isla Norfolk</generic>
+ <standard draft="contributed">hora estándar de la isla Norfolk</standard>
+ <daylight draft="contributed">hora de verano de la isla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5880,9 +5884,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5891,7 +5965,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -5991,7 +6065,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6021,7 +6095,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6219,9 +6293,9 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="force-pound-force">
<displayName>↑↑↑</displayName>
@@ -6497,17 +6571,17 @@
<unitPattern count="one">{0} caballo de fuerza</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6587,7 +6661,7 @@
<unitPattern count="one">kelvin</unitPattern>
<unitPattern count="other">{0} kelvines</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6741,9 +6815,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6752,7 +6896,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6852,7 +6996,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6882,7 +7026,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7080,9 +7224,9 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="force-pound-force">
<displayName>↑↑↑</displayName>
@@ -7358,17 +7502,17 @@
<unitPattern count="one">{0} CV</unitPattern>
<unitPattern count="other">{0} CV</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7448,7 +7592,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7602,9 +7746,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7613,7 +7827,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/es_NI.xml b/common/main/es_NI.xml
index fcaf497..9584c87 100644
--- a/common/main/es_NI.xml
+++ b/common/main/es_NI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_PA.xml b/common/main/es_PA.xml
index 919287e..76ae4ac 100644
--- a/common/main/es_PA.xml
+++ b/common/main/es_PA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_PE.xml b/common/main/es_PE.xml
index c389c1e..65d26e9 100644
--- a/common/main/es_PE.xml
+++ b/common/main/es_PE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_PH.xml b/common/main/es_PH.xml
index 6a6428d..e2878a4 100644
--- a/common/main/es_PH.xml
+++ b/common/main/es_PH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_PR.xml b/common/main/es_PR.xml
index 55b3aa1..17cb7c2 100644
--- a/common/main/es_PR.xml
+++ b/common/main/es_PR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_PY.xml b/common/main/es_PY.xml
index aee52a0..1051fd0 100644
--- a/common/main/es_PY.xml
+++ b/common/main/es_PY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_SV.xml b/common/main/es_SV.xml
index 6a546e5..7872bdf 100644
--- a/common/main/es_SV.xml
+++ b/common/main/es_SV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_US.xml b/common/main/es_US.xml
index 2a963a8..3f75b22 100644
--- a/common/main/es_US.xml
+++ b/common/main/es_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -158,6 +158,7 @@
<language type="eu">euskera</language>
<language type="ewo">↑↑↑</language>
<language type="fa">↑↑↑</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">↑↑↑</language>
@@ -200,7 +201,7 @@
<language type="gwi">↑↑↑</language>
<language type="ha">↑↑↑</language>
<language type="hai">↑↑↑</language>
- <language type="hak" draft="contributed">hak</language>
+ <language type="hak">↑↑↑</language>
<language type="haw">↑↑↑</language>
<language type="he">↑↑↑</language>
<language type="hi">↑↑↑</language>
@@ -347,7 +348,7 @@
<language type="myv">↑↑↑</language>
<language type="mzn">↑↑↑</language>
<language type="na">↑↑↑</language>
- <language type="nan" draft="contributed">nan</language>
+ <language type="nan">↑↑↑</language>
<language type="nap">↑↑↑</language>
<language type="naq">↑↑↑</language>
<language type="nb">↑↑↑</language>
@@ -391,7 +392,7 @@
<language type="pam">↑↑↑</language>
<language type="pap">↑↑↑</language>
<language type="pau">↑↑↑</language>
- <language type="pcm" draft="contributed">pcm</language>
+ <language type="pcm">↑↑↑</language>
<language type="peo">↑↑↑</language>
<language type="phn">↑↑↑</language>
<language type="pi">↑↑↑</language>
@@ -530,7 +531,7 @@
<language type="was">↑↑↑</language>
<language type="wbp">↑↑↑</language>
<language type="wo" draft="contributed">wolof</language>
- <language type="wuu" draft="contributed">wuu</language>
+ <language type="wuu">↑↑↑</language>
<language type="xal" draft="contributed">kalmyk</language>
<language type="xh">↑↑↑</language>
<language type="xog">↑↑↑</language>
@@ -686,7 +687,7 @@
<territory type="CG" alt="variant">↑↑↑</territory>
<territory type="CH">↑↑↑</territory>
<territory type="CI">Côte d’Ivoire</territory>
- <territory type="CI" alt="variant" draft="contributed">CI</territory>
+ <territory type="CI" alt="variant">↑↑↑</territory>
<territory type="CK">↑↑↑</territory>
<territory type="CL">↑↑↑</territory>
<territory type="CM">↑↑↑</territory>
@@ -879,7 +880,7 @@
<territory type="TJ">↑↑↑</territory>
<territory type="TK">↑↑↑</territory>
<territory type="TL">Timor-Leste</territory>
- <territory type="TL" alt="variant" draft="contributed">TL</territory>
+ <territory type="TL" alt="variant">↑↑↑</territory>
<territory type="TM">↑↑↑</territory>
<territory type="TN">↑↑↑</territory>
<territory type="TO">↑↑↑</territory>
@@ -891,7 +892,7 @@
<territory type="UA">↑↑↑</territory>
<territory type="UG">↑↑↑</territory>
<territory type="UM">Islas menores alejadas de EE. UU.</territory>
- <territory type="UN" draft="contributed">UN</territory>
+ <territory type="UN">↑↑↑</territory>
<territory type="US">↑↑↑</territory>
<territory type="US" alt="short" draft="contributed">EE. UU.</territory>
<territory type="UY">↑↑↑</territory>
@@ -1020,6 +1021,7 @@
</codePatterns>
</localeDisplayNames>
<characters>
+ <exemplarCharacters draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="auxiliary" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="index" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="numbers" draft="contributed">↑↑↑</exemplarCharacters>
@@ -4463,7 +4465,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>hora de la isla Norfolk</standard>
+ <generic draft="contributed">hora de la isla Norfolk</generic>
+ <standard draft="contributed">hora estándar de la isla Norfolk</standard>
+ <daylight draft="contributed">hora de verano de la isla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5471,6 +5475,8 @@
</currency>
<currency type="MRU">
<displayName draft="contributed">↑↑↑</displayName>
+ <displayName count="one">↑↑↑</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MUR">
@@ -5933,9 +5939,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cuadrado {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cuadrado {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cúbico{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cúbico{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5944,7 +6020,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6044,7 +6120,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">ppm</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6074,7 +6150,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6550,17 +6626,17 @@
<unitPattern count="one" draft="contributed">{0} caballo de vapor</unitPattern>
<unitPattern count="other" draft="contributed">{0} caballos de vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6640,7 +6716,7 @@
<unitPattern count="one" draft="contributed">kelvin</unitPattern>
<unitPattern count="other" draft="contributed">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -6794,9 +6870,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6805,7 +6951,7 @@
<unitPattern count="one" draft="contributed">{0} Fg</unitPattern>
<unitPattern count="other" draft="contributed">{0} Fg</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6905,7 +7051,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6935,7 +7081,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7411,17 +7557,17 @@
<unitPattern count="one" draft="contributed">{0} CV</unitPattern>
<unitPattern count="other" draft="contributed">{0} CV</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7501,7 +7647,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -7655,9 +7801,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7666,7 +7882,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/es_UY.xml b/common/main/es_UY.xml
index 6789bae..8027133 100644
--- a/common/main/es_UY.xml
+++ b/common/main/es_UY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/es_VE.xml b/common/main/es_VE.xml
index 103e0fa..a5c73b7 100644
--- a/common/main/es_VE.xml
+++ b/common/main/es_VE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/et.xml b/common/main/et.xml
index 0e6a6f9..0a3d520 100644
--- a/common/main/et.xml
+++ b/common/main/et.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -180,6 +180,7 @@
<language type="ewo">evondo</language>
<language type="ext">estremenju</language>
<language type="fa">pärsia</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fangi</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -201,7 +202,6 @@
<language type="fur">friuuli</language>
<language type="fy">läänefriisi</language>
<language type="ga">iiri</language>
- <language type="gaa">gaa</language>
<language type="gag">gagauusi</language>
<language type="gan">kani</language>
<language type="gay">gajo</language>
@@ -470,7 +470,6 @@
<language type="ro_MD">moldova</language>
<language type="rof">rombo</language>
<language type="rom">mustlaskeel</language>
- <language type="root">root</language>
<language type="rtm">rotuma</language>
<language type="ru">vene</language>
<language type="rue">russiini</language>
@@ -4895,7 +4894,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolki saarte aeg</standard>
+ <generic draft="contributed">Norfolki saarte aeg</generic>
+ <standard draft="contributed">Norfolki saarte standardaeg</standard>
+ <daylight draft="contributed">Norfolki saarte suveaeg</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6912,9 +6913,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>detsi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} {1} kohta</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ruut{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ruut{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ruut{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kuup{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kuup{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kuup{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6923,7 +6994,7 @@
<unitPattern count="one">{0} Maa raskuskiirendus</unitPattern>
<unitPattern count="other">{0} Maa raskuskiirendust</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meetrid sekundi ruudu kohta</displayName>
<unitPattern count="one">{0} meeter sekundi ruudu kohta</unitPattern>
<unitPattern count="other">{0} meetrit sekundi ruudu kohta</unitPattern>
@@ -7023,7 +7094,7 @@
<unitPattern count="one">{0} millimool liitri kohta</unitPattern>
<unitPattern count="other">{0} millimooli liitri kohta</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>osa miljoni kohta</displayName>
<unitPattern count="one">{0} osa miljoni kohta</unitPattern>
<unitPattern count="other">{0} osa miljoni kohta</unitPattern>
@@ -7053,7 +7124,7 @@
<unitPattern count="one">{0} liiter kilomeetri kohta</unitPattern>
<unitPattern count="other">{0} liitrit kilomeetri kohta</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liitrid 100 kilomeetri kohta</displayName>
<unitPattern count="one">liiter 100 kilomeetri kohta</unitPattern>
<unitPattern count="other">{0} liitrit 100 kilomeetri kohta</unitPattern>
@@ -7544,17 +7615,17 @@
<unitPattern count="one">{0} hobujõud</unitPattern>
<unitPattern count="other">{0} hobujõudu</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeetrid elavhõbedasammast</displayName>
<unitPattern count="one">{0} millimeeter elavhõbedasammast</unitPattern>
<unitPattern count="other">{0} millimeetrit elavhõbedasammast</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>naelad ruuttolli kohta</displayName>
<unitPattern count="one">{0} nael ruuttolli kohta</unitPattern>
<unitPattern count="other">{0} naela ruuttolli kohta</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tollid elavhõbedasammast</displayName>
<unitPattern count="one">{0} toll elavhõbedasammast</unitPattern>
<unitPattern count="other">{0} tolli elavhõbedasammast</unitPattern>
@@ -7634,7 +7705,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvinit</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>naeljalad</displayName>
<unitPattern count="one">{0} naeljalg</unitPattern>
<unitPattern count="other">{0} naeljalga</unitPattern>
@@ -7793,9 +7864,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7804,7 +7945,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7904,7 +8045,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>osa/miljon</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7934,7 +8075,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8421,17 +8562,17 @@
<unitPattern count="one">{0} hj</unitPattern>
<unitPattern count="other">{0} hj</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} in Hg</unitPattern>
<unitPattern count="other">{0} in Hg</unitPattern>
@@ -8511,7 +8652,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -8668,9 +8809,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8712,7 +8923,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -8868,12 +9079,12 @@
<unitPattern count="one">{0} hj</unitPattern>
<unitPattern count="other">{0} hj</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″ Hg</displayName>
<unitPattern count="one">{0} toll Hg</unitPattern>
<unitPattern count="other">{0} tolli Hg</unitPattern>
diff --git a/common/main/et_EE.xml b/common/main/et_EE.xml
index 739ba63..289db09 100644
--- a/common/main/et_EE.xml
+++ b/common/main/et_EE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/eu.xml b/common/main/eu.xml
index 0cf27d1..73b032b 100644
--- a/common/main/eu.xml
+++ b/common/main/eu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="eu">euskara</language>
<language type="ewo">ewondera</language>
<language type="fa">persiera</language>
+ <language type="fa_AF">daria</language>
<language type="ff">fula</language>
<language type="fi">finlandiera</language>
<language type="fil">filipinera</language>
@@ -556,7 +557,7 @@
<territory type="CG" alt="variant">Kongoko Errepublika</territory>
<territory type="CH">Suitza</territory>
<territory type="CI">Boli Kosta</territory>
- <territory type="CI" alt="variant">CI</territory>
+ <territory type="CI" alt="variant">C¨ôte d’Ivore</territory>
<territory type="CK">Cook uharteak</territory>
<territory type="CL">Txile</territory>
<territory type="CM">Kamerun</territory>
@@ -749,7 +750,7 @@
<territory type="TJ">Tajikistan</territory>
<territory type="TK">Tokelau</territory>
<territory type="TL">Ekialdeko Timor</territory>
- <territory type="TL" alt="variant">TL</territory>
+ <territory type="TL" alt="variant">↑↑↑</territory>
<territory type="TM">Turkmenistan</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
@@ -776,7 +777,7 @@
<territory type="WF">Wallis eta Futuna</territory>
<territory type="WS">Samoa</territory>
<territory type="XA">Sasiazentuak</territory>
- <territory type="XB" draft="provisional">pseudobidia</territory>
+ <territory type="XB">pseudobidia</territory>
<territory type="XK">Kosovo</territory>
<territory type="YE">Yemen</territory>
<territory type="YT">Mayotte</territory>
@@ -1260,18 +1261,18 @@
<month type="12">A</month>
</monthWidth>
<monthWidth type="wide">
- <month type="1">urtarrila</month>
- <month type="2">otsaila</month>
- <month type="3">martxoa</month>
- <month type="4">apirila</month>
- <month type="5">maiatza</month>
- <month type="6">ekaina</month>
- <month type="7">uztaila</month>
- <month type="8">abuztua</month>
- <month type="9">iraila</month>
- <month type="10">urria</month>
- <month type="11">azaroa</month>
- <month type="12">abendua</month>
+ <month type="1">urtarrilak</month>
+ <month type="2">otsailak</month>
+ <month type="3">martxoak</month>
+ <month type="4">apirilak</month>
+ <month type="5">maiatzak</month>
+ <month type="6">ekainak</month>
+ <month type="7">uztailak</month>
+ <month type="8">abuztuak</month>
+ <month type="9">irailak</month>
+ <month type="10">urriak</month>
+ <month type="11">azaroak</month>
+ <month type="12">abenduak</month>
</monthWidth>
</monthContext>
<monthContext type="stand-alone">
@@ -3132,6 +3133,9 @@
<zone type="Asia/Aqtobe">
<exemplarCity>Aktobe</exemplarCity>
</zone>
+ <zone type="Asia/Qostanay">
+ <exemplarCity>Kostanay</exemplarCity>
+ </zone>
<zone type="Asia/Qyzylorda">
<exemplarCity>Kyzylorda</exemplarCity>
</zone>
@@ -4400,7 +4404,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk uharteetako ordua</standard>
+ <generic draft="contributed">Norfolk uharteetako ordua</generic>
+ <standard draft="contributed">Norfolk uharteetako ordua estandarra</standard>
+ <daylight draft="contributed">Norfolk uharteetako udako ordua</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5897,18 +5903,88 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>dezi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>zenti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} karratu</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} karratu</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} karratu</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} kubiko</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kubiko</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kubiko</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
- <compoundUnitPattern draft="provisional">{0}-{1}</compoundUnitPattern>
+ <compoundUnitPattern>{0}-{1}</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<displayName>grabitate-indar</displayName>
<unitPattern count="one">{0} grabitate-indar</unitPattern>
<unitPattern count="other">{0} grabitate-indar</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metroak segundo karratu bakoitzeko</displayName>
<unitPattern count="one">{0} metro segundo karratu bakoitzeko</unitPattern>
<unitPattern count="other">{0} metro segundo karratu bakoitzeko</unitPattern>
@@ -6008,7 +6084,7 @@
<unitPattern count="one">{0} milimole litro bakoitzeko</unitPattern>
<unitPattern count="other">{0} milimole litro bakoitzeko</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>zati milioi bakoitzeko</displayName>
<unitPattern count="one">{0} zati milioi bakoitzeko</unitPattern>
<unitPattern count="other">{0} zati milioi bakoitzeko</unitPattern>
@@ -6038,7 +6114,7 @@
<unitPattern count="one">{0} litro kilometro bakoitzeko</unitPattern>
<unitPattern count="other">{0} litro kilometro bakoitzeko</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litro 100 kilometro bakoitzeko</displayName>
<unitPattern count="one">{0} litro 100 kilometro bakoitzeko</unitPattern>
<unitPattern count="other">{0} litro 100 kilometro bakoitzeko</unitPattern>
@@ -6232,13 +6308,13 @@
</unit>
<unit type="energy-british-thermal-unit">
<displayName>↑↑↑</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">AEBko termiak</displayName>
- <unitPattern count="one" draft="provisional">{0} AEBko termia</unitPattern>
- <unitPattern count="other" draft="provisional">{0} AEBko termia</unitPattern>
+ <displayName>AEBko termiak</displayName>
+ <unitPattern count="one">{0} AEBko termia</unitPattern>
+ <unitPattern count="other">{0} AEBko termia</unitPattern>
</unit>
<unit type="force-pound-force">
<displayName>libra indar</displayName>
@@ -6514,23 +6590,23 @@
<unitPattern count="one">{0} zaldi-potentzia</unitPattern>
<unitPattern count="other">{0} zaldi-potentzia</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>merkurio-milimetroak</displayName>
<unitPattern count="one">{0} merkurio-milimetro</unitPattern>
<unitPattern count="other">{0} merkurio-milimetro</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libra hazbete karratuko</displayName>
<unitPattern count="one">{0} libra hazbete karratuko</unitPattern>
<unitPattern count="other">{0} libra hazbete karratuko</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>merkurio-hazbeteak</displayName>
<unitPattern count="one">{0} merkurio-hazbete</unitPattern>
<unitPattern count="other">{0} merkurio-hazbete</unitPattern>
</unit>
<unit type="pressure-bar">
- <displayName draft="provisional">↑↑↑</displayName>
+ <displayName>↑↑↑</displayName>
<unitPattern count="one">{0} bar</unitPattern>
<unitPattern count="other">{0} bar</unitPattern>
</unit>
@@ -6545,7 +6621,7 @@
<unitPattern count="other">{0} atmosfera</unitPattern>
</unit>
<unit type="pressure-pascal">
- <displayName draft="provisional">pascal</displayName>
+ <displayName>pascal</displayName>
<unitPattern count="one">{0} pascal</unitPattern>
<unitPattern count="other">{0} pascal</unitPattern>
</unit>
@@ -6604,7 +6680,7 @@
<unitPattern count="one">{0} kelvin gradu</unitPattern>
<unitPattern count="other">{0} kelvin gradu</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>oin-libra</displayName>
<unitPattern count="one">{0} oin-libra</unitPattern>
<unitPattern count="other">{0} oin-libra</unitPattern>
@@ -6758,18 +6834,88 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
- <compoundUnitPattern draft="provisional">{0}{1}</compoundUnitPattern>
+ <compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<displayName>G</displayName>
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6869,7 +7015,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>zati/milioi</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6899,7 +7045,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7093,13 +7239,13 @@
</unit>
<unit type="energy-british-thermal-unit">
<displayName>↑↑↑</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">AEBko termia</displayName>
- <unitPattern count="one" draft="provisional">{0} AEBko termia</unitPattern>
- <unitPattern count="other" draft="provisional">{0} AEBko termia</unitPattern>
+ <displayName>AEBko termia</displayName>
+ <unitPattern count="one">{0} AEBko termia</unitPattern>
+ <unitPattern count="other">{0} AEBko termia</unitPattern>
</unit>
<unit type="force-pound-force">
<displayName>libra indar</displayName>
@@ -7138,13 +7284,13 @@
</unit>
<unit type="graphics-pixel">
<displayName>pixel</displayName>
- <unitPattern count="one" draft="provisional">{0} p</unitPattern>
- <unitPattern count="other" draft="provisional">{0} p</unitPattern>
+ <unitPattern count="one">{0} p</unitPattern>
+ <unitPattern count="other">{0} p</unitPattern>
</unit>
<unit type="graphics-megapixel">
<displayName>megapixel</displayName>
- <unitPattern count="one" draft="provisional">{0} Mp</unitPattern>
- <unitPattern count="other" draft="provisional">{0} Mp</unitPattern>
+ <unitPattern count="one">{0} Mp</unitPattern>
+ <unitPattern count="other">{0} Mp</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
<displayName>ppcm</displayName>
@@ -7263,8 +7409,8 @@
</unit>
<unit type="length-solar-radius">
<displayName>eguzki-erradio</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="light-lux">
<displayName>lux</displayName>
@@ -7375,17 +7521,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7465,7 +7611,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>oin-libra</displayName>
<unitPattern count="one">{0} oin-libra</unitPattern>
<unitPattern count="other">{0} oin-libra</unitPattern>
@@ -7619,11 +7765,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
- <compoundUnitPattern draft="provisional">{0}{1}</compoundUnitPattern>
+ <compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<unitPattern count="one">{0} G</unitPattern>
@@ -7670,7 +7886,7 @@
<unitPattern count="one">% {0}</unitPattern>
<unitPattern count="other">% {0}</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7789,7 +8005,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -8038,7 +8254,6 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
@@ -8048,8 +8263,6 @@
<styleName type="wdth" subtype="112.5" alt="extended">semiextended</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">semiwide</styleName>
<styleName type="wdth" subtype="125">expanded</styleName>
- <styleName type="wdth" subtype="125" alt="extended">extended</styleName>
- <styleName type="wdth" subtype="125" alt="wide">wide</styleName>
<styleName type="wdth" subtype="150">extra-expanded</styleName>
<styleName type="wdth" subtype="150" alt="extended">extra-extended</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra-wide</styleName>
@@ -8069,10 +8282,7 @@
<styleName type="wght" subtype="700">bold</styleName>
<styleName type="wght" subtype="800">extra-bold</styleName>
<styleName type="wght" subtype="900">black</styleName>
- <styleName type="wght" subtype="900" alt="heavy">heavy</styleName>
<styleName type="wght" subtype="950">extra-black</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">ultrablack</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">ultraheavy</styleName>
<featureName type="afrc">vertical fractions</featureName>
<featureName type="cpsp">capital spacing</featureName>
<featureName type="dlig">optional ligatures</featureName>
diff --git a/common/main/eu_ES.xml b/common/main/eu_ES.xml
index 9ea270a..49aa38c 100644
--- a/common/main/eu_ES.xml
+++ b/common/main/eu_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ewo.xml b/common/main/ewo.xml
index a361cea..4d4fc24 100644
--- a/common/main/ewo.xml
+++ b/common/main/ewo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ewo_CM.xml b/common/main/ewo_CM.xml
index e9c1b10..65a2122 100644
--- a/common/main/ewo_CM.xml
+++ b/common/main/ewo_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fa.xml b/common/main/fa.xml
index efa92a7..d99dc1f 100644
--- a/common/main/fa.xml
+++ b/common/main/fa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -986,7 +986,7 @@
<territory type="VU">وانواتو</territory>
<territory type="WF">والیس و فوتونا</territory>
<territory type="WS">ساموآ</territory>
- <territory type="XA" draft="provisional">انگلیسی با لهجه خارجی</territory>
+ <territory type="XA">انگلیسی با لهجه خارجی</territory>
<territory type="XB">مجازی - دوجهته</territory>
<territory type="XK">کوزوو</territory>
<territory type="YE">یمن</territory>
@@ -5694,7 +5694,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>وقت جزیرهٔ نورفولک</standard>
+ <generic draft="contributed">وقت جزیرهٔ نورفولک</generic>
+ <standard draft="contributed">وقت عادی جزیرهٔ نورفولک</standard>
+ <daylight draft="contributed">وقت تابستانی جزیرهٔ نورفولک</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6881,7 +6883,7 @@
<symbol draft="contributed">LTL</symbol>
</currency>
<currency type="LTT">
- <displayName draft="contributed">↑↑↑</displayName>
+ <displayName>تالوناس لیتوانی</displayName>
</currency>
<currency type="LUF">
<displayName>فرانک لوکزامبورگ</displayName>
@@ -7590,9 +7592,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>دسی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سانتی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>میلی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>میکرو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نانو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پیکو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فمتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>آتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زپتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>دکا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>هکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کیلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گیگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ترا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>اگزا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوتا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} در {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} مربع</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} مربع</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>مکعب {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} مکعب</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} مکعب</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7601,7 +7673,7 @@
<unitPattern count="one">{0} نیروی جاذبه</unitPattern>
<unitPattern count="other">{0} جاذبه</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>متر بر مجذور ثانیه</displayName>
<unitPattern count="one">{0} متر بر مجذور ثانیه</unitPattern>
<unitPattern count="other">{0} متر بر مجذور ثانیه</unitPattern>
@@ -7701,7 +7773,7 @@
<unitPattern count="one">{0} میلیمول در لیتر</unitPattern>
<unitPattern count="other">{0} میلیمول در لیتر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>بخش در میلیون</displayName>
<unitPattern count="one">{0} بخش در میلیون</unitPattern>
<unitPattern count="other">{0} بخش در میلیون</unitPattern>
@@ -7731,7 +7803,7 @@
<unitPattern count="one">{0} لیتر در کیلومتر</unitPattern>
<unitPattern count="other">{0} لیتر در کیلومتر</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیتر در ۱۰۰ کیلومتر</displayName>
<unitPattern count="one">{0} لیتر در ۱۰۰ کیلومتر</unitPattern>
<unitPattern count="other">{0} لیتر در ۱۰۰ کیلومتر</unitPattern>
@@ -8207,17 +8279,17 @@
<unitPattern count="one">{0} اسب بخار</unitPattern>
<unitPattern count="other">{0} اسب بخار</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>میلیمتر جیوه</displayName>
<unitPattern count="one">{0} میلیمتر جیوه</unitPattern>
<unitPattern count="other">{0} میلیمتر جیوه</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پوند در اینچ مربع</displayName>
<unitPattern count="one">{0} پوند در اینچ مربع</unitPattern>
<unitPattern count="other">{0} پوند در اینچ مربع</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>اینچ جیوه</displayName>
<unitPattern count="one">{0} اینچ جیوه</unitPattern>
<unitPattern count="other">{0} اینچ جیوه</unitPattern>
@@ -8297,7 +8369,7 @@
<unitPattern count="one">{0} درجهٔ کلوین</unitPattern>
<unitPattern count="other">{0} درجهٔ کلوین</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>پوند-فوت</displayName>
<unitPattern count="one">{0} پوند-فوت</unitPattern>
<unitPattern count="other">{0} پوند-فوت</unitPattern>
@@ -8451,9 +8523,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>دسی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سانتی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>میلی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>میکرو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نانو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پیکو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فمتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>آتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زپتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>دکا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>هکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کیلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گیگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ترا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>اگزا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوتا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8462,7 +8604,7 @@
<unitPattern count="one">{0} جاذبه</unitPattern>
<unitPattern count="other">{0} جاذبه</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>متر/مجذور ثانیه</displayName>
<unitPattern count="one">{0}<LRM> m/s²</unitPattern>
<unitPattern count="other">{0}<LRM> m/s²</unitPattern>
@@ -8562,7 +8704,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>بخش/میلیون</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8592,7 +8734,7 @@
<unitPattern count="one">{0} ل./ک.م.</unitPattern>
<unitPattern count="other">{0} ل./ک.م.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیتر/۱۰۰ کیلومتر</displayName>
<unitPattern count="one">{0} ل./۱۰۰ ک.م.</unitPattern>
<unitPattern count="other">{0} ل./۱۰۰ ک.م.</unitPattern>
@@ -9068,17 +9210,17 @@
<unitPattern count="one">{0} اسب بخار</unitPattern>
<unitPattern count="other">{0} اسب بخار</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>میلیمتر جیوه</displayName>
<unitPattern count="one">{0} مم جیوه</unitPattern>
<unitPattern count="other">{0} مم جیوه</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پوند در اینچ مربع</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>اینچ جیوه</displayName>
<unitPattern count="one">{0} اینچ جیوه</unitPattern>
<unitPattern count="other">{0} اینچ جیوه</unitPattern>
@@ -9158,7 +9300,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>پوند-فوت</displayName>
<unitPattern count="one">{0} پوند-فوت</unitPattern>
<unitPattern count="other">{0} پوند-فوت</unitPattern>
@@ -9312,9 +9454,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>دسی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سانتی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>میلی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>میکرو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نانو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پیکو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فمتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>آتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زپتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>دکا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>هکتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کیلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گیگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ترا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>اگزا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زتا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوتا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9323,7 +9535,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">متر/مجذور ثانیه</displayName>
</unit>
<unit type="angle-radian">
@@ -9376,7 +9588,7 @@
<unitPattern count="one">{0}٪</unitPattern>
<unitPattern count="other">{0}٪</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیتر/۱۰۰ کیلومتر</displayName>
<unitPattern count="one">{0} ل./۱۰۰ ک.م.</unitPattern>
<unitPattern count="other">{0} ل./۱۰۰ ک.م.</unitPattern>
@@ -9593,17 +9805,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">میلیمتر جیوه</displayName>
<unitPattern count="one" draft="contributed">{0} مم جیوه</unitPattern>
<unitPattern count="other" draft="contributed">{0} مم جیوه</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">پوند در اینچ مربع</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">اینچ جیوه</displayName>
<unitPattern count="one">{0}inHg</unitPattern>
<unitPattern count="other">{0}inHg</unitPattern>
diff --git a/common/main/fa_AF.xml b/common/main/fa_AF.xml
index 849439e..543b7c6 100644
--- a/common/main/fa_AF.xml
+++ b/common/main/fa_AF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fa_IR.xml b/common/main/fa_IR.xml
index 0dc3c95..f9ca272 100644
--- a/common/main/fa_IR.xml
+++ b/common/main/fa_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff.xml b/common/main/ff.xml
index fb8460d..ac2a2ab 100644
--- a/common/main/ff.xml
+++ b/common/main/ff.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ff_Adlm.xml b/common/main/ff_Adlm.xml
similarity index 99%
rename from seed/main/ff_Adlm.xml
rename to common/main/ff_Adlm.xml
index d972bbe..0a5556a 100644
--- a/seed/main/ff_Adlm.xml
+++ b/common/main/ff_Adlm.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3750,7 +3750,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵</standard>
+ <generic draft="contributed">𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵</generic>
+ <standard draft="contributed">𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤵𞤲𞥋𞤣𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵</standard>
+ <daylight draft="contributed">𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤐𞤮𞤪𞤬𞤮𞤤𞤳𞤵</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4426,7 +4428,7 @@
<symbol alt="narrow" draft="contributed">𞤊𞤘</symbol>
</currency>
<currency type="GTQ">
- <displayName>↑↑↑</displayName>
+ <displayName>𞤑𞤫𞤼𞤵𞥁𞤢𞤤 𞤘𞤵𞤱𞤢𞤼𞤫𞤥𞤢𞤤𞤢𞤲𞤳𞤮</displayName>
<displayName count="one">𞤑𞤫𞤼𞤵𞥁𞤢𞤤 𞤘𞤵𞤱𞤢𞤼𞤫𞤥𞤢𞤤𞤢𞤲𞤳𞤮</displayName>
<displayName count="other">𞤑𞤫𞤼𞤵𞥁𞤫 𞤘𞤵𞤱𞤢𞤼𞤫𞤥𞤢𞤤𞤢𞤲𞤳𞤮</displayName>
<symbol draft="contributed">GTQ</symbol>
diff --git a/seed/main/ff_Adlm_BF.xml b/common/main/ff_Adlm_BF.xml
similarity index 93%
rename from seed/main/ff_Adlm_BF.xml
rename to common/main/ff_Adlm_BF.xml
index 9f2c311..bf0d2fa 100644
--- a/seed/main/ff_Adlm_BF.xml
+++ b/common/main/ff_Adlm_BF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ff_Adlm_CM.xml b/common/main/ff_Adlm_CM.xml
similarity index 93%
rename from seed/main/ff_Adlm_CM.xml
rename to common/main/ff_Adlm_CM.xml
index c93f4fe..df2174d 100644
--- a/seed/main/ff_Adlm_CM.xml
+++ b/common/main/ff_Adlm_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Adlm_GH.xml b/common/main/ff_Adlm_GH.xml
new file mode 100644
index 0000000..3a6652c
--- /dev/null
+++ b/common/main/ff_Adlm_GH.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ff"/>
+ <script type="Adlm"/>
+ <territory type="GH"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <currencies>
+ <currency type="GHS">
+ <symbol>GH₵</symbol>
+ </currency>
+ <currency type="GNF">
+ <symbol>GNF</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/common/main/ff_Adlm_GM.xml b/common/main/ff_Adlm_GM.xml
new file mode 100644
index 0000000..10cac35
--- /dev/null
+++ b/common/main/ff_Adlm_GM.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ff"/>
+ <script type="Adlm"/>
+ <territory type="GM"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <currencies>
+ <currency type="GMD">
+ <symbol>D</symbol>
+ </currency>
+ <currency type="GNF">
+ <symbol>GNF</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/seed/main/ff_Adlm_GN.xml b/common/main/ff_Adlm_GN.xml
similarity index 92%
rename from seed/main/ff_Adlm_GN.xml
rename to common/main/ff_Adlm_GN.xml
index 4e0ed63..f627a64 100644
--- a/seed/main/ff_Adlm_GN.xml
+++ b/common/main/ff_Adlm_GN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ff_Adlm_GW.xml b/common/main/ff_Adlm_GW.xml
similarity index 93%
rename from seed/main/ff_Adlm_GW.xml
rename to common/main/ff_Adlm_GW.xml
index 3027fbf..ac6673a 100644
--- a/seed/main/ff_Adlm_GW.xml
+++ b/common/main/ff_Adlm_GW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Adlm_LR.xml b/common/main/ff_Adlm_LR.xml
new file mode 100644
index 0000000..1d25771
--- /dev/null
+++ b/common/main/ff_Adlm_LR.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ff"/>
+ <script type="Adlm"/>
+ <territory type="LR"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <currencies>
+ <currency type="GNF">
+ <symbol>GNF</symbol>
+ </currency>
+ <currency type="LRD">
+ <symbol>$</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/common/main/ff_Adlm_MR.xml b/common/main/ff_Adlm_MR.xml
new file mode 100644
index 0000000..98b8d38
--- /dev/null
+++ b/common/main/ff_Adlm_MR.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ff"/>
+ <script type="Adlm"/>
+ <territory type="MR"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <currencies>
+ <currency type="GNF">
+ <symbol>GNF</symbol>
+ </currency>
+ <currency type="MRU">
+ <symbol>UM</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/seed/main/ff_Adlm_NE.xml b/common/main/ff_Adlm_NE.xml
similarity index 93%
rename from seed/main/ff_Adlm_NE.xml
rename to common/main/ff_Adlm_NE.xml
index 1268e57..5dd9949 100644
--- a/seed/main/ff_Adlm_NE.xml
+++ b/common/main/ff_Adlm_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ff_Adlm_NG.xml b/common/main/ff_Adlm_NG.xml
similarity index 93%
rename from seed/main/ff_Adlm_NG.xml
rename to common/main/ff_Adlm_NG.xml
index 9a1e42e..3cbba06 100644
--- a/seed/main/ff_Adlm_NG.xml
+++ b/common/main/ff_Adlm_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Adlm_SL.xml b/common/main/ff_Adlm_SL.xml
new file mode 100644
index 0000000..f6a1480
--- /dev/null
+++ b/common/main/ff_Adlm_SL.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ff"/>
+ <script type="Adlm"/>
+ <territory type="SL"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <currencies>
+ <currency type="GNF">
+ <symbol>GNF</symbol>
+ </currency>
+ <currency type="SLL">
+ <symbol>Le</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/seed/main/ff_Adlm_SN.xml b/common/main/ff_Adlm_SN.xml
similarity index 93%
rename from seed/main/ff_Adlm_SN.xml
rename to common/main/ff_Adlm_SN.xml
index eb65c51..ec57bfa 100644
--- a/seed/main/ff_Adlm_SN.xml
+++ b/common/main/ff_Adlm_SN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn.xml b/common/main/ff_Latn.xml
index ce19f68..75d70dd 100644
--- a/common/main/ff_Latn.xml
+++ b/common/main/ff_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_BF.xml b/common/main/ff_Latn_BF.xml
index f3f6a14..19cacfe 100644
--- a/common/main/ff_Latn_BF.xml
+++ b/common/main/ff_Latn_BF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_CM.xml b/common/main/ff_Latn_CM.xml
index 626bb42..c68a4f8 100644
--- a/common/main/ff_Latn_CM.xml
+++ b/common/main/ff_Latn_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_GH.xml b/common/main/ff_Latn_GH.xml
index 98c4618..a5cbf4d 100644
--- a/common/main/ff_Latn_GH.xml
+++ b/common/main/ff_Latn_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_GM.xml b/common/main/ff_Latn_GM.xml
index babac61..600c715 100644
--- a/common/main/ff_Latn_GM.xml
+++ b/common/main/ff_Latn_GM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_GN.xml b/common/main/ff_Latn_GN.xml
index b89ce79..fe8f0d3 100644
--- a/common/main/ff_Latn_GN.xml
+++ b/common/main/ff_Latn_GN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_GW.xml b/common/main/ff_Latn_GW.xml
index c95c020..148e2ea 100644
--- a/common/main/ff_Latn_GW.xml
+++ b/common/main/ff_Latn_GW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_LR.xml b/common/main/ff_Latn_LR.xml
index fb6ebc9..6e0fa39 100644
--- a/common/main/ff_Latn_LR.xml
+++ b/common/main/ff_Latn_LR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_MR.xml b/common/main/ff_Latn_MR.xml
index 00d3b15..303eded 100644
--- a/common/main/ff_Latn_MR.xml
+++ b/common/main/ff_Latn_MR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_NE.xml b/common/main/ff_Latn_NE.xml
index 5ec4205..443d835 100644
--- a/common/main/ff_Latn_NE.xml
+++ b/common/main/ff_Latn_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_NG.xml b/common/main/ff_Latn_NG.xml
index 6ca44d1..54e394b 100644
--- a/common/main/ff_Latn_NG.xml
+++ b/common/main/ff_Latn_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_SL.xml b/common/main/ff_Latn_SL.xml
index e490309..68034d4 100644
--- a/common/main/ff_Latn_SL.xml
+++ b/common/main/ff_Latn_SL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ff_Latn_SN.xml b/common/main/ff_Latn_SN.xml
index 707e926..f4a3587 100644
--- a/common/main/ff_Latn_SN.xml
+++ b/common/main/ff_Latn_SN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fi.xml b/common/main/fi.xml
index 57add08..8ac93c7 100644
--- a/common/main/fi.xml
+++ b/common/main/fi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="chr">cherokee</language>
<language type="chy">cheyenne</language>
<language type="ckb">sorani</language>
+ <language type="ckb" alt="menu">kurdi – soranî</language>
<language type="co">korsika</language>
<language type="cop">kopti</language>
<language type="cps">capiznon</language>
@@ -184,6 +185,7 @@
<language type="ext">extremadura</language>
<language type="fa">persia</language>
<language type="fa" alt="secondary">persia</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulani</language>
@@ -655,6 +657,7 @@
<script type="Ahom">ahom</script>
<script type="Arab">arabialainen</script>
<script type="Arab" alt="variant">persialaisarabialainen</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">valtakunnanaramealainen</script>
<script type="Armn">armenialainen</script>
<script type="Avst">avestalainen</script>
@@ -675,12 +678,14 @@
<script type="Cari">kaarialainen</script>
<script type="Cham">tšamilainen</script>
<script type="Cher">cherokeelainen</script>
+ <script type="Chrs">horemzi</script>
<script type="Cirt">cirth</script>
<script type="Copt">koptilainen</script>
<script type="Cprt">muinaiskyproslainen</script>
<script type="Cyrl">kyrillinen</script>
<script type="Cyrs">kyrillinen muinaiskirkkoslaavimuunnelma</script>
<script type="Deva">devanagari</script>
+ <script type="Diak">dives akuru</script>
<script type="Dogr" draft="contributed">dogri</script>
<script type="Dsrt">deseret</script>
<script type="Dupl">Duployén pikakirjoitus</script>
@@ -696,8 +701,8 @@
<script type="Geor">georgialainen</script>
<script type="Geor" alt="secondary">mkhedruli</script>
<script type="Glag">glagoliittinen</script>
- <script type="Gong" draft="provisional">gondin gunjala</script>
- <script type="Gonm" draft="contributed">masaram-gondi</script>
+ <script type="Gong" draft="contributed">gondin gunjala</script>
+ <script type="Gonm">masaram-gondi</script>
<script type="Goth">goottilainen</script>
<script type="Gran">grantha</script>
<script type="Grek">kreikkalainen</script>
@@ -716,7 +721,7 @@
<script type="Hira">hiragana</script>
<script type="Hluw">anatolialaiset hieroglyfit</script>
<script type="Hmng">pahawh hmong</script>
- <script type="Hmnp" draft="provisional">hmongin nyiakeng puachue</script>
+ <script type="Hmnp" draft="contributed">hmongin nyiakeng puachue</script>
<script type="Hrkt">japanin tavumerkistöt</script>
<script type="Hung">muinaisunkarilainen</script>
<script type="Inds">induslainen</script>
@@ -730,6 +735,7 @@
<script type="Khar">kharosthi</script>
<script type="Khmr">khmeriläinen</script>
<script type="Khoj">khojki</script>
+ <script type="Kits">kitaanin pieni merkistö</script>
<script type="Knda">kannadalainen</script>
<script type="Kore">korealainen</script>
<script type="Kpel">kpelle</script>
@@ -838,6 +844,7 @@
<script type="Wole">woleai</script>
<script type="Xpeo">muinaispersialainen</script>
<script type="Xsux">sumerilais-akkadilainen nuolenpääkirjoitus</script>
+ <script type="Yezi" draft="contributed">jesidi</script>
<script type="Yiii">yiläinen</script>
<script type="Zanb">zanabazar-neliökirjaimisto</script>
<script type="Zinh">peritty</script>
@@ -1147,8 +1154,8 @@
<territory type="VU">Vanuatu</territory>
<territory type="WF">Wallis ja Futuna</territory>
<territory type="WS">Samoa</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">pseudoaksentit</territory>
+ <territory type="XB">kaksisuuntainen pseudo</territory>
<territory type="XK">Kosovo</territory>
<territory type="YE">Jemen</territory>
<territory type="YT">Mayotte</territory>
@@ -1188,6 +1195,7 @@
<variant type="BISKE">sloveenin resian San Giorgion/Bilan alamurre</variant>
<variant type="BOHORIC">sloveenin Bohorič-aakkosto</variant>
<variant type="BOONT">englannin boontling-murre</variant>
+ <variant type="BORNHOLM">Bornholmin murre</variant>
<variant type="CISAUP" draft="contributed">oksitaanin luoteisitalialainen variantti</variant>
<variant type="COLB1945">portugalin oikeinkirjoitus 1945</variant>
<variant type="CORNU">englannin cornu-murre</variant>
@@ -1218,6 +1226,7 @@
<variant type="KSCOR">kornin Kernowek-ortografia</variant>
<variant type="LAUKIKA">klassinen sanskriitti</variant>
<variant type="LEMOSIN" draft="contributed">oksitaanin Limousin-alueen variantti</variant>
+ <variant type="LENGADOC" draft="contributed">oksitaanin lengadocian variantti</variant>
<variant type="LIPAW">sloveenin resian Lipovazin/Lipovecin alamurre</variant>
<variant type="LUNA1918">venäjän ortografia 1918</variant>
<variant type="METELKO">sloveenin Metelko-aakkosto</variant>
@@ -1225,6 +1234,7 @@
<variant type="NDYUKA">ndyukan kreolimurre</variant>
<variant type="NEDIS">sloveenin natisonen murre</variant>
<variant type="NEWFOUND">englannin newfoundlandilaismurre</variant>
+ <variant type="NICARD" draft="contributed">oksitaanin Nizzan variantti</variant>
<variant type="NJIVA">sloveenin resian Gnivan/Njivan alamurre</variant>
<variant type="NULIK">nykyvolapük</variant>
<variant type="OSOJS">sloveenin resian Oseaccon/Osojanen alamurre</variant>
@@ -1237,6 +1247,7 @@
<variant type="PINYIN">kiinan pinyin-latinaistus</variant>
<variant type="POLYTON">polytoninen kreikka</variant>
<variant type="POSIX">tietokonemäärittely POSIX</variant>
+ <variant type="PROVENC">provensaali</variant>
<variant type="PUTER">retoromaanin puter-muoto</variant>
<variant type="REVISED">uudistettu oikeinkirjoitus</variant>
<variant type="RIGIK">klassinen volapük</variant>
@@ -1260,6 +1271,7 @@
<variant type="VAIDIKA">sanskriitin veda-murre</variant>
<variant type="VALENCIA">katalaanin valencian murre</variant>
<variant type="VALLADER">reoromaanin vallader-muoto</variant>
+ <variant type="VIVARAUP" draft="contributed">oksitaanin vivaro-alpiininen variantti</variant>
<variant type="WADEGILE">kiinan Wade-Giles-latinaistus</variant>
<variant type="XSISTEMO">esperanton x-kirjoitus</variant>
</variants>
@@ -1367,11 +1379,12 @@
<type key="numbers" type="cham">cham-numerot</type>
<type key="numbers" type="cyrl">kyrilliset numerot</type>
<type key="numbers" type="deva">devanagarinumerot</type>
+ <type key="numbers" type="diak">dives akuru -numerot</type>
<type key="numbers" type="ethi">etiopialaiset numerot</type>
<type key="numbers" type="finance">talousnumerot</type>
<type key="numbers" type="fullwide">ideografin levyiset numerot</type>
<type key="numbers" type="geor">georgialaiset numerot</type>
- <type key="numbers" type="gong" draft="provisional">gondin gunjala-numerot</type>
+ <type key="numbers" type="gong" draft="contributed">gondin gunjala-numerot</type>
<type key="numbers" type="gonm" draft="contributed">gondin masaram-numerot</type>
<type key="numbers" type="grek">kreikkalaiset numerot</type>
<type key="numbers" type="greklow">kreikkalaiset piennumerot</type>
@@ -1384,7 +1397,7 @@
<type key="numbers" type="hantfin">perinteiset kiinalaiset talousnumerot</type>
<type key="numbers" type="hebr">heprealaiset numerot</type>
<type key="numbers" type="hmng">pahawh hmong -numerot</type>
- <type key="numbers" type="hmnp" draft="provisional">hmongin nyiakeng puachue -numerot</type>
+ <type key="numbers" type="hmnp" draft="contributed">hmongin nyiakeng puachue -numerot</type>
<type key="numbers" type="java">jaavalaiset numerot</type>
<type key="numbers" type="jpan">japanilaiset numerot</type>
<type key="numbers" type="jpanfin">japanilaiset talousnumerot</type>
@@ -1415,6 +1428,7 @@
<type key="numbers" type="olck">ol chiki -numerot</type>
<type key="numbers" type="orya">orijalaiset numerot</type>
<type key="numbers" type="osma">osmanjalaiset numerot</type>
+ <type key="numbers" type="rohg">hanifilaisen rohingyan numerot</type>
<type key="numbers" type="roman">roomalaiset numerot</type>
<type key="numbers" type="romanlow">roomalaiset piennumerot</type>
<type key="numbers" type="saur">saurashtra-numerot</type>
@@ -1534,14 +1548,38 @@
</dateFormatLength>
</dateFormats>
<dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
<availableFormats>
+ <dateFormatItem id="d" draft="contributed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="Ed">E d.</dateFormatItem>
<dateFormatItem id="Gy">y G</dateFormatItem>
<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
+ <dateFormatItem id="M" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="Md">d.M.</dateFormatItem>
<dateFormatItem id="MEd">E d.M.</dateFormatItem>
+ <dateFormatItem id="MMM" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
<dateFormatItem id="MMMEd">ccc d. MMM</dateFormatItem>
<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
@@ -1882,6 +1920,23 @@
<greatestDifference id="M">E d.M. – E d.M.y G</greatestDifference>
<greatestDifference id="y">E d.M.y – E d.M.y G</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="GyMMMM">
+ <greatestDifference id="G">LLLL y G – LLLL y G</greatestDifference>
+ <greatestDifference id="M">LLLL–LLLL y G</greatestDifference>
+ <greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMMd">
+ <greatestDifference id="d">d.–d. MMMM y G</greatestDifference>
+ <greatestDifference id="G">d. MMMM y G – d. MMMM y G</greatestDifference>
+ <greatestDifference id="M">d. MMMM – d. MMMM y G</greatestDifference>
+ <greatestDifference id="y">d. MMMM y – d. MMMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMMEd">
+ <greatestDifference id="d">E d. – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="G">E d. MMMM y G – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="M">E d. MMMM – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="y">E d. MMMM y – E d. MMMM y G</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">h a – h a</greatestDifference>
<greatestDifference id="h">h–h a</greatestDifference>
@@ -2441,9 +2496,9 @@
<greatestDifference id="y">E d.M.y – E d.M.y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
- <greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
- <greatestDifference id="M">MMM–MMM y G</greatestDifference>
- <greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+ <greatestDifference id="G">M.y G – M.y G</greatestDifference>
+ <greatestDifference id="M">M.–M.y G</greatestDifference>
+ <greatestDifference id="y">M.y–M.y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMd">
<greatestDifference id="d">d.–d.M.y G</greatestDifference>
@@ -2457,6 +2512,23 @@
<greatestDifference id="M">E d.M. – E d.M.y G</greatestDifference>
<greatestDifference id="y">E d.M.y – E d.M.y G</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="GyMMMM">
+ <greatestDifference id="G">LLLL y G – LLLL y G</greatestDifference>
+ <greatestDifference id="M">LLLL–LLLL y G</greatestDifference>
+ <greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMMd">
+ <greatestDifference id="d">d.–d. MMMM y G</greatestDifference>
+ <greatestDifference id="G">d. MMMM y G – d. MMMM y G</greatestDifference>
+ <greatestDifference id="M">d. MMMM – d. MMMM y G</greatestDifference>
+ <greatestDifference id="y">d. MMMM y – d. MMMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMMEd">
+ <greatestDifference id="d">E d. – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="G">E d. MMMM y G – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="M">E d. MMMM – E d. MMMM y G</greatestDifference>
+ <greatestDifference id="y">E d. MMMM y – E d. MMMM y G</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">h a – h a</greatestDifference>
<greatestDifference id="h">h–h a</greatestDifference>
@@ -5551,7 +5623,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkinsaaren aika</standard>
+ <generic draft="contributed">Norfolkinsaaren aika</generic>
+ <standard draft="contributed">Norfolkinsaaren normaaliaika</standard>
+ <daylight draft="contributed">Norfolkinsaaren kesäaika</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7900,9 +7974,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>sentti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>tsepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hehto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>tsetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>neliö{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">neliö{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">neliö{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kuutio{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kuutio{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kuutio{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7911,7 +8055,7 @@
<unitPattern count="one">{0} G-voima</unitPattern>
<unitPattern count="other">{0} G-voimaa</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrit per sekunti toiseen</displayName>
<unitPattern count="one">{0} metri per sekunti toiseen</unitPattern>
<unitPattern count="other">{0} metriä per sekunti toiseen</unitPattern>
@@ -8011,7 +8155,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8041,7 +8185,7 @@
<unitPattern count="one">{0} litra / kilometri</unitPattern>
<unitPattern count="other">{0} litraa / kilometri</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litrat / 100 kilometriä</displayName>
<unitPattern count="one">{0} litra / 100 km</unitPattern>
<unitPattern count="other">{0} litraa / 100 km</unitPattern>
@@ -8532,17 +8676,17 @@
<unitPattern count="one">{0} hevosvoima</unitPattern>
<unitPattern count="other">{0} hevosvoimaa</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>elohopeamillimetrit</displayName>
<unitPattern count="one">{0} millimetri elohopeaa</unitPattern>
<unitPattern count="other">{0} millimetriä elohopeaa</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>paunat / neliötuuma</displayName>
<unitPattern count="one">{0} pauna / neliötuuma</unitPattern>
<unitPattern count="other">{0} paunaa / neliötuuma</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>elohopeatuumat</displayName>
<unitPattern count="one">{0} tuuma elohopeaa</unitPattern>
<unitPattern count="other">{0} tuumaa elohopeaa</unitPattern>
@@ -8622,7 +8766,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelviniä</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pauna-jalat</displayName>
<unitPattern count="one">{0} pauna-jalka</unitPattern>
<unitPattern count="other">{0} pauna-jalkaa</unitPattern>
@@ -8781,9 +8925,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8792,7 +9006,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8892,7 +9106,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8922,7 +9136,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -9413,17 +9627,17 @@
<unitPattern count="one">{0} hv</unitPattern>
<unitPattern count="other">{0} hv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9503,7 +9717,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -9662,9 +9876,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9673,7 +9957,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="other">{0}m/s²</unitPattern>
@@ -9773,7 +10057,7 @@
<unitPattern count="one">{0}mmol/l</unitPattern>
<unitPattern count="other">{0}mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0}ppm</unitPattern>
<unitPattern count="other">{0}ppm</unitPattern>
@@ -9803,7 +10087,7 @@
<unitPattern count="one">{0}l/km</unitPattern>
<unitPattern count="other">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
@@ -10294,17 +10578,17 @@
<unitPattern count="one">{0}hv</unitPattern>
<unitPattern count="other">{0}hv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0}″ Hg</unitPattern>
<unitPattern count="other">{0}″ Hg</unitPattern>
@@ -10384,15 +10668,15 @@
<unitPattern count="one">{0}K</unitPattern>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="torque-newton-meter">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">{0}Nm</unitPattern>
- <unitPattern count="other" draft="provisional">{0}Nm</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">{0}Nm</unitPattern>
+ <unitPattern count="other" draft="contributed">{0}Nm</unitPattern>
</unit>
<unit type="volume-cubic-kilometer">
<displayName>km³</displayName>
diff --git a/common/main/fi_FI.xml b/common/main/fi_FI.xml
index 91e8016..c09f990 100644
--- a/common/main/fi_FI.xml
+++ b/common/main/fi_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fil.xml b/common/main/fil.xml
index 459e1ed..e7dee08 100644
--- a/common/main/fil.xml
+++ b/common/main/fil.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -120,6 +120,7 @@
<language type="eu">Basque</language>
<language type="ewo">Ewondo</language>
<language type="fa">Persian</language>
+ <language type="fa_AF">Dari</language>
<language type="ff">Fulah</language>
<language type="fi">Finnish</language>
<language type="fil">Filipino</language>
@@ -449,7 +450,7 @@
<script type="Grek">Greek</script>
<script type="Gujr">Gujarati</script>
<script type="Guru">Gurmukhi</script>
- <script type="Hanb">Hanb</script>
+ <script type="Hanb">Han na may Bopomofo</script>
<script type="Hang">Hangul</script>
<script type="Hani">Han</script>
<script type="Hans">Pinasimple</script>
@@ -6430,7 +6431,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Oras sa Norfolk Island</standard>
+ <generic draft="contributed">Oras sa Norfolk Island</generic>
+ <standard draft="contributed">Standard na Norfolk Island</standard>
+ <daylight draft="contributed">Daylight Time sa Norfolk Island</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6717,6 +6720,9 @@
<nan>NaN</nan>
<timeSeparator draft="contributed">:</timeSeparator>
</symbols>
+ <symbols numberSystem="sora">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
<decimalFormats numberSystem="latn">
<decimalFormatLength>
<decimalFormat>
@@ -7942,9 +7948,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} kada {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kuwadrado</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kuwadrado</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cubic na {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cubic {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7953,7 +8029,7 @@
<unitPattern count="one">{0} g-force</unitPattern>
<unitPattern count="other">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metro kada segundo kwadrado</displayName>
<unitPattern count="one">{0} metro kada segundo kwadrado</unitPattern>
<unitPattern count="other">{0} na metro kada segundo kwadrado</unitPattern>
@@ -8053,7 +8129,7 @@
<unitPattern count="one">{0} millimole per liter</unitPattern>
<unitPattern count="other">{0} millimoles per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts per million</displayName>
<unitPattern count="one">{0} part per million</unitPattern>
<unitPattern count="other">{0} parts per million</unitPattern>
@@ -8083,7 +8159,7 @@
<unitPattern count="one">{0} litro kada kilometro</unitPattern>
<unitPattern count="other">{0} litro kada kilometro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litro kada 100 kilometro</displayName>
<unitPattern count="one">{0} litro kada 100 kilometro</unitPattern>
<unitPattern count="other">{0} na litro kada 100 kilometer</unitPattern>
@@ -8159,7 +8235,7 @@
<unitPattern count="other">{0} siglo</unitPattern>
</unit>
<unit type="duration-decade">
- <displayName draft="provisional">dekada</displayName>
+ <displayName draft="contributed">dekada</displayName>
<unitPattern count="one">{0} dekada</unitPattern>
<unitPattern count="other">{0} dekada</unitPattern>
</unit>
@@ -8281,7 +8357,7 @@
<unitPattern count="other">{0} British thermal unit</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">↑↑↑</displayName>
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -8321,7 +8397,7 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel">
- <displayName draft="provisional">mga pixel</displayName>
+ <displayName draft="contributed">mga pixel</displayName>
<unitPattern count="one">{0} pixel</unitPattern>
<unitPattern count="other">{0} pixel</unitPattern>
</unit>
@@ -8331,12 +8407,12 @@
<unitPattern count="other">{0} megapixels</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
- <displayName draft="provisional">mga pixel bawat sentimetro</displayName>
+ <displayName draft="contributed">mga pixel bawat sentimetro</displayName>
<unitPattern count="one">{0} pixel bawat sentimetro</unitPattern>
<unitPattern count="other">{0} pixel bawat sentimetro</unitPattern>
</unit>
<unit type="graphics-pixel-per-inch">
- <displayName draft="provisional">mga pixel bawat pulgada</displayName>
+ <displayName draft="contributed">mga pixel bawat pulgada</displayName>
<unitPattern count="one">{0} pixel bawat pulgada</unitPattern>
<unitPattern count="other">{0} pixel bawat pulgada</unitPattern>
</unit>
@@ -8574,23 +8650,23 @@
<unitPattern count="one">{0} horsepower</unitPattern>
<unitPattern count="other">{0} horsepower</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetro ng asoge</displayName>
<unitPattern count="one">{0} millimetro ng mercury</unitPattern>
<unitPattern count="other">{0} na milimetro ng asoge</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libra kada pulgadang parisukat</displayName>
<unitPattern count="one">{0} libra kada pulgadang parisukat</unitPattern>
<unitPattern count="other">{0} na libra kada pulgadang parisukat</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pulgada ng asoge</displayName>
<unitPattern count="one">{0} pulgada ng asoge</unitPattern>
<unitPattern count="other">{0} na pulgada ng asoge</unitPattern>
</unit>
<unit type="pressure-bar">
- <displayName draft="provisional">↑↑↑</displayName>
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -8605,7 +8681,7 @@
<unitPattern count="other">{0} atmospheres</unitPattern>
</unit>
<unit type="pressure-pascal">
- <displayName draft="provisional">↑↑↑</displayName>
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one">{0} pascal</unitPattern>
<unitPattern count="other">{0} pascals</unitPattern>
</unit>
@@ -8664,9 +8740,9 @@
<unitPattern count="one">{0} degree kelvin</unitPattern>
<unitPattern count="other">{0} degrees kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound-feet</displayName>
- <unitPattern count="one">{0} pound-foot</unitPattern>
+ <unitPattern count="one">{0} pound-force-foot</unitPattern>
<unitPattern count="other">{0} pound-feet</unitPattern>
</unit>
<unit type="torque-newton-meter">
@@ -8765,9 +8841,9 @@
</unit>
<unit type="volume-gallon-imperial">
<displayName>Imp. gal</displayName>
- <unitPattern count="one" draft="provisional">{0} gal Imp.</unitPattern>
- <unitPattern count="other" draft="provisional">{0} gal Imp.</unitPattern>
- <perUnitPattern draft="provisional">{0} kada Imp. galon</perUnitPattern>
+ <unitPattern count="one">{0} gal Imp.</unitPattern>
+ <unitPattern count="other">{0} gal Imp.</unitPattern>
+ <perUnitPattern draft="contributed">{0} kada Imp. galon</perUnitPattern>
</unit>
<unit type="volume-quart">
<displayName>quarts</displayName>
@@ -8805,7 +8881,7 @@
<unitPattern count="other">{0} na kutsarita</unitPattern>
</unit>
<unit type="volume-barrel">
- <displayName draft="contributed">bariles</displayName>
+ <displayName>bariles</displayName>
<unitPattern count="one">{0} bariles</unitPattern>
<unitPattern count="other">{0} bariles</unitPattern>
</unit>
@@ -8818,9 +8894,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8829,7 +8975,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metro/segundo²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8929,7 +9075,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts/million</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8959,7 +9105,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} na L/100km</unitPattern>
<unitPattern count="other">{0} na L/100km</unitPattern>
@@ -8970,7 +9116,7 @@
<unitPattern count="other">{0} na mpg</unitPattern>
</unit>
<unit type="consumption-mile-per-gallon-imperial">
- <displayName draft="provisional">milya/gal Imp.</displayName>
+ <displayName draft="contributed">milya/gal Imp.</displayName>
<unitPattern count="one">{0} mpg Imp.</unitPattern>
<unitPattern count="other">{0} mpg Imp.</unitPattern>
</unit>
@@ -9035,9 +9181,9 @@
<unitPattern count="other">{0} siglo</unitPattern>
</unit>
<unit type="duration-decade">
- <displayName draft="provisional">dec</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} dec</unitPattern>
+ <displayName draft="contributed">dec</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} dec</unitPattern>
</unit>
<unit type="duration-year">
<displayName>taon</displayName>
@@ -9197,7 +9343,7 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel">
- <displayName draft="provisional">mga pixel</displayName>
+ <displayName draft="contributed">mga pixel</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9450,17 +9596,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetro ng asoge</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9540,7 +9686,7 @@
<unitPattern count="one">{0}°K</unitPattern>
<unitPattern count="other">{0}°K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -9694,9 +9840,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9705,7 +9921,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
@@ -9746,7 +9962,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -9974,17 +10190,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″ Hg</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
@@ -10252,7 +10468,6 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
@@ -10262,8 +10477,6 @@
<styleName type="wdth" subtype="112.5" alt="extended">semiextended</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">semiwide</styleName>
<styleName type="wdth" subtype="125">expanded</styleName>
- <styleName type="wdth" subtype="125" alt="extended">extended</styleName>
- <styleName type="wdth" subtype="125" alt="wide">wide</styleName>
<styleName type="wdth" subtype="150">extra-expanded</styleName>
<styleName type="wdth" subtype="150" alt="extended">extra-extended</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra-wide</styleName>
@@ -10283,10 +10496,7 @@
<styleName type="wght" subtype="700">bold</styleName>
<styleName type="wght" subtype="800">extra-bold</styleName>
<styleName type="wght" subtype="900">black</styleName>
- <styleName type="wght" subtype="900" alt="heavy">heavy</styleName>
<styleName type="wght" subtype="950">extra-black</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">ultrablack</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">ultraheavy</styleName>
<featureName type="afrc">vertical fractions</featureName>
<featureName type="cpsp">capital spacing</featureName>
<featureName type="dlig">optional ligatures</featureName>
diff --git a/common/main/fil_PH.xml b/common/main/fil_PH.xml
index 75a7f9c..05f0e6f 100644
--- a/common/main/fil_PH.xml
+++ b/common/main/fil_PH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fo.xml b/common/main/fo.xml
index fe5d0a7..a93ef82 100644
--- a/common/main/fo.xml
+++ b/common/main/fo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -320,7 +320,6 @@
<language type="ro">rumenskt</language>
<language type="ro_MD">moldaviskt</language>
<language type="rof">rombo</language>
- <language type="root">root</language>
<language type="ru">russiskt</language>
<language type="rup">aromenskt</language>
<language type="rw">kinyarwanda</language>
@@ -4269,7 +4268,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolksoyggj tíð</standard>
+ <generic draft="contributed">Norfolksoyggj tíð</generic>
+ <standard draft="contributed">Norfolksoyggj vanlig tíð</standard>
+ <daylight draft="contributed">Norfolksoyggj summartíð</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5767,7 +5768,7 @@
<unitPattern count="one">{0} G-kraft</unitPattern>
<unitPattern count="other">{0} G-kreftir</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrar um sekundi²</displayName>
<unitPattern count="one">{0} metur um sekundi²</unitPattern>
<unitPattern count="other">{0} metrar um sekundi²</unitPattern>
@@ -5867,7 +5868,7 @@
<unitPattern count="one">{0} millimol fyri hvønn litur</unitPattern>
<unitPattern count="other">{0} millimol fyri hvønn litur</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partar fyri hvørja millión</displayName>
<unitPattern count="one">{0} partur fyri hvørja millión</unitPattern>
<unitPattern count="other">{0} partar fyri hvørja millión</unitPattern>
@@ -5897,7 +5898,7 @@
<unitPattern count="one">{0} litur fyri hvønn kilometrar</unitPattern>
<unitPattern count="other">{0} litrar fyri hvønn kilometrar</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litrar fyri hvørjar 100 kilometrar</displayName>
<unitPattern count="one">{0} litur fyri hvørjar 100 kilometrar</unitPattern>
<unitPattern count="other">{0} litrar fyri hvørjar 100 kilometrar</unitPattern>
@@ -6373,17 +6374,17 @@
<unitPattern count="one">{0} hestakraft</unitPattern>
<unitPattern count="other">{0} hestakreftur</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetrar av kviksilvur</displayName>
<unitPattern count="one">{0} millimetur av kviksilvur</unitPattern>
<unitPattern count="other">{0} millimetrar av kviksilvur</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tummar av kviksilvur</displayName>
<unitPattern count="one">{0} tummi av kviksilvur</unitPattern>
<unitPattern count="other">{0} tummar av kviksilvur</unitPattern>
@@ -6463,7 +6464,7 @@
<unitPattern count="one">{0} Kelvin</unitPattern>
<unitPattern count="other">{0} Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pund føtur</displayName>
<unitPattern count="one">{0} pund fótur</unitPattern>
<unitPattern count="other">{0} pund føtur</unitPattern>
@@ -6628,7 +6629,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6728,7 +6729,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partar/millión</displayName>
<unitPattern count="one">{0} partur/mill.</unitPattern>
<unitPattern count="other">{0} partar/mill.</unitPattern>
@@ -6758,7 +6759,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7234,17 +7235,17 @@
<unitPattern count="one">{0} hk</unitPattern>
<unitPattern count="other">{0} hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7324,7 +7325,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7522,7 +7523,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">ppm</displayName>
<unitPattern count="one" draft="unconfirmed">{0} ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} ppm</unitPattern>
@@ -7532,7 +7533,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
diff --git a/common/main/fo_DK.xml b/common/main/fo_DK.xml
index 7abb55c..2f45e1e 100644
--- a/common/main/fo_DK.xml
+++ b/common/main/fo_DK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fo_FO.xml b/common/main/fo_FO.xml
index e7965f6..610f7b5 100644
--- a/common/main/fo_FO.xml
+++ b/common/main/fo_FO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr.xml b/common/main/fr.xml
index 839f6ad..04cd285 100644
--- a/common/main/fr.xml
+++ b/common/main/fr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="chr">cherokee</language>
<language type="chy">cheyenne</language>
<language type="ckb">sorani</language>
+ <language type="ckb" alt="menu">kurde sorani</language>
<language type="co">corse</language>
<language type="cop">copte</language>
<language type="cps">capiznon</language>
@@ -182,6 +183,7 @@
<language type="ewo">éwondo</language>
<language type="ext">estrémègne</language>
<language type="fa">persan</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">peul</language>
@@ -653,6 +655,7 @@
<script type="Ahom" draft="unconfirmed">ahom</script>
<script type="Arab">arabe</script>
<script type="Arab" alt="variant">arabo-persan</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">araméen impérial</script>
<script type="Armn">arménien</script>
<script type="Avst">avestique</script>
@@ -786,6 +789,7 @@
<script type="Phnx">phénicien</script>
<script type="Plrd">phonétique de Pollard</script>
<script type="Prti">parthe des inscriptions</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Rohg" draft="unconfirmed">hanifi</script>
<script type="Roro">rongorongo</script>
@@ -7209,7 +7213,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>heure de l’île Norfolk</standard>
+ <generic draft="contributed">heure de l’île Norfolk</generic>
+ <standard draft="contributed">heure normale de l’île Norfolk</standard>
+ <daylight draft="contributed">heure d’été de l’île Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -9719,9 +9725,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>déci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>déca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>méga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>téra{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>péta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} par {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} carré</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cube</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9730,7 +9806,7 @@
<unitPattern count="one">{0} fois l’accélération de pesanteur terrestre</unitPattern>
<unitPattern count="other">{0} fois l’accélération de pesanteur terrestre</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mètres par seconde carrée</displayName>
<unitPattern count="one">{0} mètre par seconde carrée</unitPattern>
<unitPattern count="other">{0} mètres par seconde carrée</unitPattern>
@@ -9830,7 +9906,7 @@
<unitPattern count="one">{0} millimole par litre</unitPattern>
<unitPattern count="other">{0} millimoles par litre</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parts par million</displayName>
<unitPattern count="one">{0} part par million</unitPattern>
<unitPattern count="other">{0} parts par million</unitPattern>
@@ -9860,7 +9936,7 @@
<unitPattern count="one">{0} litre au kilomètre</unitPattern>
<unitPattern count="other">{0} litres au kilomètre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litres aux 100 km</displayName>
<unitPattern count="one">{0} litre aux 100 km</unitPattern>
<unitPattern count="other">{0} litres aux 100 km</unitPattern>
@@ -10351,17 +10427,17 @@
<unitPattern count="one">{0} cheval-vapeur</unitPattern>
<unitPattern count="other">{0} chevaux-vapeur</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimètres de mercure</displayName>
<unitPattern count="one">{0} millimètre de mercure</unitPattern>
<unitPattern count="other">{0} millimètres de mercure</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>livres par pouce carré</displayName>
<unitPattern count="one">{0} livre par pouce carré</unitPattern>
<unitPattern count="other">{0} livres par pouce carré</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pouces de mercure</displayName>
<unitPattern count="one">{0} pouce de mercure</unitPattern>
<unitPattern count="other">{0} pouces de mercure</unitPattern>
@@ -10441,7 +10517,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>livres-pieds</displayName>
<unitPattern count="one">{0} livre-pied</unitPattern>
<unitPattern count="other">{0} livres-pieds</unitPattern>
@@ -10600,9 +10676,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -10611,7 +10757,7 @@
<unitPattern count="one">{0} force g</unitPattern>
<unitPattern count="other">{0} force g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -10711,7 +10857,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -10741,7 +10887,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -11232,17 +11378,17 @@
<unitPattern count="one">{0} ch</unitPattern>
<unitPattern count="other">{0} ch</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb/po²</displayName>
<unitPattern count="one">{0} lb/po²</unitPattern>
<unitPattern count="other">{0} lb/po²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -11322,7 +11468,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -11481,9 +11627,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -11492,7 +11708,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
</unit>
<unit type="angle-revolution">
@@ -11590,7 +11806,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/l</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">ppm</displayName>
<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
@@ -11620,7 +11836,7 @@
<unitPattern count="one" draft="unconfirmed">{0}l/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
@@ -12039,17 +12255,17 @@
<unitPattern count="one">{0}ch</unitPattern>
<unitPattern count="other">{0}ch</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">lb/po²</displayName>
<unitPattern count="one" draft="contributed">{0} lb/po²</unitPattern>
<unitPattern count="other" draft="contributed">{0} lb/po²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″Hg</displayName>
<unitPattern count="one">{0}″ Hg</unitPattern>
<unitPattern count="other">{0}″ Hg</unitPattern>
@@ -12115,7 +12331,7 @@
<unit type="temperature-kelvin">
<displayName draft="contributed">K</displayName>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">lbf⋅ft</displayName>
<unitPattern count="one" draft="unconfirmed">{0}lbf⋅ft</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}lbf⋅ft</unitPattern>
diff --git a/common/main/fr_BE.xml b/common/main/fr_BE.xml
index d2e651d..fe69d44 100644
--- a/common/main/fr_BE.xml
+++ b/common/main/fr_BE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_BF.xml b/common/main/fr_BF.xml
index faa1341..ceec4fc 100644
--- a/common/main/fr_BF.xml
+++ b/common/main/fr_BF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_BI.xml b/common/main/fr_BI.xml
index 672316a..9377e8a 100644
--- a/common/main/fr_BI.xml
+++ b/common/main/fr_BI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_BJ.xml b/common/main/fr_BJ.xml
index a3abd20..e0681fc 100644
--- a/common/main/fr_BJ.xml
+++ b/common/main/fr_BJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_BL.xml b/common/main/fr_BL.xml
index 5bd7abb..56b8a5b 100644
--- a/common/main/fr_BL.xml
+++ b/common/main/fr_BL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CA.xml b/common/main/fr_CA.xml
index ad07286..b86bbea 100644
--- a/common/main/fr_CA.xml
+++ b/common/main/fr_CA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -121,6 +121,7 @@
<language type="chr">cherokee</language>
<language type="chy">↑↑↑</language>
<language type="ckb">kurde central</language>
+ <language type="ckb" alt="menu">sorani</language>
<language type="co">corse</language>
<language type="cop">↑↑↑</language>
<language type="cps">↑↑↑</language>
@@ -181,6 +182,7 @@
<language type="ewo">ewondo</language>
<language type="ext">↑↑↑</language>
<language type="fa">persan</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">fang</language>
<language type="fat">↑↑↑</language>
<language type="ff">peul</language>
@@ -680,6 +682,7 @@
<script type="Mlym">↑↑↑</script>
<script type="Mong">mongol</script>
<script type="Mymr">birman</script>
+ <script type="Olck" draft="contributed">ol chiki</script>
<script type="Orya">odia</script>
<script type="Sinh">↑↑↑</script>
<script type="Taml">tamoul</script>
@@ -5315,7 +5318,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>heure de l’île Norfolk</standard>
+ <generic draft="contributed">heure de l’île Norfolk</generic>
+ <standard draft="contributed">heure normale de l’île Norfolk</standard>
+ <daylight draft="contributed">heure avancée de l’île Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6795,9 +6800,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} cubes</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cube</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cubes</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6806,7 +6881,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mètres par seconde carrée</displayName>
<unitPattern count="one">{0} mètre par seconde carrée</unitPattern>
<unitPattern count="other">{0} mètres par seconde carrée</unitPattern>
@@ -6906,7 +6981,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parties par million</displayName>
<unitPattern count="one">{0} partie par million</unitPattern>
<unitPattern count="other">{0} parties par million</unitPattern>
@@ -6936,7 +7011,7 @@
<unitPattern count="one">{0} litre au kilomètre</unitPattern>
<unitPattern count="other">{0} litres au kilomètre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litres aux 100 kilomètres</displayName>
<unitPattern count="one">{0} litre aux 100 kilomètres</unitPattern>
<unitPattern count="other">{0} litres aux 100 kilomètres</unitPattern>
@@ -7417,17 +7492,17 @@
<unitPattern count="one">{0} cheval-vapeur</unitPattern>
<unitPattern count="other">{0} chevaux-vapeur</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pouces de mercure</displayName>
<unitPattern count="one">{0} pouce de mercure</unitPattern>
<unitPattern count="other">{0} pouces de mercure</unitPattern>
@@ -7507,7 +7582,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7661,9 +7736,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7672,7 +7817,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7772,7 +7917,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7802,7 +7947,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -8283,17 +8428,17 @@
<unitPattern count="one">{0} ch</unitPattern>
<unitPattern count="other">{0} ch</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>po Hg</displayName>
<unitPattern count="one">{0} po Hg</unitPattern>
<unitPattern count="other">{0} po Hg</unitPattern>
@@ -8373,7 +8518,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lb-pi</displayName>
<unitPattern count="one">{0} lb-pi</unitPattern>
<unitPattern count="other">{0} lb-pi</unitPattern>
@@ -8527,9 +8672,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8538,7 +8753,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
@@ -8548,7 +8763,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -8769,17 +8984,17 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/fr_CD.xml b/common/main/fr_CD.xml
index b1dd1a3..b982dbf 100644
--- a/common/main/fr_CD.xml
+++ b/common/main/fr_CD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CF.xml b/common/main/fr_CF.xml
index dc01ac8..c6de2e1 100644
--- a/common/main/fr_CF.xml
+++ b/common/main/fr_CF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CG.xml b/common/main/fr_CG.xml
index 704d7ed..60a0f9d 100644
--- a/common/main/fr_CG.xml
+++ b/common/main/fr_CG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CH.xml b/common/main/fr_CH.xml
index abf8638..4c842d4 100644
--- a/common/main/fr_CH.xml
+++ b/common/main/fr_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CI.xml b/common/main/fr_CI.xml
index e41c071..f866c7d 100644
--- a/common/main/fr_CI.xml
+++ b/common/main/fr_CI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_CM.xml b/common/main/fr_CM.xml
index 5e72012..0798abe 100644
--- a/common/main/fr_CM.xml
+++ b/common/main/fr_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_DJ.xml b/common/main/fr_DJ.xml
index 21a7fd4..2527edf 100644
--- a/common/main/fr_DJ.xml
+++ b/common/main/fr_DJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_DZ.xml b/common/main/fr_DZ.xml
index f6a9655..f7518de 100644
--- a/common/main/fr_DZ.xml
+++ b/common/main/fr_DZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_FR.xml b/common/main/fr_FR.xml
index f68d742..74f0b48 100644
--- a/common/main/fr_FR.xml
+++ b/common/main/fr_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_GA.xml b/common/main/fr_GA.xml
index 46a49b9..f3c98ef 100644
--- a/common/main/fr_GA.xml
+++ b/common/main/fr_GA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_GF.xml b/common/main/fr_GF.xml
index 73c139a..1a3acd9 100644
--- a/common/main/fr_GF.xml
+++ b/common/main/fr_GF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_GN.xml b/common/main/fr_GN.xml
index edbf92e..df7ea7e 100644
--- a/common/main/fr_GN.xml
+++ b/common/main/fr_GN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_GP.xml b/common/main/fr_GP.xml
index a0bba1e..fa4ff77 100644
--- a/common/main/fr_GP.xml
+++ b/common/main/fr_GP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_GQ.xml b/common/main/fr_GQ.xml
index 1571c7a..2ba4984 100644
--- a/common/main/fr_GQ.xml
+++ b/common/main/fr_GQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_HT.xml b/common/main/fr_HT.xml
index 3b64535..70af32a 100644
--- a/common/main/fr_HT.xml
+++ b/common/main/fr_HT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_KM.xml b/common/main/fr_KM.xml
index fde8507..1943afc 100644
--- a/common/main/fr_KM.xml
+++ b/common/main/fr_KM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_LU.xml b/common/main/fr_LU.xml
index c011eae..5394dd5 100644
--- a/common/main/fr_LU.xml
+++ b/common/main/fr_LU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MA.xml b/common/main/fr_MA.xml
index b7d33f0..e02d4ff 100644
--- a/common/main/fr_MA.xml
+++ b/common/main/fr_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MC.xml b/common/main/fr_MC.xml
index 8224cb6..087329d 100644
--- a/common/main/fr_MC.xml
+++ b/common/main/fr_MC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MF.xml b/common/main/fr_MF.xml
index 28f8e3a..107b486 100644
--- a/common/main/fr_MF.xml
+++ b/common/main/fr_MF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MG.xml b/common/main/fr_MG.xml
index 4372603..b5050c9 100644
--- a/common/main/fr_MG.xml
+++ b/common/main/fr_MG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_ML.xml b/common/main/fr_ML.xml
index 726222c..0c4e490 100644
--- a/common/main/fr_ML.xml
+++ b/common/main/fr_ML.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MQ.xml b/common/main/fr_MQ.xml
index d120ebe..370494d 100644
--- a/common/main/fr_MQ.xml
+++ b/common/main/fr_MQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MR.xml b/common/main/fr_MR.xml
index d98f754..59ba10b 100644
--- a/common/main/fr_MR.xml
+++ b/common/main/fr_MR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_MU.xml b/common/main/fr_MU.xml
index 837e9db..3f6a1d8 100644
--- a/common/main/fr_MU.xml
+++ b/common/main/fr_MU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_NC.xml b/common/main/fr_NC.xml
index ab64f2f..b2edb20 100644
--- a/common/main/fr_NC.xml
+++ b/common/main/fr_NC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_NE.xml b/common/main/fr_NE.xml
index a74136a..6f675fc 100644
--- a/common/main/fr_NE.xml
+++ b/common/main/fr_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_PF.xml b/common/main/fr_PF.xml
index 685b56a..69b93c2 100644
--- a/common/main/fr_PF.xml
+++ b/common/main/fr_PF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_PM.xml b/common/main/fr_PM.xml
index 1a37ed8..ec25d8d 100644
--- a/common/main/fr_PM.xml
+++ b/common/main/fr_PM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_RE.xml b/common/main/fr_RE.xml
index 950a780..a2bef3d 100644
--- a/common/main/fr_RE.xml
+++ b/common/main/fr_RE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_RW.xml b/common/main/fr_RW.xml
index 408eebc..cc7dda0 100644
--- a/common/main/fr_RW.xml
+++ b/common/main/fr_RW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_SC.xml b/common/main/fr_SC.xml
index 3fb44ab..9a9f97b 100644
--- a/common/main/fr_SC.xml
+++ b/common/main/fr_SC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_SN.xml b/common/main/fr_SN.xml
index d0f8be6..9be5bbd 100644
--- a/common/main/fr_SN.xml
+++ b/common/main/fr_SN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_SY.xml b/common/main/fr_SY.xml
index 4cb62af..dc35ed1 100644
--- a/common/main/fr_SY.xml
+++ b/common/main/fr_SY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_TD.xml b/common/main/fr_TD.xml
index df656b2..e869c83 100644
--- a/common/main/fr_TD.xml
+++ b/common/main/fr_TD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_TG.xml b/common/main/fr_TG.xml
index 1b0c037..f713557 100644
--- a/common/main/fr_TG.xml
+++ b/common/main/fr_TG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_TN.xml b/common/main/fr_TN.xml
index b33222f..a77c78b 100644
--- a/common/main/fr_TN.xml
+++ b/common/main/fr_TN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_VU.xml b/common/main/fr_VU.xml
index b7560cf..08ce082 100644
--- a/common/main/fr_VU.xml
+++ b/common/main/fr_VU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_WF.xml b/common/main/fr_WF.xml
index e5a5f2c..10d46b1 100644
--- a/common/main/fr_WF.xml
+++ b/common/main/fr_WF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fr_YT.xml b/common/main/fr_YT.xml
index 11e1e04..df32353 100644
--- a/common/main/fr_YT.xml
+++ b/common/main/fr_YT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fur.xml b/common/main/fur.xml
index 9a87990..474eb0d 100644
--- a/common/main/fur.xml
+++ b/common/main/fur.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -446,7 +446,6 @@
<territory type="MF" draft="contributed">Sant Martin</territory>
<territory type="MG" draft="contributed">Madagascar</territory>
<territory type="MH" draft="contributed">Isulis Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML" draft="contributed">Mali</territory>
<territory type="MM" draft="contributed">Birmanie</territory>
<territory type="MN" draft="contributed">Mongolie</territory>
@@ -1229,9 +1228,6 @@
<relativeTimePattern count="other">{0} seconts indaûr</relativeTimePattern>
</relativeTime>
</field>
- <field type="zone">
- <displayName draft="contributed">zone</displayName>
- </field>
</fields>
<timeZoneNames>
<hourFormat draft="contributed">+HH:mm;-HH:mm</hourFormat>
diff --git a/common/main/fur_IT.xml b/common/main/fur_IT.xml
index 2eeee96..7732df1 100644
--- a/common/main/fur_IT.xml
+++ b/common/main/fur_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/fy.xml b/common/main/fy.xml
index e502fd5..375799b 100644
--- a/common/main/fy.xml
+++ b/common/main/fy.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -881,7 +881,6 @@
<territory type="MF" draft="contributed">Saint-Martin</territory>
<territory type="MG" draft="contributed">Madeiaskar</territory>
<territory type="MH" draft="contributed">Marshalleilannen</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML" draft="contributed">Mali</territory>
<territory type="MM" draft="contributed">Myanmar (Birma)</territory>
<territory type="MN" draft="contributed">Mongolië</territory>
@@ -1861,46 +1860,6 @@
</months>
</calendar>
<calendar type="generic">
- <months>
- <monthContext type="format">
- <monthWidth type="wide">
- <month type="1" draft="unconfirmed">M01</month>
- <month type="2" draft="unconfirmed">M02</month>
- <month type="3" draft="unconfirmed">M03</month>
- <month type="4" draft="unconfirmed">M04</month>
- <month type="5" draft="unconfirmed">M05</month>
- <month type="6" draft="unconfirmed">M06</month>
- <month type="7" draft="unconfirmed">M07</month>
- <month type="8" draft="unconfirmed">M08</month>
- <month type="9" draft="unconfirmed">M09</month>
- <month type="10" draft="unconfirmed">M10</month>
- <month type="11" draft="unconfirmed">M11</month>
- <month type="12" draft="unconfirmed">M12</month>
- </monthWidth>
- </monthContext>
- <monthContext type="stand-alone">
- <monthWidth type="narrow">
- <month type="1" draft="unconfirmed">1</month>
- <month type="2" draft="unconfirmed">2</month>
- <month type="3" draft="unconfirmed">3</month>
- <month type="4" draft="unconfirmed">4</month>
- <month type="5" draft="unconfirmed">5</month>
- <month type="6" draft="unconfirmed">6</month>
- <month type="7" draft="unconfirmed">7</month>
- <month type="8" draft="unconfirmed">8</month>
- <month type="9" draft="unconfirmed">9</month>
- <month type="10" draft="unconfirmed">10</month>
- <month type="11" draft="unconfirmed">11</month>
- <month type="12" draft="unconfirmed">12</month>
- </monthWidth>
- </monthContext>
- </months>
- <eras>
- <eraAbbr>
- <era type="0" draft="unconfirmed">ERA0</era>
- <era type="1" draft="unconfirmed">ERA1</era>
- </eraAbbr>
- </eras>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
@@ -4347,7 +4306,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard draft="contributed">Norfolkeilânske tiid</standard>
+ <generic draft="contributed">Norfolkeilânske tiid</generic>
+ <standard draft="contributed">Norfolkeilânske standerttiid</standard>
+ <daylight draft="contributed">Norfolkeilânske simmertiid</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6460,7 +6421,7 @@
<unitPattern count="one" draft="contributed">{0} hynstekrêft</unitPattern>
<unitPattern count="other" draft="contributed">{0} hynstekrêften</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -6695,7 +6656,7 @@
<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -6895,7 +6856,7 @@
<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/fy_NL.xml b/common/main/fy_NL.xml
index 4c004c5..e431ec3 100644
--- a/common/main/fy_NL.xml
+++ b/common/main/fy_NL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ga.xml b/common/main/ga.xml
index 24013fa..7dc086c 100644
--- a/common/main/ga.xml
+++ b/common/main/ga.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -21,66 +21,46 @@
<languages>
<language type="aa">Afáiris</language>
<language type="ab">Abcáisis</language>
- <language type="ace">ace</language>
- <language type="ada">ada</language>
<language type="ady">Adaigéis</language>
<language type="ae">Aivéistis</language>
<language type="af">Afracáinis</language>
- <language type="agq">agq</language>
<language type="ain">Aidhniúis</language>
<language type="ak">Acáinis</language>
<language type="akk">Acáidis</language>
- <language type="ale">ale</language>
- <language type="alt">alt</language>
<language type="am">Amáiris</language>
<language type="an">Aragóinis</language>
<language type="ang">Sean-Bhéarla</language>
- <language type="anp">anp</language>
<language type="ar">Araibis</language>
<language type="ar_001">Araibis Chaighdeánach</language>
<language type="arc">Aramais</language>
<language type="arn">Mapúitsis</language>
- <language type="arp">arp</language>
<language type="as">Asaimis</language>
- <language type="asa">asa</language>
<language type="ast">Astúiris</language>
<language type="av">Aváiris</language>
- <language type="awa">awa</language>
<language type="ay">Aidhmiris</language>
<language type="az">Asarbaiseáinis</language>
<language type="az" alt="short">Asairis</language>
<language type="ba">Baiscíris</language>
<language type="ban">Bailís</language>
<language type="bar">Baváiris</language>
- <language type="bas">bas</language>
<language type="be">Bealarúisis</language>
<language type="bem">Beimbis</language>
- <language type="bez">bez</language>
<language type="bg">Bulgáiris</language>
- <language type="bho">bho</language>
<language type="bi">Bioslaimis</language>
- <language type="bin">bin</language>
- <language type="bla">bla</language>
- <language type="bm">bm</language>
+ <language type="bm">Bambairis</language>
<language type="bn">Beangáilis</language>
<language type="bo">Tibéidis</language>
<language type="br">Briotáinis</language>
- <language type="brx">brx</language>
<language type="bs">Boisnis</language>
<language type="bua">Buiriáitis</language>
<language type="bug">Buiginis</language>
- <language type="byn">byn</language>
<language type="ca">Catalóinis</language>
- <language type="ccp">↑↑↑</language>
+ <language type="ccp">Chakma</language>
<language type="ce">Seisnis</language>
<language type="ceb">Seabúáinis</language>
- <language type="cgg">cgg</language>
<language type="ch">Seamóiris</language>
- <language type="chk">chk</language>
<language type="chm">Mairis</language>
- <language type="cho">cho</language>
<language type="chr">Seiricis</language>
- <language type="chy">chy</language>
<language type="ckb">Coirdis Lárnach</language>
<language type="co">Corsaicis</language>
<language type="cop">Coptais</language>
@@ -92,26 +72,18 @@
<language type="cv">Suvaisis</language>
<language type="cy">Breatnais</language>
<language type="da">Danmhairgis</language>
- <language type="dak">dak</language>
- <language type="dar">dar</language>
<language type="dav">Taita</language>
<language type="de">Gearmáinis</language>
<language type="de_AT">Gearmáinis Ostarach</language>
<language type="de_CH">Ard-Ghearmáinis Eilvéiseach</language>
- <language type="dgr">dgr</language>
<language type="dje">Zarmais</language>
<language type="dsb">Sorbais Íochtarach</language>
- <language type="dua">dua</language>
+ <language type="dua">Duailis</language>
<language type="dum">Meán-Ollainnis</language>
<language type="dv">Divéihis</language>
- <language type="dyo">dyo</language>
<language type="dz">Seoinicis</language>
- <language type="dzg">dzg</language>
- <language type="ebu">ebu</language>
- <language type="ee">ee</language>
- <language type="efi">efi</language>
+ <language type="ee">Éabhais</language>
<language type="egy">Sean-Éigiptis</language>
- <language type="eka">eka</language>
<language type="el">Gréigis</language>
<language type="en">Béarla</language>
<language type="en_AU">Béarla Astrálach</language>
@@ -128,8 +100,9 @@
<language type="es_MX">Spáinnis Mheicsiceach</language>
<language type="et">Eastóinis</language>
<language type="eu">Bascais</language>
- <language type="ewo">ewo</language>
+ <language type="ewo">Éabhandóis</language>
<language type="fa">Peirsis</language>
+ <language type="fa_AF">Dairis</language>
<language type="ff">Fuláinis</language>
<language type="fi">Fionlainnis</language>
<language type="fil">Filipínis</language>
@@ -145,7 +118,6 @@
<language type="fur">Friúilis</language>
<language type="fy">Freaslainnis Iartharach</language>
<language type="ga">Gaeilge</language>
- <language type="gaa">gaa</language>
<language type="gan">Sínis Gan</language>
<language type="gd">Gaeilge na hAlban</language>
<language type="gez">Aetóipis</language>
@@ -154,14 +126,11 @@
<language type="gmh">Meán-Ard-Ghearmáinis</language>
<language type="gn">Guaráinis</language>
<language type="goh">Sean-Ard-Ghearmáinis</language>
- <language type="gor">gor</language>
<language type="grc">Sean-Ghréigis</language>
<language type="gsw">Gearmáinis Eilvéiseach</language>
<language type="gu">Gúisearáitis</language>
<language type="guc">Uaúis</language>
- <language type="guz">guz</language>
<language type="gv">Manainnis</language>
- <language type="gwi">gwi</language>
<language type="ha">Hásais</language>
<language type="hak">Haicéis</language>
<language type="haw">Haváis</language>
@@ -181,14 +150,11 @@
<language type="hy">Airméinis</language>
<language type="hz">Heiréiris</language>
<language type="ia">Interlingua</language>
- <language type="iba">iba</language>
<language type="ibb">Ibibis</language>
<language type="id">Indinéisis</language>
<language type="ie">Interlingue</language>
<language type="ig">Íogbóis</language>
- <language type="ii">ii</language>
<language type="ik">Iniúipiaicis</language>
- <language type="ilo">ilo</language>
<language type="inh">Iongúis</language>
<language type="io">Ido</language>
<language type="is">Íoslainnis</language>
@@ -203,16 +169,10 @@
<language type="ka">Seoirsis</language>
<language type="kaa">Cara-Chalpáis</language>
<language type="kab">Caibílis</language>
- <language type="kac">kac</language>
- <language type="kaj">kaj</language>
<language type="kam">Cambais</language>
- <language type="kbd">kbd</language>
- <language type="kcg">kcg</language>
<language type="kde">Makonde</language>
<language type="kea">Kabuverdianu</language>
- <language type="kfo">kfo</language>
<language type="kg">Congóis</language>
- <language type="kha">kha</language>
<language type="khq">Koyra Chiini</language>
<language type="ki">Ciocúis</language>
<language type="kj">Cuainiáimis</language>
@@ -221,21 +181,14 @@
<language type="kl">Kalaallisut</language>
<language type="kln">Kalenjin</language>
<language type="km">Ciméiris</language>
- <language type="kmb">kmb</language>
<language type="kn">Cannadais</language>
<language type="ko">Cóiréis</language>
<language type="kok">Concáinis</language>
- <language type="kpe">kpe</language>
<language type="kr">Canúiris</language>
- <language type="krc">krc</language>
<language type="krl">Cairéilis</language>
<language type="kru">Curúicis</language>
<language type="ks">Caismíris</language>
- <language type="ksb">ksb</language>
- <language type="ksf">ksf</language>
- <language type="ksh">ksh</language>
<language type="ku">Coirdis</language>
- <language type="kum">kum</language>
<language type="kv">Coimis</language>
<language type="kw">Coirnis</language>
<language type="ky">Cirgisis</language>
@@ -244,7 +197,6 @@
<language type="lag">Langi</language>
<language type="lah">Puinseáibis Iartharach</language>
<language type="lb">Lucsambuirgis</language>
- <language type="lez">lez</language>
<language type="lg">Lugandais</language>
<language type="li">Liombuirgis</language>
<language type="lij">Liogúiris</language>
@@ -253,22 +205,14 @@
<language type="lmo">Lombairdis</language>
<language type="ln">Liongáilis</language>
<language type="lo">Laoisis</language>
- <language type="loz">loz</language>
<language type="lrc">Luri Thuaidh</language>
<language type="lt">Liotuáinis</language>
<language type="lu">Lúba-Cataingis</language>
- <language type="lua">lua</language>
- <language type="lun">lun</language>
<language type="luo">Lúóis</language>
- <language type="lus">lus</language>
<language type="luy">Luyia</language>
<language type="lv">Laitvis</language>
- <language type="mad">mad</language>
- <language type="mag">mag</language>
- <language type="mai">mai</language>
- <language type="mak">mak</language>
+ <language type="mai">Maitilis</language>
<language type="mas">Másais</language>
- <language type="mdf">mdf</language>
<language type="men">Meindis</language>
<language type="mer">Meru</language>
<language type="mfe">Morisyen</language>
@@ -278,25 +222,20 @@
<language type="mgo">Metaʼ</language>
<language type="mh">Mairsillis</language>
<language type="mi">Maorais</language>
- <language type="mic">mic</language>
- <language type="min">min</language>
<language type="mk">Macadóinis</language>
<language type="ml">Mailéalaimis</language>
<language type="mn">Mongóilis</language>
<language type="mni">Manapúiris</language>
<language type="moh">Móháicis</language>
- <language type="mos">mos</language>
<language type="mr">Maraitis</language>
<language type="mrj">Mairis Iartharach</language>
<language type="ms">Malaeis</language>
<language type="mt">Máltais</language>
<language type="mua">Mundang</language>
<language type="mul">Ilteangacha</language>
- <language type="mus">mus</language>
<language type="mwl">Mioraindéis</language>
<language type="mwr">Marmhairis</language>
<language type="my">Burmais</language>
- <language type="myv">myv</language>
<language type="mzn">Mazanderani</language>
<language type="na">Nárúis</language>
<language type="nan">Sínis Min Nan</language>
@@ -307,9 +246,7 @@
<language type="nds">Gearmáinis Íochtarach</language>
<language type="nds_NL">Sacsainis Íochtarach</language>
<language type="ne">Neipeailis</language>
- <language type="new">new</language>
<language type="ng">Ndongais</language>
- <language type="nia">nia</language>
<language type="niu">Níobhais</language>
<language type="nl">Ollainnis</language>
<language type="nl_BE">Pléimeannais</language>
@@ -317,9 +254,7 @@
<language type="nn">Nua-Ioruais</language>
<language type="nnh">Ngiemboon</language>
<language type="no">Ioruais</language>
- <language type="nog">nog</language>
<language type="non">Sean-Lochlainnis</language>
- <language type="nqo">nqo</language>
<language type="nr">Ndeibéilis an Deiscirt</language>
<language type="nso">Sútúis an Tuaiscirt</language>
<language type="nus">Nuer</language>
@@ -332,11 +267,6 @@
<language type="or">Oirísis</language>
<language type="os">Oiséitis</language>
<language type="pa">Puinseáibis</language>
- <language type="pag">pag</language>
- <language type="pam">pam</language>
- <language type="pap">pap</language>
- <language type="pau">pau</language>
- <language type="pcm">pcm</language>
<language type="peo">Sean-Pheirsis</language>
<language type="pi">Páilis</language>
<language type="pl">Polainnis</language>
@@ -347,39 +277,29 @@
<language type="pt_PT">Portaingéilis Ibéarach</language>
<language type="qu">Ceatsuais</language>
<language type="quc">Cuitséis</language>
- <language type="rap">rap</language>
- <language type="rar">rar</language>
<language type="rm">Rómainis</language>
<language type="rn">Rúindis</language>
<language type="ro">Rómáinis</language>
<language type="ro_MD">Moldáivis</language>
- <language type="rof">rof</language>
<language type="rom">Romainis</language>
- <language type="root">root</language>
+ <language type="root" draft="contributed">Root</language>
<language type="ru">Rúisis</language>
<language type="rup">Arómáinis</language>
<language type="rw">Ciniaruaindis</language>
- <language type="rwk">rwk</language>
<language type="sa">Sanscrait</language>
- <language type="sad">sad</language>
<language type="sah">Sachais</language>
<language type="sam">Aramais Shamárach</language>
- <language type="saq">saq</language>
<language type="sat">Santáilis</language>
- <language type="sba">sba</language>
- <language type="sbp">sbp</language>
<language type="sc">Sairdínis</language>
<language type="scn">Sicilis</language>
<language type="sco">Albainis</language>
<language type="sd">Sindis</language>
<language type="se">Sáimis Thuaidh</language>
- <language type="seh">seh</language>
<language type="ses">Koyraboro Senni</language>
<language type="sg">Sangóis</language>
<language type="sga">Sean-Ghaeilge</language>
<language type="sh">Seirbea-Chróitis</language>
<language type="shi">Tachelhit</language>
- <language type="shn">shn</language>
<language type="si">Siolóinis</language>
<language type="sk">Slóvaicis</language>
<language type="sl">Slóivéinis</language>
@@ -389,17 +309,13 @@
<language type="smn">Sáimis Inari</language>
<language type="sms">Sáimis Skolt</language>
<language type="sn">Seoinis</language>
- <language type="snk">snk</language>
<language type="so">Somáilis</language>
<language type="sog">Sogdánais</language>
<language type="sq">Albáinis</language>
<language type="sr">Seirbis</language>
- <language type="srn">srn</language>
<language type="ss">Suaisis</language>
- <language type="ssy">ssy</language>
<language type="st">Seasóitis</language>
<language type="su">Sundais</language>
- <language type="suk">suk</language>
<language type="sux">Suiméiris</language>
<language type="sv">Sualainnis</language>
<language type="sw">Svahaílis</language>
@@ -409,13 +325,10 @@
<language type="szl">Siléisis</language>
<language type="ta">Tamailis</language>
<language type="te">Teileagúis</language>
- <language type="tem">tem</language>
- <language type="teo">teo</language>
- <language type="tet">tet</language>
+ <language type="teo">Teso</language>
<language type="tg">Táidsícis</language>
<language type="th">Téalainnis</language>
<language type="ti">Tigrinis</language>
- <language type="tig">tig</language>
<language type="tk">Tuircméinis</language>
<language type="tl">Tagálaigis</language>
<language type="tlh">Klingon</language>
@@ -423,20 +336,15 @@
<language type="to">Tongais</language>
<language type="tpi">Tok Pisin</language>
<language type="tr">Tuircis</language>
- <language type="trv">trv</language>
<language type="ts">Songais</language>
<language type="tt">Tatairis</language>
- <language type="tum">tum</language>
- <language type="tvl">tvl</language>
<language type="tw">Tíbhis</language>
- <language type="twq">twq</language>
+ <language type="twq">Tasawaq</language>
<language type="ty">Taihítis</language>
- <language type="tyv">tyv</language>
<language type="tzm">Tamazight Atlais Láir</language>
<language type="udm">Udmairtis</language>
<language type="ug">Uigiúiris</language>
<language type="uk">Úcráinis</language>
- <language type="umb">umb</language>
<language type="und">Teanga Anaithnid</language>
<language type="ur">Urdúis</language>
<language type="uz">Úisbéiceastáinis</language>
@@ -446,18 +354,13 @@
<language type="vi">Vítneaimis</language>
<language type="vls">Pléimeannais Iartharach</language>
<language type="vo">Volapük</language>
- <language type="vun">vun</language>
+ <language type="vun">Vunjo</language>
<language type="wa">Vallúnais</language>
- <language type="wae">wae</language>
- <language type="wal">wal</language>
- <language type="war">war</language>
+ <language type="wae">Walser</language>
<language type="wo">Volaifis</language>
- <language type="wuu">wuu</language>
<language type="xal">Cailmícis</language>
<language type="xh">Cóisis</language>
- <language type="xog">xog</language>
- <language type="yav">yav</language>
- <language type="ybb">ybb</language>
+ <language type="yav">Yangben</language>
<language type="yi">Giúdais</language>
<language type="yo">Iarúibis</language>
<language type="yue">Cantainis</language>
@@ -474,10 +377,9 @@
<language type="zu">Súlúis</language>
<language type="zun">Zúinis</language>
<language type="zxx">Gan ábhar teangeolaíoch</language>
- <language type="zza">zza</language>
</languages>
<scripts>
- <script type="Adlm">Adlm</script>
+ <script type="Adlm" draft="contributed">Adlam</script>
<script type="Aghb">Albánach Cugasach</script>
<script type="Ahom">Ahom</script>
<script type="Arab">Arabach</script>
@@ -485,72 +387,53 @@
<script type="Armn">Airméanach</script>
<script type="Avst">Aivéisteach</script>
<script type="Bali">Bailíoch</script>
- <script type="Bamu">Bamu</script>
- <script type="Bass">Bass</script>
<script type="Batk">Batacach</script>
<script type="Beng">Beangálach</script>
- <script type="Bhks">Bhks</script>
<script type="Bopo">Bopomofo</script>
- <script type="Brah">Brah</script>
<script type="Brai">Braille</script>
<script type="Bugi">Buigineach</script>
<script type="Buhd">Buthaideach</script>
- <script type="Cakm">Cakm</script>
- <script type="Cans">Cans</script>
- <script type="Cari">Cari</script>
- <script type="Cham">Cham</script>
+ <script type="Cans" draft="contributed">Siollach Bundúchasach Ceanadach Aontaithe</script>
<script type="Cher">Seiricíoch</script>
<script type="Copt">Coptach</script>
<script type="Cprt">Cipireach</script>
<script type="Cyrl">Coireallach</script>
<script type="Deva">Déiveanágrach</script>
- <script type="Dsrt">Dsrt</script>
- <script type="Dupl">Dupl</script>
+ <script type="Dupl" draft="contributed">Gearrscríobh Duployan</script>
<script type="Egyd">Éigipteach coiteann</script>
<script type="Egyh">Éigipteach cliarúil</script>
<script type="Egyp">Iairiglifí Éigipteacha</script>
- <script type="Elba">Elba</script>
<script type="Ethi">Aetópach</script>
<script type="Geor">Seoirseach</script>
<script type="Glag">Glagalach</script>
- <script type="Gonm">Gonm</script>
<script type="Goth">Gotach</script>
- <script type="Gran">Gran</script>
<script type="Grek">Gréagach</script>
<script type="Gujr">Gúisearátach</script>
<script type="Guru">Gurmúcach</script>
<script type="Hanb">Han agus Bopomofo</script>
<script type="Hang">Hangalach</script>
<script type="Hani">Han</script>
- <script type="Hano">Hano</script>
+ <script type="Hano" draft="provisional">Hananúis</script>
<script type="Hans">Simplithe</script>
<script type="Hans" alt="stand-alone">Han Simplithe</script>
<script type="Hant">Traidisiúnta</script>
<script type="Hant" alt="stand-alone">Han Traidisiúnta</script>
- <script type="Hatr">Hatr</script>
<script type="Hebr">Eabhrach</script>
<script type="Hira">Hireagánach</script>
<script type="Hluw">Iairiglifí Anatólacha</script>
- <script type="Hmng">Hmng</script>
<script type="Hrkt">Siollabraí Seapánacha</script>
<script type="Hung">Sean-Ungárach</script>
<script type="Ital">Sean-Iodáilic</script>
<script type="Jamo">Seamó</script>
<script type="Java">Iávach</script>
<script type="Jpan">Seapánach</script>
- <script type="Kali">Kali</script>
<script type="Kana">Catacánach</script>
- <script type="Khar">Khar</script>
<script type="Khmr">Ciméarach</script>
- <script type="Khoj">Khoj</script>
<script type="Knda">Cannadach</script>
<script type="Kore">Cóiréach</script>
- <script type="Kthi">Kthi</script>
- <script type="Lana">Lana</script>
<script type="Laoo">Laosach</script>
<script type="Latg">Cló Gaelach</script>
<script type="Latn">Laidineach</script>
- <script type="Lepc">Lepc</script>
<script type="Limb">Liombúch</script>
<script type="Lina">Líneach A</script>
<script type="Linb">Líneach B</script>
@@ -558,77 +441,45 @@
<script type="Lyci">Liciach</script>
<script type="Lydi">Lidiach</script>
<script type="Mahj">Mahasánach</script>
- <script type="Mand">Mand</script>
<script type="Mani">Mainicéasach</script>
- <script type="Marc">Marc</script>
<script type="Maya">Iairiglifí Máigheacha</script>
<script type="Mend">Meindeach</script>
- <script type="Merc">Merc</script>
- <script type="Mero">Mero</script>
<script type="Mlym">Mailéalamach</script>
- <script type="Modi">Modi</script>
<script type="Mong">Mongólach</script>
- <script type="Mroo">Mroo</script>
- <script type="Mtei">Mtei</script>
- <script type="Mult">Mult</script>
+ <script type="Mult" draft="contributed">Multani</script>
<script type="Mymr">Maenmarach</script>
<script type="Narb">Sean-Arabach Thuaidh</script>
- <script type="Nbat">Nbat</script>
<script type="Newa">Newa</script>
- <script type="Nkoo">Nkoo</script>
- <script type="Nshu">Nshu</script>
+ <script type="Nkoo" draft="provisional">N-cóis</script>
<script type="Ogam">Ogham</script>
- <script type="Olck">Olck</script>
- <script type="Orkh">Orkh</script>
<script type="Orya">Oiríseach</script>
- <script type="Osge">Osge</script>
- <script type="Osma">Osma</script>
- <script type="Palm">Palm</script>
- <script type="Pauc">Pauc</script>
+ <script type="Osge" draft="provisional">Ósáis</script>
<script type="Perm">Sean-Pheirmeach</script>
- <script type="Phag">Phag</script>
- <script type="Phli">Phli</script>
- <script type="Phlp">Phlp</script>
<script type="Phnx">Féiníceach</script>
<script type="Plrd">Pollard Foghrach</script>
<script type="Prti">Pairtiach Inscríbhinniúil</script>
- <script type="Rjng">Rjng</script>
<script type="Runr">Rúnach</script>
<script type="Samr">Samárach</script>
<script type="Sarb">Sean-Arabach Theas</script>
- <script type="Saur">Saur</script>
- <script type="Sgnw">Sgnw</script>
+ <script type="Sgnw" draft="provisional">Litritheoireacht Comharthaí</script>
<script type="Shaw">Shawach</script>
- <script type="Shrd">Shrd</script>
- <script type="Sidd">Sidd</script>
- <script type="Sind">Sind</script>
<script type="Sinh">Siolónach</script>
- <script type="Sora">Sora</script>
- <script type="Soyo">Soyo</script>
- <script type="Sund">Sund</script>
- <script type="Sylo">Sylo</script>
+ <script type="Sund" draft="contributed">Sundainéis</script>
<script type="Syrc">Siriceach</script>
- <script type="Tagb">Tagb</script>
- <script type="Takr">Takr</script>
- <script type="Tale">Tale</script>
- <script type="Talu">Talu</script>
+ <script type="Tale" draft="provisional">Deiheoingis</script>
+ <script type="Talu" draft="provisional">Tai Lue Nua</script>
<script type="Taml">Tamalach</script>
- <script type="Tang">Tang</script>
- <script type="Tavt">Tavt</script>
<script type="Telu">Teileagúch</script>
<script type="Tfng">Tifinagh</script>
<script type="Tglg">Tagálagach</script>
<script type="Thaa">Tánach</script>
<script type="Thai">Téalannach</script>
<script type="Tibt">Tibéadach</script>
- <script type="Tirh">Tirh</script>
<script type="Ugar">Úgairíteach</script>
- <script type="Vaii">Vaii</script>
- <script type="Wara">Wara</script>
+ <script type="Vaii" draft="provisional">Vadhais</script>
<script type="Xpeo">Sean-Pheirseach</script>
<script type="Xsux">Dingchruthach Suiméar-Acádach</script>
<script type="Yiii">Ís</script>
- <script type="Zanb">Zanb</script>
<script type="Zinh">Oidhreacht</script>
<script type="Zmth">Nodaireacht Mhatamaiticiúil</script>
<script type="Zsye">Emoji</script>
@@ -909,7 +760,7 @@
<territory type="TJ">an Táidsíceastáin</territory>
<territory type="TK">Tócalá</territory>
<territory type="TL">Tíomór Thoir</territory>
- <territory type="TL" alt="variant">TL</territory>
+ <territory type="TL" alt="variant">↑↑↑</territory>
<territory type="TM">an Tuircméanastáin</territory>
<territory type="TN">an Túinéis</territory>
<territory type="TO">Tonga</territory>
@@ -953,90 +804,90 @@
</subdivisions>
<variants>
<variant type="1901">Litriú Traidisiúnta na Gearmáinise</variant>
- <variant type="1994">1994</variant>
- <variant type="1996">1996</variant>
- <variant type="1606NICT">1606NICT</variant>
+ <variant type="1994" draft="provisional">Ortagrafaíocht Resian Chaighdeánaithe</variant>
+ <variant type="1996" draft="provisional">Ortagrafaíocht na Gearmáinise in 1996</variant>
+ <variant type="1606NICT" draft="provisional">Fraincis Dhéanach Mheánach go 1606</variant>
<variant type="1694ACAD">Nua-Fhraincis Mhoch</variant>
<variant type="1959ACAD">Acadúil</variant>
- <variant type="ABL1943">ABL1943</variant>
+ <variant type="ABL1943" draft="provisional">Foirmiú ortagrafaíochta in 1943</variant>
<variant type="ALALC97">Rómhánú ALA-LC, eagrán 1997</variant>
- <variant type="ALUKU">ALUKU</variant>
- <variant type="AO1990">AO1990</variant>
+ <variant type="ALUKU" draft="provisional">Canúint Aluku</variant>
+ <variant type="AO1990" draft="provisional">Comhaontú Ortagrafaíochta Theanga na Portaingéilise, 1990</variant>
<variant type="AREVELA">Airméinis an Oirthir</variant>
<variant type="AREVMDA">Airméinis an Iarthair</variant>
- <variant type="BAKU1926">BAKU1926</variant>
- <variant type="BALANKA">BALANKA</variant>
- <variant type="BARLA">BARLA</variant>
+ <variant type="BAKU1926" draft="provisional">Abítir Laidine Tuircice Aontaithe</variant>
+ <variant type="BALANKA" draft="provisional">Canúint Balanka de Anii</variant>
+ <variant type="BARLA" draft="provisional">Grúpa canúna Barlavento de Kabuverdianu</variant>
<variant type="BASICENG">Bun-Bhéarla</variant>
- <variant type="BAUDDHA">BAUDDHA</variant>
- <variant type="BISCAYAN">BISCAYAN</variant>
- <variant type="BISKE">BISKE</variant>
+ <variant type="BAUDDHA" draft="contributed">Bauddha</variant>
+ <variant type="BISCAYAN" draft="contributed">BIOSCÁNACH</variant>
+ <variant type="BISKE">Canúint San Giorgo/Bila</variant>
<variant type="BOHORIC">Aibítir Bohorič</variant>
- <variant type="BOONT">BOONT</variant>
- <variant type="COLB1945">COLB1945</variant>
+ <variant type="BOONT" draft="contributed">Boontling</variant>
+ <variant type="COLB1945" draft="provisional">Coinbhinsiún Ortagrafaíochta na Portaingéilise na Brasaíle, 1945</variant>
<variant type="CORNU">Béarla an Choirn</variant>
<variant type="DAJNKO">Aibítir Dajnko</variant>
- <variant type="EKAVSK">EKAVSK</variant>
+ <variant type="EKAVSK" draft="provisional">Seirbis le fuaimniú Ekavian</variant>
<variant type="EMODENG">Nua-Bhéarla Moch</variant>
<variant type="FONIPA">Fogharscríobh IPA</variant>
- <variant type="FONNAPA">FONNAPA</variant>
+ <variant type="FONNAPA" draft="contributed">Fonnapa</variant>
<variant type="FONUPA">Fogharscríobh UPA</variant>
- <variant type="FONXSAMP">FONXSAMP</variant>
+ <variant type="FONXSAMP" draft="contributed">Fonxsamp</variant>
<variant type="HEPBURN">Rómhánú Hepburn</variant>
- <variant type="HOGNORSK">HOGNORSK</variant>
- <variant type="HSISTEMO">HSISTEMO</variant>
- <variant type="IJEKAVSK">IJEKAVSK</variant>
- <variant type="ITIHASA">ITIHASA</variant>
- <variant type="JAUER">JAUER</variant>
- <variant type="JYUTPING">JYUTPING</variant>
+ <variant type="HOGNORSK" draft="contributed">Hognorsk</variant>
+ <variant type="HSISTEMO" draft="contributed">Hsistemo</variant>
+ <variant type="IJEKAVSK" draft="provisional">Seirbis le fuaimniú Ijekavach</variant>
+ <variant type="ITIHASA" draft="contributed">Itihasa</variant>
+ <variant type="JAUER" draft="contributed">Jauer</variant>
+ <variant type="JYUTPING" draft="contributed">Jyutping</variant>
<variant type="KKCOR">Gnáth-Litriú</variant>
- <variant type="KOCIEWIE">KOCIEWIE</variant>
+ <variant type="KOCIEWIE" draft="contributed">Kociewie</variant>
<variant type="KSCOR">Litriú Caighdeánach</variant>
- <variant type="LAUKIKA">LAUKIKA</variant>
- <variant type="LIPAW">LIPAW</variant>
- <variant type="LUNA1918">LUNA1918</variant>
+ <variant type="LAUKIKA" draft="contributed">Laukika</variant>
+ <variant type="LIPAW" draft="provisional">Canúint Lipovaz de Resian</variant>
+ <variant type="LUNA1918" draft="contributed">Luna1918</variant>
<variant type="METELKO">Aibítir Metelko</variant>
<variant type="MONOTON">Aontonach</variant>
- <variant type="NDYUKA">NDYUKA</variant>
- <variant type="NEDIS">NEDIS</variant>
+ <variant type="NDYUKA" draft="provisional">Canúint Ndyuka</variant>
+ <variant type="NEDIS" draft="provisional">Canúint Natisone</variant>
<variant type="NEWFOUND">Talamh an Éisc</variant>
- <variant type="NJIVA">NJIVA</variant>
+ <variant type="NJIVA" draft="contributed">Canúint Gniva/Njiva</variant>
<variant type="NULIK">Volapük Nua-Aimseartha</variant>
- <variant type="OSOJS">OSOJS</variant>
+ <variant type="OSOJS" draft="provisional">Canúint Oseacco/Osojane</variant>
<variant type="OXENDICT">Litriú OED</variant>
- <variant type="PAHAWH2">PAHAWH2</variant>
- <variant type="PAHAWH3">PAHAWH3</variant>
- <variant type="PAHAWH4">PAHAWH4</variant>
- <variant type="PAMAKA">PAMAKA</variant>
- <variant type="PETR1708">PETR1708</variant>
+ <variant type="PAHAWH2" draft="contributed">Pahawh2</variant>
+ <variant type="PAHAWH3" draft="contributed">Pahawh3</variant>
+ <variant type="PAHAWH4" draft="contributed">Pahawh4</variant>
+ <variant type="PAMAKA" draft="provisional">Canúint Pamaka</variant>
+ <variant type="PETR1708" draft="contributed">Petr1708</variant>
<variant type="PINYIN">Rómhánú Pinyin</variant>
<variant type="POLYTON">Iltonach</variant>
<variant type="POSIX">Ríomhaire</variant>
- <variant type="PUTER">PUTER</variant>
+ <variant type="PUTER" draft="contributed">Puter</variant>
<variant type="REVISED">Litriú Athbhreithnithe</variant>
<variant type="RIGIK">Volapük Clasaiceach</variant>
- <variant type="ROZAJ">ROZAJ</variant>
- <variant type="RUMGR">RUMGR</variant>
- <variant type="SAAHO">SAAHO</variant>
+ <variant type="ROZAJ" draft="contributed">Reisiach</variant>
+ <variant type="RUMGR" draft="contributed">Rumgr</variant>
+ <variant type="SAAHO" draft="contributed">Saho</variant>
<variant type="SCOTLAND">Béarla Caighdeánach na hAlban</variant>
<variant type="SCOUSE">Béarla Learphoill</variant>
<variant type="SIMPLE">Simplí</variant>
- <variant type="SOLBA">SOLBA</variant>
- <variant type="SOTAV">SOTAV</variant>
- <variant type="SPANGLIS">SPANGLIS</variant>
- <variant type="SURMIRAN">SURMIRAN</variant>
- <variant type="SURSILV">SURSILV</variant>
- <variant type="SUTSILV">SUTSILV</variant>
- <variant type="TARASK">TARASK</variant>
+ <variant type="SOLBA" draft="provisional">Canúint Stolvizza/Solbica</variant>
+ <variant type="SOTAV" draft="provisional">Grúpa canúna Sotavento de Kabuverdianu</variant>
+ <variant type="SPANGLIS" draft="contributed">Spainglis</variant>
+ <variant type="SURMIRAN" draft="contributed">Surmiran</variant>
+ <variant type="SURSILV" draft="contributed">Sursilvan</variant>
+ <variant type="SUTSILV" draft="contributed">Sutsilv</variant>
+ <variant type="TARASK" draft="provisional">Ortografaíocht Taraskievica</variant>
<variant type="UCCOR">Litriú Comhaontaithe</variant>
<variant type="UCRCOR">Litriú Comhaontaithe Athbhreithnithe</variant>
<variant type="ULSTER">Cúige Uladh</variant>
<variant type="UNIFON">Aibítir foghraíochta Unifon</variant>
<variant type="VAIDIKA">Véideach</variant>
<variant type="VALENCIA">Vaileinsis</variant>
- <variant type="VALLADER">VALLADER</variant>
+ <variant type="VALLADER" draft="contributed">Vallader</variant>
<variant type="WADEGILE">Rómhánú Wade-Giles</variant>
- <variant type="XSISTEMO">XSISTEMO</variant>
+ <variant type="XSISTEMO" draft="contributed">Xsistemo</variant>
</variants>
<keys>
<key type="calendar">Féilire</key>
@@ -1054,15 +905,15 @@
<type key="calendar" type="coptic">Féilire Coptach</type>
<type key="calendar" type="dangi">Féilire Dangi</type>
<type key="calendar" type="ethiopic">Féilire Aetóipice</type>
- <type key="calendar" type="ethiopic-amete-alem">ethiopic-amete-alem</type>
+ <type key="calendar" type="ethiopic-amete-alem">Féilire Aetóipice Amete Alem</type>
<type key="calendar" type="gregorian">Féilire Ghréagóra</type>
<type key="calendar" type="hebrew">Féilire na nEabhrach</type>
<type key="calendar" type="indian">Féilire Náisiúnta na hIndia</type>
<type key="calendar" type="islamic">Féilire Ioslamach</type>
- <type key="calendar" type="islamic-civil">islamic-civil</type>
- <type key="calendar" type="islamic-rgsa">islamic-rgsa</type>
- <type key="calendar" type="islamic-tbla">islamic-tbla</type>
- <type key="calendar" type="islamic-umalqura">islamic-umalqura</type>
+ <type key="calendar" type="islamic-civil" draft="provisional">Féilire Ioslamach (táblach, seanré shibhialta)</type>
+ <type key="calendar" type="islamic-rgsa" draft="provisional">Féilire Ioslamach (an Araib Shádach, dearcadh)</type>
+ <type key="calendar" type="islamic-tbla" draft="provisional">Féilire Ioslamach (táblach, seanré réalteolaíoch)</type>
+ <type key="calendar" type="islamic-umalqura" draft="provisional">Féilire Ioslamach (Umm al-Qura)</type>
<type key="calendar" type="iso8601">Féilire ISO-8601</type>
<type key="calendar" type="japanese">Féilire Seapánach</type>
<type key="calendar" type="persian">Féilire Peirseach</type>
@@ -1070,22 +921,22 @@
<type key="cf" type="account">Formáid Airgeadra don Chuntasaíocht</type>
<type key="cf" type="standard">Formáid Airgeadra Caighdeánach</type>
<type key="collation" type="big5han">Ord sórtála Síneach traidisiúnta - Big5</type>
- <type key="collation" type="compat">compat</type>
- <type key="collation" type="dictionary">dictionary</type>
+ <type key="collation" type="compat" draft="provisional">Ord Sórtála Roimhe Seo, ar son na comhoiriúnachta</type>
+ <type key="collation" type="dictionary">Ord Sórtála Foclóirí</type>
<type key="collation" type="ducet">Ord Sórtála Réamhshocraithe Unicode</type>
- <type key="collation" type="emoji">emoji</type>
- <type key="collation" type="eor">eor</type>
+ <type key="collation" type="emoji">Ord Sórtála Emoji</type>
+ <type key="collation" type="eor" draft="provisional">Rialacha Ordaithe Eorpacha</type>
<type key="collation" type="gb2312han">Ord sórtála Síneach simplithe - GB 2312</type>
<type key="collation" type="phonebook">Ord sórtála an eolaire teileafóin</type>
<type key="collation" type="pinyin">Ord sórtála pinyin</type>
- <type key="collation" type="reformed">reformed</type>
+ <type key="collation" type="reformed" draft="provisional">Ord Sórtála Athfhoirmithe</type>
<type key="collation" type="search">Cuardach Ilfhóinteach</type>
- <type key="collation" type="searchjl">searchjl</type>
+ <type key="collation" type="searchjl" draft="provisional">Cuardach de réir Consan Tosaigh Hangul</type>
<type key="collation" type="standard">Ord Sórtála Caighdeánach</type>
<type key="collation" type="stroke">Ord sórtála stríce</type>
<type key="collation" type="traditional">Ord sórtála traidisiúnta</type>
- <type key="collation" type="unihan">unihan</type>
- <type key="collation" type="zhuyin">zhuyin</type>
+ <type key="collation" type="unihan" draft="provisional">Ord Sórtála Stríce Radacaí</type>
+ <type key="collation" type="zhuyin" draft="provisional">Ord Sórtála Zhuyin</type>
<type key="hc" type="h11">Córas 12 Uair (0–11)</type>
<type key="hc" type="h12">Córas 12 Uair (1–12)</type>
<type key="hc" type="h23">Córas 24 Uair (0–23)</type>
@@ -1096,22 +947,22 @@
<type key="ms" type="metric">Córas Méadrach</type>
<type key="ms" type="uksystem">Córas Tomhais Reachtúil</type>
<type key="ms" type="ussystem">Córas Tomhais SAM</type>
- <type key="numbers" type="ahom">ahom</type>
+ <type key="numbers" type="ahom">Digití Ahom</type>
<type key="numbers" type="arab">Digití Ind-Arabacha</type>
<type key="numbers" type="arabext">Digití Ind-Arabacha Breisithe</type>
<type key="numbers" type="armn">Uimhreacha Airméanacha</type>
<type key="numbers" type="armnlow">Uimhreacha Cás Íochtair Airméanacha</type>
<type key="numbers" type="bali">Digití Bailíocha</type>
<type key="numbers" type="beng">Digití Beangálacha</type>
- <type key="numbers" type="brah">brah</type>
- <type key="numbers" type="cakm">cakm</type>
- <type key="numbers" type="cham">cham</type>
+ <type key="numbers" type="brah">Digití Brahmi</type>
+ <type key="numbers" type="cakm">Digití Chakma</type>
+ <type key="numbers" type="cham">Digití Cham</type>
<type key="numbers" type="cyrl">Uimhreacha Coireallacha</type>
<type key="numbers" type="deva">Digití Déiveanágracha</type>
<type key="numbers" type="ethi">Uimhreacha Aetóipice</type>
<type key="numbers" type="fullwide">Digití Lánleithid</type>
<type key="numbers" type="geor">Uimhreacha Seoirseacha</type>
- <type key="numbers" type="gonm">gonm</type>
+ <type key="numbers" type="gonm" draft="provisional">Digití Masaram Gondi</type>
<type key="numbers" type="grek">Uimhreacha Gréagacha</type>
<type key="numbers" type="greklow">Uimhreacha Cás Íochtair Gréagacha</type>
<type key="numbers" type="gujr">Digití Gúisearátacha</type>
@@ -1122,54 +973,54 @@
<type key="numbers" type="hant">Uimhreacha sa tSínis Thraidisiúnta</type>
<type key="numbers" type="hantfin">Uimhreacha Airgeadúla sa tSínis Thraidisiúnta</type>
<type key="numbers" type="hebr">Uimhreacha Eabhracha</type>
- <type key="numbers" type="hmng">hmng</type>
+ <type key="numbers" type="hmng" draft="provisional">Digití Pahawh Hmong</type>
<type key="numbers" type="java">Digití Iávacha</type>
<type key="numbers" type="jpan">Uimhreacha Seapánacha</type>
<type key="numbers" type="jpanfin">Uimhreacha Airgeadúla Seapánacha</type>
- <type key="numbers" type="kali">kali</type>
+ <type key="numbers" type="kali" draft="provisional">Digití Kayah Li</type>
<type key="numbers" type="khmr">Digití Ciméaracha</type>
<type key="numbers" type="knda">Digití Cannadacha</type>
- <type key="numbers" type="lana">lana</type>
- <type key="numbers" type="lanatham">lanatham</type>
+ <type key="numbers" type="lana" draft="provisional">Digití Tai Tham Hora</type>
+ <type key="numbers" type="lanatham" draft="provisional">Digití Tai Tham Tham</type>
<type key="numbers" type="laoo">Digití Laosacha</type>
<type key="numbers" type="latn">Digití Iartharacha</type>
- <type key="numbers" type="lepc">lepc</type>
- <type key="numbers" type="limb">limb</type>
- <type key="numbers" type="mathbold">mathbold</type>
- <type key="numbers" type="mathdbl">mathdbl</type>
- <type key="numbers" type="mathmono">mathmono</type>
- <type key="numbers" type="mathsanb">mathsanb</type>
- <type key="numbers" type="mathsans">mathsans</type>
+ <type key="numbers" type="lepc" draft="provisional">Digití Lepcha</type>
+ <type key="numbers" type="limb" draft="provisional">Digití Limbu</type>
+ <type key="numbers" type="mathbold" draft="provisional">Digití Troma Matamaiticiúla</type>
+ <type key="numbers" type="mathdbl" draft="provisional">Digití Stríce Dúbailte Matamaiticiúla</type>
+ <type key="numbers" type="mathmono" draft="provisional">Digití Aonspáis Matamaiticiúla</type>
+ <type key="numbers" type="mathsanb" draft="provisional">Digití Troma Sans-Serif Matamaiticiúla</type>
+ <type key="numbers" type="mathsans" draft="provisional">Digití Sans-Serif Matamaiticiúla</type>
<type key="numbers" type="mlym">Digití Mailéalamacha</type>
- <type key="numbers" type="modi">modi</type>
+ <type key="numbers" type="modi" draft="provisional">Digití Modi</type>
<type key="numbers" type="mong">Digití Mongólacha</type>
- <type key="numbers" type="mroo">mroo</type>
- <type key="numbers" type="mtei">mtei</type>
+ <type key="numbers" type="mroo" draft="provisional">Digití Mro</type>
+ <type key="numbers" type="mtei" draft="provisional">Digití Meetei Mayek</type>
<type key="numbers" type="mymr">Digití Maenmaracha</type>
- <type key="numbers" type="mymrshan">mymrshan</type>
- <type key="numbers" type="mymrtlng">mymrtlng</type>
- <type key="numbers" type="nkoo">nkoo</type>
- <type key="numbers" type="olck">olck</type>
+ <type key="numbers" type="mymrshan" draft="provisional">Digití Myanmar Shan</type>
+ <type key="numbers" type="mymrtlng" draft="provisional">Digití Myanmar Tai Laing</type>
+ <type key="numbers" type="nkoo" draft="provisional">Digití N’ko</type>
+ <type key="numbers" type="olck" draft="provisional">Digití Ol Chiki</type>
<type key="numbers" type="orya">Digití Oiríseacha</type>
- <type key="numbers" type="osma">osma</type>
+ <type key="numbers" type="osma" draft="provisional">Digití Osmanya</type>
<type key="numbers" type="roman">Uimhreacha Rómhánacha</type>
<type key="numbers" type="romanlow">Uimhreacha Cás Íochtair Rómhánacha</type>
- <type key="numbers" type="saur">saur</type>
- <type key="numbers" type="shrd">shrd</type>
- <type key="numbers" type="sind">sind</type>
- <type key="numbers" type="sinh">sinh</type>
- <type key="numbers" type="sora">sora</type>
- <type key="numbers" type="sund">sund</type>
- <type key="numbers" type="takr">takr</type>
- <type key="numbers" type="talu">talu</type>
+ <type key="numbers" type="saur" draft="provisional">Digití Saurashtra</type>
+ <type key="numbers" type="shrd" draft="provisional">Digití Sharada</type>
+ <type key="numbers" type="sind" draft="provisional">Digití Khudawadi</type>
+ <type key="numbers" type="sinh" draft="provisional">Digití Sinhala Lith</type>
+ <type key="numbers" type="sora" draft="provisional">Digití Sora Sompeng</type>
+ <type key="numbers" type="sund" draft="provisional">Digití Sundainéise</type>
+ <type key="numbers" type="takr" draft="provisional">Digití Takri</type>
+ <type key="numbers" type="talu" draft="provisional">Digití Tai Lue Nua</type>
<type key="numbers" type="taml">Uimhreacha Traidisiúnta Tamalacha</type>
<type key="numbers" type="tamldec">Digití Tamalacha</type>
<type key="numbers" type="telu">Digití Teileagúcha</type>
<type key="numbers" type="thai">Digití Téalannacha</type>
<type key="numbers" type="tibt">Digití Tibéadacha</type>
- <type key="numbers" type="tirh">tirh</type>
- <type key="numbers" type="vaii">vaii</type>
- <type key="numbers" type="wara">wara</type>
+ <type key="numbers" type="tirh" draft="provisional">Digití Tirhuta</type>
+ <type key="numbers" type="vaii" draft="provisional">Digití Vai</type>
+ <type key="numbers" type="wara" draft="provisional">Digití Warang Citi</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Méadrach</measurementSystemName>
@@ -5120,7 +4971,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Am Oileán Norfolk</standard>
+ <generic draft="contributed">Am Oileán Norfolk</generic>
+ <standard draft="contributed">Am Caighdeánach Oileán Norfolk</standard>
+ <daylight draft="contributed">Am Samhraidh Oileán Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5797,7 +5650,7 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="ATS">
- <displayName>ATS</displayName>
+ <displayName>Scilling na hOstaire</displayName>
<displayName count="one">Scilling Ostarach</displayName>
<displayName count="two">Scilling Ostarach</displayName>
<displayName count="few">Scilling Ostarach</displayName>
@@ -5885,7 +5738,7 @@
<symbol alt="narrow" draft="contributed">৳</symbol>
</currency>
<currency type="BEC">
- <displayName>BEC</displayName>
+ <displayName>Franc na Beilge (inmhalartaithe)</displayName>
<displayName count="one">Franc Beilgeach (inathraithe)</displayName>
<displayName count="two">Franc Beilgeach (inathraithe)</displayName>
<displayName count="few">Franc Beilgeach (inathraithe)</displayName>
@@ -5903,7 +5756,7 @@
<symbol draft="contributed">BEF</symbol>
</currency>
<currency type="BEL">
- <displayName>BEL</displayName>
+ <displayName>Franc na Beilge (airgeadais)</displayName>
<displayName count="one">Franc Beilgeach (airgeadúil)</displayName>
<displayName count="two">Franc Beilgeach (airgeadúil)</displayName>
<displayName count="few">Franc Beilgeach (airgeadúil)</displayName>
@@ -6204,12 +6057,6 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="two">CNH</displayName>
- <displayName count="few">CNH</displayName>
- <displayName count="many">CNH</displayName>
- <displayName count="other">CNH</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNY">
@@ -6312,7 +6159,7 @@
<symbol alt="narrow" draft="contributed">Kč</symbol>
</currency>
<currency type="DDM">
- <displayName>DDM</displayName>
+ <displayName>Marc Ghearmáin an Oirthir</displayName>
<displayName count="one">Ostmark na hOirGhearmáine</displayName>
<displayName count="two">Ostmark na hOirGhearmáine</displayName>
<displayName count="few">Ostmark na hOirGhearmáine</displayName>
@@ -6478,7 +6325,7 @@
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="FRF">
- <displayName>FRF</displayName>
+ <displayName draft="provisional">Franc na Fraince</displayName>
<displayName count="one">Franc Francach</displayName>
<displayName count="two">Franc Francach</displayName>
<displayName count="few">Franc Francach</displayName>
@@ -6961,12 +6808,12 @@
<symbol draft="contributed">LTT</symbol>
</currency>
<currency type="LUC">
- <displayName>LUC</displayName>
- <displayName count="one">LUC</displayName>
- <displayName count="two">LUC</displayName>
- <displayName count="few">LUC</displayName>
- <displayName count="many">LUC</displayName>
- <displayName count="other">LUC</displayName>
+ <displayName draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
+ <displayName count="one" draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
+ <displayName count="two" draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
+ <displayName count="few" draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
+ <displayName count="many" draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
+ <displayName count="other" draft="provisional">Franc Inmhalartach Lucsamburgach</displayName>
<symbol draft="contributed">LUC</symbol>
</currency>
<currency type="LUF">
@@ -6989,7 +6836,7 @@
<symbol alt="narrow" draft="contributed">Ls</symbol>
</currency>
<currency type="LVR">
- <displayName>LVR</displayName>
+ <displayName draft="provisional">Rúbal na Laitvia</displayName>
<displayName count="one">Rúbal Laitviach</displayName>
<displayName count="two">Rúbal Laitviach</displayName>
<displayName count="few">Rúbal Laitviach</displayName>
@@ -7195,7 +7042,7 @@
<symbol draft="contributed">MXP</symbol>
</currency>
<currency type="MXV">
- <displayName>MXV</displayName>
+ <displayName draft="provisional">Aonad Infheistíochta Meicsiceach</displayName>
<displayName count="one">Unidad de Inversion (UDI) Meicsiceo</displayName>
<displayName count="two">Unidad de Inversion (UDI) Meicsiceo</displayName>
<displayName count="few">Unidad de Inversion (UDI) Meicsiceo</displayName>
@@ -8181,7 +8028,7 @@
<symbol draft="contributed">YUM</symbol>
</currency>
<currency type="YUN">
- <displayName>YUN</displayName>
+ <displayName draft="provisional">Dinar Inmhalartaithe Iúgslavach (1990–1992)</displayName>
<displayName count="one">Dínear Inathraithe Iúgslavach</displayName>
<displayName count="two">Dínear Inathraithe Iúgslavach</displayName>
<displayName count="few">Dínear Inathraithe Iúgslavach</displayName>
@@ -8276,9 +8123,85 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deici{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ceinti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micri{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nanai{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pici{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>feimti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atai{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zeipti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yoctai{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deacai{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>heicti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>cili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>meigi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>gigi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>teiri{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peiti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eicsi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeiti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotai{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} sa {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} cearnach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cearnaithe</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} chearnaithe</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} ciúbach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} ciúbach</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8290,7 +8213,7 @@
<unitPattern count="many">{0} g-fhórsa</unitPattern>
<unitPattern count="other">{0} g-fhórsa</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>méadair sa soicind cearnaithe</displayName>
<unitPattern count="one">{0} mhéadar sa soicind cearnaithe</unitPattern>
<unitPattern count="two">{0} mhéadar sa soicind cearnaithe</unitPattern>
@@ -8447,7 +8370,7 @@
<unitPattern count="many">{0} milleamól sa lítear</unitPattern>
<unitPattern count="other">{0} milleamól sa lítear</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>codanna sa mhilliún</displayName>
<unitPattern count="one">{0} sa mhilliún</unitPattern>
<unitPattern count="two">{0} sa mhilliún</unitPattern>
@@ -8495,7 +8418,7 @@
<unitPattern count="many">{0} lítear sa chiliméadar</unitPattern>
<unitPattern count="other">{0} lítear sa chiliméadar</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lítir sa 100 ciliméadar</displayName>
<unitPattern count="one">{0} lítear sa 100 ciliméadar</unitPattern>
<unitPattern count="two">{0} lítear sa 100 ciliméadar</unitPattern>
@@ -9271,7 +9194,7 @@
<unitPattern count="many">{0} n-each-chumhacht</unitPattern>
<unitPattern count="other">{0} each-chumhacht</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milliméadair mhearcair</displayName>
<unitPattern count="one">{0} mhilliméadar mearcair</unitPattern>
<unitPattern count="two">{0} mhilliméadar mearcair</unitPattern>
@@ -9279,7 +9202,7 @@
<unitPattern count="many">{0} milliméadar mearcair</unitPattern>
<unitPattern count="other">{0} milliméadar mearcair</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>puint san orlach cearnach</displayName>
<unitPattern count="one">{0} phunt san orlach cearnach</unitPattern>
<unitPattern count="two">{0} phunt san orlach cearnach</unitPattern>
@@ -9287,7 +9210,7 @@
<unitPattern count="many">{0} bpunt san orlach cearnach</unitPattern>
<unitPattern count="other">{0} punt san orlach cearnach</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>orlaí mearcair</displayName>
<unitPattern count="one">{0} orlach mearcair</unitPattern>
<unitPattern count="two">{0} orlach mearcair</unitPattern>
@@ -9415,7 +9338,7 @@
<unitPattern count="many">{0} gcéim cheilvin</unitPattern>
<unitPattern count="other">{0} céim cheilvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>punt-troigh</displayName>
<unitPattern count="one">{0} punt-troigh</unitPattern>
<unitPattern count="two">{0} lbf⋅ft</unitPattern>
@@ -9661,9 +9584,85 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9675,7 +9674,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -9832,7 +9831,7 @@
<unitPattern count="many">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>codanna/milliún</displayName>
<unitPattern count="one">{0}/milliún</unitPattern>
<unitPattern count="two">{0}/milliún</unitPattern>
@@ -9880,7 +9879,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="two">{0} l/100km</unitPattern>
@@ -10656,7 +10655,7 @@
<unitPattern count="many">{0} ec</unitPattern>
<unitPattern count="other">{0} ec</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="two">{0} mm Hg</unitPattern>
@@ -10664,7 +10663,7 @@
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psoc</displayName>
<unitPattern count="one">{0} psoc</unitPattern>
<unitPattern count="two">{0} psoc</unitPattern>
@@ -10672,7 +10671,7 @@
<unitPattern count="many">{0} psoc</unitPattern>
<unitPattern count="other">{0} psoc</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>orlaí Hg</displayName>
<unitPattern count="one">{0} or. Hg</unitPattern>
<unitPattern count="two">{0} or. Hg</unitPattern>
@@ -10800,7 +10799,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="two">{0} lbf⋅ft</unitPattern>
@@ -11046,9 +11045,85 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -11060,7 +11135,7 @@
<unitPattern count="many">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="two">{0}m/s²</unitPattern>
@@ -11209,7 +11284,7 @@
<unitPattern count="many">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>codanna/milliún</displayName>
<unitPattern count="one">{0}/milliún</unitPattern>
<unitPattern count="two">{0}/milliún</unitPattern>
@@ -11233,7 +11308,7 @@
<unitPattern count="many">{0}l/km</unitPattern>
<unitPattern count="other">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="two">{0}l/100km</unitPattern>
@@ -11857,7 +11932,7 @@
<unitPattern count="many">{0}ec</unitPattern>
<unitPattern count="other">{0}ec</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0}mmHg</unitPattern>
<unitPattern count="two">{0}mmHg</unitPattern>
@@ -11865,7 +11940,7 @@
<unitPattern count="many">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psoc</displayName>
<unitPattern count="one">{0}psoc</unitPattern>
<unitPattern count="two">{0}psoc</unitPattern>
@@ -11873,7 +11948,7 @@
<unitPattern count="many">{0}psoc</unitPattern>
<unitPattern count="other">{0}psoc</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>orlaí Hg</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="two">{0}" Hg</unitPattern>
diff --git a/common/main/ga_GB.xml b/common/main/ga_GB.xml
index 470466e..89753b5 100644
--- a/common/main/ga_GB.xml
+++ b/common/main/ga_GB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ga_IE.xml b/common/main/ga_IE.xml
index 9fe6dff..8da8390 100644
--- a/common/main/ga_IE.xml
+++ b/common/main/ga_IE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gd.xml b/common/main/gd.xml
index 9b89e14..436b0e5 100644
--- a/common/main/gd.xml
+++ b/common/main/gd.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -177,6 +177,7 @@
<language type="ewo">Ewondo</language>
<language type="ext">Cànan na h-Extremadura</language>
<language type="fa">Peirsis</language>
+ <language type="fa_AF">Dari</language>
<language type="fan">Fang</language>
<language type="fat">Fanti</language>
<language type="ff">Fulah</language>
@@ -749,7 +750,7 @@
<script type="Phnx">Pheniceach</script>
<script type="Plrd">Miao Phollard</script>
<script type="Prti">Partais snaidh-sgrìobhte</script>
- <script type="Qaag">Qaag</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Rejang</script>
<script type="Rohg">Hanifi Rohingya</script>
<script type="Roro">Rongorongo</script>
@@ -1126,13 +1127,13 @@
<variant type="1694ACAD">Nua-Fhraingis thràth</variant>
<variant type="1959ACAD">Bealaruisis Acadamaigeach</variant>
<variant type="ABL1943">Gnàthas-litreachaidh 1943</variant>
- <variant type="AKUAPEM">AKUAPEM</variant>
+ <variant type="AKUAPEM">Akuapem</variant>
<variant type="ALALC97">Ròmanachadh ALA-LC 1997</variant>
<variant type="ALUKU">Dual-chainnt Aluku</variant>
<variant type="AO1990">Aonta litreachadh na Portagailise 1990</variant>
<variant type="AREVELA">Airmeinis an Ear</variant>
<variant type="AREVMDA">Airmeinis an Iar</variant>
- <variant type="ASANTE">ASANTE</variant>
+ <variant type="ASANTE">Asante</variant>
<variant type="BAKU1926">Abidil Laideann aonaichte na Turcaise</variant>
<variant type="BALANKA">Dual-chainnt Balanka de Anii</variant>
<variant type="BARLA">Dual-chainntean Barlavento de Kabuverdianu</variant>
@@ -1148,15 +1149,15 @@
<variant type="EKAVSK">Sèirbhis le fuaimneachadh iarach</variant>
<variant type="EMODENG">Nua-Bheurla thràth</variant>
<variant type="FONIPA">Comharran fuaim-eòlais an IPA</variant>
- <variant type="FONNAPA">FONNAPA</variant>
+ <variant type="FONNAPA">Aibidil Fhuaim-eòlach Aimeireaga a Tuath</variant>
<variant type="FONUPA">Comharran fuaim-eòlais an UPA</variant>
- <variant type="FONXSAMP">FONXSAMP</variant>
+ <variant type="FONXSAMP">Tar-sgrìobhadh X-SAMPA</variant>
<variant type="HEPBURN">Ròmanachadh Hepburn</variant>
<variant type="HOGNORSK">Høgnorsk</variant>
- <variant type="HSISTEMO">HSISTEMO</variant>
+ <variant type="HSISTEMO">Roghainn-èiginn stannardach litreachadh na h-Esperanto le h</variant>
<variant type="IJEKAVSK">Sèirbis le fuaimneachadh Ijekavia</variant>
<variant type="ITIHASA">Itihasa</variant>
- <variant type="IVANCHOV">IVANCHOV</variant>
+ <variant type="IVANCHOV">Bulgarian in 1899 orthography = Bulgairis le litreachadh na bliadhna 1899</variant>
<variant type="JAUER">Jauer</variant>
<variant type="JYUTPING">Jyutping</variant>
<variant type="KKCOR">Litreachadh coitcheann</variant>
@@ -1164,7 +1165,7 @@
<variant type="KSCOR">Litreachadh stannardach</variant>
<variant type="LAUKIKA">Laukika</variant>
<variant type="LIPAW">Dual-chainnt Lipovaz Resia</variant>
- <variant type="LUNA1918">LUNA1918</variant>
+ <variant type="LUNA1918">Litreachadh na Ruisise às dèidh 1917</variant>
<variant type="METELKO">Aibidil Metelko</variant>
<variant type="MONOTON">Greugais mhonotonach</variant>
<variant type="NDYUKA">Dual-chainnt Ndyuka</variant>
@@ -1190,7 +1191,7 @@
<variant type="SAAHO">Saho</variant>
<variant type="SCOTLAND">Beurla Stannardach na h-Alba</variant>
<variant type="SCOUSE">Scouse</variant>
- <variant type="SIMPLE">SIMPLE</variant>
+ <variant type="SIMPLE">Samhlaidhean sìmplichte</variant>
<variant type="SOLBA">Dual-chainnt Stolvizza/Solbica</variant>
<variant type="SOTAV">Dual-chainntean Sotavento de Kabuverdianu</variant>
<variant type="SPANGLIS">Spanglish</variant>
@@ -1206,7 +1207,7 @@
<variant type="VALENCIA">Valencià</variant>
<variant type="VALLADER">Vallader</variant>
<variant type="WADEGILE">Ròmanachadh Wade-Giles</variant>
- <variant type="XSISTEMO">XSISTEMO</variant>
+ <variant type="XSISTEMO">Roghainn-èiginn stannardach litreachadh na h-Esperanto le x</variant>
</variants>
<keys>
<key type="calendar">Mìosachan</key>
@@ -6243,7 +6244,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Àm Eilein Norfolk</standard>
+ <generic draft="contributed">Àm Eilein Norfolk</generic>
+ <standard draft="contributed">Bun-àm Eilein Norfolk</standard>
+ <daylight draft="contributed">Tìde samhraidh Eilein Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -10032,9 +10035,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deicheamh-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ceuda{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micreo-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piceo-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deaca-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>heacta-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>cile{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>meaga-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta-{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} / {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} ceàrnagach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} ceàrnagach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">{0} cheàrnagach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0} ceàrnagach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} ceàrnagach</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} ciùbach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} ciùbach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">{0} chiùbach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0} ciùbach</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} ciùbach</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10045,7 +10122,7 @@
<unitPattern count="few">{0} forsan-g</unitPattern>
<unitPattern count="other">{0} forsa-g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meatair san diog cheàrnagach</displayName>
<unitPattern count="one">{0} mheatair san diog cheàrnagach</unitPattern>
<unitPattern count="two">{0} mheatair san diog cheàrnagach</unitPattern>
@@ -10183,7 +10260,7 @@
<unitPattern count="few">{0} milimòlaichean san liotair</unitPattern>
<unitPattern count="other">{0} milimòl san liotair</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>pàirt sa mhillean</displayName>
<unitPattern count="one">{0} phàirt sa mhillean</unitPattern>
<unitPattern count="two">{0} phàirt sa mhillean</unitPattern>
@@ -10225,7 +10302,7 @@
<unitPattern count="few">{0} liotairean sa chilemeatair</unitPattern>
<unitPattern count="other">{0} liotair sa chilemeatair</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liotair sa 100 chilemeatair</displayName>
<unitPattern count="one">{0} liotair sa 100 chilemeatair</unitPattern>
<unitPattern count="two">{0} liotair sa 100 chilemeatair</unitPattern>
@@ -10906,21 +10983,21 @@
<unitPattern count="few">{0} cumhachdan-eich</unitPattern>
<unitPattern count="other">{0} cumhachd-eich</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimeatair de dh’airgead-beò</displayName>
<unitPattern count="one">{0} mhilimeatair de dh’airgead-beò</unitPattern>
<unitPattern count="two">{0} mhilimeatair de dh’airgead-beò</unitPattern>
<unitPattern count="few">{0} milimeatairean de dh’airgead-beò</unitPattern>
<unitPattern count="other">{0} milimeatair de dh’airgead-beò</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>punnd san òirleach cheàrnagach</displayName>
<unitPattern count="one">{0} phunnd san òirleach cheàrnagach</unitPattern>
<unitPattern count="two">{0} phunnd san òirleach cheàrnagach</unitPattern>
<unitPattern count="few">{0} puinnd san òirleach cheàrnagach</unitPattern>
<unitPattern count="other">{0} punnd san òirleach cheàrnagach</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>òirleach de dh’airgead-beò</displayName>
<unitPattern count="one">{0} òirleach de dh’airgead-beò</unitPattern>
<unitPattern count="two">{0} òirleach de dh’airgead-beò</unitPattern>
@@ -11032,7 +11109,7 @@
<unitPattern count="few">{0} ceuman Kelvin</unitPattern>
<unitPattern count="other">{0} ceum Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>troigh-phuinnd</displayName>
<unitPattern count="one">{0} troigh-phuinnd</unitPattern>
<unitPattern count="two">{0} throigh-phuinnd</unitPattern>
@@ -11249,9 +11326,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -11262,7 +11413,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meatair/diog²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -11400,7 +11551,7 @@
<unitPattern count="few">{0} mmòl/L</unitPattern>
<unitPattern count="other">{0} mmòl/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="two">{0} ppm</unitPattern>
@@ -11442,7 +11593,7 @@
<unitPattern count="few">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="two">{0} L/100km</unitPattern>
@@ -12123,21 +12274,21 @@
<unitPattern count="few">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="two">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="two">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -12249,7 +12400,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="two">{0} lbf⋅ft</unitPattern>
@@ -12466,9 +12617,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -12479,7 +12704,7 @@
<unitPattern count="few">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0}m/s²</unitPattern>
<unitPattern count="two">{0}m/s²</unitPattern>
@@ -12617,7 +12842,7 @@
<unitPattern count="few">{0}mmòl/L</unitPattern>
<unitPattern count="other">{0}mmòl/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0}ppm</unitPattern>
<unitPattern count="two">{0}ppm</unitPattern>
@@ -12659,7 +12884,7 @@
<unitPattern count="few">{0}L/km</unitPattern>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="two">{0}L/100km</unitPattern>
@@ -13340,21 +13565,21 @@
<unitPattern count="few">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0}mm Hg</unitPattern>
<unitPattern count="two">{0}mm Hg</unitPattern>
<unitPattern count="few">{0}mm Hg</unitPattern>
<unitPattern count="other">{0}mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0}psi</unitPattern>
<unitPattern count="two">{0}psi</unitPattern>
<unitPattern count="few">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>″ Hg</displayName>
<unitPattern count="one">{0}″ Hg</unitPattern>
<unitPattern count="two">{0}″ Hg</unitPattern>
@@ -13466,7 +13691,7 @@
<unitPattern count="few">{0}K</unitPattern>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0}lbf⋅ft</unitPattern>
<unitPattern count="two">{0}lbf⋅ft</unitPattern>
diff --git a/common/main/gd_GB.xml b/common/main/gd_GB.xml
index fa567d7..6988cbe 100644
--- a/common/main/gd_GB.xml
+++ b/common/main/gd_GB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gl.xml b/common/main/gl.xml
index e8c8329..518d825 100644
--- a/common/main/gl.xml
+++ b/common/main/gl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -68,7 +68,7 @@
<language type="bug">buginés</language>
<language type="byn">blin</language>
<language type="ca">catalán</language>
- <language type="ccp" draft="provisional">chakma</language>
+ <language type="ccp">chakma</language>
<language type="ce">checheno</language>
<language type="ceb">cebuano</language>
<language type="cgg">kiga</language>
@@ -122,6 +122,7 @@
<language type="eu">éuscaro</language>
<language type="ewo">ewondo</language>
<language type="fa">persa</language>
+ <language type="fa_AF">dari</language>
<language type="ff">fula</language>
<language type="fi">finés</language>
<language type="fil">filipino</language>
@@ -755,7 +756,7 @@
<territory type="TJ">Taxiquistán</territory>
<territory type="TK">Tokelau</territory>
<territory type="TL">Timor Leste</territory>
- <territory type="TL" alt="variant">TL</territory>
+ <territory type="TL" alt="variant">↑↑↑</territory>
<territory type="TM">Turkmenistán</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
@@ -4392,7 +4393,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Horario da Illa Norfolk</standard>
+ <generic draft="contributed">Horario da Illa Norfolk</generic>
+ <standard draft="contributed">Horario estándar da Illa Norfolk</standard>
+ <daylight draft="contributed">Horario de verán da Illa Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6071,9 +6074,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>fento{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>iocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>quilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>xiga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>iota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} por {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} cadrado</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cadrado</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cadrado</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} cúbico</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cúbico</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cúbico</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6082,7 +6155,7 @@
<unitPattern count="one">{0} forza G</unitPattern>
<unitPattern count="other">{0} forzas G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros por segundo cadrado</displayName>
<unitPattern count="one">{0} metro por segundo cadrado</unitPattern>
<unitPattern count="other">{0} metros por segundo cadrado</unitPattern>
@@ -6182,7 +6255,7 @@
<unitPattern count="one">{0} milimol por litro</unitPattern>
<unitPattern count="other">{0} milimoles por litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes por millón</displayName>
<unitPattern count="one">{0} parte por millón</unitPattern>
<unitPattern count="other">{0} partes por millón</unitPattern>
@@ -6212,7 +6285,7 @@
<unitPattern count="one">{0} litro por quilómetro</unitPattern>
<unitPattern count="other">{0} litros por quilómetro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros por 100 quilómetros</displayName>
<unitPattern count="one">{0} litro por 100 quilómetros</unitPattern>
<unitPattern count="other">{0} litros por 100 quilómetros</unitPattern>
@@ -6688,17 +6761,17 @@
<unitPattern count="one">{0} cabalo de potencia</unitPattern>
<unitPattern count="other">{0} cabalos de potencia</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetros de mercurio</displayName>
<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
<unitPattern count="other">{0} milímetros de mercurio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libras por polgada cadrada</displayName>
<unitPattern count="one">{0} libra por polgada cadrada</unitPattern>
<unitPattern count="other">{0} libras por polgada cadrada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>polgadas de mercurio</displayName>
<unitPattern count="one">{0} polgada de mercurio</unitPattern>
<unitPattern count="other">{0} polgadas de mercurio</unitPattern>
@@ -6778,7 +6851,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>libras pés</displayName>
<unitPattern count="one">{0} libra pé</unitPattern>
<unitPattern count="other">{0} libras pés</unitPattern>
@@ -6932,9 +7005,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6943,7 +7086,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7043,7 +7186,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7073,7 +7216,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7549,17 +7692,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7639,7 +7782,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf ft</displayName>
<unitPattern count="one">{0} lbf ft</unitPattern>
<unitPattern count="other">{0} lbf ft</unitPattern>
@@ -7793,9 +7936,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7808,7 +8021,7 @@
<unitPattern count="one">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
diff --git a/common/main/gl_ES.xml b/common/main/gl_ES.xml
index 7c71c52..9f2f5cb 100644
--- a/common/main/gl_ES.xml
+++ b/common/main/gl_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gsw.xml b/common/main/gsw.xml
index 3395030..62cb8f9 100644
--- a/common/main/gsw.xml
+++ b/common/main/gsw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -464,7 +464,6 @@
</languages>
<scripts>
<script type="Arab">Arabisch</script>
- <script type="Armi">Armi</script>
<script type="Armn">Armenisch</script>
<script type="Avst">Aveschtisch</script>
<script type="Bali">Balinesisch</script>
@@ -478,7 +477,6 @@
<script type="Buhd">Buhid</script>
<script type="Cans">UCAS</script>
<script type="Cari">Karisch</script>
- <script type="Cham">Cham</script>
<script type="Cher">Cherokee</script>
<script type="Cirt">Cirth</script>
<script type="Copt">Koptisch</script>
@@ -767,7 +765,6 @@
<territory type="MF">St. Martin</territory>
<territory type="MG">Madagaschkar</territory>
<territory type="MH">Marshallinsle</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Maali</territory>
<territory type="MM">Myanmar (Burma)</territory>
<territory type="MN">Mongolei</territory>
@@ -3571,7 +3568,7 @@
<unitPattern count="one" draft="unconfirmed">{0} Pferdestärke</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} Pferdestärke</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">Zoll Quecksilbersüüle</displayName>
<unitPattern count="one" draft="unconfirmed">{0} Zoll Quecksilbersüüle</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} Zoll Quecksilbersüüle</unitPattern>
@@ -3800,7 +3797,7 @@
<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">Zoll Quecksilbersüüle</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -3988,7 +3985,7 @@
<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/gsw_CH.xml b/common/main/gsw_CH.xml
index 93a5bd7..f78dc4f 100644
--- a/common/main/gsw_CH.xml
+++ b/common/main/gsw_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gsw_FR.xml b/common/main/gsw_FR.xml
index 5594617..c4f9cba 100644
--- a/common/main/gsw_FR.xml
+++ b/common/main/gsw_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gsw_LI.xml b/common/main/gsw_LI.xml
index 2472193..705ca89 100644
--- a/common/main/gsw_LI.xml
+++ b/common/main/gsw_LI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gu.xml b/common/main/gu.xml
index 933e84c..706d5bb 100644
--- a/common/main/gu.xml
+++ b/common/main/gu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -157,6 +157,7 @@
<language type="eu">બાસ્ક</language>
<language type="ewo">ઇવોન્ડો</language>
<language type="fa">ફારસી</language>
+ <language type="fa_AF">ડારી</language>
<language type="fan">ફેંગ</language>
<language type="fat">ફન્ટી</language>
<language type="ff">ફુલાહ</language>
@@ -202,7 +203,6 @@
<language type="gwi">ગ્વિચ’ઇન</language>
<language type="ha">હૌસા</language>
<language type="hai">હૈડા</language>
- <language type="hak">hak</language>
<language type="haw">હવાઇયન</language>
<language type="he">હીબ્રુ</language>
<language type="hi">હિન્દી</language>
@@ -213,7 +213,6 @@
<language type="ho">હિરી મોટૂ</language>
<language type="hr">ક્રોએશિયન</language>
<language type="hsb">અપર સોર્બિયન</language>
- <language type="hsn">hsn</language>
<language type="ht">હૈતિઅન ક્રેઓલે</language>
<language type="hu">હંગેરિયન</language>
<language type="hup">હૂપા</language>
@@ -349,7 +348,6 @@
<language type="myv">એર્ઝયા</language>
<language type="mzn">મઝાન્દેરાની</language>
<language type="na">નાઉરૂ</language>
- <language type="nan">nan</language>
<language type="nap">નેપોલિટાન</language>
<language type="naq">નમા</language>
<language type="nb">નોર્વેજિયન બોકમાલ</language>
@@ -531,7 +529,6 @@
<language type="was">વાશો</language>
<language type="wbp">વાર્લ્પીરી</language>
<language type="wo">વોલોફ</language>
- <language type="wuu">wuu</language>
<language type="xal">કાલ્મિક</language>
<language type="xh">ખોસા</language>
<language type="xog">સોગા</language>
@@ -5315,7 +5312,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>નોરફૉક આઇલેન્ડ સમય</standard>
+ <generic draft="contributed">નોરફૉક આઇલેન્ડ સમય</generic>
+ <standard draft="contributed">નોરફૉક આઇલેન્ડ માનક સમય</standard>
+ <daylight draft="contributed">નોરફૉક આઇલેન્ડ ગ્રીષ્મ સમય</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6868,9 +6867,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ડેસી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>સેન્ટી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>મિલી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>માઇક્રો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>નેનો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>પીકો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ફેમ્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>એટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ઝેપ્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>યોક્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ડેકા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>હેક્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>કિલો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>મેગા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ગિગા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ટેરા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>પિટા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>એગ્ઝા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ઝેટા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>યોટા{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} પ્રતિ {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ચોરસ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ચોરસ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ચોરસ {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ક્યુબિક {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ક્યુબિક {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ક્યુબિક {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6879,7 +6948,7 @@
<unitPattern count="one">{0} ગુ-બળ</unitPattern>
<unitPattern count="other">{0} ગુ-બળ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>મીટર પ્રતિ સેકન્ડ²</displayName>
<unitPattern count="one">{0} મીટર પ્રતિ સેકન્ડ²</unitPattern>
<unitPattern count="other">{0} મીટર પ્રતિ સેકન્ડ²</unitPattern>
@@ -6979,7 +7048,7 @@
<unitPattern count="one">{0} મિલિમોલ પ્રતિ લિટર</unitPattern>
<unitPattern count="other">{0} મિલિમોલ પ્રતિ લિટર</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>કણ પ્રતિ મિલિયન</displayName>
<unitPattern count="one">{0} કણ પ્રતિ મિલિયન</unitPattern>
<unitPattern count="other">{0} કણ પ્રતિ મિલિયન</unitPattern>
@@ -7009,7 +7078,7 @@
<unitPattern count="one">{0} લીટર પ્રતિ કિલોમીટર</unitPattern>
<unitPattern count="other">{0} લીટર પ્રતિ કિલોમીટર</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>લિટર પ્રતિ 100 કિલોમીટર</displayName>
<unitPattern count="one">{0} લિટર પ્રતિ 100 કિલોમીટર</unitPattern>
<unitPattern count="other">{0} લિટર પ્રતિ 100 કિલોમીટર</unitPattern>
@@ -7490,17 +7559,17 @@
<unitPattern count="one">{0} હોર્સપાવર</unitPattern>
<unitPattern count="other">{0} હોર્સપાવર</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>પારાનું મિલિમીટર</displayName>
<unitPattern count="one">{0} પારાનું મિલિમીટર</unitPattern>
<unitPattern count="other">{0} પારાનું મિલિમીટર</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>પાઉન્ડ પ્રતિ વર્ગ ઇંચ</displayName>
<unitPattern count="one">{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ</unitPattern>
<unitPattern count="other">{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>પારાના ઇંચ</displayName>
<unitPattern count="one">{0} પારાના ઇંચ</unitPattern>
<unitPattern count="other">{0} પારાના ઇંચ</unitPattern>
@@ -7580,7 +7649,7 @@
<unitPattern count="one">{0} કેલ્વિન</unitPattern>
<unitPattern count="other">{0} કેલ્વિન</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>પાઉન્ડ ફૂટ</displayName>
<unitPattern count="one">{0} પાઉન્ડ ફૂટ</unitPattern>
<unitPattern count="other">{0} પાઉન્ડ ફૂટ</unitPattern>
@@ -7734,9 +7803,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ડે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>સે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>મિ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ને.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>પી.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ફે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>એ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ઝેપ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>યોક.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ડા.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>હે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>કિ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>મે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ગિ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ટે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>પિ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>એગ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ઝે.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>યો.{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7745,7 +7884,7 @@
<unitPattern count="one">{0} ગુ</unitPattern>
<unitPattern count="other">{0} ગુ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>મીટર/સેકન્ડ²</displayName>
<unitPattern count="one">{0} મી/સે²</unitPattern>
<unitPattern count="other">{0} મી/સે²</unitPattern>
@@ -7845,7 +7984,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>કણ/મિલિયન</displayName>
<unitPattern count="one">{0} પીપીએમ</unitPattern>
<unitPattern count="other">{0} પીપીએમ</unitPattern>
@@ -7875,7 +8014,7 @@
<unitPattern count="one">{0} લીટર/કિમી</unitPattern>
<unitPattern count="other">{0} લીટર/કિમી</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>લિ/100 કિમી</displayName>
<unitPattern count="one">{0} લિ/100 કિમી</unitPattern>
<unitPattern count="other">{0} લિ/100 કિમી</unitPattern>
@@ -8356,17 +8495,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8446,7 +8585,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -8600,9 +8739,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ડેસી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>સેન્ટી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>મિલી{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>નેનો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>પીકો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ફેમ્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>એટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ઝેપ્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>યોક્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ડેકા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>હેક્ટો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>કિલો{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>મેગા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ગિગા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ટેરા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>પિટા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>એગ્ઝા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ઝેટા{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>યોટા{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8626,7 +8835,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>લિ/100 કિમી</displayName>
<unitPattern count="one">{0}લિ/100કિમી</unitPattern>
<unitPattern count="other">{0}લિ/100કિમી</unitPattern>
@@ -8779,7 +8988,7 @@
<unitPattern count="one" draft="contributed">{0} hp</unitPattern>
<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/gu_IN.xml b/common/main/gu_IN.xml
index 92c0469..1020972 100644
--- a/common/main/gu_IN.xml
+++ b/common/main/gu_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/guz.xml b/common/main/guz.xml
index 20b754b..8e8a234 100644
--- a/common/main/guz.xml
+++ b/common/main/guz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/guz_KE.xml b/common/main/guz_KE.xml
index 205fc8d..7399381 100644
--- a/common/main/guz_KE.xml
+++ b/common/main/guz_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gv.xml b/common/main/gv.xml
index 5e9c514..f1b2940 100644
--- a/common/main/gv.xml
+++ b/common/main/gv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/gv_IM.xml b/common/main/gv_IM.xml
index 865e628..c2453c8 100644
--- a/common/main/gv_IM.xml
+++ b/common/main/gv_IM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ha.xml b/common/main/ha.xml
index 5a60baf..87fe6a3 100644
--- a/common/main/ha.xml
+++ b/common/main/ha.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -201,7 +201,7 @@
<language type="rof">Rombo</language>
<language type="ru">Rashanci</language>
<language type="rw">Kiniyaruwanda</language>
- <language type="rwk">↑↑↑</language>
+ <language type="rwk">yaren Rwa</language>
<language type="sa">Sanskrit</language>
<language type="sah">Sakha</language>
<language type="saq">Samburu</language>
@@ -266,14 +266,14 @@
<language type="zh_Hant">Sinanci na gargajiya</language>
<language type="zh_Hant" alt="long">↑↑↑</language>
<language type="zu">Harshen Zulu</language>
- <language type="zxx">↑↑↑</language>
+ <language type="zxx">Babu abun-ciki na yare</language>
</languages>
<scripts>
<script type="Arab">Larabci</script>
<script type="Armn">Armeniyawa</script>
<script type="Beng">Bangla</script>
<script type="Bopo">Bopomofo</script>
- <script type="Brai">↑↑↑</script>
+ <script type="Brai">Rubutun Makafi</script>
<script type="Cyrl">Cyrillic</script>
<script type="Deva">Devanagari</script>
<script type="Ethi">Ethiopic</script>
@@ -282,38 +282,38 @@
<script type="Gujr">Gujarati</script>
<script type="Guru">Gurmukhi</script>
<script type="Hanb">Han with Bopomofo</script>
- <script type="Hang">↑↑↑</script>
- <script type="Hani">↑↑↑</script>
+ <script type="Hang">Yaren Hangul</script>
+ <script type="Hani">Mutanen Han na ƙasar Sin</script>
<script type="Hans">Sauƙaƙaƙƙen</script>
<script type="Hans" alt="stand-alone">Sauƙaƙaƙƙen Hans</script>
<script type="Hant">Na gargajiya</script>
<script type="Hant" alt="stand-alone">Han na gargajiya</script>
<script type="Hebr">Ibrananci</script>
- <script type="Hira">↑↑↑</script>
- <script type="Hrkt">↑↑↑</script>
+ <script type="Hira">Tsarin Rubutun Hiragana</script>
+ <script type="Hrkt">kalaman Jafananci</script>
<script type="Jamo">↑↑↑</script>
- <script type="Jpan">↑↑↑</script>
- <script type="Kana">↑↑↑</script>
- <script type="Khmr">↑↑↑</script>
- <script type="Knda">↑↑↑</script>
- <script type="Kore">↑↑↑</script>
- <script type="Laoo">↑↑↑</script>
+ <script type="Jpan">Jafanis</script>
+ <script type="Kana">Tsarin Rubutun Katakana</script>
+ <script type="Khmr">Yaren Khmer</script>
+ <script type="Knda">Yaren Kannada</script>
+ <script type="Kore">Koriya</script>
+ <script type="Laoo">Mutanen Laos</script>
<script type="Latn">Latin</script>
- <script type="Mlym">↑↑↑</script>
- <script type="Mong">↑↑↑</script>
- <script type="Mymr">↑↑↑</script>
- <script type="Orya">↑↑↑</script>
- <script type="Sinh">↑↑↑</script>
- <script type="Taml">↑↑↑</script>
- <script type="Telu">↑↑↑</script>
- <script type="Thaa">↑↑↑</script>
+ <script type="Mlym">Yaren Malayalam</script>
+ <script type="Mong">Na kasar Mongolia</script>
+ <script type="Mymr">Ƙasar Myanmar</script>
+ <script type="Orya">Yaren Odia</script>
+ <script type="Sinh">Yaren Sinhala</script>
+ <script type="Taml">Yaren Tamil</script>
+ <script type="Telu">Yaren Telugu</script>
+ <script type="Thaa">Yaren Thaana</script>
<script type="Thai">↑↑↑</script>
- <script type="Tibt">↑↑↑</script>
- <script type="Zmth">↑↑↑</script>
- <script type="Zsye">↑↑↑</script>
+ <script type="Tibt">Yaren Tibet</script>
+ <script type="Zmth">Alamar Lissafi</script>
+ <script type="Zsye">Alama ta hoto</script>
<script type="Zsym">Alamomi</script>
<script type="Zxxx">Ba rubutacce ba</script>
- <script type="Zyyy">↑↑↑</script>
+ <script type="Zyyy">Gama-gari</script>
<script type="Zzzz">Rubutun da ba sani ba</script>
</scripts>
<territories>
@@ -335,10 +335,10 @@
<territory type="034">kudancin Asiya</territory>
<territory type="035">Kudu Maso Gabashin Asiya</territory>
<territory type="039">Kudancin Turai</territory>
- <territory type="053">↑↑↑</territory>
- <territory type="054">↑↑↑</territory>
- <territory type="057">↑↑↑</territory>
- <territory type="061">↑↑↑</territory>
+ <territory type="053">Tsibarai na Austraila da New Zealand da maƙota</territory>
+ <territory type="054">Tsibirai na New Guinea da Fiji da maƙota</territory>
+ <territory type="057">Yankin Micronesia</territory>
+ <territory type="061">tsibiri</territory>
<territory type="142">Asiya</territory>
<territory type="143">Asiya ta Tsakiya</territory>
<territory type="145">Yammacin Asiya</territory>
@@ -348,7 +348,7 @@
<territory type="155">Yammacin Turai</territory>
<territory type="202">Sub-Saharan Africa</territory>
<territory type="419">Latin America</territory>
- <territory type="AC">↑↑↑</territory>
+ <territory type="AC">Tsibirin Ascension</territory>
<territory type="AD">Andora</territory>
<territory type="AE">Haɗaɗɗiyar Daular Larabawa</territory>
<territory type="AF">Afaganistan</territory>
@@ -363,7 +363,7 @@
<territory type="AT">Ostiriya</territory>
<territory type="AU">Ostareliya</territory>
<territory type="AW">Aruba</territory>
- <territory type="AX">↑↑↑</territory>
+ <territory type="AX">Tsibirai na Åland</territory>
<territory type="AZ">Azarbaijan</territory>
<territory type="BA">Bosniya Harzagobina</territory>
<territory type="BB">Barbadas</territory>
@@ -382,7 +382,7 @@
<territory type="BR">Birazil</territory>
<territory type="BS">Bahamas</territory>
<territory type="BT">Butan</territory>
- <territory type="BV">↑↑↑</territory>
+ <territory type="BV">Tsibirin Bouvet</territory>
<territory type="BW">Baswana</territory>
<territory type="BY">Belarus</territory>
<territory type="BZ">Beliz</territory>
@@ -401,7 +401,7 @@
<territory type="CM">Kamaru</territory>
<territory type="CN">Sin</territory>
<territory type="CO">Kolambiya</territory>
- <territory type="CP">↑↑↑</territory>
+ <territory type="CP">Tsibirin Clipperton</territory>
<territory type="CR">Kwasta Rika</territory>
<territory type="CU">Kyuba</territory>
<territory type="CV">Tsibiran Kap Barde</territory>
@@ -411,17 +411,17 @@
<territory type="CZ">Jamhuriyar Cak</territory>
<territory type="CZ" alt="variant">↑↑↑</territory>
<territory type="DE">Jamus</territory>
- <territory type="DG">↑↑↑</territory>
+ <territory type="DG">Tsibirn Diego Garcia</territory>
<territory type="DJ">Jibuti</territory>
<territory type="DK">Danmark</territory>
<territory type="DM">Dominika</territory>
<territory type="DO">Jamhuriyar Dominika</territory>
<territory type="DZ">Aljeriya</territory>
- <territory type="EA" draft="provisional">↑↑↑</territory>
+ <territory type="EA">Ceuta & Melilla</territory>
<territory type="EC">Ekwador</territory>
<territory type="EE">Estoniya</territory>
<territory type="EG">Misira</territory>
- <territory type="EH">↑↑↑</territory>
+ <territory type="EH">Yammacin Sahara</territory>
<territory type="ER">Eritireya</territory>
<territory type="ES">Sipen</territory>
<territory type="ET">Habasha</territory>
@@ -432,7 +432,7 @@
<territory type="FK">Tsibiran Falkilan</territory>
<territory type="FK" alt="variant">↑↑↑</territory>
<territory type="FM">Mikuronesiya</territory>
- <territory type="FO">↑↑↑</territory>
+ <territory type="FO">Tsibirai na Faroe</territory>
<territory type="FR">Faransa</territory>
<territory type="GA">Gabon</territory>
<territory type="GB">Biritaniya</territory>
@@ -440,7 +440,7 @@
<territory type="GD">Girnada</territory>
<territory type="GE">Jiwarjiya</territory>
<territory type="GF">Gini Ta Faransa</territory>
- <territory type="GG">↑↑↑</territory>
+ <territory type="GG">Yankin Guernsey</territory>
<territory type="GH">Gana</territory>
<territory type="GI">Jibaraltar</territory>
<territory type="GL">Grinlan</territory>
@@ -449,30 +449,30 @@
<territory type="GP">Gwadaluf</territory>
<territory type="GQ">Gini Ta Ikwaita</territory>
<territory type="GR">Girka</territory>
- <territory type="GS">↑↑↑</territory>
+ <territory type="GS">Kudancin Geogia da Kudancin Tsibirin Sandiwic</territory>
<territory type="GT">Gwatamala</territory>
<territory type="GU">Gwam</territory>
<territory type="GW">Gini Bisau</territory>
<territory type="GY">Guyana</territory>
- <territory type="HK">↑↑↑</territory>
+ <territory type="HK">Hong Kong Babban Birnin Kasar Chana</territory>
<territory type="HK" alt="short">↑↑↑</territory>
- <territory type="HM">↑↑↑</territory>
+ <territory type="HM">Tsibirin Heard da McDonald</territory>
<territory type="HN">Honduras</territory>
<territory type="HR">Kurowaishiya</territory>
<territory type="HT">Haiti</territory>
<territory type="HU">Hungari</territory>
- <territory type="IC" draft="provisional">↑↑↑</territory>
+ <territory type="IC">Canary Islands</territory>
<territory type="ID">Indunusiya</territory>
<territory type="IE">Ayalan</territory>
<territory type="IL">Iziraʼila</territory>
- <territory type="IM">↑↑↑</territory>
+ <territory type="IM">Isle na Mutum</territory>
<territory type="IN">Indiya</territory>
<territory type="IO">Yankin Birtaniya Na Tekun Indiya</territory>
<territory type="IQ">Iraƙi</territory>
<territory type="IR">Iran</territory>
<territory type="IS">Aisalan</territory>
<territory type="IT">Italiya</territory>
- <territory type="JE">↑↑↑</territory>
+ <territory type="JE">Kasar Jersey</territory>
<territory type="JM">Jamaika</territory>
<territory type="JO">Jordan</territory>
<territory type="JP">Jàpân</territory>
@@ -509,7 +509,7 @@
<territory type="ML">Mali</territory>
<territory type="MM">Burma, Miyamar</territory>
<territory type="MN">Mangoliya</territory>
- <territory type="MO">↑↑↑</territory>
+ <territory type="MO">Babban Birnin Mulki na Chana</territory>
<territory type="MO" alt="short">↑↑↑</territory>
<territory type="MP">Tsibiran Mariyana Na Arewa</territory>
<territory type="MQ">Martinik</territory>
@@ -551,7 +551,7 @@
<territory type="PW">Palau</territory>
<territory type="PY">Faragwai</territory>
<territory type="QA">Katar</territory>
- <territory type="QO">↑↑↑</territory>
+ <territory type="QO">Bakin Teku</territory>
<territory type="RE">Rawuniyan</territory>
<territory type="RO">Romaniya</territory>
<territory type="RS">Sabiya</territory>
@@ -565,7 +565,7 @@
<territory type="SG">Singapur</territory>
<territory type="SH">San Helena</territory>
<territory type="SI">Sulobeniya</territory>
- <territory type="SJ">↑↑↑</territory>
+ <territory type="SJ">Svalbard da Jan Mayen</territory>
<territory type="SK">Sulobakiya</territory>
<territory type="SL">Salewo</territory>
<territory type="SM">San Marino</territory>
@@ -599,7 +599,7 @@
<territory type="TZ">Tanzaniya</territory>
<territory type="UA">Yukaran</territory>
<territory type="UG">Yuganda</territory>
- <territory type="UM">↑↑↑</territory>
+ <territory type="UM">Rukunin Tsibirin U.S</territory>
<territory type="UN">Majalisar Dinkin Duniya</territory>
<territory type="US">Amurka</territory>
<territory type="US" alt="short">↑↑↑</territory>
@@ -614,9 +614,9 @@
<territory type="VU">Banuwatu</territory>
<territory type="WF">Walis Da Futuna</territory>
<territory type="WS">Samoa</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
- <territory type="XK">↑↑↑</territory>
+ <territory type="XA">Gogewar Kwalwa</territory>
+ <territory type="XB">Gano wani abu ta hanyar amfani da fasaha</territory>
+ <territory type="XK">Kasar Kosovo</territory>
<territory type="YE">Yamal</territory>
<territory type="YT">Mayoti</territory>
<territory type="ZA">Afirka Ta Kudu</territory>
@@ -627,11 +627,11 @@
<keys>
<key type="calendar">Kalanda</key>
<key type="cf">Yanayin Kudi</key>
- <key type="collation">↑↑↑</key>
+ <key type="collation">Tsarin Rabewa</key>
<key type="currency">Kudin Kasa</key>
<key type="hc">Zagayen Awowi</key>
- <key type="lb">↑↑↑</key>
- <key type="ms">↑↑↑</key>
+ <key type="lb">Salo na Raba Layi</key>
+ <key type="ms">Tsarin Awo</key>
<key type="numbers">Lambobi</key>
</keys>
<types>
@@ -645,57 +645,57 @@
<type key="calendar" type="iso8601">Kalanda ISO-8601</type>
<type key="calendar" type="japanese">Kalanda Jafan</type>
<type key="calendar" type="persian">Kalanda Farisa</type>
- <type key="calendar" type="roc">↑↑↑</type>
- <type key="cf" type="account">↑↑↑</type>
- <type key="cf" type="standard">↑↑↑</type>
- <type key="collation" type="ducet">↑↑↑</type>
- <type key="collation" type="search">↑↑↑</type>
+ <type key="calendar" type="roc">Kalandar kasar Sin</type>
+ <type key="cf" type="account">Tsarin Kudi na Kididdiga</type>
+ <type key="cf" type="standard">Tsarin Kudi Nagartacce</type>
+ <type key="collation" type="ducet">Tsarin Rabewa na Dan-maƙalu na Asali</type>
+ <type key="collation" type="search">Bincike na Dalilai-Gamagari</type>
<type key="collation" type="standard">Daidai ta ce Kasà</type>
<type key="hc" type="h11">Tsarin Awowi 12(0–11)</type>
<type key="hc" type="h12">Tsarin Awowi 12(1–12)</type>
<type key="hc" type="h23">Tsarin Awowi 24(0–23)</type>
<type key="hc" type="h24">Tsarin Awowi 24(1–24)</type>
- <type key="lb" type="loose">↑↑↑</type>
- <type key="lb" type="normal">↑↑↑</type>
- <type key="lb" type="strict">↑↑↑</type>
- <type key="ms" type="metric">↑↑↑</type>
- <type key="ms" type="uksystem">↑↑↑</type>
- <type key="ms" type="ussystem">↑↑↑</type>
+ <type key="lb" type="loose">Salo na Raba Layi Sakakke</type>
+ <type key="lb" type="normal">Salo na Raba Layi na Kodayaushe</type>
+ <type key="lb" type="strict">Salo na Raba Layi mai Tsauri</type>
+ <type key="ms" type="metric">Tsarin Awo na Metric</type>
+ <type key="ms" type="uksystem">Tsarin Awo na Imperial</type>
+ <type key="ms" type="ussystem">Tsarin Awo na Amurka</type>
<type key="numbers" type="arab">Lambobi na larabawan a gabas</type>
- <type key="numbers" type="arabext">↑↑↑</type>
- <type key="numbers" type="armn">↑↑↑</type>
- <type key="numbers" type="armnlow">↑↑↑</type>
- <type key="numbers" type="beng">↑↑↑</type>
- <type key="numbers" type="deva">↑↑↑</type>
- <type key="numbers" type="ethi">↑↑↑</type>
- <type key="numbers" type="fullwide">↑↑↑</type>
- <type key="numbers" type="geor">↑↑↑</type>
- <type key="numbers" type="grek">↑↑↑</type>
- <type key="numbers" type="greklow">↑↑↑</type>
- <type key="numbers" type="gujr">↑↑↑</type>
- <type key="numbers" type="guru">↑↑↑</type>
- <type key="numbers" type="hanidec">↑↑↑</type>
- <type key="numbers" type="hans">↑↑↑</type>
- <type key="numbers" type="hansfin">↑↑↑</type>
- <type key="numbers" type="hant">↑↑↑</type>
- <type key="numbers" type="hantfin">↑↑↑</type>
- <type key="numbers" type="hebr">↑↑↑</type>
- <type key="numbers" type="jpan">↑↑↑</type>
- <type key="numbers" type="jpanfin">↑↑↑</type>
- <type key="numbers" type="khmr">↑↑↑</type>
- <type key="numbers" type="knda">↑↑↑</type>
- <type key="numbers" type="laoo">↑↑↑</type>
+ <type key="numbers" type="arabext">Fitattun lambobin lissafi na Larabci</type>
+ <type key="numbers" type="armn">Lambobin ƙirga na Armenia</type>
+ <type key="numbers" type="armnlow">Kananan Haruffan Armenia</type>
+ <type key="numbers" type="beng">Lambobin Yaren Bangla</type>
+ <type key="numbers" type="deva">Lambobin Tsarin Rubutu na Devangari</type>
+ <type key="numbers" type="ethi">Lambobin ƙirga na Ethiopia</type>
+ <type key="numbers" type="fullwide">Lambobi masu Cikakken-Faɗi</type>
+ <type key="numbers" type="geor">Lambobin ƙirga na Georgia</type>
+ <type key="numbers" type="grek">Lambobin ƙirga na Girka</type>
+ <type key="numbers" type="greklow">Kananan Haruffa na Girka</type>
+ <type key="numbers" type="gujr">Lambobin Yaren Gujarati</type>
+ <type key="numbers" type="guru">Lambobi na Tsarin Rubutun Gurmukhi</type>
+ <type key="numbers" type="hanidec">Lambobin Gomiya na Yaren ƙasar Sin</type>
+ <type key="numbers" type="hans">Lambobin ƙirga na Yaren ƙasar Sin wanda aka Sauƙaƙa</type>
+ <type key="numbers" type="hansfin">Lambobin Ƙirgan Kudi na Yaren ƙasar Sin wanda aka Sauƙaƙa</type>
+ <type key="numbers" type="hant">Lambobin Ƙirga na Yaren ƙasar Sin na Alʼada</type>
+ <type key="numbers" type="hantfin">Lambobin Ƙirgan Kudi na Yaren ƙasar Sin na Alʼada</type>
+ <type key="numbers" type="hebr">Lambobin ƙirga na Hebrew</type>
+ <type key="numbers" type="jpan">Lambobin ƙirga na Jafananci</type>
+ <type key="numbers" type="jpanfin">Lambobin ƙirgan Kudi na Jafananci</type>
+ <type key="numbers" type="khmr">Lambobin Yaren Khmer</type>
+ <type key="numbers" type="knda">Lambobin Yaren Kannada</type>
+ <type key="numbers" type="laoo">Lambobin Yaren Lao</type>
<type key="numbers" type="latn">Lambobi na yammacin</type>
- <type key="numbers" type="mlym">↑↑↑</type>
- <type key="numbers" type="mymr">↑↑↑</type>
- <type key="numbers" type="orya">↑↑↑</type>
- <type key="numbers" type="roman">↑↑↑</type>
- <type key="numbers" type="romanlow">↑↑↑</type>
- <type key="numbers" type="taml">↑↑↑</type>
- <type key="numbers" type="tamldec">↑↑↑</type>
- <type key="numbers" type="telu">↑↑↑</type>
- <type key="numbers" type="thai">↑↑↑</type>
- <type key="numbers" type="tibt">↑↑↑</type>
+ <type key="numbers" type="mlym">Lambobin Yaren Malayalam</type>
+ <type key="numbers" type="mymr">Lambobin Myanmar</type>
+ <type key="numbers" type="orya">Lambobin Yaren Odia</type>
+ <type key="numbers" type="roman">Lambobin Rumawa</type>
+ <type key="numbers" type="romanlow">Lambobin Kirga Kanana na Rumawa</type>
+ <type key="numbers" type="taml">Lambobin ƙirga na Tamil na Alʼada</type>
+ <type key="numbers" type="tamldec">Lambobin Tamil</type>
+ <type key="numbers" type="telu">Lambobin yaren Telugu</type>
+ <type key="numbers" type="thai">Lambobin yaren Thai</type>
+ <type key="numbers" type="tibt">Lambobin yaren Tibet</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Tsarin awo</measurementSystemName>
@@ -3962,6 +3962,13 @@
<standard>Marshall Islands Time</standard>
</long>
</metazone>
+ <metazone type="Mauritius">
+ <long>
+ <generic>Lokacin Mauritius</generic>
+ <standard>TsaTsayayyar Lokacin Mauritius</standard>
+ <daylight>Bazarar Mauritius</daylight>
+ </long>
+ </metazone>
<metazone type="Mawson">
<long>
<standard>Mawson Time</standard>
@@ -4038,7 +4045,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic draft="contributed">Norfolk Island Time</generic>
+ <standard draft="contributed">Norfolk Island Standard Time</standard>
+ <daylight draft="contributed">Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4441,26 +4450,26 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AFN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Afghani na kasar Afghanistan</displayName>
+ <displayName count="one">Afghani na kasar Afghanistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Albanian</displayName>
+ <displayName count="one">Kudin Albanian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AMD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Armenian</displayName>
+ <displayName count="one">kudin Armenian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ANG">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Antillean Guilder na ƙasar Netherlands</displayName>
+ <displayName count="one">Antillean guilder na ƙasar Netherlands</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4472,8 +4481,8 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ARS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Argentina</displayName>
+ <displayName count="one">peso na ƙasar Argentina</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4486,41 +4495,41 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="AWG">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Florin na yankin Aruba</displayName>
+ <displayName count="one">florin na yankin Aruba</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AZN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Azerbaijani</displayName>
+ <displayName count="one">kudin Azerbaijani</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BAM">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudaden Bosnia da Harzegovina</displayName>
+ <displayName count="one">Kudaden Bosnia da Herzegovina</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BBD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Barbados</displayName>
+ <displayName count="one">dalar Barbados</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BDT">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Taka na kasar Bangladesh</displayName>
+ <displayName count="one">taka na kasar Bangladesh</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BGN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Bulgeria</displayName>
+ <displayName count="one">Kudin Bulgeria</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4537,22 +4546,22 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BMD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Bermuda</displayName>
+ <displayName count="one">dalar Bermuda</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BND">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Brunei</displayName>
+ <displayName count="one">kudin Brunei</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BOB">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Boloviano na ƙasar Bolivia</displayName>
+ <displayName count="one">boliviano na ƙasar Bolivia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4565,15 +4574,15 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BSD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Bahamas</displayName>
+ <displayName count="one">dalar ƙasar Bahamas</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BTN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Ngultrum na kasar Bhutan</displayName>
+ <displayName count="one">ngultrum na kasar Bhutan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4585,15 +4594,15 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BYN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Belarusian</displayName>
+ <displayName count="one">Kudin Belarusian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BZD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Belize</displayName>
+ <displayName count="one">dalar ƙasar Belize</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4618,15 +4627,15 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CLP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Chile</displayName>
+ <displayName count="one">peso na ƙasar Chile</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNH">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Yuan na ƙasar Sin (na wajen ƙasa)</displayName>
+ <displayName count="one">yuan na ƙasar Sin (na wajen ƙasa)</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4638,29 +4647,29 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="COP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Columbia</displayName>
+ <displayName count="one">peso na ƙasar Columbia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CRC">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Colón na kasar Costa Rica</displayName>
+ <displayName count="one">colón na kasar Costa Rica</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso mai fuska biyu na ƙasar Cuba</displayName>
+ <displayName count="one">peso mai fuska biyu na Cuba</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Cuba</displayName>
+ <displayName count="one">peso na ƙasar Cuba</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4672,8 +4681,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CZK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Czech</displayName>
+ <displayName count="one">kudin Czech</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4685,15 +4694,15 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DKK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Krone na ƙasar Denmark</displayName>
+ <displayName count="one">krone na ƙasar Denmark</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DOP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na jamhuriyar Dominica</displayName>
+ <displayName count="one">peso na jamhuriyar Dominica</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4731,15 +4740,15 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FJD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Fiji</displayName>
+ <displayName count="one">dalar Fiji</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FKP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Fam na ƙasar Tsibirai na Falkland</displayName>
+ <displayName count="one">fam na Tsibirai na Falkland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4752,8 +4761,8 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GEL">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Georgian</displayName>
+ <displayName count="one">kudin Georgian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4762,14 +4771,14 @@
<displayName>Cedi</displayName>
</currency>
<currency type="GHS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Ghana</displayName>
+ <displayName count="one">kudin Ghanainian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GIP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Gibraltar</displayName>
+ <displayName count="one">Kudin Gibraltal</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4781,8 +4790,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GNF">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Guinean</displayName>
+ <displayName count="one">Kudin Guinean</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4791,63 +4800,63 @@
<displayName>Kuɗin Gini</displayName>
</currency>
<currency type="GTQ">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Quetzal na ƙasar Guatemala</displayName>
+ <displayName count="one">quetzal na ƙasar Guatemala</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GYD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Guyana</displayName>
+ <displayName count="one">dalar Guyana</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HKD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Hong Kong</displayName>
+ <displayName count="one">dalar Hong Kong</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HNL">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Lempira na ƙasar Honduras</displayName>
+ <displayName count="one">lempira na ƙasar Honduras</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HRK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Croatian</displayName>
+ <displayName count="one">Kudin Croatian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HTG">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Gourde na ƙasar Haiti</displayName>
+ <displayName count="one">gourde na ƙasar Haiti</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HUF">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Hungarian</displayName>
+ <displayName count="one">kudin Hungarian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IDR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Rupiah na ƙasar Indonesia</displayName>
+ <displayName count="one">rupiah na ƙasar Indonesia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ILS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Sabbin Kudin Shekel</displayName>
+ <displayName count="one">sabbin kudi Israeli</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4860,34 +4869,34 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IQD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dinarin Iraqi</displayName>
+ <displayName count="one">dinarin Iraqi</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IRR">
- <displayName>↑↑↑</displayName>
+ <displayName>Riyal na kasar Iran</displayName>
<displayName count="one">↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName count="other">Riyal-riyal na kasar Iran</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ISK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Króna na ƙasar Iceland</displayName>
+ <displayName count="one">króna na ƙasar Iceland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Jamaica</displayName>
+ <displayName count="one">dalar Jamaica</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JOD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dinarin Jordanian</displayName>
+ <displayName count="one">dinarin Jordanian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4905,14 +4914,14 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KGS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Som na ƙasar Kyrgystani</displayName>
+ <displayName count="one">som na ƙasar Kyrgystani</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KHR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Riel na ƙasar Cambodia</displayName>
+ <displayName count="one">riel na ƙasar Cambodia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4925,56 +4934,56 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KPW">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Won na ƙasar Koreya ta Arewa</displayName>
+ <displayName count="one">won na ƙasar Koreya ta Arewa</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KRW">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Won na Koreya ta Kudu</displayName>
+ <displayName count="one">won na Koreya ta Kudu</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KWD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dinarin Kuwaiti</displayName>
+ <displayName count="one">dinarin Kuwaiti</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KYD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Tsibirai na Cayman</displayName>
+ <displayName count="one">dalar ƙasar Tsibirai na Cayman</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KZT">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Tenge na ƙasar Kazkhstan</displayName>
+ <displayName count="one">tenge na ƙasar Kazakhstan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LAK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Laotian</displayName>
+ <displayName count="one">kudin Laotian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LBP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Lebanese</displayName>
+ <displayName count="one">kudin Lebanese</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LKR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Rupee na kasar Sri Lanka</displayName>
+ <displayName count="one">rupee na kasar Sri Lanka</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5002,8 +5011,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MDL">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>kudaden Moldova</displayName>
+ <displayName count="one">Kudaden Moldovan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5015,28 +5024,28 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MKD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dinarin Macedonian</displayName>
+ <displayName count="one">Dinarin Macedonian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MMK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Myanmar</displayName>
+ <displayName count="one">kudin Myanmar</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MNT">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Tugrik na Mongolia</displayName>
+ <displayName count="one">tugrik na Mongoliya</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MOP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Pataca na ƙasar Macao</displayName>
+ <displayName count="one">pataca na ƙasar Macao</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5057,8 +5066,8 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Rufiyaa na kasar Maldives</displayName>
+ <displayName count="one">rufiyaa na kasar Maldives</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5069,15 +5078,15 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MXN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Mexico</displayName>
+ <displayName count="one">peso na ƙasar Mexico</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MYR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Malaysian</displayName>
+ <displayName count="one">kudin Malaysian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5086,8 +5095,8 @@
<displayName>Kuɗin Mozambik</displayName>
</currency>
<currency type="MZN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Metical na ƙasar Mozambique</displayName>
+ <displayName count="one">metical na ƙasar Mozambique</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5106,101 +5115,101 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NIO">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Córdoba na ƙasar Nicaragua</displayName>
+ <displayName count="one">córdoba na ƙasar Nicaragua</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NOK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Krone na ƙasar Norway</displayName>
+ <displayName count="one">krone na ƙasar Norway</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NPR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Rupee na Nepal</displayName>
+ <displayName count="one">rupee na kasar Nepal</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NZD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar New Zealand</displayName>
+ <displayName count="one">dalar New Zealand</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="OMR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Riyal din Omani</displayName>
+ <displayName count="one">Riyal din Omani</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PAB">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Balboa na ƙasar Panama</displayName>
+ <displayName count="one">balboa na ƙasar Panama</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PEN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Sol na ƙasar Peru</displayName>
+ <displayName count="one">sol na ƙasar Peru</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PGK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kina na ƙasar Papua Sabon Guinea</displayName>
+ <displayName count="one">kina na ƙasar Papua Sabon Guinea</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PHP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Philippine</displayName>
+ <displayName count="one">kudin Philippine</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PKR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Rupee na kasar Pakistan</displayName>
+ <displayName count="one">rupee na kasar Pakistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PLN">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudaden Polish</displayName>
+ <displayName count="one">kudin Polish</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PYG">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Guarani na ƙasar Paraguay</displayName>
+ <displayName count="one">guarani na ƙasar Paraguay</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="QAR">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Riyal din Qatari</displayName>
+ <displayName count="one">riyal Qatari</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RON">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Romanian</displayName>
+ <displayName count="one">kudin Romanian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RSD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dinar Serbian</displayName>
+ <displayName count="one">dinarin Serbian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5225,8 +5234,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SBD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Tsibirai na Solomon</displayName>
+ <displayName count="one">dalar Tsibirai na Solomon</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5244,15 +5253,15 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SEK">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Krona na ƙasar Sweden</displayName>
+ <displayName count="one">krona na ƙasar Sweden</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SGD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dilar Singapore</displayName>
+ <displayName count="one">dalar Singapore</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5277,15 +5286,15 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SRD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Suriname</displayName>
+ <displayName count="one">dalar ƙasar Suriname</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SSP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Fam na Kudancin Sudan</displayName>
+ <displayName count="one">fam na Kudancin Sudan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5301,8 +5310,8 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SYP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Syrian</displayName>
+ <displayName count="one">Kudin Syrian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5314,21 +5323,21 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="THB">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Baht na ƙasar Thailand</displayName>
+ <displayName count="one">baht na ƙasar Thailand</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TJS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Somoni na ƙasar Tajikistan</displayName>
+ <displayName count="one">somoni na ƙasar Tajikistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TMT">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Manat na ƙasar Turkmenistan</displayName>
+ <displayName count="one">manat na ƙasar Turkmenistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5339,30 +5348,30 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TOP">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Paʼanga na ƙasar Tonga</displayName>
+ <displayName count="one">paʼanga na ƙasar Tonga</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TRY">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Turkish</displayName>
+ <displayName count="one">kudin Turkish</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
<symbol alt="variant" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TTD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar ƙasar Trinidad da Tobago</displayName>
+ <displayName count="one">dalar ƙasar Trinidad da Tobago</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TWD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Sabuwar Dalar Taiwan</displayName>
+ <displayName count="one">Sabuwar dalar Taiwan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5374,8 +5383,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UAH">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Ukrainian</displayName>
+ <displayName count="one">kudin Ukrainian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5394,40 +5403,40 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UYU">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Peso na ƙasar Uruguay</displayName>
+ <displayName count="one">peso na ƙasar Uruguay</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Som na ƙasar Uzbekistan</displayName>
+ <displayName count="one">som na ƙasar Uzbekistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VES">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Bolívar na ƙasar Venezuela</displayName>
+ <displayName count="one">bolívar na ƙasar Venezuela</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VND">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Kudin Vietnamese</displayName>
+ <displayName count="one">kudin Vietnamese</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VUV">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Vatu da ƙasar Vanuatu</displayName>
+ <displayName count="one">vatu na ƙasar Vanuatu</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="WST">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Tala na ƙasar Samoa</displayName>
+ <displayName count="one">tala na ƙasar Samoa</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5438,8 +5447,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XCD">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Dalar Gabashin Caribbean</displayName>
+ <displayName count="one">dalar Gabashin Caribbeaan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -5451,8 +5460,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XPF">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>kudin CFP Franc</displayName>
+ <displayName count="one">kudin CFP franc</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5462,8 +5471,8 @@
<displayName count="other">(Kudin da ba a sani ba)</displayName>
</currency>
<currency type="YER">
- <displayName>↑↑↑</displayName>
- <displayName count="one">↑↑↑</displayName>
+ <displayName>Riyal din Yemeni</displayName>
+ <displayName count="one">riyal din Yemeni</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -5502,9 +5511,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5513,7 +5592,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -5613,7 +5692,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -5643,7 +5722,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6119,17 +6198,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6209,7 +6288,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6363,9 +6442,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6374,7 +6523,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6474,7 +6623,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6504,7 +6653,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6980,17 +7129,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7070,7 +7219,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7224,9 +7373,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7235,7 +7454,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7527,7 +7746,7 @@
<styleName type="wdth" subtype="62.5" alt="compressed">↑↑↑</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">↑↑↑</styleName>
<styleName type="wdth" subtype="75">↑↑↑</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">↑↑↑</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">abnchhhh</styleName>
<styleName type="wdth" subtype="75" alt="narrow">↑↑↑</styleName>
<styleName type="wdth" subtype="87.5">↑↑↑</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">↑↑↑</styleName>
@@ -7537,8 +7756,8 @@
<styleName type="wdth" subtype="112.5" alt="extended">↑↑↑</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">↑↑↑</styleName>
<styleName type="wdth" subtype="125">↑↑↑</styleName>
- <styleName type="wdth" subtype="125" alt="extended">↑↑↑</styleName>
- <styleName type="wdth" subtype="125" alt="wide">↑↑↑</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">Fadadawa</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">fadi</styleName>
<styleName type="wdth" subtype="150">↑↑↑</styleName>
<styleName type="wdth" subtype="150" alt="extended">↑↑↑</styleName>
<styleName type="wdth" subtype="150" alt="wide">↑↑↑</styleName>
@@ -7558,10 +7777,10 @@
<styleName type="wght" subtype="700">↑↑↑</styleName>
<styleName type="wght" subtype="800">↑↑↑</styleName>
<styleName type="wght" subtype="900">↑↑↑</styleName>
- <styleName type="wght" subtype="900" alt="heavy">↑↑↑</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">nauyi</styleName>
<styleName type="wght" subtype="950">↑↑↑</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">↑↑↑</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">↑↑↑</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">matsanancin baki</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">matsanancin nauyi</styleName>
<featureName type="afrc">↑↑↑</featureName>
<featureName type="cpsp">↑↑↑</featureName>
<featureName type="dlig">↑↑↑</featureName>
diff --git a/common/main/ha_GH.xml b/common/main/ha_GH.xml
index de83c91..842eed2 100644
--- a/common/main/ha_GH.xml
+++ b/common/main/ha_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ha_NE.xml b/common/main/ha_NE.xml
index dd40b0c..3d1f884 100644
--- a/common/main/ha_NE.xml
+++ b/common/main/ha_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -195,6 +195,7 @@
<language type="rof">Rombo</language>
<language type="ru">Rashanci</language>
<language type="rw">Kiniyaruwanda</language>
+ <language type="rwk">yaren Rwa</language>
<language type="sa">Sanskrit</language>
<language type="sah">Sakha</language>
<language type="saq">Samburu</language>
@@ -257,12 +258,14 @@
<language type="zh_Hans">Sauƙaƙaƙƙen Sinanci</language>
<language type="zh_Hant">Sinanci na gargajiya</language>
<language type="zu">Harshen Zulu</language>
+ <language type="zxx">Babu abun-ciki na yare</language>
</languages>
<scripts>
<script type="Arab">Larabci</script>
<script type="Armn">Armeniyawa</script>
<script type="Beng">Bangla</script>
<script type="Bopo">Bopomofo</script>
+ <script type="Brai">Rubutun Makafi</script>
<script type="Cyrl">Cyrillic</script>
<script type="Deva">Devanagari</script>
<script type="Ethi">Ethiopic</script>
@@ -271,14 +274,36 @@
<script type="Gujr">Gujarati</script>
<script type="Guru">Gurmukhi</script>
<script type="Hanb">Han with Bopomofo</script>
+ <script type="Hang">Yaren Hangul</script>
+ <script type="Hani">Mutanen Han na ƙasar Sin</script>
<script type="Hans">Sauƙaƙaƙƙen</script>
<script type="Hans" alt="stand-alone">Sauƙaƙaƙƙen Hans</script>
<script type="Hant">Na gargajiya</script>
<script type="Hant" alt="stand-alone">Han na gargajiya</script>
<script type="Hebr">Ibrananci</script>
+ <script type="Hira">Tsarin Rubutun Hiragana</script>
+ <script type="Hrkt">kalaman Jafananci</script>
+ <script type="Jpan">Jafanis</script>
+ <script type="Kana">Tsarin Rubutun Katakana</script>
+ <script type="Khmr">Yaren Khmer</script>
+ <script type="Knda">Yaren Kannada</script>
+ <script type="Kore">Koriya</script>
+ <script type="Laoo">Mutanen Laos</script>
<script type="Latn">Latin</script>
+ <script type="Mlym">Yaren Malayalam</script>
+ <script type="Mong">Na kasar Mongolia</script>
+ <script type="Mymr">Ƙasar Myanmar</script>
+ <script type="Orya">Yaren Odia</script>
+ <script type="Sinh">Yaren Sinhala</script>
+ <script type="Taml">Yaren Tamil</script>
+ <script type="Telu">Yaren Telugu</script>
+ <script type="Thaa">Yaren Thaana</script>
+ <script type="Tibt">Yaren Tibet</script>
+ <script type="Zmth">Alamar Lissafi</script>
+ <script type="Zsye">Alama ta hoto</script>
<script type="Zsym">Alamomi</script>
<script type="Zxxx">Ba rubutacce ba</script>
+ <script type="Zyyy">Gama-gari</script>
<script type="Zzzz">Rubutun da ba sani ba</script>
</scripts>
<territories>
@@ -300,6 +325,10 @@
<territory type="034">kudancin Asiya</territory>
<territory type="035">Kudu Maso Gabashin Asiya</territory>
<territory type="039">Kudancin Turai</territory>
+ <territory type="053">Tsibarai na Austraila da New Zealand da maƙota</territory>
+ <territory type="054">Tsibirai na New Guinea da Fiji da maƙota</territory>
+ <territory type="057">Yankin Micronesia</territory>
+ <territory type="061">tsibiri</territory>
<territory type="142">Asiya</territory>
<territory type="143">Asiya ta Tsakiya</territory>
<territory type="145">Yammacin Asiya</territory>
@@ -309,6 +338,7 @@
<territory type="155">Yammacin Turai</territory>
<territory type="202">Sub-Saharan Africa</territory>
<territory type="419">Latin America</territory>
+ <territory type="AC">Tsibirin Ascension</territory>
<territory type="AD">Andora</territory>
<territory type="AE">Haɗaɗɗiyar Daular Larabawa</territory>
<territory type="AF">Afaganistan</territory>
@@ -323,6 +353,7 @@
<territory type="AT">Ostiriya</territory>
<territory type="AU">Ostareliya</territory>
<territory type="AW">Aruba</territory>
+ <territory type="AX">Tsibirai na Åland</territory>
<territory type="AZ">Azarbaijan</territory>
<territory type="BA">Bosniya Harzagobina</territory>
<territory type="BB">Barbadas</territory>
@@ -341,6 +372,7 @@
<territory type="BR">Birazil</territory>
<territory type="BS">Bahamas</territory>
<territory type="BT">Butan</territory>
+ <territory type="BV">Tsibirin Bouvet</territory>
<territory type="BW">Baswana</territory>
<territory type="BY">Belarus</territory>
<territory type="BZ">Beliz</territory>
@@ -359,6 +391,7 @@
<territory type="CM">Kamaru</territory>
<territory type="CN">Sin</territory>
<territory type="CO">Kolambiya</territory>
+ <territory type="CP">Tsibirin Clipperton</territory>
<territory type="CR">Kwasta Rika</territory>
<territory type="CU">Kyuba</territory>
<territory type="CV">Tsibiran Kap Barde</territory>
@@ -367,14 +400,17 @@
<territory type="CY">Sifurus</territory>
<territory type="CZ">Jamhuriyar Cak</territory>
<territory type="DE">Jamus</territory>
+ <territory type="DG">Tsibirn Diego Garcia</territory>
<territory type="DJ">Jibuti</territory>
<territory type="DK">Danmark</territory>
<territory type="DM">Dominika</territory>
<territory type="DO">Jamhuriyar Dominika</territory>
<territory type="DZ">Aljeriya</territory>
+ <territory type="EA">Ceuta & Melilla</territory>
<territory type="EC">Ekwador</territory>
<territory type="EE">Estoniya</territory>
<territory type="EG">Misira</territory>
+ <territory type="EH">Yammacin Sahara</territory>
<territory type="ER">Eritireya</territory>
<territory type="ES">Sipen</territory>
<territory type="ET">Habasha</territory>
@@ -384,12 +420,14 @@
<territory type="FJ">Fiji</territory>
<territory type="FK">Tsibiran Falkilan</territory>
<territory type="FM">Mikuronesiya</territory>
+ <territory type="FO">Tsibirai na Faroe</territory>
<territory type="FR">Faransa</territory>
<territory type="GA">Gabon</territory>
<territory type="GB">Biritaniya</territory>
<territory type="GD">Girnada</territory>
<territory type="GE">Jiwarjiya</territory>
<territory type="GF">Gini Ta Faransa</territory>
+ <territory type="GG">Yankin Guernsey</territory>
<territory type="GH">Gana</territory>
<territory type="GI">Jibaraltar</territory>
<territory type="GL">Grinlan</territory>
@@ -398,23 +436,29 @@
<territory type="GP">Gwadaluf</territory>
<territory type="GQ">Gini Ta Ikwaita</territory>
<territory type="GR">Girka</territory>
+ <territory type="GS">Kudancin Geogia da Kudancin Tsibirin Sandiwic</territory>
<territory type="GT">Gwatamala</territory>
<territory type="GU">Gwam</territory>
<territory type="GW">Gini Bisau</territory>
<territory type="GY">Guyana</territory>
+ <territory type="HK">Hong Kong Babban Birnin Kasar Chana</territory>
+ <territory type="HM">Tsibirin Heard da McDonald</territory>
<territory type="HN">Honduras</territory>
<territory type="HR">Kurowaishiya</territory>
<territory type="HT">Haiti</territory>
<territory type="HU">Hungari</territory>
+ <territory type="IC">Canary Islands</territory>
<territory type="ID">Indunusiya</territory>
<territory type="IE">Ayalan</territory>
<territory type="IL">Iziraʼila</territory>
+ <territory type="IM">Isle na Mutum</territory>
<territory type="IN">Indiya</territory>
<territory type="IO">Yankin Birtaniya Na Tekun Indiya</territory>
<territory type="IQ">Iraƙi</territory>
<territory type="IR">Iran</territory>
<territory type="IS">Aisalan</territory>
<territory type="IT">Italiya</territory>
+ <territory type="JE">Kasar Jersey</territory>
<territory type="JM">Jamaika</territory>
<territory type="JO">Jordan</territory>
<territory type="JP">Jàpân</territory>
@@ -451,6 +495,7 @@
<territory type="ML">Mali</territory>
<territory type="MM">Burma, Miyamar</territory>
<territory type="MN">Mangoliya</territory>
+ <territory type="MO">Babban Birnin Mulki na Chana</territory>
<territory type="MP">Tsibiran Mariyana Na Arewa</territory>
<territory type="MQ">Martinik</territory>
<territory type="MR">Moritaniya</territory>
@@ -491,6 +536,7 @@
<territory type="PW">Palau</territory>
<territory type="PY">Faragwai</territory>
<territory type="QA">Katar</territory>
+ <territory type="QO">Bakin Teku</territory>
<territory type="RE">Rawuniyan</territory>
<territory type="RO">Romaniya</territory>
<territory type="RS">Sabiya</territory>
@@ -504,6 +550,7 @@
<territory type="SG">Singapur</territory>
<territory type="SH">San Helena</territory>
<territory type="SI">Sulobeniya</territory>
+ <territory type="SJ">Svalbard da Jan Mayen</territory>
<territory type="SK">Sulobakiya</territory>
<territory type="SL">Salewo</territory>
<territory type="SM">San Marino</territory>
@@ -535,6 +582,7 @@
<territory type="TZ">Tanzaniya</territory>
<territory type="UA">Yukaran</territory>
<territory type="UG">Yuganda</territory>
+ <territory type="UM">Rukunin Tsibirin U.S</territory>
<territory type="UN">Majalisar Dinkin Duniya</territory>
<territory type="US">Amurka</territory>
<territory type="UY">Yurigwai</territory>
@@ -548,6 +596,9 @@
<territory type="VU">Banuwatu</territory>
<territory type="WF">Walis Da Futuna</territory>
<territory type="WS">Samoa</territory>
+ <territory type="XA">Gogewar Kwalwa</territory>
+ <territory type="XB">Gano wani abu ta hanyar amfani da fasaha</territory>
+ <territory type="XK">Kasar Kosovo</territory>
<territory type="YE">Yamal</territory>
<territory type="YT">Mayoti</territory>
<territory type="ZA">Afirka Ta Kudu</territory>
@@ -558,8 +609,11 @@
<keys>
<key type="calendar">Kalanda</key>
<key type="cf">Yanayin Kudi</key>
+ <key type="collation">Tsarin Rabewa</key>
<key type="currency">Kudin Kasa</key>
<key type="hc">Zagayen Awowi</key>
+ <key type="lb">Salo na Raba Layi</key>
+ <key type="ms">Tsarin Awo</key>
<key type="numbers">Lambobi</key>
</keys>
<types>
@@ -573,13 +627,57 @@
<type key="calendar" type="iso8601">Kalanda ISO-8601</type>
<type key="calendar" type="japanese">Kalanda Jafan</type>
<type key="calendar" type="persian">Kalanda Farisa</type>
+ <type key="calendar" type="roc">Kalandar kasar Sin</type>
+ <type key="cf" type="account">Tsarin Kudi na Kididdiga</type>
+ <type key="cf" type="standard">Tsarin Kudi Nagartacce</type>
+ <type key="collation" type="ducet">Tsarin Rabewa na Dan-maƙalu na Asali</type>
+ <type key="collation" type="search">Bincike na Dalilai-Gamagari</type>
<type key="collation" type="standard">Daidai ta ce Kasà</type>
<type key="hc" type="h11">Tsarin Awowi 12(0–11)</type>
<type key="hc" type="h12">Tsarin Awowi 12(1–12)</type>
<type key="hc" type="h23">Tsarin Awowi 24(0–23)</type>
<type key="hc" type="h24">Tsarin Awowi 24(1–24)</type>
+ <type key="lb" type="loose">Salo na Raba Layi Sakakke</type>
+ <type key="lb" type="normal">Salo na Raba Layi na Kodayaushe</type>
+ <type key="lb" type="strict">Salo na Raba Layi mai Tsauri</type>
+ <type key="ms" type="metric">Tsarin Awo na Metric</type>
+ <type key="ms" type="uksystem">Tsarin Awo na Imperial</type>
+ <type key="ms" type="ussystem">Tsarin Awo na Amurka</type>
<type key="numbers" type="arab">Lambobi na larabawan a gabas</type>
+ <type key="numbers" type="arabext">Fitattun lambobin lissafi na Larabci</type>
+ <type key="numbers" type="armn">Lambobin ƙirga na Armenia</type>
+ <type key="numbers" type="armnlow">Kananan Haruffan Armenia</type>
+ <type key="numbers" type="beng">Lambobin Yaren Bangla</type>
+ <type key="numbers" type="deva">Lambobin Tsarin Rubutu na Devangari</type>
+ <type key="numbers" type="ethi">Lambobin ƙirga na Ethiopia</type>
+ <type key="numbers" type="fullwide">Lambobi masu Cikakken-Faɗi</type>
+ <type key="numbers" type="geor">Lambobin ƙirga na Georgia</type>
+ <type key="numbers" type="grek">Lambobin ƙirga na Girka</type>
+ <type key="numbers" type="greklow">Kananan Haruffa na Girka</type>
+ <type key="numbers" type="gujr">Lambobin Yaren Gujarati</type>
+ <type key="numbers" type="guru">Lambobi na Tsarin Rubutun Gurmukhi</type>
+ <type key="numbers" type="hanidec">Lambobin Gomiya na Yaren ƙasar Sin</type>
+ <type key="numbers" type="hans">Lambobin ƙirga na Yaren ƙasar Sin wanda aka Sauƙaƙa</type>
+ <type key="numbers" type="hansfin">Lambobin Ƙirgan Kudi na Yaren ƙasar Sin wanda aka Sauƙaƙa</type>
+ <type key="numbers" type="hant">Lambobin Ƙirga na Yaren ƙasar Sin na Alʼada</type>
+ <type key="numbers" type="hantfin">Lambobin Ƙirgan Kudi na Yaren ƙasar Sin na Alʼada</type>
+ <type key="numbers" type="hebr">Lambobin ƙirga na Hebrew</type>
+ <type key="numbers" type="jpan">Lambobin ƙirga na Jafananci</type>
+ <type key="numbers" type="jpanfin">Lambobin ƙirgan Kudi na Jafananci</type>
+ <type key="numbers" type="khmr">Lambobin Yaren Khmer</type>
+ <type key="numbers" type="knda">Lambobin Yaren Kannada</type>
+ <type key="numbers" type="laoo">Lambobin Yaren Lao</type>
<type key="numbers" type="latn">Lambobi na yammacin</type>
+ <type key="numbers" type="mlym">Lambobin Yaren Malayalam</type>
+ <type key="numbers" type="mymr">Lambobin Myanmar</type>
+ <type key="numbers" type="orya">Lambobin Yaren Odia</type>
+ <type key="numbers" type="roman">Lambobin Rumawa</type>
+ <type key="numbers" type="romanlow">Lambobin Kirga Kanana na Rumawa</type>
+ <type key="numbers" type="taml">Lambobin ƙirga na Tamil na Alʼada</type>
+ <type key="numbers" type="tamldec">Lambobin Tamil</type>
+ <type key="numbers" type="telu">Lambobin yaren Telugu</type>
+ <type key="numbers" type="thai">Lambobin yaren Thai</type>
+ <type key="numbers" type="tibt">Lambobin yaren Tibet</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Tsarin awo</measurementSystemName>
@@ -1969,6 +2067,13 @@
<standard>Marshall Islands Time</standard>
</long>
</metazone>
+ <metazone type="Mauritius">
+ <long>
+ <generic>Lokacin Mauritius</generic>
+ <standard>TsaTsayayyar Lokacin Mauritius</standard>
+ <daylight>Bazarar Mauritius</daylight>
+ </long>
+ </metazone>
<metazone type="Mawson">
<long>
<standard>Mawson Time</standard>
@@ -2045,7 +2150,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic draft="contributed">Norfolk Island Time</generic>
+ <standard draft="contributed">Norfolk Island Standard Time</standard>
+ <daylight draft="contributed">Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Novosibirsk">
@@ -2355,27 +2462,99 @@
<currency type="AED">
<displayName>Kuɗin Haɗaɗɗiyar Daular Larabawa</displayName>
</currency>
+ <currency type="AFN">
+ <displayName>Afghani na kasar Afghanistan</displayName>
+ <displayName count="one">Afghani na kasar Afghanistan</displayName>
+ </currency>
+ <currency type="ALL">
+ <displayName>Kudin Albanian</displayName>
+ <displayName count="one">Kudin Albanian</displayName>
+ </currency>
+ <currency type="AMD">
+ <displayName>Kudin Armenian</displayName>
+ <displayName count="one">kudin Armenian</displayName>
+ </currency>
+ <currency type="ANG">
+ <displayName>Antillean Guilder na ƙasar Netherlands</displayName>
+ <displayName count="one">Antillean guilder na ƙasar Netherlands</displayName>
+ </currency>
<currency type="AOA">
<displayName>Kuɗin Angola</displayName>
</currency>
+ <currency type="ARS">
+ <displayName>Peso na ƙasar Argentina</displayName>
+ <displayName count="one">peso na ƙasar Argentina</displayName>
+ </currency>
<currency type="AUD">
<displayName>Dalar Ostareliya</displayName>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
+ <currency type="AWG">
+ <displayName>Florin na yankin Aruba</displayName>
+ <displayName count="one">florin na yankin Aruba</displayName>
+ </currency>
+ <currency type="AZN">
+ <displayName>Kudin Azerbaijani</displayName>
+ <displayName count="one">kudin Azerbaijani</displayName>
+ </currency>
+ <currency type="BAM">
+ <displayName>Kudaden Bosnia da Harzegovina</displayName>
+ <displayName count="one">Kudaden Bosnia da Herzegovina</displayName>
+ </currency>
+ <currency type="BBD">
+ <displayName>Dalar ƙasar Barbados</displayName>
+ <displayName count="one">dalar Barbados</displayName>
+ </currency>
+ <currency type="BDT">
+ <displayName>Taka na kasar Bangladesh</displayName>
+ <displayName count="one">taka na kasar Bangladesh</displayName>
+ </currency>
+ <currency type="BGN">
+ <displayName>Kudin Bulgeria</displayName>
+ <displayName count="one">Kudin Bulgeria</displayName>
+ </currency>
<currency type="BHD">
<displayName>Kuɗin Baharan</displayName>
</currency>
<currency type="BIF">
<displayName>Kuɗin Burundi</displayName>
</currency>
+ <currency type="BMD">
+ <displayName>Dalar ƙasar Bermuda</displayName>
+ <displayName count="one">dalar Bermuda</displayName>
+ </currency>
+ <currency type="BND">
+ <displayName>Kudin Brunei</displayName>
+ <displayName count="one">kudin Brunei</displayName>
+ </currency>
+ <currency type="BOB">
+ <displayName>Boloviano na ƙasar Bolivia</displayName>
+ <displayName count="one">boliviano na ƙasar Bolivia</displayName>
+ </currency>
<currency type="BRL">
<displayName>Ril Kudin Birazil</displayName>
<displayName count="one">Ril Kudin Birazil</displayName>
<displayName count="other">Ril Kudin Birazil</displayName>
</currency>
+ <currency type="BSD">
+ <displayName>Dalar ƙasar Bahamas</displayName>
+ <displayName count="one">dalar ƙasar Bahamas</displayName>
+ </currency>
+ <currency type="BTN">
+ <displayName>Ngultrum na kasar Bhutan</displayName>
+ <displayName count="one">ngultrum na kasar Bhutan</displayName>
+ </currency>
<currency type="BWP">
<displayName>Kuɗin Baswana</displayName>
</currency>
+ <currency type="BYN">
+ <displayName>Kudin Belarusian</displayName>
+ <displayName count="one">Kudin Belarusian</displayName>
+ </currency>
+ <currency type="BZD">
+ <displayName>Dalar ƙasar Belize</displayName>
+ <displayName count="one">dalar ƙasar Belize</displayName>
+ </currency>
<currency type="CAD">
<displayName>Dalar Kanada</displayName>
</currency>
@@ -2385,16 +2564,52 @@
<currency type="CHF">
<displayName>Kuɗin Suwizalan</displayName>
</currency>
+ <currency type="CLP">
+ <displayName>Peso na ƙasar Chile</displayName>
+ <displayName count="one">peso na ƙasar Chile</displayName>
+ </currency>
+ <currency type="CNH">
+ <displayName>Yuan na ƙasar Sin (na wajen ƙasa)</displayName>
+ <displayName count="one">yuan na ƙasar Sin (na wajen ƙasa)</displayName>
+ </currency>
<currency type="CNY">
<displayName>Yuwan kasar Sin</displayName>
<displayName count="one">Yuwan kasar Sin</displayName>
</currency>
+ <currency type="COP">
+ <displayName>Peso na ƙasar Columbia</displayName>
+ <displayName count="one">peso na ƙasar Columbia</displayName>
+ </currency>
+ <currency type="CRC">
+ <displayName>Colón na kasar Costa Rica</displayName>
+ <displayName count="one">colón na kasar Costa Rica</displayName>
+ </currency>
+ <currency type="CUC">
+ <displayName>Peso mai fuska biyu na ƙasar Cuba</displayName>
+ <displayName count="one">peso mai fuska biyu na Cuba</displayName>
+ </currency>
+ <currency type="CUP">
+ <displayName>Peso na ƙasar Cuba</displayName>
+ <displayName count="one">peso na ƙasar Cuba</displayName>
+ </currency>
<currency type="CVE">
<displayName>Kuɗin Tsibiran Kap Barde</displayName>
</currency>
+ <currency type="CZK">
+ <displayName>Kudin Czech</displayName>
+ <displayName count="one">kudin Czech</displayName>
+ </currency>
<currency type="DJF">
<displayName>Kuɗin Jibuti</displayName>
</currency>
+ <currency type="DKK">
+ <displayName>Krone na ƙasar Denmark</displayName>
+ <displayName count="one">krone na ƙasar Denmark</displayName>
+ </currency>
+ <currency type="DOP">
+ <displayName>Peso na jamhuriyar Dominica</displayName>
+ <displayName count="one">peso na jamhuriyar Dominica</displayName>
+ </currency>
<currency type="DZD">
<displayName>Kuɗin Aljeriya</displayName>
</currency>
@@ -2410,23 +2625,103 @@
<currency type="EUR">
<displayName>Yuro</displayName>
</currency>
+ <currency type="FJD">
+ <displayName>Dalar Fiji</displayName>
+ <displayName count="one">dalar Fiji</displayName>
+ </currency>
+ <currency type="FKP">
+ <displayName>Fam na ƙasar Tsibirai na Falkland</displayName>
+ <displayName count="one">fam na Tsibirai na Falkland</displayName>
+ </currency>
<currency type="GBP">
<displayName>Fam na Ingila</displayName>
<displayName count="one">Fam na Ingila</displayName>
<displayName count="other">Fam na Ingila</displayName>
</currency>
+ <currency type="GEL">
+ <displayName>Kudin Georgian</displayName>
+ <displayName count="one">kudin Georgian</displayName>
+ </currency>
<currency type="GHC">
<displayName>Cedi</displayName>
</currency>
+ <currency type="GHS">
+ <displayName>Kudin Ghana</displayName>
+ <displayName count="one">kudin Ghanainian</displayName>
+ </currency>
+ <currency type="GIP">
+ <displayName>Kudin Gibraltar</displayName>
+ <displayName count="one">Kudin Gibraltal</displayName>
+ </currency>
<currency type="GMD">
<displayName>Kuɗin Gambiya</displayName>
</currency>
+ <currency type="GNF">
+ <displayName>Kudin Guinean</displayName>
+ <displayName count="one">Kudin Guinean</displayName>
+ </currency>
<currency type="GNS">
<displayName>Kuɗin Gini</displayName>
</currency>
+ <currency type="GTQ">
+ <displayName>Quetzal na ƙasar Guatemala</displayName>
+ <displayName count="one">quetzal na ƙasar Guatemala</displayName>
+ </currency>
+ <currency type="GYD">
+ <displayName>Dalar Guyana</displayName>
+ <displayName count="one">dalar Guyana</displayName>
+ </currency>
+ <currency type="HKD">
+ <displayName>Dalar Hong Kong</displayName>
+ <displayName count="one">dalar Hong Kong</displayName>
+ </currency>
+ <currency type="HNL">
+ <displayName>Lempira na ƙasar Honduras</displayName>
+ <displayName count="one">lempira na ƙasar Honduras</displayName>
+ </currency>
+ <currency type="HRK">
+ <displayName>Kudin Croatian</displayName>
+ <displayName count="one">Kudin Croatian</displayName>
+ </currency>
+ <currency type="HTG">
+ <displayName>Gourde na ƙasar Haiti</displayName>
+ <displayName count="one">gourde na ƙasar Haiti</displayName>
+ </currency>
+ <currency type="HUF">
+ <displayName>Kudin Hungarian</displayName>
+ <displayName count="one">kudin Hungarian</displayName>
+ </currency>
+ <currency type="IDR">
+ <displayName>Rupiah na ƙasar Indonesia</displayName>
+ <displayName count="one">rupiah na ƙasar Indonesia</displayName>
+ </currency>
+ <currency type="ILS">
+ <displayName>Sabbin Kudin Shekel</displayName>
+ <displayName count="one">sabbin kudi Israeli</displayName>
+ </currency>
<currency type="INR">
<displayName>Kuɗin Indiya</displayName>
</currency>
+ <currency type="IQD">
+ <displayName>Dinarin Iraqi</displayName>
+ <displayName count="one">dinarin Iraqi</displayName>
+ </currency>
+ <currency type="IRR">
+ <displayName>Riyal na kasar Iran</displayName>
+ <displayName count="other">Riyal-riyal na kasar Iran</displayName>
+ </currency>
+ <currency type="ISK">
+ <displayName>Króna na ƙasar Iceland</displayName>
+ <displayName count="one">króna na ƙasar Iceland</displayName>
+ </currency>
+ <currency type="JMD">
+ <displayName>Dalar Jamaica</displayName>
+ <displayName count="one">dalar Jamaica</displayName>
+ </currency>
+ <currency type="JOD">
+ <displayName>Dinarin Jordanian</displayName>
+ <displayName count="one">dinarin Jordanian</displayName>
+ </currency>
<currency type="JPY">
<displayName>Yen kasar Japan</displayName>
<displayName count="one">Yen kasar Japan</displayName>
@@ -2436,9 +2731,49 @@
<currency type="KES">
<displayName>Sulen Kenya</displayName>
</currency>
+ <currency type="KGS">
+ <displayName>Som na ƙasar Kyrgystani</displayName>
+ <displayName count="one">som na ƙasar Kyrgystani</displayName>
+ </currency>
+ <currency type="KHR">
+ <displayName>Riel na ƙasar Cambodia</displayName>
+ <displayName count="one">riel na ƙasar Cambodia</displayName>
+ </currency>
<currency type="KMF">
<displayName>Kuɗin Kwamoras</displayName>
</currency>
+ <currency type="KPW">
+ <displayName>Won na ƙasar Koreya ta Arewa</displayName>
+ <displayName count="one">won na ƙasar Koreya ta Arewa</displayName>
+ </currency>
+ <currency type="KRW">
+ <displayName>Won na Koreya ta Kudu</displayName>
+ <displayName count="one">won na Koreya ta Kudu</displayName>
+ </currency>
+ <currency type="KWD">
+ <displayName>Dinarin Kuwaiti</displayName>
+ <displayName count="one">dinarin Kuwaiti</displayName>
+ </currency>
+ <currency type="KYD">
+ <displayName>Dalar ƙasar Tsibirai na Cayman</displayName>
+ <displayName count="one">dalar ƙasar Tsibirai na Cayman</displayName>
+ </currency>
+ <currency type="KZT">
+ <displayName>Tenge na ƙasar Kazkhstan</displayName>
+ <displayName count="one">tenge na ƙasar Kazakhstan</displayName>
+ </currency>
+ <currency type="LAK">
+ <displayName>Kudin Laotian</displayName>
+ <displayName count="one">kudin Laotian</displayName>
+ </currency>
+ <currency type="LBP">
+ <displayName>Kudin Lebanese</displayName>
+ <displayName count="one">kudin Lebanese</displayName>
+ </currency>
+ <currency type="LKR">
+ <displayName>Rupee na kasar Sri Lanka</displayName>
+ <displayName count="one">rupee na kasar Sri Lanka</displayName>
+ </currency>
<currency type="LRD">
<displayName>Dalar Laberiya</displayName>
</currency>
@@ -2451,9 +2786,29 @@
<currency type="MAD">
<displayName>Kuɗin Maroko</displayName>
</currency>
+ <currency type="MDL">
+ <displayName>kudaden Moldova</displayName>
+ <displayName count="one">Kudaden Moldovan</displayName>
+ </currency>
<currency type="MGA">
<displayName>Kuɗin Madagaskar</displayName>
</currency>
+ <currency type="MKD">
+ <displayName>Dinarin Macedonian</displayName>
+ <displayName count="one">Dinarin Macedonian</displayName>
+ </currency>
+ <currency type="MMK">
+ <displayName>Kudin Myanmar</displayName>
+ <displayName count="one">kudin Myanmar</displayName>
+ </currency>
+ <currency type="MNT">
+ <displayName>Tugrik na Mongolia</displayName>
+ <displayName count="one">tugrik na Mongoliya</displayName>
+ </currency>
+ <currency type="MOP">
+ <displayName>Pataca na ƙasar Macao</displayName>
+ <displayName count="one">pataca na ƙasar Macao</displayName>
+ </currency>
<currency type="MRO">
<displayName>Kuɗin Moritaniya (1973–2017)</displayName>
</currency>
@@ -2463,12 +2818,28 @@
<currency type="MUR">
<displayName>Kuɗin Moritus</displayName>
</currency>
+ <currency type="MVR">
+ <displayName>Rufiyaa na kasar Maldives</displayName>
+ <displayName count="one">rufiyaa na kasar Maldives</displayName>
+ </currency>
<currency type="MWK">
<displayName>Kuɗin Malawi</displayName>
</currency>
+ <currency type="MXN">
+ <displayName>Peso na ƙasar Mexico</displayName>
+ <displayName count="one">peso na ƙasar Mexico</displayName>
+ </currency>
+ <currency type="MYR">
+ <displayName>Kudin Malaysian</displayName>
+ <displayName count="one">kudin Malaysian</displayName>
+ </currency>
<currency type="MZM">
<displayName>Kuɗin Mozambik</displayName>
</currency>
+ <currency type="MZN">
+ <displayName>Metical na ƙasar Mozambique</displayName>
+ <displayName count="one">metical na ƙasar Mozambique</displayName>
+ </currency>
<currency type="NAD">
<displayName>Dalar Namibiya</displayName>
</currency>
@@ -2478,6 +2849,66 @@
<displayName count="other">Nairorin Najeriya</displayName>
<symbol>₦</symbol>
</currency>
+ <currency type="NIO">
+ <displayName>Córdoba na ƙasar Nicaragua</displayName>
+ <displayName count="one">córdoba na ƙasar Nicaragua</displayName>
+ </currency>
+ <currency type="NOK">
+ <displayName>Krone na ƙasar Norway</displayName>
+ <displayName count="one">krone na ƙasar Norway</displayName>
+ </currency>
+ <currency type="NPR">
+ <displayName>Rupee na Nepal</displayName>
+ <displayName count="one">rupee na kasar Nepal</displayName>
+ </currency>
+ <currency type="NZD">
+ <displayName>Dalar New Zealand</displayName>
+ <displayName count="one">dalar New Zealand</displayName>
+ </currency>
+ <currency type="OMR">
+ <displayName>Riyal din Omani</displayName>
+ <displayName count="one">Riyal din Omani</displayName>
+ </currency>
+ <currency type="PAB">
+ <displayName>Balboa na ƙasar Panama</displayName>
+ <displayName count="one">balboa na ƙasar Panama</displayName>
+ </currency>
+ <currency type="PEN">
+ <displayName>Sol na ƙasar Peru</displayName>
+ <displayName count="one">sol na ƙasar Peru</displayName>
+ </currency>
+ <currency type="PGK">
+ <displayName>Kina na ƙasar Papua Sabon Guinea</displayName>
+ <displayName count="one">kina na ƙasar Papua Sabon Guinea</displayName>
+ </currency>
+ <currency type="PHP">
+ <displayName>Kudin Philippine</displayName>
+ <displayName count="one">kudin Philippine</displayName>
+ </currency>
+ <currency type="PKR">
+ <displayName>Rupee na kasar Pakistan</displayName>
+ <displayName count="one">rupee na kasar Pakistan</displayName>
+ </currency>
+ <currency type="PLN">
+ <displayName>Kudaden Polish</displayName>
+ <displayName count="one">kudin Polish</displayName>
+ </currency>
+ <currency type="PYG">
+ <displayName>Guarani na ƙasar Paraguay</displayName>
+ <displayName count="one">guarani na ƙasar Paraguay</displayName>
+ </currency>
+ <currency type="QAR">
+ <displayName>Riyal din Qatari</displayName>
+ <displayName count="one">riyal Qatari</displayName>
+ </currency>
+ <currency type="RON">
+ <displayName>Kudin Romanian</displayName>
+ <displayName count="one">kudin Romanian</displayName>
+ </currency>
+ <currency type="RSD">
+ <displayName>Dinar Serbian</displayName>
+ <displayName count="one">dinarin Serbian</displayName>
+ </currency>
<currency type="RUB">
<displayName>Ruble kasar Rasha</displayName>
<displayName count="one">Ruble kasar Rasha</displayName>
@@ -2488,12 +2919,24 @@
<currency type="SAR">
<displayName>Riyal</displayName>
</currency>
+ <currency type="SBD">
+ <displayName>Dalar Tsibirai na Solomon</displayName>
+ <displayName count="one">dalar Tsibirai na Solomon</displayName>
+ </currency>
<currency type="SCR">
<displayName>Kuɗin Saishal</displayName>
</currency>
<currency type="SDG">
<displayName>Fam kin Sudan</displayName>
</currency>
+ <currency type="SEK">
+ <displayName>Krona na ƙasar Sweden</displayName>
+ <displayName count="one">krona na ƙasar Sweden</displayName>
+ </currency>
+ <currency type="SGD">
+ <displayName>Dilar Singapore</displayName>
+ <displayName count="one">dalar Singapore</displayName>
+ </currency>
<currency type="SHP">
<displayName>Fam kin San Helena</displayName>
</currency>
@@ -2503,21 +2946,65 @@
<currency type="SOS">
<displayName>Sulen Somaliya</displayName>
</currency>
+ <currency type="SRD">
+ <displayName>Dalar ƙasar Suriname</displayName>
+ <displayName count="one">dalar ƙasar Suriname</displayName>
+ </currency>
+ <currency type="SSP">
+ <displayName>Fam na Kudancin Sudan</displayName>
+ <displayName count="one">fam na Kudancin Sudan</displayName>
+ </currency>
<currency type="STD">
<displayName>Kuɗin Sawo Tome da Paransip (1977–2017)</displayName>
</currency>
<currency type="STN">
<displayName>Kuɗin Sawo Tome da Paransip</displayName>
</currency>
+ <currency type="SYP">
+ <displayName>Kudin Syrian</displayName>
+ <displayName count="one">Kudin Syrian</displayName>
+ </currency>
<currency type="SZL">
<displayName>Kuɗin Lilangeni</displayName>
</currency>
+ <currency type="THB">
+ <displayName>Baht na ƙasar Thailand</displayName>
+ <displayName count="one">baht na ƙasar Thailand</displayName>
+ </currency>
+ <currency type="TJS">
+ <displayName>Somoni na ƙasar Tajikistan</displayName>
+ <displayName count="one">somoni na ƙasar Tajikistan</displayName>
+ </currency>
+ <currency type="TMT">
+ <displayName>Manat na ƙasar Turkmenistan</displayName>
+ <displayName count="one">manat na ƙasar Turkmenistan</displayName>
+ </currency>
<currency type="TND">
<displayName>Kuɗin Tunisiya</displayName>
</currency>
+ <currency type="TOP">
+ <displayName>Paʼanga na ƙasar Tonga</displayName>
+ <displayName count="one">paʼanga na ƙasar Tonga</displayName>
+ </currency>
+ <currency type="TRY">
+ <displayName>Kudin Turkish</displayName>
+ <displayName count="one">kudin Turkish</displayName>
+ </currency>
+ <currency type="TTD">
+ <displayName>Dalar ƙasar Trinidad da Tobago</displayName>
+ <displayName count="one">dalar ƙasar Trinidad da Tobago</displayName>
+ </currency>
+ <currency type="TWD">
+ <displayName>Sabuwar Dalar Taiwan</displayName>
+ <displayName count="one">Sabuwar dalar Taiwan</displayName>
+ </currency>
<currency type="TZS">
<displayName>Sulen Tanzaniya</displayName>
</currency>
+ <currency type="UAH">
+ <displayName>Kudin Ukrainian</displayName>
+ <displayName count="one">kudin Ukrainian</displayName>
+ </currency>
<currency type="UGX">
<displayName>Sule Yuganda</displayName>
</currency>
@@ -2526,17 +3013,53 @@
<displayName count="one">Dalar Amirka</displayName>
<symbol draft="contributed">$</symbol>
</currency>
+ <currency type="UYU">
+ <displayName>Peso na ƙasar Uruguay</displayName>
+ <displayName count="one">peso na ƙasar Uruguay</displayName>
+ </currency>
+ <currency type="UZS">
+ <displayName>Som na ƙasar Uzbekistan</displayName>
+ <displayName count="one">som na ƙasar Uzbekistan</displayName>
+ </currency>
+ <currency type="VES">
+ <displayName>Bolívar na ƙasar Venezuela</displayName>
+ <displayName count="one">bolívar na ƙasar Venezuela</displayName>
+ </currency>
+ <currency type="VND">
+ <displayName>Kudin Vietnamese</displayName>
+ <displayName count="one">kudin Vietnamese</displayName>
+ </currency>
+ <currency type="VUV">
+ <displayName>Vatu da ƙasar Vanuatu</displayName>
+ <displayName count="one">vatu na ƙasar Vanuatu</displayName>
+ </currency>
+ <currency type="WST">
+ <displayName>Tala na ƙasar Samoa</displayName>
+ <displayName count="one">tala na ƙasar Samoa</displayName>
+ </currency>
<currency type="XAF">
<displayName>Kuɗin Sefa na Afirka Ta Tsakiya</displayName>
</currency>
+ <currency type="XCD">
+ <displayName>Dalar Gabashin Caribbean</displayName>
+ <displayName count="one">dalar Gabashin Caribbeaan</displayName>
+ </currency>
<currency type="XOF">
<displayName>Kuɗin Sefa na Afirka Ta Yamma</displayName>
</currency>
+ <currency type="XPF">
+ <displayName>kudin CFP Franc</displayName>
+ <displayName count="one">kudin CFP franc</displayName>
+ </currency>
<currency type="XXX">
<displayName>Kudin da ba a sani ba</displayName>
<displayName count="one">Kudin sashe da ba a sani ba</displayName>
<displayName count="other">(Kudin da ba a sani ba)</displayName>
</currency>
+ <currency type="YER">
+ <displayName>Riyal din Yemeni</displayName>
+ <displayName count="one">riyal din Yemeni</displayName>
+ </currency>
<currency type="ZAR">
<displayName>Kuɗin Afirka Ta Kudu</displayName>
</currency>
@@ -2587,4 +3110,12 @@
<nostr>aʼa:a</nostr>
</messages>
</posix>
+ <typographicNames>
+ <styleName type="wdth" subtype="75" alt="compressed">abnchhhh</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">Fadadawa</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">fadi</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">nauyi</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">matsanancin baki</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">matsanancin nauyi</styleName>
+ </typographicNames>
</ldml>
diff --git a/common/main/ha_NG.xml b/common/main/ha_NG.xml
index 1618f68..cf6a4aa 100644
--- a/common/main/ha_NG.xml
+++ b/common/main/ha_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/haw.xml b/common/main/haw.xml
index 58a39c4..656370f 100644
--- a/common/main/haw.xml
+++ b/common/main/haw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/haw_US.xml b/common/main/haw_US.xml
index 2de2007..e1ecc98 100644
--- a/common/main/haw_US.xml
+++ b/common/main/haw_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/he.xml b/common/main/he.xml
index 9679797..e291de9 100644
--- a/common/main/he.xml
+++ b/common/main/he.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -161,6 +161,7 @@
<language type="eu">בסקית</language>
<language type="ewo">אוונדו</language>
<language type="fa">פרסית</language>
+ <language type="fa_AF">דארי</language>
<language type="fan">פנג</language>
<language type="fat">פאנטי</language>
<language type="ff">פולה</language>
@@ -565,6 +566,8 @@
<scripts>
<script type="Arab">ערבי</script>
<script type="Arab" alt="variant">ערבי-פרסי</script>
+ <script type="Aran" draft="contributed">נסתעליק</script>
+ <script type="Armi" draft="contributed">ארמית רשמית</script>
<script type="Armn">ארמני</script>
<script type="Bali">באלינזי</script>
<script type="Beng">בנגלי</script>
@@ -610,9 +613,13 @@
<script type="Maya" draft="contributed">מאיה</script>
<script type="Mlym">מליאלאם</script>
<script type="Mong">מונגולי</script>
+ <script type="Mtei" draft="contributed">מאיטי מאייק</script>
<script type="Mymr">מיאנמר</script>
+ <script type="Nkoo" draft="contributed">נ׳קו</script>
+ <script type="Olck" draft="contributed">אול צ׳יקי</script>
<script type="Orya">אודייה</script>
<script type="Phnx">פיניקי</script>
+ <script type="Qaag" draft="contributed">זאוגיי</script>
<script type="Runr">רוני</script>
<script type="Sinh">סינהלה</script>
<script type="Syrc">סורי</script>
@@ -5624,7 +5631,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>שעון האי נורפוק</standard>
+ <generic draft="contributed">שעון האי נורפוק</generic>
+ <standard draft="contributed">שעון האי נורפוק (חורף)</standard>
+ <daylight draft="contributed">שעון האי נורפוק (קיץ)</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7748,9 +7757,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>דצי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>סנטי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>מילי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>מיקרו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ננו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>פיקו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>פמטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>אטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>זפטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>יוקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>דקא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>הקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>קילו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>מגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>גיגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>טרה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>פטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>אקסה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>זטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>יוטא{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ל{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} בריבוע</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} מעוקב</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7761,7 +7844,7 @@
<unitPattern count="many">{0} כוחות ג׳י</unitPattern>
<unitPattern count="other">{0} כוחות ג׳י</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>מטר לשנייה בריבוע</displayName>
<unitPattern count="one">{0} מטר לשנייה בריבוע</unitPattern>
<unitPattern count="two">{0} מטר לשנייה בריבוע</unitPattern>
@@ -7899,7 +7982,7 @@
<unitPattern count="many">{0} מילימול/ליטר</unitPattern>
<unitPattern count="other">{0} מילימול/ליטר</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>חלקים למיליון</displayName>
<unitPattern count="one">{0} חלקים למיליון</unitPattern>
<unitPattern count="two">{0} חלקים למיליון</unitPattern>
@@ -7941,7 +8024,7 @@
<unitPattern count="many">{0} ליטרים/קילומטר</unitPattern>
<unitPattern count="other">{0} ליטרים/קילומטר</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ליטר/100 ק״מ</displayName>
<unitPattern count="one">ליטר/100 ק״מ</unitPattern>
<unitPattern count="two">{0} ליטר/100 ק״מ</unitPattern>
@@ -8608,21 +8691,21 @@
<unitPattern count="many">{0} כוח סוס</unitPattern>
<unitPattern count="other">{0} כוח סוס</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>מילימטר כספית</displayName>
<unitPattern count="one">מילימטר כספית אחד</unitPattern>
<unitPattern count="two">שני מילימטר כספית</unitPattern>
<unitPattern count="many">{0} מילימטר כספית</unitPattern>
<unitPattern count="other">{0} מילימטר כספית</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>פאונד לאינץ׳ רבוע</displayName>
<unitPattern count="one">פאונד אחד לאינץ׳ רבוע</unitPattern>
<unitPattern count="two">שני פאונד לאינץ׳ רבוע</unitPattern>
<unitPattern count="many">{0} פאונד לאינץ׳ רבוע</unitPattern>
<unitPattern count="other">{0} פאונד לאינץ׳ רבוע</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>אינץ׳ כספית</displayName>
<unitPattern count="one">אינץ׳ כספית {0}</unitPattern>
<unitPattern count="two">{0} אינץ׳ כספית</unitPattern>
@@ -8734,7 +8817,7 @@
<unitPattern count="many">{0} קלווין</unitPattern>
<unitPattern count="other">{0} קלווין</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>כוח פאונד</displayName>
<unitPattern count="one">{0} כוח פאונד</unitPattern>
<unitPattern count="two">{0} כוח פאונד</unitPattern>
@@ -8944,9 +9027,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>דצי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>סנטי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>מילי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ננו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>פיקו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>פמטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>אטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>זפטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>יוקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>דקא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>הקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>קילו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>מגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>גיגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>טרה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>פטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>אקס{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>זטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>יוטא{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8957,7 +9114,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -9095,7 +9252,7 @@
<unitPattern count="many">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="two">{0} ppm</unitPattern>
@@ -9137,7 +9294,7 @@
<unitPattern count="many">{0} ל׳/ק״מ</unitPattern>
<unitPattern count="other">{0} ל׳/ק״מ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ל׳/100 ק״מ</displayName>
<unitPattern count="one">ל׳ {0}/100 ק״מ</unitPattern>
<unitPattern count="two">{0} ל׳/100 ק״מ</unitPattern>
@@ -9804,21 +9961,21 @@
<unitPattern count="many">{0} כ״ס</unitPattern>
<unitPattern count="other">{0} כ״ס</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="two">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="two">{0} psi</unitPattern>
<unitPattern count="many">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -9930,7 +10087,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="two">↑↑↑</unitPattern>
@@ -10140,9 +10297,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>דצי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>סנטי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>מילי{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ננו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>פיקו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>פמטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>אטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>זפטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>יוקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>דקא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>הקטו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>קילו{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>מגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>גיגה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>טרה{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>פטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>אקס{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>זטא{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>יוטא{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10153,7 +10384,7 @@
<unitPattern count="many" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="two" draft="contributed">{0} m/s²</unitPattern>
@@ -10221,7 +10452,7 @@
<unitPattern count="many">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ל׳/100ק״מ</displayName>
<unitPattern count="one">{0}ל׳/100ק״מ</unitPattern>
<unitPattern count="two">{0}ל׳/100ק״מ</unitPattern>
@@ -10575,21 +10806,21 @@
<unitPattern count="many" draft="contributed">{0} כ״ס</unitPattern>
<unitPattern count="other" draft="contributed">{0} כ״ס</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="two" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="many" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="two" draft="contributed">{0} psi</unitPattern>
<unitPattern count="many" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
diff --git a/common/main/he_IL.xml b/common/main/he_IL.xml
index 5650090..8f02406 100644
--- a/common/main/he_IL.xml
+++ b/common/main/he_IL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hi.xml b/common/main/hi.xml
index cb1fb2b..07c7940 100644
--- a/common/main/hi.xml
+++ b/common/main/hi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">मापूचे</language>
<language type="arp">अरापाहो</language>
<language type="ars">नज्दी अरबी</language>
+ <language type="ars" alt="menu">अरबी, नज्दी</language>
<language type="arw">अरावक</language>
<language type="as">असमिया</language>
<language type="asa">असु</language>
@@ -97,6 +98,7 @@
<language type="chr">चेरोकी</language>
<language type="chy">शेयेन्न</language>
<language type="ckb">सोरानी कुर्दिश</language>
+ <language type="ckb" alt="menu">कुर्दी, सोरानी</language>
<language type="co">कोर्सीकन</language>
<language type="cop">कॉप्टिक</language>
<language type="cr">क्री</language>
@@ -152,6 +154,7 @@
<language type="eu">बास्क</language>
<language type="ewo">इवोन्डो</language>
<language type="fa">फ़ारसी</language>
+ <language type="fa_AF">दारी</language>
<language type="fan">फैन्ग</language>
<language type="fat">फन्टी</language>
<language type="ff">फुलाह</language>
@@ -336,7 +339,7 @@
<language type="myv">एर्ज़या</language>
<language type="mzn">माज़न्देरानी</language>
<language type="na">नाउरू</language>
- <language type="nan" draft="contributed">nan</language>
+ <language type="nan">मिन नान</language>
<language type="nap">नीपोलिटन</language>
<language type="naq">नामा</language>
<language type="nb">नॉर्वेजियाई बोकमाल</language>
@@ -547,6 +550,7 @@
<scripts>
<script type="Arab">अरबी</script>
<script type="Arab" alt="variant">फ़ारसी-अरबी</script>
+ <script type="Aran" draft="contributed">नस्तालीक़</script>
<script type="Armi">इम्पिरियल आर्मेनिक</script>
<script type="Armn">आर्मेनियाई</script>
<script type="Avst">अवेस्तन</script>
@@ -642,6 +646,7 @@
<script type="Phnx">फोनिशियन</script>
<script type="Plrd">पॉलार्ड फोनेटिक</script>
<script type="Prti">इंस्क्रिपश्नल पार्थियन</script>
+ <script type="Qaag" draft="contributed">ज़ौजी</script>
<script type="Rjng">रीजांग</script>
<script type="Roro">रोन्गोरोन्गो</script>
<script type="Runr">रूनिक</script>
@@ -4979,7 +4984,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>नॉरफ़ॉक द्वीप समय</standard>
+ <generic draft="contributed">नॉरफ़ॉक द्वीप समय</generic>
+ <standard draft="contributed">नॉरफ़ॉक द्वीप मानक समय</standard>
+ <daylight draft="contributed">नॉरफ़ॉक द्वीप डेलाइट समय</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6574,9 +6581,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेसी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सेंटी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मिली{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>माइक्रो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नैनो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पिको{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फ़ेम्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ज़ेप्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>योक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हेक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>किलो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मेगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गीगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टेरा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>एक्ज़ा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ज़ेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} प्रति {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>वर्ग {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">वर्ग {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">वर्ग {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>घन {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">घन {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">घन {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6585,7 +6662,7 @@
<unitPattern count="one">{0} गुरुत्व–बल</unitPattern>
<unitPattern count="other">{0} गुरुत्व–बल</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मीटर/से²</displayName>
<unitPattern count="one">{0} मीटर प्रति सेकंड वर्ग</unitPattern>
<unitPattern count="other">{0} मीटर प्रति सेकंड वर्ग</unitPattern>
@@ -6685,7 +6762,7 @@
<unitPattern count="one">{0} मिलीमोल प्रति लीटर</unitPattern>
<unitPattern count="other">{0} मिलीमोल प्रति लीटर</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} हिस्सा प्रति दस लाख</unitPattern>
@@ -6715,7 +6792,7 @@
<unitPattern count="one">{0} लीटर प्रति किलोमीटर</unitPattern>
<unitPattern count="other">{0} लीटर प्रति किलोमीटर</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लीटर प्रति 100 किलोमीटर</displayName>
<unitPattern count="one">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
<unitPattern count="other">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
@@ -7191,17 +7268,17 @@
<unitPattern count="one">{0} अश्वशक्ति</unitPattern>
<unitPattern count="other">{0} अश्वशक्ति</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>मर्क्यूरी मिलीमीटर</displayName>
<unitPattern count="one">{0} मर्क्यूरी मिलीमीटर</unitPattern>
<unitPattern count="other">{0} मर्क्यूरी मिलीमीटर</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>पाउंड प्रति वर्ग इंच</displayName>
<unitPattern count="one">{0} पाउंड प्रति वर्ग इंच</unitPattern>
<unitPattern count="other">{0} पाउंड प्रति वर्ग इंच</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>मर्करी इंच</displayName>
<unitPattern count="one">{0} मर्करी इंच</unitPattern>
<unitPattern count="other">{0} मर्करी इंच</unitPattern>
@@ -7281,7 +7358,7 @@
<unitPattern count="one">{0} केल्विन</unitPattern>
<unitPattern count="other">{0} केल्विन</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>पाउंड-फ़ुट</displayName>
<unitPattern count="one">{0} पाउंड-फ़ुट</unitPattern>
<unitPattern count="other">{0} पाउंड-फ़ुट</unitPattern>
@@ -7435,9 +7512,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>से.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नै.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फ़े.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ज़ेे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यो.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गी.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ज़े.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7446,7 +7593,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मीटर/से²</displayName>
<unitPattern count="one">{0} मी॰/व॰से॰</unitPattern>
<unitPattern count="other">{0} मी॰/व॰से॰</unitPattern>
@@ -7546,7 +7693,7 @@
<unitPattern count="one">{0} मिलीमोल/ली॰</unitPattern>
<unitPattern count="other">{0} मिलीमोल/ली॰</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7576,7 +7723,7 @@
<unitPattern count="one">{0} ली/किमी</unitPattern>
<unitPattern count="other">{0} ली/किमी</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ली॰/100 कि॰मी॰</displayName>
<unitPattern count="one">{0} ली॰/100 कि॰मी॰</unitPattern>
<unitPattern count="other">{0} ली॰/100 कि॰मी॰</unitPattern>
@@ -8052,17 +8199,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8142,7 +8289,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8296,9 +8443,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>से {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नै {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फ़े {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ज़े {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यो {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गी {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ज़े {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>यो {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8348,7 +8565,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ली॰/100 कि॰मी॰</displayName>
<unitPattern count="one">{0}ली/100कि</unitPattern>
<unitPattern count="other">{0}ली/100कि</unitPattern>
@@ -8467,7 +8684,7 @@
<unitPattern count="one">{0}एचपी</unitPattern>
<unitPattern count="other">{0}एचपी</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
diff --git a/common/main/hi_IN.xml b/common/main/hi_IN.xml
index 737a695..035d0e1 100644
--- a/common/main/hi_IN.xml
+++ b/common/main/hi_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hr.xml b/common/main/hr.xml
index 4bbc75c..2b186ed 100644
--- a/common/main/hr.xml
+++ b/common/main/hr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">mapuche</language>
<language type="arp">arapaho</language>
<language type="ars">najdi arapski</language>
+ <language type="ars" alt="menu">arapski, najdi</language>
<language type="arw">aravački</language>
<language type="as">asamski</language>
<language type="asa">asu</language>
@@ -106,6 +107,7 @@
<language type="chr">čerokijski</language>
<language type="chy">čejenski</language>
<language type="ckb">soranski kurdski</language>
+ <language type="ckb" alt="menu">kurdski, sorani</language>
<language type="co">korzički</language>
<language type="cop">koptski</language>
<language type="cr">cree</language>
@@ -161,6 +163,7 @@
<language type="eu">baskijski</language>
<language type="ewo">ewondo</language>
<language type="fa">perzijski</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -566,6 +569,7 @@
<script type="Afak" draft="contributed">afaka pismo</script>
<script type="Arab">arapsko pismo</script>
<script type="Arab" alt="variant">perzijsko-arapsko pismo</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">aramejsko pismo</script>
<script type="Armn">armensko pismo</script>
<script type="Avst">avestansko pismo</script>
@@ -677,6 +681,7 @@
<script type="Phnx">feničko pismo</script>
<script type="Plrd">pollard fonetsko pismo</script>
<script type="Prti">pisani parthian</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang pismo</script>
<script type="Roro">rongorongo pismo</script>
<script type="Runr">runsko pismo</script>
@@ -5615,7 +5620,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>vrijeme Otoka Norfolk</standard>
+ <generic draft="contributed">vrijeme Otoka Norfolk</generic>
+ <standard draft="contributed">standardno vrijeme Otoka Norfolk</standard>
+ <daylight draft="contributed">ljetno vrijeme Otoka Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8297,9 +8304,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>četvorni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">četvorni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">četvorna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">četvornih {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kubna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubnih {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8309,7 +8388,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri u sekundi na kvadrat</displayName>
<unitPattern count="one">{0} metar u sekundi na kvadrat</unitPattern>
<unitPattern count="few">{0} metra u sekundi na kvadrat</unitPattern>
@@ -8428,7 +8507,7 @@
<unitPattern count="few">{0} milimola po litri</unitPattern>
<unitPattern count="other">{0} milimola po litri</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>dijelovi na milijun</displayName>
<unitPattern count="one">{0} dio na milijun</unitPattern>
<unitPattern count="few">{0} dijela na milijun</unitPattern>
@@ -8464,7 +8543,7 @@
<unitPattern count="few">{0} litre po kilometru</unitPattern>
<unitPattern count="other">{0} litara po kilometru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litre na 100 kilometara</displayName>
<unitPattern count="one">{0} litra na 100 kilometara</unitPattern>
<unitPattern count="few">{0} litre na 100 kilometara</unitPattern>
@@ -9050,19 +9129,19 @@
<unitPattern count="few">{0} konjske snage</unitPattern>
<unitPattern count="other">{0} konjskih snaga</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetri živina stupca</displayName>
<unitPattern count="one">{0} milimetar živina stupca</unitPattern>
<unitPattern count="few">{0} milimetra živina stupca</unitPattern>
<unitPattern count="other">{0} milimetara živina stupca</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funte po kvadratnom inču</displayName>
<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inči žive</displayName>
<unitPattern count="one">{0} inč žive</unitPattern>
<unitPattern count="few">{0} inča žive</unitPattern>
@@ -9158,7 +9237,7 @@
<unitPattern count="few">{0} kelvina</unitPattern>
<unitPattern count="other">{0} kelvina</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funte sile po stopi</displayName>
<unitPattern count="one">{0} funta sile po stopi</unitPattern>
<unitPattern count="few">{0} funte sile po stopi</unitPattern>
@@ -9346,9 +9425,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9358,7 +9509,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -9477,7 +9628,7 @@
<unitPattern count="few">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -9513,7 +9664,7 @@
<unitPattern count="few">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -10099,19 +10250,19 @@
<unitPattern count="few">{0} KS</unitPattern>
<unitPattern count="other">{0} KS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -10207,7 +10358,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -10395,9 +10546,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10406,7 +10629,7 @@
<unitPattern count="few" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -10488,7 +10711,7 @@
<unitPattern count="few" draft="contributed">{0} l/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="few">{0}l/100km</unitPattern>
@@ -10866,17 +11089,17 @@
<unitPattern count="few" draft="contributed">{0} KS</unitPattern>
<unitPattern count="other" draft="contributed">{0} KS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
diff --git a/common/main/hr_BA.xml b/common/main/hr_BA.xml
index cfd0ee5..34bc27b 100644
--- a/common/main/hr_BA.xml
+++ b/common/main/hr_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hr_HR.xml b/common/main/hr_HR.xml
index 36ca01a..b04bad0 100644
--- a/common/main/hr_HR.xml
+++ b/common/main/hr_HR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hsb.xml b/common/main/hsb.xml
index 424d8a9..f39d5c0 100644
--- a/common/main/hsb.xml
+++ b/common/main/hsb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -513,7 +513,6 @@
<territory type="MF">St. Martin</territory>
<territory type="MG">Madagaskar</territory>
<territory type="MH">Marshallowe kupy</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongolska</territory>
@@ -2785,7 +2784,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>čas kupy Norfolk</standard>
+ <generic draft="contributed">čas kupy Norfolk</generic>
+ <standard draft="contributed">standardny čas kupy Norfolk</standard>
+ <daylight draft="contributed">lětni čas kupy Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4595,7 +4596,7 @@
<unitPattern count="few">{0} jednotki zemskeho pospěšenja</unitPattern>
<unitPattern count="other">{0} jednotkow zemskeho pospěšenja</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metry na kwadratnu sekundu</displayName>
<unitPattern count="one">{0} meter na kwadratnu sekundu</unitPattern>
<unitPattern count="two">{0} metraj na kwadratnu sekundu</unitPattern>
@@ -5185,21 +5186,21 @@
<unitPattern count="few">{0} konjace mocy</unitPattern>
<unitPattern count="other">{0} konjacych mocow</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetry žiwoslěbroweho stołpika</displayName>
<unitPattern count="one">{0} milimeter žiwoslěbroweho stołpika</unitPattern>
<unitPattern count="two">{0} milimetraj žiwoslěbroweho stołpika</unitPattern>
<unitPattern count="few">{0} milimetry žiwoslěbroweho stołpika</unitPattern>
<unitPattern count="other">{0} milimetrow žiwoslěbroweho stołpika</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>punty na kwadratny cól</displayName>
<unitPattern count="one">{0} punt na kwadratny cól</unitPattern>
<unitPattern count="two">{0} puntaj na kwadratny cól</unitPattern>
<unitPattern count="few">{0} punty na kwadratny cól</unitPattern>
<unitPattern count="other">{0} puntow na kwadratny cól</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>cóle žiwoslěbroweho stołpika</displayName>
<unitPattern count="one">{0} cól žiwoslěbroweho stołpika</unitPattern>
<unitPattern count="two">{0} cólej žiwoslěbroweho stołpika</unitPattern>
@@ -5418,7 +5419,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -6008,21 +6009,21 @@
<unitPattern count="few">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="two">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="two">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -6458,7 +6459,7 @@
<unitPattern count="few">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/hsb_DE.xml b/common/main/hsb_DE.xml
index 0f5d53e..a5448b3 100644
--- a/common/main/hsb_DE.xml
+++ b/common/main/hsb_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hu.xml b/common/main/hu.xml
index 5641fe5..e6089ee 100644
--- a/common/main/hu.xml
+++ b/common/main/hu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">mapucse</language>
<language type="arp">arapaho</language>
<language type="ars">nedzsdi arab</language>
+ <language type="ars" alt="menu">arab, nedzsdi</language>
<language type="arw">aravak</language>
<language type="as">asszámi</language>
<language type="asa">asu</language>
@@ -105,6 +106,7 @@
<language type="chr">cseroki</language>
<language type="chy">csejen</language>
<language type="ckb">közép-ázsiai kurd</language>
+ <language type="ckb" alt="menu" draft="contributed">kurd, szoráni</language>
<language type="co">korzikai</language>
<language type="cop">kopt</language>
<language type="cr">krí</language>
@@ -160,6 +162,7 @@
<language type="eu">baszk</language>
<language type="ewo">evondo</language>
<language type="fa">perzsa</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulani</language>
@@ -563,6 +566,7 @@
<scripts>
<script type="Arab">Arab</script>
<script type="Arab" alt="variant">Perzsa-arab</script>
+ <script type="Aran" draft="contributed">Nasztalik</script>
<script type="Armi">Birodalmi arámi</script>
<script type="Armn">Örmény</script>
<script type="Avst">Avesztán</script>
@@ -597,7 +601,7 @@
<script type="Grek">Görög</script>
<script type="Gujr">Gudzsaráti</script>
<script type="Guru">Gurmuki</script>
- <script type="Hanb">Hanb</script>
+ <script type="Hanb">Han bopomofóval</script>
<script type="Hang">Hangul</script>
<script type="Hani">Han</script>
<script type="Hano">Hanunoo</script>
@@ -656,6 +660,7 @@
<script type="Phnx">Főniciai</script>
<script type="Plrd">Pollard fonetikus</script>
<script type="Prti">Feliratos parthian</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Redzsang</script>
<script type="Roro">Rongorongo</script>
<script type="Runr">Runikus</script>
@@ -779,6 +784,7 @@
<territory type="CG" alt="variant">Kongó (Köztársaság)</territory>
<territory type="CH">Svájc</territory>
<territory type="CI">Elefántcsontpart</territory>
+ <territory type="CI" alt="variant">↑↑↑</territory>
<territory type="CK">Cook-szigetek</territory>
<territory type="CL">Chile</territory>
<territory type="CM">Kamerun</territory>
@@ -5328,7 +5334,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>norfolk-szigeteki idő</standard>
+ <generic draft="contributed">norfolk-szigeteki idő</generic>
+ <standard draft="contributed">norfolk-szigeteki téli idő</standard>
+ <daylight draft="contributed">norfolk-szigeteki nyári idő</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5654,9 +5662,15 @@
<nan>NaN</nan>
<timeSeparator draft="contributed">:</timeSeparator>
</symbols>
+ <symbols numberSystem="olck">
+ <decimal draft="contributed">↑↑↑</decimal>
+ </symbols>
<symbols numberSystem="rohg">
<timeSeparator draft="contributed">↑↑↑</timeSeparator>
</symbols>
+ <symbols numberSystem="sora">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
<decimalFormats numberSystem="latn">
<decimalFormatLength>
<decimalFormat>
@@ -5779,6 +5793,7 @@
<displayName>Andorrai peseta</displayName>
<displayName count="one">Andorrai peseta</displayName>
<displayName count="other">Andorrai peseta</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AED">
<displayName>EAE-dirham</displayName>
@@ -5797,6 +5812,12 @@
<displayName count="other">afgán afghani</displayName>
<symbol draft="contributed">AFN</symbol>
</currency>
+ <currency type="ALK">
+ <displayName draft="contributed">albán lek (1946–1965)</displayName>
+ <displayName count="one" draft="contributed">albán lek (1946–1965)</displayName>
+ <displayName count="other" draft="contributed">albán lek (1946–1965)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="ALL">
<displayName>albán lek</displayName>
<displayName count="one">albán lek</displayName>
@@ -5887,6 +5908,7 @@
<displayName>Bosznia-hercegovinai dínár (1992–1994)</displayName>
<displayName count="one">Bosznia-hercegovinai dínár (1992–1994)</displayName>
<displayName count="other">Bosznia-hercegovinai dínár (1992–1994)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BAM">
<displayName>bosznia-hercegovinai konvertibilis márka</displayName>
@@ -5895,6 +5917,12 @@
<symbol draft="contributed">BAM</symbol>
<symbol alt="narrow" draft="contributed">KM</symbol>
</currency>
+ <currency type="BAN">
+ <displayName draft="contributed">bosznia-hercegovinai új dínár (1994–1997)</displayName>
+ <displayName count="one" draft="contributed">bosznia-hercegovinai új dínár (1994–1997)</displayName>
+ <displayName count="other" draft="contributed">bosznia-hercegovinai új dínár (1994–1997)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="BBD">
<displayName>barbadosi dollár</displayName>
<displayName count="one">barbadosi dollár</displayName>
@@ -5928,6 +5956,13 @@
<displayName>Bolgár kemény leva</displayName>
<displayName count="one">Bolgár kemény leva</displayName>
<displayName count="other">Bolgár kemény leva</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="BGM">
+ <displayName draft="contributed">bolgár szocialista leva</displayName>
+ <displayName count="one" draft="contributed">bolgár szocialista leva</displayName>
+ <displayName count="other" draft="contributed">bolgár szocialista leva</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BGN">
<displayName>bolgár új leva</displayName>
@@ -5935,6 +5970,12 @@
<displayName count="other">bolgár új leva</displayName>
<symbol draft="contributed">BGN</symbol>
</currency>
+ <currency type="BGO">
+ <displayName draft="contributed">bolgár leva (1879–1952)</displayName>
+ <displayName count="one" draft="contributed">bolgár leva (1879–1952)</displayName>
+ <displayName count="other" draft="contributed">bolgár leva (1879–1952)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="BHD">
<displayName>bahreini dinár</displayName>
<displayName count="one">bahreini dinár</displayName>
@@ -6038,6 +6079,9 @@
</currency>
<currency type="BYB">
<displayName>Fehérorosz új rubel (1994–1999)</displayName>
+ <displayName count="one" draft="contributed">fehérorosz új rubel (1994–1999)</displayName>
+ <displayName count="other" draft="contributed">fehérorosz új rubel (1994–1999)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BYN">
<displayName>belarusz rubel</displayName>
@@ -6126,9 +6170,15 @@
</currency>
<currency type="CSD">
<displayName>szerb dinár</displayName>
+ <displayName count="one" draft="contributed">szerb dinár (2002–2006)</displayName>
+ <displayName count="other" draft="contributed">szerb dinár (2002–2006)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CSK">
<displayName>Csehszlovák kemény korona</displayName>
+ <displayName count="one" draft="contributed">csehszlovák kemény korona</displayName>
+ <displayName count="other" draft="contributed">csehszlovák kemény korona</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
<displayName>kubai konvertibilis peso</displayName>
@@ -6216,12 +6266,22 @@
</currency>
<currency type="ESA">
<displayName>spanyol peseta (A–kontó)</displayName>
+ <displayName count="one" draft="contributed">spanyol peseta (A–kontó)</displayName>
+ <displayName count="other" draft="contributed">spanyol peseta (A–kontó)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ESB">
<displayName>spanyol peseta (konvertibilis kontó)</displayName>
+ <displayName count="one" draft="contributed">↑↑↑</displayName>
+ <displayName count="other" draft="contributed">↑↑↑</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ESP">
<displayName>Spanyol peseta</displayName>
+ <displayName count="one" draft="contributed">spanyol peseta</displayName>
+ <displayName count="other" draft="contributed">spanyol peseta</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ETB">
<displayName>etiópiai birr</displayName>
@@ -6313,6 +6373,9 @@
</currency>
<currency type="GRD">
<displayName>Görög drachma</displayName>
+ <displayName count="one" draft="contributed">görög drachma</displayName>
+ <displayName count="other" draft="contributed">görög drachma</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GTQ">
<displayName>guatemalai quetzal</displayName>
@@ -6350,6 +6413,9 @@
</currency>
<currency type="HRD">
<displayName>Horvát dínár</displayName>
+ <displayName count="one" draft="contributed">horvát dínár</displayName>
+ <displayName count="other" draft="contributed">horvát dínár</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HRK">
<displayName>horvát kuna</displayName>
@@ -6419,6 +6485,9 @@
</currency>
<currency type="ITL">
<displayName>Olasz líra</displayName>
+ <displayName count="one" draft="contributed">olasz líra</displayName>
+ <displayName count="other" draft="contributed">olasz líra</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
<displayName>jamaicai dollár</displayName>
@@ -6573,6 +6642,12 @@
<currency type="MAF">
<displayName>Marokkói frank</displayName>
</currency>
+ <currency type="MDC">
+ <displayName draft="contributed">moldáv kupon</displayName>
+ <displayName count="one" draft="contributed">moldáv kupon</displayName>
+ <displayName count="other" draft="contributed">moldáv kupon</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="MDL">
<displayName>moldován lei</displayName>
<displayName count="one">moldován lei</displayName>
@@ -6595,6 +6670,12 @@
<displayName count="other">macedon dínár</displayName>
<symbol draft="contributed">MKD</symbol>
</currency>
+ <currency type="MKN">
+ <displayName draft="contributed">macedón dénár (1992–1993)</displayName>
+ <displayName count="one" draft="contributed">macedón dénár (1992–1993)</displayName>
+ <displayName count="other" draft="contributed">macedón dénár (1992–1993)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="MLF">
<displayName>Mali frank</displayName>
</currency>
@@ -6632,9 +6713,15 @@
</currency>
<currency type="MTL">
<displayName>Máltai líra</displayName>
+ <displayName count="one" draft="contributed">máltai líra</displayName>
+ <displayName count="other" draft="contributed">máltai líra</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MTP">
<displayName>Máltai font</displayName>
+ <displayName count="one" draft="contributed">máltai font</displayName>
+ <displayName count="other" draft="contributed">máltai font</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MUR">
<displayName>mauritiusi rúpia</displayName>
@@ -6788,9 +6875,15 @@
</currency>
<currency type="PLZ">
<displayName>Lengyel zloty (1950–1995)</displayName>
+ <displayName count="one" draft="contributed">lengyel zloty (PLZ)</displayName>
+ <displayName count="other" draft="contributed">lengyel zloty (PLZ)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PTE">
<displayName>Portugál escudo</displayName>
+ <displayName count="one" draft="contributed">portugál escudo</displayName>
+ <displayName count="other" draft="contributed">portugál escudo</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PYG">
<displayName>paraguayi guarani</displayName>
@@ -6814,6 +6907,7 @@
<displayName>román lej (1952–2006)</displayName>
<displayName count="one">román lej (1952–2006)</displayName>
<displayName count="other">román lej (1952–2006)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RON">
<displayName>román lej</displayName>
@@ -6839,6 +6933,8 @@
<displayName>orosz rubel (1991–1998)</displayName>
<displayName count="one">orosz rubel (1991–1998)</displayName>
<displayName count="other">orosz rubel (1991–1998)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RWF">
<displayName>ruandai frank</displayName>
@@ -6905,9 +7001,15 @@
</currency>
<currency type="SIT">
<displayName>Szlovén tolar</displayName>
+ <displayName count="one" draft="contributed">szlovén tolár</displayName>
+ <displayName count="other" draft="contributed">szlovén tolár</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SKK">
<displayName>Szlovák korona</displayName>
+ <displayName count="one" draft="contributed">szlovák korona</displayName>
+ <displayName count="other" draft="contributed">szlovák korona</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SLL">
<displayName>Sierra Leone-i leone</displayName>
@@ -6953,6 +7055,9 @@
</currency>
<currency type="SUR">
<displayName>Szovjet rubel</displayName>
+ <displayName count="one" draft="contributed">szovjet rubel</displayName>
+ <displayName count="other" draft="contributed">szovjet rubel</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SVC">
<displayName>Salvadori colón</displayName>
@@ -7058,6 +7163,9 @@
</currency>
<currency type="UAK">
<displayName>Ukrán karbovanec</displayName>
+ <displayName count="one" draft="contributed">ukrán karbovanec</displayName>
+ <displayName count="other" draft="contributed">ukrán karbovanec</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UGS">
<displayName>Ugandai shilling (1966–1987)</displayName>
@@ -7246,12 +7354,27 @@
</currency>
<currency type="YUD">
<displayName>Jugoszláv kemény dínár</displayName>
+ <displayName count="one" draft="contributed">jugoszláv kemény dinár (1966–1990)</displayName>
+ <displayName count="other" draft="contributed">jugoszláv kemény dinár (1966–1990)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="YUM">
<displayName>Jugoszláv új dínár</displayName>
+ <displayName count="one" draft="contributed">jugoszláv új dinár (1994–2002)</displayName>
+ <displayName count="other" draft="contributed">jugoszláv új dinár (1994–2002)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="YUN">
<displayName>Jugoszláv konvertibilis dínár</displayName>
+ <displayName count="one" draft="contributed">jugoszláv konvertibilis dinár (1990–1992)</displayName>
+ <displayName count="other" draft="contributed">jugoszláv konvertibilis dinár (1990–1992)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="YUR">
+ <displayName draft="contributed">jugoszláv reformált dinár (1992–1993)</displayName>
+ <displayName count="one" draft="contributed">jugoszláv reformált dinár (1992–1993)</displayName>
+ <displayName count="other" draft="contributed">jugoszláv reformált dinár (1992–1993)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZAL">
<displayName>Dél-afrikai rand (pénzügyi)</displayName>
@@ -7309,9 +7432,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>négyzet{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>köb{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7320,7 +7513,7 @@
<unitPattern count="one">{0} g gyorsulás</unitPattern>
<unitPattern count="other">{0} g gyorsulás</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>méter per másodpercnégyzet</displayName>
<unitPattern count="one">{0} méter per másodpercnégyzet</unitPattern>
<unitPattern count="other">{0} méter per másodpercnégyzet</unitPattern>
@@ -7420,7 +7613,7 @@
<unitPattern count="one">{0} millimól/liter</unitPattern>
<unitPattern count="other">{0} millimól/liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>részecske/millió</displayName>
<unitPattern count="one">{0} részecske/millió</unitPattern>
<unitPattern count="other">{0} részecske/millió</unitPattern>
@@ -7450,7 +7643,7 @@
<unitPattern count="one">{0} liter per kilométer</unitPattern>
<unitPattern count="other">{0} liter per kilométer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter/100 km</displayName>
<unitPattern count="one">{0} liter/100 km</unitPattern>
<unitPattern count="other">{0} liter/100 km</unitPattern>
@@ -7931,17 +8124,17 @@
<unitPattern count="one">{0} lóerő</unitPattern>
<unitPattern count="other">{0} lóerő</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>higanymilliméter</displayName>
<unitPattern count="one">{0} higanymilliméter</unitPattern>
<unitPattern count="other">{0} higanymilliméter</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>font per négyzethüvelyk</displayName>
<unitPattern count="one">{0} font per négyzethüvelyk</unitPattern>
<unitPattern count="other">{0} font per négyzethüvelyk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>higanyhüvelyk</displayName>
<unitPattern count="one">{0} higanyhüvelyk</unitPattern>
<unitPattern count="other">{0} higanyhüvelyk</unitPattern>
@@ -8021,7 +8214,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>fontláb</displayName>
<unitPattern count="one">{0} fontláb</unitPattern>
<unitPattern count="other">{0} fontláb</unitPattern>
@@ -8175,9 +8368,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8186,7 +8449,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -8286,7 +8549,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>részecske/millió</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8316,7 +8579,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -8797,17 +9060,17 @@
<unitPattern count="one">{0} LE</unitPattern>
<unitPattern count="other">{0} LE</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>Hgmm</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8887,7 +9150,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -9041,9 +9304,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9107,7 +9440,7 @@
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -9516,18 +9849,18 @@
<unitPattern count="one">{0} LE</unitPattern>
<unitPattern count="other">{0} LE</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>Hgmm</displayName>
<unitPattern count="one">{0} Hgmm</unitPattern>
<unitPattern count="other">{0} Hgmm</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
- <displayName draft="provisional">Hgin</displayName>
+ <unit type="pressure-inch-ofhg">
+ <displayName draft="contributed">Hgin</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/hu_HU.xml b/common/main/hu_HU.xml
index 216fe85..6bd3891 100644
--- a/common/main/hu_HU.xml
+++ b/common/main/hu_HU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/hy.xml b/common/main/hy.xml
index 8307c56..1e6c4e6 100644
--- a/common/main/hy.xml
+++ b/common/main/hy.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -75,7 +75,7 @@
<language type="bug">բուգիերեն</language>
<language type="byn">բիլին</language>
<language type="ca">կատալաներեն</language>
- <language type="ccp" draft="provisional">չակմա</language>
+ <language type="ccp">չակմա</language>
<language type="ce">չեչեներեն</language>
<language type="ceb">սեբուերեն</language>
<language type="cgg">չիգա</language>
@@ -131,6 +131,7 @@
<language type="eu">բասկերեն</language>
<language type="ewo">էվոնդո</language>
<language type="fa">պարսկերեն</language>
+ <language type="fa_AF">դարի</language>
<language type="ff">ֆուլահ</language>
<language type="fi">ֆիններեն</language>
<language type="fil">ֆիլիպիներեն</language>
@@ -490,11 +491,11 @@
<language type="zen">զենագա</language>
<language type="zgh">ընդհանուր մարոկյան թամազիղտ</language>
<language type="zh">չինարեն</language>
- <language type="zh" alt="menu" draft="provisional">↑↑↑</language>
+ <language type="zh" alt="menu">↑↑↑</language>
<language type="zh_Hans">պարզեցված չինարեն</language>
- <language type="zh_Hans" alt="long" draft="provisional">↑↑↑</language>
+ <language type="zh_Hans" alt="long">↑↑↑</language>
<language type="zh_Hant">չինարեն, ավանդական</language>
- <language type="zh_Hant" alt="long" draft="provisional">չինարեն (ավանդական չինարեն)</language>
+ <language type="zh_Hant" alt="long">չինարեն (ավանդական չինարեն)</language>
<language type="zu">զուլուերեն</language>
<language type="zun">զունիերեն</language>
<language type="zxx">առանց լեզվային բովանդակության</language>
@@ -4358,7 +4359,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Նորֆոլկ կղզու ժամանակ</standard>
+ <generic draft="contributed">Նորֆոլկ կղզու ժամանակ</generic>
+ <standard draft="contributed">Նորֆոլկ կղզու ստանդարտ ժամանակ</standard>
+ <daylight draft="contributed">Նորֆոլկ կղզու ամառային ժամանակ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4955,9 +4958,9 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName>չինական օֆշորային յուան</displayName>
+ <displayName count="one">չինական օֆշորային յուան</displayName>
+ <displayName count="other">չինական օֆշորային յուան</displayName>
<symbol draft="contributed">CNH</symbol>
</currency>
<currency type="CNY">
@@ -5846,9 +5849,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>դեցի{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>սանտի{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>միլի{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>միկրո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>նանո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>պիկո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ֆեմտո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ատտո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>զեպտո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>յոկտո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>դեկա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>հեկտո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>կիլո{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>մեգա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>գիգա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>տերա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>պետա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>էքսա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>զետտա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>յոտտա{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>քառակուսի {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">քառակուսի {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">քառակուսի {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>խորանարդ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">խորանարդ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5857,7 +5930,7 @@
<unitPattern count="one">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>մետրեր/վայրկյան քառակուսի</displayName>
<unitPattern count="one">{0} մետր/վայրկյան քառակուսի</unitPattern>
<unitPattern count="other">{0} մետր/վայրկյան քառակուսի</unitPattern>
@@ -5957,7 +6030,7 @@
<unitPattern count="one">{0} միլիմոլ լիտրի վրա</unitPattern>
<unitPattern count="other">{0} միլիմոլ լիտրի վրա</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>մասնիկներ միլիոնի վրա</displayName>
<unitPattern count="one">{0} մասնիկ միլիոնի վրա</unitPattern>
<unitPattern count="other">{0} մասնիկ միլիոնի վրա</unitPattern>
@@ -5987,7 +6060,7 @@
<unitPattern count="one">{0} լիտր կիլոմետրի վրա</unitPattern>
<unitPattern count="other">{0} լիտր կիլոմետրի վրա</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>լիտրեր 100 կիլոմետրի վրա</displayName>
<unitPattern count="one">{0} լիտր 100 կիլոմետրի վրա</unitPattern>
<unitPattern count="other">{0} լիտր 100 կիլոմետրի վրա</unitPattern>
@@ -6463,17 +6536,17 @@
<unitPattern count="one">{0} ձիաուժ</unitPattern>
<unitPattern count="other">{0} ձիաուժ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>սնդիկի սյան միլիմետրեր</displayName>
<unitPattern count="one">{0} միլիմետր սնդիկի սյուն</unitPattern>
<unitPattern count="other">{0} միլիմետր սնդիկի սյուն</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ֆունտեր քառակուսի դյույմի վրա</displayName>
<unitPattern count="one">{0} ֆունտ քառակուսի դյույմի վրա</unitPattern>
<unitPattern count="other">{0} ֆունտ քառակուսի դյույմի վրա</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>սնդիկի սյան դյույմեր</displayName>
<unitPattern count="one">{0} դյույմ սնդիկի սյուն</unitPattern>
<unitPattern count="other">{0} դյույմ սնդիկի սյուն</unitPattern>
@@ -6553,7 +6626,7 @@
<unitPattern count="one">{0} կելվին</unitPattern>
<unitPattern count="other">{0} կելվին</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ֆունտ-ֆուտեր</displayName>
<unitPattern count="one">{0} ֆունտ-ֆուտ</unitPattern>
<unitPattern count="other">{0} ֆունտ-ֆուտ</unitPattern>
@@ -6707,9 +6780,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>դ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ս{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>մ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>մկ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ն{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>պ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ֆ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>զ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>յ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>դա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>հ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>կ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>Մ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Գ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Տ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>Պ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Է{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Զ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Յ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6718,7 +6861,7 @@
<unitPattern count="one">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>մ/վ²</displayName>
<unitPattern count="one">{0} մ/վ²</unitPattern>
<unitPattern count="other">{0} մ/վ²</unitPattern>
@@ -6818,7 +6961,7 @@
<unitPattern count="one">{0} մմոլ/լ</unitPattern>
<unitPattern count="other">{0} մմոլ/լ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>մասնիկ/միլիոն</displayName>
<unitPattern count="one">{0} մասնիկ/միլիոն</unitPattern>
<unitPattern count="other">{0} մասնիկ/միլիոն</unitPattern>
@@ -6848,7 +6991,7 @@
<unitPattern count="one">{0} լ/կմ</unitPattern>
<unitPattern count="other">{0} լ/կմ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>լ/100 կմ</displayName>
<unitPattern count="one">{0} լ/100 կմ</unitPattern>
<unitPattern count="other">{0} լ/100 կմ</unitPattern>
@@ -7042,8 +7185,8 @@
</unit>
<unit type="energy-british-thermal-unit">
<displayName>↑↑↑</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-therm-us">
<displayName>ԱՄՆ ջերմ</displayName>
@@ -7324,17 +7467,17 @@
<unitPattern count="one">{0} ձ․ու․</unitPattern>
<unitPattern count="other">{0} ձ․ու․</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>մմ ս.ս.</displayName>
<unitPattern count="one">{0} մմ ս.ս.</unitPattern>
<unitPattern count="other">{0} մմ ս.ս.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ֆ․/քառ․ դյմ</displayName>
<unitPattern count="one">{0} ֆ./քառ․ դյմ</unitPattern>
<unitPattern count="other">{0} ֆ./քառ․ դյմ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>դյույմ ս.ս.</displayName>
<unitPattern count="one">{0} դյմ. ս.ս.</unitPattern>
<unitPattern count="other">{0} դյմ. ս.ս.</unitPattern>
@@ -7414,7 +7557,7 @@
<unitPattern count="one">{0} Կ</unitPattern>
<unitPattern count="other">{0} Կ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ֆնտ-ֆտ</displayName>
<unitPattern count="one">{0} ֆնտ-ֆտ</unitPattern>
<unitPattern count="other">{0} ֆնտ-ֆտ</unitPattern>
@@ -7568,9 +7711,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>դ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ս{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>մ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>մկ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ն{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>պ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ֆ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>զ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>յ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>դա{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>հ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>կ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>Մ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Գ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Տ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>Պ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Է{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Զ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Յ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7619,7 +7832,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>լ/100 կմ</displayName>
<unitPattern count="one">{0} լ/100 կմ</unitPattern>
<unitPattern count="other">{0} լ/100 կմ</unitPattern>
@@ -7738,7 +7951,7 @@
<unitPattern count="one">{0}ձ/ու</unitPattern>
<unitPattern count="other">{0}ձ/ու</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0}" ս. ս.</unitPattern>
<unitPattern count="other">{0}" ս. ս</unitPattern>
</unit>
diff --git a/common/main/hy_AM.xml b/common/main/hy_AM.xml
index d61bd5f..e7ea885 100644
--- a/common/main/hy_AM.xml
+++ b/common/main/hy_AM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ia.xml b/common/main/ia.xml
index 430dd09..a97f5ee 100644
--- a/common/main/ia.xml
+++ b/common/main/ia.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3631,7 +3631,7 @@
<unitPattern count="one" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} fortia g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros per secunda quadrate</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} metros per secunda quadrate</unitPattern>
@@ -3726,7 +3726,7 @@
<unitPattern count="one" draft="contributed">{0} mmol/L</unitPattern>
<unitPattern count="other" draft="contributed">{0} millimoles per litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes per million</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="other" draft="contributed">{0} partes per million</unitPattern>
@@ -3746,7 +3746,7 @@
<unitPattern count="one" draft="contributed">{0} L/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} litros per kilometro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros per 100 kilometros</displayName>
<unitPattern count="one" draft="contributed">{0} L/100km</unitPattern>
<unitPattern count="other" draft="contributed">{0} litros per 100 kilometros</unitPattern>
@@ -4132,17 +4132,17 @@
<unitPattern count="one" draft="contributed">{0} cv</unitPattern>
<unitPattern count="other" draft="contributed">{0} cavallos-vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetros de mercurio</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} milimetros de mercurio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libras per pollice quadrate</displayName>
<unitPattern count="one" draft="contributed">{0} lb/in²</unitPattern>
<unitPattern count="other" draft="contributed">{0} libras per pollice quadrate</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pollices de mercurio</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} pollices de mercurio</unitPattern>
@@ -4344,7 +4344,7 @@
<unitPattern count="one" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -4439,7 +4439,7 @@
<unitPattern count="one" draft="contributed">{0} mmol/L</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="other" draft="contributed">{0} ppm</unitPattern>
@@ -4459,7 +4459,7 @@
<unitPattern count="one" draft="contributed">{0} L/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one" draft="contributed">{0} L/100km</unitPattern>
<unitPattern count="other" draft="contributed">{0} L/100km</unitPattern>
@@ -4845,17 +4845,17 @@
<unitPattern count="one" draft="contributed">{0} cv</unitPattern>
<unitPattern count="other" draft="contributed">{0} cv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb/in²</displayName>
<unitPattern count="one" draft="contributed">{0} lb/in²</unitPattern>
<unitPattern count="other" draft="contributed">{0} lb/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -5057,7 +5057,7 @@
<unitPattern count="one" draft="contributed">{0}%</unitPattern>
<unitPattern count="other" draft="contributed">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one" draft="contributed">{0} L/100km</unitPattern>
<unitPattern count="other" draft="contributed">{0} L/100km</unitPattern>
diff --git a/common/main/ia_001.xml b/common/main/ia_001.xml
index 9b39f50..7cf776b 100644
--- a/common/main/ia_001.xml
+++ b/common/main/ia_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/id.xml b/common/main/id.xml
index 0ca1363..4d4a305 100644
--- a/common/main/id.xml
+++ b/common/main/id.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -170,6 +170,7 @@
<language type="eu">Basque</language>
<language type="ewo">Ewondo</language>
<language type="fa">Persia</language>
+ <language type="fa_AF">Persia Dari</language>
<language type="fan">Fang</language>
<language type="fat">Fanti</language>
<language type="ff">Fula</language>
@@ -589,6 +590,7 @@
<script type="Aghb">Albania Kaukasia</script>
<script type="Arab">Arab</script>
<script type="Arab" alt="variant">Arab Persia</script>
+ <script type="Aran" draft="contributed">Nastaliq</script>
<script type="Armi">Aram Imperial</script>
<script type="Armn">Armenia</script>
<script type="Avst">Avesta</script>
@@ -674,7 +676,6 @@
<script type="Merc">Kursif Meroitik</script>
<script type="Mero">Meroitik</script>
<script type="Mlym">Malayalam</script>
- <script type="Modi">Modi</script>
<script type="Mong">Mongolia</script>
<script type="Moon">Moon</script>
<script type="Mroo">Mro</script>
@@ -699,6 +700,7 @@
<script type="Phnx">Phoenix</script>
<script type="Plrd">Fonetik Pollard</script>
<script type="Prti">Prasasti Parthia</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Rejang</script>
<script type="Roro">Rongorongo</script>
<script type="Runr">Runik</script>
@@ -5399,7 +5401,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Waktu Kepulauan Norfolk</standard>
+ <generic draft="contributed">Waktu Kepulauan Norfolk</generic>
+ <standard draft="contributed">Waktu Standar Kepulauan Norfolk</standard>
+ <daylight draft="contributed">Waktu Musim Panas Kepulauan Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5687,7 +5691,7 @@
<symbols numberSystem="latn">
<decimal>,</decimal>
<group>.</group>
- <list draft="contributed">;</list>
+ <list>;</list>
<percentSign>%</percentSign>
<plusSign draft="contributed">+</plusSign>
<minusSign draft="contributed">-</minusSign>
@@ -7156,9 +7160,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} persegi</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} persegi</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} kubik</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kubik</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7166,7 +7238,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per detik persegi</displayName>
<unitPattern count="other">{0} meter per detik persegi</unitPattern>
</unit>
@@ -7247,7 +7319,7 @@
<displayName>millimol per liter</displayName>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bagian per juta</displayName>
<unitPattern count="other">{0} bagian per juta</unitPattern>
</unit>
@@ -7271,7 +7343,7 @@
<displayName>liter per kilometer</displayName>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
</unit>
@@ -7663,15 +7735,15 @@
<displayName>daya kuda</displayName>
<unitPattern count="other">{0} daya kuda</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimeter merkuri</displayName>
<unitPattern count="other">{0} milimeter merkuri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pon per inci persegi</displayName>
<unitPattern count="other">{0} pon per inci persegi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inci merkuri</displayName>
<unitPattern count="other">{0} inci merkuri</unitPattern>
</unit>
@@ -7735,7 +7807,7 @@
<displayName>kelvin</displayName>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound kaki</displayName>
<unitPattern count="other">{0} pound kaki</unitPattern>
</unit>
@@ -7861,9 +7933,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7871,7 +8011,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter/dtk²</displayName>
<unitPattern count="other">{0} m/dtk²</unitPattern>
</unit>
@@ -7952,7 +8092,7 @@
<displayName>millimol/liter</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bagian/juta</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -7976,7 +8116,7 @@
<displayName>liter/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -8370,15 +8510,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -8442,7 +8582,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -8568,16 +8708,84 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/d²</displayName>
<unitPattern count="other" draft="contributed">{0}m/d²</unitPattern>
</unit>
@@ -8591,7 +8799,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -8735,11 +8943,11 @@
<unit type="mass-carat">
<displayName draft="contributed">karat</displayName>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″ Hg</displayName>
</unit>
<unit type="speed-kilometer-per-hour">
diff --git a/common/main/id_ID.xml b/common/main/id_ID.xml
index 6af48bc..9195067 100644
--- a/common/main/id_ID.xml
+++ b/common/main/id_ID.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ig.xml b/common/main/ig.xml
index 5d8f5ca..207579e 100644
--- a/common/main/ig.xml
+++ b/common/main/ig.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -132,12 +132,12 @@
<territory type="419">Latin America</territory>
<territory type="AC">Ascension Island</territory>
<territory type="AD">Andorra</territory>
- <territory type="AE">↑↑↑</territory>
- <territory type="AF">↑↑↑</territory>
+ <territory type="AE">Obodo United Arab Emirates</territory>
+ <territory type="AF">Mba Afghanistan</territory>
<territory type="AG">Antigua & Barbuda</territory>
<territory type="AI">Anguilla</territory>
<territory type="AL">Albania</territory>
- <territory type="AM">↑↑↑</territory>
+ <territory type="AM">Obodo Armenia</territory>
<territory type="AO">Angola</territory>
<territory type="AQ">Antarctica</territory>
<territory type="AR">Argentina</territory>
@@ -146,24 +146,24 @@
<territory type="AU">Australia</territory>
<territory type="AW">Aruba</territory>
<territory type="AX">Agwaetiti Aland</territory>
- <territory type="AZ">↑↑↑</territory>
+ <territory type="AZ">Obodo Azerbaijan</territory>
<territory type="BA">Bosnia & Herzegovina</territory>
<territory type="BB">Barbados</territory>
- <territory type="BD">↑↑↑</territory>
+ <territory type="BD">Obodo Bangladesh</territory>
<territory type="BE">Belgium</territory>
<territory type="BF">Burkina Faso</territory>
<territory type="BG">Bulgaria</territory>
- <territory type="BH">↑↑↑</territory>
+ <territory type="BH">Obodo Bahrain</territory>
<territory type="BI">Burundi</territory>
<territory type="BJ">Binin</territory>
<territory type="BL">St. Barthélemy</territory>
<territory type="BM">Bemuda</territory>
- <territory type="BN">↑↑↑</territory>
+ <territory type="BN">Brunei</territory>
<territory type="BO">Bolivia</territory>
<territory type="BQ">Caribbean Netherlands</territory>
<territory type="BR">Mba Brazil</territory>
<territory type="BS">Bahamas</territory>
- <territory type="BT">↑↑↑</territory>
+ <territory type="BT">Obodo Bhutan</territory>
<territory type="BV">Agwaetiti Bouvet</territory>
<territory type="BW">Botswana</territory>
<territory type="BY">Belarus</territory>
@@ -189,7 +189,7 @@
<territory type="CV">Cape Verde</territory>
<territory type="CW">Kurakao</territory>
<territory type="CX">Agwaetiti Christmas</territory>
- <territory type="CY">↑↑↑</territory>
+ <territory type="CY">Obodo Cyprus</territory>
<territory type="CZ">Czechia</territory>
<territory type="CZ" alt="variant">Czech Republik</territory>
<territory type="DE">Mba Germany</territory>
@@ -207,8 +207,8 @@
<territory type="ER">Eritrea</territory>
<territory type="ES">Spain</territory>
<territory type="ET">Ethiopia</territory>
- <territory type="EU">↑↑↑</territory>
- <territory type="EZ">↑↑↑</territory>
+ <territory type="EU">Otu nzukọ mba Europe</territory>
+ <territory type="EZ">Gburugburu Euro</territory>
<territory type="FI">Finland</territory>
<territory type="FJ">Fiji</territory>
<territory type="FK">Agwaetiti Falkland</territory>
@@ -220,7 +220,7 @@
<territory type="GB">Mba United Kingdom</territory>
<territory type="GB" alt="short">UK</territory>
<territory type="GD">Grenada</territory>
- <territory type="GE">↑↑↑</territory>
+ <territory type="GE">Obodo Georgia</territory>
<territory type="GF">Frenchi Guiana</territory>
<territory type="GG">Guernsey</territory>
<territory type="GH">Ghana</territory>
@@ -236,7 +236,7 @@
<territory type="GU">Guam</territory>
<territory type="GW">Guinea-Bissau</territory>
<territory type="GY">Guyana</territory>
- <territory type="HK">↑↑↑</territory>
+ <territory type="HK">Honk Kong mba nwere ndozi pụrụ iche n’obodo China</territory>
<territory type="HK" alt="short">↑↑↑</territory>
<territory type="HM">Agwaetiti Heard na Agwaetiti McDonald</territory>
<territory type="HN">Honduras</territory>
@@ -244,36 +244,36 @@
<territory type="HT">Hati</territory>
<territory type="HU">Hungary</territory>
<territory type="IC">Agwaetiti Kanarị</territory>
- <territory type="ID">↑↑↑</territory>
+ <territory type="ID">Indonesia</territory>
<territory type="IE">Ireland</territory>
- <territory type="IL">↑↑↑</territory>
+ <territory type="IL">Obodo Israel</territory>
<territory type="IM">Isle of Man</territory>
<territory type="IN">Mba India</territory>
<territory type="IO">British Indian Ocean Territory</territory>
- <territory type="IQ">↑↑↑</territory>
- <territory type="IR">↑↑↑</territory>
+ <territory type="IQ">Obodo Iraq</territory>
+ <territory type="IR">Obodo Iran</territory>
<territory type="IS">Iceland</territory>
<territory type="IT">Mba Italy</territory>
<territory type="JE">Jersey</territory>
<territory type="JM">Jamaika</territory>
- <territory type="JO">↑↑↑</territory>
+ <territory type="JO">Obodo Jordan</territory>
<territory type="JP">Mba Japan</territory>
<territory type="KE">Kenya</territory>
- <territory type="KG">↑↑↑</territory>
- <territory type="KH">↑↑↑</territory>
+ <territory type="KG">Obodo Kyrgyzstan</territory>
+ <territory type="KH">Cambodia</territory>
<territory type="KI">Kiribati</territory>
<territory type="KM">Comorosu</territory>
<territory type="KN">St. Kitts & Nevis</territory>
- <territory type="KP">↑↑↑</territory>
- <territory type="KR">↑↑↑</territory>
- <territory type="KW">↑↑↑</territory>
+ <territory type="KP">Mba Ugwu Korea</territory>
+ <territory type="KR">Mba South Korea</territory>
+ <territory type="KW">Obodo Kuwait</territory>
<territory type="KY">Agwaetiti Cayman</territory>
- <territory type="KZ">↑↑↑</territory>
- <territory type="LA">↑↑↑</territory>
- <territory type="LB">↑↑↑</territory>
+ <territory type="KZ">Obodo Kazakhstan</territory>
+ <territory type="LA">Laos</territory>
+ <territory type="LB">Obodo Lebanon</territory>
<territory type="LC">St. Lucia</territory>
<territory type="LI">Liechtenstein</territory>
- <territory type="LK">↑↑↑</territory>
+ <territory type="LK">Obodo Sri Lanka</territory>
<territory type="LR">Liberia</territory>
<territory type="LS">Lesotho</territory>
<territory type="LT">Lithuania</territory>
@@ -289,9 +289,9 @@
<territory type="MH">Agwaetiti Marshall</territory>
<territory type="MK">North Macedonia</territory>
<territory type="ML">Mali</territory>
- <territory type="MM">↑↑↑</territory>
- <territory type="MN">↑↑↑</territory>
- <territory type="MO">↑↑↑</territory>
+ <territory type="MM">Myanmar (Burma)</territory>
+ <territory type="MN">Obodo Mongolia</territory>
+ <territory type="MO">Obodo Macao nwere ndozi pụrụ iche na mba China</territory>
<territory type="MO" alt="short">↑↑↑</territory>
<territory type="MP">Agwaetiti Northern Mariana</territory>
<territory type="MQ">Martinique</territory>
@@ -302,7 +302,7 @@
<territory type="MV">Maldivesa</territory>
<territory type="MW">Malawi</territory>
<territory type="MX">Mexico</territory>
- <territory type="MY">↑↑↑</territory>
+ <territory type="MY">Malaysia</territory>
<territory type="MZ">Mozambik</territory>
<territory type="NA">Namibia</territory>
<territory type="NC">New Caledonia</territory>
@@ -312,34 +312,34 @@
<territory type="NI">Nicaragua</territory>
<territory type="NL">Netherlands</territory>
<territory type="NO">Norway</territory>
- <territory type="NP">↑↑↑</territory>
+ <territory type="NP">Obodo Nepal</territory>
<territory type="NR">Nauru</territory>
<territory type="NU">Niue</territory>
<territory type="NZ">New Zealand</territory>
- <territory type="OM">↑↑↑</territory>
+ <territory type="OM">Obodo Oman</territory>
<territory type="PA">Panama</territory>
<territory type="PE">Peru</territory>
<territory type="PF">Frenchi Polynesia</territory>
<territory type="PG">Papua New Guinea</territory>
<territory type="PH">Philippines</territory>
- <territory type="PK">↑↑↑</territory>
+ <territory type="PK">Obodo Pakistan</territory>
<territory type="PL">Poland</territory>
<territory type="PM">St. Pierre & Miquelon</territory>
<territory type="PN">Agwaetiti Pitcairn</territory>
<territory type="PR">Puerto Rico</territory>
- <territory type="PS">↑↑↑</territory>
+ <territory type="PS">Obodo dị iche iche dị n’okpuru mba Palestine</territory>
<territory type="PS" alt="short">↑↑↑</territory>
<territory type="PT">Portugal</territory>
<territory type="PW">Palau</territory>
<territory type="PY">Paraguay</territory>
- <territory type="QA">↑↑↑</territory>
+ <territory type="QA">Obodo Qatar</territory>
<territory type="QO">Outlying Oceania</territory>
<territory type="RE">Réunion</territory>
<territory type="RO">Romania</territory>
<territory type="RS">Serbia</territory>
<territory type="RU">Mba Russia</territory>
<territory type="RW">Rwanda</territory>
- <territory type="SA">↑↑↑</territory>
+ <territory type="SA">Obodo Saudi Arabia</territory>
<territory type="SB">Agwaetiti Solomon</territory>
<territory type="SC">Seychelles</territory>
<territory type="SD">Sudan</territory>
@@ -358,7 +358,7 @@
<territory type="ST">São Tomé & Príncipe</territory>
<territory type="SV">El Salvador</territory>
<territory type="SX">Sint Maarten</territory>
- <territory type="SY">↑↑↑</territory>
+ <territory type="SY">Obodo Syria</territory>
<territory type="SZ">Eswatini</territory>
<territory type="SZ" alt="variant">Swaziland</territory>
<territory type="TA">Tristan da Cunha</territory>
@@ -367,17 +367,17 @@
<territory type="TF">Ụmụ ngalaba Frenchi Southern</territory>
<territory type="TG">Togo</territory>
<territory type="TH">Thailand</territory>
- <territory type="TJ">↑↑↑</territory>
+ <territory type="TJ">Obodo Tajikistan</territory>
<territory type="TK">Tokelau</territory>
<territory type="TL">Timor-Leste</territory>
<territory type="TL" alt="variant">East Timor</territory>
- <territory type="TM">↑↑↑</territory>
+ <territory type="TM">Obodo Turkmenistan</territory>
<territory type="TN">Tunisia</territory>
<territory type="TO">Tonga</territory>
- <territory type="TR">↑↑↑</territory>
+ <territory type="TR">Obodo Turkey</territory>
<territory type="TT">Trinidad & Tobago</territory>
<territory type="TV">Tuvalu</territory>
- <territory type="TW">↑↑↑</territory>
+ <territory type="TW">Obodo Taiwan</territory>
<territory type="TZ">Tanzania</territory>
<territory type="UA">Ukraine</territory>
<territory type="UG">Uganda</territory>
@@ -386,7 +386,7 @@
<territory type="US">Mba United States</territory>
<territory type="US" alt="short">↑↑↑</territory>
<territory type="UY">Uruguay</territory>
- <territory type="UZ">↑↑↑</territory>
+ <territory type="UZ">Obodo Uzbekistan</territory>
<territory type="VA">Vatican City</territory>
<territory type="VC">St. Vincent & Grenadines</territory>
<territory type="VE">Venezuela</territory>
@@ -399,7 +399,7 @@
<territory type="XA">Pseudo-Accents</territory>
<territory type="XB">Pseudo-Bidi</territory>
<territory type="XK">Kosovo</territory>
- <territory type="YE">↑↑↑</territory>
+ <territory type="YE">Obodo Yemen</territory>
<territory type="YT">Mayotte</territory>
<territory type="ZA">South Africa</territory>
<territory type="ZM">Zambia</territory>
@@ -2894,7 +2894,7 @@
</metazone>
<metazone type="Europe_Further_Eastern">
<long>
- <standard draft="provisional">↑↑↑</standard>
+ <standard>↑↑↑</standard>
</long>
</metazone>
<metazone type="Europe_Western">
@@ -3219,7 +3219,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Oge Norfolk Island</standard>
+ <generic draft="contributed">Oge Norfolk Island</generic>
+ <standard draft="contributed">Oge Izugbe Norfolk Island</standard>
+ <daylight draft="contributed">Oge Okpomọkụ Norfolk Island</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -3610,88 +3612,88 @@
</currencyFormats>
<currencies>
<currency type="AED">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dirham obodo United Arab Emirates</displayName>
+ <displayName count="other">Ego dirhams obodo UAE</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AFN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Afghani Obodo Afghanistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Lek Obodo Albania</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dram obodo Armenia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ANG">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Antillean Guilder obodo Netherlands</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AOA">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Kwanza obodo Angola</displayName>
+ <displayName count="other">Ego kwanzas obodo Angola</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ARS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso obodo Argentina</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AUD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Australia</displayName>
+ <displayName count="other">Ego dollars obodo Australia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AWG">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Florin obodo Aruba</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AZN">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Manat obodo Azerbaijan</displayName>
+ <displayName count="other">Ego manats obodo Azerbaijan</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BAM">
- <displayName>↑↑↑</displayName>
+ <displayName>Akara mgbanwe ego obodo Bosnia-Herzegovina</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BBD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Barbados</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BDT">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Taka obodo Bangladesh</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BGN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Lev mba Bulgaria</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BHD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar Obodo Bahrain</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BIF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Franc obodo Burundi</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3702,13 +3704,13 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BND">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Brunei</displayName>
+ <displayName count="other">Ego dollars obodo Brunei</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BOB">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Boliviano obodo Bolivia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3720,24 +3722,24 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BSD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar Obodo Bahamas</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BTN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Ngultrum obodo Bhutan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BWP">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Pula obodo Bostwana</displayName>
+ <displayName count="other">Ego pulas obodo Bostwana</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BYN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Ruble mba Belarus</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3755,23 +3757,23 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CDF">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Franc obodo Congo</displayName>
+ <displayName count="other">Ego francs mba Congo</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CHF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Franc mba Switzerland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CLP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso obodo Chile</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNH">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Yuan Obodo China (ndị bi na mmiri)</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3782,26 +3784,26 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="COP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso obodo Columbia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CRC">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Colón obodo Costa Rica</displayName>
+ <displayName count="other">Ego colóns obodo Costa Rica</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso e nwere ike ịgbanwe nke obodo Cuba</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUP">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Peso obodo Cuba</displayName>
+ <displayName count="other">Ego pesos obodo Cuba</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -3811,47 +3813,47 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CZK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Koruna obodo Czech</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DJF">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Franc obodo Djibouti</displayName>
+ <displayName count="other">ego francs obodo Djibouti</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DKK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Krone Obodo Denmark</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso Obodo Dominica</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DZD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar Obodo Algeria</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="EGP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo Egypt</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ERN">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Nakfa obodo Eritrea</displayName>
+ <displayName count="other">Ego nakfas obodo Eritrea</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ETB">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Birr obodo Ethiopia</displayName>
+ <displayName count="other">Ego birrs obodo Ethiopia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="EUR">
@@ -3861,13 +3863,13 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FJD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Fiji</displayName>
+ <displayName count="other">Ego dollars obodo Fijian</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FKP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo Falkland Islands</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3879,82 +3881,82 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GEL">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Lari Obodo Georgia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GHS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Cedi obodo Ghana</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GIP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo Gibraltar</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dalasi obodo Gambia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GNF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Franc obodo Guinea</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GTQ">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Quetzal obodo Guatemala</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GYD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Guyana</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HKD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar Obodo Honk Kong</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HNL">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Lempira obodo Honduras</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HRK">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Kuna obodo Croatia</displayName>
+ <displayName count="other">Ego kunas obodo Croatia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HTG">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Gourde obodo Haiti</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HUF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Forint obodo Hungary</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IDR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rupiah Obodo Indonesia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ILS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Shekel ọhụrụ obodo Israel</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3966,29 +3968,29 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IQD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dinar obodo Iraq</displayName>
+ <displayName count="other">Ego dinars obodo Iraq</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IRR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rial obodo Iran</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ISK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Króna obodo Iceland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Jamaica</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JOD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar Obodo Jordan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3999,163 +4001,163 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KES">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Shilling obodo Kenya</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KGS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Som Obodo Kyrgyzstan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KHR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Riel obodo Cambodia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KMF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Franc obodo Comoros</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KPW">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Won Obodo North Korea</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KRW">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Won Obodo South Korea</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KWD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar Obodo Kuwait</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KYD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Cayman Islands</displayName>
+ <displayName count="other">Ego dollars obodo Cayman Islands</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KZT">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Tenge obodo Kazakhstani</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LAK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Kip Obodo Laos</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LBP">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Pound obodo Lebanon</displayName>
+ <displayName count="other">Ego Pound Obodo Lebanon</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LKR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rupee obodo Sri Lanka</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LRD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Liberia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LYD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar obodo Libya</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MAD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dirham obodo Morocco</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MDL">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Leu obodo Moldova</displayName>
+ <displayName count="other">Ego leu mba Moldova</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MGA">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Ariary obodo Madagascar</displayName>
+ <displayName count="other">Ego ariaries obodo Madagascar</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MKD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Denar Obodo Macedonia</displayName>
+ <displayName count="other">Ego denari mba Macedonia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MMK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Kyat obodo Myanmar</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MNT">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Turgik Obodo Mongolia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pataca ndị Obodo Macanese</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MRU">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Ouguiya Obodo Mauritania</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MUR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rupee obodo Mauritania</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rufiyaa obodo Moldova</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MWK">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Kwacha obodo Malawi</displayName>
+ <displayName count="other">Ego kwachas obodo Malawi</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MXN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso obodo Mexico</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MYR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Ringgit obodo Malaysia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MZN">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Metical obodo Mozambique</displayName>
+ <displayName count="other">Ego meticals obodo Mozambique</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NAD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Namibia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4167,86 +4169,86 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NIO">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Córodoba obodo Nicaragua</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NOK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Krone Obodo Norway</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NPR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rupee obodo Nepal</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NZD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo New Zealand</displayName>
+ <displayName count="other">Ego dollars obodo New Zealand</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="OMR">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Rial obodo Oman</displayName>
+ <displayName count="other">Ego rials Obodo Oman</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PAB">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Balboa obodo Panama</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PEN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Sol obodo Peru</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PGK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Kina obodo Papua New Guinea</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PHP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego piso obodo Philippine</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PKR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rupee obodo Pakistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PLN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Zloty mba Poland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PYG">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Guarani obodo Paraguay</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="QAR">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Rial obodo Qatar</displayName>
+ <displayName count="other">Ego rials obodo Qatar</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RON">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Leu obodo Romania</displayName>
+ <displayName count="other">Ego leu Obodo Romania</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RSD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar obodo Serbia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4257,57 +4259,57 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RWF">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Franc obodo Rwanda</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SAR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Riyal obodo Saudi</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SBD">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Solomon Islands</displayName>
+ <displayName count="other">Ego dollars obodo Solomon Islands</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SCR">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Rupee obodo Seychelles</displayName>
+ <displayName count="other">Ego rupees obodo Seychelles</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SDG">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo Sudan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SEK">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Krona Obodo Sweden</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SGD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo Singapore</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SHP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo St Helena</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SLL">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Leone obodo Sierra Leone</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SOS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego shilling obodo Somali</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4318,57 +4320,57 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SSP">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Pound obodo South Sudan</displayName>
+ <displayName count="other">Ego pounds mba ọdịda anyanwụ Sudan</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="STN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dobra nke obodo Sāo Tomé na Principe</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SYP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Pound obodo Syria</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SZL">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Lilangeni obodo Swaziland</displayName>
+ <displayName count="other">Ego emalangeni obodo Swaziland</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="THB">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Baht obodo Thai</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TJS">
- <displayName>↑↑↑</displayName>
+ <displayName>Who Somoni obodo Tajikistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TMT">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Manat Obodo Turkmenistan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TND">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dinar Obodo Tunisia</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego paʻanga obodo Tonga</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TRY">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Lira obodo Turkey</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4381,25 +4383,25 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TWD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dollar obodo New Taiwan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TZS">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Shilling Obodo Tanzania</displayName>
+ <displayName count="other">Ego Shillings Obodo Tanzania</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UAH">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Hryvnia obodo Ukraine</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UGX">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Shilling obodo Uganda</displayName>
+ <displayName count="other">Ego shillings obodo Uganda</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="USD">
@@ -4409,56 +4411,56 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UYU">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Peso obodo Uruguay</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Som obodo Uzbekistan</displayName>
+ <displayName count="other">Ego som obodo Uzbekistan</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VES">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Bolivar obodo Venezuela</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VND">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dong obodo Vietnam</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VUV">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Vatu obodo Vanuatu</displayName>
+ <displayName count="other">Ego Vanuatu vatus obodo Vanuatu</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="WST">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Tala obodo Samoa</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XAF">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Franc mba etiti Africa</displayName>
+ <displayName count="other">Ego francs mba etiti Africa</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XCD">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Dollar obodo East Carribbean</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XOF">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego CFA Franc obodo West Africa</displayName>
+ <displayName count="other">Ego CFA francs mba ọdịda anyanwụ Afrịka</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XPF">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Franc obodo CFP</displayName>
+ <displayName count="other">Ego francs obodo CFP</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XXX">
@@ -4466,19 +4468,19 @@
<displayName count="other">(ego amaghị)</displayName>
</currency>
<currency type="YER">
- <displayName>↑↑↑</displayName>
+ <displayName>Ego Rial obodo Yemeni</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZAR">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Rand obodo South Africa</displayName>
+ <displayName count="other">Ego rand obodo South Africa</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZMW">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
+ <displayName>Ego Kwacha Obodo Zambia</displayName>
+ <displayName count="other">Ego kwachas obodo Zambia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -4496,9 +4498,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -4506,7 +4576,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4587,7 +4657,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4611,7 +4681,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4995,15 +5065,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5067,7 +5137,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5193,9 +5263,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5203,7 +5341,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5284,7 +5422,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5308,7 +5446,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5692,15 +5830,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5764,7 +5902,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5890,9 +6028,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5900,7 +6106,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
diff --git a/common/main/ig_NG.xml b/common/main/ig_NG.xml
index 6f31294..a8e8092 100644
--- a/common/main/ig_NG.xml
+++ b/common/main/ig_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ii.xml b/common/main/ii.xml
index 26380ea..65b2c76 100644
--- a/common/main/ii.xml
+++ b/common/main/ii.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ii_CN.xml b/common/main/ii_CN.xml
index 9373cd2..eea6afb 100644
--- a/common/main/ii_CN.xml
+++ b/common/main/ii_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/is.xml b/common/main/is.xml
index 8ad6458..b344c6e 100644
--- a/common/main/is.xml
+++ b/common/main/is.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -154,6 +154,7 @@
<language type="eu">baskneska</language>
<language type="ewo">evondó</language>
<language type="fa">persneska</language>
+ <language type="fa_AF">darí</language>
<language type="fan">fang</language>
<language type="fat">fantí</language>
<language type="ff">fúla</language>
@@ -197,7 +198,6 @@
<language type="gwi">gvísín</language>
<language type="ha">hása</language>
<language type="hai">haída</language>
- <language type="hak">hak</language>
<language type="haw">havaíska</language>
<language type="he">hebreska</language>
<language type="hi">hindí</language>
@@ -207,7 +207,6 @@
<language type="ho">hírímótú</language>
<language type="hr">króatíska</language>
<language type="hsb">hásorbneska</language>
- <language type="hsn">hsn</language>
<language type="ht">haítíska</language>
<language type="hu">ungverska</language>
<language type="hup">húpa</language>
@@ -341,7 +340,6 @@
<language type="myv">ersja</language>
<language type="mzn">masanderaní</language>
<language type="na">nárúska</language>
- <language type="nan">nan</language>
<language type="nap">napólíska</language>
<language type="naq">nama</language>
<language type="nb">norskt bókmál</language>
@@ -520,7 +518,6 @@
<language type="was">vasjó</language>
<language type="wbp">varlpiri</language>
<language type="wo">volof</language>
- <language type="wuu">wuu</language>
<language type="xal">kalmúkska</language>
<language type="xh">sósa</language>
<language type="xog">sóga</language>
@@ -6836,7 +6833,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Tími á Norfolk-eyju</standard>
+ <generic draft="contributed">Tími á Norfolk-eyju</generic>
+ <standard draft="contributed">Staðaltími á Norfolk-eyju</standard>
+ <daylight draft="contributed">Sumartími á Norfolk-eyju</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8572,9 +8571,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>míkró{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nanó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>píkó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femtó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>attó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>septó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jóktó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hektó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kíló{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>gíga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>setta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jótta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} á {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8583,7 +8652,7 @@
<unitPattern count="one">{0} þyngdarhröðun</unitPattern>
<unitPattern count="other">{0} þyngdarhröðun</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrar á sekúndu, á sekúndu</displayName>
<unitPattern count="one">{0} metri á sekúndu, á sekúndu</unitPattern>
<unitPattern count="other">{0} metrar á sekúndu, á sekúndu</unitPattern>
@@ -8683,7 +8752,7 @@
<unitPattern count="one">{0} millimól á lítra</unitPattern>
<unitPattern count="other">{0} millimól á lítra</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milljónarhlutar</displayName>
<unitPattern count="one">{0} milljónarhluti</unitPattern>
<unitPattern count="other">{0} milljónarhlutar</unitPattern>
@@ -8713,7 +8782,7 @@
<unitPattern count="one">{0} lítri á kílómetra</unitPattern>
<unitPattern count="other">{0} lítrar á kílómetra</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lítrar á 100 kílómetra</displayName>
<unitPattern count="one">{0} lítri á 100 kílómetra</unitPattern>
<unitPattern count="other">{0} lítrar á 100 kílómetra</unitPattern>
@@ -9204,17 +9273,17 @@
<unitPattern count="one">{0} hestafl</unitPattern>
<unitPattern count="other">{0} hestöfl</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetrar af kvikasilfri</displayName>
<unitPattern count="one">{0} millimetrar af kvikasilfri</unitPattern>
<unitPattern count="other">{0} millimetrar af kvikasilfri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pund á fertommu</displayName>
<unitPattern count="one">{0} pund á fertommu</unitPattern>
<unitPattern count="other">{0} pund á fertommu</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tommur af kvikasilfri</displayName>
<unitPattern count="one">{0} tomma af kvikasilfri</unitPattern>
<unitPattern count="other">{0} tommur af kvikasilfri</unitPattern>
@@ -9294,7 +9363,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pundfet</displayName>
<unitPattern count="one">{0} pundfet</unitPattern>
<unitPattern count="other">{0} pundfet</unitPattern>
@@ -9448,9 +9517,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9459,7 +9598,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrar/sek²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -9559,7 +9698,7 @@
<unitPattern count="one">{0} m.mól/l</unitPattern>
<unitPattern count="other">{0} m.mól/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milljónarhlutar</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -9589,7 +9728,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -10080,17 +10219,17 @@
<unitPattern count="one">{0} hö</unitPattern>
<unitPattern count="other">{0} hö</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -10170,7 +10309,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -10324,9 +10463,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10335,7 +10544,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -10425,7 +10634,7 @@
<unitPattern count="one">{0}mmol/L</unitPattern>
<unitPattern count="other">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0}ppm</unitPattern>
<unitPattern count="other">{0}ppm</unitPattern>
@@ -10450,7 +10659,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
@@ -10899,17 +11108,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
@@ -10984,7 +11193,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/is_IS.xml b/common/main/is_IS.xml
index bbfbc6b..0613c93 100644
--- a/common/main/is_IS.xml
+++ b/common/main/is_IS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/it.xml b/common/main/it.xml
index 0112484..77330a1 100644
--- a/common/main/it.xml
+++ b/common/main/it.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -182,6 +182,7 @@
<language type="ewo">ewondo</language>
<language type="ext">estremegno</language>
<language type="fa">persiano</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulah</language>
@@ -472,7 +473,6 @@
<language type="ro_MD">moldavo</language>
<language type="rof">rombo</language>
<language type="rom">romani</language>
- <language type="root">root</language>
<language type="rtm">rotumano</language>
<language type="ru">russo</language>
<language type="rue">ruteno</language>
@@ -643,6 +643,7 @@
<script type="Aghb" draft="unconfirmed">albanese caucasico</script>
<script type="Arab">arabo</script>
<script type="Arab" alt="variant">arabo-persiano</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi" draft="contributed">aramaico imperiale</script>
<script type="Armn">armeno</script>
<script type="Avst" draft="contributed">avestico</script>
@@ -755,6 +756,7 @@
<script type="Phnx" draft="contributed">fenicio</script>
<script type="Plrd" draft="contributed">fonetica di pollard</script>
<script type="Prti" draft="contributed">partico delle iscrizioni</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng" draft="contributed">rejang</script>
<script type="Roro" draft="contributed">rongorongo</script>
<script type="Runr">runico</script>
@@ -4875,7 +4877,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Ora delle Isole Norfolk</standard>
+ <generic draft="contributed">Ora delle Isole Norfolk</generic>
+ <standard draft="contributed">Ora standard delle Isole Norfolk</standard>
+ <daylight draft="contributed">Ora legale delle Isole Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5549,9 +5553,9 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName>renmimbi cinese offshore</displayName>
+ <displayName count="one">renmimbi cinese offshore</displayName>
+ <displayName count="other">renmimbi cinesi offshore</displayName>
<symbol draft="contributed">CNH</symbol>
</currency>
<currency type="CNY">
@@ -6704,9 +6708,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>etto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} al {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} quadri</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} quadro</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} quadri</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} cubi</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cubo</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cubi</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6715,7 +6789,7 @@
<unitPattern count="one">{0} forza g</unitPattern>
<unitPattern count="other">{0} forza g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri al secondo quadrato</displayName>
<unitPattern count="one">{0} metro al secondo quadrato</unitPattern>
<unitPattern count="other">{0} metri al secondo quadrato</unitPattern>
@@ -6815,7 +6889,7 @@
<unitPattern count="one">{0} millimole per litro</unitPattern>
<unitPattern count="other">{0} millimoli per litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parti per milione</displayName>
<unitPattern count="one">{0} parte per milione</unitPattern>
<unitPattern count="other">{0} parti per milione</unitPattern>
@@ -6845,7 +6919,7 @@
<unitPattern count="one">{0} litro per chilometro</unitPattern>
<unitPattern count="other">{0} litri per chilometro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litri per 100 chilometri</displayName>
<unitPattern count="one">{0} litro per 100 chilometri</unitPattern>
<unitPattern count="other">{0} litri per 100 chilometri</unitPattern>
@@ -7321,17 +7395,17 @@
<unitPattern count="one">{0} cavallo vapore</unitPattern>
<unitPattern count="other">{0} cavalli vapore</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetri di mercurio</displayName>
<unitPattern count="one">{0} millimetro di mercurio</unitPattern>
<unitPattern count="other">{0} millimetri di mercurio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libbre per pollice quadrato</displayName>
<unitPattern count="one">{0} libbra per pollice quadrato</unitPattern>
<unitPattern count="other">{0} libbre per pollice quadrato</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pollici di mercurio</displayName>
<unitPattern count="one">{0} pollice di mercurio</unitPattern>
<unitPattern count="other">{0} pollici di mercurio</unitPattern>
@@ -7411,7 +7485,7 @@
<unitPattern count="one">{0} Kelvin</unitPattern>
<unitPattern count="other">{0} Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>libbre-piede</displayName>
<unitPattern count="one">{0} libbra-piede</unitPattern>
<unitPattern count="other">{0} libbre-piedi</unitPattern>
@@ -7570,9 +7644,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7581,7 +7725,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7681,7 +7825,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7711,7 +7855,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -8187,17 +8331,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8277,7 +8421,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lb-ft</displayName>
<unitPattern count="one">{0} lb-ft</unitPattern>
<unitPattern count="other">{0} lb-ft</unitPattern>
@@ -8434,9 +8578,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8481,7 +8695,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -8611,7 +8825,7 @@
<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0}inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}inHg</unitPattern>
</unit>
diff --git a/common/main/it_CH.xml b/common/main/it_CH.xml
index a2b5d48..553064c 100644
--- a/common/main/it_CH.xml
+++ b/common/main/it_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/it_IT.xml b/common/main/it_IT.xml
index 3a3158f..94810d5 100644
--- a/common/main/it_IT.xml
+++ b/common/main/it_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/it_SM.xml b/common/main/it_SM.xml
index 1c943f8..0359848 100644
--- a/common/main/it_SM.xml
+++ b/common/main/it_SM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/it_VA.xml b/common/main/it_VA.xml
index 8a03a94..b7bd960 100644
--- a/common/main/it_VA.xml
+++ b/common/main/it_VA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ja.xml b/common/main/ja.xml
index e844584..44b397b 100644
--- a/common/main/ja.xml
+++ b/common/main/ja.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,6 +49,7 @@
<language type="arp">アラパホー語</language>
<language type="arq">アルジェリア・アラビア語</language>
<language type="ars">ナジュド地方・アラビア語</language>
+ <language type="ars" alt="menu">アラビア語（ナジュド地方）</language>
<language type="arw">アラワク語</language>
<language type="ary">モロッコ・アラビア語</language>
<language type="arz">エジプト・アラビア語</language>
@@ -122,6 +123,8 @@
<language type="chr">チェロキー語</language>
<language type="chy">シャイアン語</language>
<language type="ckb">中央クルド語</language>
+ <language type="ckb" alt="menu">クルド語（中央）</language>
+ <language type="ckb" alt="variant">クルド語（ソラニー）</language>
<language type="co">コルシカ語</language>
<language type="cop">コプト語</language>
<language type="cps">カピス語</language>
@@ -182,6 +185,7 @@
<language type="ewo">エウォンド語</language>
<language type="ext">エストレマドゥーラ語</language>
<language type="fa">ペルシア語</language>
+ <language type="fa_AF">ダリー語</language>
<language type="fan">ファング語</language>
<language type="fat">ファンティー語</language>
<language type="ff">フラ語</language>
@@ -650,6 +654,7 @@
<script type="Aghb" draft="contributed">カフカス・アルバニア文字</script>
<script type="Arab">アラビア文字</script>
<script type="Arab" alt="variant">ペルソ・アラビア文字</script>
+ <script type="Aran" draft="contributed">ナスタアリーク体</script>
<script type="Armi">帝国アラム文字</script>
<script type="Armn">アルメニア文字</script>
<script type="Avst">アヴェスター文字</script>
@@ -1162,7 +1167,6 @@
<variant type="KSCOR" draft="contributed">標準コーンウォール語正書法</variant>
<variant type="LAUKIKA" draft="contributed">ラウキカ</variant>
<variant type="LIPAW" draft="contributed">レージア方言 リポヴァツ方言</variant>
- <variant type="LUNA1918" draft="contributed">LUNA1918</variant>
<variant type="METELKO" draft="contributed">メテルチッツァ</variant>
<variant type="MONOTON">モノトニック</variant>
<variant type="NDYUKA" draft="contributed">ンジュカ方言</variant>
@@ -1171,7 +1175,6 @@
<variant type="NULIK" draft="contributed">現代ヴォラピュク語</variant>
<variant type="OSOJS" draft="contributed">オゼアッコ/オソヤネ方言</variant>
<variant type="PAMAKA" draft="contributed">パマカ方言</variant>
- <variant type="PETR1708" draft="contributed">PETR1708</variant>
<variant type="PINYIN">ピン音(ローマ字表記法)</variant>
<variant type="POLYTON">ポリトニック</variant>
<variant type="POSIX">コンピュータ</variant>
@@ -1179,7 +1182,6 @@
<variant type="REVISED">改訂版</variant>
<variant type="RIGIK" draft="contributed">古典ヴォラピュク語</variant>
<variant type="ROZAJ">レシア方言</variant>
- <variant type="RUMGR" draft="contributed">RUMGR</variant>
<variant type="SAAHO">サホ語</variant>
<variant type="SCOTLAND" draft="contributed">スコットランド標準英語</variant>
<variant type="SCOUSE">リバプール方言</variant>
@@ -6828,7 +6830,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ノーフォーク島時間</standard>
+ <generic draft="contributed">ノーフォーク島時間</generic>
+ <standard draft="contributed">ノーフォーク島標準時</standard>
+ <daylight draft="contributed">ノーフォーク島夏時間</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8831,9 +8835,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>デシ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>センチ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ミリ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>マイクロ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ナノ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ピコ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>フェムト{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>アト{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ゼプト{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ヨクト{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>デカ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ヘクト{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>キロ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>メガ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ギガ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>テラ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ペタ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>エクサ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ゼタ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ヨタ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}毎{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8841,7 +8913,7 @@
<displayName>重力加速度</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>メートル毎秒毎秒</displayName>
<unitPattern count="other">{0} メートル毎秒毎秒</unitPattern>
</unit>
@@ -8922,7 +8994,7 @@
<displayName>ミリモル毎リットル</displayName>
<unitPattern count="other">{0} ミリモル毎リットル</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -8946,7 +9018,7 @@
<displayName>リットル毎キロメートル</displayName>
<unitPattern count="other">{0} リットル毎キロメートル</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>リットル毎100キロメートル</displayName>
<unitPattern count="other">{0} リットル毎100キロメートル</unitPattern>
</unit>
@@ -9342,15 +9414,15 @@
<displayName>馬力</displayName>
<unitPattern count="other">{0} 馬力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>水銀柱ミリメートル</displayName>
<unitPattern count="other">{0} 水銀柱ミリメートル</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>重量ポンド毎平方インチ</displayName>
<unitPattern count="other">{0} 重量ポンド毎平方インチ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>水銀柱インチ</displayName>
<unitPattern count="other">{0} 水銀柱インチ</unitPattern>
</unit>
@@ -9414,7 +9486,7 @@
<displayName>ケルビン</displayName>
<unitPattern count="other">{0} ケルビン</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ポンドフィート</displayName>
<unitPattern count="other">{0} ポンドフィート</unitPattern>
</unit>
@@ -9544,9 +9616,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -9554,7 +9694,7 @@
<displayName>重力加速度</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -9635,7 +9775,7 @@
<displayName>ミリモル毎リットル</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -9659,7 +9799,7 @@
<displayName>L/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -10055,15 +10195,15 @@
<displayName>馬力</displayName>
<unitPattern count="other">{0} 馬力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>水銀柱ミリメートル</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>重量ポンド毎平方インチ</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>水銀柱インチ</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -10127,7 +10267,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ポンドフィート</displayName>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
</unit>
@@ -10257,9 +10397,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -10267,7 +10475,7 @@
<displayName draft="contributed">重力加速度</displayName>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
@@ -10311,7 +10519,7 @@
<unit type="consumption-liter-per-kilometer">
<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -10584,15 +10792,15 @@
<unit type="power-horsepower">
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">水銀柱ミリメートル</displayName>
<unitPattern count="other" draft="contributed">{0}mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">重量ポンド毎平方インチ</displayName>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">水銀柱インチ</displayName>
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
diff --git a/common/main/ja_JP.xml b/common/main/ja_JP.xml
index 687dc49..3743b5e 100644
--- a/common/main/ja_JP.xml
+++ b/common/main/ja_JP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/jgo.xml b/common/main/jgo.xml
index c09e66d..8d21070 100644
--- a/common/main/jgo.xml
+++ b/common/main/jgo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/jgo_CM.xml b/common/main/jgo_CM.xml
index 79130bd..46ec52b 100644
--- a/common/main/jgo_CM.xml
+++ b/common/main/jgo_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/jmc.xml b/common/main/jmc.xml
index 66e08c4..794d239 100644
--- a/common/main/jmc.xml
+++ b/common/main/jmc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/jmc_TZ.xml b/common/main/jmc_TZ.xml
index 92d3653..be821bd 100644
--- a/common/main/jmc_TZ.xml
+++ b/common/main/jmc_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/jv.xml b/common/main/jv.xml
index 430aaee..c978557 100644
--- a/common/main/jv.xml
+++ b/common/main/jv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -20,7 +20,7 @@
<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
</localeDisplayPattern>
<languages>
- <language type="af">af</language>
+ <language type="af">Afrika</language>
<language type="agq">Aghem</language>
<language type="ak">Akan</language>
<language type="am">Amharik</language>
@@ -31,9 +31,8 @@
<language type="ast">Asturia</language>
<language type="az">Azerbaijan</language>
<language type="az" alt="short">Azeri</language>
- <language type="ban">ban</language>
<language type="bas">Basaa</language>
- <language type="be">be</language>
+ <language type="be">Belarus</language>
<language type="bem">Bemba</language>
<language type="bez">Bena</language>
<language type="bg">Bulgaria</language>
@@ -42,7 +41,7 @@
<language type="bo">Tibet</language>
<language type="br">Breton</language>
<language type="brx">Bodo</language>
- <language type="bs">bs</language>
+ <language type="bs">Bosnia lan Hercegovina</language>
<language type="ca">Katala</language>
<language type="ccp">Chakma</language>
<language type="ce">Chechen</language>
@@ -83,6 +82,7 @@
<language type="eu">Basque</language>
<language type="ewo">Ewondo</language>
<language type="fa">Persia</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="ff">Fulah</language>
<language type="fi">Suomi</language>
<language type="fil">Tagalog</language>
@@ -266,7 +266,7 @@
<language type="zxx">Konten tanpa linguistik</language>
</languages>
<scripts>
- <script type="Arab">Arab</script>
+ <script type="Arab">hija’iyah</script>
<script type="Armn">Armenia</script>
<script type="Beng">Bangla</script>
<script type="Bopo">Bopomofo</script>
@@ -302,7 +302,7 @@
<script type="Orya">Odia</script>
<script type="Sinh">Sinhala</script>
<script type="Taml">Tamil</script>
- <script type="Telu">↑↑↑</script>
+ <script type="Telu">Telugu</script>
<script type="Thaa">Thaana</script>
<script type="Thai">Thailand</script>
<script type="Tibt">Tibetan</script>
@@ -3952,7 +3952,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Wektu Pulo Norfolk</standard>
+ <generic draft="contributed">Wektu Pulo Norfolk</generic>
+ <standard draft="contributed">Wektu Standar Pulo Norfolk</standard>
+ <daylight draft="contributed">Wektu Ketigo Pulo Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4815,7 +4817,7 @@
</currency>
<currency type="MOP">
<displayName>Pataca Macau</displayName>
- <displayName count="other">MOP</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MRO">
@@ -5209,9 +5211,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} saben {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>peng loro {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">peng loro {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>peng telu {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">peng telu {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5219,7 +5289,7 @@
<displayName>tenaga-g</displayName>
<unitPattern count="other">{0} tenaga-g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter saben detik kuadrat</displayName>
<unitPattern count="other">{0} meter saben detik kuadrat</unitPattern>
</unit>
@@ -5300,7 +5370,7 @@
<displayName>milimol saben liter</displayName>
<unitPattern count="other">{0} milimol saben liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bagean saben yuta</displayName>
<unitPattern count="other">{0} bagean saben yuta</unitPattern>
</unit>
@@ -5324,7 +5394,7 @@
<displayName>liter saben kilometer</displayName>
<unitPattern count="other">{0} liter saben kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter saben 100 kilometer</displayName>
<unitPattern count="other">{0} liter saben 100 kilometer</unitPattern>
</unit>
@@ -5708,15 +5778,15 @@
<displayName>tenogo jaran</displayName>
<unitPattern count="other">{0} tenogo jaran</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimeter saka raksa</displayName>
<unitPattern count="other">{0} milimeter saka raksa</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pon saben inci kuadrat</displayName>
<unitPattern count="other">{0} pon saben inci kuadrat</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inci saka raksa</displayName>
<unitPattern count="other">{0} inci saka raksa</unitPattern>
</unit>
@@ -5780,7 +5850,7 @@
<displayName>kelvin</displayName>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pon-kaki</displayName>
<unitPattern count="other">{0} pon-kaki</unitPattern>
</unit>
@@ -5906,9 +5976,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5916,7 +6054,7 @@
<displayName>tenaga-g</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter/detik²</displayName>
<unitPattern count="other">{0} meter/detik²</unitPattern>
</unit>
@@ -5997,7 +6135,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bagean/yuta</displayName>
<unitPattern count="other">{0} bagean saben yuta</unitPattern>
</unit>
@@ -6021,7 +6159,7 @@
<displayName>liter/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="other">{0} L/100 km</unitPattern>
</unit>
@@ -6405,15 +6543,15 @@
<displayName>tenogo jaran</displayName>
<unitPattern count="other">{0} tenogo jaran</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -6477,7 +6615,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pon-kaki</displayName>
<unitPattern count="other">{0} pon-kaki</unitPattern>
</unit>
@@ -6603,9 +6741,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6613,7 +6819,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="other">{0} L/100 km</unitPattern>
</unit>
diff --git a/common/main/jv_ID.xml b/common/main/jv_ID.xml
index 8a538e5..b4b4a6b 100644
--- a/common/main/jv_ID.xml
+++ b/common/main/jv_ID.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ka.xml b/common/main/ka.xml
index 07235d7..e39b157 100644
--- a/common/main/ka.xml
+++ b/common/main/ka.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -146,6 +146,7 @@
<language type="eu">ბასკური</language>
<language type="ewo">ევონდო</language>
<language type="fa">სპარსული</language>
+ <language type="fa_AF">დარი</language>
<language type="ff">ფულა</language>
<language type="fi">ფინური</language>
<language type="fil">ფილიპინური</language>
@@ -1176,6 +1177,30 @@
<ellipsis type="word-initial">… {0}</ellipsis>
<ellipsis type="word-medial">{0} … {1}</ellipsis>
<moreInformation>?</moreInformation>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample=":" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="$" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="£" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₹" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="+" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
</characters>
<delimiters>
<quotationStart>„</quotationStart>
@@ -4818,7 +4843,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ნორფოლკის კუნძულის დრო</standard>
+ <generic draft="contributed">ნორფოლკის კუნძულის დრო</generic>
+ <standard draft="contributed">ნორფოლკის კუნძულის სტანდარტული დრო</standard>
+ <daylight draft="contributed">ნორფოლკის კუნძულის ზაფხულის დრო</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6557,9 +6584,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>დეცი{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>სანტი{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>მილი{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>მიკრო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ნანო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>პიკო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ფემტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ატო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ზეპტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>იოქტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>დეკა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ჰეკტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>კილო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>მეგა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>გიგა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ტერა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>პეტა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ექსა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ზეტა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>იოტა{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>კვადრატული {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">კვადრატული {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">კვადრატული {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>კუბური {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">კუბური {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">კუბური {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6568,7 +6665,7 @@
<unitPattern count="one">{0} ინერციის ძალა</unitPattern>
<unitPattern count="other">{0} ინერციის ძალა</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>მეტრი კვადრატულ წამში</displayName>
<unitPattern count="one">{0} მ/წმ²</unitPattern>
<unitPattern count="other">{0} მ/წმ²</unitPattern>
@@ -6668,7 +6765,7 @@
<unitPattern count="one">{0} მილიმოლი ლიტრზე</unitPattern>
<unitPattern count="other">{0} მილიმოლი ლიტრზე</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ნაწილი მილიონზე</displayName>
<unitPattern count="one">{0} ნაწილი მილიონზე</unitPattern>
<unitPattern count="other">{0} ნაწილი მილიონზე</unitPattern>
@@ -6698,7 +6795,7 @@
<unitPattern count="one">{0} ლიტრი კილომეტრზე</unitPattern>
<unitPattern count="other">{0} ლიტრი კილომეტრზე</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ლიტრი 100 კილომეტრში</displayName>
<unitPattern count="one">{0} ლიტრი 100 კილომეტრში</unitPattern>
<unitPattern count="other">{0} ლიტრი 100 კილომეტრში</unitPattern>
@@ -7174,17 +7271,17 @@
<unitPattern count="one">{0} ცხენის ძალა</unitPattern>
<unitPattern count="other">{0} ცხენის ძალა</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>მილიმეტრი ვერცხლისწყლის სვეტისა</displayName>
<unitPattern count="one">{0} მილიმეტრი ვერცხლისწყლის სვეტისა</unitPattern>
<unitPattern count="other">{0} მილიმეტრი ვერცხლისწყლის სვეტისა</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ფუნტი კვადრატულ დუიმზე</displayName>
<unitPattern count="one">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
<unitPattern count="other">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ვერცხლისწყლის დუიმი</displayName>
<unitPattern count="one">{0} ვერცხლისწყლის დუიმი</unitPattern>
<unitPattern count="other">{0} ვერცხლისწყლის დუიმი</unitPattern>
@@ -7264,7 +7361,7 @@
<unitPattern count="one">{0} კელვინი</unitPattern>
<unitPattern count="other">{0} კელვინის გრადუსი</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7418,9 +7515,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>დ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ს{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>მ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>მკ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ნ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>პკ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ფ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ზეპტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>იოქტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>დეკა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ჰ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>კ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>გ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ტ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>პტ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ექსა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ზეტა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ი{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7429,7 +7596,7 @@
<unitPattern count="one">{0} ინ. ძ.</unitPattern>
<unitPattern count="other">{0} ინ. ძ.</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>მ/წმ²</displayName>
<unitPattern count="one">{0} მ/წმ²</unitPattern>
<unitPattern count="other">{0} მ/წმ²</unitPattern>
@@ -7529,7 +7696,7 @@
<unitPattern count="one">{0} მმოლ/ლ</unitPattern>
<unitPattern count="other">{0} მმოლ/ლ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ნაწილი/მილიონზე</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7559,7 +7726,7 @@
<unitPattern count="one">{0} ლ/კმ</unitPattern>
<unitPattern count="other">{0} ლ/კმ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ლ/100კმ</displayName>
<unitPattern count="one">{0} ლ/100კმ</unitPattern>
<unitPattern count="other">{0} ლ/100კმ</unitPattern>
@@ -8035,17 +8202,17 @@
<unitPattern count="one">{0} ცხ. ძ.</unitPattern>
<unitPattern count="other">{0} ცხ. ძ.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>მმ ვწყ. სვ.</displayName>
<unitPattern count="one">{0} მმ ვწყ. სვ.</unitPattern>
<unitPattern count="other">{0} მმ ვწყ. სვ.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ფნტ. კვ. დმ.</displayName>
<unitPattern count="one">{0} ფნტ. კვ. დმ.</unitPattern>
<unitPattern count="other">{0} ფნტ. კვ. დმ.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ვრც. დმ.</displayName>
<unitPattern count="one">{0} ვრც. დმ.</unitPattern>
<unitPattern count="other">{0} ვრც. დმ.</unitPattern>
@@ -8125,7 +8292,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8279,9 +8446,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>დ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ს{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>მ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>მკ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ნ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>პკ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ფ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ზეპტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>იოქტო{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>დეკა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ჰ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>კ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>გ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ტ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>პტ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ექსა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ზეტა{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ი{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8330,7 +8567,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ლ/100კმ</displayName>
<unitPattern count="one">{0}ლ/100კმ</unitPattern>
<unitPattern count="other">{0}ლ/100კმ</unitPattern>
@@ -8449,7 +8686,7 @@
<unitPattern count="one">{0}ცხ.ძ.</unitPattern>
<unitPattern count="other">{0}ცხ.ძ.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} ვრც. დმ.</unitPattern>
<unitPattern count="other">{0} ვრც. დმ.</unitPattern>
</unit>
diff --git a/common/main/ka_GE.xml b/common/main/ka_GE.xml
index 37f3110..ac03a2f 100644
--- a/common/main/ka_GE.xml
+++ b/common/main/ka_GE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kab.xml b/common/main/kab.xml
index 1c2d883..2452b26 100644
--- a/common/main/kab.xml
+++ b/common/main/kab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4083,7 +4083,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard draft="unconfirmed">Akud n Tigzirt n Nuṛfulk</standard>
+ <generic draft="unconfirmed">Akud n Tigzirt n Nuṛfulk</generic>
+ <standard draft="unconfirmed">Akud Amagnu n Tigzirt n Nuṛfulk</standard>
+ <daylight draft="unconfirmed">Akud n Unebdu n Tigzirt n Nuṛfulk</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/kab_DZ.xml b/common/main/kab_DZ.xml
index b46e0d5..6f72ee0 100644
--- a/common/main/kab_DZ.xml
+++ b/common/main/kab_DZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kam.xml b/common/main/kam.xml
index 8b114ea..353e343 100644
--- a/common/main/kam.xml
+++ b/common/main/kam.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kam_KE.xml b/common/main/kam_KE.xml
index 093d71c..1914cfc 100644
--- a/common/main/kam_KE.xml
+++ b/common/main/kam_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kde.xml b/common/main/kde.xml
index a66637b..b7e709d 100644
--- a/common/main/kde.xml
+++ b/common/main/kde.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kde_TZ.xml b/common/main/kde_TZ.xml
index dc8b82f..5f86fcd 100644
--- a/common/main/kde_TZ.xml
+++ b/common/main/kde_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kea.xml b/common/main/kea.xml
index 292b308..287a23d 100644
--- a/common/main/kea.xml
+++ b/common/main/kea.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2887,7 +2887,7 @@
<displayName>forsa G</displayName>
<unitPattern count="other">{0} forsa G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metru pur sigundu kuadradu</displayName>
<unitPattern count="other">{0} metru pur sigundu kuadradu</unitPattern>
</unit>
@@ -2968,7 +2968,7 @@
<displayName>milimol pur litru</displayName>
<unitPattern count="other">{0} milimol pur litru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parti pur milhãu</displayName>
<unitPattern count="other">{0} parti pur milhãu</unitPattern>
</unit>
@@ -2992,7 +2992,7 @@
<displayName>litru pur kilómetru</displayName>
<unitPattern count="other">{0} litru pur kilómetru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litru pur 100 kilómetru</displayName>
<unitPattern count="other">{0} litru pur 100 kilómetru</unitPattern>
</unit>
@@ -3376,15 +3376,15 @@
<displayName>kabalu-vapor</displayName>
<unitPattern count="other">{0} kabalu-vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetru di merkúriu</displayName>
<unitPattern count="other">{0} milímetru di merkúriu</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libra pur pulegada kuadradu</displayName>
<unitPattern count="other">{0} libra pur pulegada kuadradu</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>pulegada di merkúriu</displayName>
<unitPattern count="other">{0} pulegada di merkúriu</unitPattern>
</unit>
@@ -3448,7 +3448,7 @@
<displayName>kelvin</displayName>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pe-libra</displayName>
<unitPattern count="other">{0} pe-libra</unitPattern>
</unit>
@@ -3584,7 +3584,7 @@
<displayName>G</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -3665,7 +3665,7 @@
<displayName>milimol/litru</displayName>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parti/milhãu</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -3689,7 +3689,7 @@
<displayName>l/km</displayName>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litru/100km</displayName>
<unitPattern count="other">{0} l/100 km</unitPattern>
</unit>
@@ -4073,15 +4073,15 @@
<displayName>cv</displayName>
<unitPattern count="other">{0} cv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4145,7 +4145,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4281,7 +4281,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="other">{0} l/100km</unitPattern>
</unit>
diff --git a/common/main/kea_CV.xml b/common/main/kea_CV.xml
index 6993cbd..b31af05 100644
--- a/common/main/kea_CV.xml
+++ b/common/main/kea_CV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/khq.xml b/common/main/khq.xml
index fd81ed0..df7543e 100644
--- a/common/main/khq.xml
+++ b/common/main/khq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/khq_ML.xml b/common/main/khq_ML.xml
index 997afb4..b7fcec0 100644
--- a/common/main/khq_ML.xml
+++ b/common/main/khq_ML.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ki.xml b/common/main/ki.xml
index aacf794..ee27316 100644
--- a/common/main/ki.xml
+++ b/common/main/ki.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ki_KE.xml b/common/main/ki_KE.xml
index cfc516a..57d45b8 100644
--- a/common/main/ki_KE.xml
+++ b/common/main/ki_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kk.xml b/common/main/kk.xml
index bbfed91..8414968 100644
--- a/common/main/kk.xml
+++ b/common/main/kk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="eu">баск тілі</language>
<language type="ewo">эвондо тілі</language>
<language type="fa">парсы тілі</language>
+ <language type="fa_AF" draft="contributed">дари тілі</language>
<language type="ff">фула тілі</language>
<language type="fi">фин тілі</language>
<language type="fil">филиппин тілі</language>
@@ -4312,7 +4313,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк аралы уақыты</standard>
+ <generic draft="contributed">Норфолк аралы уақыты</generic>
+ <standard draft="contributed">Норфолк аралы стандартты уақыты</standard>
+ <daylight draft="contributed">Норфолк аралы жазғы уақыты</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5793,9 +5796,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} дециметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} сантиметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} миллиметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} микрометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} нанометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} пикометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} фемтометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} аттометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} зептометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} йоктометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} декаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} гектометр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} километр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} мегаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} гигаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} тераметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} петаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} эксаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} зеттаметр</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} йоттаметр</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5804,7 +5877,7 @@
<unitPattern count="one">{0} гравитациялық күш</unitPattern>
<unitPattern count="other">{0} гравитациялық күш</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метр/шаршы секунд</displayName>
<unitPattern count="one">{0} метр/шаршы секунд</unitPattern>
<unitPattern count="other">{0} метр/шаршы секунд</unitPattern>
@@ -5904,7 +5977,7 @@
<unitPattern count="one">{0} миллимоль/литр</unitPattern>
<unitPattern count="other">{0} миллимоль/литр</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>миллиондық үлес</displayName>
<unitPattern count="one">{0} миллиондық үлес</unitPattern>
<unitPattern count="other">{0} миллиондық үлес</unitPattern>
@@ -5934,7 +6007,7 @@
<unitPattern count="one">{0} литр/километр</unitPattern>
<unitPattern count="other">{0} литр/километр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>литр/100 километр</displayName>
<unitPattern count="one">{0} литр/100 километр</unitPattern>
<unitPattern count="other">{0} литр/100 километр</unitPattern>
@@ -6132,9 +6205,9 @@
<unitPattern count="other">{0} британдық жылу бірлігі</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">америка термі</displayName>
- <unitPattern count="one" draft="provisional">{0} америка термі</unitPattern>
- <unitPattern count="other" draft="provisional">{0} америка термі</unitPattern>
+ <displayName draft="contributed">америка термі</displayName>
+ <unitPattern count="one" draft="contributed">{0} америка термі</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} америка термі</unitPattern>
</unit>
<unit type="force-pound-force">
<displayName>фунт-күш</displayName>
@@ -6410,17 +6483,17 @@
<unitPattern count="one">{0} ат күші</unitPattern>
<unitPattern count="other">{0} ат күші</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>миллиметр сынап бағанасы</displayName>
<unitPattern count="one">{0} миллиметр сынап бағанасы</unitPattern>
<unitPattern count="other">{0} миллиметр сынап бағанасы</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунт/шаршы дюйм</displayName>
<unitPattern count="one">{0} фунт/шаршы дюйм</unitPattern>
<unitPattern count="other">{0} фунт/шаршы дюйм</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйм сынап бағанасы</displayName>
<unitPattern count="one">{0} дюйм сынап бағанасы</unitPattern>
<unitPattern count="other">{0} дюйм сынап бағанасы</unitPattern>
@@ -6500,7 +6573,7 @@
<unitPattern count="one">{0} кельвин</unitPattern>
<unitPattern count="other">{0} кельвин</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-фут</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="other">{0} фунт-фут</unitPattern>
@@ -6654,9 +6727,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} дм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} см</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} мм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} мкм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} нм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} пм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} фм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} ам</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} зм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} йм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} дам</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} гм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} км</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} Мм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} Гм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} Тм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} Пм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} Эм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} Зм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} Йм</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6665,7 +6808,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метр/сек²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="other">{0} м/с²</unitPattern>
@@ -6765,7 +6908,7 @@
<unitPattern count="one">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6795,7 +6938,7 @@
<unitPattern count="one">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="other">{0} л/100 км</unitPattern>
@@ -6993,7 +7136,7 @@
<unitPattern count="other">{0} Btu</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">америка термі</displayName>
+ <displayName draft="contributed">америка термі</displayName>
<unitPattern count="one">{0} амер. термі</unitPattern>
<unitPattern count="other">{0} амер. термі</unitPattern>
</unit>
@@ -7271,17 +7414,17 @@
<unitPattern count="one">{0} а. к.</unitPattern>
<unitPattern count="other">{0} а. к.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм с.б.</displayName>
<unitPattern count="one">{0} мм с.б.</unitPattern>
<unitPattern count="other">{0} мм с.б.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйм сынап бағанасы</displayName>
<unitPattern count="one">{0} дюйм с.б.</unitPattern>
<unitPattern count="other">{0} дюйм с.б.</unitPattern>
@@ -7361,7 +7504,7 @@
<unitPattern count="one">{0} К</unitPattern>
<unitPattern count="other">{0} К</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7515,9 +7658,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} дм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} см</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} мм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} мкм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} нм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} пм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} фм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} ам</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} зм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} йм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} дам</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} гм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} км</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} Мм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} Гм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} Тм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} Пм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} Эм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} Зм</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} Йм</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7566,7 +7779,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="other">{0} л/100 км</unitPattern>
@@ -7685,7 +7898,7 @@
<unitPattern count="one">{0} ат күші</unitPattern>
<unitPattern count="other">{0} ат күші</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/kk_KZ.xml b/common/main/kk_KZ.xml
index b5daa29..245aa6f 100644
--- a/common/main/kk_KZ.xml
+++ b/common/main/kk_KZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kkj.xml b/common/main/kkj.xml
index 76baccd..a050a30 100644
--- a/common/main/kkj.xml
+++ b/common/main/kkj.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -112,7 +112,7 @@
<month type="8">fɛ</month>
<month type="9">njapi</month>
<month type="10">nyukul</month>
- <month type="11">11</month>
+ <month type="11">M11</month>
<month type="12">ɓulɓusɛ</month>
</monthWidth>
</monthContext>
@@ -128,7 +128,7 @@
<month type="8">fɛ</month>
<month type="9">njapi</month>
<month type="10">nyukul</month>
- <month type="11">11</month>
+ <month type="11">M11</month>
<month type="12">ɓulɓusɛ</month>
</monthWidth>
</monthContext>
diff --git a/common/main/kkj_CM.xml b/common/main/kkj_CM.xml
index 9df6178..ee5b30e 100644
--- a/common/main/kkj_CM.xml
+++ b/common/main/kkj_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kl.xml b/common/main/kl.xml
index 8acb00c..597c533 100644
--- a/common/main/kl.xml
+++ b/common/main/kl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1282,7 +1282,7 @@
<unitPattern count="one" draft="unconfirmed">{0} nutsuinera nunarsuaq</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} nutsuinera nunarsuaq</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">meteri per kvadratsekundi</displayName>
<unitPattern count="one" draft="unconfirmed">{0} meteri per kvadratsekundi</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} meteri per kvadratsekundi</unitPattern>
@@ -1360,7 +1360,7 @@
<unitPattern count="one" draft="unconfirmed">{0} millimoli per literi</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} millimoli per literi</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">millioni ilaa</displayName>
<unitPattern count="one" draft="unconfirmed">{0} millioni ilaa</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} millioni ilaa</unitPattern>
@@ -1560,7 +1560,7 @@
<unitPattern count="one" draft="unconfirmed">{0} hestekraft</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} hestekrafter</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">tommer kviksølv</displayName>
<unitPattern count="one" draft="unconfirmed">{0} tomme kviksølv</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} tommer kviksølv</unitPattern>
@@ -1667,7 +1667,7 @@
<unitPattern count="one" draft="unconfirmed">{0} G</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">m/s²</displayName>
<unitPattern count="one" draft="unconfirmed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} m/s²</unitPattern>
@@ -1745,7 +1745,7 @@
<unitPattern count="one" draft="unconfirmed">{0} mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">millioni ilaa</displayName>
<unitPattern count="one" draft="unconfirmed">{0} ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} ppm</unitPattern>
@@ -1755,7 +1755,7 @@
<unitPattern count="one" draft="unconfirmed">{0} L/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">L/100km</displayName>
<unitPattern count="one" draft="unconfirmed">{0} L/100km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} L/100km</unitPattern>
@@ -1953,7 +1953,7 @@
<unitPattern count="one" draft="unconfirmed">{0} hk</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} hk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">tommer kviksølv</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -2059,7 +2059,7 @@
<unitPattern count="one" draft="unconfirmed">{0}G</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">m/s²</displayName>
<unitPattern count="one" draft="unconfirmed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} m/s²</unitPattern>
@@ -2128,7 +2128,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">millioni ilaa</displayName>
<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
@@ -2138,7 +2138,7 @@
<unitPattern count="one" draft="unconfirmed">{0}L/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">L/100km</displayName>
<unitPattern count="one" draft="unconfirmed">{0}L/100km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}L/100km</unitPattern>
@@ -2308,7 +2308,7 @@
<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/kl_GL.xml b/common/main/kl_GL.xml
index b425faf..eea08ec 100644
--- a/common/main/kl_GL.xml
+++ b/common/main/kl_GL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kln.xml b/common/main/kln.xml
index 1ce6588..e9d055b 100644
--- a/common/main/kln.xml
+++ b/common/main/kln.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kln_KE.xml b/common/main/kln_KE.xml
index 42bbe58..abc7ae0 100644
--- a/common/main/kln_KE.xml
+++ b/common/main/kln_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/km.xml b/common/main/km.xml
index 04403f2..fd47509 100644
--- a/common/main/km.xml
+++ b/common/main/km.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -120,6 +120,7 @@
<language type="eu">បាសខ៍</language>
<language type="ewo">អ៊ីវ៉ុនដូ</language>
<language type="fa">ភឺសៀន</language>
+ <language type="fa_AF">ដារី</language>
<language type="ff">ហ្វ៊ូឡា</language>
<language type="fi">ហ្វាំងឡង់</language>
<language type="fil">ហ្វីលីពីន</language>
@@ -4180,7 +4181,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ម៉ោងនៅកោះន័រហ្វក់</standard>
+ <generic draft="contributed">ម៉ោងនៅកោះន័រហ្វក់</generic>
+ <standard draft="contributed">ម៉ោងស្ដង់ដារនៅណ័រហ្វក់</standard>
+ <daylight draft="contributed">ម៉ោងនៅណ័រហ្វក់នារដូវក្ដៅ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5455,9 +5458,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ដេស៊ី{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>សង់ទី{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>មីល្លី{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>មីក្រូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ណាណូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ពីកូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ហ្វង់តូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>អាត់តូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ហ្សិបតូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>យ៉ុកតូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ដេកា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ហិកតូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>គីឡូ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>មេហ្គា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ហ្គីហ្គា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>តេរ៉ា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ប៉េតា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>អ៊ិចសា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ហ្សិតតា{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>យ៉ុតតា{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ក្នុងមួយ {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} ការ៉េ</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}គូប</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5465,7 +5536,7 @@
<displayName>កម្លាំងទំនាញ</displayName>
<unitPattern count="other">{0} កម្លាំងទំនាញ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ម៉ែត្រក្នុងមួយវិនាទីការ៉េ</displayName>
<unitPattern count="other">{0} ម៉ែត្រក្នុងមួយវិនាទីការ៉េ</unitPattern>
</unit>
@@ -5546,7 +5617,7 @@
<displayName>មិល្លីម៉ូលក្នុងមួយលីត្រ</displayName>
<unitPattern count="other">{0} មិល្លីម៉ូលក្នុងមួយលីត្រ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ផ្នែកក្នុងមួយលាន</displayName>
<unitPattern count="other">{0} ផ្នែកក្នុងមួយលាន</unitPattern>
</unit>
@@ -5570,7 +5641,7 @@
<displayName>លីត្រក្នុងមួយគីឡូម៉ែត្រ</displayName>
<unitPattern count="other">{0} លីត្រក្នុងមួយគីឡូម៉ែត្រ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>លីត្រក្នុង 100 គីឡូម៉ែត្រ</displayName>
<unitPattern count="other">{0} លីត្រក្នុង 100 គីឡូម៉ែត្រ</unitPattern>
</unit>
@@ -5954,15 +6025,15 @@
<displayName>សេះ</displayName>
<unitPattern count="other">{0} សេះ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>មិល្លីម៉ែត្រនៃបារត</displayName>
<unitPattern count="other">{0} មិល្លីម៉ែត្រនៃបារត</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ផោនក្នុងមួយអ៊ីញការ៉េ</displayName>
<unitPattern count="other">{0} ផោនក្នុងមួយអ៊ីញការ៉េ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>អ៊ីញនៃបារត</displayName>
<unitPattern count="other">{0} អ៊ីញនៃបារត</unitPattern>
</unit>
@@ -6026,7 +6097,7 @@
<displayName>អង្សាខែលវិន</displayName>
<unitPattern count="other">{0} អង្សាខែលវិន</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6152,9 +6223,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6162,7 +6301,7 @@
<displayName>កម្លាំងទំនាញ</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ម៉ែត្រ/វិនាទីការ៉េ</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -6243,7 +6382,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -6267,7 +6406,7 @@
<displayName>លីត្រ/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -6651,15 +6790,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -6723,7 +6862,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6849,9 +6988,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6889,7 +7096,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -6982,7 +7189,7 @@
<unit type="power-horsepower">
<unitPattern count="other">{0} សេះ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
<unit type="pressure-millibar">
@@ -7049,6 +7256,30 @@
<listPatternPart type="end">{0} ឬ {1}</listPatternPart>
<listPatternPart type="2">{0} ឬ {1}</listPatternPart>
</listPattern>
+ <listPattern type="or-narrow">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
+ <listPattern type="or-short">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
+ <listPattern type="standard-narrow">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">{0}, {1}</listPatternPart>
+ <listPatternPart type="2">{0}, {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="standard-short">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">{0} និង {1}</listPatternPart>
+ </listPattern>
<listPattern type="unit">
<listPatternPart type="start">{0} {1}</listPatternPart>
<listPatternPart type="middle">{0} {1}</listPatternPart>
diff --git a/common/main/km_KH.xml b/common/main/km_KH.xml
index 8d70b25..3dad20c 100644
--- a/common/main/km_KH.xml
+++ b/common/main/km_KH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kn.xml b/common/main/kn.xml
index 1ec1d5e..84897e6 100644
--- a/common/main/kn.xml
+++ b/common/main/kn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -151,6 +151,7 @@
<language type="eu">ಬಾಸ್ಕ್</language>
<language type="ewo">ಇವಾಂಡೋ</language>
<language type="fa">ಪರ್ಶಿಯನ್</language>
+ <language type="fa_AF">ದರಿ</language>
<language type="fan">ಫಾಂಗ್</language>
<language type="fat">ಫಾಂಟಿ</language>
<language type="ff">ಫುಲಾ</language>
@@ -1035,7 +1036,7 @@
<type key="calendar" type="indian">ಭಾರತೀಯ ರಾಷ್ಟ್ರೀಯ ಕ್ಯಾಲೆಂಡರ್</type>
<type key="calendar" type="islamic">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
<type key="calendar" type="islamic-civil">ಇಸ್ಲಾಮಿಕ್-ಸಿವಿಲ್ ಕ್ಯಾಲೆಂಡರ್</type>
- <type key="calendar" type="islamic-rgsa" draft="unconfirmed">islamic-rgsa</type>
+ <type key="calendar" type="islamic-rgsa" draft="contributed">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್ (ಸೌದಿ ಅರೇಬಿಯಾ, ಸೈಟಿಂಗ್)bia, sighting)</type>
<type key="calendar" type="islamic-umalqura" draft="contributed">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್ (ಉಮ್ ಅಲ್-ಖುರಾ)</type>
<type key="calendar" type="iso8601">ISO-8601 ಕ್ಯಾಲೆಂಡರ್</type>
<type key="calendar" type="japanese">ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
@@ -5295,7 +5296,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ನಾರ್ಫೋಕ್ ದ್ವೀಪ ಸಮಯ</standard>
+ <generic draft="contributed">ನಾರ್ಫೋಕ್ ದ್ವೀಪ ಸಮಯ</generic>
+ <standard draft="contributed">ನಾರ್ಫೋಕ್ ದ್ವೀಪ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
+ <daylight draft="contributed">ನಾರ್ಫೋಕ್ ದ್ವೀಪ ಬೇಸಿಗೆ ಸಮಯ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6841,9 +6844,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ಡೆಸಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ಸೆಂಟಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ಮಿಲಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ಮೈಕ್ರೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ನ್ಯಾನೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ಪಿಕೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ಫೆಮ್ಟೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ಅಟ್ಟೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ಝೆಪ್ಟೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ಯೊಕ್ಟೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ಡೆಕಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ಹೆಕ್ಟೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ಕಿಲೋ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ಮೆಗಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ಗಿಗಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ಟೆರಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ಪೆಟಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ಎಕ್ಸಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ಝೆಟ್ಟಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ಯೊಟ್ಟಾ {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>ಪ್ರತಿ {1} ಗೆ {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ಚದರ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ಚದರ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ಚ. {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ಕ್ಯೂ. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ಕ್ಯೂಬಿಕ್ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ಕ್ಯೂ {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6852,7 +6925,7 @@
<unitPattern count="one">{0} ಜಿ-ಫೋರ್ಸ್</unitPattern>
<unitPattern count="other">{0} ಜಿ-ಫೋರ್ಸ್</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ಮೀಟರ್ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್ ಸ್ಕ್ವೇರ್ಗಳಿಗೆ</displayName>
<unitPattern count="one">{0} ಮೀಟರ್ ಪ್ರತಿ ಸೆಕೆಂಡ್ ಸ್ಕ್ವೇರ್ಗಳಿಗೆ</unitPattern>
<unitPattern count="other">{0} ಮೀಟರ್ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್ ಸ್ಕ್ವೇರ್ಗಳಿಗೆ</unitPattern>
@@ -6952,7 +7025,7 @@
<unitPattern count="one">{0} ಪ್ರತಿ ಲೀಟರ್ ಮಿಲ್ಲಿಮೋಲ್ಸ್</unitPattern>
<unitPattern count="other">{0} ಪ್ರತಿ ಲೀಟರ್ ಮಿಲ್ಲಿಮೋಲ್ಸ್</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು</displayName>
<unitPattern count="one">{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗ</unitPattern>
<unitPattern count="other">{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು</unitPattern>
@@ -6982,7 +7055,7 @@
<unitPattern count="one">{0} ಲೀಟರ್ ಪ್ರತಿ ಕಿಲೋಮೀಟರ್ಗೆ</unitPattern>
<unitPattern count="other">{0} ಪ್ರತಿ ಕಿಲೋಮೀಟರ್ಗೆ ಲೀಟರ್ಗಳು</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್ಗಳಿಗೆ ಲೀಟರ್ಗಳು</displayName>
<unitPattern count="one">{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್ಗಳಿಗೆ ಲೀಟರ್ಗಳು</unitPattern>
<unitPattern count="other">{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್ಗಳಿಗೆ ಲೀಟರ್ಗಳು</unitPattern>
@@ -7463,17 +7536,17 @@
<unitPattern count="one">{0} ಹಾರ್ಸ್ಪವರ್</unitPattern>
<unitPattern count="other">{0} ಹಾರ್ಸ್ಪವರ್</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್ಗಳು</displayName>
<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್</unitPattern>
<unitPattern count="other">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್ಗಳು</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್ಗಳು</displayName>
<unitPattern count="one">{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್</unitPattern>
<unitPattern count="other">{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್ಗಳು</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</displayName>
<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲ</unitPattern>
<unitPattern count="other">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</unitPattern>
@@ -7553,7 +7626,7 @@
<unitPattern count="one">{0} ಕೆಲ್ವಿನ್</unitPattern>
<unitPattern count="other">{0} ಕೆಲ್ವಿನ್ಗಳು</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ಪೌಂಡ್-ಅಡಿ</displayName>
<unitPattern count="one">{0} ಪೌಂಡ್-ಅಡಿ</unitPattern>
<unitPattern count="other">{0} ಪೌಂಡ್-ಅಡಿ</unitPattern>
@@ -7707,9 +7780,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ಡೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ಸೆಂ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ಮಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ಮೈ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ನ್ಯಾ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ಪಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ಫೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ಅ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ಝೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ಯೊ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ಡೆಟ್ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ಹೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ಕಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ಮೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ಗಿ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ಟೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ಪೆ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ಎ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ಝೆಟ್ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ಯೊಟ್ {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7718,7 +7861,7 @@
<unitPattern count="one">{0} ಜಿ</unitPattern>
<unitPattern count="other">{0} ಜಿ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ಮೀಟರ್ಗಳು/ಸೆ²</displayName>
<unitPattern count="one">{0} ಮೀ/ಸೆ²</unitPattern>
<unitPattern count="other">{0} ಮೀ/ಸೆ²</unitPattern>
@@ -7818,7 +7961,7 @@
<unitPattern count="one">{0} ಮಿಮೊಲ್/ಲೀ</unitPattern>
<unitPattern count="other">{0} ಮಿಮೋಲ್/ಲೀ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ಭಾಗಗಳು/ಮಿಲಿಯನ್</displayName>
<unitPattern count="one">{0} ಭಾಪ್ರಮಿ</unitPattern>
<unitPattern count="other">{0} ಭಾಪ್ರಮಿ</unitPattern>
@@ -7848,7 +7991,7 @@
<unitPattern count="one">{0} ಲೀ/ಕಿ.ಮೀ</unitPattern>
<unitPattern count="other">{0} ಲೀ/ಕಿ.ಮೀ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ಲೀ/100ಕಿಮೀ</displayName>
<unitPattern count="one">{0} ಲೀ/100ಕಿಮೀ</unitPattern>
<unitPattern count="other">{0} ಲೀ/100ಕಿ.ಮೀ</unitPattern>
@@ -8329,17 +8472,17 @@
<unitPattern count="one">{0} ಹೆಚ್ಪಿ</unitPattern>
<unitPattern count="other">{0} ಹೆಚ್ಪಿ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.</displayName>
<unitPattern count="one">{0} ಮರ್ಕ್ಯು ಮಿಮೀ</unitPattern>
<unitPattern count="other">{0} ಮರ್ಕ್ಯು ಮಿಮೀ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ಪ್ರ.ಚ.ಇಂ.ಪೌಂ.</displayName>
<unitPattern count="one">{0} ಪ್ರಚಇಂಪೌಂ</unitPattern>
<unitPattern count="other">{0} ಪ್ರಚಇಂಪೌಂ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ಮರ್ಕ್ಯು.ಅಂ.</displayName>
<unitPattern count="one">{0} ಮರ್ಕ್ಯುಅಂ</unitPattern>
<unitPattern count="other">{0} ಮರ್ಕ್ಯುಅಂ</unitPattern>
@@ -8419,7 +8562,7 @@
<unitPattern count="one">{0} ಕೆ</unitPattern>
<unitPattern count="other">{0} ಕೆ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ಎಲ್ಬಿಎಫ್-ಎಫ್ಟಿ</displayName>
<unitPattern count="one">{0} ಎಲ್ಬಿಎಫ್-ಎಫ್ಟಿ</unitPattern>
<unitPattern count="other">{0} ಎಲ್ಬಿಎಫ್-ಎಫ್ಟಿ</unitPattern>
@@ -8573,9 +8716,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ಡೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ಸೆಂ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ಮಿ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ಮೈ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ನ್ಯಾ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ಪಿ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ಫೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ಅ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ಝೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ಯೊ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ಡೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ಹೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ಕಿ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ಮೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ಗಿ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ಟೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ಪೆ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ಎ. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ಝೆಟ್. {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ಯೊ. {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8620,7 +8833,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ಲೀ/100ಕಿ.ಮೀ</displayName>
<unitPattern count="one">{0} ಲೀ/100ಕಿಮೀ</unitPattern>
<unitPattern count="other">{0} ಲೀ/100ಕಿಮೀ</unitPattern>
@@ -8774,17 +8987,17 @@
<unitPattern count="one">{0}ಹೆಚ್ಪಿ</unitPattern>
<unitPattern count="other">{0}ಹೆಚ್ಪಿ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.</displayName>
<unitPattern count="one">{0}mmHg</unitPattern>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">ಪ್ರ.ಚ.ಇಂ.ಪೌಂ.</displayName>
<unitPattern count="one">{0}psi</unitPattern>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">ಮರ್ಕ್ಯು.ಅಂ.</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
diff --git a/common/main/kn_IN.xml b/common/main/kn_IN.xml
index 4513cf6..178edff 100644
--- a/common/main/kn_IN.xml
+++ b/common/main/kn_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ko.xml b/common/main/ko.xml
index 3cf3557..ad74a29 100644
--- a/common/main/ko.xml
+++ b/common/main/ko.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -110,6 +110,7 @@
<language type="chr">체로키어</language>
<language type="chy">샤이엔어</language>
<language type="ckb">소라니 쿠르드어</language>
+ <language type="ckb" alt="menu">쿠르드어(소라니)</language>
<language type="co">코르시카어</language>
<language type="cop">콥트어</language>
<language type="cr">크리어</language>
@@ -165,6 +166,7 @@
<language type="eu">바스크어</language>
<language type="ewo">이원도어</language>
<language type="fa">페르시아어</language>
+ <language type="fa_AF">다리어</language>
<language type="fan">팡그어</language>
<language type="fat">판티어</language>
<language type="ff">풀라어</language>
@@ -581,6 +583,7 @@
<script type="Aghb" draft="contributed">코카시안 알바니아 문자</script>
<script type="Arab">아랍 문자</script>
<script type="Arab" alt="variant">페르소-아라비아 문자</script>
+ <script type="Aran" draft="contributed">나스탈리크체</script>
<script type="Armi" draft="contributed">아랍제국 문자</script>
<script type="Armn">아르메니아 문자</script>
<script type="Avst" draft="contributed">아베스타 문자</script>
@@ -695,6 +698,7 @@
<script type="Phnx" draft="contributed">페니키아 문자</script>
<script type="Plrd" draft="contributed">폴라드 표음 문자</script>
<script type="Prti" draft="contributed">명문 파라티아 문자</script>
+ <script type="Qaag" draft="contributed">저지 문자</script>
<script type="Rjng" draft="contributed">레장 문자</script>
<script type="Roro" draft="contributed">롱고롱고</script>
<script type="Runr">룬 문자</script>
@@ -5870,7 +5874,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>노퍽섬 시간</standard>
+ <generic draft="contributed">노퍽섬 시간</generic>
+ <standard draft="contributed">노퍽섬 표준시</standard>
+ <daylight draft="contributed">노퍽섬 하계 표준시</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7563,9 +7569,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>데시{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>센티{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>밀리{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>마이크로{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>나노{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>피코{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>펨토{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>아토{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>젭토{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>욕토{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>데카{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>헥토{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>킬로{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>메가{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>기가{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>테라{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>페타{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>엑사{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>제타{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>요타{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1}당 {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>제곱{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">제곱{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>세제곱{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">세제곱{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7573,7 +7647,7 @@
<displayName>중력가속도</displayName>
<unitPattern count="other">{0} 중력가속도</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>제곱 초당 미터</displayName>
<unitPattern count="other">{0}제곱 초당 미터</unitPattern>
</unit>
@@ -7654,7 +7728,7 @@
<displayName>리터당 밀리몰</displayName>
<unitPattern count="other">리터당 {0}밀리몰</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0}ppm</unitPattern>
</unit>
@@ -7678,7 +7752,7 @@
<displayName>킬로미터당 리터</displayName>
<unitPattern count="other">킬로미터당 {0}리터</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100킬로미터당 리터</displayName>
<unitPattern count="other">100킬로미터당 {0}리터</unitPattern>
</unit>
@@ -8074,15 +8148,15 @@
<displayName>마력</displayName>
<unitPattern count="other">{0}마력</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>수은주밀리미터</displayName>
<unitPattern count="other">{0}수은주밀리미터</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>제곱인치당 파운드</displayName>
<unitPattern count="other">{0}제곱인치당 파운드</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>수은주인치</displayName>
<unitPattern count="other">{0}수은주인치</unitPattern>
</unit>
@@ -8146,7 +8220,7 @@
<displayName>켈빈</displayName>
<unitPattern count="other">{0}켈빈</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0}lbf⋅ft</unitPattern>
</unit>
@@ -8272,9 +8346,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8282,7 +8424,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0}m/s²</unitPattern>
</unit>
@@ -8363,7 +8505,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0}ppm</unitPattern>
</unit>
@@ -8387,7 +8529,7 @@
<displayName>L/km</displayName>
<unitPattern count="other">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -8783,15 +8925,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="other">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0}inHg</unitPattern>
</unit>
@@ -8855,7 +8997,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0}lbf⋅ft</unitPattern>
</unit>
@@ -8981,9 +9123,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8991,7 +9201,7 @@
<displayName draft="contributed">g-force</displayName>
<unitPattern count="other" draft="contributed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
@@ -9026,7 +9236,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -9223,15 +9433,15 @@
<unit type="power-horsepower">
<unitPattern count="other" draft="contributed">{0}HP</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="other" draft="contributed">{0}"Hg</unitPattern>
</unit>
diff --git a/common/main/ko_KP.xml b/common/main/ko_KP.xml
index e19dbd2..6722f1e 100644
--- a/common/main/ko_KP.xml
+++ b/common/main/ko_KP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ko_KR.xml b/common/main/ko_KR.xml
index d22ae4d..c50ebbe 100644
--- a/common/main/ko_KR.xml
+++ b/common/main/ko_KR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kok.xml b/common/main/kok.xml
index 6b8282c..e20a55d 100644
--- a/common/main/kok.xml
+++ b/common/main/kok.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -86,7 +86,7 @@
<language type="dav">तायता</language>
<language type="de">जर्मन</language>
<language type="de_AT">ऑस्ट्रियन जर्मन</language>
- <language type="de_CH">स्वीझ म्हान जर्मन</language>
+ <language type="de_CH">स्विझ हाय जर्मन</language>
<language type="dgr">डोगरीब</language>
<language type="dje">झर्मा</language>
<language type="dsb">लोवर सोर्बियन</language>
@@ -102,34 +102,35 @@
<language type="el">ग्रीक्</language>
<language type="en">इंग्लीश</language>
<language type="en_AU">ऑस्ट्रेलियन इंग्लीश</language>
- <language type="en_CA">कॅनाडीयन इंग्लीश</language>
+ <language type="en_CA">कॅनडियन इंग्लीश</language>
<language type="en_GB">ब्रिटीश इंग्लीश</language>
- <language type="en_GB" alt="short">युके इंग्लीश</language>
+ <language type="en_GB" alt="short">यूके इंग्लीश</language>
<language type="en_US">अमेरिकन इंग्लीश</language>
- <language type="en_US" alt="short">युएस इंग्लीश</language>
+ <language type="en_US" alt="short">यूएस इंग्लीश</language>
<language type="eo">इस्परान्टो</language>
- <language type="es">स्पॅनिश</language>
- <language type="es_419">लॅटिन अमेरिकन स्पॅनिश</language>
- <language type="es_ES">युरोपियन स्पॅनिश</language>
- <language type="es_MX">मेक्सिकन स्पॅनिश</language>
+ <language type="es">स्पॅनीश</language>
+ <language type="es_419">लातीं अमेरिकन स्पॅनीश</language>
+ <language type="es_ES">युरोपियन स्पॅनीश</language>
+ <language type="es_MX">मॅक्सिकन स्पॅनीश</language>
<language type="et">इस्टोनियन्</language>
<language type="eu">बास्क</language>
<language type="ewo">एवोंडो</language>
- <language type="fa">पर्सियन</language>
+ <language type="fa">पर्शियन</language>
+ <language type="fa_AF">दारी</language>
<language type="ff">फुला</language>
<language type="fi">फिन्निष्</language>
<language type="fil">फिलिपिनो</language>
<language type="fj">फिजी</language>
<language type="fo">फेरोस्</language>
<language type="fon">फोन</language>
- <language type="fr">फ्रेन्च</language>
- <language type="fr_CA">कॅनाडीयन फ्रेन्च</language>
- <language type="fr_CH">स्वीझ फ्रेन्च</language>
+ <language type="fr">फ्रेंच</language>
+ <language type="fr_CA">कॅनडियन फ्रेंच</language>
+ <language type="fr_CH">स्विझ फ्रेंच</language>
<language type="fur">फ्रिलियन</language>
<language type="fy">पश्चिमी फ्रिशियन</language>
<language type="ga">ऐरिष</language>
<language type="gaa">गा</language>
- <language type="gd">स्काटस् गेलिक्</language>
+ <language type="gd">स्कॉटीश गॅलीक</language>
<language type="gez">गेझ</language>
<language type="gil">गिलबर्टीस</language>
<language type="gl">गेलीशियन</language>
@@ -201,7 +202,7 @@
<language type="krl">कारेलियन</language>
<language type="kru">कुरुख</language>
<language type="ks">कश्मीरी</language>
- <language type="ksb">शंबाला</language>
+ <language type="ksb">शांबाला</language>
<language type="ksf">बाफिया</language>
<language type="ksh">कोलोनियन</language>
<language type="ku">कुर्दिष</language>
@@ -288,7 +289,7 @@
<language type="nyn">नानकोले</language>
<language type="oc">ओसिटान्</language>
<language type="om">ओरोमो</language>
- <language type="or">ओरिया</language>
+ <language type="or">ओडिया</language>
<language type="os">ओसेटिक</language>
<language type="pa">पंजाबी</language>
<language type="pag">पांगासियान</language>
@@ -296,19 +297,19 @@
<language type="pap">पापिमेंटो</language>
<language type="pau">पालुयान</language>
<language type="pcm">नायझेरियन पिडगीन</language>
- <language type="pl">पोलिष</language>
+ <language type="pl">पॉलीश</language>
<language type="prg">प्रुसियन</language>
<language type="ps">पाष्टो</language>
- <language type="pt">पोर्तुगिज</language>
- <language type="pt_BR">ब्राझिलियन पोर्तुगिज</language>
- <language type="pt_PT">युरोपियन पोर्तुगिज</language>
+ <language type="pt">पोर्तुगीज</language>
+ <language type="pt_BR">ब्राझिलियन पोर्तुगीज</language>
+ <language type="pt_PT">युरोपियन पोर्तुगीज</language>
<language type="qu">क्वेच्वा</language>
<language type="quc">किचे</language>
<language type="rap">रापान्यु</language>
<language type="rar">रारोटोंगान</language>
- <language type="rm">रोमांन्श</language>
+ <language type="rm">रोमान्श</language>
<language type="rn">रुंदी</language>
- <language type="ro">रोमानियन्</language>
+ <language type="ro">रोमानियन</language>
<language type="ro_MD">मोल्डावियन्</language>
<language type="rof">रोम्बो</language>
<language type="root">रूट</language>
@@ -319,7 +320,7 @@
<language type="sa">संस्कृत</language>
<language type="sad">संडावे</language>
<language type="sah">सखा</language>
- <language type="saq">सांबारु</language>
+ <language type="saq">साम्बरू</language>
<language type="sat">संथाली</language>
<language type="sba">गांबे</language>
<language type="sbp">सांगू</language>
@@ -330,14 +331,14 @@
<language type="se">उत्तरीय सामी</language>
<language type="seh">सेना</language>
<language type="ses">कोयराबोरो सेन्नी</language>
- <language type="sg">सांग्रो</language>
+ <language type="sg">सांगो</language>
<language type="sh">सेर्बो-क्रोयेषियन्</language>
<language type="shi">ताछेहीट</language>
<language type="shn">शान</language>
- <language type="si">सिन्हलीस्</language>
+ <language type="si">सिनहालीस</language>
<language type="sk">स्लोवाक</language>
- <language type="sl">स्लोवेनियन्</language>
- <language type="sm">समोन</language>
+ <language type="sl">स्लोवानियन</language>
+ <language type="sm">सामोअन</language>
<language type="sma">दक्षिणी सामी</language>
<language type="smj">लुले सामी</language>
<language type="smn">ईनारी सामी</language>
@@ -350,10 +351,10 @@
<language type="srn">श्रानन टोंगो</language>
<language type="ss">स्वाती</language>
<language type="ssy">साहो</language>
- <language type="st">सेसोथो</language>
+ <language type="st">सावथर्न सोथो</language>
<language type="su">सुंदनीस</language>
<language type="suk">सुकुमा</language>
- <language type="sv">स्वीदीष</language>
+ <language type="sv">स्विडीश</language>
<language type="sw">स्वाहिली</language>
<language type="sw_CD">काँगो स्वाहिली</language>
<language type="swb">कोमोरियन</language>
@@ -388,7 +389,7 @@
<language type="ug">उयघूर</language>
<language type="uk">युक्रेनियन्</language>
<language type="umb">यमबुंडु</language>
- <language type="und">अज्ञात भाशा</language>
+ <language type="und">अज्ञात भास</language>
<language type="ur">उर्दू</language>
<language type="uz">उझबेक</language>
<language type="vai">वाई</language>
@@ -409,18 +410,22 @@
<language type="yi">इद्दिष्</language>
<language type="yo">यूरुबा</language>
<language type="yue">कांटोसी</language>
+ <language type="yue" alt="menu">चिनी, कॅण्टोनीस</language>
<language type="za">झ्हुन्ग</language>
- <language type="zgh">प्रमाणित मोरोक्कन तामाझायट</language>
+ <language type="zgh">प्रमाणीत मॉरोक्कन तमाझीट</language>
<language type="zh">चिनी</language>
+ <language type="zh" alt="menu">चिनी, मंडारीन</language>
<language type="zh_Hans">सोंपी चिनी</language>
+ <language type="zh_Hans" alt="long">सोंपी मंडारीन चिनी</language>
<language type="zh_Hant">पारंपारीक चिनी</language>
+ <language type="zh_Hant" alt="long">पारंपारीक मंडारीन चिनी</language>
<language type="zu">जुलू</language>
<language type="zun">झून</language>
<language type="zxx">अणकार सामुग्री ना</language>
<language type="zza">झाझा</language>
</languages>
<scripts>
- <script type="Arab">अरेबिक</script>
+ <script type="Arab">आरबी</script>
<script type="Armn">आर्मेनियन</script>
<script type="Beng">बांग्ला</script>
<script type="Bopo">बोपोमोफो</script>
@@ -432,9 +437,9 @@
<script type="Grek">ग्रीक</script>
<script type="Gujr">गुजराती</script>
<script type="Guru">गुरमुखी</script>
- <script type="Hanb">बोपोमोफो वांगडा हॅन</script>
+ <script type="Hanb">बोपोफोमो वरवीं हान</script>
<script type="Hang">हंगूल</script>
- <script type="Hani">हॅन</script>
+ <script type="Hani">हान</script>
<script type="Hans">सोंपी</script>
<script type="Hans" alt="stand-alone">सोंपी हॅन</script>
<script type="Hant">पारंपारीक</script>
@@ -444,8 +449,8 @@
<script type="Hrkt">जपानी अक्षरमाळ</script>
<script type="Jamo">जामो</script>
<script type="Jpan">जपानी</script>
- <script type="Kana">काटकाना</script>
- <script type="Khmr">कंबोडियन</script>
+ <script type="Kana">कटाकाना</script>
+ <script type="Khmr">खमेर</script>
<script type="Knda">कन्नड</script>
<script type="Kore">कोरियन</script>
<script type="Laoo">लाओ</script>
@@ -456,7 +461,7 @@
<script type="Orya">ओरिया</script>
<script type="Sinh">सिन्हाला</script>
<script type="Taml">तमीळ</script>
- <script type="Telu">तेलुगू</script>
+ <script type="Telu">तेलगू</script>
<script type="Thaa">थाणा</script>
<script type="Thai">थाई</script>
<script type="Tibt">तिबेटन</script>
@@ -790,7 +795,7 @@
<type key="calendar" type="chinese">चीनी दिनदर्शिका</type>
<type key="calendar" type="dangi">डांगी दिनदर्शिका</type>
<type key="calendar" type="ethiopic">इथियोपिक दिनदर्शिका</type>
- <type key="calendar" type="gregorian">ग्रेगोरियन दिनदर्शिका</type>
+ <type key="calendar" type="gregorian">ग्रेगोरियन कॅलेन्डर</type>
<type key="calendar" type="hebrew">हिब्रू दिनदर्शिका</type>
<type key="calendar" type="islamic">ईस्लामीक दिनदर्शिका</type>
<type key="calendar" type="iso8601">आयएसओ-8601 दिनदर्शिका</type>
@@ -854,7 +859,7 @@
<measurementSystemName type="US">युएस</measurementSystemName>
</measurementSystemNames>
<codePatterns>
- <codePattern type="language">भाशा: {0}</codePattern>
+ <codePattern type="language">भासः{0}</codePattern>
<codePattern type="script">लिपी: {0}</codePattern>
<codePattern type="territory">प्रांत: {0}</codePattern>
</codePatterns>
@@ -1114,8 +1119,8 @@
<month type="4">एप्रिल</month>
<month type="5">मे</month>
<month type="6">जून</month>
- <month type="7">जुलाय</month>
- <month type="8">आगोस्त</month>
+ <month type="7">जुलय</month>
+ <month type="8">ऑगस्ट</month>
<month type="9">सप्टेंबर</month>
<month type="10">ऑक्टोबर</month>
<month type="11">नोव्हेंबर</month>
@@ -1142,8 +1147,8 @@
<month type="4">एप्रिल</month>
<month type="5">मे</month>
<month type="6">जून</month>
- <month type="7">जुलाय</month>
- <month type="8">आगोस्त</month>
+ <month type="7">जुलय</month>
+ <month type="8">ऑगस्ट</month>
<month type="9">सप्टेंबर</month>
<month type="10">ऑक्टोबर</month>
<month type="11">नोव्हेंबर</month>
@@ -1152,18 +1157,18 @@
</monthContext>
<monthContext type="stand-alone">
<monthWidth type="abbreviated">
- <month type="1">जानेवारी</month>
- <month type="2">फेब्रुवारी</month>
+ <month type="1">जाने</month>
+ <month type="2">फेब्रु</month>
<month type="3">मार्च</month>
- <month type="4">एप्रिल</month>
+ <month type="4">एप्री</month>
<month type="5">मे</month>
<month type="6">जून</month>
- <month type="7">जुलाय</month>
- <month type="8">आगोस्त</month>
- <month type="9">सप्टेंबर</month>
- <month type="10">ऑक्टोबर</month>
- <month type="11">नोव्हेंबर</month>
- <month type="12">डिसेंबर</month>
+ <month type="7">जुल</month>
+ <month type="8">ऑग</month>
+ <month type="9">सप्टें</month>
+ <month type="10">ऑक्टो</month>
+ <month type="11">नो</month>
+ <month type="12">डिसे</month>
</monthWidth>
<monthWidth type="narrow">
<month type="1">1</month>
@@ -1185,9 +1190,9 @@
<month type="3">मार्च</month>
<month type="4">एप्रिल</month>
<month type="5">मे</month>
- <month type="6">जून</month>
- <month type="7">जुलाय</month>
- <month type="8">आगोस्त</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
<month type="9">सप्टेंबर</month>
<month type="10">ऑक्टोबर</month>
<month type="11">नोव्हेंबर</month>
@@ -1202,7 +1207,7 @@
<day type="mon">सोमार</day>
<day type="tue">मंगळार</day>
<day type="wed">बुधवार</day>
- <day type="thu">गुरुवार</day>
+ <day type="thu">↑↑↑</day>
<day type="fri">शुक्रार</day>
<day type="sat">शेनवार</day>
</dayWidth>
@@ -1211,7 +1216,7 @@
<day type="mon">सो</day>
<day type="tue">मं</day>
<day type="wed">बु</day>
- <day type="thu">गु</day>
+ <day type="thu">बि</day>
<day type="fri">शु</day>
<day type="sat">शे</day>
</dayWidth>
@@ -1220,7 +1225,7 @@
<day type="mon">सोम</day>
<day type="tue">मंगळ</day>
<day type="wed">बुध</day>
- <day type="thu">गुरु</day>
+ <day type="thu">बिरे</day>
<day type="fri">शुक्र</day>
<day type="sat">शेन</day>
</dayWidth>
@@ -1229,7 +1234,7 @@
<day type="mon">सोमार</day>
<day type="tue">मंगळार</day>
<day type="wed">बुधवार</day>
- <day type="thu">गुरुवार</day>
+ <day type="thu">बिरेस्तार</day>
<day type="fri">शुक्रार</day>
<day type="sat">शेनवार</day>
</dayWidth>
@@ -1240,7 +1245,7 @@
<day type="mon">सोमार</day>
<day type="tue">मंगळार</day>
<day type="wed">बुधवार</day>
- <day type="thu">गुरुवार</day>
+ <day type="thu">↑↑↑</day>
<day type="fri">शुक्रार</day>
<day type="sat">शेनवार</day>
</dayWidth>
@@ -1249,7 +1254,7 @@
<day type="mon">सो</day>
<day type="tue">मं</day>
<day type="wed">बु</day>
- <day type="thu">गु</day>
+ <day type="thu">ब</day>
<day type="fri">शु</day>
<day type="sat">शे</day>
</dayWidth>
@@ -1258,7 +1263,7 @@
<day type="mon">सोम</day>
<day type="tue">मंगळ</day>
<day type="wed">बुध</day>
- <day type="thu">गुरु</day>
+ <day type="thu">↑↑↑</day>
<day type="fri">शुक्र</day>
<day type="sat">शेन</day>
</dayWidth>
@@ -1267,7 +1272,7 @@
<day type="mon">सोमार</day>
<day type="tue">मंगळार</day>
<day type="wed">बुधवार</day>
- <day type="thu">गुरुवार</day>
+ <day type="thu">↑↑↑</day>
<day type="fri">शुक्रार</day>
<day type="sat">शेनवार</day>
</dayWidth>
@@ -1296,10 +1301,10 @@
</quarterContext>
<quarterContext type="stand-alone">
<quarterWidth type="abbreviated">
- <quarter type="1">Q1</quarter>
- <quarter type="2">Q2</quarter>
- <quarter type="3">Q3</quarter>
- <quarter type="4">Q4</quarter>
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
</quarterWidth>
<quarterWidth type="narrow">
<quarter type="1">1</quarter>
@@ -1308,10 +1313,10 @@
<quarter type="4">4</quarter>
</quarterWidth>
<quarterWidth type="wide">
- <quarter type="1">1लें त्रैमासीक</quarter>
- <quarter type="2">2रें त्रैमासीक</quarter>
- <quarter type="3">3रें त्रैमासीक</quarter>
- <quarter type="4">4थें त्रैमासीक</quarter>
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
</quarterWidth>
</quarterContext>
</quarters>
@@ -1463,11 +1468,11 @@
<dateFormatItem id="y">y</dateFormatItem>
<dateFormatItem id="yM">y-MM</dateFormatItem>
<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
- <dateFormatItem id="yMEd">y-MM-dd, E</dateFormatItem>
+ <dateFormatItem id="yMEd">d-M-y, E</dateFormatItem>
<dateFormatItem id="yMMM">y MMM</dateFormatItem>
<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
- <dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
<dateFormatItem id="yw" count="other">'week' w 'of' Y</dateFormatItem>
@@ -2159,7 +2164,7 @@
</relativeTime>
</field>
<field type="second-narrow">
- <displayName>सेकंद</displayName>
+ <displayName>↑↑↑</displayName>
<relativeTime type="future">
<relativeTimePattern count="other">{0} सेकंदानीं</relativeTimePattern>
</relativeTime>
@@ -3460,7 +3465,7 @@
<exemplarCity>अपिया</exemplarCity>
</zone>
<zone type="Asia/Aden">
- <exemplarCity>Aden</exemplarCity>
+ <exemplarCity>ऍडन</exemplarCity>
</zone>
<zone type="Indian/Mayotte">
<exemplarCity>मेयोट</exemplarCity>
@@ -3504,7 +3509,7 @@
<metazone type="Alaska">
<long>
<generic>अलास्का वेळ</generic>
- <standard>अलास्का प्रमाणित वेळ</standard>
+ <standard>अलास्का प्रमाणीत वेळ</standard>
<daylight>अलास्का डेलायट वेळ</daylight>
</long>
</metazone>
@@ -3723,7 +3728,7 @@
<metazone type="Cuba">
<long>
<generic>क्युबा वेळ</generic>
- <standard>क्युबा प्रमाणित वेळ</standard>
+ <standard>क्युबा प्रमाणीत वेळ</standard>
<daylight>क्युबा डेलायट वेळ</daylight>
</long>
</metazone>
@@ -3758,7 +3763,7 @@
<long>
<generic>मध्य युरोपियन वेळ</generic>
<standard>मध्य युरोपियन प्रमाणित वेळ</standard>
- <daylight>मध्य युवरोपियन ग्रीष्म वेळ</daylight>
+ <daylight>मध्य युरोपियन ग्रीष्म वेळ</daylight>
</long>
</metazone>
<metazone type="Europe_Eastern">
@@ -3828,20 +3833,20 @@
</metazone>
<metazone type="GMT">
<long>
- <standard>ग्रीनविच मध्यc वेळ</standard>
+ <standard>ग्रीनविच मध्य वेळ</standard>
</long>
</metazone>
<metazone type="Greenland_Eastern">
<long>
<generic>उदेंत ग्रीनलँड वेळ</generic>
- <standard>उदेंत ग्रीनलँड प्रमाणित वेळ</standard>
+ <standard>उदेंत ग्रीनलँड प्रमाणीत वेळ</standard>
<daylight>उदेंत ग्रीनलँड ग्रीष्म वेळ</daylight>
</long>
</metazone>
<metazone type="Greenland_Western">
<long>
<generic>अस्तंत ग्रीनलँड वेळ</generic>
- <standard>अस्तंत ग्रीनलँड प्रमाणित वेळ</standard>
+ <standard>अस्तंत ग्रीनलँड प्रमाणीत वेळ</standard>
<daylight>अस्तंत ग्रीनलँड ग्रीष्म वेळ</daylight>
</long>
</metazone>
@@ -3858,7 +3863,7 @@
<metazone type="Hawaii_Aleutian">
<long>
<generic>हवाई-अलेयुशिन वेळ</generic>
- <standard>हवाई-अलेयुशिन प्रमाणित वेळ</standard>
+ <standard>हवाई-अलेयुशिन प्रमाणीत वेळ</standard>
<daylight>हवाई-अलेयुशिन डेलायट वेळ</daylight>
</long>
</metazone>
@@ -4030,14 +4035,14 @@
<metazone type="Mexico_Northwest">
<long>
<generic>वायव्य मेक्सिको वेळ</generic>
- <standard>वायव्य मेक्सिको प्रमाणित वेळ</standard>
+ <standard>वायव्य मेक्सिको प्रमाणीत वेळ</standard>
<daylight>वायव्य मेक्सिको डेलायट वेळ</daylight>
</long>
</metazone>
<metazone type="Mexico_Pacific">
<long>
<generic>मेक्सिकन प्रशांत वेळ</generic>
- <standard>मेक्सिकन प्रशांत प्रमाणित वेळ</standard>
+ <standard>मेक्सिकन प्रशांत प्रमाणीत वेळ</standard>
<daylight>मेक्सिकन प्रशांत डेलायट वेळ</daylight>
</long>
</metazone>
@@ -4087,7 +4092,7 @@
<metazone type="Newfoundland">
<long>
<generic>न्युफावंडलँड वेळ</generic>
- <standard>न्युफावंडलँड प्रमाणित वेळ</standard>
+ <standard>न्युफावंडलँड प्रमाणीत वेळ</standard>
<daylight>न्युफावंडलँड डेलायट वेळ</daylight>
</long>
</metazone>
@@ -4098,7 +4103,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>नॉरफॉक आयलँड वेळ</standard>
+ <generic draft="contributed">नॉरफॉक आयलँड वेळ</generic>
+ <standard draft="contributed">नॉरफॉक आयलँड प्रमाणित वेळ</standard>
+ <daylight draft="contributed">नॉरफॉक आयलँड ग्रीष्म वेळ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4168,7 +4175,7 @@
<metazone type="Pierre_Miquelon">
<long>
<generic>सेंट पियर आनी मिकलान वेळ</generic>
- <standard>सेंट पियर आनी मिकलान प्रमाणित वेळ</standard>
+ <standard>सेंट पियर आनी मिकलान प्रमाणीत वेळ</standard>
<daylight>सेंट पियर आनी मिकलान डेलायट वेळ</daylight>
</long>
</metazone>
@@ -4615,7 +4622,7 @@
</currency>
<currency type="BWP">
<displayName>बोत्सवाना पुला</displayName>
- <displayName count="other">Vote बोत्सवाना पुलास</displayName>
+ <displayName count="other">बोत्सवाना पुलास</displayName>
<symbol draft="contributed">BWP</symbol>
<symbol alt="narrow" draft="contributed">P</symbol>
</currency>
@@ -4844,7 +4851,7 @@
</currency>
<currency type="INR">
<displayName>भारतीय रुपया</displayName>
- <displayName count="other">भारतीय रुपया</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">₹</symbol>
<symbol alt="narrow" draft="contributed">₹</symbol>
</currency>
@@ -5367,7 +5374,7 @@
</currency>
</currencies>
<miscPatterns numberSystem="latn">
- <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="approximately">~{0}</pattern>
<pattern type="atLeast">{0}+</pattern>
<pattern type="atMost">≤{0}</pattern>
<pattern type="range">{0}–{1}</pattern>
@@ -5379,8 +5386,76 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेसी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सँटी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मिली{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>मायक्रो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅनो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पिको{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फॅम्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ऑटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जॅप्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यॉक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डॅका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हॅक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>किलो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मॅगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गिगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टेरा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ऍक्सा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झॅटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
- <compoundUnitPattern>↑↑↑</compoundUnitPattern>
+ <compoundUnitPattern>{1} क {0}</compoundUnitPattern>
+ </compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>चवकोण {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">चवकोण {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>घनाकार {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">घनाकार {0}</compoundUnitPattern1>
</compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
@@ -5389,7 +5464,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मी/से²</displayName>
<unitPattern count="other">{0} मी/से²</unitPattern>
</unit>
@@ -5470,7 +5545,7 @@
<displayName>मिलिमोल्स/लि</displayName>
<unitPattern count="other">{0} मिलिमोल्स/लि</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5494,7 +5569,7 @@
<displayName>लिटर/किलोमीटर</displayName>
<unitPattern count="other">{0} लिटर/किलोमीटर</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लिटर/100किलोमीटर</displayName>
<unitPattern count="other">{0} लिटर/100किलोमीटर</unitPattern>
</unit>
@@ -5855,8 +5930,8 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="power-gigawatt">
- <displayName>↑↑↑</displayName>
- <unitPattern count="other">↑↑↑</unitPattern>
+ <displayName>गिगावॉट्स</displayName>
+ <unitPattern count="other">{0} गिगावॉट्स</unitPattern>
</unit>
<unit type="power-megawatt">
<displayName>मेगावॅट</displayName>
@@ -5878,15 +5953,15 @@
<displayName>हॉर्सपावर</displayName>
<unitPattern count="other">{0} हॉर्सपावर</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5950,7 +6025,7 @@
<displayName>केल्वीन</displayName>
<unitPattern count="other">{0} केल्वीन</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6076,9 +6151,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सँ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यॉ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>यो{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6086,7 +6229,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मी/से²</displayName>
<unitPattern count="other">{0} मी/से²</unitPattern>
</unit>
@@ -6167,7 +6310,7 @@
<displayName>मिमो/लि</displayName>
<unitPattern count="other">{0} मिमो/लि</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -6191,7 +6334,7 @@
<displayName>लि/किमी</displayName>
<unitPattern count="other">{0} लि/किमी</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लि/100किमी</displayName>
<unitPattern count="other">{0} लि/100किमी</unitPattern>
</unit>
@@ -6575,15 +6718,15 @@
<displayName>हॉर्सपावर</displayName>
<unitPattern count="other">{0} हॉर्सपावर</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -6647,7 +6790,7 @@
<displayName>के</displayName>
<unitPattern count="other">{0} के</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
</unit>
@@ -6773,9 +6916,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सँ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यॉ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>यो {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6783,7 +6994,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6902,7 +7113,7 @@
<listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">↑↑↑</listPatternPart>
<listPatternPart type="end">↑↑↑</listPatternPart>
- <listPatternPart type="2">↑↑↑</listPatternPart>
+ <listPatternPart type="2">{0}, {1}</listPatternPart>
</listPattern>
<listPattern type="standard-short">
<listPatternPart type="start">↑↑↑</listPatternPart>
@@ -6966,7 +7177,7 @@
<characterLabel type="downwards_arrows">सकयल दर्शोवपी बाण</characterLabel>
<characterLabel type="downwards_upwards_arrows">सकयल वयर दर्शोवपी बाण</characterLabel>
<characterLabel type="east_asian_scripts">उदेंत आशियाई लिपी</characterLabel>
- <characterLabel type="emoji">↑↑↑</characterLabel>
+ <characterLabel type="emoji">इमोजी</characterLabel>
<characterLabel type="european_scripts">युरोपियन लिपी</characterLabel>
<characterLabel type="female">बायल</characterLabel>
<characterLabel type="flag">बावटो</characterLabel>
@@ -7001,11 +7212,11 @@
<characterLabel type="modifier">मॉडिफायर</characterLabel>
<characterLabel type="musical_symbols">संगिताचें चिन्न</characterLabel>
<characterLabel type="nature">सैम</characterLabel>
- <characterLabel type="nonspacing">सुवातना</characterLabel>
+ <characterLabel type="nonspacing">सुवात ना</characterLabel>
<characterLabel type="numbers">आंकडे</characterLabel>
<characterLabel type="objects">ऑब्जॅक्ट</characterLabel>
<characterLabel type="other">हेर</characterLabel>
- <characterLabel type="paired">जोडी लायिल्लें</characterLabel>
+ <characterLabel type="paired">जोडी</characterLabel>
<characterLabel type="person">व्यक्ती</characterLabel>
<characterLabel type="phonetic_alphabet">फोनेटिक अक्षर</characterLabel>
<characterLabel type="pictographs">पिक्टोग्राफ</characterLabel>
@@ -7017,20 +7228,20 @@
<characterLabel type="small_form_variant">ल्हान वेरीयंट</characterLabel>
<characterLabel type="smiley">स्मायली</characterLabel>
<characterLabel type="smileys_people">स्मायली वा व्यक्ती</characterLabel>
- <characterLabel type="south_asian_scripts">दक्षिण आशियाई लिपी</characterLabel>
+ <characterLabel type="south_asian_scripts">दक्षीण आशियायी लिपी</characterLabel>
<characterLabel type="southeast_asian_scripts">आग्नेय आशियाई लिपी</characterLabel>
<characterLabel type="spacing">सुवात घेवप</characterLabel>
- <characterLabel type="sport">क्रिडा</characterLabel>
- <characterLabel type="symbols">कुरू</characterLabel>
- <characterLabel type="technical_symbols">तांत्रिक कुरू</characterLabel>
+ <characterLabel type="sport">खेळ</characterLabel>
+ <characterLabel type="symbols">चिन्न</characterLabel>
+ <characterLabel type="technical_symbols">तांत्रीक चिन्न</characterLabel>
<characterLabel type="tone_marks">स्वर खूण</characterLabel>
- <characterLabel type="travel">भोंवडी</characterLabel>
- <characterLabel type="travel_places">भोंवडी वा सुवात</characterLabel>
+ <characterLabel type="travel">प्रवास</characterLabel>
+ <characterLabel type="travel_places">प्रवास वा ठिकाण</characterLabel>
<characterLabel type="upwards_arrows">वयर दर्शोवपी बाण</characterLabel>
<characterLabel type="variant_forms">वेरीयंट</characterLabel>
<characterLabel type="vocalic_jamo">स्वरयुक्त जामो</characterLabel>
<characterLabel type="weather">हवामान</characterLabel>
- <characterLabel type="western_asian_scripts">अस्तंत आशियाई लिपी</characterLabel>
+ <characterLabel type="western_asian_scripts">पश्चिमी आशियायी लिपी</characterLabel>
<characterLabel type="whitespace">धवीसुवात</characterLabel>
</characterLabels>
<typographicNames>
diff --git a/common/main/kok_IN.xml b/common/main/kok_IN.xml
index 709b41a..5323481 100644
--- a/common/main/kok_IN.xml
+++ b/common/main/kok_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ks.xml b/common/main/ks.xml
index 12e20b7..54616c6 100644
--- a/common/main/ks.xml
+++ b/common/main/ks.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -455,6 +455,7 @@
</languages>
<scripts>
<script type="Arab">اَربی</script>
+ <script type="Aran" draft="contributed">نستعلیق</script>
<script type="Armn">اَرمانیَن</script>
<script type="Avst">اَویستَن</script>
<script type="Bali">بالَنیٖز</script>
@@ -3013,7 +3014,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>نورفعاک ٹایِم</standard>
+ <generic draft="contributed">نورفعاک ٹایِم</generic>
+ <standard draft="contributed">نورفعاک سٹینڑاڑ ٹایِم</standard>
+ <daylight draft="contributed">نورفعاک سَمَر ٹایِم</daylight>
</long>
</metazone>
<metazone type="Noronha">
diff --git a/common/main/ks_IN.xml b/common/main/ks_Arab.xml
similarity index 87%
copy from common/main/ks_IN.xml
copy to common/main/ks_Arab.xml
index e3540e2..d043b7d 100644
--- a/common/main/ks_IN.xml
+++ b/common/main/ks_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,6 @@
<identity>
<version number="$Revision$"/>
<language type="ks"/>
- <territory type="IN"/>
+ <script type="Arab"/>
</identity>
</ldml>
diff --git a/common/main/ks_IN.xml b/common/main/ks_Arab_IN.xml
similarity index 87%
rename from common/main/ks_IN.xml
rename to common/main/ks_Arab_IN.xml
index e3540e2..7c4fdb1 100644
--- a/common/main/ks_IN.xml
+++ b/common/main/ks_Arab_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,7 @@
<identity>
<version number="$Revision$"/>
<language type="ks"/>
+ <script type="Arab"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/common/main/ksb.xml b/common/main/ksb.xml
index db731ab..a95d1de 100644
--- a/common/main/ksb.xml
+++ b/common/main/ksb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ksb_TZ.xml b/common/main/ksb_TZ.xml
index fddd888..579175e 100644
--- a/common/main/ksb_TZ.xml
+++ b/common/main/ksb_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ksf.xml b/common/main/ksf.xml
index aa1ce94..5ae0d13 100644
--- a/common/main/ksf.xml
+++ b/common/main/ksf.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ksf_CM.xml b/common/main/ksf_CM.xml
index 874b048..fc129ad 100644
--- a/common/main/ksf_CM.xml
+++ b/common/main/ksf_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ksh.xml b/common/main/ksh.xml
index 3158291..90d1938 100644
--- a/common/main/ksh.xml
+++ b/common/main/ksh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2809,7 +2809,7 @@
<unitPattern count="one" draft="contributed">{0} Pferdestärke</unitPattern>
<unitPattern count="other" draft="contributed">{0} Pferdestärken</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">Dumm Quecksilbersäule</displayName>
<unitPattern count="zero" draft="contributed">{0} Dumm Quecksilbersäule</unitPattern>
<unitPattern count="one" draft="contributed">{0} Dumm Quecksilbersäule</unitPattern>
@@ -3087,7 +3087,7 @@
<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">Dumm Quecksilbersäule</displayName>
<unitPattern count="zero">{0} inHg</unitPattern>
<unitPattern count="one">{0} inHg</unitPattern>
@@ -3318,7 +3318,7 @@
<unitPattern count="one" draft="contributed">{0}PS</unitPattern>
<unitPattern count="other" draft="contributed">{0}PS</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="zero">{0} inHg</unitPattern>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
diff --git a/common/main/ksh_DE.xml b/common/main/ksh_DE.xml
index 7020438..caaadda 100644
--- a/common/main/ksh_DE.xml
+++ b/common/main/ksh_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ku.xml b/common/main/ku.xml
index 8eec67e..0159357 100644
--- a/common/main/ku.xml
+++ b/common/main/ku.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -48,7 +48,6 @@
<language type="br">bretonî</language>
<language type="bs">bosnî</language>
<language type="bug">bugî</language>
- <language type="byn">byn</language>
<language type="ca">katalanî</language>
<language type="ce">çeçenî</language>
<language type="ceb">sebwanoyî</language>
@@ -99,7 +98,6 @@
<language type="fy">frîsî</language>
<language type="ga">îrî</language>
<language type="gd">gaelîka skotî</language>
- <language type="gez">gez</language>
<language type="gil">kîrîbatî</language>
<language type="gl">galîsî</language>
<language type="gn">guwaranî</language>
@@ -452,7 +450,6 @@
<territory type="MC">Monako</territory>
<territory type="MD">Moldova</territory>
<territory type="ME">Montenegro</territory>
- <territory type="MF">MF</territory>
<territory type="MG">Madagaskar</territory>
<territory type="MH">Giravên Marşal</territory>
<territory type="MK">Makedonya</territory>
@@ -1363,7 +1360,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -1439,7 +1436,7 @@
<unitPattern count="one">%{0}</unitPattern>
<unitPattern count="other">%{0}</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
diff --git a/common/main/ku_TR.xml b/common/main/ku_TR.xml
index 2c2cec8..755cb0b 100644
--- a/common/main/ku_TR.xml
+++ b/common/main/ku_TR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kw.xml b/common/main/kw.xml
index e0a86c6..69de95d 100644
--- a/common/main/kw.xml
+++ b/common/main/kw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/kw_GB.xml b/common/main/kw_GB.xml
index a247ac8..7a88d11 100644
--- a/common/main/kw_GB.xml
+++ b/common/main/kw_GB.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ky.xml b/common/main/ky.xml
index 77309e6..5fae834 100644
--- a/common/main/ky.xml
+++ b/common/main/ky.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="eu">баскча</language>
<language type="ewo">эвондочо</language>
<language type="fa">фарсча</language>
+ <language type="fa_AF" draft="contributed">дари</language>
<language type="ff">фулача</language>
<language type="fi">финче</language>
<language type="fil">филипинче</language>
@@ -268,7 +269,6 @@
<language type="myv">эрзянча</language>
<language type="mzn">мазандераниче</language>
<language type="na">науруча</language>
- <language type="nan">nan</language>
<language type="nap">неополитанча</language>
<language type="naq">намача</language>
<language type="nb">норвежче (букмал)</language>
@@ -410,7 +410,6 @@
<language type="war">варайча</language>
<language type="wbp">ворлпириче</language>
<language type="wo">уолофчо</language>
- <language type="wuu">wuu</language>
<language type="xal">калмыкча</language>
<language type="xh">косача</language>
<language type="xog">согача</language>
@@ -4293,7 +4292,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк убактысы</standard>
+ <generic draft="contributed">Норфолк убактысы</generic>
+ <standard draft="contributed">Норфолк кышкы убактысы</standard>
+ <daylight draft="contributed">Норфолк жайкы убактысы</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4887,9 +4888,9 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName>Кытай юаны (офшор)</displayName>
+ <displayName count="one">Кытай юаны (офшор)</displayName>
+ <displayName count="other">Кытай юаны (офшор)</displayName>
</currency>
<currency type="CNY">
<displayName>Кытай юаны</displayName>
@@ -5680,9 +5681,9 @@
<symbol alt="narrow" draft="contributed">Bs</symbol>
</currency>
<currency type="VES">
- <displayName>VES</displayName>
- <displayName count="one">VES</displayName>
- <displayName count="other">VES</displayName>
+ <displayName>Венесуэла боливары</displayName>
+ <displayName count="one">Венесуэла боливары</displayName>
+ <displayName count="other">Венесуэла боливары</displayName>
</currency>
<currency type="VND">
<displayName>Вьетнам доңу</displayName>
@@ -5768,9 +5769,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>центи{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>милли{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>атто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>йокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>гекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>экза{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зетта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>йотта{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>чарчы {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">чарчы {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">чарчы {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубик {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кубик {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кубик {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5779,7 +5850,7 @@
<unitPattern count="one">{0} оордук күчү</unitPattern>
<unitPattern count="other">{0} оордук күчү</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>квадраттык секундасына метр</displayName>
<unitPattern count="one">квадраттык секундасына {0} метр</unitPattern>
<unitPattern count="other">квадраттык секундасына {0} метр</unitPattern>
@@ -5879,7 +5950,7 @@
<unitPattern count="one">литрине {0} миллимоль</unitPattern>
<unitPattern count="other">литрине {0} миллимоль</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>миллионго бөлүктөр</displayName>
<unitPattern count="one">миллионго {0} бөлүк</unitPattern>
<unitPattern count="other">миллионго {0} бөлүк</unitPattern>
@@ -5909,7 +5980,7 @@
<unitPattern count="one">километрине {0} литр</unitPattern>
<unitPattern count="other">километрине {0} литр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 километрге литр</displayName>
<unitPattern count="one">100 километрге {0} литр</unitPattern>
<unitPattern count="other">100 километрге {0} литр</unitPattern>
@@ -6385,17 +6456,17 @@
<unitPattern count="one">{0} аттын күчү</unitPattern>
<unitPattern count="other">{0} аттын күчү</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>миллиметр сымап мамычасы</displayName>
<unitPattern count="one">{0} миллиметр сымап мамычасы</unitPattern>
<unitPattern count="other">{0} миллиметр сымап мамычасы</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>чарчы дюймга фунт</displayName>
<unitPattern count="one">чарчы дюймга {0} фунт</unitPattern>
<unitPattern count="other">чарчы дюймга {0} фунт</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйм сымап мамычасы</displayName>
<unitPattern count="one">{0} дюйм сымап мамычасы</unitPattern>
<unitPattern count="other">{0} дюйм сымап мамычасы</unitPattern>
@@ -6475,7 +6546,7 @@
<unitPattern count="one">{0} Келвин градусу</unitPattern>
<unitPattern count="other">{0} Келвин градусу</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -6629,9 +6700,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ц{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6640,7 +6781,7 @@
<unitPattern count="one">{0} о.к.</unitPattern>
<unitPattern count="other">{0} о.к.</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метр/сек²</displayName>
<unitPattern count="one">{0} м/сек²</unitPattern>
<unitPattern count="other">{0} м/сек²</unitPattern>
@@ -6740,7 +6881,7 @@
<unitPattern count="one">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>миллионго/бөлүк</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6770,7 +6911,7 @@
<unitPattern count="one">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 км/л</displayName>
<unitPattern count="one">{0} л/100км</unitPattern>
<unitPattern count="other">{0} л/100км</unitPattern>
@@ -7246,17 +7387,17 @@
<unitPattern count="one">{0} а.к.</unitPattern>
<unitPattern count="other">{0} а.к.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм.с.м.</displayName>
<unitPattern count="one">{0} мм.с. м.</unitPattern>
<unitPattern count="other">{0} мм.с. м.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фчд</displayName>
<unitPattern count="one">{0} фчд</unitPattern>
<unitPattern count="other">{0} фчд</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйм сымап мамычасы</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7336,7 +7477,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7490,9 +7631,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ц{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7541,7 +7752,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 км/л</displayName>
<unitPattern count="one">{0} л/100км</unitPattern>
<unitPattern count="other">{0} л/100км</unitPattern>
@@ -7660,7 +7871,7 @@
<unitPattern count="one">{0} ат</unitPattern>
<unitPattern count="other">{0} ат</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -7741,6 +7952,7 @@
<listPattern type="or-narrow">
<listPatternPart type="start" draft="contributed">↑↑↑</listPatternPart>
<listPatternPart type="middle" draft="contributed">↑↑↑</listPatternPart>
+ <listPatternPart type="end" draft="contributed">↑↑↑</listPatternPart>
<listPatternPart type="2" draft="contributed">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="or-short">
diff --git a/common/main/ky_KG.xml b/common/main/ky_KG.xml
index ebd67bd..488ae00 100644
--- a/common/main/ky_KG.xml
+++ b/common/main/ky_KG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lag.xml b/common/main/lag.xml
index 3169e20..e759b33 100644
--- a/common/main/lag.xml
+++ b/common/main/lag.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lag_TZ.xml b/common/main/lag_TZ.xml
index 12da312..5cb95a9 100644
--- a/common/main/lag_TZ.xml
+++ b/common/main/lag_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lb.xml b/common/main/lb.xml
index 649cef2..6afd70f 100644
--- a/common/main/lb.xml
+++ b/common/main/lb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -399,7 +399,6 @@
<language type="nb">Norwegesch Bokmål</language>
<language type="nd">Nord-Ndebele-Sprooch</language>
<language type="nds">Nidderdäitsch</language>
- <language type="nds_NL">nds_NL</language>
<language type="ne">Nepalesesch</language>
<language type="new">Newari</language>
<language type="ng">Ndonga</language>
@@ -633,7 +632,6 @@
</languages>
<scripts>
<script type="Arab">Arabesch</script>
- <script type="Armi">Armi</script>
<script type="Armn">Armenesch</script>
<script type="Avst">Avestesch</script>
<script type="Bali">Balinesesch</script>
@@ -647,7 +645,6 @@
<script type="Buhd">Buhid</script>
<script type="Cans">UCAS</script>
<script type="Cari">Karesch</script>
- <script type="Cham">Cham</script>
<script type="Cher">Cherokee</script>
<script type="Cirt">Cirth</script>
<script type="Copt">Koptesch</script>
@@ -3300,7 +3297,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkinselen-Zäit</standard>
+ <generic draft="contributed">Norfolkinselen-Zäit</generic>
+ <standard draft="contributed">Norfolkinselen-Normalzäit</standard>
+ <daylight draft="contributed">Norfolkinselen-Summerzäit</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5159,7 +5158,7 @@
<unitPattern count="one">{0}-fach Äerdacceleratioun</unitPattern>
<unitPattern count="other">{0}-fach Äerdacceleratioun</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>Meter pro Quadratsekonn</displayName>
<unitPattern count="one">{0} Meter pro Quadratsekonn</unitPattern>
<unitPattern count="other">{0} Meter pro Quadratsekonn</unitPattern>
@@ -5591,17 +5590,17 @@
<unitPattern count="one">{0} Päerdsstäerkt</unitPattern>
<unitPattern count="other">{0} Päerdsstäerkten</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} Zoll Quecksëlwersail</unitPattern>
<unitPattern count="other">{0} Zoll Quecksëlwersail</unitPattern>
@@ -5763,7 +5762,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6200,17 +6199,17 @@
<unitPattern count="one">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -6371,7 +6370,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -6596,15 +6595,15 @@
<unitPattern count="one">{0} PS</unitPattern>
<unitPattern count="other">{0} PS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/lb_LU.xml b/common/main/lb_LU.xml
index a7466be..5017dbe 100644
--- a/common/main/lb_LU.xml
+++ b/common/main/lb_LU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lg.xml b/common/main/lg.xml
index d648fb5..1a7bce7 100644
--- a/common/main/lg.xml
+++ b/common/main/lg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Molodova</territory>
<territory type="MG">Madagasika</territory>
<territory type="MH">Bizinga bya Mariso</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanima</territory>
<territory type="MN">Mongoliya</territory>
diff --git a/common/main/lg_UG.xml b/common/main/lg_UG.xml
index dce9434..83f2c75 100644
--- a/common/main/lg_UG.xml
+++ b/common/main/lg_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lkt.xml b/common/main/lkt.xml
index b54bcc6..a3884fd 100644
--- a/common/main/lkt.xml
+++ b/common/main/lkt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lkt_US.xml b/common/main/lkt_US.xml
index 12ee099..408cb6d 100644
--- a/common/main/lkt_US.xml
+++ b/common/main/lkt_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ln.xml b/common/main/ln.xml
index 496b0b8..80aa5b1 100644
--- a/common/main/ln.xml
+++ b/common/main/ln.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -252,7 +252,6 @@
<territory type="MF" draft="unconfirmed">Sántu Martin</territory>
<territory type="MG">Madagasikari</territory>
<territory type="MH">Bisanga bya Marishalɛ</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Malí</territory>
<territory type="MM">Birmanie</territory>
<territory type="MN">Mongolí</territory>
diff --git a/common/main/ln_AO.xml b/common/main/ln_AO.xml
index 89d44f8..7bf1000 100644
--- a/common/main/ln_AO.xml
+++ b/common/main/ln_AO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ln_CD.xml b/common/main/ln_CD.xml
index f37ff1e..e0768fc 100644
--- a/common/main/ln_CD.xml
+++ b/common/main/ln_CD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ln_CF.xml b/common/main/ln_CF.xml
index c12fcad..42a000a 100644
--- a/common/main/ln_CF.xml
+++ b/common/main/ln_CF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ln_CG.xml b/common/main/ln_CG.xml
index 102b3ca..398b159 100644
--- a/common/main/ln_CG.xml
+++ b/common/main/ln_CG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lo.xml b/common/main/lo.xml
index a484dc7..25081a3 100644
--- a/common/main/lo.xml
+++ b/common/main/lo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -89,7 +89,7 @@
<language type="car">ຄາຣິບ</language>
<language type="cay">ຄາຢູກາ</language>
<language type="cch">ອາດແຊມ</language>
- <language type="ccp" draft="provisional">Chakma</language>
+ <language type="ccp">Chakma</language>
<language type="ce">ຊີເຄນ</language>
<language type="ceb">ຊີບູໂນ</language>
<language type="cgg">ຊີກາ</language>
@@ -159,6 +159,7 @@
<language type="eu">ບັສກີ</language>
<language type="ewo">ອີວອນດູ</language>
<language type="fa">ເປີຊຽນ</language>
+ <language type="fa_AF">ດາຣີ</language>
<language type="fan">ແຟງ</language>
<language type="fat">ແຟນຕີ</language>
<language type="ff">ຟູລາ</language>
@@ -535,7 +536,7 @@
<language type="yi">ຢິວ</language>
<language type="yo">ໂຢຣູບາ</language>
<language type="yue">ກວາງຕຸ້ງ</language>
- <language type="yue" alt="menu" draft="provisional">ພາສາຈີນ, ຈີກວາງຕຸ້ງ</language>
+ <language type="yue" alt="menu">ພາສາຈີນ, ຈີກວາງຕຸ້ງ</language>
<language type="za">ຊວາງ</language>
<language type="zap">ຊາໂປແຕບ</language>
<language type="zbl">ສັນຍາລັກບລີຊິມ</language>
@@ -1015,8 +1016,8 @@
<territory type="VU">ວານົວຕູ</territory>
<territory type="WF">ວາລລິສ ແລະ ຟູຕູນາ</territory>
<territory type="WS">ຊາມົວ</territory>
- <territory type="XA" draft="provisional">Pseudo-Accents</territory>
- <territory type="XB" draft="provisional">Pseudo-Bidi</territory>
+ <territory type="XA">Pseudo-Accents</territory>
+ <territory type="XB">Pseudo-Bidi</territory>
<territory type="XK">ໂຄໂຊໂວ</territory>
<territory type="YE">ເຢເມນ</territory>
<territory type="YT">ມາຢັອດ</territory>
@@ -1787,27 +1788,27 @@
<greatestDifference id="y">GGGGG d/M/y – d/M/y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
- <greatestDifference id="d" draft="provisional">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
- <greatestDifference id="G" draft="provisional">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
- <greatestDifference id="M" draft="provisional">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
- <greatestDifference id="y" draft="provisional">↑↑↑</greatestDifference>
+ <greatestDifference id="d">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
+ <greatestDifference id="G">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
+ <greatestDifference id="M">E, d/M GGGGG y – E, d/M GGGGG y</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
- <greatestDifference id="G" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="M" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="y" draft="provisional">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMd">
- <greatestDifference id="d" draft="provisional">↑↑↑</greatestDifference>
- <greatestDifference id="G" draft="provisional">d MMM G y– d MMM G y</greatestDifference>
- <greatestDifference id="M" draft="provisional">d MMM – d MMM G y</greatestDifference>
- <greatestDifference id="y" draft="provisional">d MMM G y– d MMM G y</greatestDifference>
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">d MMM G y– d MMM G y</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM G y</greatestDifference>
+ <greatestDifference id="y">d MMM G y– d MMM G y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMEd">
- <greatestDifference id="d" draft="provisional">E, d MMM – E, d MMM G y</greatestDifference>
- <greatestDifference id="G" draft="provisional">E, d MMM G y – E, d MMM G y</greatestDifference>
- <greatestDifference id="M" draft="provisional">E, d MMM – E, d MMM G y</greatestDifference>
- <greatestDifference id="y" draft="provisional">E, d MMM G y – E, d MMM G y</greatestDifference>
+ <greatestDifference id="d">E, d MMM – E, d MMM G y</greatestDifference>
+ <greatestDifference id="G">E, d MMM G y – E, d MMM G y</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM G y</greatestDifference>
+ <greatestDifference id="y">E, d MMM G y – E, d MMM G y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">h a – h a</greatestDifference>
@@ -5654,7 +5655,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ເວລາເກາະນໍຟອລ໌ກ</standard>
+ <generic draft="contributed">ເວລາເກາະນໍຟອລ໌ກ</generic>
+ <standard draft="contributed">ເວລາມາດຕະຖານເກາະນໍຟອລ໌ກ</standard>
+ <daylight draft="contributed">ເວລາລະດູຮ້ອນເກາະນໍຟອລ໌ກ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7379,9 +7382,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ເດຊີ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ຊັງຕີ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ມິນລິ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ໄມໂຄຣ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ນາໂນ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ປິໂກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ເຟມໂຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ອັດໂຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ເຊັບໂຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ຢັອກໂຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ເດກາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ເຮັກໂຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ກິໂລ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ເມກາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ກິກາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ເທຣາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ເພຕາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ເອັກຊາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ເຊັດຕາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ຢັອດຕາ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ຕໍ່ {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ຕາ{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ຕາ{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} ແມັດກ້ອນ</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}ກ້ອນ</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7389,7 +7460,7 @@
<displayName>ແຮງຕົກຕາມລຳພັງ</displayName>
<unitPattern count="other">{0} ແຮງຕົກຕາມລຳພັງ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -7470,7 +7541,7 @@
<displayName>ມິລິໂມລຕໍ່ລິດ</displayName>
<unitPattern count="other">{0} ມິລິໂມລຕໍ່ລິດ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ພາດຕໍ່ລ້ານ</displayName>
<unitPattern count="other">{0} ພາດຕໍ່ລ້ານ</unitPattern>
</unit>
@@ -7494,7 +7565,7 @@
<displayName>ລ/ກມ</displayName>
<unitPattern count="other">{0} ລິດຕໍ່ກິໂລແມັດ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ລິດ ຕໍ່ 100 ກິໂລເເມັດ</displayName>
<unitPattern count="other">{0} ລິດຕໍ່ 100 ກີໂລແມັດ</unitPattern>
</unit>
@@ -7878,15 +7949,15 @@
<displayName>ແຮງມ້າ</displayName>
<unitPattern count="other">{0} ແຮງມ້າ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pounds per square inch</displayName>
<unitPattern count="other">{0} pounds per square inch</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="other">{0} inches of mercury</unitPattern>
</unit>
@@ -7950,7 +8021,7 @@
<displayName>ອົງສາເຄວິນ</displayName>
<unitPattern count="other">{0} ອົງສາເຄວິນ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ປອນ-ຟຸດ</displayName>
<unitPattern count="other">{0} ປອນ-ຟຸດ</unitPattern>
</unit>
@@ -8076,9 +8147,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ດຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ຊມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ມມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ມຄ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ນນ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ປກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ຟຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ອຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ຊຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ຢຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ດກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ຮຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ກມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ມກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ກກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ທຣ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ເພຕາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ອຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ຢ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8086,7 +8225,7 @@
<displayName>ແຮງຕົກຕາມລຳພັງ</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -8167,7 +8306,7 @@
<displayName>ມິລິໂມນ/ລິດ</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ພາດ/ລ້ານ</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -8191,7 +8330,7 @@
<displayName>ລ/ກມ</displayName>
<unitPattern count="other">{0} ລ/ກມ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ລ/ 100 ກມ</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -8575,15 +8714,15 @@
<displayName>ແຮງມ້າ</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="other">{0} in Hg</unitPattern>
</unit>
@@ -8647,7 +8786,7 @@
<displayName>ອົງສາ ເຄ.</displayName>
<unitPattern count="other">{0}°K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -8773,9 +8912,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ດຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ຊມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ມມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ມຄ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ນນ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ປກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ຟຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ອຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ຊຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ຢຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ດກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ຮຕ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ກມ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ມກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ກກ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ທຣ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ເພຕາ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ອຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ຊ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ຢ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8812,7 +9019,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ລ/ 100 ກມ</displayName>
<unitPattern count="other">{0} ລ / 100 ກມ</unitPattern>
</unit>
@@ -8911,7 +9118,7 @@
<unit type="power-horsepower">
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="other">{0} in Hg</unitPattern>
</unit>
@@ -8985,13 +9192,13 @@
<listPattern type="or-narrow">
<listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">↑↑↑</listPatternPart>
- <listPatternPart type="end" draft="provisional">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
<listPatternPart type="2">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="or-short">
<listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">↑↑↑</listPatternPart>
- <listPatternPart type="end" draft="provisional">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
<listPatternPart type="2">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="standard-narrow">
diff --git a/common/main/lo_LA.xml b/common/main/lo_LA.xml
index b0fabb7..e9cfd52 100644
--- a/common/main/lo_LA.xml
+++ b/common/main/lo_LA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lrc.xml b/common/main/lrc.xml
index 853bb21..8fd8160 100644
--- a/common/main/lrc.xml
+++ b/common/main/lrc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -885,8 +885,6 @@
<symbol alt="narrow" draft="contributed">₽</symbol>
</currency>
<currency type="USD">
- <displayName>USD</displayName>
- <displayName count="other">USD</displayName>
<symbol draft="contributed">US$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
diff --git a/common/main/lrc_IQ.xml b/common/main/lrc_IQ.xml
index b1665e4..cb9d49c 100644
--- a/common/main/lrc_IQ.xml
+++ b/common/main/lrc_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lrc_IR.xml b/common/main/lrc_IR.xml
index 3968677..db3c4c3 100644
--- a/common/main/lrc_IR.xml
+++ b/common/main/lrc_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lt.xml b/common/main/lt.xml
index a7b5996..62055d3 100644
--- a/common/main/lt.xml
+++ b/common/main/lt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -181,6 +181,7 @@
<language type="ewo">evondo</language>
<language type="ext">ispanų kalbos Ekstremadūros tarmė</language>
<language type="fa">persų</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">fangų</language>
<language type="fat">fanti</language>
<language type="ff">fulahų</language>
@@ -1114,8 +1115,8 @@
<territory type="VU">Vanuatu</territory>
<territory type="WF">Volisas ir Futūna</territory>
<territory type="WS">Samoa</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">pseudo A</territory>
+ <territory type="XB">pseudo B</territory>
<territory type="XK">Kosovas</territory>
<territory type="YE">Jemenas</territory>
<territory type="YT">Majotas</territory>
@@ -6719,7 +6720,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolko Salų laikas</standard>
+ <generic draft="contributed">Norfolko Salų laikas</generic>
+ <standard draft="contributed">Norfolko Salų žiemos laikas</standard>
+ <daylight draft="contributed">Norfolko Salų vasaros laikas</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -9595,9 +9598,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kub. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9608,7 +9685,7 @@
<unitPattern count="many">{0} laisvojo kritimo pagreičio</unitPattern>
<unitPattern count="other">{0} laisvojo kritimo pagreičių</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metrai per kvadratinę sekundę</displayName>
<unitPattern count="one">{0} metras per kvadratinę sekundę</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -9746,7 +9823,7 @@
<unitPattern count="many">{0} milimoliai litre</unitPattern>
<unitPattern count="other">{0} milimolių litre</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milijoninės dalys</displayName>
<unitPattern count="one">{0} milijoninė dalis</unitPattern>
<unitPattern count="few">{0} milijoninės dalys</unitPattern>
@@ -9788,7 +9865,7 @@
<unitPattern count="many">{0} litro kilometrui</unitPattern>
<unitPattern count="other">{0} litrų kilometrui</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litrai 100 kilometrų</displayName>
<unitPattern count="one">{0} litras 100 kilometrų</unitPattern>
<unitPattern count="few">{0} litrai 100 kilometrų</unitPattern>
@@ -10469,21 +10546,21 @@
<unitPattern count="many">{0} arklio galios</unitPattern>
<unitPattern count="other">{0} arklio galių</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>gysidabrio stulpelio milimetrai</displayName>
<unitPattern count="one">{0} gysidabrio stulpelio milimetras</unitPattern>
<unitPattern count="few">{0} gysidabrio stulpelio milimetrai</unitPattern>
<unitPattern count="many">{0} gysidabrio stulpelio milimetro</unitPattern>
<unitPattern count="other">{0} gysidabrio stulpelio milimetrų</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>svarai kv. colyje</displayName>
<unitPattern count="one">{0} svaras kv. colyje</unitPattern>
<unitPattern count="few">{0} svarai kv. colyje</unitPattern>
<unitPattern count="many">{0} svaro kv. colyje</unitPattern>
<unitPattern count="other">{0} svarų kv. colyje</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>gyvsidabrio stulpelio coliai</displayName>
<unitPattern count="one">{0} gyvsidabrio stulpelio colis</unitPattern>
<unitPattern count="few">{0} gyvsidabrio stulpelio coliai</unitPattern>
@@ -10595,7 +10672,7 @@
<unitPattern count="many">{0} kelvino</unitPattern>
<unitPattern count="other">{0} kelvinų</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>svarų pėdos</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -10812,9 +10889,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10825,7 +10976,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -10963,7 +11114,7 @@
<unitPattern count="many">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -11005,7 +11156,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -11686,21 +11837,21 @@
<unitPattern count="many">{0} AG</unitPattern>
<unitPattern count="other">{0} AG</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb in²</displayName>
<unitPattern count="one">{0} lb in²</unitPattern>
<unitPattern count="few">{0} lb in²</unitPattern>
<unitPattern count="many">{0} lb in²</unitPattern>
<unitPattern count="other">{0} lb in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -11812,7 +11963,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -12029,9 +12180,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -12042,7 +12267,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -12110,7 +12335,7 @@
<unitPattern count="many">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -12365,21 +12590,21 @@
<unitPattern count="many">{0} AG</unitPattern>
<unitPattern count="other">{0} AG</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb in²</displayName>
<unitPattern count="one">{0} lb in²</unitPattern>
<unitPattern count="few">{0} lb in²</unitPattern>
<unitPattern count="many">{0} lb in²</unitPattern>
<unitPattern count="other">{0} lb in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/lt_LT.xml b/common/main/lt_LT.xml
index 633e843..aeef713 100644
--- a/common/main/lt_LT.xml
+++ b/common/main/lt_LT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lu.xml b/common/main/lu.xml
index eff57e5..c7d8d89 100644
--- a/common/main/lu.xml
+++ b/common/main/lu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -182,7 +182,6 @@
<territory type="MD">Molidavi</territory>
<territory type="MG">Madagasikari</territory>
<territory type="MH">Lutanda lua Marishale</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myamare</territory>
<territory type="MN">Mongoli</territory>
diff --git a/common/main/lu_CD.xml b/common/main/lu_CD.xml
index 7e6297a..6299b38 100644
--- a/common/main/lu_CD.xml
+++ b/common/main/lu_CD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/luo.xml b/common/main/luo.xml
index 0fceb14..9445ac1 100644
--- a/common/main/luo.xml
+++ b/common/main/luo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Madagascar</territory>
<territory type="MH">Chuia mar Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/luo_KE.xml b/common/main/luo_KE.xml
index a328305..4f884af 100644
--- a/common/main/luo_KE.xml
+++ b/common/main/luo_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/luy.xml b/common/main/luy.xml
index e6a97e8..91b7767 100644
--- a/common/main/luy.xml
+++ b/common/main/luy.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/luy_KE.xml b/common/main/luy_KE.xml
index 5b96f8f..e5d5ae7 100644
--- a/common/main/luy_KE.xml
+++ b/common/main/luy_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/lv.xml b/common/main/lv.xml
index fc2cf0c..fbc11c9 100644
--- a/common/main/lv.xml
+++ b/common/main/lv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -160,6 +160,7 @@
<language type="eu">basku</language>
<language type="ewo">evondu</language>
<language type="fa">persiešu</language>
+ <language type="fa_AF">darī</language>
<language type="fan">fangu</language>
<language type="fat">fantu</language>
<language type="ff">fulu</language>
@@ -232,7 +233,7 @@
<language type="iu">inuītu</language>
<language type="ja">japāņu</language>
<language type="jbo">ložbans</language>
- <language type="jgo">jgo</language>
+ <language type="jgo">ngomba</language>
<language type="jmc">mačamu</language>
<language type="jpr">jūdpersiešu</language>
<language type="jrb">jūdarābu</language>
@@ -5064,7 +5065,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolkas salas laiks</standard>
+ <generic draft="contributed">Norfolkas salas laiks</generic>
+ <standard draft="contributed">Norfolkas salas ziemas laiks</standard>
+ <daylight draft="contributed">Norfolkas salas vasaras laiks</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6941,9 +6944,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadrāt{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadrāt{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadrāt{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubik{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6953,7 +7028,7 @@
<unitPattern count="one">{0} smagumspēks</unitPattern>
<unitPattern count="other">{0} smagumspēks</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri kvadrātsekundē</displayName>
<unitPattern count="zero">{0} metru kvadrātsekundē</unitPattern>
<unitPattern count="one">{0} metrs kvadrātsekundē</unitPattern>
@@ -7072,7 +7147,7 @@
<unitPattern count="one">{0} milimols uz litru</unitPattern>
<unitPattern count="other">{0} milimoli uz litru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>miljonās daļas</displayName>
<unitPattern count="zero">{0} miljono daļu</unitPattern>
<unitPattern count="one">{0} miljonā daļa</unitPattern>
@@ -7108,7 +7183,7 @@
<unitPattern count="one">{0} litrs uz kilometru</unitPattern>
<unitPattern count="other">{0} litri uz kilometru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litri uz 100 kilometriem</displayName>
<unitPattern count="zero">{0} litru uz 100 kilometriem</unitPattern>
<unitPattern count="one">{0} litrs uz 100 kilometriem</unitPattern>
@@ -7694,19 +7769,19 @@
<unitPattern count="one">{0} zirgspēks</unitPattern>
<unitPattern count="other">{0} zirgspēki</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>dzīvsudraba stabiņa milimetri</displayName>
<unitPattern count="zero">{0} dzīvsudraba stabiņa milimetru</unitPattern>
<unitPattern count="one">{0} dzīvsudraba stabiņa milimetrs</unitPattern>
<unitPattern count="other">{0} dzīvsudraba stabiņa milimetri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>mārciņas uz kvadrātcollu</displayName>
<unitPattern count="zero">{0} mārciņu uz kvadrātcollu</unitPattern>
<unitPattern count="one">{0} mārciņa uz kvadrātcollu</unitPattern>
<unitPattern count="other">{0} mārciņas uz kvadrātcollu</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>dzīvsudraba stabiņa collas</displayName>
<unitPattern count="zero">{0} dzīvsudraba stabiņa collu</unitPattern>
<unitPattern count="one">{0} dzīvsudraba stabiņa colla</unitPattern>
@@ -7802,7 +7877,7 @@
<unitPattern count="one">{0} kelvins</unitPattern>
<unitPattern count="other">{0} kelvini</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>mārciņpēda</displayName>
<unitPattern count="zero">{0} mārciņpēdu</unitPattern>
<unitPattern count="one">{0} mārciņpēda</unitPattern>
@@ -7984,9 +8059,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>j{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7996,7 +8143,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri kvadrātsekundē</displayName>
<unitPattern count="zero">{0} m/s²</unitPattern>
<unitPattern count="one">{0} m/s²</unitPattern>
@@ -8115,7 +8262,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>miljonās daļas</displayName>
<unitPattern count="zero">{0} ppm</unitPattern>
<unitPattern count="one">{0} ppm</unitPattern>
@@ -8151,7 +8298,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="zero">{0} l/100 km</unitPattern>
<unitPattern count="one">{0} l/100 km</unitPattern>
@@ -8737,19 +8884,19 @@
<unitPattern count="one">{0} ZS</unitPattern>
<unitPattern count="other">{0} ZS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="zero">{0} mmHg</unitPattern>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="zero">{0} psi</unitPattern>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="zero">{0} inHg</unitPattern>
<unitPattern count="one">{0} inHg</unitPattern>
@@ -8845,7 +8992,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>mārciņpēda</displayName>
<unitPattern count="zero">{0} mārc. pēdas</unitPattern>
<unitPattern count="one">{0} mārc. pēda</unitPattern>
@@ -9027,9 +9174,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>j{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="zero">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9090,7 +9309,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="zero">{0} l/100 km</unitPattern>
<unitPattern count="one">{0} l/100 km</unitPattern>
@@ -9317,13 +9536,13 @@
<unitPattern count="one">{0} ZS</unitPattern>
<unitPattern count="other">{0} ZS</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="zero" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="zero">{0}inHg</unitPattern>
<unitPattern count="one">{0}inHg</unitPattern>
<unitPattern count="other">{0}inHg</unitPattern>
diff --git a/common/main/lv_LV.xml b/common/main/lv_LV.xml
index a85090a..263f64a 100644
--- a/common/main/lv_LV.xml
+++ b/common/main/lv_LV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mai.xml b/common/main/mai.xml
new file mode 100644
index 0000000..ea3f141
--- /dev/null
+++ b/common/main/mai.xml
@@ -0,0 +1,779 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="mai"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>↑↑↑</localePattern>
+ <localeSeparator>↑↑↑</localeSeparator>
+ <localeKeyTypePattern>↑↑↑</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="de">जर्मन</language>
+ <language type="de_AT">ऑस्ट्रियाई जर्मन</language>
+ <language type="de_CH">स्विस उच्च जर्मन</language>
+ <language type="en">अंग्रेज़ी</language>
+ <language type="en_AU">ऑस्ट्रेलियाई अंग्रेज़ी</language>
+ <language type="en_CA">कनाडाई अंग्रेज़ी</language>
+ <language type="en_GB">ब्रिटिश अंग्रेज़ी</language>
+ <language type="en_GB" alt="short">यू॰के॰ अंग्रेज़ी</language>
+ <language type="en_US">अमेरिकी अंग्रेज़ी</language>
+ <language type="en_US" alt="short">अमेरिकी अंग्रेज़ी</language>
+ <language type="es">स्पेनी</language>
+ <language type="es_419">लैटिन अमेरिकी स्पेनिश</language>
+ <language type="es_ES">यूरोपीय स्पेनिश</language>
+ <language type="es_MX">मैक्सिकन स्पेनिश</language>
+ <language type="fr">फ़्रेंच</language>
+ <language type="fr_CA">कनाडाई फ़्रेंच</language>
+ <language type="fr_CH">स्विस फ़्रेंच</language>
+ <language type="it">इतालवी</language>
+ <language type="ja">जापानी</language>
+ <language type="mai">मैथिली</language>
+ <language type="pt">पुर्तगाली</language>
+ <language type="pt_BR">ब्राज़ीली पुर्तगाली</language>
+ <language type="pt_PT">यूरोपीय पुर्तगाली</language>
+ <language type="ru">रूसी</language>
+ <language type="und">अज्ञात भाषा</language>
+ <language type="zh">चीनी</language>
+ <language type="zh" alt="menu">चीनी, मैंडेरिन</language>
+ <language type="zh_Hans">सरलीकृत चीनी</language>
+ <language type="zh_Hans" alt="long">सरलीकृत मैंडेरिन चीनी</language>
+ <language type="zh_Hant">पारंपरिक चीनी</language>
+ <language type="zh_Hant" alt="long">पारंपरिक मैंडेरिन चीनी</language>
+ </languages>
+ <scripts>
+ <script type="Arab">अरबी</script>
+ <script type="Cyrl">सिरिलिक</script>
+ <script type="Deva">देवनागरी</script>
+ <script type="Hans">सरलीकृत</script>
+ <script type="Hans" alt="stand-alone">सरलीकृत हान</script>
+ <script type="Hant">पारंपरिक</script>
+ <script type="Hant" alt="stand-alone">पारंपरिक हान</script>
+ <script type="Latn">लैटिन</script>
+ <script type="Zxxx">अलिखित</script>
+ <script type="Zzzz">अज्ञात लिपि</script>
+ </scripts>
+ <territories>
+ <territory type="BR">ब्राज़ील</territory>
+ <territory type="CN">चीन</territory>
+ <territory type="DE">जर्मनी</territory>
+ <territory type="FR">फ़्रांस</territory>
+ <territory type="GB">यूनाइटेड किंगडम</territory>
+ <territory type="IN">भारत</territory>
+ <territory type="IT">इटली</territory>
+ <territory type="JP">जापान</territory>
+ <territory type="RU">रूस</territory>
+ <territory type="US">संयुक्त राज्य</territory>
+ <territory type="ZZ">अज्ञात क्षेत्र</territory>
+ </territories>
+ <types>
+ <type key="calendar" type="gregorian">ग्रेगोरियन कैलेंडर</type>
+ <type key="collation" type="standard">मानक सॉर्ट क्रम</type>
+ <type key="numbers" type="deva">देवनागरी अंक</type>
+ <type key="numbers" type="latn">पश्चिमी अंक</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">मीट्रिक</measurementSystemName>
+ <measurementSystemName type="UK">यूके</measurementSystemName>
+ <measurementSystemName type="US">यूएस</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">भाषा: {0}</codePattern>
+ <codePattern type="script">लिपि: {0}</codePattern>
+ <codePattern type="territory">क्षेत्र: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters>[\u093C \u0902 ः क {क\u094Dष} ख ग घ च छ ज {ज\u094Dञ} झ ञ ट ठ ड {ड\u0902} ढ ण त {त\u094Dर} थ द ध न प फ ब भ म य र ल व श {श\u094Dर} ष स ह ा ि ी \u0941 \u0942 \u0947 \u0948 ो ौ]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[अ {अ\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ]</exemplarCharacters>
+ <exemplarCharacters type="index">[\u093C अ {अ\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ क {क\u094Dष} ख ग घ च छ ज {ज\u094Dञ} झ ञ ट ठ ड {ड\u0902} ढ ण त {त\u094Dर} थ द ध न प फ ब भ म य र ल व श {श\u094Dर} ष स ह]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">↑↑↑</exemplarCharacters>
+ <exemplarCharacters type="punctuation">[_ \- ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] \{ \} § @ * / \\ \& # ′ ″ ` + | ~]</exemplarCharacters>
+ </characters>
+ <delimiters>
+ <quotationStart>↑↑↑</quotationStart>
+ <quotationEnd>↑↑↑</quotationEnd>
+ <alternateQuotationStart>↑↑↑</alternateQuotationStart>
+ <alternateQuotationEnd>↑↑↑</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>G EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>G d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>G d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>G d/M/y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <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>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">जन॰</month>
+ <month type="2">फ़र॰</month>
+ <month type="3">मार्च</month>
+ <month type="4">अप्रैल</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जुल॰</month>
+ <month type="8">अग॰</month>
+ <month type="9">सित॰</month>
+ <month type="10">अक्तू॰</month>
+ <month type="11">नव॰</month>
+ <month type="12">दिस॰</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">ज</month>
+ <month type="2">फ़</month>
+ <month type="3">मा</month>
+ <month type="4">अ</month>
+ <month type="5">म</month>
+ <month type="6">जू</month>
+ <month type="7">जु</month>
+ <month type="8">अ</month>
+ <month type="9">सि</month>
+ <month type="10">अ</month>
+ <month type="11">न</month>
+ <month type="12">दि</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">जनवरी</month>
+ <month type="2">फ़रवरी</month>
+ <month type="3">मार्च</month>
+ <month type="4">अप्रैल</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जुलाई</month>
+ <month type="8">अगस्त</month>
+ <month type="9">सितंबर</month>
+ <month type="10">अक्तूबर</month>
+ <month type="11">नवंबर</month>
+ <month type="12">दिसंबर</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">जन॰</month>
+ <month type="2">फ़र॰</month>
+ <month type="3">मार्च</month>
+ <month type="4">अप्रैल</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जुल॰</month>
+ <month type="8">अग॰</month>
+ <month type="9">सित॰</month>
+ <month type="10">अक्तू॰</month>
+ <month type="11">नव॰</month>
+ <month type="12">दिस॰</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">ज</month>
+ <month type="2">फ़</month>
+ <month type="3">मा</month>
+ <month type="4">अ</month>
+ <month type="5">म</month>
+ <month type="6">जू</month>
+ <month type="7">जु</month>
+ <month type="8">अ</month>
+ <month type="9">सि</month>
+ <month type="10">अ</month>
+ <month type="11">न</month>
+ <month type="12">दि</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">जनवरी</month>
+ <month type="2">फ़रवरी</month>
+ <month type="3">मार्च</month>
+ <month type="4">अप्रैल</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जुलाई</month>
+ <month type="8">अगस्त</month>
+ <month type="9">सितंबर</month>
+ <month type="10">अक्तूबर</month>
+ <month type="11">नवंबर</month>
+ <month type="12">दिसंबर</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">रवि</day>
+ <day type="mon">सोम</day>
+ <day type="tue">मंगल</day>
+ <day type="wed">बुध</day>
+ <day type="thu">गुरु</day>
+ <day type="fri">शुक्र</day>
+ <day type="sat">शनि</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">र</day>
+ <day type="mon">सो</day>
+ <day type="tue">मं</day>
+ <day type="wed">बु</day>
+ <day type="thu">गु</day>
+ <day type="fri">शु</day>
+ <day type="sat">श</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">रविवार</day>
+ <day type="mon">सोमवार</day>
+ <day type="tue">मंगलवार</day>
+ <day type="wed">बुधवार</day>
+ <day type="thu">गुरुवार</day>
+ <day type="fri">शुक्रवार</day>
+ <day type="sat">शनिवार</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">रवि</day>
+ <day type="mon">सोम</day>
+ <day type="tue">मंगल</day>
+ <day type="wed">बुध</day>
+ <day type="thu">गुरु</day>
+ <day type="fri">शुक्र</day>
+ <day type="sat">शनि</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">र</day>
+ <day type="mon">सो</day>
+ <day type="tue">मं</day>
+ <day type="wed">बु</day>
+ <day type="thu">गु</day>
+ <day type="fri">शु</day>
+ <day type="sat">श</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">रविवार</day>
+ <day type="mon">सोमवार</day>
+ <day type="tue">मंगलवार</day>
+ <day type="wed">बुधवार</day>
+ <day type="thu">गुरुवार</day>
+ <day type="fri">शुक्रवार</day>
+ <day type="sat">शनिवार</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">ति1</quarter>
+ <quarter type="2">ति2</quarter>
+ <quarter type="3">ति3</quarter>
+ <quarter type="4">ति4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">पहली तिमाही</quarter>
+ <quarter type="2">दूसरी तिमाही</quarter>
+ <quarter type="3">तीसरी तिमाही</quarter>
+ <quarter type="4">चौथी तिमाही</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">ति1</quarter>
+ <quarter type="2">ति2</quarter>
+ <quarter type="3">ति3</quarter>
+ <quarter type="4">ति4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">पहली तिमाही</quarter>
+ <quarter type="2">दूसरी तिमाही</quarter>
+ <quarter type="3">तीसरी तिमाही</quarter>
+ <quarter type="4">चौथी तिमाही</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">am</dayPeriod>
+ <dayPeriod type="pm">pm</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">ईसा-पूर्व</era>
+ <era type="0" alt="variant">ईसवी पूर्व</era>
+ <era type="1">ईस्वी</era>
+ <era type="1" alt="variant">ईसवी</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </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="Bh">B h</dateFormatItem>
+ <dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+ <dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
+ <dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
+ <dateFormatItem id="Ed">E d</dateFormatItem>
+ <dateFormatItem id="Ehm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ehms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">y G</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+ <dateFormatItem id="h">↑↑↑</dateFormatItem>
+ <dateFormatItem id="H">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">d/M</dateFormatItem>
+ <dateFormatItem id="MEd">E, d/M</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="ms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">M/y</dateFormatItem>
+ <dateFormatItem id="yMd">d/M/y</dateFormatItem>
+ <dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+ <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>युग</displayName>
+ </field>
+ <field type="year">
+ <displayName>वर्ष</displayName>
+ </field>
+ <field type="year-short">
+ <displayName>वर्ष</displayName>
+ </field>
+ <field type="year-narrow">
+ <displayName>वर्ष</displayName>
+ </field>
+ <field type="quarter">
+ <displayName>तिमाही</displayName>
+ </field>
+ <field type="quarter-short">
+ <displayName>तिमाही</displayName>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>तिमाही</displayName>
+ </field>
+ <field type="month">
+ <displayName>महीना</displayName>
+ </field>
+ <field type="month-short">
+ <displayName>मास</displayName>
+ </field>
+ <field type="month-narrow">
+ <displayName>मास</displayName>
+ </field>
+ <field type="week">
+ <displayName>सप्ताह</displayName>
+ </field>
+ <field type="week-short">
+ <displayName>सप्ताह</displayName>
+ </field>
+ <field type="week-narrow">
+ <displayName>सप्ताह</displayName>
+ </field>
+ <field type="day">
+ <displayName>दिन</displayName>
+ <relative type="-1">काइल के दिन</relative>
+ <relative type="0">आजुक दिन</relative>
+ <relative type="1">काइल के दिन</relative>
+ </field>
+ <field type="day-short">
+ <displayName>दिन</displayName>
+ <relative type="-1">बीतल काइल</relative>
+ <relative type="0">आइ</relative>
+ <relative type="1">आवय वाला काइल</relative>
+ </field>
+ <field type="day-narrow">
+ <displayName>दिन</displayName>
+ <relative type="-1">बीतल काइल के दिन</relative>
+ <relative type="0">आइ के दिन</relative>
+ <relative type="1">आवय वाला काइल के दिन</relative>
+ </field>
+ <field type="weekday">
+ <displayName>सप्ताह के दिन</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>पूर्वाह्न/अपराह्न</displayName>
+ </field>
+ <field type="hour">
+ <displayName>घंटा</displayName>
+ </field>
+ <field type="hour-short">
+ <displayName>घं॰</displayName>
+ </field>
+ <field type="hour-narrow">
+ <displayName>घं॰</displayName>
+ </field>
+ <field type="minute">
+ <displayName>मिनट</displayName>
+ </field>
+ <field type="minute-short">
+ <displayName>मि॰</displayName>
+ </field>
+ <field type="minute-narrow">
+ <displayName>मि॰</displayName>
+ </field>
+ <field type="second">
+ <displayName>सेकंड</displayName>
+ </field>
+ <field type="second-short">
+ <displayName>से॰</displayName>
+ </field>
+ <field type="second-narrow">
+ <displayName>से॰</displayName>
+ </field>
+ <field type="zone">
+ <displayName>समय क्षेत्र</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>↑↑↑</hourFormat>
+ <gmtFormat>↑↑↑</gmtFormat>
+ <gmtZeroFormat>↑↑↑</gmtZeroFormat>
+ <regionFormat>{0} समय</regionFormat>
+ <regionFormat type="daylight">{0} डेलाइट समय</regionFormat>
+ <regionFormat type="standard">{0} मानक समय</regionFormat>
+ <fallbackFormat>↑↑↑</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>समन्वित वैश्विक समय</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>अज्ञात शहर</exemplarCity>
+ </zone>
+ <metazone type="America_Central">
+ <long>
+ <generic>उत्तरी अमेरिकी केंद्रीय समय</generic>
+ <standard>उत्तरी अमेरिकी केंद्रीय मानक समय</standard>
+ <daylight>उत्तरी अमेरिकी केंद्रीय डेलाइट समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>उत्तरी अमेरिकी पूर्वी समय</generic>
+ <standard>उत्तरी अमेरिकी पूर्वी मानक समय</standard>
+ <daylight>उत्तरी अमेरिकी पूर्वी डेलाइट समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>उत्तरी अमेरिकी माउंटेन समय</generic>
+ <standard>उत्तरी अमेरिकी माउंटेन मानक समय</standard>
+ <daylight>उत्तरी अमेरिकी माउंटेन डेलाइट समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>उत्तरी अमेरिकी प्रशांत समय</generic>
+ <standard>उत्तरी अमेरिकी प्रशांत मानक समय</standard>
+ <daylight>उत्तरी अमेरिकी प्रशांत डेलाइट समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>अटलांटिक समय</generic>
+ <standard>अटलांटिक मानक समय</standard>
+ <daylight>अटलांटिक डेलाइट समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>मध्य यूरोपीय समय</generic>
+ <standard>मध्य यूरोपीय मानक समय</standard>
+ <daylight>मध्य यूरोपीय ग्रीष्मकालीन समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>पूर्वी यूरोपीय समय</generic>
+ <standard>पूर्वी यूरोपीय मानक समय</standard>
+ <daylight>पूर्वी यूरोपीय ग्रीष्मकालीन समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>पश्चिमी यूरोपीय समय</generic>
+ <standard>पश्चिमी यूरोपीय मानक समय</standard>
+ <daylight>पश्चिमी यूरोपीय ग्रीष्मकालीन समय</daylight>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>ग्रीनविच मीन टाइम</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem draft="contributed">↑↑↑</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">deva</native>
+ </otherNumberingSystems>
+ <symbols numberSystem="latn">
+ <decimal>↑↑↑</decimal>
+ <group>↑↑↑</group>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign>↑↑↑</plusSign>
+ <minusSign>↑↑↑</minusSign>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>[#E0]</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="BRL">
+ <displayName>ब्राज़ीली रियाल</displayName>
+ <displayName count="other">ब्राज़ीली रियाल</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>चीनी युआन</displayName>
+ <displayName count="other">चीनी युआन</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>यूरो</displayName>
+ <displayName count="other">यूरो</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>ब्रिटिश पाउंड स्टर्लिंग</displayName>
+ <displayName count="other">ब्रिटिश पाउंड स्टर्लिंग</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>भारतीय रुपया</displayName>
+ <displayName count="other">भारतीय रुपया</displayName>
+ <symbol draft="contributed">₹</symbol>
+ <symbol alt="narrow" draft="contributed">₹</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>जापानी येन</displayName>
+ <displayName count="other">जापानी येन</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>रूसी रूबल</displayName>
+ <displayName count="other">रूसी रूबल</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>यूएस डॉलर</displayName>
+ <displayName count="other">यूएस डॉलर</displayName>
+ <symbol draft="contributed">$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="XXX">
+ <displayName>अज्ञात मुद्रा</displayName>
+ <displayName count="other">(अज्ञात मुद्रा)</displayName>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <durationUnit type="hm">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">{0}, और {1}</listPatternPart>
+ <listPatternPart type="2">{0} और {1}</listPatternPart>
+ </listPattern>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>हाँ</yesstr>
+ <nostr>नहीं</nostr>
+ </messages>
+ </posix>
+</ldml>
diff --git a/common/main/ks_IN.xml b/common/main/mai_IN.xml
similarity index 87%
copy from common/main/ks_IN.xml
copy to common/main/mai_IN.xml
index e3540e2..d60efab 100644
--- a/common/main/ks_IN.xml
+++ b/common/main/mai_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,7 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="ks"/>
+ <language type="mai"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/common/main/mas.xml b/common/main/mas.xml
index 4e8cf72..16f25f0 100644
--- a/common/main/mas.xml
+++ b/common/main/mas.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/mas_KE.xml b/common/main/mas_KE.xml
index b029698..f4927df 100644
--- a/common/main/mas_KE.xml
+++ b/common/main/mas_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mas_TZ.xml b/common/main/mas_TZ.xml
index 6acb130..dd9c218 100644
--- a/common/main/mas_TZ.xml
+++ b/common/main/mas_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mer.xml b/common/main/mer.xml
index 79f0153..969e62b 100644
--- a/common/main/mer.xml
+++ b/common/main/mer.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Madagasika</territory>
<territory type="MH">Aĩrandi cia Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanima</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/mer_KE.xml b/common/main/mer_KE.xml
index eefc498..7973fa6 100644
--- a/common/main/mer_KE.xml
+++ b/common/main/mer_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mfe.xml b/common/main/mfe.xml
index 5879675..8005a6b 100644
--- a/common/main/mfe.xml
+++ b/common/main/mfe.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldavi</territory>
<territory type="MG">Madagaskar</territory>
<territory type="MH">Zil Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongoli</territory>
diff --git a/common/main/mfe_MU.xml b/common/main/mfe_MU.xml
index 1669a93..88c6fe0 100644
--- a/common/main/mfe_MU.xml
+++ b/common/main/mfe_MU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mg.xml b/common/main/mg.xml
index 5f886e0..67c5415 100644
--- a/common/main/mg.xml
+++ b/common/main/mg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Môldavia</territory>
<territory type="MG">Madagasikara</territory>
<territory type="MH">Nosy Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Môngôlia</territory>
diff --git a/common/main/mg_MG.xml b/common/main/mg_MG.xml
index b40e695..6a3c4f9 100644
--- a/common/main/mg_MG.xml
+++ b/common/main/mg_MG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mgh.xml b/common/main/mgh.xml
index b2b73ab..9d6d8b6 100644
--- a/common/main/mgh.xml
+++ b/common/main/mgh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -132,7 +132,6 @@
<territory type="LY">Ulibya</territory>
<territory type="ME">Umantegro</territory>
<territory type="MG">Ubukini</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="MW">Umalawi</territory>
<territory type="MZ" draft="contributed">Umozambiki</territory>
<territory type="NE">Unijeri</territory>
diff --git a/common/main/mgh_MZ.xml b/common/main/mgh_MZ.xml
index eac5de9..80fcd44 100644
--- a/common/main/mgh_MZ.xml
+++ b/common/main/mgh_MZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mgo.xml b/common/main/mgo.xml
index 5066212..391a847 100644
--- a/common/main/mgo.xml
+++ b/common/main/mgo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mgo_CM.xml b/common/main/mgo_CM.xml
index 5e16e25..4f538f5 100644
--- a/common/main/mgo_CM.xml
+++ b/common/main/mgo_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mi.xml b/common/main/mi.xml
index 47b43a7..96ebf76 100644
--- a/common/main/mi.xml
+++ b/common/main/mi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -107,19 +107,6 @@
<dates>
<calendars>
<calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="wide">
- <day type="sun" draft="provisional">Rātapu</day>
- <day type="mon" draft="provisional">Mane</day>
- <day type="tue" draft="provisional">Tūrei</day>
- <day type="wed" draft="provisional">Wenerei</day>
- <day type="thu" draft="provisional">Tāite</day>
- <day type="fri" draft="provisional">Paraire</day>
- <day type="sat" draft="provisional">Hātarei</day>
- </dayWidth>
- </dayContext>
- </days>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
@@ -1000,30 +987,20 @@
</currencyFormats>
<currencies>
<currency type="ANG">
- <displayName>ANG</displayName>
- <displayName count="other">ANG</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ARS">
- <displayName>ARS</displayName>
- <displayName count="other">ARS</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AWG">
- <displayName>AWG</displayName>
- <displayName count="other">AWG</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BBD">
- <displayName>BBD</displayName>
- <displayName count="other">BBD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BMD">
- <displayName>BMD</displayName>
- <displayName count="other">BMD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1034,20 +1011,14 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BSD">
- <displayName>BSD</displayName>
- <displayName count="other">BSD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BZD">
- <displayName>BZD</displayName>
- <displayName count="other">BZD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CAD">
- <displayName>CAD</displayName>
- <displayName count="other">CAD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1058,26 +1029,18 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CRC">
- <displayName>CRC</displayName>
- <displayName count="other">CRC</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
- <displayName>CUC</displayName>
- <displayName count="other">CUC</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUP">
- <displayName>CUP</displayName>
- <displayName count="other">CUP</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DOP">
- <displayName>DOP</displayName>
- <displayName count="other">DOP</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1094,20 +1057,14 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GTQ">
- <displayName>GTQ</displayName>
- <displayName count="other">GTQ</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HNL">
- <displayName>HNL</displayName>
- <displayName count="other">HNL</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HTG">
- <displayName>HTG</displayName>
- <displayName count="other">HTG</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="INR">
@@ -1117,8 +1074,6 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
- <displayName>JMD</displayName>
- <displayName count="other">JMD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1129,20 +1084,14 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KYD">
- <displayName>KYD</displayName>
- <displayName count="other">KYD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MXN">
- <displayName>MXN</displayName>
- <displayName count="other">MXN</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NIO">
- <displayName>NIO</displayName>
- <displayName count="other">NIO</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1152,8 +1101,6 @@
<symbol>$</symbol>
</currency>
<currency type="PAB">
- <displayName>PAB</displayName>
- <displayName count="other">PAB</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RUB">
@@ -1163,8 +1110,6 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TTD">
- <displayName>TTD</displayName>
- <displayName count="other">TTD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -1175,8 +1120,6 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XCD">
- <displayName>XCD</displayName>
- <displayName count="other">XCD</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
diff --git a/common/main/mi_NZ.xml b/common/main/mi_NZ.xml
index fe2c814..c7fbf49 100644
--- a/common/main/mi_NZ.xml
+++ b/common/main/mi_NZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mk.xml b/common/main/mk.xml
index 3076d43..0d4cd86 100644
--- a/common/main/mk.xml
+++ b/common/main/mk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -181,6 +181,7 @@
<language type="ewo">евондо</language>
<language type="ext">екстремадурски</language>
<language type="fa">персиски</language>
+ <language type="fa_AF">дари</language>
<language type="fan">фанг</language>
<language type="fat">фанти</language>
<language type="ff">фула</language>
@@ -5525,7 +5526,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Време на Островите Норфолк</standard>
+ <generic draft="contributed">Време на Островите Норфолк</generic>
+ <standard draft="contributed">Стандардно време на Островите Норфолк</standard>
+ <daylight draft="contributed">Летно сметање на Островите Норфолк</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7223,9 +7226,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>центи{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мили{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ато{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>јокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>хекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>екса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>јота{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} на {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадратни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} квадратен</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} квадратни</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} кубен</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} кубни</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7234,7 +7307,7 @@
<unitPattern count="one">{0} гравитациска сила</unitPattern>
<unitPattern count="other">{0} гравитациска сила</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри во секунда на квадрат</displayName>
<unitPattern count="one">{0} метар во секунда на квадрат</unitPattern>
<unitPattern count="other">{0} метри во секунда на квадрат</unitPattern>
@@ -7334,7 +7407,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7364,7 +7437,7 @@
<unitPattern count="one">{0} литар на километар</unitPattern>
<unitPattern count="other">{0} литри на километар</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>литри на 100 километри</displayName>
<unitPattern count="one">{0} литар на 100 километри</unitPattern>
<unitPattern count="other">{0} литри на 100 километри</unitPattern>
@@ -7855,17 +7928,17 @@
<unitPattern count="one">{0} коњска сила</unitPattern>
<unitPattern count="other">{0} коњски сили</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>милиметри жива</displayName>
<unitPattern count="one">{0} милиметар жива</unitPattern>
<unitPattern count="other">{0} милиметри жива</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунти на квадратен инч</displayName>
<unitPattern count="one">{0} фунта на квадратен инч</unitPattern>
<unitPattern count="other">{0} фунти на квадратен инч</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>инчи жива</displayName>
<unitPattern count="one">{0} инч жива</unitPattern>
<unitPattern count="other">{0} инчи жива</unitPattern>
@@ -7945,7 +8018,7 @@
<unitPattern count="one">{0} келвин</unitPattern>
<unitPattern count="other">{0} келвини</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>стапки фунти</displayName>
<unitPattern count="one">{0} стапка фунта</unitPattern>
<unitPattern count="other">{0} стапки фунти</unitPattern>
@@ -8104,9 +8177,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8115,7 +8258,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри/сек²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="other">{0} м/с²</unitPattern>
@@ -8215,7 +8358,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8245,7 +8388,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -8736,17 +8879,17 @@
<unitPattern count="one">{0} кс</unitPattern>
<unitPattern count="other">{0} кс</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8826,7 +8969,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -8985,16 +9128,86 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<displayName draft="contributed">G</displayName>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">м/с²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="other">{0} м/с²</unitPattern>
@@ -9060,7 +9273,7 @@
<unitPattern count="one">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -9344,12 +9557,12 @@
<unitPattern count="one">{0} кс</unitPattern>
<unitPattern count="other">{0} кс</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">мм жива</displayName>
<unitPattern count="one">{0}mm Hg</unitPattern>
<unitPattern count="other">{0}mm Hg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/mk_MK.xml b/common/main/mk_MK.xml
index 4229bd8..4b288c4 100644
--- a/common/main/mk_MK.xml
+++ b/common/main/mk_MK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ml.xml b/common/main/ml.xml
index 21f04bb..8cd86ba 100644
--- a/common/main/ml.xml
+++ b/common/main/ml.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -159,6 +159,7 @@
<language type="eu">ബാസ്ക്</language>
<language type="ewo">എവോൻഡോ</language>
<language type="fa">പേർഷ്യൻ</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">ഫങ്</language>
<language type="fat">ഫാന്റി</language>
<language type="ff">ഫുല</language>
@@ -999,7 +1000,7 @@
<territory type="WF">വാലിസ് ആന്റ് ഫ്യൂച്യുന</territory>
<territory type="WS">സമോവ</territory>
<territory type="XA">കൃത്രിമ ഉച്ചാരണം</territory>
- <territory type="XB" draft="provisional">↑↑↑</territory>
+ <territory type="XB" draft="contributed">സൂഡോ-ബായഡീ</territory>
<territory type="XK">കൊസോവൊ</territory>
<territory type="YE">യെമൻ</territory>
<territory type="YT">മയോട്ടി</territory>
@@ -5397,7 +5398,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>നോർഫാക്ക് ദ്വീപുകൾ സമയം</standard>
+ <generic draft="contributed">നോർഫാക്ക് ദ്വീപുകൾ സമയം</generic>
+ <standard draft="contributed">നോർഫാക്ക് ദ്വീപുകൾ സ്റ്റാൻഡേർഡ് സമയം</standard>
+ <daylight draft="contributed">നോർഫാക്ക് ദ്വീപുകൾ ഡേലൈറ്റ് സമയം</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7474,9 +7477,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ഡെസി{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>സെന്റി{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>മില്ലി{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>മൈക്രോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>നാനോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>പിക്കോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ഫെംറ്റോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ആറ്റോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>സെപ്റ്റോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>യോക്റ്റോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ഡെകാ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ഹെക്റ്റോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>കിലോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>മെഗാ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ഗിഗ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ടെറാ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>എക്സാ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>സെറ്റാ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>യൊറ്റാ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>വർഗ്ഗം {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">വർഗ്ഗം {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1 draft="provisional">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ക്യുബിക് {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7485,7 +7558,7 @@
<unitPattern count="one">{0} ജി-ഫോഴ്സ്</unitPattern>
<unitPattern count="other">{0} ജി-ഫോഴ്സ്</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>മീറ്റർ/സെക്കൻഡ്²</displayName>
<unitPattern count="one">{0} മീറ്റർ/സെക്കൻഡ്²</unitPattern>
<unitPattern count="other">{0} മീറ്റർ/സെക്കൻഡ്²</unitPattern>
@@ -7585,7 +7658,7 @@
<unitPattern count="one">{0} മില്ലിമോൾ / ലിറ്റർ</unitPattern>
<unitPattern count="other">{0} മില്ലിമോൾ / ലിറ്റർ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>പാർട്സ് / മില്ല്യൺ</displayName>
<unitPattern count="one">പാർട്ട് / മില്ല്യൺ</unitPattern>
<unitPattern count="other">{0} പാർട്സ് / മില്ല്യൺ</unitPattern>
@@ -7615,7 +7688,7 @@
<unitPattern count="one">{0} ലിറ്റർ/കിലോമീറ്റർ</unitPattern>
<unitPattern count="other">{0} ലിറ്റർ/കിലോമീറ്റർ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ലിറ്റർ/100 കിലോമീറ്റർ</displayName>
<unitPattern count="one">{0} ലിറ്റർ/100 കിലോമീറ്റർ</unitPattern>
<unitPattern count="other">{0} ലിറ്റർ/100 കിലോമീറ്റർ</unitPattern>
@@ -8106,17 +8179,17 @@
<unitPattern count="one">{0} കുതിരശക്തി</unitPattern>
<unitPattern count="other">{0} കുതിരശക്തി</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>മില്ലീമീറ്റർ മെർക്കുറി</displayName>
<unitPattern count="one">{0} മില്ലീമീറ്റർ മെർക്കുറി</unitPattern>
<unitPattern count="other">{0} മില്ലീമീറ്റർ മെർക്കുറി</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്</displayName>
<unitPattern count="one">{0} പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്</unitPattern>
<unitPattern count="other">{0} പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ഇഞ്ച് ഓഫ് മെർക്കുറി</displayName>
<unitPattern count="one">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
<unitPattern count="other">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
@@ -8196,7 +8269,7 @@
<unitPattern count="one">{0} കെൽവിൻ</unitPattern>
<unitPattern count="other">{0} കെൽവിൻ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>പൗണ്ട് ഫീറ്റ്</displayName>
<unitPattern count="one">{0} പൗണ്ട് ഫൂട്ട്</unitPattern>
<unitPattern count="other">{0} പൗണ്ട് ഫീറ്റ്</unitPattern>
@@ -8350,9 +8423,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>പി{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>യോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8361,7 +8504,7 @@
<unitPattern count="one">{0} ജി</unitPattern>
<unitPattern count="other">{0} ജി</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>മീറ്റർ/സെക്കൻഡ്²</displayName>
<unitPattern count="one">{0} മീ/സെ²</unitPattern>
<unitPattern count="other">{0} മീ/സെ²</unitPattern>
@@ -8461,7 +8604,7 @@
<unitPattern count="one">{0} മി.മോ/ലി.</unitPattern>
<unitPattern count="other">{0} മി.മോ/ലി.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>പാർട്സ്/മില്ല്യൺ</displayName>
<unitPattern count="one">{0} പാ.പെ.മി.</unitPattern>
<unitPattern count="other">{0} പാ.പെ.മി.</unitPattern>
@@ -8491,7 +8634,7 @@
<unitPattern count="one">{0} ലി/കി.മീ.</unitPattern>
<unitPattern count="other">{0} ലി/കി.മീ.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ലി./100 കി.മീ.</displayName>
<unitPattern count="one">{0} ലി./100 കി.മീ.</unitPattern>
<unitPattern count="other">{0} ലി./100 കി.മീ.</unitPattern>
@@ -8982,17 +9125,17 @@
<unitPattern count="one">{0} എച്ച്.പി.</unitPattern>
<unitPattern count="other">{0} എച്ച്.പി.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>മിമീ.മെ.</displayName>
<unitPattern count="one">{0} മിമീ.മെ.</unitPattern>
<unitPattern count="other">{0} മിമീ.മെ.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>പിഎസ്ഐ</displayName>
<unitPattern count="one">{0} പിഎസ്ഐ</unitPattern>
<unitPattern count="other">{0} പിഎസ്ഐ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ഇഞ്ച് മെ.</displayName>
<unitPattern count="one">{0} ഇഞ്ച് മെ.</unitPattern>
<unitPattern count="other">{0} ഇഞ്ച് മെ.</unitPattern>
@@ -9072,7 +9215,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -9226,9 +9369,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>പി{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>യോ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern draft="provisional">↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9237,7 +9450,7 @@
<unitPattern count="one">{0} ജി</unitPattern>
<unitPattern count="other">{0} ജി</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">മീ/സെ²</displayName>
<unitPattern count="one" draft="contributed">{0}മീ/സെ²</unitPattern>
<unitPattern count="other" draft="contributed">{0}മീ/സെ²</unitPattern>
@@ -9279,7 +9492,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ലി./100 കി.മീ.</displayName>
<unitPattern count="one">{0}ലി/100കിമി</unitPattern>
<unitPattern count="other">{0}ലി/100കിമി</unitPattern>
@@ -9516,15 +9729,15 @@
<unitPattern count="one">{0} വാ</unitPattern>
<unitPattern count="other">{0} വാ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">മിമീ.മെ.</displayName>
<unitPattern count="one" draft="contributed">{0}മിമീ.മെ.</unitPattern>
<unitPattern count="other" draft="contributed">{0}മിമീ.മെ.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">പിഎസ്ഐ</displayName>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">ഇഞ്ച് മെ.</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
diff --git a/common/main/ml_IN.xml b/common/main/ml_IN.xml
index 708da95..3f29fd1 100644
--- a/common/main/ml_IN.xml
+++ b/common/main/ml_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mn.xml b/common/main/mn.xml
index 7669d3b..3cda63c 100644
--- a/common/main/mn.xml
+++ b/common/main/mn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -118,6 +118,7 @@
<language type="eu">баск</language>
<language type="ewo">эвондо</language>
<language type="fa">перс</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="ff">фула</language>
<language type="fi">фин</language>
<language type="fil">филипино</language>
@@ -4256,7 +4257,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк арлын цаг</standard>
+ <generic draft="contributed">Норфолк арлын цаг</generic>
+ <standard draft="contributed">Норфолк арлын стандарт цаг</standard>
+ <daylight draft="contributed">Норфолк арлын зуны цаг</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5741,9 +5744,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деси{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>сенти{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мили{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>атто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ёокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>хекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>экса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зетта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ёотта{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1} тутамд {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадрат {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">квадрат {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">квадрат {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>куб {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">куб {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">куб {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5752,7 +5825,7 @@
<unitPattern count="one">{0} жи-хүч</unitPattern>
<unitPattern count="other">{0} жи-хүч</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>квадрат секундэд ногдох метр</displayName>
<unitPattern count="one">квадрат секундэд {0} метр</unitPattern>
<unitPattern count="other">квадрат секундэд {0} метр</unitPattern>
@@ -5852,7 +5925,7 @@
<unitPattern count="one">литр тутамд {0} миллимоль</unitPattern>
<unitPattern count="other">литр тутамд {0} миллимоль</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>саяны хувь</displayName>
<unitPattern count="one">саяны {0} хувь</unitPattern>
<unitPattern count="other">саяны {0} хувь</unitPattern>
@@ -5882,7 +5955,7 @@
<unitPattern count="one">километр тутамд {0} литр</unitPattern>
<unitPattern count="other">километр тутамд {0} литр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 километр тутамд ногдох литр</displayName>
<unitPattern count="one">100 километр тутамд {0} литр</unitPattern>
<unitPattern count="other">100 километр тутамд {0} литр</unitPattern>
@@ -6358,17 +6431,17 @@
<unitPattern count="one">{0} морины хүч</unitPattern>
<unitPattern count="other">{0} морины хүч</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мөнгөн усны баганын миллиметр</displayName>
<unitPattern count="one">{0} мөнгөн усны баганын миллиметр</unitPattern>
<unitPattern count="other">{0} мөнгөн усны баганын миллиметр</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>квадрат инч тутамд ногдох фунт</displayName>
<unitPattern count="one">квадрат инч тутамд {0} фунт</unitPattern>
<unitPattern count="other">квадрат инч тутамд {0} фунт</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>мөнгөн усны баганын инч</displayName>
<unitPattern count="one">{0} мөнгөн усны баганын инч</unitPattern>
<unitPattern count="other">{0} мөнгөн усны баганын инч</unitPattern>
@@ -6448,7 +6521,7 @@
<unitPattern count="one">{0} Кельвиний хэм</unitPattern>
<unitPattern count="other">{0} Кельвиний хэм</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт фүүт</displayName>
<unitPattern count="one">{0} фунт фүүт</unitPattern>
<unitPattern count="other">{0} фунт фүүт</unitPattern>
@@ -6602,9 +6675,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ё{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>х{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Ё{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6613,7 +6756,7 @@
<unitPattern count="one">{0} Жи</unitPattern>
<unitPattern count="other">{0} Жи</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метр/сек²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="other">{0} м/с²</unitPattern>
@@ -6713,7 +6856,7 @@
<unitPattern count="one">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>хувь/сая</displayName>
<unitPattern count="one">{0}x10⁻⁶</unitPattern>
<unitPattern count="other">{0}x10⁻⁶</unitPattern>
@@ -6743,7 +6886,7 @@
<unitPattern count="one">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100км</displayName>
<unitPattern count="one">{0} л/100км</unitPattern>
<unitPattern count="other">{0} л/100км</unitPattern>
@@ -6947,8 +7090,8 @@
</unit>
<unit type="force-pound-force">
<displayName>фунт хүч</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="force-newton">
<displayName>ньютон</displayName>
@@ -6991,14 +7134,14 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel-per-inch">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="graphics-dot-per-centimeter">
<displayName>цэг/см</displayName>
@@ -7219,17 +7362,17 @@
<unitPattern count="one">{0} мх</unitPattern>
<unitPattern count="other">{0} мх</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм.муб</displayName>
<unitPattern count="one">{0} мм.муб</unitPattern>
<unitPattern count="other">{0} мм.муб</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунт/инч²</displayName>
<unitPattern count="one">{0} фунт/инч²</unitPattern>
<unitPattern count="other">{0} фунт/инч²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>инч.муб</displayName>
<unitPattern count="one">{0} инч.муб</unitPattern>
<unitPattern count="other">{0} инч.муб</unitPattern>
@@ -7309,15 +7452,15 @@
<unitPattern count="one">{0}°К</unitPattern>
<unitPattern count="other">{0}°К</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="torque-newton-meter">
<displayName>Н*м</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="volume-cubic-kilometer">
<displayName>км³</displayName>
@@ -7463,9 +7606,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ё{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>х{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Ё{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7514,7 +7727,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100км</displayName>
<unitPattern count="one">{0} л/100км</unitPattern>
<unitPattern count="other">{0}л/100км</unitPattern>
@@ -7633,7 +7846,7 @@
<unitPattern count="one">{0} м.х.</unitPattern>
<unitPattern count="other">{0} м.х.</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} муб</unitPattern>
<unitPattern count="other">{0} муб</unitPattern>
</unit>
diff --git a/common/main/mn_MN.xml b/common/main/mn_MN.xml
index bc50ffc..0b3b6f8 100644
--- a/common/main/mn_MN.xml
+++ b/common/main/mn_MN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mni.xml b/common/main/mni.xml
new file mode 100644
index 0000000..ea101f5
--- /dev/null
+++ b/common/main/mni.xml
@@ -0,0 +1,771 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="mni"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="de">জর্মন</language>
+ <language type="de_AT">ওষ্ট্রিয়ান জর্মন</language>
+ <language type="de_CH">স্বিজ হায় জর্মন</language>
+ <language type="en">ইংলিস</language>
+ <language type="en_AU">ওষ্ট্রেলিয়ান ইংলিস</language>
+ <language type="en_CA">কানাদিয়ান ইংলিস</language>
+ <language type="en_GB">ব্রিটিশ ইংলিস</language>
+ <language type="en_GB" alt="short">য়ু কে ইংলিস</language>
+ <language type="en_US">অমেরিকান ইংলিস</language>
+ <language type="en_US" alt="short">য়ু এস ইংলিস</language>
+ <language type="es">স্পেনিস</language>
+ <language type="es_419">লেটিন অমেরিকান স্পেনিস</language>
+ <language type="es_ES">↑↑↑</language>
+ <language type="es_MX">↑↑↑</language>
+ <language type="fr">ফ্রেঞ্চ</language>
+ <language type="fr_CA">কানাদিয়ান ফ্রেঞ্চ</language>
+ <language type="fr_CH">স্বিজ ফ্রেঞ্চ</language>
+ <language type="it">ইটালিয়ান</language>
+ <language type="ja">জাপানিজ</language>
+ <language type="mni">মৈতৈলোন্</language>
+ <language type="pt">পোর্টুগিজ</language>
+ <language type="pt_BR">ব্রাজিলিয়ান পোর্টুগিজ</language>
+ <language type="pt_PT">য়ুরোপিয়ান পোর্টুগিজ</language>
+ <language type="ru">রুসিয়ান</language>
+ <language type="und">মশকখংদবা লোল</language>
+ <language type="zh">চাইনিজ</language>
+ <language type="zh" alt="menu">চাইনিজ মন্দারিন</language>
+ <language type="zh_Hans">সিমপ্লিফাইদ চাইনিজ</language>
+ <language type="zh_Hans" alt="long">সিমপ্লিফাইদ মন্দারিন চাইনিজ</language>
+ <language type="zh_Hant">ত্রেদিস্নেল চাইনিজ</language>
+ <language type="zh_Hant" alt="long">ত্রেদিস্নেল মন্দারিন চাইনিজ</language>
+ </languages>
+ <scripts>
+ <script type="Arab">আরবিক</script>
+ <script type="Beng">বাংলা</script>
+ <script type="Cyrl">সিরিলিক</script>
+ <script type="Hans">সিমপ্লিফাইদ</script>
+ <script type="Hans" alt="stand-alone">সিমপ্লিফাইদ চাইনিজ</script>
+ <script type="Hant">ত্রেদিস্নেল</script>
+ <script type="Hant" alt="stand-alone">ত্রেদিস্নেল চাইনিজ</script>
+ <script type="Latn">লেটিন</script>
+ <script type="Mtei" draft="contributed">মেইটেই মায়েক</script>
+ <script type="Zxxx">ইদবা</script>
+ <script type="Zzzz">মশকখংদবা স্ক্রিপ্ট</script>
+ </scripts>
+ <territories>
+ <territory type="BR">ব্রাজিল</territory>
+ <territory type="CN">চিনা</territory>
+ <territory type="DE">জর্মনি</territory>
+ <territory type="FR">ফ্রান্স</territory>
+ <territory type="GB">য়ুনাইটেদ কিংদম</territory>
+ <territory type="IN">ইন্দিয়া</territory>
+ <territory type="IT">ইটালি</territory>
+ <territory type="JP">জাপান</territory>
+ <territory type="RU">রুসিয়া</territory>
+ <territory type="US">য়ুনাইটেদ ষ্টেটস</territory>
+ <territory type="ZZ">মশকখংদবা লমদম</territory>
+ </territories>
+ <types>
+ <type key="calendar" type="gregorian">গ্রিগোরিয়ান কেলেন্দর</type>
+ <type key="collation" type="standard">ষ্টেন্দর্দ সোর্ট ওর্দর</type>
+ <type key="numbers" type="beng">বাংলা দিজিট</type>
+ <type key="numbers" type="latn">ৱেস্তর্ন দিজিট</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">মেত্রিক</measurementSystemName>
+ <measurementSystemName type="UK">য়ু কে</measurementSystemName>
+ <measurementSystemName type="US">য়ু এস</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">লোল: {0}</codePattern>
+ <codePattern type="script">স্ক্রিপ্ট: {0}</codePattern>
+ <codePattern type="territory">লমদম: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[\u09BC \u0981 ং ঃ অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC} ঢ {ঢ\u09BC} ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} র ল ৱ শ ষ স হ া ি ী \u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="contributed">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters>
+ </characters>
+ <delimiters>
+ <quotationStart>↑↑↑</quotationStart>
+ <quotationEnd>↑↑↑</quotationEnd>
+ <alternateQuotationStart>↑↑↑</alternateQuotationStart>
+ <alternateQuotationEnd>↑↑↑</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>MMMM d, y G, EEEE</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/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <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>
+ <intervalFormats>
+ <intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">মার্চ</month>
+ <month type="4">এপ্রিল</month>
+ <month type="5">মে</month>
+ <month type="6">জুন</month>
+ <month type="7">জুলাই</month>
+ <month type="8">আগস্ট</month>
+ <month type="9">সেপ্টেম্বর</month>
+ <month type="10">ওক্টোবর</month>
+ <month type="11">নভেম্বর</month>
+ <month type="12">ডিসেম্বর</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">জা</month>
+ <month type="2">ফে</month>
+ <month type="3">মার</month>
+ <month type="4">এপ</month>
+ <month type="5">মে</month>
+ <month type="6">জুন</month>
+ <month type="7">জুল</month>
+ <month type="8">আ</month>
+ <month type="9">সে</month>
+ <month type="10">ওক</month>
+ <month type="11">নব</month>
+ <month type="12">ডি</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">জানুৱারি</month>
+ <month type="2">ফেব্রুৱারি</month>
+ <month type="3">মার্চ</month>
+ <month type="4">এপ্রিল</month>
+ <month type="5">মে</month>
+ <month type="6">জুন</month>
+ <month type="7">জুলাই</month>
+ <month type="8">আগস্ট</month>
+ <month type="9">সেপ্টেম্বর</month>
+ <month type="10">ওক্টোবর</month>
+ <month type="11">নভেম্বর</month>
+ <month type="12">ডিসেম্বর</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">জানু</month>
+ <month type="2">ফেব্রু</month>
+ <month type="3">মার</month>
+ <month type="4">এপ্রি</month>
+ <month type="5">মে</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">জুলা</month>
+ <month type="8">আগ</month>
+ <month type="9">সেপ্ট</month>
+ <month type="10">ওক্টো</month>
+ <month type="11">নভে</month>
+ <month type="12">ডিসে</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">জা</month>
+ <month type="2">ফে</month>
+ <month type="3">মার</month>
+ <month type="4">এপ</month>
+ <month type="5">মে</month>
+ <month type="6">জুন</month>
+ <month type="7">জুল</month>
+ <month type="8">আ</month>
+ <month type="9">সে</month>
+ <month type="10">ও</month>
+ <month type="11">নব</month>
+ <month type="12">ডি</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">জানুৱারি</month>
+ <month type="2">ফেব্রুৱারি</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">নোংমাইজিং</day>
+ <day type="mon">নিংথৌকাবা</day>
+ <day type="tue">লৈবাকপোকপা</day>
+ <day type="wed">য়ুমশকৈশা</day>
+ <day type="thu">শগোলশেন</day>
+ <day type="fri">ইরাই</day>
+ <day type="sat">থাংজ</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">নিং</day>
+ <day type="tue">লৈ</day>
+ <day type="wed">য়ুম</day>
+ <day type="thu">↑↑↑</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">↑↑↑</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">নোংমাইজিং</day>
+ <day type="mon">নিংথৌকাবা</day>
+ <day type="tue">লৈবাকপোকপা</day>
+ <day type="wed">য়ুমশকৈশা</day>
+ <day type="thu">শগোলশেন</day>
+ <day type="fri">ইরাই</day>
+ <day type="sat">থাংজ</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">↑↑↑</day>
+ <day type="tue">↑↑↑</day>
+ <day type="wed">↑↑↑</day>
+ <day type="thu">↑↑↑</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">থাংজ</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">নো</day>
+ <day type="mon">নিং</day>
+ <day type="tue">লৈ</day>
+ <day type="wed">য়ুম</day>
+ <day type="thu">শগ</day>
+ <day type="fri">ইরা</day>
+ <day type="sat">থাং</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">↑↑↑</day>
+ <day type="tue">↑↑↑</day>
+ <day type="wed">↑↑↑</day>
+ <day type="thu">↑↑↑</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">থাংজ</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">অহানবা মসুং</quarter>
+ <quarter type="2">অনীশুবা মসুং</quarter>
+ <quarter type="3">অহুমশুবা মসুং</quarter>
+ <quarter type="4">মরীশুবা মসুং</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">অহানবা মসুং</quarter>
+ <quarter type="2">অনীশুবা মসুং</quarter>
+ <quarter type="3">অহুমশুবা মসুং</quarter>
+ <quarter type="4">মরীশুবা মসুং</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="abbreviated">
+ <dayPeriod type="am">নুমাং</dayPeriod>
+ <dayPeriod type="pm">↑↑↑</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">এ এম</dayPeriod>
+ <dayPeriod type="pm">পি এম</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">খৃ: মমাং</era>
+ <era type="0" alt="variant">বি সি ই</era>
+ <era type="1">খৃ: মতুং</era>
+ <era type="1" alt="variant">সি ই</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>MMMM d, y, EEEE</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>MMMM d, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>MMM d, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </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="Bh">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ehm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ehms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</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">↑↑↑</dateFormatItem>
+ <dateFormatItem id="H">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">d/M</dateFormatItem>
+ <dateFormatItem id="MEd">d/M, E</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">MMM d</dateFormatItem>
+ <dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+ <dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+ <dateFormatItem id="ms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">M/y</dateFormatItem>
+ <dateFormatItem id="yMd">d/M/y</dateFormatItem>
+ <dateFormatItem id="yMEd">d/M/y, E</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">MMM d, y, E</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>চক</displayName>
+ </field>
+ <field type="year">
+ <displayName>চহী</displayName>
+ </field>
+ <field type="year-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="year-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="quarter">
+ <displayName>মসুং</displayName>
+ </field>
+ <field type="quarter-short">
+ <displayName>মসুং</displayName>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>মসুং</displayName>
+ </field>
+ <field type="month">
+ <displayName>থা</displayName>
+ </field>
+ <field type="month-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="month-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="week">
+ <displayName>চয়োল</displayName>
+ </field>
+ <field type="week-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="week-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="day">
+ <displayName>নুমিৎ</displayName>
+ <relative type="-1">ঙরাং</relative>
+ <relative type="0">ঙসি</relative>
+ <relative type="1">হয়েং</relative>
+ </field>
+ <field type="day-short">
+ <displayName>↑↑↑</displayName>
+ <relative type="-1">ঙরাং</relative>
+ <relative type="0">ঙসি</relative>
+ <relative type="1">হয়েং</relative>
+ </field>
+ <field type="day-narrow">
+ <displayName>নুমিৎ</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">হয়েং</relative>
+ </field>
+ <field type="weekday">
+ <displayName>চয়োলগী নুমিৎ</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>এ এম/পি এম</displayName>
+ </field>
+ <field type="hour">
+ <displayName>পুং</displayName>
+ </field>
+ <field type="hour-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="hour-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute">
+ <displayName>মিনট</displayName>
+ </field>
+ <field type="minute-short">
+ <displayName>মিনট</displayName>
+ </field>
+ <field type="minute-narrow">
+ <displayName>মিনট</displayName>
+ </field>
+ <field type="second">
+ <displayName>সেকেণ্ড</displayName>
+ </field>
+ <field type="second-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="second-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="zone">
+ <displayName>জোন</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>+HH:mm;-HH:mm</hourFormat>
+ <gmtFormat>জি এম টি {0}</gmtFormat>
+ <gmtZeroFormat>জি এম টি</gmtZeroFormat>
+ <regionFormat>{0} টাইম</regionFormat>
+ <regionFormat type="daylight">{0} (+1) দেলাইট টাইম</regionFormat>
+ <regionFormat type="standard">{0} (+0) ষ্টেন্দর্দ টাইম</regionFormat>
+ <fallbackFormat>{1} ({0})</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>কোওর্দিনেটেদ য়ুনিভর্সেল টাইম</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>খংদবা সিটি</exemplarCity>
+ </zone>
+ <metazone type="America_Central">
+ <long>
+ <generic>নোর্থ অমেরিকান সেন্ত্রেল টাইম</generic>
+ <standard>নোর্থ অমেরিকান সেন্ত্রেল ষ্টেন্দর্দ টাইম</standard>
+ <daylight>নোর্থ অমেরিকান সেন্ত্রেল দেলাইট টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>নোর্থ অমেরিকান ইষ্টর্ন টাইম</generic>
+ <standard>নোর্থ অমেরিকান ইষ্টর্ন ষ্টেন্দর্দ টাইম</standard>
+ <daylight>নোর্থ অমেরিকান ইষ্টর্ন দেলাইট টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>নোর্থ অমেরিকান মাউন্টেন টাইম</generic>
+ <standard>নোর্থ অমেরিকান মাউন্টেন ষ্টেন্দর্দ টাইম</standard>
+ <daylight>নোর্থ অমেরিকান মাউন্টেন দেলাইট টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>নোর্থ অমেরিকান পেসিফিক টাইম</generic>
+ <standard>নোর্থ অমেরিকান পেসিফিক ষ্টেন্দর্দ টাইম</standard>
+ <daylight>নোর্থ অমেরিকান পেসিফিক দেলাইট টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>অটলান্টিক টাইম</generic>
+ <standard>অটলান্টিক ষ্টেন্দর্দ টাইম</standard>
+ <daylight>অটলান্টিক দেলাইট টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>সেন্ত্রেল য়ুরোপিয়ান টাইম</generic>
+ <standard>সেন্ত্রেল য়ুরোপিয়ান ষ্টেন্দর্দ টাইম</standard>
+ <daylight>সেন্ত্রেল য়ুরোপিয়ান সমর টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>ইষ্টর্ন য়ুরোপিয়ান টাইম</generic>
+ <standard>ইষ্টর্ন য়ুরোপিয়ান ষ্টেন্দর্দ টাইম</standard>
+ <daylight>ইষ্টর্ন য়ুরোপিয়ান সমর টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>ৱেষ্টর্ন য়ুরোপিয়ান টাইম</generic>
+ <standard>ৱেষ্টর্ন য়ুরোপিয়ান ষ্টেন্দর্দ টাইম</standard>
+ <daylight>ৱেষ্টর্ন য়ুরোপিয়ান সমর টাইম</daylight>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>গ্রিনৱিচ মিন টাইম</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem>beng</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">↑↑↑</native>
+ </otherNumberingSystems>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+ <percentSign>%</percentSign>
+ <plusSign>+</plusSign>
+ <minusSign>-</minusSign>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="BRL">
+ <displayName>ব্রাজিলিয়ান রেয়াল</displayName>
+ <displayName count="other">ব্রাজিলিয়ান রেয়াল</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>চাইনিজ য়ুআন</displayName>
+ <displayName count="other">চাইনিজ য়ুআন</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>য়ুরো</displayName>
+ <displayName count="other">য়ুরো</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>ব্রিটিশ পাউন্দ</displayName>
+ <displayName count="other">ব্রিটিশ পাউন্দ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>ইন্দিয়ান রুপি</displayName>
+ <displayName count="other">ইন্দিয়ান রুপি</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>জাপানিজ য়েন</displayName>
+ <displayName count="other">জাপানিজ য়েন</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>রুসিয়ান রুবল</displayName>
+ <displayName count="other">রুসিয়ান রুবল</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>য়ু এস দি</displayName>
+ <displayName count="other">য়ু এস দি</displayName>
+ <symbol draft="contributed">$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="XXX">
+ <displayName>মশকখংদবা করেন্সি</displayName>
+ <displayName count="other">মশকখংদবা করেন্সি</displayName>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <durationUnit type="hm">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </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>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>য়েস:y</yesstr>
+ <nostr>নো:n</nostr>
+ </messages>
+ </posix>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/mni_Beng.xml
similarity index 86%
copy from seed/main/mni_IN.xml
copy to common/main/mni_Beng.xml
index 01c64c4..00f9688 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/mni_Beng.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,6 @@
<identity>
<version number="$Revision$"/>
<language type="mni"/>
- <territory type="IN"/>
+ <script type="Beng"/>
</identity>
</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/mni_Beng_IN.xml
similarity index 87%
rename from seed/main/mni_IN.xml
rename to common/main/mni_Beng_IN.xml
index 01c64c4..166990d 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/mni_Beng_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,7 @@
<identity>
<version number="$Revision$"/>
<language type="mni"/>
+ <script type="Beng"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/common/main/mr.xml b/common/main/mr.xml
index 00a05b7..e8bde34 100644
--- a/common/main/mr.xml
+++ b/common/main/mr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -151,6 +151,7 @@
<language type="eu">बास्क</language>
<language type="ewo">इवोन्डो</language>
<language type="fa">फारसी</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">फँग</language>
<language type="fat">फन्टी</language>
<language type="ff">फुलाह</language>
@@ -763,7 +764,7 @@
<territory type="CG" alt="variant">काँगो (प्रजासत्ताक)</territory>
<territory type="CH">स्वित्झर्लंड</territory>
<territory type="CI">आयव्हरी कोस्ट</territory>
- <territory type="CI" alt="variant" draft="provisional">↑↑↑</territory>
+ <territory type="CI" alt="variant" draft="contributed">↑↑↑</territory>
<territory type="CK">कुक बेटे</territory>
<territory type="CL">चिली</territory>
<territory type="CM">कॅमेरून</territory>
@@ -5305,7 +5306,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>नॉरफोक बेट वेळ</standard>
+ <generic draft="contributed">नॉरफोक बेट वेळ</generic>
+ <standard draft="contributed">नॉरफोक बेट प्रमाण वेळ</standard>
+ <daylight draft="contributed">नॉरफोक बेट सूर्यप्रकाश वेळ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6854,9 +6857,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेसी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सेंटी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मिलि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>मायक्रो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅनो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पिको{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फेमिटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अॅटॉ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>झेपटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>योक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हेक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>किलो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मेगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गीगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टेरा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>एक्सा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झेट{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} प्रति {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>चौरस {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">चौरस {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">चौरस {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>घन{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">घन{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">घन{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6865,7 +6938,7 @@
<unitPattern count="one">{0} जी-फोर्स</unitPattern>
<unitPattern count="other">{0} जी-फोर्स</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मीटर प्रति सेकंद चौरस</displayName>
<unitPattern count="one">{0} मीटर प्रति सेकंद चौरस</unitPattern>
<unitPattern count="other">{0} मीटर प्रति सेकंद चौरस</unitPattern>
@@ -6965,7 +7038,7 @@
<unitPattern count="one">{0} मिलीमोल पर लिटर</unitPattern>
<unitPattern count="other">{0} मिलीमोलस् पर लिटर</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>भाग प्रति दशलक्ष</displayName>
<unitPattern count="one">{0} भाग प्रति दशलक्ष</unitPattern>
<unitPattern count="other">{0} भाग प्रति दशलक्ष</unitPattern>
@@ -6995,7 +7068,7 @@
<unitPattern count="one">{0} लीटर प्रति किलोमीटर</unitPattern>
<unitPattern count="other">{0} लीटर प्रति किलोमीटर</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लीटर प्रति 100 किलोमीटर</displayName>
<unitPattern count="one">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
<unitPattern count="other">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
@@ -7476,17 +7549,17 @@
<unitPattern count="one">{0} हॉर्सपॉवर</unitPattern>
<unitPattern count="other">{0} हॉर्सपॉवर</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>मर्क्यूरी मिलिमीटर</displayName>
<unitPattern count="one">{0} मर्क्यूरी मिलिमीटर</unitPattern>
<unitPattern count="other">{0} मर्क्यूरी मिलिमीटर</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>प्रति चौरस इंच पाउंड</displayName>
<unitPattern count="one">{0} प्रति चौरस इंच पाउंड</unitPattern>
<unitPattern count="other">{0} प्रति चौरस इंच पाउंड</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>मर्क्यूरी इंच</displayName>
<unitPattern count="one">{0} मर्क्यूरी इंच</unitPattern>
<unitPattern count="other">{0} मर्क्यूरी इंच</unitPattern>
@@ -7566,7 +7639,7 @@
<unitPattern count="one">{0} केल्व्हिन</unitPattern>
<unitPattern count="other">{0} केल्व्हिन</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>पाउंड-फूट</displayName>
<unitPattern count="one">{0} पाउंड-फुट</unitPattern>
<unitPattern count="other">{0} पाउंड-फूट</unitPattern>
@@ -7720,9 +7793,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेस{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>से{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>झेप{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>योक{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झेटा.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योट{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7731,7 +7874,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मीटर/सेक²</displayName>
<unitPattern count="one">{0} मी/से²</unitPattern>
<unitPattern count="other">{0} मी/से²</unitPattern>
@@ -7831,7 +7974,7 @@
<unitPattern count="one">{0} मिलीमो. /लि.</unitPattern>
<unitPattern count="other">{0} मिलीमो. /लि.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7861,7 +8004,7 @@
<unitPattern count="one">{0} ली/किमी</unitPattern>
<unitPattern count="other">{0} ली/किमी</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ली/100किमी</displayName>
<unitPattern count="one">{0} ली/100किमी</unitPattern>
<unitPattern count="other">{0} ली/100किमी</unitPattern>
@@ -8342,17 +8485,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8432,7 +8575,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8586,9 +8729,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>से{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अॅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>झे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>झे{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>यो{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8596,7 +8809,7 @@
<unitPattern count="one">{0}जी</unitPattern>
<unitPattern count="other">{0}जी</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">मीटर/सेक²</displayName>
<unitPattern count="one" draft="contributed">{0} मी/से²</unitPattern>
<unitPattern count="other" draft="contributed">{0} मी/से²</unitPattern>
@@ -8642,7 +8855,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ली/100किमी</displayName>
<unitPattern count="one">{0} ली/100किमी</unitPattern>
<unitPattern count="other">{0} ली/100किमी</unitPattern>
@@ -8840,17 +9053,17 @@
<unitPattern count="one">{0} हॉपॉ</unitPattern>
<unitPattern count="other">{0}हॉपॉ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″ Hg</displayName>
<unitPattern count="one">{0}" हेग्रॅ</unitPattern>
<unitPattern count="other">{0}" हेग्रॅ</unitPattern>
diff --git a/common/main/mr_IN.xml b/common/main/mr_IN.xml
index 8fcbe7e..e9f4782 100644
--- a/common/main/mr_IN.xml
+++ b/common/main/mr_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ms.xml b/common/main/ms.xml
index a1fc7d3..4afb416 100644
--- a/common/main/ms.xml
+++ b/common/main/ms.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -142,6 +142,7 @@
<language type="eu">Basque</language>
<language type="ewo">Ewondo</language>
<language type="fa">Parsi</language>
+ <language type="fa_AF">Dari</language>
<language type="ff">Fulah</language>
<language type="fi">Finland</language>
<language type="fil">Filipina</language>
@@ -480,11 +481,11 @@
<script type="Ahom" draft="contributed">↑↑↑</script>
<script type="Arab">Arab</script>
<script type="Arab" alt="variant">Perso-Arab</script>
+ <script type="Aran" draft="contributed">Nastaliq</script>
<script type="Armi" draft="contributed">Aramia Imperial</script>
<script type="Armn">Armenia</script>
<script type="Avst" draft="contributed">Avestan</script>
<script type="Bali" draft="contributed">Bali</script>
- <script type="Bamu" draft="contributed">Bamu</script>
<script type="Bass" draft="contributed">Bassa Vah</script>
<script type="Batk" draft="contributed">Batak</script>
<script type="Beng">Benggala</script>
@@ -495,7 +496,7 @@
<script type="Bugi" draft="contributed">Bugis</script>
<script type="Buhd" draft="contributed">Buhid</script>
<script type="Cakm" draft="contributed">Chakma</script>
- <script type="Cans" draft="contributed">Cans</script>
+ <script type="Cans">Suku Kata Orang Asli Kanada Bersatu</script>
<script type="Cari" draft="contributed">Carian</script>
<script type="Cham" draft="contributed">Cham</script>
<script type="Cher" draft="contributed">Cherokee</script>
@@ -943,8 +944,8 @@
<territory type="VU">Vanuatu</territory>
<territory type="WF">Wallis dan Futuna</territory>
<territory type="WS">Samoa</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">Aksen Pseudo</territory>
+ <territory type="XB">Bidi Pseudo</territory>
<territory type="XK">Kosovo</territory>
<territory type="YE">Yaman</territory>
<territory type="YT">Mayotte</territory>
@@ -959,106 +960,58 @@
<subdivision type="gbwls">Wales</subdivision>
</subdivisions>
<variants>
- <variant type="1901" draft="contributed">↑↑↑</variant>
- <variant type="1994" draft="contributed">↑↑↑</variant>
- <variant type="1996" draft="contributed">↑↑↑</variant>
- <variant type="1606NICT" draft="contributed">↑↑↑</variant>
- <variant type="1694ACAD" draft="contributed">↑↑↑</variant>
- <variant type="1959ACAD" draft="contributed">↑↑↑</variant>
- <variant type="ABL1943" draft="contributed">↑↑↑</variant>
- <variant type="AKUAPEM" draft="contributed">↑↑↑</variant>
- <variant type="ALALC97" draft="contributed">↑↑↑</variant>
- <variant type="ALUKU" draft="contributed">↑↑↑</variant>
- <variant type="AO1990" draft="contributed">↑↑↑</variant>
- <variant type="ARANES" draft="contributed">↑↑↑</variant>
- <variant type="ASANTE" draft="contributed">↑↑↑</variant>
- <variant type="AUVERN" draft="contributed">↑↑↑</variant>
- <variant type="BAKU1926" draft="contributed">↑↑↑</variant>
- <variant type="BALANKA" draft="contributed">↑↑↑</variant>
- <variant type="BARLA" draft="contributed">↑↑↑</variant>
- <variant type="BASICENG" draft="contributed">↑↑↑</variant>
- <variant type="BAUDDHA" draft="contributed">↑↑↑</variant>
- <variant type="BISCAYAN" draft="contributed">↑↑↑</variant>
- <variant type="BISKE" draft="contributed">↑↑↑</variant>
- <variant type="BOHORIC" draft="contributed">↑↑↑</variant>
- <variant type="BOONT" draft="contributed">↑↑↑</variant>
- <variant type="CISAUP" draft="contributed">↑↑↑</variant>
- <variant type="COLB1945" draft="contributed">↑↑↑</variant>
- <variant type="CORNU" draft="contributed">↑↑↑</variant>
- <variant type="CREISS" draft="contributed">↑↑↑</variant>
- <variant type="DAJNKO" draft="contributed">↑↑↑</variant>
- <variant type="EKAVSK" draft="contributed">↑↑↑</variant>
- <variant type="EMODENG" draft="contributed">↑↑↑</variant>
- <variant type="FONIPA" draft="contributed">↑↑↑</variant>
- <variant type="FONKIRSH" draft="contributed">↑↑↑</variant>
- <variant type="FONNAPA" draft="contributed">↑↑↑</variant>
- <variant type="FONUPA" draft="contributed">↑↑↑</variant>
- <variant type="FONXSAMP" draft="contributed">↑↑↑</variant>
- <variant type="GASCON" draft="contributed">↑↑↑</variant>
- <variant type="GRCLASS" draft="contributed">↑↑↑</variant>
- <variant type="GRITAL" draft="contributed">↑↑↑</variant>
- <variant type="GRMISTR" draft="contributed">↑↑↑</variant>
- <variant type="HEPBURN" draft="contributed">↑↑↑</variant>
- <variant type="HOGNORSK" draft="contributed">↑↑↑</variant>
- <variant type="HSISTEMO" draft="contributed">↑↑↑</variant>
- <variant type="IJEKAVSK" draft="contributed">↑↑↑</variant>
- <variant type="ITIHASA" draft="contributed">↑↑↑</variant>
- <variant type="IVANCHOV" draft="contributed">↑↑↑</variant>
- <variant type="JAUER" draft="contributed">↑↑↑</variant>
- <variant type="JYUTPING" draft="contributed">↑↑↑</variant>
- <variant type="KKCOR" draft="contributed">↑↑↑</variant>
- <variant type="KOCIEWIE" draft="contributed">↑↑↑</variant>
- <variant type="KSCOR" draft="contributed">↑↑↑</variant>
- <variant type="LAUKIKA" draft="contributed">↑↑↑</variant>
- <variant type="LEMOSIN" draft="contributed">↑↑↑</variant>
- <variant type="LENGADOC" draft="contributed">↑↑↑</variant>
- <variant type="LIPAW" draft="contributed">↑↑↑</variant>
- <variant type="LUNA1918" draft="contributed">↑↑↑</variant>
- <variant type="METELKO" draft="contributed">↑↑↑</variant>
- <variant type="MONOTON" draft="contributed">↑↑↑</variant>
- <variant type="NDYUKA" draft="contributed">↑↑↑</variant>
- <variant type="NEDIS" draft="contributed">↑↑↑</variant>
- <variant type="NEWFOUND" draft="contributed">↑↑↑</variant>
- <variant type="NICARD" draft="contributed">↑↑↑</variant>
- <variant type="NJIVA" draft="contributed">↑↑↑</variant>
- <variant type="NULIK" draft="contributed">↑↑↑</variant>
- <variant type="OSOJS" draft="contributed">↑↑↑</variant>
- <variant type="OXENDICT" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH2" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH3" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH4" draft="contributed">↑↑↑</variant>
- <variant type="PAMAKA" draft="contributed">↑↑↑</variant>
- <variant type="PETR1708" draft="contributed">↑↑↑</variant>
- <variant type="PINYIN" draft="contributed">↑↑↑</variant>
- <variant type="POLYTON" draft="contributed">↑↑↑</variant>
+ <variant type="1901">Sistem ejaan Jerman Tradisional</variant>
+ <variant type="1994">Sistem ejaan Resia standard</variant>
+ <variant type="1996">Sistem ejaan Jerman 1996</variant>
+ <variant type="1606NICT">Lewat Pertengahan Era Perancis hingga 1606</variant>
+ <variant type="1694ACAD">Awal Pertengahan Era Perancis</variant>
+ <variant type="1959ACAD">Akademik</variant>
+ <variant type="ABL1943">Perumusan sistem ejaan 1943</variant>
+ <variant type="ALALC97">Perumian ALA-LC, edisi 1997</variant>
+ <variant type="ALUKU">Dialek Aluku</variant>
+ <variant type="AO1990">Perjanjian Sistem Ejaan Bahasa Portugis 1990</variant>
+ <variant type="BAKU1926">Abjad Latin Turki Disatukan</variant>
+ <variant type="BALANKA">Dialek Balanka Anii</variant>
+ <variant type="BARLA">Kumpulan dialek Barlavento Kabuverdianu</variant>
+ <variant type="BISKE">Dialek San Giorgio/Bila</variant>
+ <variant type="BOHORIC">Abjad Bohoric</variant>
+ <variant type="BOONT">Boontling</variant>
+ <variant type="COLB1945">Konvensyen Sistem Ejaan Portugis-Brazil 1945</variant>
+ <variant type="DAJNKO">Abjad Dajnko</variant>
+ <variant type="EKAVSK">Serbia dengan sebutan Ekavia</variant>
+ <variant type="EMODENG">Inggeris Moden Awal</variant>
+ <variant type="FONIPA">Fonetik IPA</variant>
+ <variant type="FONUPA">Fonetik UPA</variant>
+ <variant type="HEPBURN">Perumian Hepburn</variant>
+ <variant type="IJEKAVSK">Fon Serbia dengan sebutan Ijekavia</variant>
+ <variant type="KKCOR">Sistem Ejaan Lazim</variant>
+ <variant type="KSCOR">Sistem Ejaan Standard</variant>
+ <variant type="LIPAW">Dialek Lipovaz Resia</variant>
+ <variant type="METELKO">Abjad Metelko</variant>
+ <variant type="MONOTON">Ekanada</variant>
+ <variant type="NDYUKA">Dialek Ndyuka</variant>
+ <variant type="NEDIS">Dialek Natisone</variant>
+ <variant type="NJIVA">Dialek Gniva/Njiva</variant>
+ <variant type="NULIK">Volapuk Moden</variant>
+ <variant type="OSOJS">Dialek Oseacco/Osojane</variant>
+ <variant type="OXENDICT">Ejaan Kamus Inggeris Oxford</variant>
+ <variant type="PAMAKA">Dialek Pamaka</variant>
+ <variant type="PINYIN">Perumian Pinyin</variant>
+ <variant type="POLYTON">Banyak Nada</variant>
<variant type="POSIX">Komputer</variant>
- <variant type="PROVENC" draft="contributed">↑↑↑</variant>
- <variant type="PUTER" draft="contributed">↑↑↑</variant>
- <variant type="REVISED" draft="contributed">↑↑↑</variant>
- <variant type="RIGIK" draft="contributed">↑↑↑</variant>
- <variant type="ROZAJ" draft="contributed">↑↑↑</variant>
- <variant type="RUMGR" draft="contributed">↑↑↑</variant>
- <variant type="SAAHO" draft="contributed">↑↑↑</variant>
+ <variant type="REVISED">Sistem Ejaan Semakan</variant>
+ <variant type="RIGIK">Vopaluk Klasik</variant>
+ <variant type="ROZAJ">Resia</variant>
+ <variant type="SAAHO">Saho</variant>
<variant type="SCOTLAND">Inggeris Standard Scotland</variant>
- <variant type="SCOUSE" draft="contributed">↑↑↑</variant>
- <variant type="SIMPLE" draft="contributed">↑↑↑</variant>
- <variant type="SOLBA" draft="contributed">↑↑↑</variant>
- <variant type="SOTAV" draft="contributed">↑↑↑</variant>
- <variant type="SPANGLIS" draft="contributed">↑↑↑</variant>
- <variant type="SURMIRAN" draft="contributed">↑↑↑</variant>
- <variant type="SURSILV" draft="contributed">↑↑↑</variant>
- <variant type="SUTSILV" draft="contributed">↑↑↑</variant>
- <variant type="TARASK" draft="contributed">↑↑↑</variant>
- <variant type="UCCOR" draft="contributed">↑↑↑</variant>
- <variant type="UCRCOR" draft="contributed">↑↑↑</variant>
- <variant type="ULSTER" draft="contributed">↑↑↑</variant>
- <variant type="UNIFON" draft="contributed">↑↑↑</variant>
- <variant type="VAIDIKA" draft="contributed">↑↑↑</variant>
- <variant type="VALENCIA" draft="contributed">↑↑↑</variant>
- <variant type="VALLADER" draft="contributed">↑↑↑</variant>
- <variant type="VIVARAUP" draft="contributed">↑↑↑</variant>
- <variant type="WADEGILE" draft="contributed">↑↑↑</variant>
- <variant type="XSISTEMO" draft="contributed">↑↑↑</variant>
+ <variant type="SOLBA">Dialek Stolvizza/Solbica</variant>
+ <variant type="SOTAV">Kumpulan dialek Sotavento Kabuverdianu</variant>
+ <variant type="TARASK">Sistem ejaan Taraskievica</variant>
+ <variant type="UCCOR">Sistem Ejaan Bersatu</variant>
+ <variant type="UCRCOR">Sistem Ejaan Semakan Bersatu</variant>
+ <variant type="UNIFON">Abjad fonetik Unifon</variant>
+ <variant type="VALENCIA">Valencia</variant>
+ <variant type="WADEGILE">Perumian Wade-Giles</variant>
</variants>
<keys>
<key type="calendar">Kalendar</key>
@@ -3300,6 +3253,7 @@
<era type="236" draft="contributed">↑↑↑</era>
</eraAbbr>
<eraNarrow>
+ <era type="2" draft="contributed">↑↑↑</era>
<era type="236" draft="contributed">↑↑↑</era>
</eraNarrow>
</eras>
@@ -5972,7 +5926,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Waktu Kepulauan Norfolk</standard>
+ <generic draft="contributed">Waktu Kepulauan Norfolk</generic>
+ <standard draft="contributed">Waktu Piawai Kepulauan Norfolk</standard>
+ <daylight draft="contributed">Waktu Musim Panas Kepulauan Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6252,6 +6208,7 @@
<timeSeparator draft="contributed">↑↑↑</timeSeparator>
</symbols>
<symbols numberSystem="arab">
+ <plusSign draft="contributed">↑↑↑</plusSign>
<timeSeparator draft="contributed">↑↑↑</timeSeparator>
</symbols>
<symbols numberSystem="bali">
@@ -6277,6 +6234,9 @@
<nan>NaN</nan>
<timeSeparator draft="contributed">:</timeSeparator>
</symbols>
+ <symbols numberSystem="olck">
+ <decimal draft="contributed">↑↑↑</decimal>
+ </symbols>
<symbols numberSystem="sora">
<timeSeparator draft="contributed">↑↑↑</timeSeparator>
</symbols>
@@ -6731,7 +6691,7 @@
<symbol alt="narrow" draft="contributed">E£</symbol>
</currency>
<currency type="ERN">
- <displayName>ERN</displayName>
+ <displayName>Nakfa Eritrea</displayName>
<displayName count="other">Nakfa Eritrea</displayName>
<symbol draft="contributed">ERN</symbol>
</currency>
@@ -7080,6 +7040,8 @@
<symbol alt="narrow" draft="contributed">Ar</symbol>
</currency>
<currency type="MGF">
+ <displayName draft="contributed">Franc Malagasy</displayName>
+ <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MKD">
@@ -7164,9 +7126,13 @@
<symbol alt="narrow" draft="contributed">RM</symbol>
</currency>
<currency type="MZE">
+ <displayName draft="contributed">Escudo Mozambique</displayName>
+ <displayName count="other" draft="contributed">Escudo Mozambique</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MZM">
+ <displayName draft="contributed">Metical Mozambique (1980–2006)</displayName>
+ <displayName count="other" draft="contributed">Metical Mozambique (1980–2006)</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MZN">
@@ -7278,6 +7244,8 @@
<symbol draft="contributed">QAR</symbol>
</currency>
<currency type="RHD">
+ <displayName draft="contributed">Dolar Rhodesia</displayName>
+ <displayName count="other" draft="contributed">Dolar Rhodesia</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ROL">
@@ -7486,6 +7454,8 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UGS">
+ <displayName draft="contributed">Shilling Uganda (1966–1987)</displayName>
+ <displayName count="other" draft="contributed">Shilling Uganda (1966–1987)</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UGX">
@@ -7657,6 +7627,7 @@
</currency>
<currency type="ZMK">
<displayName>Kwacha Zambia (1968–2012)</displayName>
+ <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">ZMK</symbol>
</currency>
<currency type="ZMW">
@@ -7672,12 +7643,18 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZWD">
+ <displayName draft="contributed">Dolar Zimbabwe (1980–2008)</displayName>
+ <displayName count="other" draft="contributed">Dolar Zimbabwe (1980–2008)</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZWL">
+ <displayName draft="contributed">Dolar Zimbabwe (2009)</displayName>
+ <displayName count="other" draft="contributed">Dolar Zimbabwe (2009)</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ZWR">
+ <displayName draft="contributed">Dolar Zimbabwe (2008)</displayName>
+ <displayName count="other" draft="contributed">Dolar Zimbabwe (2008)</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
</currencies>
@@ -7695,9 +7672,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} persegi</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">persegi {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} padu</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">padu {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7705,7 +7750,7 @@
<displayName>daya g</displayName>
<unitPattern count="other">{0} daya g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter sesaat ganda dua</displayName>
<unitPattern count="other">{0} meter sesaat ganda dua</unitPattern>
</unit>
@@ -7786,7 +7831,7 @@
<displayName>milimol setiap liter</displayName>
<unitPattern count="other">{0} milimol setiap liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bahagian setiap juta</displayName>
<unitPattern count="other">{0} bahagian setiap juta</unitPattern>
</unit>
@@ -7810,7 +7855,7 @@
<displayName>liter sekilometer</displayName>
<unitPattern count="other">{0} liter sekilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter setiap 100 kilometer</displayName>
<unitPattern count="other">{0} liter setiap 100 kilometer</unitPattern>
</unit>
@@ -8206,15 +8251,15 @@
<displayName>kuasa kuda</displayName>
<unitPattern count="other">{0} kuasa kuda</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimeter raksa</displayName>
<unitPattern count="other">{0} milimeter raksa</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>paun seinci persegi</displayName>
<unitPattern count="other">{0} paun seinci persegi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inci raksa</displayName>
<unitPattern count="other">{0} inci raksa</unitPattern>
</unit>
@@ -8278,7 +8323,7 @@
<displayName>kelvin</displayName>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>kaki paun</displayName>
<unitPattern count="other">{0} kaki paun</unitPattern>
</unit>
@@ -8404,9 +8449,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8414,7 +8527,7 @@
<displayName>daya g</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -8495,7 +8608,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -8519,7 +8632,7 @@
<displayName>liter/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -8915,15 +9028,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -8987,7 +9100,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9113,9 +9226,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9123,9 +9304,12 @@
<displayName>daya g</displayName>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="other">{0}m/s²</unitPattern>
</unit>
+ <unit type="angle-degree">
+ <unitPattern count="other" draft="contributed">{0}°</unitPattern>
+ </unit>
<unit type="angle-arc-minute">
<unitPattern count="other">{0}′</unitPattern>
</unit>
@@ -9157,7 +9341,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -9368,15 +9552,15 @@
<unit type="power-horsepower">
<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/ms_BN.xml b/common/main/ms_BN.xml
index a68cd22..9d3d2da 100644
--- a/common/main/ms_BN.xml
+++ b/common/main/ms_BN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ms_ID.xml b/common/main/ms_ID.xml
new file mode 100644
index 0000000..2f82fd9
--- /dev/null
+++ b/common/main/ms_ID.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ms"/>
+ <territory type="ID"/>
+ </identity>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, dd MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/yy GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, dd MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>HH.mm.ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>HH.mm.ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>HH.mm.ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>HH.mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ <dateTimeFormats>
+ <availableFormats>
+ <dateFormatItem id="Bhm">h.mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h.mm.ss B</dateFormatItem>
+ <dateFormatItem id="EBhm">E h.mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h.mm.ss B</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="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="hmsv">h.mm.ss. a v</dateFormatItem>
+ <dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+ <dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+ <dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h.mm B – h.mm B</greatestDifference>
+ <greatestDifference id="h">h.mm – h.mm B</greatestDifference>
+ <greatestDifference id="m">h.mm – h.mm B</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>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="islamic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, dd MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ </calendar>
+ </calendars>
+ <timeZoneNames>
+ <hourFormat>+HH.mm;-HH.mm</hourFormat>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <symbols numberSystem="latn">
+ <decimal>,</decimal>
+ <group>.</group>
+ <timeSeparator>.</timeSeparator>
+ </symbols>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="accounting">
+ <pattern>¤#,##0.00</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ </currencyFormats>
+ <currencies>
+ <currency type="IDR">
+ <symbol>Rp</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+</ldml>
diff --git a/common/main/ms_MY.xml b/common/main/ms_MY.xml
index 0d129b3..96ed6ad 100644
--- a/common/main/ms_MY.xml
+++ b/common/main/ms_MY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ms_SG.xml b/common/main/ms_SG.xml
index 390074c..555a08c 100644
--- a/common/main/ms_SG.xml
+++ b/common/main/ms_SG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mt.xml b/common/main/mt.xml
index 0111a54..b3816c4 100644
--- a/common/main/mt.xml
+++ b/common/main/mt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3368,359 +3368,148 @@
</currencyFormats>
<currencies>
<currency type="AED">
- <displayName>AED</displayName>
- <displayName count="one">AED</displayName>
- <displayName count="few">AED</displayName>
- <displayName count="many">AED</displayName>
- <displayName count="other">AED</displayName>
<symbol draft="contributed">AED</symbol>
</currency>
<currency type="AFN">
- <displayName>AFN</displayName>
- <displayName count="one">AFN</displayName>
- <displayName count="few">AFN</displayName>
- <displayName count="many">AFN</displayName>
- <displayName count="other">AFN</displayName>
<symbol draft="contributed">AFN</symbol>
</currency>
<currency type="ALL">
- <displayName>ALL</displayName>
- <displayName count="one">ALL</displayName>
- <displayName count="few">ALL</displayName>
- <displayName count="many">ALL</displayName>
- <displayName count="other">ALL</displayName>
<symbol draft="contributed">ALL</symbol>
</currency>
<currency type="AMD">
- <displayName>AMD</displayName>
- <displayName count="one">AMD</displayName>
- <displayName count="few">AMD</displayName>
- <displayName count="many">AMD</displayName>
- <displayName count="other">AMD</displayName>
<symbol draft="contributed">AMD</symbol>
</currency>
<currency type="ANG">
- <displayName>ANG</displayName>
- <displayName count="one">ANG</displayName>
- <displayName count="few">ANG</displayName>
- <displayName count="many">ANG</displayName>
- <displayName count="other">ANG</displayName>
<symbol draft="contributed">ANG</symbol>
</currency>
<currency type="AOA">
- <displayName>AOA</displayName>
- <displayName count="one">AOA</displayName>
- <displayName count="few">AOA</displayName>
- <displayName count="many">AOA</displayName>
- <displayName count="other">AOA</displayName>
<symbol draft="contributed">AOA</symbol>
<symbol alt="narrow" draft="contributed">Kz</symbol>
</currency>
<currency type="ARS">
- <displayName>ARS</displayName>
- <displayName count="one">ARS</displayName>
- <displayName count="few">ARS</displayName>
- <displayName count="many">ARS</displayName>
- <displayName count="other">ARS</displayName>
<symbol draft="contributed">ARS</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="AUD">
- <displayName>AUD</displayName>
- <displayName count="one">AUD</displayName>
- <displayName count="few">AUD</displayName>
- <displayName count="many">AUD</displayName>
- <displayName count="other">AUD</displayName>
<symbol draft="contributed">A$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="AWG">
- <displayName>AWG</displayName>
- <displayName count="one">AWG</displayName>
- <displayName count="few">AWG</displayName>
- <displayName count="many">AWG</displayName>
- <displayName count="other">AWG</displayName>
<symbol draft="contributed">AWG</symbol>
</currency>
<currency type="AZN">
- <displayName>AZN</displayName>
- <displayName count="one">AZN</displayName>
- <displayName count="few">AZN</displayName>
- <displayName count="many">AZN</displayName>
- <displayName count="other">AZN</displayName>
<symbol draft="contributed">AZN</symbol>
</currency>
<currency type="BAM">
- <displayName>BAM</displayName>
- <displayName count="one">BAM</displayName>
- <displayName count="few">BAM</displayName>
- <displayName count="many">BAM</displayName>
- <displayName count="other">BAM</displayName>
<symbol draft="contributed">BAM</symbol>
<symbol alt="narrow" draft="contributed">KM</symbol>
</currency>
<currency type="BBD">
- <displayName>BBD</displayName>
- <displayName count="one">BBD</displayName>
- <displayName count="few">BBD</displayName>
- <displayName count="many">BBD</displayName>
- <displayName count="other">BBD</displayName>
<symbol draft="contributed">BBD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="BDT">
- <displayName>BDT</displayName>
- <displayName count="one">BDT</displayName>
- <displayName count="few">BDT</displayName>
- <displayName count="many">BDT</displayName>
- <displayName count="other">BDT</displayName>
<symbol draft="contributed">BDT</symbol>
<symbol alt="narrow" draft="contributed">৳</symbol>
</currency>
<currency type="BGN">
- <displayName>BGN</displayName>
- <displayName count="one">BGN</displayName>
- <displayName count="few">BGN</displayName>
- <displayName count="many">BGN</displayName>
- <displayName count="other">BGN</displayName>
<symbol draft="contributed">BGN</symbol>
</currency>
<currency type="BHD">
- <displayName>BHD</displayName>
- <displayName count="one">BHD</displayName>
- <displayName count="few">BHD</displayName>
- <displayName count="many">BHD</displayName>
- <displayName count="other">BHD</displayName>
<symbol draft="contributed">BHD</symbol>
</currency>
<currency type="BIF">
- <displayName>BIF</displayName>
- <displayName count="one">BIF</displayName>
- <displayName count="few">BIF</displayName>
- <displayName count="many">BIF</displayName>
- <displayName count="other">BIF</displayName>
<symbol draft="contributed">BIF</symbol>
</currency>
<currency type="BMD">
- <displayName>BMD</displayName>
- <displayName count="one">BMD</displayName>
- <displayName count="few">BMD</displayName>
- <displayName count="many">BMD</displayName>
- <displayName count="other">BMD</displayName>
<symbol draft="contributed">BMD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="BND">
- <displayName>BND</displayName>
- <displayName count="one">BND</displayName>
- <displayName count="few">BND</displayName>
- <displayName count="many">BND</displayName>
- <displayName count="other">BND</displayName>
<symbol draft="contributed">BND</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="BOB">
- <displayName>BOB</displayName>
- <displayName count="one">BOB</displayName>
- <displayName count="few">BOB</displayName>
- <displayName count="many">BOB</displayName>
- <displayName count="other">BOB</displayName>
<symbol draft="contributed">BOB</symbol>
<symbol alt="narrow" draft="contributed">Bs</symbol>
</currency>
<currency type="BRL">
- <displayName>BRL</displayName>
- <displayName count="one">BRL</displayName>
- <displayName count="few">BRL</displayName>
- <displayName count="many">BRL</displayName>
- <displayName count="other">BRL</displayName>
<symbol draft="contributed">R$</symbol>
<symbol alt="narrow" draft="contributed">R$</symbol>
</currency>
<currency type="BSD">
- <displayName>BSD</displayName>
- <displayName count="one">BSD</displayName>
- <displayName count="few">BSD</displayName>
- <displayName count="many">BSD</displayName>
- <displayName count="other">BSD</displayName>
<symbol draft="contributed">BSD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="BTN">
- <displayName>BTN</displayName>
- <displayName count="one">BTN</displayName>
- <displayName count="few">BTN</displayName>
- <displayName count="many">BTN</displayName>
- <displayName count="other">BTN</displayName>
<symbol draft="contributed">BTN</symbol>
</currency>
<currency type="BWP">
- <displayName>BWP</displayName>
- <displayName count="one">BWP</displayName>
- <displayName count="few">BWP</displayName>
- <displayName count="many">BWP</displayName>
- <displayName count="other">BWP</displayName>
<symbol draft="contributed">BWP</symbol>
<symbol alt="narrow" draft="contributed">P</symbol>
</currency>
<currency type="BYN">
- <displayName>BYN</displayName>
- <displayName count="one">BYN</displayName>
- <displayName count="few">BYN</displayName>
- <displayName count="many">BYN</displayName>
- <displayName count="other">BYN</displayName>
<symbol draft="contributed">BYN</symbol>
<symbol alt="narrow" draft="contributed">р.</symbol>
</currency>
<currency type="BYR">
- <displayName>BYR</displayName>
- <displayName count="one">BYR</displayName>
- <displayName count="few">BYR</displayName>
- <displayName count="many">BYR</displayName>
- <displayName count="other">BYR</displayName>
<symbol draft="contributed">BYR</symbol>
</currency>
<currency type="BZD">
- <displayName>BZD</displayName>
- <displayName count="one">BZD</displayName>
- <displayName count="few">BZD</displayName>
- <displayName count="many">BZD</displayName>
- <displayName count="other">BZD</displayName>
<symbol draft="contributed">BZD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
- <currency type="CAD">
- <displayName>CAD</displayName>
- <displayName count="one">CAD</displayName>
- <displayName count="few">CAD</displayName>
- <displayName count="many">CAD</displayName>
- <displayName count="other">CAD</displayName>
- </currency>
<currency type="CDF">
- <displayName>CDF</displayName>
- <displayName count="one">CDF</displayName>
- <displayName count="few">CDF</displayName>
- <displayName count="many">CDF</displayName>
- <displayName count="other">CDF</displayName>
<symbol draft="contributed">CDF</symbol>
</currency>
<currency type="CHF">
- <displayName>CHF</displayName>
- <displayName count="one">CHF</displayName>
- <displayName count="few">CHF</displayName>
- <displayName count="many">CHF</displayName>
- <displayName count="other">CHF</displayName>
<symbol draft="contributed">CHF</symbol>
</currency>
<currency type="CLP">
- <displayName>CLP</displayName>
- <displayName count="one">CLP</displayName>
- <displayName count="few">CLP</displayName>
- <displayName count="many">CLP</displayName>
- <displayName count="other">CLP</displayName>
<symbol draft="contributed">CLP</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="COP">
- <displayName>COP</displayName>
- <displayName count="one">COP</displayName>
- <displayName count="few">COP</displayName>
- <displayName count="many">COP</displayName>
- <displayName count="other">COP</displayName>
<symbol draft="contributed">COP</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CRC">
- <displayName>CRC</displayName>
- <displayName count="one">CRC</displayName>
- <displayName count="few">CRC</displayName>
- <displayName count="many">CRC</displayName>
- <displayName count="other">CRC</displayName>
<symbol draft="contributed">CRC</symbol>
<symbol alt="narrow" draft="contributed">₡</symbol>
</currency>
<currency type="CUC">
- <displayName>CUC</displayName>
- <displayName count="one">CUC</displayName>
- <displayName count="few">CUC</displayName>
- <displayName count="many">CUC</displayName>
- <displayName count="other">CUC</displayName>
<symbol draft="contributed">CUC</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CUP">
- <displayName>CUP</displayName>
- <displayName count="one">CUP</displayName>
- <displayName count="few">CUP</displayName>
- <displayName count="many">CUP</displayName>
- <displayName count="other">CUP</displayName>
<symbol draft="contributed">CUP</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CVE">
- <displayName>CVE</displayName>
- <displayName count="one">CVE</displayName>
- <displayName count="few">CVE</displayName>
- <displayName count="many">CVE</displayName>
- <displayName count="other">CVE</displayName>
<symbol draft="contributed">CVE</symbol>
</currency>
<currency type="CZK">
- <displayName>CZK</displayName>
- <displayName count="one">CZK</displayName>
- <displayName count="few">CZK</displayName>
- <displayName count="many">CZK</displayName>
- <displayName count="other">CZK</displayName>
<symbol draft="contributed">CZK</symbol>
<symbol alt="narrow" draft="contributed">Kč</symbol>
</currency>
<currency type="DJF">
- <displayName>DJF</displayName>
- <displayName count="one">DJF</displayName>
- <displayName count="few">DJF</displayName>
- <displayName count="many">DJF</displayName>
- <displayName count="other">DJF</displayName>
<symbol draft="contributed">DJF</symbol>
</currency>
<currency type="DOP">
- <displayName>DOP</displayName>
- <displayName count="one">DOP</displayName>
- <displayName count="few">DOP</displayName>
- <displayName count="many">DOP</displayName>
- <displayName count="other">DOP</displayName>
<symbol draft="contributed">DOP</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="DZD">
- <displayName>DZD</displayName>
- <displayName count="one">DZD</displayName>
- <displayName count="few">DZD</displayName>
- <displayName count="many">DZD</displayName>
- <displayName count="other">DZD</displayName>
<symbol draft="contributed">DZD</symbol>
</currency>
<currency type="EGP">
- <displayName count="one">EGP</displayName>
- <displayName count="few">EGP</displayName>
- <displayName count="many">EGP</displayName>
- <displayName count="other">EGP</displayName>
<symbol draft="contributed">EGP</symbol>
<symbol alt="narrow" draft="contributed">E£</symbol>
</currency>
<currency type="ERN">
- <displayName>ERN</displayName>
- <displayName count="one">ERN</displayName>
- <displayName count="few">ERN</displayName>
- <displayName count="many">ERN</displayName>
- <displayName count="other">ERN</displayName>
<symbol draft="contributed">ERN</symbol>
</currency>
<currency type="ETB">
- <displayName>ETB</displayName>
- <displayName count="one">ETB</displayName>
- <displayName count="few">ETB</displayName>
- <displayName count="many">ETB</displayName>
- <displayName count="other">ETB</displayName>
<symbol draft="contributed">ETB</symbol>
</currency>
<currency type="EUR">
@@ -3733,613 +3522,257 @@
<symbol alt="narrow" draft="contributed">€</symbol>
</currency>
<currency type="FJD">
- <displayName>FJD</displayName>
- <displayName count="one">FJD</displayName>
- <displayName count="few">FJD</displayName>
- <displayName count="many">FJD</displayName>
- <displayName count="other">FJD</displayName>
<symbol draft="contributed">FJD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="FKP">
- <displayName>FKP</displayName>
- <displayName count="one">FKP</displayName>
- <displayName count="few">FKP</displayName>
- <displayName count="many">FKP</displayName>
- <displayName count="other">FKP</displayName>
<symbol draft="contributed">FKP</symbol>
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="GEL">
- <displayName>GEL</displayName>
- <displayName count="one">GEL</displayName>
- <displayName count="few">GEL</displayName>
- <displayName count="many">GEL</displayName>
- <displayName count="other">GEL</displayName>
<symbol draft="contributed">GEL</symbol>
<symbol alt="narrow" draft="contributed">₾</symbol>
</currency>
<currency type="GHS">
- <displayName>GHS</displayName>
- <displayName count="one">GHS</displayName>
- <displayName count="few">GHS</displayName>
- <displayName count="many">GHS</displayName>
- <displayName count="other">GHS</displayName>
<symbol draft="contributed">GHS</symbol>
</currency>
<currency type="GIP">
- <displayName>GIP</displayName>
- <displayName count="one">GIP</displayName>
- <displayName count="few">GIP</displayName>
- <displayName count="many">GIP</displayName>
- <displayName count="other">GIP</displayName>
<symbol draft="contributed">GIP</symbol>
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="GMD">
- <displayName>GMD</displayName>
- <displayName count="one">GMD</displayName>
- <displayName count="few">GMD</displayName>
- <displayName count="many">GMD</displayName>
- <displayName count="other">GMD</displayName>
<symbol draft="contributed">GMD</symbol>
</currency>
<currency type="GNF">
- <displayName>GNF</displayName>
- <displayName count="one">GNF</displayName>
- <displayName count="few">GNF</displayName>
- <displayName count="many">GNF</displayName>
- <displayName count="other">GNF</displayName>
<symbol draft="contributed">GNF</symbol>
<symbol alt="narrow" draft="contributed">FG</symbol>
</currency>
<currency type="GTQ">
- <displayName>GTQ</displayName>
- <displayName count="one">GTQ</displayName>
- <displayName count="few">GTQ</displayName>
- <displayName count="many">GTQ</displayName>
- <displayName count="other">GTQ</displayName>
<symbol draft="contributed">GTQ</symbol>
<symbol alt="narrow" draft="contributed">Q</symbol>
</currency>
<currency type="GYD">
- <displayName>GYD</displayName>
- <displayName count="one">GYD</displayName>
- <displayName count="few">GYD</displayName>
- <displayName count="many">GYD</displayName>
- <displayName count="other">GYD</displayName>
<symbol draft="contributed">GYD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="HNL">
- <displayName>HNL</displayName>
- <displayName count="one">HNL</displayName>
- <displayName count="few">HNL</displayName>
- <displayName count="many">HNL</displayName>
- <displayName count="other">HNL</displayName>
<symbol draft="contributed">HNL</symbol>
<symbol alt="narrow" draft="contributed">L</symbol>
</currency>
<currency type="HRK">
- <displayName>HRK</displayName>
- <displayName count="one">HRK</displayName>
- <displayName count="few">HRK</displayName>
- <displayName count="many">HRK</displayName>
- <displayName count="other">HRK</displayName>
<symbol draft="contributed">HRK</symbol>
<symbol alt="narrow" draft="contributed">kn</symbol>
</currency>
<currency type="HTG">
- <displayName>HTG</displayName>
- <displayName count="one">HTG</displayName>
- <displayName count="few">HTG</displayName>
- <displayName count="many">HTG</displayName>
- <displayName count="other">HTG</displayName>
<symbol draft="contributed">HTG</symbol>
</currency>
<currency type="HUF">
- <displayName>HUF</displayName>
- <displayName count="one">HUF</displayName>
- <displayName count="few">HUF</displayName>
- <displayName count="many">HUF</displayName>
- <displayName count="other">HUF</displayName>
<symbol draft="contributed">HUF</symbol>
<symbol alt="narrow" draft="contributed">Ft</symbol>
</currency>
<currency type="IDR">
- <displayName>IDR</displayName>
- <displayName count="one">IDR</displayName>
- <displayName count="few">IDR</displayName>
- <displayName count="many">IDR</displayName>
- <displayName count="other">IDR</displayName>
<symbol draft="contributed">IDR</symbol>
<symbol alt="narrow" draft="contributed">Rp</symbol>
</currency>
<currency type="ILS">
- <displayName>ILS</displayName>
- <displayName count="one">ILS</displayName>
- <displayName count="few">ILS</displayName>
- <displayName count="many">ILS</displayName>
- <displayName count="other">ILS</displayName>
<symbol draft="contributed">₪</symbol>
<symbol alt="narrow" draft="contributed">₪</symbol>
</currency>
<currency type="INR">
- <displayName>INR</displayName>
- <displayName count="one">INR</displayName>
- <displayName count="few">INR</displayName>
- <displayName count="many">INR</displayName>
- <displayName count="other">INR</displayName>
<symbol draft="contributed">₹</symbol>
<symbol alt="narrow" draft="contributed">₹</symbol>
</currency>
<currency type="IQD">
- <displayName>IQD</displayName>
- <displayName count="one">IQD</displayName>
- <displayName count="few">IQD</displayName>
- <displayName count="many">IQD</displayName>
- <displayName count="other">IQD</displayName>
<symbol draft="contributed">IQD</symbol>
</currency>
<currency type="IRR">
- <displayName>IRR</displayName>
- <displayName count="one">IRR</displayName>
- <displayName count="few">IRR</displayName>
- <displayName count="many">IRR</displayName>
- <displayName count="other">IRR</displayName>
<symbol draft="contributed">IRR</symbol>
</currency>
<currency type="JMD">
- <displayName>JMD</displayName>
- <displayName count="one">JMD</displayName>
- <displayName count="few">JMD</displayName>
- <displayName count="many">JMD</displayName>
- <displayName count="other">JMD</displayName>
<symbol draft="contributed">JMD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="JOD">
- <displayName>JOD</displayName>
- <displayName count="one">JOD</displayName>
- <displayName count="few">JOD</displayName>
- <displayName count="many">JOD</displayName>
- <displayName count="other">JOD</displayName>
<symbol draft="contributed">JOD</symbol>
</currency>
<currency type="KES">
- <displayName>KES</displayName>
- <displayName count="one">KES</displayName>
- <displayName count="few">KES</displayName>
- <displayName count="many">KES</displayName>
- <displayName count="other">KES</displayName>
<symbol draft="contributed">KES</symbol>
</currency>
<currency type="KGS">
- <displayName>KGS</displayName>
- <displayName count="one">KGS</displayName>
- <displayName count="few">KGS</displayName>
- <displayName count="many">KGS</displayName>
- <displayName count="other">KGS</displayName>
<symbol draft="contributed">KGS</symbol>
</currency>
<currency type="KHR">
- <displayName>KHR</displayName>
- <displayName count="one">KHR</displayName>
- <displayName count="few">KHR</displayName>
- <displayName count="many">KHR</displayName>
- <displayName count="other">KHR</displayName>
<symbol draft="contributed">KHR</symbol>
<symbol alt="narrow" draft="contributed">៛</symbol>
</currency>
<currency type="KMF">
- <displayName>KMF</displayName>
- <displayName count="one">KMF</displayName>
- <displayName count="few">KMF</displayName>
- <displayName count="many">KMF</displayName>
- <displayName count="other">KMF</displayName>
<symbol draft="contributed">KMF</symbol>
<symbol alt="narrow" draft="contributed">CF</symbol>
</currency>
<currency type="KPW">
- <displayName count="one">KPW</displayName>
- <displayName count="few">KPW</displayName>
- <displayName count="many">KPW</displayName>
- <displayName count="other">KPW</displayName>
<symbol draft="contributed">KPW</symbol>
<symbol alt="narrow" draft="contributed">₩</symbol>
</currency>
<currency type="KRW">
- <displayName>KRW</displayName>
- <displayName count="one">KRW</displayName>
- <displayName count="few">KRW</displayName>
- <displayName count="many">KRW</displayName>
- <displayName count="other">KRW</displayName>
<symbol draft="contributed">₩</symbol>
<symbol alt="narrow" draft="contributed">₩</symbol>
</currency>
<currency type="KWD">
- <displayName>KWD</displayName>
- <displayName count="one">KWD</displayName>
- <displayName count="few">KWD</displayName>
- <displayName count="many">KWD</displayName>
- <displayName count="other">KWD</displayName>
<symbol draft="contributed">KWD</symbol>
</currency>
<currency type="KYD">
- <displayName>KYD</displayName>
- <displayName count="one">KYD</displayName>
- <displayName count="few">KYD</displayName>
- <displayName count="many">KYD</displayName>
- <displayName count="other">KYD</displayName>
<symbol draft="contributed">KYD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="KZT">
- <displayName>KZT</displayName>
- <displayName count="one">KZT</displayName>
- <displayName count="few">KZT</displayName>
- <displayName count="many">KZT</displayName>
- <displayName count="other">KZT</displayName>
<symbol draft="contributed">KZT</symbol>
<symbol alt="narrow" draft="contributed">₸</symbol>
</currency>
<currency type="LAK">
- <displayName>LAK</displayName>
- <displayName count="one">LAK</displayName>
- <displayName count="few">LAK</displayName>
- <displayName count="many">LAK</displayName>
- <displayName count="other">LAK</displayName>
<symbol draft="contributed">LAK</symbol>
<symbol alt="narrow" draft="contributed">₭</symbol>
</currency>
<currency type="LBP">
- <displayName>LBP</displayName>
- <displayName count="one">LBP</displayName>
- <displayName count="few">LBP</displayName>
- <displayName count="many">LBP</displayName>
- <displayName count="other">LBP</displayName>
<symbol draft="contributed">LBP</symbol>
<symbol alt="narrow" draft="contributed">L£</symbol>
</currency>
<currency type="LKR">
- <displayName>LKR</displayName>
- <displayName count="one">LKR</displayName>
- <displayName count="few">LKR</displayName>
- <displayName count="many">LKR</displayName>
- <displayName count="other">LKR</displayName>
<symbol draft="contributed">LKR</symbol>
<symbol alt="narrow" draft="contributed">Rs</symbol>
</currency>
<currency type="LRD">
- <displayName>LRD</displayName>
- <displayName count="one">LRD</displayName>
- <displayName count="few">LRD</displayName>
- <displayName count="many">LRD</displayName>
- <displayName count="other">LRD</displayName>
<symbol draft="contributed">LRD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="LYD">
- <displayName>LYD</displayName>
- <displayName count="one">LYD</displayName>
- <displayName count="few">LYD</displayName>
- <displayName count="many">LYD</displayName>
- <displayName count="other">LYD</displayName>
<symbol draft="contributed">LYD</symbol>
</currency>
<currency type="MAD">
- <displayName>MAD</displayName>
- <displayName count="one">MAD</displayName>
- <displayName count="few">MAD</displayName>
- <displayName count="many">MAD</displayName>
- <displayName count="other">MAD</displayName>
<symbol draft="contributed">MAD</symbol>
</currency>
<currency type="MDL">
- <displayName>MDL</displayName>
- <displayName count="one">MDL</displayName>
- <displayName count="few">MDL</displayName>
- <displayName count="many">MDL</displayName>
- <displayName count="other">MDL</displayName>
<symbol draft="contributed">MDL</symbol>
</currency>
<currency type="MGA">
- <displayName>MGA</displayName>
- <displayName count="one">MGA</displayName>
- <displayName count="few">MGA</displayName>
- <displayName count="many">MGA</displayName>
- <displayName count="other">MGA</displayName>
<symbol draft="contributed">MGA</symbol>
<symbol alt="narrow" draft="contributed">Ar</symbol>
</currency>
<currency type="MKD">
- <displayName>MKD</displayName>
- <displayName count="one">MKD</displayName>
- <displayName count="few">MKD</displayName>
- <displayName count="many">MKD</displayName>
- <displayName count="other">MKD</displayName>
<symbol draft="contributed">MKD</symbol>
</currency>
<currency type="MMK">
- <displayName>MMK</displayName>
- <displayName count="one">MMK</displayName>
- <displayName count="few">MMK</displayName>
- <displayName count="many">MMK</displayName>
- <displayName count="other">MMK</displayName>
<symbol draft="contributed">MMK</symbol>
<symbol alt="narrow" draft="contributed">K</symbol>
</currency>
<currency type="MNT">
- <displayName>MNT</displayName>
- <displayName count="one">MNT</displayName>
- <displayName count="few">MNT</displayName>
- <displayName count="many">MNT</displayName>
- <displayName count="other">MNT</displayName>
<symbol draft="contributed">MNT</symbol>
<symbol alt="narrow" draft="contributed">₮</symbol>
</currency>
<currency type="MOP">
- <displayName>MOP</displayName>
- <displayName count="one">MOP</displayName>
- <displayName count="few">MOP</displayName>
- <displayName count="many">MOP</displayName>
- <displayName count="other">MOP</displayName>
<symbol draft="contributed">MOP</symbol>
</currency>
<currency type="MRO">
- <displayName>MRO</displayName>
- <displayName count="one">MRO</displayName>
- <displayName count="few">MRO</displayName>
- <displayName count="many">MRO</displayName>
- <displayName count="other">MRO</displayName>
<symbol draft="contributed">MRO</symbol>
</currency>
- <currency type="MRU">
- <displayName>MRU</displayName>
- <displayName count="one">MRU</displayName>
- <displayName count="few">MRU</displayName>
- <displayName count="many">MRU</displayName>
- <displayName count="other">MRU</displayName>
- </currency>
<currency type="MTL">
<displayName>Lira Maltija</displayName>
</currency>
<currency type="MUR">
- <displayName>MUR</displayName>
- <displayName count="one">MUR</displayName>
- <displayName count="few">MUR</displayName>
- <displayName count="many">MUR</displayName>
- <displayName count="other">MUR</displayName>
<symbol draft="contributed">MUR</symbol>
<symbol alt="narrow" draft="contributed">Rs</symbol>
</currency>
<currency type="MVR">
- <displayName>MVR</displayName>
- <displayName count="one">MVR</displayName>
- <displayName count="few">MVR</displayName>
- <displayName count="many">MVR</displayName>
- <displayName count="other">MVR</displayName>
<symbol draft="contributed">MVR</symbol>
</currency>
<currency type="MWK">
- <displayName>MWK</displayName>
- <displayName count="one">MWK</displayName>
- <displayName count="few">MWK</displayName>
- <displayName count="many">MWK</displayName>
- <displayName count="other">MWK</displayName>
<symbol draft="contributed">MWK</symbol>
</currency>
<currency type="MXN">
- <displayName>MXN</displayName>
- <displayName count="one">MXN</displayName>
- <displayName count="few">MXN</displayName>
- <displayName count="many">MXN</displayName>
- <displayName count="other">MXN</displayName>
<symbol draft="contributed">MX$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="MYR">
- <displayName>MYR</displayName>
- <displayName count="one">MYR</displayName>
- <displayName count="few">MYR</displayName>
- <displayName count="many">MYR</displayName>
- <displayName count="other">MYR</displayName>
<symbol draft="contributed">MYR</symbol>
<symbol alt="narrow" draft="contributed">RM</symbol>
</currency>
<currency type="MZN">
- <displayName>MZN</displayName>
- <displayName count="one">MZN</displayName>
- <displayName count="few">MZN</displayName>
- <displayName count="many">MZN</displayName>
- <displayName count="other">MZN</displayName>
<symbol draft="contributed">MZN</symbol>
</currency>
<currency type="NAD">
- <displayName>NAD</displayName>
- <displayName count="one">NAD</displayName>
- <displayName count="few">NAD</displayName>
- <displayName count="many">NAD</displayName>
- <displayName count="other">NAD</displayName>
<symbol draft="contributed">NAD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="NGN">
- <displayName>NGN</displayName>
- <displayName count="one">NGN</displayName>
- <displayName count="few">NGN</displayName>
- <displayName count="many">NGN</displayName>
- <displayName count="other">NGN</displayName>
<symbol draft="contributed">NGN</symbol>
<symbol alt="narrow" draft="contributed">₦</symbol>
</currency>
<currency type="NIO">
- <displayName>NIO</displayName>
- <displayName count="one">NIO</displayName>
- <displayName count="few">NIO</displayName>
- <displayName count="many">NIO</displayName>
- <displayName count="other">NIO</displayName>
<symbol draft="contributed">NIO</symbol>
<symbol alt="narrow" draft="contributed">C$</symbol>
</currency>
<currency type="NPR">
- <displayName>NPR</displayName>
- <displayName count="one">NPR</displayName>
- <displayName count="few">NPR</displayName>
- <displayName count="many">NPR</displayName>
- <displayName count="other">NPR</displayName>
<symbol alt="narrow" draft="contributed">Rs</symbol>
</currency>
<currency type="NZD">
- <displayName>NZD</displayName>
- <displayName count="one">NZD</displayName>
- <displayName count="few">NZD</displayName>
- <displayName count="many">NZD</displayName>
- <displayName count="other">NZD</displayName>
<symbol draft="contributed">NZ$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="OMR">
- <displayName>OMR</displayName>
- <displayName count="one">OMR</displayName>
- <displayName count="few">OMR</displayName>
- <displayName count="many">OMR</displayName>
- <displayName count="other">OMR</displayName>
<symbol draft="contributed">OMR</symbol>
</currency>
<currency type="PAB">
- <displayName>PAB</displayName>
- <displayName count="one">PAB</displayName>
- <displayName count="few">PAB</displayName>
- <displayName count="many">PAB</displayName>
- <displayName count="other">PAB</displayName>
<symbol draft="contributed">PAB</symbol>
</currency>
<currency type="PEN">
- <displayName>PEN</displayName>
- <displayName count="one">PEN</displayName>
- <displayName count="few">PEN</displayName>
- <displayName count="many">PEN</displayName>
- <displayName count="other">PEN</displayName>
<symbol draft="contributed">PEN</symbol>
</currency>
<currency type="PGK">
- <displayName>PGK</displayName>
- <displayName count="one">PGK</displayName>
- <displayName count="few">PGK</displayName>
- <displayName count="many">PGK</displayName>
- <displayName count="other">PGK</displayName>
<symbol draft="contributed">PGK</symbol>
</currency>
<currency type="PHP">
- <displayName>PHP</displayName>
- <displayName count="one">PHP</displayName>
- <displayName count="few">PHP</displayName>
- <displayName count="many">PHP</displayName>
- <displayName count="other">PHP</displayName>
<symbol draft="contributed">PHP</symbol>
<symbol alt="narrow" draft="contributed">₱</symbol>
</currency>
<currency type="PKR">
- <displayName>PKR</displayName>
- <displayName count="one">PKR</displayName>
- <displayName count="few">PKR</displayName>
- <displayName count="many">PKR</displayName>
- <displayName count="other">PKR</displayName>
<symbol draft="contributed">PKR</symbol>
<symbol alt="narrow" draft="contributed">Rs</symbol>
</currency>
<currency type="PLN">
- <displayName>PLN</displayName>
- <displayName count="one">PLN</displayName>
- <displayName count="few">PLN</displayName>
- <displayName count="many">PLN</displayName>
- <displayName count="other">PLN</displayName>
<symbol draft="contributed">PLN</symbol>
<symbol alt="narrow" draft="contributed">zł</symbol>
</currency>
<currency type="PYG">
- <displayName>PYG</displayName>
- <displayName count="one">PYG</displayName>
- <displayName count="few">PYG</displayName>
- <displayName count="many">PYG</displayName>
- <displayName count="other">PYG</displayName>
<symbol draft="contributed">PYG</symbol>
<symbol alt="narrow" draft="contributed">₲</symbol>
</currency>
<currency type="QAR">
- <displayName>QAR</displayName>
- <displayName count="one">QAR</displayName>
- <displayName count="few">QAR</displayName>
- <displayName count="many">QAR</displayName>
- <displayName count="other">QAR</displayName>
<symbol draft="contributed">QAR</symbol>
</currency>
<currency type="RON">
- <displayName>RON</displayName>
- <displayName count="one">RON</displayName>
- <displayName count="few">RON</displayName>
- <displayName count="many">RON</displayName>
- <displayName count="other">RON</displayName>
<symbol draft="contributed">RON</symbol>
</currency>
<currency type="RSD">
- <displayName>RSD</displayName>
- <displayName count="one">RSD</displayName>
- <displayName count="few">RSD</displayName>
- <displayName count="many">RSD</displayName>
- <displayName count="other">RSD</displayName>
<symbol draft="contributed">RSD</symbol>
</currency>
<currency type="RUB">
- <displayName>RUB</displayName>
- <displayName count="one">RUB</displayName>
- <displayName count="few">RUB</displayName>
- <displayName count="many">RUB</displayName>
- <displayName count="other">RUB</displayName>
<symbol draft="contributed">RUB</symbol>
<symbol alt="narrow" draft="contributed">₽</symbol>
</currency>
<currency type="RWF">
- <displayName>RWF</displayName>
- <displayName count="one">RWF</displayName>
- <displayName count="few">RWF</displayName>
- <displayName count="many">RWF</displayName>
- <displayName count="other">RWF</displayName>
<symbol draft="contributed">RWF</symbol>
<symbol alt="narrow" draft="contributed">RF</symbol>
</currency>
<currency type="SAR">
- <displayName>SAR</displayName>
- <displayName count="one">SAR</displayName>
- <displayName count="few">SAR</displayName>
- <displayName count="many">SAR</displayName>
- <displayName count="other">SAR</displayName>
<symbol draft="contributed">SAR</symbol>
</currency>
<currency type="SBD">
- <displayName>SBD</displayName>
- <displayName count="one">SBD</displayName>
- <displayName count="few">SBD</displayName>
- <displayName count="many">SBD</displayName>
- <displayName count="other">SBD</displayName>
<symbol draft="contributed">SBD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="SCR">
- <displayName>SCR</displayName>
- <displayName count="one">SCR</displayName>
- <displayName count="few">SCR</displayName>
- <displayName count="many">SCR</displayName>
- <displayName count="other">SCR</displayName>
<symbol draft="contributed">SCR</symbol>
</currency>
<currency type="SDG">
- <displayName>SDG</displayName>
- <displayName count="one">SDG</displayName>
- <displayName count="few">SDG</displayName>
- <displayName count="many">SDG</displayName>
- <displayName count="other">SDG</displayName>
<symbol draft="contributed">SDG</symbol>
</currency>
<currency type="SEK">
@@ -4347,283 +3780,116 @@
<symbol alt="narrow" draft="contributed">kr</symbol>
</currency>
<currency type="SGD">
- <displayName>SGD</displayName>
- <displayName count="one">SGD</displayName>
- <displayName count="few">SGD</displayName>
- <displayName count="many">SGD</displayName>
- <displayName count="other">SGD</displayName>
<symbol draft="contributed">SGD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="SHP">
- <displayName>SHP</displayName>
- <displayName count="one">SHP</displayName>
- <displayName count="few">SHP</displayName>
- <displayName count="many">SHP</displayName>
- <displayName count="other">SHP</displayName>
<symbol draft="contributed">SHP</symbol>
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="SLL">
- <displayName>SLL</displayName>
- <displayName count="one">SLL</displayName>
- <displayName count="few">SLL</displayName>
- <displayName count="many">SLL</displayName>
- <displayName count="other">SLL</displayName>
<symbol draft="contributed">SLL</symbol>
</currency>
<currency type="SOS">
- <displayName>SOS</displayName>
- <displayName count="one">SOS</displayName>
- <displayName count="few">SOS</displayName>
- <displayName count="many">SOS</displayName>
- <displayName count="other">SOS</displayName>
<symbol draft="contributed">SOS</symbol>
</currency>
<currency type="SRD">
- <displayName>SRD</displayName>
- <displayName count="one">SRD</displayName>
- <displayName count="few">SRD</displayName>
- <displayName count="many">SRD</displayName>
- <displayName count="other">SRD</displayName>
<symbol draft="contributed">SRD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="SSP">
- <displayName>SSP</displayName>
- <displayName count="one">SSP</displayName>
- <displayName count="few">SSP</displayName>
- <displayName count="many">SSP</displayName>
- <displayName count="other">SSP</displayName>
<symbol draft="contributed">SSP</symbol>
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="STD">
- <displayName>STD</displayName>
- <displayName count="one">STD</displayName>
- <displayName count="few">STD</displayName>
- <displayName count="many">STD</displayName>
- <displayName count="other">STD</displayName>
<symbol draft="contributed">STD</symbol>
</currency>
<currency type="STN">
- <displayName>STN</displayName>
- <displayName count="one">STN</displayName>
- <displayName count="few">STN</displayName>
- <displayName count="many">STN</displayName>
- <displayName count="other">STN</displayName>
<symbol draft="contributed">STN</symbol>
<symbol alt="narrow" draft="contributed">Db</symbol>
</currency>
<currency type="SYP">
- <displayName>SYP</displayName>
- <displayName count="one">SYP</displayName>
- <displayName count="few">SYP</displayName>
- <displayName count="many">SYP</displayName>
- <displayName count="other">SYP</displayName>
<symbol draft="contributed">SYP</symbol>
<symbol alt="narrow" draft="contributed">£</symbol>
</currency>
<currency type="SZL">
- <displayName>SZL</displayName>
- <displayName count="one">SZL</displayName>
- <displayName count="few">SZL</displayName>
- <displayName count="many">SZL</displayName>
- <displayName count="other">SZL</displayName>
<symbol draft="contributed">SZL</symbol>
</currency>
<currency type="THB">
- <displayName>THB</displayName>
- <displayName count="one">THB</displayName>
- <displayName count="few">THB</displayName>
- <displayName count="many">THB</displayName>
- <displayName count="other">THB</displayName>
<symbol draft="contributed">THB</symbol>
<symbol alt="narrow" draft="contributed">฿</symbol>
</currency>
<currency type="TJS">
- <displayName>TJS</displayName>
- <displayName count="one">TJS</displayName>
- <displayName count="few">TJS</displayName>
- <displayName count="many">TJS</displayName>
- <displayName count="other">TJS</displayName>
<symbol draft="contributed">TJS</symbol>
</currency>
<currency type="TMT">
- <displayName>TMT</displayName>
- <displayName count="one">TMT</displayName>
- <displayName count="few">TMT</displayName>
- <displayName count="many">TMT</displayName>
- <displayName count="other">TMT</displayName>
<symbol draft="contributed">TMT</symbol>
</currency>
<currency type="TND">
- <displayName>TND</displayName>
- <displayName count="one">TND</displayName>
- <displayName count="few">TND</displayName>
- <displayName count="many">TND</displayName>
- <displayName count="other">TND</displayName>
<symbol draft="contributed">TND</symbol>
</currency>
<currency type="TOP">
- <displayName>TOP</displayName>
- <displayName count="one">TOP</displayName>
- <displayName count="few">TOP</displayName>
- <displayName count="many">TOP</displayName>
- <displayName count="other">TOP</displayName>
<symbol draft="contributed">TOP</symbol>
<symbol alt="narrow" draft="contributed">T$</symbol>
</currency>
<currency type="TRY">
- <displayName>TRY</displayName>
- <displayName count="one">TRY</displayName>
- <displayName count="few">TRY</displayName>
- <displayName count="many">TRY</displayName>
- <displayName count="other">TRY</displayName>
<symbol draft="contributed">TRY</symbol>
<symbol alt="narrow" draft="contributed">₺</symbol>
<symbol alt="variant" draft="contributed">TL</symbol>
</currency>
<currency type="TTD">
- <displayName>TTD</displayName>
- <displayName count="one">TTD</displayName>
- <displayName count="few">TTD</displayName>
- <displayName count="many">TTD</displayName>
- <displayName count="other">TTD</displayName>
<symbol draft="contributed">TTD</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="TWD">
- <displayName>TWD</displayName>
- <displayName count="one">TWD</displayName>
- <displayName count="few">TWD</displayName>
- <displayName count="many">TWD</displayName>
- <displayName count="other">TWD</displayName>
<symbol draft="contributed">NT$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="TZS">
- <displayName>TZS</displayName>
- <displayName count="one">TZS</displayName>
- <displayName count="few">TZS</displayName>
- <displayName count="many">TZS</displayName>
- <displayName count="other">TZS</displayName>
<symbol draft="contributed">TZS</symbol>
</currency>
<currency type="UAH">
- <displayName>UAH</displayName>
- <displayName count="one">UAH</displayName>
- <displayName count="few">UAH</displayName>
- <displayName count="many">UAH</displayName>
- <displayName count="other">UAH</displayName>
<symbol draft="contributed">UAH</symbol>
<symbol alt="narrow" draft="contributed">₴</symbol>
</currency>
<currency type="UGX">
- <displayName>UGX</displayName>
- <displayName count="one">UGX</displayName>
- <displayName count="few">UGX</displayName>
- <displayName count="many">UGX</displayName>
- <displayName count="other">UGX</displayName>
<symbol draft="contributed">UGX</symbol>
</currency>
<currency type="USD">
- <displayName>USD</displayName>
- <displayName count="one">USD</displayName>
- <displayName count="few">USD</displayName>
- <displayName count="many">USD</displayName>
- <displayName count="other">USD</displayName>
<symbol draft="contributed">US$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="UYU">
- <displayName>UYU</displayName>
- <displayName count="one">UYU</displayName>
- <displayName count="few">UYU</displayName>
- <displayName count="many">UYU</displayName>
- <displayName count="other">UYU</displayName>
<symbol draft="contributed">UYU</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="UZS">
- <displayName>UZS</displayName>
- <displayName count="one">UZS</displayName>
- <displayName count="few">UZS</displayName>
- <displayName count="many">UZS</displayName>
- <displayName count="other">UZS</displayName>
<symbol draft="contributed">UZS</symbol>
</currency>
<currency type="VEF">
- <displayName>VEF</displayName>
- <displayName count="one">VEF</displayName>
- <displayName count="few">VEF</displayName>
- <displayName count="many">VEF</displayName>
- <displayName count="other">VEF</displayName>
<symbol draft="contributed">VEF</symbol>
</currency>
- <currency type="VES">
- <displayName>VES</displayName>
- <displayName count="one">VES</displayName>
- <displayName count="few">VES</displayName>
- <displayName count="many">VES</displayName>
- <displayName count="other">VES</displayName>
- </currency>
<currency type="VND">
- <displayName>VND</displayName>
- <displayName count="one">VND</displayName>
- <displayName count="few">VND</displayName>
- <displayName count="many">VND</displayName>
- <displayName count="other">VND</displayName>
<symbol draft="contributed">₫</symbol>
<symbol alt="narrow" draft="contributed">₫</symbol>
</currency>
<currency type="VUV">
- <displayName>VUV</displayName>
- <displayName count="one">VUV</displayName>
- <displayName count="few">VUV</displayName>
- <displayName count="many">VUV</displayName>
- <displayName count="other">VUV</displayName>
<symbol draft="contributed">VUV</symbol>
</currency>
<currency type="WST">
- <displayName>WST</displayName>
- <displayName count="one">WST</displayName>
- <displayName count="few">WST</displayName>
- <displayName count="many">WST</displayName>
- <displayName count="other">WST</displayName>
<symbol draft="contributed">WST</symbol>
</currency>
<currency type="XAF">
- <displayName>XAF</displayName>
- <displayName count="one">XAF</displayName>
- <displayName count="few">XAF</displayName>
- <displayName count="many">XAF</displayName>
- <displayName count="other">XAF</displayName>
<symbol draft="contributed">FCFA</symbol>
</currency>
<currency type="XCD">
- <displayName>XCD</displayName>
- <displayName count="one">XCD</displayName>
- <displayName count="few">XCD</displayName>
- <displayName count="many">XCD</displayName>
- <displayName count="other">XCD</displayName>
<symbol draft="contributed">EC$</symbol>
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="XOF">
- <displayName>XOF</displayName>
- <displayName count="one">XOF</displayName>
- <displayName count="few">XOF</displayName>
- <displayName count="many">XOF</displayName>
- <displayName count="other">XOF</displayName>
<symbol draft="contributed">CFA</symbol>
</currency>
<currency type="XPF">
- <displayName>XPF</displayName>
- <displayName count="one">XPF</displayName>
- <displayName count="few">XPF</displayName>
- <displayName count="many">XPF</displayName>
- <displayName count="other">XPF</displayName>
<symbol draft="contributed">CFPF</symbol>
</currency>
<currency type="XXX">
@@ -4634,27 +3900,12 @@
<displayName count="other">Munita Mhix Magħrufa jew Mhix Valida</displayName>
</currency>
<currency type="YER">
- <displayName>YER</displayName>
- <displayName count="one">YER</displayName>
- <displayName count="few">YER</displayName>
- <displayName count="many">YER</displayName>
- <displayName count="other">YER</displayName>
<symbol draft="contributed">YER</symbol>
</currency>
<currency type="ZAR">
- <displayName>ZAR</displayName>
- <displayName count="one">ZAR</displayName>
- <displayName count="few">ZAR</displayName>
- <displayName count="many">ZAR</displayName>
- <displayName count="other">ZAR</displayName>
<symbol draft="contributed">ZAR</symbol>
</currency>
<currency type="ZMW">
- <displayName>ZMW</displayName>
- <displayName count="one">ZMW</displayName>
- <displayName count="few">ZMW</displayName>
- <displayName count="many">ZMW</displayName>
- <displayName count="other">ZMW</displayName>
<symbol draft="contributed">ZMW</symbol>
<symbol alt="narrow" draft="contributed">ZK</symbol>
</currency>
diff --git a/common/main/mt_MT.xml b/common/main/mt_MT.xml
index 11c1868..d383c4a 100644
--- a/common/main/mt_MT.xml
+++ b/common/main/mt_MT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mua.xml b/common/main/mua.xml
index 809f2de..51695ce 100644
--- a/common/main/mua.xml
+++ b/common/main/mua.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,7 +49,6 @@
<language type="so">Somaliya</language>
<language type="sv">Swedia</language>
<language type="ta">Tamul</language>
- <language type="th">th</language>
<language type="tr">Turk</language>
<language type="uk">Ukrainia</language>
<language type="ur">Urdu</language>
@@ -184,7 +183,6 @@
<territory type="MD">Moldoviya</territory>
<territory type="MG">Madagaskar</territory>
<territory type="MH">Sǝr Marshall ma laŋne</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Sǝr Mali</territory>
<territory type="MM">Sǝr Myanmar</territory>
<territory type="MN">Mongoliya</territory>
diff --git a/common/main/mua_CM.xml b/common/main/mua_CM.xml
index 51842b3..2ddfbe9 100644
--- a/common/main/mua_CM.xml
+++ b/common/main/mua_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/my.xml b/common/main/my.xml
index 039c61a..448f294 100644
--- a/common/main/my.xml
+++ b/common/main/my.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -125,6 +125,7 @@
<language type="eu">ဘာစ်ခ်</language>
<language type="ewo">အီဝန်ဒို</language>
<language type="fa">ပါရှန်</language>
+ <language type="fa_AF">ဒါရီ</language>
<language type="ff">ဖူလာ</language>
<language type="fi">ဖင်လန်</language>
<language type="fil">ဖိလစ်ပိုင်</language>
@@ -799,8 +800,8 @@
<territory type="VU">ဗနွားတူ</territory>
<territory type="WF">ဝေါလစ်နှင့် ဖူကျူးနား</territory>
<territory type="WS">ဆမိုးအား</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">နိုင်ငံခြားသံ</territory>
+ <territory type="XB">စာပြောင်းပြန်</territory>
<territory type="XK">ကိုဆိုဗို</territory>
<territory type="YE">ယီမင်</territory>
<territory type="YT">မေယော့</territory>
@@ -4246,7 +4247,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>နောဖော့ခ်ကျွန်းအချိန်</standard>
+ <generic draft="contributed">နောဖော့ခ်ကျွန်း အချိန်</generic>
+ <standard draft="contributed">နောဖော့ခ်ကျွန်း စံတော်ချိန်</standard>
+ <daylight draft="contributed">နောဖော့ခ်ကျွန်း နွေရာသီ စံတော်ချိန်</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5633,9 +5636,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ဒက်စီ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>စင်တီ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>မီလီ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>မိုက်ခရို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>နာနို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ပီကို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ဖမ်တို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>အက်တို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ဇက်ပ်တို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ယောက်တို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ဒက်ကာ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ဟက်တို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ကီလို {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>မီဂါ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ဂစ်ဂါ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>တယ်ရာ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ပက်တာ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>အိတ်စ်ဆာ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ဇက်တာ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ယိုဒါ {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>တစ်{1} လျှင် {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>နှစ်ထပ်ကိန်း {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">နှစ်ထပ်ကိန်း {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ကုဗ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ကုဗ {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5643,7 +5714,7 @@
<displayName>ဆွဲငင်အား</displayName>
<unitPattern count="other">{0} ဆွဲငင်အား</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</displayName>
<unitPattern count="other">{0} မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</unitPattern>
</unit>
@@ -5724,7 +5795,7 @@
<displayName>တစ်လီတာရှိ မီလီမိုးလ်</displayName>
<unitPattern count="other">တစ်လီတာရှိ {0} မီလီမိုးလ်</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>တစ်သန်းပုံ တစ်ပုံ</displayName>
<unitPattern count="other">တစ်သန်းပုံ {0} ပုံ</unitPattern>
</unit>
@@ -5748,7 +5819,7 @@
<displayName>တစ်ကီလိုမီတာရှိ လီတာ</displayName>
<unitPattern count="other">တစ်ကီလိုမီတာရှိ {0} လီတာ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>တစ်ရာကီလိုမီတာရှိ လီတာ</displayName>
<unitPattern count="other">တစ်ရာကီလိုမီတာရှိ {0} လီတာ</unitPattern>
</unit>
@@ -6132,15 +6203,15 @@
<displayName>မြင်းကောင်ရေအား</displayName>
<unitPattern count="other">{0} မြင်းကောင်ရေအား</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ပြဒါးမီလီမီတာ</displayName>
<unitPattern count="other">{0} ပြဒါးမီလီမီတာ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ပေါင်/စတုရန်းလက်မ</displayName>
<unitPattern count="other">တစ်စတုရန်းလက်မလျှင် {0} ပေါင်</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ပြဒါးလက်မ</displayName>
<unitPattern count="other">{0} ပြဒါးလက်မ</unitPattern>
</unit>
@@ -6204,7 +6275,7 @@
<displayName>ကယ်လ်ဗင်</displayName>
<unitPattern count="other">{0} ကယ်လ်ဗင်</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf.ft</displayName>
<unitPattern count="other">{0} lbf.ft</unitPattern>
</unit>
@@ -6330,9 +6401,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6340,7 +6479,7 @@
<displayName>ဆွဲငင်အား</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -6421,7 +6560,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>တစ်သန်းပုံ တစ်ပုံ</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -6445,7 +6584,7 @@
<displayName>လီတာ/ကီလိုမီတာ</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>တစ်ရာကီလိုမီတာရှိ လီတာ</displayName>
<unitPattern count="other">{0} L/100 km</unitPattern>
</unit>
@@ -6829,15 +6968,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ပေါင်/စတုရန်းလက်မ</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -6901,7 +7040,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf.ft</displayName>
<unitPattern count="other">{0} lbf.ft</unitPattern>
</unit>
@@ -7027,9 +7166,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7067,7 +7274,7 @@
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -7160,7 +7367,7 @@
<unit type="power-horsepower">
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
<unit type="pressure-millibar">
diff --git a/common/main/my_MM.xml b/common/main/my_MM.xml
index 6cfec0c..2db6b9c 100644
--- a/common/main/my_MM.xml
+++ b/common/main/my_MM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/mzn.xml b/common/main/mzn.xml
index b1432d0..d8132a5 100644
--- a/common/main/mzn.xml
+++ b/common/main/mzn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -462,7 +462,6 @@
<territory type="MF">سنت مارتین</territory>
<territory type="MG">ماداگاسکار</territory>
<territory type="MH">مارشال جزایر</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">مالی</territory>
<territory type="MM">میانمار</territory>
<territory type="MN">مغولستون</territory>
@@ -1902,7 +1901,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -1934,7 +1933,7 @@
<displayName>L/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -2303,7 +2302,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -2335,7 +2334,7 @@
<displayName>L/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -2700,7 +2699,7 @@
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
diff --git a/common/main/mzn_IR.xml b/common/main/mzn_IR.xml
index f18d80f..7f85f15 100644
--- a/common/main/mzn_IR.xml
+++ b/common/main/mzn_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/naq.xml b/common/main/naq.xml
index 5fac230..dde28e1 100644
--- a/common/main/naq.xml
+++ b/common/main/naq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Madagascari</territory>
<territory type="MH">Marshall Islands</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Malib</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/naq_NA.xml b/common/main/naq_NA.xml
index 867ee24..cc5857c 100644
--- a/common/main/naq_NA.xml
+++ b/common/main/naq_NA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nb.xml b/common/main/nb.xml
index 55c5606..4f324d3 100644
--- a/common/main/nb.xml
+++ b/common/main/nb.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,6 +49,7 @@
<language type="arp">arapaho</language>
<language type="arq">algerisk arabisk</language>
<language type="ars">najdi-arabisk</language>
+ <language type="ars" alt="menu">arabisk (najd)</language>
<language type="arw">arawak</language>
<language type="ary">marokkansk-arabisk</language>
<language type="arz">egyptisk arabisk</language>
@@ -182,6 +183,7 @@
<language type="ewo">ewondo</language>
<language type="ext">ekstremaduransk</language>
<language type="fa">persisk</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulfulde</language>
@@ -651,6 +653,7 @@
<script type="Ahom" draft="contributed">ahom</script>
<script type="Arab">arabisk</script>
<script type="Arab" alt="variant">persisk-arabisk</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">arameisk</script>
<script type="Armn">armensk</script>
<script type="Avst">avestisk</script>
@@ -769,6 +772,7 @@
<script type="Phnx">fønikisk</script>
<script type="Plrd">pollard-fonetisk</script>
<script type="Prti">inskripsjonsparthisk</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Roro">rongorongo</script>
<script type="Runr">runer</script>
@@ -929,7 +933,7 @@
<territory type="ER">Eritrea</territory>
<territory type="ES">Spania</territory>
<territory type="ET">Etiopia</territory>
- <territory type="EU">EU</territory>
+ <territory type="EU">Den europeiske union</territory>
<territory type="EZ">eurosonen</territory>
<territory type="FI">Finland</territory>
<territory type="FJ">Fiji</territory>
@@ -1170,7 +1174,6 @@
<variant type="KSCOR" draft="contributed">standard ortografi</variant>
<variant type="LAUKIKA" draft="contributed">laukika</variant>
<variant type="LIPAW" draft="contributed">resia med Lipovaz-dialekt</variant>
- <variant type="LUNA1918" draft="contributed">LUNA1918</variant>
<variant type="METELKO" draft="contributed">Metelko-alfabet</variant>
<variant type="MONOTON">monotonisk rettskriving</variant>
<variant type="NDYUKA">ndyuka-dialekt</variant>
@@ -1179,15 +1182,12 @@
<variant type="NULIK" draft="contributed">moderne volapük</variant>
<variant type="OSOJS">oseacco- og osojanedialekt</variant>
<variant type="PAMAKA">Pamaka-dialekt</variant>
- <variant type="PETR1708" draft="contributed">PETR1708</variant>
<variant type="PINYIN">pinyin</variant>
<variant type="POLYTON">polytonisk rettskriving</variant>
<variant type="POSIX">dataspråk</variant>
- <variant type="PUTER" draft="contributed">PUTER</variant>
<variant type="REVISED">revidert ortografi</variant>
<variant type="RIGIK" draft="contributed">klassisk volapük</variant>
<variant type="ROZAJ">resisk dialekt</variant>
- <variant type="RUMGR" draft="contributed">RUMGR</variant>
<variant type="SAAHO">saho</variant>
<variant type="SCOTLAND">skotsk standard engelsk</variant>
<variant type="SCOUSE">scouse dialekt</variant>
@@ -9507,7 +9507,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>tidssone for Norfolkøya</standard>
+ <generic draft="contributed">tidssone for Norfolkøya</generic>
+ <standard draft="contributed">normaltid for Norfolkøya</standard>
+ <daylight draft="contributed">sommertid for Norfolkøya</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -12818,9 +12820,9 @@
<symbol draft="contributed">MAF</symbol>
</currency>
<currency type="MCF">
- <displayName draft="contributed">MCF</displayName>
- <displayName count="one" draft="contributed">MCF</displayName>
- <displayName count="other" draft="contributed">MCF</displayName>
+ <displayName draft="contributed">monegaskiske franc</displayName>
+ <displayName count="one" draft="contributed">monegaskisk franc</displayName>
+ <displayName count="other" draft="contributed">monegaskiske franc</displayName>
<symbol draft="contributed">MCF</symbol>
</currency>
<currency type="MDC">
@@ -13891,9 +13893,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadrat{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubikk{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubikk{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubikk{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -13902,7 +13974,7 @@
<unitPattern count="one">{0} g-kraft</unitPattern>
<unitPattern count="other">{0} g-kraft</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per sekund²</displayName>
<unitPattern count="one">{0} meter per sekund²</unitPattern>
<unitPattern count="other">{0} meter per sekund²</unitPattern>
@@ -14002,7 +14074,7 @@
<unitPattern count="one">{0} millimol per liter</unitPattern>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>deler per million</displayName>
<unitPattern count="one">{0} del per million</unitPattern>
<unitPattern count="other">{0} deler per million</unitPattern>
@@ -14032,7 +14104,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
@@ -14513,17 +14585,17 @@
<unitPattern count="one">{0} hestekraft</unitPattern>
<unitPattern count="other">{0} hestekrefter</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter kvikksølv</displayName>
<unitPattern count="one">{0} millimeter kvikksølv</unitPattern>
<unitPattern count="other">{0} millimeter kvikksølv</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pund per kvadrattomme</displayName>
<unitPattern count="one">{0} pund per kvadrattomme</unitPattern>
<unitPattern count="other">{0} pund per kvadrattomme</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tommer kvikksølv</displayName>
<unitPattern count="one">{0} tomme kvikksølv</unitPattern>
<unitPattern count="other">{0} tommer kvikksølv</unitPattern>
@@ -14603,8 +14675,8 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
- <displayName>pound-foot</displayName>
+ <unit type="torque-pound-force-foot">
+ <displayName>pound-force-foot</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -14757,9 +14829,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -14768,7 +14910,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -14868,7 +15010,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -14898,7 +15040,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -15379,17 +15521,17 @@
<unitPattern count="one">{0} hk</unitPattern>
<unitPattern count="other">{0} hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -15469,7 +15611,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -15623,9 +15765,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -15634,7 +15846,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
@@ -15702,7 +15914,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">ppm</displayName>
<unitPattern count="one" draft="unconfirmed">{0} ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} ppm</unitPattern>
@@ -15717,7 +15929,7 @@
<unitPattern count="one" draft="unconfirmed">{0}L/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -15936,15 +16148,15 @@
<unitPattern count="one">{0}hk</unitPattern>
<unitPattern count="other">{0}hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<unitPattern count="one" draft="contributed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0}ʹʹ Hg</unitPattern>
<unitPattern count="other">{0}ʹʹ Hg</unitPattern>
</unit>
diff --git a/common/main/nb_NO.xml b/common/main/nb_NO.xml
index 6f40ce4..b66e24e 100644
--- a/common/main/nb_NO.xml
+++ b/common/main/nb_NO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nb_SJ.xml b/common/main/nb_SJ.xml
index 3555b7b..e936646 100644
--- a/common/main/nb_SJ.xml
+++ b/common/main/nb_SJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nd.xml b/common/main/nd.xml
index 8142cc4..fe95f56 100644
--- a/common/main/nd.xml
+++ b/common/main/nd.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Madagaska</territory>
<territory type="MH">Marshall Islands</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/nd_ZW.xml b/common/main/nd_ZW.xml
index a97a242..68692ab 100644
--- a/common/main/nd_ZW.xml
+++ b/common/main/nd_ZW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nds.xml b/common/main/nds.xml
index 7abfbcd..3e807d5 100644
--- a/common/main/nds.xml
+++ b/common/main/nds.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nds_DE.xml b/common/main/nds_DE.xml
index 33ee0b9..a225018 100644
--- a/common/main/nds_DE.xml
+++ b/common/main/nds_DE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nds_NL.xml b/common/main/nds_NL.xml
index 029dbf9..aec330e 100644
--- a/common/main/nds_NL.xml
+++ b/common/main/nds_NL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ne.xml b/common/main/ne.xml
index 4121d67..f57378b 100644
--- a/common/main/ne.xml
+++ b/common/main/ne.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -179,6 +179,7 @@
<language type="ewo">इवोन्डो</language>
<language type="ext">एक्सट्रेमादुराली</language>
<language type="fa">फारसी</language>
+ <language type="fa_AF">दारी</language>
<language type="fan">फाङ</language>
<language type="fat">फान्टी</language>
<language type="ff">फुलाह</language>
@@ -710,8 +711,8 @@
<script type="Xpeo">पुरानो पर्सियन</script>
<script type="Yiii">यी</script>
<script type="Zinh">इन्हेरिटेड</script>
- <script type="Zmth">Zmth</script>
- <script type="Zsye">Zsye</script>
+ <script type="Zmth">गणितीय चिन्ह</script>
+ <script type="Zsye">इमोजी</script>
<script type="Zsym">प्रतीकहरू</script>
<script type="Zxxx">नलेखिएको</script>
<script type="Zyyy">साझा</script>
@@ -1016,7 +1017,7 @@
<territory type="VU">भानुआतु</territory>
<territory type="WF">वालिस र फुटुना</territory>
<territory type="WS">सामोआ</territory>
- <territory type="XA" draft="provisional">सिउडो-एक्सेन्ट्स</territory>
+ <territory type="XA">सिउडो-एक्सेन्ट्स</territory>
<territory type="XB">सिउडो-बिडी</territory>
<territory type="XK">कोसोभो</territory>
<territory type="YE">येमेन</territory>
@@ -1037,11 +1038,11 @@
</variants>
<keys>
<key type="calendar">पात्रो</key>
- <key type="cf">cf</key>
+ <key type="cf">मुद्राको ढाँचा</key>
<key type="collation">क्रमबद्ध सुची</key>
<key type="currency">मुद्रा</key>
- <key type="hc">hc</key>
- <key type="lb">lb</key>
+ <key type="hc">समय चक्र (12 तथा 24)</key>
+ <key type="lb">पङ्क्ति विच्छेदको शैली</key>
<key type="ms">मापन प्रणाली</key>
<key type="numbers">अङ्कहरू</key>
</keys>
@@ -1074,9 +1075,9 @@
<type key="hc" type="h12">hc-h12</type>
<type key="hc" type="h23">hc-h23</type>
<type key="hc" type="h24">hc-h24</type>
- <type key="lb" type="loose">loose</type>
- <type key="lb" type="normal">normal</type>
- <type key="lb" type="strict">strict</type>
+ <type key="lb" type="loose">पङ्क्ति विच्छेदको खुला शैली</type>
+ <type key="lb" type="normal">पङ्क्ति विच्छेदको सामान्य शैली</type>
+ <type key="lb" type="strict">पङ्क्ति विच्छेदको कडा शैली</type>
<type key="ms" type="metric">मेट्रिक प्रणाली</type>
<type key="ms" type="uksystem">इम्पेरियल मापन प्रणाली</type>
<type key="ms" type="ussystem">संयुक्त राज्य मापन प्रणाली</type>
@@ -1140,6 +1141,9 @@
<ellipsis type="word-initial">… {0}</ellipsis>
<ellipsis type="word-medial">{0} … {1}</ellipsis>
<moreInformation>?</moreInformation>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
</characters>
<delimiters>
<quotationStart>“</quotationStart>
@@ -4501,7 +4505,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>नोर्फल्क टापू समय</standard>
+ <generic draft="contributed">नोर्फल्क टापू समय</generic>
+ <standard draft="contributed">नोर्फल्क टापू मानक समय</standard>
+ <daylight draft="contributed">नोर्फल्क टापू ग्रीष्मकालीन समय</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4797,14 +4803,14 @@
<decimalFormats numberSystem="deva">
<decimalFormatLength>
<decimalFormat>
- <pattern draft="contributed">#,##0.###</pattern>
+ <pattern draft="contributed">#,##,##0.###</pattern>
</decimalFormat>
</decimalFormatLength>
</decimalFormats>
<decimalFormats numberSystem="latn">
<decimalFormatLength>
<decimalFormat>
- <pattern draft="contributed">#,##0.###</pattern>
+ <pattern draft="contributed">#,##,##0.###</pattern>
</decimalFormat>
</decimalFormatLength>
<decimalFormatLength type="long">
@@ -4881,31 +4887,31 @@
<percentFormats numberSystem="deva">
<percentFormatLength>
<percentFormat>
- <pattern>#,##0%</pattern>
+ <pattern>#,##,##0%</pattern>
</percentFormat>
</percentFormatLength>
</percentFormats>
<percentFormats numberSystem="latn">
<percentFormatLength>
<percentFormat>
- <pattern>#,##0%</pattern>
+ <pattern>#,##,##0%</pattern>
</percentFormat>
</percentFormatLength>
</percentFormats>
<currencyFormats numberSystem="deva">
<currencyFormatLength>
<currencyFormat type="standard">
- <pattern>¤ #,##0.00</pattern>
+ <pattern>¤ #,##,##0.00</pattern>
</currencyFormat>
</currencyFormatLength>
</currencyFormats>
<currencyFormats numberSystem="latn">
<currencyFormatLength>
<currencyFormat type="standard">
- <pattern>¤ #,##0.00</pattern>
+ <pattern>¤ #,##,##0.00</pattern>
</currencyFormat>
<currencyFormat type="accounting">
- <pattern>¤ #,##0.00</pattern>
+ <pattern>¤ #,##,##0.00</pattern>
</currencyFormat>
</currencyFormatLength>
<currencyFormatLength type="short">
@@ -6032,9 +6038,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेसि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सेन्टी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मिली{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>माइक्रो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नानो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पिको{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फेमटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जेप्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>योक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हेक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>किलो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मेगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गिगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टेरा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>एक्सा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>जेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}प्रति{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>वर्ग {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">वर्ग {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">वर्ग {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>घन {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">घन {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">घन {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6043,7 +6119,7 @@
<unitPattern count="one">{0} गुरूत्वाकर्षण शक्ति</unitPattern>
<unitPattern count="other">{0} गुरूत्वाकर्षण शक्ति</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>मिटर प्रति वर्ग सेकेन्ड</displayName>
<unitPattern count="one">{0}मिटर प्रति सेकेण्ड वर्ग</unitPattern>
<unitPattern count="other">{0}मिटर प्रति सेकेण्ड वर्ग</unitPattern>
@@ -6143,7 +6219,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6173,7 +6249,7 @@
<unitPattern count="one">{0}लिटर प्रति किलोमिटर</unitPattern>
<unitPattern count="other">{0}लिटर प्रति किलोमिटर</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लिटर प्रति १०० किलोमिटर</displayName>
<unitPattern count="one">{0}लिटर प्रति १०० किलोमिटर</unitPattern>
<unitPattern count="other">{0}लिटर प्रति १०० किलोमिटर</unitPattern>
@@ -6649,17 +6725,17 @@
<unitPattern count="one">{0} हर्सपावर</unitPattern>
<unitPattern count="other">{0} हर्सपावर</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>मिलिमिटर पारो</displayName>
<unitPattern count="one">{0} मिलिमिटर पारो</unitPattern>
<unitPattern count="other">{0} मिलिमिटर पारो</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>पाउन्ड प्रति वर्ग इन्च</displayName>
<unitPattern count="one">{0} पाउन्ड प्रति वर्ग इन्च</unitPattern>
<unitPattern count="other">{0}पाउन्ड प्रति वर्ग इन्च</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>इन्च पारो</displayName>
<unitPattern count="one">{0} इन्च पारो</unitPattern>
<unitPattern count="other">{0} इन्च पारो</unitPattern>
@@ -6739,7 +6815,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>पाउन्ड फिट</displayName>
<unitPattern count="one">{0} पाउन्ड फुट</unitPattern>
<unitPattern count="other">{0} पाउन्ड फिट</unitPattern>
@@ -6893,9 +6969,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>से.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>मा.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ना.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>यो.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>कि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गि.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पे.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ए.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>जेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}प्रति {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6904,7 +7050,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7004,7 +7150,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7034,7 +7180,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लि./१००कि.मि.</displayName>
<unitPattern count="one">{0}लि./१००कि.मि.</unitPattern>
<unitPattern count="other">{0}लि./१००कि.मि.</unitPattern>
@@ -7510,17 +7656,17 @@
<unitPattern count="one">{0} हर्सपावर</unitPattern>
<unitPattern count="other">{0} हर्सपावर</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>इन्च पारो</displayName>
<unitPattern count="one">{0} इन्च पारो</unitPattern>
<unitPattern count="other">{0} इन्च पारो</unitPattern>
@@ -7600,7 +7746,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7754,9 +7900,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>डेसि{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>सेन्टी{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>मिली{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>माइक्रो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>नानो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>पिको{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>फेमटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>अटो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>जेप्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>योक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>डेका{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>हेक्टो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>किलो{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>मेगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>गिगा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>टेरा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>पेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>एक्सा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>जेटा{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>योटा{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}प्रति {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7805,7 +8021,7 @@
<unitPattern count="one">{0}प्रतिशत</unitPattern>
<unitPattern count="other">{0}प्रतिशत</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>लि./१००कि.मि.</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -7926,7 +8142,7 @@
<unitPattern count="one">{0} हर्सपावर</unitPattern>
<unitPattern count="other">{0} हर्सपावर</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} ईञ्च पारो</unitPattern>
<unitPattern count="other">{0} ईञ्च पारो</unitPattern>
</unit>
@@ -8017,7 +8233,7 @@
<listPatternPart type="2">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="standard-narrow">
- <listPatternPart type="start" draft="provisional">↑↑↑</listPatternPart>
+ <listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">{0}, {1}</listPatternPart>
<listPatternPart type="end">{0}, {1}</listPatternPart>
<listPatternPart type="2">{0}, {1}</listPatternPart>
diff --git a/common/main/ne_IN.xml b/common/main/ne_IN.xml
index b0959b1..d85620b 100644
--- a/common/main/ne_IN.xml
+++ b/common/main/ne_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ne_NP.xml b/common/main/ne_NP.xml
index 4d74477..c72e9cc 100644
--- a/common/main/ne_NP.xml
+++ b/common/main/ne_NP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl.xml b/common/main/nl.xml
index 47df885..c492141 100644
--- a/common/main/nl.xml
+++ b/common/main/nl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,6 +49,7 @@
<language type="arp">Arapaho</language>
<language type="arq">Algerijns Arabisch</language>
<language type="ars">Nadjdi-Arabisch</language>
+ <language type="ars" alt="menu">Arabisch, Nadjdi</language>
<language type="arw">Arawak</language>
<language type="ary">Marokkaans Arabisch</language>
<language type="arz">Egyptisch Arabisch</language>
@@ -122,6 +123,7 @@
<language type="chr">Cherokee</language>
<language type="chy">Cheyenne</language>
<language type="ckb">Soranî</language>
+ <language type="ckb" alt="menu">Koerdisch, Soranî</language>
<language type="co">Corsicaans</language>
<language type="cop">Koptisch</language>
<language type="cps">Capiznon</language>
@@ -182,6 +184,7 @@
<language type="ewo">Ewondo</language>
<language type="ext">Extremeens</language>
<language type="fa">Perzisch</language>
+ <language type="fa_AF">Dari</language>
<language type="fan">Fang</language>
<language type="fat">Fanti</language>
<language type="ff">Fulah</language>
@@ -652,6 +655,7 @@
<script type="Ahom" draft="contributed">Ahom</script>
<script type="Arab">Arabisch</script>
<script type="Arab" alt="variant">Perso-Arabisch</script>
+ <script type="Aran" draft="contributed">Nastaliq</script>
<script type="Armi">Keizerlijk Aramees</script>
<script type="Armn">Armeens</script>
<script type="Avst">Avestaans</script>
@@ -672,12 +676,14 @@
<script type="Cari">Carisch</script>
<script type="Cham" draft="contributed">Cham</script>
<script type="Cher">Cherokee</script>
+ <script type="Chrs" draft="contributed">Chorasmisch</script>
<script type="Cirt">Cirth</script>
<script type="Copt">Koptisch</script>
<script type="Cprt">Cyprisch</script>
<script type="Cyrl">Cyrillisch</script>
<script type="Cyrs">Oudkerkslavisch Cyrillisch</script>
<script type="Deva">Devanagari</script>
+ <script type="Diak" draft="contributed">Dives Akuru</script>
<script type="Dogr" draft="contributed">Dogra</script>
<script type="Dsrt">Deseret</script>
<script type="Dupl" draft="contributed">Duployan snelschrift</script>
@@ -697,7 +703,7 @@
<script type="Grek">Grieks</script>
<script type="Gujr">Gujarati</script>
<script type="Guru">Gurmukhi</script>
- <script type="Hanb">Hanb</script>
+ <script type="Hanb">Han met Bopomofo</script>
<script type="Hang">Hangul</script>
<script type="Hani">Han</script>
<script type="Hano">Hanunoo</script>
@@ -724,6 +730,7 @@
<script type="Khar">Kharoshthi</script>
<script type="Khmr">Khmer</script>
<script type="Khoj" draft="contributed">Khojki</script>
+ <script type="Kits" draft="contributed">Kitaans kleinschrift</script>
<script type="Knda">Kannada</script>
<script type="Kore">Koreaans</script>
<script type="Kpel" draft="contributed">Kpelle</script>
@@ -782,7 +789,7 @@
<script type="Phnx">Foenicisch</script>
<script type="Plrd">Pollard-fonetisch</script>
<script type="Prti">Inscriptioneel Parthisch</script>
- <script type="Qaag" draft="contributed">Qaag</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Rejang</script>
<script type="Rohg" draft="contributed">Hanifi Rohingya</script>
<script type="Roro">Rongorongo</script>
@@ -830,6 +837,7 @@
<script type="Wole" draft="contributed">Woleai</script>
<script type="Xpeo">Oudperzisch</script>
<script type="Xsux">Sumero-Akkadian Cuneiform</script>
+ <script type="Yezi" draft="contributed">Jezidi</script>
<script type="Yiii">Yi</script>
<script type="Zanb" draft="contributed">vierkant Zanabazar</script>
<script type="Zinh">Overgeërfd</script>
@@ -1180,6 +1188,7 @@
<variant type="BISKE">San Giorgio/Bila-dialect</variant>
<variant type="BOHORIC" draft="contributed">Bohorič-alfabet</variant>
<variant type="BOONT">Boontling</variant>
+ <variant type="BORNHOLM" draft="contributed">Bornholms</variant>
<variant type="CISAUP" draft="contributed">Cisaup</variant>
<variant type="COLB1945" draft="contributed">Portugese-Braziliaanse spellingsverdrag van 1945</variant>
<variant type="CORNU" draft="contributed">Cornu</variant>
@@ -1362,6 +1371,7 @@
<type key="numbers" type="cham" draft="contributed">Cham cijfers</type>
<type key="numbers" type="cyrl" draft="contributed">Cyrillische cijfers</type>
<type key="numbers" type="deva">Devanagari cijfers</type>
+ <type key="numbers" type="diak" draft="contributed">Dives Akuru cijfers</type>
<type key="numbers" type="ethi">Ethiopische cijfers</type>
<type key="numbers" type="finance" draft="contributed">Financiële cijfers</type>
<type key="numbers" type="fullwide">cijfers met volledige breedte</type>
@@ -5178,7 +5188,7 @@
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G">y G – y G</greatestDifference>
- <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
+ <greatestDifference id="y">y – y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">M-y GGGGG – M-y GGGGG</greatestDifference>
@@ -11077,9 +11087,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <generic draft="contributed">↑↑↑</generic>
- <standard>Norfolkeilandse tijd</standard>
- <daylight draft="contributed">↑↑↑</daylight>
+ <generic draft="contributed">Norfolkeilandse tijd</generic>
+ <standard draft="contributed">Norfolkeilandse standaardtijd</standard>
+ <daylight draft="contributed">Norfolkeilandse zomertijd</daylight>
</long>
<short>
<generic draft="contributed">↑↑↑</generic>
@@ -16095,9 +16105,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>vierkante {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">vierkante {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">vierkante {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubieke {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubieke {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubieke {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -16106,7 +16186,7 @@
<unitPattern count="one">{0} G-kracht</unitPattern>
<unitPattern count="other">{0} G-krachten</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per seconde kwadraat</displayName>
<unitPattern count="one">{0} meter per seconde kwadraat</unitPattern>
<unitPattern count="other">{0} meter per seconde kwadraat</unitPattern>
@@ -16206,7 +16286,7 @@
<unitPattern count="one">{0} millimol per liter</unitPattern>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -16236,7 +16316,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
@@ -16727,17 +16807,17 @@
<unitPattern count="one">{0} paardenkracht</unitPattern>
<unitPattern count="other">{0} paardenkrachten</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter-kwikdruk</displayName>
<unitPattern count="one">{0} millimeter-kwikdruk</unitPattern>
<unitPattern count="other">{0} millimeter-kwikdruk</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inch-kwikdruk</displayName>
<unitPattern count="one">{0} inch-kwikdruk</unitPattern>
<unitPattern count="other">{0} inch-kwikdruk</unitPattern>
@@ -16817,9 +16897,9 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound-feet</displayName>
- <unitPattern count="one">{0} pound-foot</unitPattern>
+ <unitPattern count="one">{0} pound-force-foot</unitPattern>
<unitPattern count="other">{0} pound-feet</unitPattern>
</unit>
<unit type="torque-newton-meter">
@@ -16976,9 +17056,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -16987,7 +17137,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -17087,7 +17237,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -17117,7 +17267,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -17608,17 +17758,17 @@
<unitPattern count="one">{0} pk</unitPattern>
<unitPattern count="other">{0} pk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -17698,7 +17848,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -17857,9 +18007,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -17868,7 +18088,7 @@
<unitPattern count="one" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
@@ -17968,7 +18188,7 @@
<unitPattern count="one" draft="contributed">{0} mmol/l</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">ppm</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="other" draft="contributed">{0} ppm</unitPattern>
@@ -17998,7 +18218,7 @@
<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -18489,17 +18709,17 @@
<unitPattern count="one">{0} pk</unitPattern>
<unitPattern count="other">{0} pk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -18579,7 +18799,7 @@
<unitPattern count="one" draft="contributed">{0} K</unitPattern>
<unitPattern count="other" draft="contributed">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
diff --git a/common/main/nl_AW.xml b/common/main/nl_AW.xml
index 413839a..1aff085 100644
--- a/common/main/nl_AW.xml
+++ b/common/main/nl_AW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_BE.xml b/common/main/nl_BE.xml
index a3c0f81..9a34b30 100644
--- a/common/main/nl_BE.xml
+++ b/common/main/nl_BE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_BQ.xml b/common/main/nl_BQ.xml
index 9839315..8217e87 100644
--- a/common/main/nl_BQ.xml
+++ b/common/main/nl_BQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_CW.xml b/common/main/nl_CW.xml
index 386009f..819ef7b 100644
--- a/common/main/nl_CW.xml
+++ b/common/main/nl_CW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_NL.xml b/common/main/nl_NL.xml
index 0347df5..7e2d110 100644
--- a/common/main/nl_NL.xml
+++ b/common/main/nl_NL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_SR.xml b/common/main/nl_SR.xml
index 787e229..7603cd8 100644
--- a/common/main/nl_SR.xml
+++ b/common/main/nl_SR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nl_SX.xml b/common/main/nl_SX.xml
index 5473d53..6972b30 100644
--- a/common/main/nl_SX.xml
+++ b/common/main/nl_SX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nmg.xml b/common/main/nmg.xml
index c8f5817..bc7f238 100644
--- a/common/main/nmg.xml
+++ b/common/main/nmg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Mɔldavia</territory>
<territory type="MG">Madagaskar</territory>
<territory type="MH">Maŋ́ má Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mɔngolia</territory>
diff --git a/common/main/nmg_CM.xml b/common/main/nmg_CM.xml
index 14f96c8..e7bd006 100644
--- a/common/main/nmg_CM.xml
+++ b/common/main/nmg_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nn.xml b/common/main/nn.xml
index fa6135b..84a282c 100644
--- a/common/main/nn.xml
+++ b/common/main/nn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -760,7 +760,6 @@
<territory type="ER">Eritrea</territory>
<territory type="ES">Spania</territory>
<territory type="ET">Etiopia</territory>
- <territory type="EU">EU</territory>
<territory type="EZ">eurosona</territory>
<territory type="FI">Finland</territory>
<territory type="FJ">Fiji</territory>
@@ -4320,7 +4319,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>tidssone for Norfolkøya</standard>
+ <generic draft="contributed">tidssone for Norfolkøya</generic>
+ <standard draft="contributed">normaltid for Norfolkøya</standard>
+ <daylight draft="contributed">sumartid for Norfolkøya</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6320,7 +6321,7 @@
<unitPattern count="one">{0} g-kraft</unitPattern>
<unitPattern count="other">{0} g-krefter</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per sekund²</displayName>
<unitPattern count="one">{0} meter per sekund²</unitPattern>
<unitPattern count="other">{0} meter per sekund²</unitPattern>
@@ -6415,7 +6416,7 @@
<unitPattern count="one">{0} millimol per liter</unitPattern>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milliondelar</displayName>
<unitPattern count="one">{0} milliondel</unitPattern>
<unitPattern count="other">{0} milliondelar</unitPattern>
@@ -6425,7 +6426,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
@@ -6806,17 +6807,17 @@
<unitPattern count="one">{0} hestekraft</unitPattern>
<unitPattern count="other">{0} hestekrefter</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter kvikksølv</displayName>
<unitPattern count="one">{0} millimeter kvikksølv</unitPattern>
<unitPattern count="other">{0} millimeter kvikksølv</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pund per kvadrattomme</displayName>
<unitPattern count="one">{0} pund per kvadrattomme</unitPattern>
<unitPattern count="other">{0} pund per kvadrattomme</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tommar kvikksølv</displayName>
<unitPattern count="one">{0} tomme kvikksølv</unitPattern>
<unitPattern count="other">{0} tommar kvikksølv</unitPattern>
@@ -7012,7 +7013,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7107,7 +7108,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7117,7 +7118,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7498,17 +7499,17 @@
<unitPattern count="one">{0} hk</unitPattern>
<unitPattern count="other">{0} hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7739,12 +7740,12 @@
<unitPattern count="one">{0} ft²</unitPattern>
<unitPattern count="other">{0} ft²</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">ppm</displayName>
<unitPattern count="one" draft="unconfirmed">{0} ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} ppm</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -7903,7 +7904,7 @@
<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/nn_NO.xml b/common/main/nn_NO.xml
index 241c8ea..ce88a1a 100644
--- a/common/main/nn_NO.xml
+++ b/common/main/nn_NO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nnh.xml b/common/main/nnh.xml
index 98866ab..c6f85af 100644
--- a/common/main/nnh.xml
+++ b/common/main/nnh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nnh_CM.xml b/common/main/nnh_CM.xml
index 3261f6a..c389780 100644
--- a/common/main/nnh_CM.xml
+++ b/common/main/nnh_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nus.xml b/common/main/nus.xml
index 7353df3..2e017cf 100644
--- a/common/main/nus.xml
+++ b/common/main/nus.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nus_SS.xml b/common/main/nus_SS.xml
index 6fbd3f1..d078cef 100644
--- a/common/main/nus_SS.xml
+++ b/common/main/nus_SS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/nyn.xml b/common/main/nyn.xml
index d7a2fb4..f9f24c6 100644
--- a/common/main/nyn.xml
+++ b/common/main/nyn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moridova</territory>
<territory type="MG">Madagasika</territory>
<territory type="MH">Ebizinga bya Marshaa</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mari</territory>
<territory type="MM">Myanamar</territory>
<territory type="MN">Mongoria</territory>
diff --git a/common/main/nyn_UG.xml b/common/main/nyn_UG.xml
index 00bb44c..26f6271 100644
--- a/common/main/nyn_UG.xml
+++ b/common/main/nyn_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/om.xml b/common/main/om.xml
index 35fcd45..fb410dc 100644
--- a/common/main/om.xml
+++ b/common/main/om.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/om_ET.xml b/common/main/om_ET.xml
index 605c844..6157992 100644
--- a/common/main/om_ET.xml
+++ b/common/main/om_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/om_KE.xml b/common/main/om_KE.xml
index 64156b0..86c7f52 100644
--- a/common/main/om_KE.xml
+++ b/common/main/om_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/or.xml b/common/main/or.xml
index 5de5974..957d740 100644
--- a/common/main/or.xml
+++ b/common/main/or.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -150,6 +150,7 @@
<language type="eu">ବାସ୍କ୍ୱି</language>
<language type="ewo">ଇୱୋଣ୍ଡୋ</language>
<language type="fa">ପର୍ସିଆନ୍</language>
+ <language type="fa_AF">ଦାରି</language>
<language type="fan">ଫାଙ୍ଗ</language>
<language type="fat">ଫାଣ୍ଟି</language>
<language type="ff">ଫୁଲାହ</language>
@@ -982,6 +983,16 @@
<subdivision type="gbsct">ସ୍କଟଲ୍ୟାଣ୍ଡ</subdivision>
<subdivision type="gbwls">ୱେଲ୍ସ</subdivision>
</subdivisions>
+ <variants>
+ <variant type="1901">ପାରମ୍ପରିକ ଜର୍ମାନ ବର୍ଣ୍ଣପ୍ରକରଣ</variant>
+ <variant type="1996">1996ର ଜର୍ମାନ ବର୍ଣ୍ଣପ୍ରକରଣ</variant>
+ <variant type="1694ACAD">ଆଦ୍ୟ ଆଧୁନିକ ଫରାସୀ</variant>
+ <variant type="1959ACAD">ଏକାଡେମିକ</variant>
+ <variant type="ALUKU">ଆଲୁକୁ ଉପଭାଷା</variant>
+ <variant type="UNIFON">ୟୁନିଫନ୍ ଫନେଟିକ୍ ଆଲଫାବେଟ୍</variant>
+ <variant type="VAIDIKA">ବୈଦିକ</variant>
+ <variant type="VALENCIA">ଭେଲେନସିଆନ୍</variant>
+ </variants>
<keys>
<key type="calendar">କ୍ୟାଲେଣ୍ଡର୍</key>
<key type="cf">ମୁଦ୍ରା ଫର୍ମାଟ୍</key>
@@ -1045,6 +1056,7 @@
<type key="numbers" type="laoo">ଲାଓ ଅଙ୍କଗୁଡ଼ିକ</type>
<type key="numbers" type="latn">ପାଶ୍ଚାତ୍ୟ ଅଙ୍କଗୁଡ଼ିକ</type>
<type key="numbers" type="mlym">ମଲୟାଲମ୍ ଅଙ୍କଗୁଡ଼ିକ</type>
+ <type key="numbers" type="mong">ମଙ୍ଗୋଲୀୟ ଡିଜିଟ୍</type>
<type key="numbers" type="mymr">ମିଆଁମାର୍ ଅଙ୍କଗୁଡ଼ିକ</type>
<type key="numbers" type="orya">ଓଡ଼ିଆ ଅଙ୍କଗୁଡ଼ିକ</type>
<type key="numbers" type="roman">ରୋମାନ୍ ସଂଖ୍ୟାଗୁଡ଼ିକ</type>
@@ -1898,6 +1910,9 @@
</field>
<field type="quarter-short">
<displayName>ତ୍ରୟ.</displayName>
+ <relative type="-1">ଗତ ତିନିମାସ</relative>
+ <relative type="0">ଏହି ତ୍ରୟମାସ</relative>
+ <relative type="1">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} ତ୍ରୟ. ରେ</relativeTimePattern>
<relativeTimePattern count="other">{0} ତ୍ରୟ. ରେ</relativeTimePattern>
@@ -1909,6 +1924,9 @@
</field>
<field type="quarter-narrow">
<displayName>ତ୍ରୟ.</displayName>
+ <relative type="-1">ଗତ ତିନିମାସ</relative>
+ <relative type="0">ଏହି ତିନିମାସ</relative>
+ <relative type="1">ଆଗାମୀ ତିନିମାସ</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} ତ୍ରୟ. ରେ</relativeTimePattern>
<relativeTimePattern count="other">{0} ତ୍ରୟ. ରେ</relativeTimePattern>
@@ -3777,6 +3795,13 @@
<zone type="Africa/Harare">
<exemplarCity>ହରାରେ</exemplarCity>
</zone>
+ <metazone type="Acre">
+ <long>
+ <generic>ଆକା ସମୟ</generic>
+ <standard>ଆକା ମାନକ ସମୟ</standard>
+ <daylight>ଆକା ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Afghanistan">
<long>
<standard>ଆଫଗାନିସ୍ତାନ ସମୟ</standard>
@@ -3811,6 +3836,13 @@
<daylight>ଆଲାସ୍କା ଦିବାଲୋକ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Almaty">
+ <long>
+ <generic>ଅଲମାଟୀ ସମୟ</generic>
+ <standard>ଅଲମାଟୀ ମାନକ ସମୟ</standard>
+ <daylight>ଅଲମାଟୀ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Amazon">
<long>
<generic>ଆମାଜନ୍ ସମୟ</generic>
@@ -3846,6 +3878,13 @@
<daylight>ପାସିଫିକ୍ ଦିବାଲୋକ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Anadyr">
+ <long>
+ <generic>ଅନାଡିର୍ ସମୟ</generic>
+ <standard>ଅନାଡିର୍ ମାନକ ସମୟ</standard>
+ <daylight>ଅନାଡିର୍ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Apia">
<long>
<generic>ଆପିଆ ସମୟ</generic>
@@ -3853,6 +3892,20 @@
<daylight>ଆପିଆ ଦିବାଲୋକ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Aqtau">
+ <long>
+ <generic>ଅକତୌ ସମୟ</generic>
+ <standard>ଅକତୌ ମାନକ ସମୟ</standard>
+ <daylight>ଅକତୌ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
+ <metazone type="Aqtobe">
+ <long>
+ <generic>ଅକ୍ତୋବ ସମୟ</generic>
+ <standard>ଅକ୍ତୋବ ମାନକ ସମୟ</standard>
+ <daylight>ଅକ୍ତୋବ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Arabian">
<long>
<generic>ଆରବୀୟ ସମୟ</generic>
@@ -4133,6 +4186,9 @@
<long>
<standard>ଗ୍ରୀନୱିଚ୍ ମିନ୍ ସମୟ</standard>
</long>
+ <short>
+ <standard draft="contributed">GMT</standard>
+ </short>
</metazone>
<metazone type="Greenland_Eastern">
<long>
@@ -4240,6 +4296,13 @@
<daylight>ଜାପାନ ଦିବାଲୋକ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Kamchatka">
+ <long>
+ <generic>ପେଟ୍ରୋପାଭଲୋଭ୍ସକ-କମଚଟସ୍କି ସମୟ</generic>
+ <standard>ପେଟ୍ରୋପାଭଲୋଭ୍ସକ-କମଚଟସ୍କି ମାନକ ସମୟ</standard>
+ <daylight>ପେଟ୍ରୋପାଭଲୋଭ୍ସକ-କମଚଟସ୍କି ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Kazakhstan_Eastern">
<long>
<standard>ପୂର୍ବ କାଜାକସ୍ତାନ୍ ସମୟ</standard>
@@ -4274,6 +4337,11 @@
<standard>କିର୍ଗିସ୍ତାନ ସମୟ</standard>
</long>
</metazone>
+ <metazone type="Lanka">
+ <long>
+ <standard>ଲଙ୍କା ସମୟ</standard>
+ </long>
+ </metazone>
<metazone type="Line_Islands">
<long>
<standard>ଲାଇନ୍ ଦ୍ୱୀପପୁଞ୍ଜ ସମୟ</standard>
@@ -4286,6 +4354,13 @@
<daylight>ଲର୍ଡ ହୋୱେ ଦିବାଲୋକ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Macau">
+ <long>
+ <generic>ମାକାଓ ସମୟ</generic>
+ <standard>ମକାଓ ମାନକ ସମୟ</standard>
+ <daylight>ମକାଓ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Macquarie">
<long>
<standard>ମାକ୍ୱେରୀ ଦ୍ୱୀପ ସମୟ</standard>
@@ -4401,7 +4476,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ନରଫୋକ୍ ଦ୍ୱୀପ ସମୟ</standard>
+ <generic draft="contributed">ନରଫୋକ୍ ଦ୍ୱୀପ ସମୟ</generic>
+ <standard draft="contributed">ନରଫୋକ୍ ଦ୍ୱୀପ ମାନାଙ୍କ ସମୟ</standard>
+ <daylight draft="contributed">ନରଫୋକ୍ ଦ୍ୱୀପ ଗ୍ରୀଷ୍ମକାଳ ସମୟ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4411,6 +4488,11 @@
<daylight>ଫର୍ଣ୍ଣାଣ୍ଡୋ ଡି ନୋରୋନ୍ନା ଗ୍ରୀଷ୍ମକାଳ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="North_Mariana">
+ <long>
+ <standard>ଉତ୍ତର ମେରିଆନା ଆଇଲ୍ୟାଣ୍ଡ ସମୟ</standard>
+ </long>
+ </metazone>
<metazone type="Novosibirsk">
<long>
<generic>ନୋଭୋସିବିରସ୍କ ସମୟ</generic>
@@ -4490,6 +4572,13 @@
<standard>ପୋୟଙ୍ଗୟାଙ୍ଗ ସମୟ</standard>
</long>
</metazone>
+ <metazone type="Qyzylorda">
+ <long>
+ <generic>କାଜିଲୋର୍ଡା ସମୟ</generic>
+ <standard>କାଜିଲୋର୍ଡା ମାନକ ସମୟ</standard>
+ <daylight>କାଜିଲୋର୍ଡା ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Reunion">
<long>
<standard>ରିୟୁନିଅନ୍ ସମୟ</standard>
@@ -4507,6 +4596,13 @@
<daylight>ସଖାଲିନ୍ ଗ୍ରୀଷ୍ମକାଳ ସମୟ</daylight>
</long>
</metazone>
+ <metazone type="Samara">
+ <long>
+ <generic>ସମାରା ସମୟ</generic>
+ <standard>ସମାରା ମାନକ ସମୟ</standard>
+ <daylight>ସମାରା ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
+ </long>
+ </metazone>
<metazone type="Samoa">
<long>
<generic>ସାମୋଆ ସମୟ</generic>
@@ -5900,9 +5996,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ଡେସି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ସେଣ୍ଟି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ମିଲି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ମାଇକ୍ରୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ନାନୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ପିକୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ଫିମଟୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ଅଟୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern draft="provisional">ଜିପୋଟ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern draft="provisional">ୟୋକଟ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ଡେକା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern draft="provisional">ହେକ୍ଟା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>କିଲୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ମେଗା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ଗିଗା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ଟେରା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ପିଟା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ଏକ୍ସା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ଜିଟା{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ୟୋଟା{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1} ପ୍ରତି {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ସ୍କୋୟାର୍ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ସ୍କୋୟାର୍{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ସ୍କୋ{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>କ୍ୟୁବି {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">କ୍ୟୁବିକ୍ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">କ୍ୟୁ {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5911,7 +6077,7 @@
<unitPattern count="one">{0} ଜି-ଫୋର୍ସ୍</unitPattern>
<unitPattern count="other">{0} ଜି-ଫୋର୍ସ୍</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ</displayName>
<unitPattern count="one">{0} ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ</unitPattern>
<unitPattern count="other">{0} ମିଟର୍ ପ୍ରତି ସେକେଣ୍ଡ୍ ବର୍ଗ</unitPattern>
@@ -6011,7 +6177,7 @@
<unitPattern count="one">{0} ମିଲିମୋଲ୍ ପ୍ରତି ଲିଟର୍</unitPattern>
<unitPattern count="other">{0} ମିଲିମୋଲ୍ ପ୍ରତି ଲିଟର୍</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ଅଂଶ ପ୍ରତି ନିୟୁତ</displayName>
<unitPattern count="one">{0} ଅଂଶ ପ୍ରତି ନିୟୁତ</unitPattern>
<unitPattern count="other">{0} ଅଂଶ ପ୍ରତି ନିୟୁତ</unitPattern>
@@ -6041,7 +6207,7 @@
<unitPattern count="one">{0} ଲିଟର୍ ପ୍ରତି କିଲୋମିଟର୍</unitPattern>
<unitPattern count="other">{0} ଲିଟର୍ ପ୍ରତି କିଲୋମିଟର୍</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>100 କିଲୋମିଟର୍ ପ୍ରତି ଲିଟର୍</displayName>
<unitPattern count="one">100 କିଲୋମିଟର୍ ପ୍ରତି {0} ଲିଟର୍</unitPattern>
<unitPattern count="other">100 କିଲୋମିଟର୍ ପ୍ରତି {0} ଲିଟର୍</unitPattern>
@@ -6517,17 +6683,17 @@
<unitPattern count="one">{0} ହର୍ସପାୱାର୍</unitPattern>
<unitPattern count="other">{0} ହର୍ସପାୱାର୍</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ପାରାର ମିଲିମିଟର୍</displayName>
<unitPattern count="one">ପାରାର {0} ମିଲିମିଟର୍</unitPattern>
<unitPattern count="other">ପାରାର {0} ମିଲିମିଟର୍</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ପାଉଣ୍ଡ୍ ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ</displayName>
<unitPattern count="one">ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ {0} ପାଉଣ୍ଡ୍</unitPattern>
<unitPattern count="other">ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ {0} ପାଉଣ୍ଡ୍</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ପାରାର ଇଞ୍ଜି</displayName>
<unitPattern count="one">ପାରାର {0} ଇଞ୍ଜି</unitPattern>
<unitPattern count="other">ପାରାର {0} ଇଞ୍ଜି</unitPattern>
@@ -6607,7 +6773,7 @@
<unitPattern count="one">{0} କେଲଭିନ୍</unitPattern>
<unitPattern count="other">{0} କେଲଭିନ୍</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ପାଉଣ୍ଡ-ଫିଟ</displayName>
<unitPattern count="one">{0} ପାଉଣ୍ଡ-ଫୁଟ</unitPattern>
<unitPattern count="other">{0} ପାଉଣ୍ଡ-ଫିଟ</unitPattern>
@@ -6761,9 +6927,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ଡେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ସେ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ମି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ନେ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ପିକ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ଫି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ଅ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ଜିପ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ୟୋକ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ଡେକ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ହେ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>କି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ମେ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ଗି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ଟେ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ପି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ଏ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ଜି.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ୟୋ.{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6772,7 +7008,7 @@
<unitPattern count="one">{0} ଜି</unitPattern>
<unitPattern count="other">{0} ଜି</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ମିଟର୍/ସେ²</displayName>
<unitPattern count="one">{0} ମି/ସେ²</unitPattern>
<unitPattern count="other">{0} ମି/ସେ²</unitPattern>
@@ -6872,7 +7108,7 @@
<unitPattern count="one">{0} ମିଲିମୋଲ୍/ଲି</unitPattern>
<unitPattern count="other">{0} ମିଲିମୋଲ୍/ଲି</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ଅଂଶ/ନିୟୁତ</displayName>
<unitPattern count="one">{0} ପିପିଏମ୍</unitPattern>
<unitPattern count="other">{0} ପିପିଏମ୍</unitPattern>
@@ -6902,7 +7138,7 @@
<unitPattern count="one">{0} ଲି/କିମି</unitPattern>
<unitPattern count="other">{0} ଲି/କିମି</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ଲି/100 କିମି</displayName>
<unitPattern count="one">{0} ଲି/100 କିମି</unitPattern>
<unitPattern count="other">{0} ଲି/100 କିମି</unitPattern>
@@ -7378,17 +7614,17 @@
<unitPattern count="one">{0} ଏଚପି</unitPattern>
<unitPattern count="other">{0} ଏଚପି</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7468,7 +7704,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7622,9 +7858,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ଡେସି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ସେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ମି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ନେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ପି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ଫି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ଅ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ଜି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ୟୋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ଡେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ହେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>କି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ମେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ଗି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ଟେ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ପି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ଏ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ଜି{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ୟୋ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7633,7 +7939,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ଲି/100କିମି</displayName>
<unitPattern count="one">{0}ଲି/100 କିମି</unitPattern>
<unitPattern count="other">{0}ଲି/100 କିମି</unitPattern>
@@ -7708,6 +8014,9 @@
<unitPattern count="one">{0}ଗ୍ରା</unitPattern>
<unitPattern count="other">{0}ଗ୍ରା</unitPattern>
</unit>
+ <unit type="mass-earth-mass">
+ <displayName>ଅର୍ଥ ମାସ୍</displayName>
+ </unit>
<unit type="speed-kilometer-per-hour">
<displayName>କିମି/ଘ</displayName>
<unitPattern count="one">{0}କେପିଏଚ୍</unitPattern>
diff --git a/common/main/or_IN.xml b/common/main/or_IN.xml
index e07b92a..5e9ec15 100644
--- a/common/main/or_IN.xml
+++ b/common/main/or_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/os.xml b/common/main/os.xml
index 0b0047c..09eae6d 100644
--- a/common/main/os.xml
+++ b/common/main/os.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/os_GE.xml b/common/main/os_GE.xml
index 3f2b229..0a2bf0e 100644
--- a/common/main/os_GE.xml
+++ b/common/main/os_GE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/os_RU.xml b/common/main/os_RU.xml
index 9fecf28..d1f68a4 100644
--- a/common/main/os_RU.xml
+++ b/common/main/os_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pa.xml b/common/main/pa.xml
index 959e279..04a155d 100644
--- a/common/main/pa.xml
+++ b/common/main/pa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="eu">ਬਾਸਕ</language>
<language type="ewo">ਇਵੋਂਡੋ</language>
<language type="fa">ਫ਼ਾਰਸੀ</language>
+ <language type="fa_AF">ਦਾਰੀ</language>
<language type="ff">ਫੁਲਾਹ</language>
<language type="fi">ਫਿਨਿਸ਼</language>
<language type="fil">ਫਿਲੀਪਿਨੋ</language>
@@ -442,6 +443,7 @@
</languages>
<scripts>
<script type="Arab">ਅਰਬੀ</script>
+ <script type="Aran" draft="contributed">ਨਸਤਾਲੀਕ</script>
<script type="Armn">ਅਰਮੀਨੀਆਈ</script>
<script type="Beng">ਬੰਗਾਲੀ</script>
<script type="Bopo">ਬੋਪੋਮੋਫੋ</script>
@@ -5081,7 +5083,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਵੇਲਾ</standard>
+ <generic draft="contributed">ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਵੇਲਾ</generic>
+ <standard draft="contributed">ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਮਿਆਰੀ ਵੇਲਾ</standard>
+ <daylight draft="contributed">ਨੋਰਫੌਕ ਆਈਲੈਂਡ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6755,7 +6759,7 @@
</currency>
<currency type="XEU">
<displayName>ਯੂਰਪੀ ਮੁਦਰਾ ਇਕਾਈ</displayName>
- <displayName count="one">XEU</displayName>
+ <displayName count="one">ਯੂਰਪੀਅਨ ਮੁਦਰਾ ਇਕਾਈ</displayName>
<displayName count="other">ਯੂਰਪੀ ਮੁਦਰਾ ਇਕਾਈ</displayName>
<symbol>XEU</symbol>
</currency>
@@ -6812,9 +6816,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ਡੈਸੀ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ਸੈਂਟੀ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ਮਿਲੀ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ਮਾਈਕ੍ਰੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ਨੈਨੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ਪਿਕੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ਫੈਮਟੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ਐੱਟੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ਜ਼ੈਪਟੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ਯੋਕਟੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ਡੇਕਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ਹੈਕਟੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ਕਿਲੋ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ਮੈਗਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ਗੀਗਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ਟੈਰਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ਪੇਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ਐਕਸਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ਜ਼ੀਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ਯੋਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} ਪ੍ਰਤੀ {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>ਵਰਗ{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ਵਰਗ{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ਵਰਗ{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ਘਣ{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ਘਣ{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ਘਣ{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6823,7 +6897,7 @@
<unitPattern count="one">{0} ਗੁਰੂਤਾਕਰਸ਼ਣ ਬਲ</unitPattern>
<unitPattern count="other">{0} ਗੁਰੂਤਾਕਰਸ਼ਣ ਬਲ</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</displayName>
<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
@@ -6923,7 +6997,7 @@
<unitPattern count="one">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
<unitPattern count="other">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</displayName>
<unitPattern count="one">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
<unitPattern count="other">{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
@@ -6953,7 +7027,7 @@
<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</displayName>
<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
@@ -7444,17 +7518,17 @@
<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ਮਿਲੀਮੀਟਰ ਪਾਰਾ</displayName>
<unitPattern count="one">{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</displayName>
<unitPattern count="one">{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</unitPattern>
<unitPattern count="other">{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ਇੰਚ ਪਾਰਾ</displayName>
<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
@@ -7534,7 +7608,7 @@
<unitPattern count="one">{0} ਕੈਲਵਿਨ</unitPattern>
<unitPattern count="other">{0} ਕੈਲਵਿਨ</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ਪੌਂਡ-ਫੁੱਟ</displayName>
<unitPattern count="one">{0} ਪੌਂਡ-ਫੁੱਟ</unitPattern>
<unitPattern count="other">{0} ਪੌਂਡ-ਫੁੱਟ</unitPattern>
@@ -7693,9 +7767,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ਡੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ਸੈਂ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ਮਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ਮਾ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ਨੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ਪਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ਫੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ਐੱ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ਜ਼ੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ਯੋ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ਡੇ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ਹੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ਕਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ਮੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ਗੀਗਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ਟੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ਪੇਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ਐਕਸਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ਜ਼ੀਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ਯੋਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7704,7 +7848,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ਮੀਟਰ/ਸਕਿੰਟ²</displayName>
<unitPattern count="one">{0} ਮੀ/ਸ²</unitPattern>
<unitPattern count="other">{0} ਮੀ/ਸ²</unitPattern>
@@ -7804,7 +7948,7 @@
<unitPattern count="one">{0} ਮਿ.ਮੋ./ਲਿ.</unitPattern>
<unitPattern count="other">{0} ਮਿ.ਮੋ./ਲਿ.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ਹਿੱਸੇ/ਮਿਲੀਅਨ</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7834,7 +7978,7 @@
<unitPattern count="one">{0} ਲਿ./ਕਿ.ਮੀ.</unitPattern>
<unitPattern count="other">{0} ਲਿ./ਕਿ.ਮੀ.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ਲਿ./100ਕਿ.ਮੀ.</displayName>
<unitPattern count="one">{0}ਲਿ/100 ਕਿਮੀ</unitPattern>
<unitPattern count="other">{0}ਲਿ/100 ਕਿਮੀ</unitPattern>
@@ -8325,17 +8469,17 @@
<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ਮਿ.ਮੀ. ਪਾਰਾ</displayName>
<unitPattern count="one">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ਪੌਂ.ਵ.ਇੰਚ</displayName>
<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
<unitPattern count="other">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ਇੰਚ ਪਾਰਾ</displayName>
<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
@@ -8415,7 +8559,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8574,9 +8718,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ਡੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>ਸੈਂ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ਮਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ਮਾ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>ਨੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>ਪਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ਫੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ਐੱ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ਜ਼ੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ਯੋ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ਡੇ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ਹੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>ਕਿ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>ਮੈ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ਗੀਗਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>ਪੇਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ਐਕਸਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ਜ਼ੀਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ਯੋਟਾ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8584,7 +8798,7 @@
<unitPattern count="one">{0}G</unitPattern>
<unitPattern count="other">{0}Gs</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one">{0}ਮੀ/ਸ²</unitPattern>
<unitPattern count="other">{0}ਮੀ/ਸ²</unitPattern>
</unit>
@@ -8653,7 +8867,7 @@
<unitPattern count="one">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
<unitPattern count="other">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ਲਿ./100ਕਿ.ਮੀ.</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8966,17 +9180,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">ਮਿ.ਮੀ. ਪਾਰਾ</displayName>
<unitPattern count="one">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">ਪੌਂ.ਵ.ਇੰਚ</displayName>
<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
<unitPattern count="other">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">ਇੰਚ ਪਾਰਾ</displayName>
<unitPattern count="one">{0}" ਪਾਰਾ</unitPattern>
<unitPattern count="other">{0}" ਪਾਰਾ</unitPattern>
diff --git a/common/main/pa_Arab.xml b/common/main/pa_Arab.xml
index fa5f308..cfac6a3 100644
--- a/common/main/pa_Arab.xml
+++ b/common/main/pa_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -17,6 +17,7 @@
</languages>
<scripts>
<script type="Arab">عربی</script>
+ <script type="Aran" draft="contributed">نستعلیق</script>
<script type="Guru">گُرمُکھی</script>
</scripts>
<territories>
diff --git a/common/main/pa_Arab_PK.xml b/common/main/pa_Arab_PK.xml
index def07f1..8316ac4 100644
--- a/common/main/pa_Arab_PK.xml
+++ b/common/main/pa_Arab_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pa_Guru.xml b/common/main/pa_Guru.xml
index 7ca1994..00bd078 100644
--- a/common/main/pa_Guru.xml
+++ b/common/main/pa_Guru.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pa_Guru_IN.xml b/common/main/pa_Guru_IN.xml
index b96c7b5..cbcf867 100644
--- a/common/main/pa_Guru_IN.xml
+++ b/common/main/pa_Guru_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pcm.xml b/common/main/pcm.xml
new file mode 100644
index 0000000..64f7c35
--- /dev/null
+++ b/common/main/pcm.xml
@@ -0,0 +1,7759 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="pcm"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="af">Áfríkaans Lángwej</language>
+ <language type="agq">Aghẹ́m Lángwej</language>
+ <language type="ak">Akan Lángwej</language>
+ <language type="am">Amhárík Lángwej</language>
+ <language type="ar">Arábík Lángwej</language>
+ <language type="ar_001">Gẹ́nárál Arábík Lángwej fọ dís taim</language>
+ <language type="as">Asamíz Lángwej</language>
+ <language type="asa">Asu Lángwej</language>
+ <language type="ast">Astúriá Lángwej</language>
+ <language type="az">Azẹrbaijáni Lángwej</language>
+ <language type="az" alt="short">Azẹrbaijáni Lángwej</language>
+ <language type="bas">Básaa Lángwej</language>
+ <language type="be">Bẹlarúsiá Lángwej</language>
+ <language type="bem">Bẹ́mba Lángwej</language>
+ <language type="bez">Bẹ́na Lángwej</language>
+ <language type="bg">Bọlgériá Lángwej</language>
+ <language type="bm">Bambára Lángwej</language>
+ <language type="bn">Bángla Lángwej</language>
+ <language type="bo">Tibẹ́tan</language>
+ <language type="br">Brẹ́tọn Lángwej</language>
+ <language type="brx">Bódo Lángwej</language>
+ <language type="bs">Bọ́sniá Lángwej</language>
+ <language type="ca">Kátála Lángwej</language>
+ <language type="ccp">Chákma Lángwej</language>
+ <language type="ce">Chẹ́chẹn Lángwej</language>
+ <language type="ceb">Sẹbuáno Lángwej</language>
+ <language type="cgg">Chíga Lángwej</language>
+ <language type="chr">Chẹ́rókii Lángwej</language>
+ <language type="ckb">Mídúl Kọ́dish Lángwej</language>
+ <language type="co">Kọsíkan Lángwej</language>
+ <language type="cs">Chẹ́k Lángwej</language>
+ <language type="cu">Chọ́ch Slávik</language>
+ <language type="cy">Wẹlsh</language>
+ <language type="da">Dénísh Lángwej</language>
+ <language type="dav">Taíta</language>
+ <language type="de">Jámán Lángwej</language>
+ <language type="de_AT">Ọ́stria Jámán</language>
+ <language type="de_CH">Swítzaland Haí Jámán</language>
+ <language type="dje">Zármá</language>
+ <language type="dsb">Lówá Sorbiá</language>
+ <language type="dua">Duála Lángwej</language>
+ <language type="dyo">Jóla-Fónyi Lángwej</language>
+ <language type="dz">Zọ́ngka Lángwej</language>
+ <language type="ebu">Ẹmbu Lángwej</language>
+ <language type="ee">Ẹ́wẹ́ Lángwej</language>
+ <language type="el">Grík Lángwej</language>
+ <language type="en">Ínglish</language>
+ <language type="en_AU">Ọstréliá Ínglish</language>
+ <language type="en_CA">Kánáda Ínglish</language>
+ <language type="en_GB">Brítísh Ínglish</language>
+ <language type="en_GB" alt="short">UK Ínglish</language>
+ <language type="en_US">Amẹ́ríka Ínglish</language>
+ <language type="en_US" alt="short">US Ínglish</language>
+ <language type="eo">Ẹsperánto Lángwej</language>
+ <language type="es">Spánish Lángwej</language>
+ <language type="es_419">Látín Amẹ́ríka Spánish</language>
+ <language type="es_ES">Yúrop Spánish</language>
+ <language type="es_MX">Mẹ́ksiko Spánish</language>
+ <language type="et">Ẹstóniá Lángwej</language>
+ <language type="eu">Básk Lángwej</language>
+ <language type="ewo">Ẹwondo Lángwej</language>
+ <language type="fa">Pẹ́shiá Lángwej</language>
+ <language type="fa_AF">Dári</language>
+ <language type="ff">Fúlaní Lángwej</language>
+ <language type="fi">Fínísh Lángwej</language>
+ <language type="fil">Filipínó Lángwej</language>
+ <language type="fo">Fáróís Lángwej</language>
+ <language type="fr">Frẹ́nch Lángwej</language>
+ <language type="fr_CA">Kánádá Frẹnch</language>
+ <language type="fr_CH">Swítzalánd Frẹnch</language>
+ <language type="fur">Friúlián Lángwej</language>
+ <language type="fy">Wẹ́stán Frísiá Lángwej</language>
+ <language type="ga">Aírísh Lángwej</language>
+ <language type="gd">Gaelík Lángwej ọf Gael Pípol fọ Skọ́tland</language>
+ <language type="gl">Galísiá Lángwej</language>
+ <language type="gsw">Jámán Swis</language>
+ <language type="gu">Gujarátí Lángwej</language>
+ <language type="guz">Gusí Lángwej</language>
+ <language type="gv">Mánks Lángwej</language>
+ <language type="ha">Háusá Lángwej</language>
+ <language type="haw">Hawaii Lángwej</language>
+ <language type="he">Híbru Lángwej</language>
+ <language type="hi">Híndi Lángwej</language>
+ <language type="hmn">Mọ́ng Lángwej</language>
+ <language type="hr">Kroéshia Lángwej</language>
+ <language type="hsb">Sóbiá Lángwej di ọ́p-ọ́p wan</language>
+ <language type="ht">Haítí Kriol</language>
+ <language type="hu">Họngári Lángwej</language>
+ <language type="hy">Armẹ́niá Lángwej</language>
+ <language type="ia">Intalíngwuá Lángwej</language>
+ <language type="id">Indoníshia Lángwej</language>
+ <language type="ig">Igbo Lángwej</language>
+ <language type="ii">Síchuan Yi</language>
+ <language type="is">Aíslánd Lángwej</language>
+ <language type="it">Ítáli Lángwej</language>
+ <language type="ja">Japan Lángwej</language>
+ <language type="jgo">Ngómbá Lángwej</language>
+ <language type="jmc">Machámẹ́ Lángwej</language>
+ <language type="jv">Javáníz Lángwej</language>
+ <language type="ka">Jọ́jiá Lángwej</language>
+ <language type="kab">Kabail Lángwej</language>
+ <language type="kam">Kámbá Lángwej</language>
+ <language type="kde">Makọ́ndẹ́ Lángwej</language>
+ <language type="kea">Kábúvẹrdiánu Lángwej</language>
+ <language type="khq">Koyra Chíní Lángwej</language>
+ <language type="ki">Kikúyú Lángwej</language>
+ <language type="kk">Kazák Lángwej</language>
+ <language type="kkj">Kákó Lángwej</language>
+ <language type="kl">Kalálísút Lángwej</language>
+ <language type="kln">Kálẹ́njín Lángwej</language>
+ <language type="km">Kmaí Lángwej</language>
+ <language type="kn">Kánnáda Lángwej</language>
+ <language type="ko">Koriá Lángwej</language>
+ <language type="kok">Kónkéní Lángwej</language>
+ <language type="ks">Kashmírí Lángwej</language>
+ <language type="ksb">Shambala</language>
+ <language type="ksf">Bafiá Lángwej</language>
+ <language type="ksh">Kọlónián Lángwej</language>
+ <language type="ku">Kọ́dísh Lángwej</language>
+ <language type="kw">Kọ́nish Lángwej</language>
+ <language type="ky">Kiẹ́gíz Lángwej</language>
+ <language type="la">Látín Lángwej</language>
+ <language type="lag">Langi Lángwej</language>
+ <language type="lb">Lọ́ksémbọ́g Lángwej</language>
+ <language type="lg">Gánda Lángwej</language>
+ <language type="lkt">Lakótá Lángwej</language>
+ <language type="ln">Lingálá Lángwej</language>
+ <language type="lo">Láo Lángwej</language>
+ <language type="lrc">Nọ́tán Lúrí Lángwej</language>
+ <language type="lt">Lituéniá Lángwej</language>
+ <language type="lu">Lúbá-Katángá Lángwej</language>
+ <language type="luo">Luó Lángwej</language>
+ <language type="luy">Luyia Lángwej</language>
+ <language type="lv">Látvián Lángwej</language>
+ <language type="mas">Masaí Lángwej</language>
+ <language type="mer">Mẹ́rú Lángwej</language>
+ <language type="mfe">Morísiẹ́n Lángwej</language>
+ <language type="mg">Malagásí Lángwej</language>
+ <language type="mgh">Makúwá-Mító</language>
+ <language type="mgo">Mẹta’ Lángwej</language>
+ <language type="mi">Maórí Lángwej</language>
+ <language type="mk">Masẹdóniá Lángwej</language>
+ <language type="ml">Maléyálám Lángwej</language>
+ <language type="mn">Mọngóliá Lángwej</language>
+ <language type="mr">Marátí Lángwej</language>
+ <language type="ms">Malé Lángwej</language>
+ <language type="mt">Mọ́ltá Lángwej</language>
+ <language type="mua">Mundáng Lángwej</language>
+ <language type="mul">Plẹ́ntí Lángwej-dẹm</language>
+ <language type="my">Bọ́ma Lángwej</language>
+ <language type="mzn">Mazandẹrání Lángwej</language>
+ <language type="naq">Naámá Lángwej</language>
+ <language type="nb">Nọwẹ́jiá Bokmál Lángwej</language>
+ <language type="nd">Nọ́tán Ndẹbẹlẹ Lángwej</language>
+ <language type="nds">Ló Jámán Lángwej</language>
+ <language type="ne">Nẹpálí Lángwej</language>
+ <language type="nl">Dọch Lángwej</language>
+ <language type="nl_BE">Flẹ́mish Lángwej</language>
+ <language type="nmg">Kwasió Lángwej</language>
+ <language type="nn">Nọwẹ́jiá Niúnọsk</language>
+ <language type="nnh">Ngiẹ́mbọn Lángwej</language>
+ <language type="nus">Núa</language>
+ <language type="ny">Nyánja</language>
+ <language type="nyn">Nyankólẹ</language>
+ <language type="om">Orómó</language>
+ <language type="or">Ódiá</language>
+ <language type="os">Osẹ́tik</language>
+ <language type="pa">Punjábi</language>
+ <language type="pcm">Naijíriá Píjin</language>
+ <language type="pl">Pólánd Lángwej</language>
+ <language type="prg">Prúshia</language>
+ <language type="ps">Páshto</language>
+ <language type="pt">Pọtiugiz</language>
+ <language type="pt_BR">Brazíl Pọtiugíz</language>
+ <language type="pt_PT">Yúróp Pọtiugíz</language>
+ <language type="qu">Kẹchuá</language>
+ <language type="rm">Románsh</language>
+ <language type="rn">Rúndi</language>
+ <language type="ro">Romániá Lángwej</language>
+ <language type="rof">Rómbo</language>
+ <language type="ru">Rọshiá Lángwej</language>
+ <language type="rw">Kinyarwánda Lángwej</language>
+ <language type="rwk">Rwa</language>
+ <language type="sa">Sánskrit</language>
+ <language type="sah">Sakhá</language>
+ <language type="saq">Sambúru</language>
+ <language type="sbp">Sangu</language>
+ <language type="sd">Síndí</language>
+ <language type="se">Nọ́tán Sámí Lángwej</language>
+ <language type="seh">Sẹ́ná</language>
+ <language type="ses">Kóiraboró Sẹ́nní Lángwej</language>
+ <language type="sg">sàngo</language>
+ <language type="shi">Táchẹ́lit</language>
+ <language type="si">Sínhala</language>
+ <language type="sk">Slóvak</language>
+ <language type="sl">Slovẹ́niá Lángwej</language>
+ <language type="sm">Samóá Lángwej</language>
+ <language type="smn">Ínárí Sámí Lángwej</language>
+ <language type="sn">Shóna</language>
+ <language type="so">Sọmáli</language>
+ <language type="sq">Albéniá Lángwej</language>
+ <language type="sr">Sẹrbiá Lángwej</language>
+ <language type="st">Saútán Sóto</language>
+ <language type="su">Sọ́ndaniz</language>
+ <language type="sv">Suwídẹ́n Lángwej</language>
+ <language type="sw">Swahíli</language>
+ <language type="ta">tàmil</language>
+ <language type="te">Tẹlugu</language>
+ <language type="teo">Tẹ́so</language>
+ <language type="tg">Tájik</language>
+ <language type="th">Taí</language>
+ <language type="ti">Tigrínyá</language>
+ <language type="tk">Tọ́kmẹn</language>
+ <language type="to">Tóngan</language>
+ <language type="tr">Tọ́ki</language>
+ <language type="tt">Tatá</language>
+ <language type="twq">Tasawak</language>
+ <language type="tzm">Mídúl Atlás Támazígt Lángwej</language>
+ <language type="ug">Wiúgọ</language>
+ <language type="uk">Yukrénia</language>
+ <language type="und">Lángwej wé nóbọ́di sabi</language>
+ <language type="ur">Úrdú</language>
+ <language type="uz">Úzbẹk</language>
+ <language type="vai">Vaí</language>
+ <language type="vi">Viẹ́tnám Lángwej</language>
+ <language type="vo">Vólapiuk</language>
+ <language type="vun">Vúnjo</language>
+ <language type="wae">Wọ́lsa</language>
+ <language type="wo">Wólof</language>
+ <language type="xh">Kọ́sa</language>
+ <language type="xog">sóga</language>
+ <language type="yav">Yangbẹn</language>
+ <language type="yi">Yídish</language>
+ <language type="yo">Yorubá</language>
+ <language type="yue">Kántọn Lángwej</language>
+ <language type="yue" alt="menu">Chainiz Kántọniz</language>
+ <language type="zgh">Gẹ́nárál Morókó Támazígt Lángwej</language>
+ <language type="zh">Mandarín Chainíz Lángwej</language>
+ <language type="zh" alt="menu">Chainiz, Mandarin</language>
+ <language type="zh_Hans">Ízí Chainíz Lángwej</language>
+ <language type="zh_Hans" alt="long">Ízí Mandarín Chainíz Lángwej</language>
+ <language type="zh_Hant">Tradíshọ́nál Chainíz Lángwej</language>
+ <language type="zh_Hant" alt="long">Tradíshọ́nál Mandarín Chainíz Lángwej</language>
+ <language type="zu">Zúlu</language>
+ <language type="zxx">Nó Lángwéj Kọ́ntẹnt</language>
+ </languages>
+ <scripts>
+ <script type="Arab">Arábík</script>
+ <script type="Armn">Armẹ́nia</script>
+ <script type="Beng">Bángla</script>
+ <script type="Bopo">Bopomófo</script>
+ <script type="Brai">Blaínd Pípol Raítín Sístẹm</script>
+ <script type="Cyrl">Sírílik</script>
+ <script type="Deva">Dẹvanágári</script>
+ <script type="Ethi">Ẹtiópik</script>
+ <script type="Geor">Jọ́jia</script>
+ <script type="Grek">Grík</script>
+ <script type="Gujr">Gujaráti</script>
+ <script type="Guru">Gúrmukhi</script>
+ <script type="Hanb">Han Wit Bopomófo</script>
+ <script type="Hang">Hángul</script>
+ <script type="Hani">Chainiz</script>
+ <script type="Hans">Ízí Chainíz Lángwej</script>
+ <script type="Hans" alt="stand-alone">Ízí Chainíz Lang</script>
+ <script type="Hant">Nọ́mal</script>
+ <script type="Hant" alt="stand-alone">Nọ́mál Chainiz</script>
+ <script type="Hebr">Híbrú</script>
+ <script type="Hira">Hiagána</script>
+ <script type="Hrkt">Pát ọf Japán Raítín Sístẹm</script>
+ <script type="Jamo">Jámo</script>
+ <script type="Jpan">Japan</script>
+ <script type="Kana">Katákána</script>
+ <script type="Khmr">Kemẹẹ</script>
+ <script type="Knda">Kánnad Raítín Sístẹm</script>
+ <script type="Kore">Koria</script>
+ <script type="Laoo">Lao</script>
+ <script type="Latn">Látin</script>
+ <script type="Mlym">Maléyálam</script>
+ <script type="Mong">Mọngólia</script>
+ <script type="Mymr">Miánmar</script>
+ <script type="Orya">Ódia</script>
+ <script type="Sinh">Sinhála</script>
+ <script type="Taml">Támil</script>
+ <script type="Telu">Tẹ́lúgu</script>
+ <script type="Thaa">Tána</script>
+ <script type="Thai">Taí</script>
+ <script type="Tibt">Tíbẹt</script>
+ <script type="Zmth">Matimátiks Sains</script>
+ <script type="Zsye">Ẹ́móji</script>
+ <script type="Zsym">Símbuls</script>
+ <script type="Zxxx">Wétín Dẹm Nó Rait</script>
+ <script type="Zyyy">Jẹ́náral</script>
+ <script type="Zzzz">Raítín Sístẹm Wé Nóbọ́di Sabí</script>
+ </scripts>
+ <territories>
+ <territory type="001">Wọld</territory>
+ <territory type="002">Áfríka</territory>
+ <territory type="003">Nọ́t Amẹ́ríka</territory>
+ <territory type="005">Saút Amẹ́ríka</territory>
+ <territory type="009">Oshẹnia</territory>
+ <territory type="011">Wẹ́stán Áfríka</territory>
+ <territory type="013">Mídúl Amẹ́ríka</territory>
+ <territory type="014">Ístán Áfríká</territory>
+ <territory type="015">Nọ́tán Áfríka</territory>
+ <territory type="017">Mídúl Áfríka</territory>
+ <territory type="018">Saútán Áfríka</territory>
+ <territory type="019">Amẹ́ríkas</territory>
+ <territory type="021">Nọ́tán Amẹ́ríka</territory>
+ <territory type="029">Karíbián</territory>
+ <territory type="030">Ístán Éshia</territory>
+ <territory type="034">Saútán Éshia</territory>
+ <territory type="035">Saútíst Éshiá</territory>
+ <territory type="039">Saútán Yúrop</territory>
+ <territory type="053">Ọstraléshia</territory>
+ <territory type="054">Mẹlanẹíshia</territory>
+ <territory type="057">Maikroníshia Ríjọn</territory>
+ <territory type="061">Poliníshiá</territory>
+ <territory type="142">Éshia</territory>
+ <territory type="143">Mídúl Éshia</territory>
+ <territory type="145">Wẹ́stán Éshia</territory>
+ <territory type="150">Yúrop</territory>
+ <territory type="151">Ístán Yúrop</territory>
+ <territory type="154">Nọ́tán Yúrop</territory>
+ <territory type="155">Wẹ́stán Yúrop</territory>
+ <territory type="202">Áfríka Éria Biló Sahára</territory>
+ <territory type="419">Látín Amẹ́ríka</territory>
+ <territory type="AC">Asẹ́nshọ́n Aíland</territory>
+ <territory type="AD">Andọ́ra</territory>
+ <territory type="AE">Yunaítẹ́d Áráb Ẹ́mírets</territory>
+ <territory type="AF">Afgánístan</territory>
+ <territory type="AG">Antígwua & Barbúda</territory>
+ <territory type="AI">Angwíla</territory>
+ <territory type="AL">Albénia</territory>
+ <territory type="AM">Armẹ́niá</territory>
+ <territory type="AO">Angóla</territory>
+ <territory type="AQ">Antáktíka</territory>
+ <territory type="AR">Ajẹntína</territory>
+ <territory type="AS">Amẹ́ríká Samoa</territory>
+ <territory type="AT">Ọ́stria</territory>
+ <territory type="AU">Ọstrélia</territory>
+ <territory type="AW">Arúba</territory>
+ <territory type="AX">Ọ́lánd Aílands</territory>
+ <territory type="AZ">Azẹrbaijan</territory>
+ <territory type="BA">Bọ́zniá & Hẹzẹgovína</territory>
+ <territory type="BB">Barbédọs</territory>
+ <territory type="BD">Bangladẹsh</territory>
+ <territory type="BE">Bẹ́ljọm</territory>
+ <territory type="BF">Burkína Fáso</territory>
+ <territory type="BG">Bọlgéria</territory>
+ <territory type="BH">Barein</territory>
+ <territory type="BI">Burúndi</territory>
+ <territory type="BJ">Binin</territory>
+ <territory type="BL">Sént Batẹlẹ́mi</territory>
+ <territory type="BM">Bẹmiúda</territory>
+ <territory type="BN">Brunẹi</territory>
+ <territory type="BO">Bolívia</territory>
+ <territory type="BQ">Karíbián Nẹ́dalands</territory>
+ <territory type="BR">Brázil</territory>
+ <territory type="BS">Bahámas</territory>
+ <territory type="BT">Butan</territory>
+ <territory type="BV">Buvẹ́ Aíland</territory>
+ <territory type="BW">Botswána</territory>
+ <territory type="BY">Bẹ́larus</territory>
+ <territory type="BZ">Bẹliz</territory>
+ <territory type="CA">Kánáda</territory>
+ <territory type="CC">Kókós Aílands</territory>
+ <territory type="CD">Kóngó – Kinshása</territory>
+ <territory type="CD" alt="variant">Kóngo (DRC)</territory>
+ <territory type="CF">Sẹ́ntrál Áfríkán Ripọ́blik</territory>
+ <territory type="CG">Kóngo – Brázavil</territory>
+ <territory type="CG" alt="variant">Kóngó (Ripọ́blik)</territory>
+ <territory type="CH">Swítsaland</territory>
+ <territory type="CI">Aívri Kost</territory>
+ <territory type="CI" alt="variant">Kót Divua</territory>
+ <territory type="CK">Kúk Aílands</territory>
+ <territory type="CL">Chílẹ</territory>
+ <territory type="CM">Kamẹrun</territory>
+ <territory type="CN">Chaína</territory>
+ <territory type="CO">Kolómbia</territory>
+ <territory type="CP">Klipatọ́n Aíland</territory>
+ <territory type="CR">Kósta Ríka</territory>
+ <territory type="CU">Kiúbá</territory>
+ <territory type="CV">Kép Vẹ́d</territory>
+ <territory type="CW">Kiurásao</territory>
+ <territory type="CX">Krísmás Aíland</territory>
+ <territory type="CY">Saíprọs</territory>
+ <territory type="CZ">Chẹ́kia</territory>
+ <territory type="CZ" alt="variant">Chẹ́k Ripọ́blik</territory>
+ <territory type="DE">Jámáni</territory>
+ <territory type="DG">Diẹ́gó Garsia</territory>
+ <territory type="DJ">Jibúti</territory>
+ <territory type="DK">Dẹ́nmak</territory>
+ <territory type="DM">Dọmíníka</territory>
+ <territory type="DO">Dọmíníka Ripọ́blik</territory>
+ <territory type="DZ">Aljíria</territory>
+ <territory type="EA">Sẹúta & Mẹ́líla</territory>
+ <territory type="EC">Ẹ́kwuádọ</territory>
+ <territory type="EE">Ẹstónia</territory>
+ <territory type="EG">Íjipt</territory>
+ <territory type="EH">Wẹ́stán Sahára</territory>
+ <territory type="ER">Ẹritrẹ́a</territory>
+ <territory type="ES">Spen</territory>
+ <territory type="ET">Ẹtiópia</territory>
+ <territory type="EU">Yurópián Yúniọ́n</territory>
+ <territory type="EZ">Yúróéria</territory>
+ <territory type="FI">Fínland</territory>
+ <territory type="FJ">Fíji</territory>
+ <territory type="FK">Fọ́klánd Aílands</territory>
+ <territory type="FK" alt="variant">Fọ́klánd Aílands (Íslás Malvínas)</territory>
+ <territory type="FM">Maikroníshia</territory>
+ <territory type="FO">Fáro Aílands</territory>
+ <territory type="FR">Frans</territory>
+ <territory type="GA">Gabọn</territory>
+ <territory type="GB">Yunáítẹ́d Kíndọm</territory>
+ <territory type="GB" alt="short">UK</territory>
+ <territory type="GD">Grẹnéda</territory>
+ <territory type="GE">Jọ́jia</territory>
+ <territory type="GF">Frẹ́nch Giána</territory>
+ <territory type="GG">Guẹnzi</territory>
+ <territory type="GH">Gána</territory>
+ <territory type="GI">Jibrọ́lta</territory>
+ <territory type="GL">Grínland</territory>
+ <territory type="GM">Gámbia</territory>
+ <territory type="GN">Gíni</territory>
+ <territory type="GP">Guadalúpẹ</territory>
+ <territory type="GQ">Ikwétóriál Gíni</territory>
+ <territory type="GR">Gris</territory>
+ <territory type="GS">Saút Jọ́jia an Saút Sándwích Aílands</territory>
+ <territory type="GT">Guátẹmála</territory>
+ <territory type="GU">Guam</territory>
+ <territory type="GW">Gíní-Bisáu</territory>
+ <territory type="GY">Gayána</territory>
+ <territory type="HK">Họng Kọng SAR</territory>
+ <territory type="HK" alt="short">Họng Kọng</territory>
+ <territory type="HM">Hiád & MakDónáld Aílands</territory>
+ <territory type="HN">Họndúras</territory>
+ <territory type="HR">Kroéshia</territory>
+ <territory type="HT">Haíti</territory>
+ <territory type="HU">Họ́ngári</territory>
+ <territory type="IC">Kenerí Aílands</territory>
+ <territory type="ID">Indoníshia</territory>
+ <territory type="IE">Ayaland</territory>
+ <territory type="IL">Ízrẹl</territory>
+ <territory type="IM">Aíl ọf Man</territory>
+ <territory type="IN">Índia</territory>
+ <territory type="IO">Brítísh Índián Óshen Tẹ́rẹ́tri</territory>
+ <territory type="IQ">Irak</territory>
+ <territory type="IR">Iran</territory>
+ <territory type="IS">Aísland</territory>
+ <territory type="IT">Ítáli</territory>
+ <territory type="JE">Jẹ́si</territory>
+ <territory type="JM">Jamaíka</territory>
+ <territory type="JO">Jọ́dan</territory>
+ <territory type="JP">Japan</territory>
+ <territory type="KE">Kẹ́nya</territory>
+ <territory type="KG">Kẹjístan</territory>
+ <territory type="KH">Kambódia</territory>
+ <territory type="KI">Kiribáti</territory>
+ <territory type="KM">Kọ́mọ́ros</territory>
+ <territory type="KN">Sent Kits & Nẹ́vis</territory>
+ <territory type="KP">Nọ́t Koria</territory>
+ <territory type="KR">Saút Koria</territory>
+ <territory type="KW">Kuwét</territory>
+ <territory type="KY">Kéman Aílands</territory>
+ <territory type="KZ">Kazakstan</territory>
+ <territory type="LA">Laos</territory>
+ <territory type="LB">Lẹ́bánọn</territory>
+ <territory type="LC">Sent Lúshia</territory>
+ <territory type="LI">Líktẹ́nstain</territory>
+ <territory type="LK">Sri Lánka</territory>
+ <territory type="LR">Laibẹ́ria</territory>
+ <territory type="LS">Lẹsóto</territory>
+ <territory type="LT">Lituénia</territory>
+ <territory type="LU">Lọ́ksẹ́mbọg</territory>
+ <territory type="LV">Látvia</territory>
+ <territory type="LY">Líbia</territory>
+ <territory type="MA">Morọko</territory>
+ <territory type="MC">Mọ́náko</territory>
+ <territory type="MD">Mọldóva</territory>
+ <territory type="ME">Mọntinígro</territory>
+ <territory type="MF">Sent Mátin</territory>
+ <territory type="MG">Madagáska</territory>
+ <territory type="MH">Máshál Aílands</territory>
+ <territory type="MK">Nọ́t Masidónia</territory>
+ <territory type="ML">Máli</territory>
+ <territory type="MM">Miánma (Bọ́ma)</territory>
+ <territory type="MN">Mọngólia</territory>
+ <territory type="MO">Makáo SAR Chaína</territory>
+ <territory type="MO" alt="short">Makáo</territory>
+ <territory type="MP">Nọ́tán Mariána Aílands</territory>
+ <territory type="MQ">Matínik</territory>
+ <territory type="MR">Mọriténia</territory>
+ <territory type="MS">Mọntsẹrat</territory>
+ <territory type="MT">Mọ́lta</territory>
+ <territory type="MU">Mọríshọs</territory>
+ <territory type="MV">Mọ́ldivs</territory>
+ <territory type="MW">Maláwi</territory>
+ <territory type="MX">Mẹ́ksíko</territory>
+ <territory type="MY">Maléshia</territory>
+ <territory type="MZ">Mozámbik</territory>
+ <territory type="NA">Namíbia</territory>
+ <territory type="NC">Niú Kalẹdónia</territory>
+ <territory type="NE">Nizhẹr</territory>
+ <territory type="NF">Nọ́fọlk Aíland</territory>
+ <territory type="NG">Naijíria</territory>
+ <territory type="NI">Nikarágwua</territory>
+ <territory type="NL">Nẹ́dalands</territory>
+ <territory type="NO">Nọ́we</territory>
+ <territory type="NP">Nẹ́pal</territory>
+ <territory type="NR">Náuru</territory>
+ <territory type="NU">Niúẹ</territory>
+ <territory type="NZ">Niú Zíland</territory>
+ <territory type="OM">Oman</territory>
+ <territory type="PA">Pánáma</territory>
+ <territory type="PE">Pẹ́ru</territory>
+ <territory type="PF">Frẹ́nch Poliníshia</territory>
+ <territory type="PG">Pápuá Niú Gíni</territory>
+ <territory type="PH">Fílípins</territory>
+ <territory type="PK">Pakístan</territory>
+ <territory type="PL">Póland</territory>
+ <territory type="PM">Sent Piẹr & Míkẹlọn</territory>
+ <territory type="PN">Pítkén Aílands</territory>
+ <territory type="PR">Puẹ́rto Ríkọ</territory>
+ <territory type="PS">Pálẹ́staín Éria-dẹm</territory>
+ <territory type="PS" alt="short">Pálẹ́stain</territory>
+ <territory type="PT">Pọ́túgal</territory>
+ <territory type="PW">Palau</territory>
+ <territory type="PY">Párágwue</territory>
+ <territory type="QA">Kata</territory>
+ <territory type="QO">Rimót Pát ọf Oshẹ́nia</territory>
+ <territory type="RE">Réyúniọn</territory>
+ <territory type="RO">Ruménia</territory>
+ <territory type="RS">Sẹ́bia</territory>
+ <territory type="RU">Rọ́shia</territory>
+ <territory type="RW">Ruwánda</territory>
+ <territory type="SA">Saúdí Arébia</territory>
+ <territory type="SB">Sólómọ́n Aílands</territory>
+ <territory type="SC">Sẹ́chẹls</territory>
+ <territory type="SD">Sudan</territory>
+ <territory type="SE">Swídẹn</territory>
+ <territory type="SG">Singapọ</territory>
+ <territory type="SH">Sent Hẹlẹ́na</territory>
+ <territory type="SI">Slovẹ́nia</territory>
+ <territory type="SJ">Sválbad & Jén Meyẹn</territory>
+ <territory type="SK">Slovékia</territory>
+ <territory type="SL">Siẹ́ra Líon</territory>
+ <territory type="SM">San Maríno</territory>
+ <territory type="SN">Sẹ́nẹ́gal</territory>
+ <territory type="SO">Sọmália</territory>
+ <territory type="SR">Súrínam</territory>
+ <territory type="SS">Saút Sudan</territory>
+ <territory type="ST">Sao Tómé & Prínsípẹ</territory>
+ <territory type="SV">El Sálvádọ</territory>
+ <territory type="SX">Sint Mátin</territory>
+ <territory type="SY">Síria</territory>
+ <territory type="SZ">Ẹswatíni</territory>
+ <territory type="SZ" alt="variant">Swáziland</territory>
+ <territory type="TA">Trístán da Kúna</territory>
+ <territory type="TC">Tọks an Kaíkọ́s Aílands</territory>
+ <territory type="TD">Chad</territory>
+ <territory type="TF">Frẹ́nch Saútán Tẹ́rẹ́tris</territory>
+ <territory type="TG">Tógo</territory>
+ <territory type="TH">Taíland</territory>
+ <territory type="TJ">Tajíkstan</territory>
+ <territory type="TK">Tókẹ́lau</territory>
+ <territory type="TL">Íst Tímọ</territory>
+ <territory type="TL" alt="variant">Íst Tímọ</territory>
+ <territory type="TM">Tọkmẹ́nístan</territory>
+ <territory type="TN">Tuníshia</territory>
+ <territory type="TO">Tónga</territory>
+ <territory type="TR">Tọ́ki</territory>
+ <territory type="TT">Trínídad & Tobágo</territory>
+ <territory type="TV">Tuválu</territory>
+ <territory type="TW">Taiwan</territory>
+ <territory type="TZ">Tanzánia</territory>
+ <territory type="UA">Yukrein</territory>
+ <territory type="UG">Yugánda</territory>
+ <territory type="UM">U.S. Faá Faá Aílands</territory>
+ <territory type="UN">Yunaítẹd Néshọns</territory>
+ <territory type="US">Yunaítẹ́d Stets</territory>
+ <territory type="US" alt="short">US</territory>
+ <territory type="UY">Yúrugwue</territory>
+ <territory type="UZ">Uzbẹ́kistan</territory>
+ <territory type="VA">Vátíkán Síti</territory>
+ <territory type="VC">Sent Vínsẹnt & Grẹ́nádians</territory>
+ <territory type="VE">Vẹnẹzuẹ́la</territory>
+ <territory type="VG">Brítísh Vájín Aílands</territory>
+ <territory type="VI">U.S. Vájín Aílands</territory>
+ <territory type="VN">Viẹ́tnam</territory>
+ <territory type="VU">Vanuátu</territory>
+ <territory type="WF">Wọ́lis & Fiutúna</territory>
+ <territory type="WS">Samóa</territory>
+ <territory type="XA">To yúz atifíshál vọis wẹ́n yu de tọk</territory>
+ <territory type="XB">Atífíshál Tú-Wé Dairẹ́kshọn</territory>
+ <territory type="XK">Kósóvo</territory>
+ <territory type="YE">Yẹ́mẹn</territory>
+ <territory type="YT">Meyọt</territory>
+ <territory type="ZA">Saút Áfríka</territory>
+ <territory type="ZM">Zámbia</territory>
+ <territory type="ZW">Zimbábwẹ</territory>
+ <territory type="ZZ">Ríjọn Wé Nóbọ́di Sabí</territory>
+ </territories>
+ <keys>
+ <key type="calendar">Kalẹ́nda</key>
+ <key type="cf">Haú To Arénj Mọní</key>
+ <key type="collation">Arénj Tins Wẹl</key>
+ <key type="currency">Mọní</key>
+ <key type="hc">Awá Saíkul (12 vs 24)</key>
+ <key type="lb">Laín Brẹk Staíl</key>
+ <key type="ms">Sístẹm fọ Mẹ́zhọ́mẹnt</key>
+ <key type="numbers">Nọ́mba-dẹm</key>
+ </keys>
+ <types>
+ <type key="calendar" type="buddhist">Búdíst Kalẹ́nda</type>
+ <type key="calendar" type="chinese">Chaíníz Kalẹ́nda</type>
+ <type key="calendar" type="dangi">Dangi Kalẹ́nda</type>
+ <type key="calendar" type="ethiopic">Ẹtiópiá Kalẹ́nda</type>
+ <type key="calendar" type="gregorian">Grẹ́górí Kalẹ́nda</type>
+ <type key="calendar" type="hebrew">Híbrú Kalẹ́nda</type>
+ <type key="calendar" type="islamic">Múslím Kalẹ́nda</type>
+ <type key="calendar" type="iso8601">ISO-8601 Kalẹ́nda</type>
+ <type key="calendar" type="japanese">Japán Kalẹ́nda</type>
+ <type key="calendar" type="persian">Pẹ́shia Kalẹ́nda</type>
+ <type key="calendar" type="roc">Ripọ́blík ọf Chaíná Kalẹ́nda</type>
+ <type key="cf" type="account">Akáunt To Ték Arénj Mọní</type>
+ <type key="cf" type="standard">Nọ́mál Wè To Arénj Mọní</type>
+ <type key="collation" type="ducet">Yúníkód Mén Wè To Arénj Tins Wẹl</type>
+ <type key="collation" type="search">Jẹ́nárál Sachin</type>
+ <type key="collation" type="standard">Nọ́mál Wè To Arénj Tins Wẹl</type>
+ <type key="hc" type="h11">12 Áwa Sístẹm (0–11)</type>
+ <type key="hc" type="h12">12 Áwa Sístẹm (1–12)</type>
+ <type key="hc" type="h23">24 Áwa Sístẹm (0–23)</type>
+ <type key="hc" type="h24">24 Áwa Sístẹm (1–24)</type>
+ <type key="lb" type="loose">Lúz Laín Brẹk Staíl</type>
+ <type key="lb" type="normal">Nọ́mál Laín Brẹk Staíl</type>
+ <type key="lb" type="strict">Fíksd Laín Brẹk Staíl</type>
+ <type key="ms" type="metric">Mẹ́trík Sístẹm</type>
+ <type key="ms" type="uksystem">Impẹ́riál Sístẹm fọ Mẹ́zhọ́mẹnt</type>
+ <type key="ms" type="ussystem">US Sístẹm fọ Mẹ́zhọ́mẹnt</type>
+ <type key="numbers" type="arab">Arábík Nọ́mba-dẹm</type>
+ <type key="numbers" type="arabext">Ẹstrá Arábík Nọ́mba-dẹm</type>
+ <type key="numbers" type="armn">Armẹ́niá Nọ́mba-dẹm</type>
+ <type key="numbers" type="armnlow">Smọ́l Taíp Armẹ́niá Nọ́mba-dẹm</type>
+ <type key="numbers" type="beng">Bánglá Nọ́mba-dẹm</type>
+ <type key="numbers" type="deva">Dẹvanágári Nọ́mba-dẹm</type>
+ <type key="numbers" type="ethi">Ẹtiópiá Nọ́mba-dẹm</type>
+ <type key="numbers" type="fullwide">Fúl-Waid Nọ́mba-dẹm</type>
+ <type key="numbers" type="geor">Jọ́jiá Nọ́mba-dẹm</type>
+ <type key="numbers" type="grek">Grík Nọ́mba-dẹm</type>
+ <type key="numbers" type="greklow">Smọ́l Taíp Grík Nọ́mba-dẹm</type>
+ <type key="numbers" type="gujr">Gujarátí Nọ́mba-dẹm</type>
+ <type key="numbers" type="guru">Gúrmukhi Nọ́mba-dẹm</type>
+ <type key="numbers" type="hanidec">Chainíz Nọ́mba-dẹm</type>
+ <type key="numbers" type="hans">Ízí Chainíz Nọ́mba-dẹm</type>
+ <type key="numbers" type="hansfin">Ízí Chainíz Mọní Nọ́mba-dẹm</type>
+ <type key="numbers" type="hant">Nọ́mál Chainíz Nọ́mba-dẹm</type>
+ <type key="numbers" type="hantfin">Nọ́mál Chainíz Mọní Nọ́mba-dẹm</type>
+ <type key="numbers" type="hebr">Híbru Nọ́mba-dẹm</type>
+ <type key="numbers" type="jpan">Japán Nọ́mba-dẹm</type>
+ <type key="numbers" type="jpanfin">Japán Mọní Nọ́mba-dẹm</type>
+ <type key="numbers" type="khmr">Kmai Nọ́mba-dẹm</type>
+ <type key="numbers" type="knda">Kánnád Nọ́mba-dẹm</type>
+ <type key="numbers" type="laoo">Lao Nọ́mba-dẹm</type>
+ <type key="numbers" type="latn">Wẹ́stán Nọ́mba-dẹm</type>
+ <type key="numbers" type="mlym">Maléyálam Nọ́mba-dẹm</type>
+ <type key="numbers" type="mymr">Miánma Nọ́mba-dẹm</type>
+ <type key="numbers" type="orya">Ódia Nọ́mba-dẹm</type>
+ <type key="numbers" type="roman">Rómán Nọ́mba-dẹm</type>
+ <type key="numbers" type="romanlow">Smọ́l Taíp Rómán Nọ́mba-dẹm</type>
+ <type key="numbers" type="taml">Nọ́mál Támíl Nọ́mba-dẹm</type>
+ <type key="numbers" type="tamldec">Támíl Nọ́mba-dẹm</type>
+ <type key="numbers" type="telu">Tẹ́lúgu Nọ́mba-dẹm</type>
+ <type key="numbers" type="thai">Taí Nọ́mba-dẹm</type>
+ <type key="numbers" type="tibt">Tíbẹt Nọ́mba-dẹm</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">Mẹ́trik</measurementSystemName>
+ <measurementSystemName type="UK">Brítish</measurementSystemName>
+ <measurementSystemName type="US">US</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">Lángwej: {0}</codePattern>
+ <codePattern type="script">Haú to raít tins: {0}</codePattern>
+ <codePattern type="territory">Éria: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters>[a á b {ch} d e é ẹ {ẹ\u0301} f g {gb} h i í j k {kp} l m n o ó ọ {ọ\u0301} p r s {sh} t u ú v w y z {zh}]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[à c è {ẹ\u0300} ì ò {ọ\u0300} q ù x]</exemplarCharacters>
+ <exemplarCharacters type="index">[A B {CH} D E F G H I J K L M N O P R S T U V W Y Z]</exemplarCharacters>
+ <exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+ <exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters>
+ <ellipsis type="final">{0}…</ellipsis>
+ <ellipsis type="initial">…{0}</ellipsis>
+ <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>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">[\--/]</parseLenient>
+ <parseLenient sample=":" draft="contributed">[\:∶︓﹕：]</parseLenient>
+ </parseLenients>
+ <parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">[.․。︒﹒．｡]</parseLenient>
+ <parseLenient sample="’" draft="contributed">['ʼ՚᾽᾿’＇]</parseLenient>
+ <parseLenient sample="%" draft="contributed">[%٪﹪％]</parseLenient>
+ <parseLenient sample="‰" draft="contributed">[؉‰]</parseLenient>
+ <parseLenient sample="$" draft="contributed">[\$﹩＄]</parseLenient>
+ <parseLenient sample="£" draft="contributed">[£₤￡]</parseLenient>
+ <parseLenient sample="¥" draft="contributed">[¥￥]</parseLenient>
+ <parseLenient sample="₩" draft="contributed">[₩￦]</parseLenient>
+ <parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="lenient">
+ <parseLenient sample="-" draft="contributed">[\-‐‒–⁻₋−➖﹣－]</parseLenient>
+ <parseLenient sample="," draft="contributed">[,،٫、︐︑﹐﹑，､]</parseLenient>
+ <parseLenient sample="+" draft="contributed">[+⁺₊➕﬩﹢＋]</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">[,٫︐﹐，]</parseLenient>
+ <parseLenient sample="." draft="contributed">[.․﹒．｡]</parseLenient>
+ </parseLenients>
+ </characters>
+ <delimiters>
+ <quotationStart>“</quotationStart>
+ <quotationEnd>”</quotationEnd>
+ <alternateQuotationStart>‘</alternateQuotationStart>
+ <alternateQuotationEnd>’</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'fọ' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'fọ' {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="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="d">d</dateFormatItem>
+ <dateFormatItem id="E">ccc</dateFormatItem>
+ <dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="Ed">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">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="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="y">y G</dateFormatItem>
+ <dateFormatItem id="yyyy">y G</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="yyyyMMMM">G y MMMM</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">h B – h B</greatestDifference>
+ <greatestDifference id="h">h–h B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+ <greatestDifference id="h">h:mm–h:mm B</greatestDifference>
+ <greatestDifference id="m">h:mm–h:mm B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">d–d</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">G y – G y</greatestDifference>
+ <greatestDifference id="y">G y–y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
+ <greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+ <greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+ <greatestDifference id="G">GGGGG y-MM-dd – GGGGG 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="GyMEd">
+ <greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+ <greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG 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="GyMMM">
+ <greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
+ <greatestDifference id="M">G y MMM–MMM</greatestDifference>
+ <greatestDifference id="y">G y MMM – y MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">G y MMM d–d</greatestDifference>
+ <greatestDifference id="G">G y MMM d – G y MMM 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="GyMMMEd">
+ <greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
+ <greatestDifference id="G">G y MMM d, E – G y 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="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">
+ <month type="1">Jén</month>
+ <month type="2">Fẹ́b</month>
+ <month type="3">Mach</month>
+ <month type="4">Épr</month>
+ <month type="5">Mee</month>
+ <month type="6">Jun</month>
+ <month type="7">Jul</month>
+ <month type="8">Ọgọ</month>
+ <month type="9">Sẹp</month>
+ <month type="10">Ọkt</month>
+ <month type="11">Nọv</month>
+ <month type="12">Dis</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">J</month>
+ <month type="2">F</month>
+ <month type="3">M</month>
+ <month type="4">A</month>
+ <month type="5">M</month>
+ <month type="6">J</month>
+ <month type="7">J</month>
+ <month type="8">A</month>
+ <month type="9">S</month>
+ <month type="10">O</month>
+ <month type="11">N</month>
+ <month type="12">D</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Jénúári</month>
+ <month type="2">Fẹ́búári</month>
+ <month type="3">Mach</month>
+ <month type="4">Éprel</month>
+ <month type="5">Mee</month>
+ <month type="6">Jun</month>
+ <month type="7">Julai</month>
+ <month type="8">Ọgọst</month>
+ <month type="9">Sẹptẹ́mba</month>
+ <month type="10">Ọktóba</month>
+ <month type="11">Nọvẹ́mba</month>
+ <month type="12">Disẹ́mba</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">Jén</month>
+ <month type="2">Fẹ́b</month>
+ <month type="3">Mach</month>
+ <month type="4">Épr</month>
+ <month type="5">Mee</month>
+ <month type="6">Jun</month>
+ <month type="7">Jul</month>
+ <month type="8">Ọ́gọ</month>
+ <month type="9">Sẹp</month>
+ <month type="10">Ọkt</month>
+ <month type="11">Nọv</month>
+ <month type="12">Dis</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">J</month>
+ <month type="2">F</month>
+ <month type="3">M</month>
+ <month type="4">A</month>
+ <month type="5">M</month>
+ <month type="6">J</month>
+ <month type="7">J</month>
+ <month type="8">A</month>
+ <month type="9">S</month>
+ <month type="10">O</month>
+ <month type="11">N</month>
+ <month type="12">D</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Jénúári</month>
+ <month type="2">Fẹ́búári</month>
+ <month type="3">Mach</month>
+ <month type="4">Éprel</month>
+ <month type="5">Mee</month>
+ <month type="6">Jun</month>
+ <month type="7">Julai</month>
+ <month type="8">Ọgọst</month>
+ <month type="9">Sẹptẹ́mba</month>
+ <month type="10">Ọktóba</month>
+ <month type="11">Nọvẹ́mba</month>
+ <month type="12">Disẹ́mba</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">Sọ́n</day>
+ <day type="mon">Mọ́n</day>
+ <day type="tue">Tiú</day>
+ <day type="wed">Wẹ́n</day>
+ <day type="thu">Tọ́z</day>
+ <day type="fri">Fraí</day>
+ <day type="sat">Sát</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <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">
+ <day type="sun">Sọ́n</day>
+ <day type="mon">Mọ́n</day>
+ <day type="tue">Tiú</day>
+ <day type="wed">Wẹ́n</day>
+ <day type="thu">Tọ́z</day>
+ <day type="fri">Fraí</day>
+ <day type="sat">Sát</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">Sọ́ndè</day>
+ <day type="mon">Mọ́ndè</day>
+ <day type="tue">Tiúzdè</day>
+ <day type="wed">Wẹ́nẹ́zdè</day>
+ <day type="thu">Tọ́zdè</day>
+ <day type="fri">Fraídè</day>
+ <day type="sat">Sátọdè</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">Sọ́n</day>
+ <day type="mon">Mọ́n</day>
+ <day type="tue">Tiú</day>
+ <day type="wed">Wẹ́n</day>
+ <day type="thu">Tọ́z</day>
+ <day type="fri">Fraí</day>
+ <day type="sat">Sát</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <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">
+ <day type="sun">Sọ́n</day>
+ <day type="mon">Mọ́n</day>
+ <day type="tue">Tiú</day>
+ <day type="wed">Wẹ́n</day>
+ <day type="thu">Tọ́z</day>
+ <day type="fri">Fraí</day>
+ <day type="sat">Sát</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">Sọ́ndè</day>
+ <day type="mon">Mọ́ndè</day>
+ <day type="tue">Tiúzdè</day>
+ <day type="wed">Wẹ́nẹ́zdè</day>
+ <day type="thu">Tọ́zdè</day>
+ <day type="fri">Fraídè</day>
+ <day type="sat">Sátọdè</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">K1</quarter>
+ <quarter type="2">K2</quarter>
+ <quarter type="3">K3</quarter>
+ <quarter type="4">K4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">1</quarter>
+ <quarter type="2">2</quarter>
+ <quarter type="3">3</quarter>
+ <quarter type="4">4</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">Fẹ́st Kwọ́ta</quarter>
+ <quarter type="2">Sẹ́kọ́n Kwọ́ta</quarter>
+ <quarter type="3">Tọ́d Kwọ́ta</quarter>
+ <quarter type="4">Fọ́t Kwọ́ta</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">K1</quarter>
+ <quarter type="2">K2</quarter>
+ <quarter type="3">K3</quarter>
+ <quarter type="4">K4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">1</quarter>
+ <quarter type="2">2</quarter>
+ <quarter type="3">3</quarter>
+ <quarter type="4">4</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">Fẹ́st Kwọ́ta</quarter>
+ <quarter type="2">Sẹ́kọ́n Kwọ́ta</quarter>
+ <quarter type="3">Tọ́d Kwọ́ta</quarter>
+ <quarter type="4">Fọ́t Kwọ́ta</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="abbreviated">
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="narrow">
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">Fọ mọ́nin</dayPeriod>
+ <dayPeriod type="pm">Fọ ívnin</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ <dayPeriodContext type="stand-alone">
+ <dayPeriodWidth type="abbreviated">
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="narrow">
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">Fọ mọ́nin</dayPeriod>
+ <dayPeriod type="pm">Fọ ívnin</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraNames>
+ <era type="0">Bifọ́ Kraist</era>
+ <era type="0" alt="variant">Bifọ́ Jẹ́nárál Taim</era>
+ <era type="1">Kraist Im Yiẹ</era>
+ <era type="1" alt="variant">Jẹ́nárál Taim</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">BK</era>
+ <era type="0" alt="variant">BJT</era>
+ <era type="1">KIY</era>
+ <era type="1" alt="variant">JT</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>HH:mm:ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>H:mm:ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>HH:mm:ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>HH:mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'fọ' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'fọ' {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="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="d">d</dateFormatItem>
+ <dateFormatItem id="E">ccc</dateFormatItem>
+ <dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="Ed">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">y G</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+ <dateFormatItem id="h">h a</dateFormatItem>
+ <dateFormatItem id="H">HH</dateFormatItem>
+ <dateFormatItem id="hm">h:mm a</dateFormatItem>
+ <dateFormatItem id="Hm">HH:mm</dateFormatItem>
+ <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+ <dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+ <dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+ <dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+ <dateFormatItem id="M">L</dateFormatItem>
+ <dateFormatItem id="Md">d /M</dateFormatItem>
+ <dateFormatItem id="MEd">E, d/M</dateFormatItem>
+ <dateFormatItem id="MMM">LLL</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="MMMMW" count="one">'Wik' W 'fọ' MMMM</dateFormatItem>
+ <dateFormatItem id="MMMMW" count="other">'Wik' W 'fọ' MMMM</dateFormatItem>
+ <dateFormatItem id="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="y">y</dateFormatItem>
+ <dateFormatItem id="yM">M/y</dateFormatItem>
+ <dateFormatItem id="yMd">d/M/y</dateFormatItem>
+ <dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+ <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+ <dateFormatItem id="yw" count="one">'Wik' w 'fọ' Y</dateFormatItem>
+ <dateFormatItem id="yw" count="other">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <appendItems>
+ <appendItem request="Timezone">{0} {1}</appendItem>
+ </appendItems>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">h B – h B</greatestDifference>
+ <greatestDifference id="h">h–h B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+ <greatestDifference id="h">h:mm–h:mm B</greatestDifference>
+ <greatestDifference id="m">h:mm–h:mm B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">d–d</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">y G – y G</greatestDifference>
+ <greatestDifference id="y">y–y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">MM-y GGGGG – MM-y GGGGG</greatestDifference>
+ <greatestDifference id="M">MM-y – MM-y GGGGG</greatestDifference>
+ <greatestDifference id="y">MM-y – MM-y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="G">dd-MM-y GGGGG – dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="M">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="y">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="G">E, dd-MM-y GGGGG – E, dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="M">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
+ <greatestDifference id="y">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+ <greatestDifference id="M">MMM–MMM y G</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">d–d MMM y G</greatestDifference>
+ <greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y G</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">dd/MM – dd/MM</greatestDifference>
+ <greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">E, dd/MM – E, dd/MM</greatestDifference>
+ <greatestDifference id="M">E, dd-MM – E, dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">LLL–LLL</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">d–d MMM</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">y–y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">MM/y – MM/y</greatestDifference>
+ <greatestDifference id="y">M/y – M/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="M">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">MMM–MMM y</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">d – d MMM y</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">E, d MMM y – E, d MMM y</greatestDifference>
+ <greatestDifference id="M">E, d MMM y – E, d MMM y</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">MMMM – MMMM y</greatestDifference>
+ <greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>Taim</displayName>
+ </field>
+ <field type="era-short">
+ <displayName>Taim</displayName>
+ </field>
+ <field type="era-narrow">
+ <displayName>Taim</displayName>
+ </field>
+ <field type="year">
+ <displayName>Yiẹ</displayName>
+ <relative type="-1">Lást yiẹ</relative>
+ <relative type="0">Dís yiẹ</relative>
+ <relative type="1">Nẹ́st yiẹ</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="year-short">
+ <displayName>Yiẹ</displayName>
+ <relative type="-1">Lást yiẹ</relative>
+ <relative type="0">Dís yiẹ</relative>
+ <relative type="1">Nẹ́st yiẹ</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="year-narrow">
+ <displayName>Yiẹ</displayName>
+ <relative type="-1">Lást yiẹ</relative>
+ <relative type="0">Dís yiẹ</relative>
+ <relative type="1">Nẹ́st yiẹ</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} yiẹ wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} yiẹ wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="quarter">
+ <displayName>Kwọ́ta</displayName>
+ <relative type="-1">Lást kwọ́ta</relative>
+ <relative type="0">Dís kwọ́ta</relative>
+ <relative type="1">Nẹ́st kwọ́ta</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="quarter-short">
+ <displayName>Kwọ́ta</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>Kwọ́ta</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">fọ {0} kwọ́ta wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} kwọ́ta wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="month">
+ <displayName>Mọnt</displayName>
+ <relative type="-1">Lást mọnt</relative>
+ <relative type="0">Dís mọnt</relative>
+ <relative type="1">Nẹ́st mọnt</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="month-short">
+ <displayName>Mọnt</displayName>
+ <relative type="-1">Lást mọnt</relative>
+ <relative type="0">Dís mọnt</relative>
+ <relative type="1">Nẹ́st mọnt</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="month-narrow">
+ <displayName>Mọnt</displayName>
+ <relative type="-1">Lást mọnt</relative>
+ <relative type="0">Dís mọnt</relative>
+ <relative type="1">Nẹ́st mọnt</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}mọnt wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mọnt wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="week">
+ <displayName>Wik</displayName>
+ <relative type="-1">Lást wik</relative>
+ <relative type="0">Dís wik</relative>
+ <relative type="1">Nẹ́st wik</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}wik wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}wik wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} wik wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} wik wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ <relativePeriod>Di wík ọf {0}</relativePeriod>
+ </field>
+ <field type="week-short">
+ <displayName>Wik</displayName>
+ <relative type="-1">Lást wik</relative>
+ <relative type="0">Dís wik</relative>
+ <relative type="1">Nẹ́st wik</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}wik wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}wik wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} wik wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} wik wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ <relativePeriod>Di wik ọf {0}</relativePeriod>
+ </field>
+ <field type="week-narrow">
+ <displayName>Wik</displayName>
+ <relative type="-1">Lást wik</relative>
+ <relative type="0">Dís wik</relative>
+ <relative type="1">Nẹ́st wik</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}wik wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}wik wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} wik wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} wik wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ <relativePeriod>Di wik ọf {0}</relativePeriod>
+ </field>
+ <field type="weekOfMonth">
+ <displayName>Wik fọ mọnt</displayName>
+ </field>
+ <field type="weekOfMonth-short">
+ <displayName>Wik fọ mọnt</displayName>
+ </field>
+ <field type="weekOfMonth-narrow">
+ <displayName>Wik fọ mọnt</displayName>
+ </field>
+ <field type="day">
+ <displayName>Dè</displayName>
+ <relative type="-1">Yẹ́stadè</relative>
+ <relative type="0">Todè</relative>
+ <relative type="1">Tumọ́ro</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}dè wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}dè wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} dè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} dè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="day-short">
+ <displayName>Dè</displayName>
+ <relative type="-1">Yẹ́stadè</relative>
+ <relative type="0">Todè</relative>
+ <relative type="1">Tumọ́ro</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}dè wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}dè wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} dè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} dè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="day-narrow">
+ <displayName>Dè</displayName>
+ <relative type="-1">Yẹ́stadè</relative>
+ <relative type="0">Todè</relative>
+ <relative type="1">Tumọ́ro</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0}dè wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0}dè wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} dè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} dè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="dayOfYear">
+ <displayName>Dè fọ yiẹ</displayName>
+ </field>
+ <field type="dayOfYear-short">
+ <displayName>Dè fọ yiẹ</displayName>
+ </field>
+ <field type="dayOfYear-narrow">
+ <displayName>Dè fọ yiẹ</displayName>
+ </field>
+ <field type="weekday">
+ <displayName>Dè fọ wik</displayName>
+ </field>
+ <field type="weekday-short">
+ <displayName>Dè fọ wik</displayName>
+ </field>
+ <field type="weekday-narrow">
+ <displayName>Dè fọ wik</displayName>
+ </field>
+ <field type="weekdayOfMonth">
+ <displayName>Dè fọ mọnt</displayName>
+ </field>
+ <field type="weekdayOfMonth-short">
+ <displayName>Dè fọ mọnt</displayName>
+ </field>
+ <field type="weekdayOfMonth-narrow">
+ <displayName>Dè fọ mọnt</displayName>
+ </field>
+ <field type="sun">
+ <relative type="-1">Lást Sọ́ndè</relative>
+ <relative type="0">Dís Sọ́ndè</relative>
+ <relative type="1">Nẹ́st Sọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sun-short">
+ <relative type="-1">Lást Sọ́ndè</relative>
+ <relative type="0">Dís Sọ́ndè</relative>
+ <relative type="1">Nẹ́st Sọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sun-narrow">
+ <relative type="-1">Lást Sọ́ndè</relative>
+ <relative type="0">Dís Sọ́ndè</relative>
+ <relative type="1">Nẹ́st Sọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="mon">
+ <relative type="-1">Lást Mọ́ndè</relative>
+ <relative type="0">Dís Mọ́ndè</relative>
+ <relative type="1">Nẹ́st Mọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Mọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Mọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="mon-short">
+ <relative type="-1">Lást Mọ́ndè</relative>
+ <relative type="0">Dís Mọ́ndè</relative>
+ <relative type="1">Nẹ́st Mọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Mọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Mọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="mon-narrow">
+ <relative type="-1">Lást Mọ́ndè</relative>
+ <relative type="0">Dís Mọ́ndè</relative>
+ <relative type="1">Nẹ́st Mọ́ndè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Mọ́ndè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Mọ́ndè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Mọ́ndè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="tue">
+ <relative type="-1">Lást Tiúzdè</relative>
+ <relative type="0">Dís Tiúzdè</relative>
+ <relative type="1">Nẹ́st Tiúzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tiúzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tiúzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="tue-short">
+ <relative type="-1">Lást Tiúzdè</relative>
+ <relative type="0">Dís Tiúzdè</relative>
+ <relative type="1">Nẹ́st Tiúzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tiúzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tiúzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="tue-narrow">
+ <relative type="-1">Lást Tiúzdè</relative>
+ <relative type="0">Dís Tiúzdè</relative>
+ <relative type="1">Nẹ́st Tiúzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tiúzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tiúzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Tiúzdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="wed">
+ <relative type="-1">Lást Wẹ́nzdè</relative>
+ <relative type="0">Dís Wẹ́nzdè</relative>
+ <relative type="1">Nẹ́st Wẹ́nzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Wẹ́nẹdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Wẹ́nẹdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="wed-short">
+ <relative type="-1">Lást Wẹ́nzdè</relative>
+ <relative type="0">Dís Wẹ́nzdè</relative>
+ <relative type="1">Nẹ́st Wẹ́nzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Wẹ́nzdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Wẹ́nzdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="wed-narrow">
+ <relative type="-1">Lást Wẹ́nzdè</relative>
+ <relative type="0">Dís Wẹ́nzdè</relative>
+ <relative type="1">Nẹ́st Wẹ́nzdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Wẹ́nzdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Wẹ́nzdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Wẹ́nzdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="thu">
+ <relative type="-1">Lást Tọ́zdè</relative>
+ <relative type="0">Dís Tọ́zdè</relative>
+ <relative type="1">Nẹ́st Tọ́zdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tọ́zdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tọ́zdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="thu-short">
+ <relative type="-1">Lást Tọ́zdè</relative>
+ <relative type="0">Dís Tọ́zdè</relative>
+ <relative type="1">Nẹ́st Tọ́zdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tọ́zdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tọ́zdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="thu-narrow">
+ <relative type="-1">Lást Tọ́zdè</relative>
+ <relative type="0">Dís Tọ́zdè</relative>
+ <relative type="1">Nẹ́st Tọ́zdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Tọ́zdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Tọ́zdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Tọ́zdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="fri">
+ <relative type="-1">Lást Fraidè</relative>
+ <relative type="0">Dís Fraidè</relative>
+ <relative type="1">Nẹ́st Fraidè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Fraidè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Fraidè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="fri-short">
+ <relative type="-1">Lást Fraidè</relative>
+ <relative type="0">Dís Fraidè</relative>
+ <relative type="1">Nẹ́st Fraidè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Fraidè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Fraidè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="fri-narrow">
+ <relative type="-1">Lást Fraidè</relative>
+ <relative type="0">Dís Fraidè</relative>
+ <relative type="1">Nẹ́st Fraidè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Fraidè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Fraidè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0}Fraidè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sat">
+ <relative type="-1">Lást Sátọdè</relative>
+ <relative type="0">Dís Sátọdè</relative>
+ <relative type="1">Nẹ́st Sátọdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sátọdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sátọdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sat-short">
+ <relative type="-1">Lást Sátọdè</relative>
+ <relative type="0">Dís Sátọdè</relative>
+ <relative type="1">Nẹ́st Sátọdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sátọdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sátọdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sat-narrow">
+ <relative type="-1">Lást Sátọdè</relative>
+ <relative type="0">Dís Sátọdè</relative>
+ <relative type="1">Nẹ́st Sátọdè</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sátọdè</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sátọdè</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} Sátọdè wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="dayperiod-short">
+ <displayName>fọ mọ́nin/fọ áftanun, fọ ívnin, fọ nait</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>fọ mọ́nin fọ áftanun fọ ívnin fọ nait</displayName>
+ </field>
+ <field type="dayperiod-narrow">
+ <displayName>fọ mọ́nin/fọ áftanun, fọ ívnin, fọ nait</displayName>
+ </field>
+ <field type="hour">
+ <displayName>Awa</displayName>
+ <relative type="0">Dís áwa</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} áwa wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} áwa wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="hour-short">
+ <displayName>Awa</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} áwa wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} áwa wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="hour-narrow">
+ <displayName>Awa</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} áwa wé de kọm</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="minute">
+ <displayName>Mínit</displayName>
+ <relative type="0">Dís mínit</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mínit wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mínit wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="minute-short">
+ <displayName>Mínit</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mínit wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mínit wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="minute-narrow">
+ <displayName>Mínit</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} mínit wé de kọm</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mínit wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mínit wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="second">
+ <displayName>Sẹ́kọn</displayName>
+ <relative type="0">nau</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="second-short">
+ <displayName>Sẹ́kọn</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="second-narrow">
+ <displayName>Sẹ́kọn</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ <relativeTimePattern count="other">Fọ {0} Sẹ́kọn</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ <relativeTimePattern count="other">{0} sẹ́kọn wé dọ́n pas</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="zone">
+ <displayName>Taím Zon</displayName>
+ </field>
+ <field type="zone-short">
+ <displayName>Taím Zon</displayName>
+ </field>
+ <field type="zone-narrow">
+ <displayName>Taím Zon</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>+HH:mm;-HH:mm</hourFormat>
+ <gmtFormat>GMT{0}</gmtFormat>
+ <gmtZeroFormat>GMT</gmtZeroFormat>
+ <regionFormat>{0} Taim</regionFormat>
+ <regionFormat type="daylight">{0} Délaít Taim</regionFormat>
+ <regionFormat type="standard">{0} Fíksd Taim</regionFormat>
+ <fallbackFormat>{1} ({0})</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>Arénjmẹnt ọf Di Hól Wọld Taim</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>Taun wé Pẹ́sin Nọ́ No</exemplarCity>
+ </zone>
+ <zone type="Europe/Andorra">
+ <exemplarCity>Andọ́ra</exemplarCity>
+ </zone>
+ <zone type="Asia/Dubai">
+ <exemplarCity>Dubai</exemplarCity>
+ </zone>
+ <zone type="Asia/Kabul">
+ <exemplarCity>Kabul</exemplarCity>
+ </zone>
+ <zone type="America/Antigua">
+ <exemplarCity>Antígwua</exemplarCity>
+ </zone>
+ <zone type="America/Anguilla">
+ <exemplarCity>Angwíla</exemplarCity>
+ </zone>
+ <zone type="Europe/Tirane">
+ <exemplarCity>Tiránẹ</exemplarCity>
+ </zone>
+ <zone type="Asia/Yerevan">
+ <exemplarCity>Yẹrẹ́van</exemplarCity>
+ </zone>
+ <zone type="Africa/Luanda">
+ <exemplarCity>Luánda</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Rothera">
+ <exemplarCity>Rotẹ́ra</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Palmer">
+ <exemplarCity>Páma</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Troll">
+ <exemplarCity>Trol</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Syowa">
+ <exemplarCity>Siówa</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Mawson">
+ <exemplarCity>Mọ́sọn</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Davis">
+ <exemplarCity>Dévis</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Vostok">
+ <exemplarCity>Vọ́stọk</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Casey">
+ <exemplarCity>Kési</exemplarCity>
+ </zone>
+ <zone type="Antarctica/DumontDUrville">
+ <exemplarCity>Diúmọ́n-d’Uvil</exemplarCity>
+ </zone>
+ <zone type="Antarctica/McMurdo">
+ <exemplarCity>McMọ́do</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Rio_Gallegos">
+ <exemplarCity>Rió Galẹ́gọs</exemplarCity>
+ </zone>
+ <zone type="America/Mendoza">
+ <exemplarCity>Mẹndóza</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/San_Juan">
+ <exemplarCity>San Hwan</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Ushuaia">
+ <exemplarCity>Usuáya</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/La_Rioja">
+ <exemplarCity>La Riókha</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/San_Luis">
+ <exemplarCity>San Luis</exemplarCity>
+ </zone>
+ <zone type="America/Catamarca">
+ <exemplarCity>Katamáka</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Salta">
+ <exemplarCity>Sálta</exemplarCity>
+ </zone>
+ <zone type="America/Jujuy">
+ <exemplarCity>Huhui</exemplarCity>
+ </zone>
+ <zone type="America/Argentina/Tucuman">
+ <exemplarCity>Túkúman</exemplarCity>
+ </zone>
+ <zone type="America/Cordoba">
+ <exemplarCity>Kórdoba</exemplarCity>
+ </zone>
+ <zone type="America/Buenos_Aires">
+ <exemplarCity>Buẹnos Aírẹs</exemplarCity>
+ </zone>
+ <zone type="Pacific/Pago_Pago">
+ <exemplarCity>Págo Págo</exemplarCity>
+ </zone>
+ <zone type="Europe/Vienna">
+ <exemplarCity>Viẹ́na</exemplarCity>
+ </zone>
+ <zone type="Australia/Perth">
+ <exemplarCity>Pẹrt</exemplarCity>
+ </zone>
+ <zone type="Australia/Eucla">
+ <exemplarCity>Yúkla</exemplarCity>
+ </zone>
+ <zone type="Australia/Darwin">
+ <exemplarCity>Dárwin</exemplarCity>
+ </zone>
+ <zone type="Australia/Adelaide">
+ <exemplarCity>Adleid</exemplarCity>
+ </zone>
+ <zone type="Australia/Broken_Hill">
+ <exemplarCity>Brókún Hil</exemplarCity>
+ </zone>
+ <zone type="Australia/Currie">
+ <exemplarCity>Kọ́ri</exemplarCity>
+ </zone>
+ <zone type="Australia/Melbourne">
+ <exemplarCity>Mẹ́lbọn</exemplarCity>
+ </zone>
+ <zone type="Australia/Hobart">
+ <exemplarCity>Hóbat</exemplarCity>
+ </zone>
+ <zone type="Australia/Lindeman">
+ <exemplarCity>Líndẹman</exemplarCity>
+ </zone>
+ <zone type="Australia/Sydney">
+ <exemplarCity>Sídni</exemplarCity>
+ </zone>
+ <zone type="Australia/Brisbane">
+ <exemplarCity>Brísben</exemplarCity>
+ </zone>
+ <zone type="Antarctica/Macquarie">
+ <exemplarCity>Makwuéí</exemplarCity>
+ </zone>
+ <zone type="Australia/Lord_Howe">
+ <exemplarCity>Lọd Haú</exemplarCity>
+ </zone>
+ <zone type="America/Aruba">
+ <exemplarCity>Arúba</exemplarCity>
+ </zone>
+ <zone type="Europe/Mariehamn">
+ <exemplarCity>Maríahámn</exemplarCity>
+ </zone>
+ <zone type="Asia/Baku">
+ <exemplarCity>Baku</exemplarCity>
+ </zone>
+ <zone type="Europe/Sarajevo">
+ <exemplarCity>Sarayẹ́vo</exemplarCity>
+ </zone>
+ <zone type="America/Barbados">
+ <exemplarCity>Barbédọs</exemplarCity>
+ </zone>
+ <zone type="Asia/Dhaka">
+ <exemplarCity>Dáka</exemplarCity>
+ </zone>
+ <zone type="Europe/Brussels">
+ <exemplarCity>Brúsuls</exemplarCity>
+ </zone>
+ <zone type="Africa/Ouagadougou">
+ <exemplarCity>Ouagadúgu</exemplarCity>
+ </zone>
+ <zone type="Europe/Sofia">
+ <exemplarCity>Sofía</exemplarCity>
+ </zone>
+ <zone type="Asia/Bahrain">
+ <exemplarCity>Bahrén</exemplarCity>
+ </zone>
+ <zone type="Africa/Bujumbura">
+ <exemplarCity>Bujumbúra</exemplarCity>
+ </zone>
+ <zone type="Africa/Porto-Novo">
+ <exemplarCity>Pọto-Nóvo</exemplarCity>
+ </zone>
+ <zone type="America/St_Barthelemy">
+ <exemplarCity>Sent Batẹlẹ́mi</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Bermuda">
+ <exemplarCity>Bẹmiúda</exemplarCity>
+ </zone>
+ <zone type="Asia/Brunei">
+ <exemplarCity>Brunẹi</exemplarCity>
+ </zone>
+ <zone type="America/La_Paz">
+ <exemplarCity>La Paz</exemplarCity>
+ </zone>
+ <zone type="America/Kralendijk">
+ <exemplarCity>Králẹ́ndijk</exemplarCity>
+ </zone>
+ <zone type="America/Eirunepe">
+ <exemplarCity>Ẹirunẹpẹ</exemplarCity>
+ </zone>
+ <zone type="America/Rio_Branco">
+ <exemplarCity>Rió Bránko</exemplarCity>
+ </zone>
+ <zone type="America/Porto_Velho">
+ <exemplarCity>Pọto Vẹ́lho</exemplarCity>
+ </zone>
+ <zone type="America/Boa_Vista">
+ <exemplarCity>Bóa Vísta</exemplarCity>
+ </zone>
+ <zone type="America/Manaus">
+ <exemplarCity>Manáus</exemplarCity>
+ </zone>
+ <zone type="America/Cuiaba">
+ <exemplarCity>Kúyábaa</exemplarCity>
+ </zone>
+ <zone type="America/Santarem">
+ <exemplarCity>Santarẹm</exemplarCity>
+ </zone>
+ <zone type="America/Campo_Grande">
+ <exemplarCity>Kampó Grándẹ</exemplarCity>
+ </zone>
+ <zone type="America/Belem">
+ <exemplarCity>Bẹlẹm</exemplarCity>
+ </zone>
+ <zone type="America/Araguaina">
+ <exemplarCity>Aragwuaína</exemplarCity>
+ </zone>
+ <zone type="America/Sao_Paulo">
+ <exemplarCity>Sao Paúlo</exemplarCity>
+ </zone>
+ <zone type="America/Bahia">
+ <exemplarCity>Bahía</exemplarCity>
+ </zone>
+ <zone type="America/Fortaleza">
+ <exemplarCity>Fọtalẹ́za</exemplarCity>
+ </zone>
+ <zone type="America/Maceio">
+ <exemplarCity>Masẹ́io</exemplarCity>
+ </zone>
+ <zone type="America/Recife">
+ <exemplarCity>Rẹsífẹ</exemplarCity>
+ </zone>
+ <zone type="America/Noronha">
+ <exemplarCity>Nọrónia</exemplarCity>
+ </zone>
+ <zone type="America/Nassau">
+ <exemplarCity>Nássọu</exemplarCity>
+ </zone>
+ <zone type="Asia/Thimphu">
+ <exemplarCity>Tímfu</exemplarCity>
+ </zone>
+ <zone type="Africa/Gaborone">
+ <exemplarCity>Háborónẹ</exemplarCity>
+ </zone>
+ <zone type="Europe/Minsk">
+ <exemplarCity>Minsk</exemplarCity>
+ </zone>
+ <zone type="America/Belize">
+ <exemplarCity>Bẹliz</exemplarCity>
+ </zone>
+ <zone type="America/Dawson">
+ <exemplarCity>Dọ́sọn</exemplarCity>
+ </zone>
+ <zone type="America/Whitehorse">
+ <exemplarCity>Waíthọs</exemplarCity>
+ </zone>
+ <zone type="America/Inuvik">
+ <exemplarCity>Inúvik</exemplarCity>
+ </zone>
+ <zone type="America/Vancouver">
+ <exemplarCity>Vankúva</exemplarCity>
+ </zone>
+ <zone type="America/Fort_Nelson">
+ <exemplarCity>Fọt Nẹ́lson</exemplarCity>
+ </zone>
+ <zone type="America/Dawson_Creek">
+ <exemplarCity>Dọ́sọn Krik</exemplarCity>
+ </zone>
+ <zone type="America/Creston">
+ <exemplarCity>Krẹ́stọn</exemplarCity>
+ </zone>
+ <zone type="America/Yellowknife">
+ <exemplarCity>Yẹ́lónaif</exemplarCity>
+ </zone>
+ <zone type="America/Edmonton">
+ <exemplarCity>Ẹ́dmọ́ntọn</exemplarCity>
+ </zone>
+ <zone type="America/Swift_Current">
+ <exemplarCity>Swíft Kọ́rẹnt</exemplarCity>
+ </zone>
+ <zone type="America/Cambridge_Bay">
+ <exemplarCity>Kémbríj Bè</exemplarCity>
+ </zone>
+ <zone type="America/Regina">
+ <exemplarCity>Rẹjína</exemplarCity>
+ </zone>
+ <zone type="America/Winnipeg">
+ <exemplarCity>Wínípẹg</exemplarCity>
+ </zone>
+ <zone type="America/Resolute">
+ <exemplarCity>Rẹ́zólut</exemplarCity>
+ </zone>
+ <zone type="America/Rainy_River">
+ <exemplarCity>Réní Ríva</exemplarCity>
+ </zone>
+ <zone type="America/Rankin_Inlet">
+ <exemplarCity>Ránkín Ínlẹt</exemplarCity>
+ </zone>
+ <zone type="America/Coral_Harbour">
+ <exemplarCity>Atíkókan</exemplarCity>
+ </zone>
+ <zone type="America/Thunder_Bay">
+ <exemplarCity>Tọ́nda Bè</exemplarCity>
+ </zone>
+ <zone type="America/Nipigon">
+ <exemplarCity>Nípígọn</exemplarCity>
+ </zone>
+ <zone type="America/Toronto">
+ <exemplarCity>Torónto</exemplarCity>
+ </zone>
+ <zone type="America/Iqaluit">
+ <exemplarCity>Ikáluit</exemplarCity>
+ </zone>
+ <zone type="America/Pangnirtung">
+ <exemplarCity>Pangnírtung</exemplarCity>
+ </zone>
+ <zone type="America/Moncton">
+ <exemplarCity>Mọ́nktọn</exemplarCity>
+ </zone>
+ <zone type="America/Halifax">
+ <exemplarCity>Hálífaks</exemplarCity>
+ </zone>
+ <zone type="America/Goose_Bay">
+ <exemplarCity>Gúz Bè</exemplarCity>
+ </zone>
+ <zone type="America/Glace_Bay">
+ <exemplarCity>Glás Bè</exemplarCity>
+ </zone>
+ <zone type="America/Blanc-Sablon">
+ <exemplarCity>Blank-Sáblọn</exemplarCity>
+ </zone>
+ <zone type="America/St_Johns">
+ <exemplarCity>Sent Jọn</exemplarCity>
+ </zone>
+ <zone type="Indian/Cocos">
+ <exemplarCity>Kókos</exemplarCity>
+ </zone>
+ <zone type="Africa/Kinshasa">
+ <exemplarCity>Kinshásha</exemplarCity>
+ </zone>
+ <zone type="Africa/Lubumbashi">
+ <exemplarCity>Lubumbáshi</exemplarCity>
+ </zone>
+ <zone type="Africa/Bangui">
+ <exemplarCity>Bangúi</exemplarCity>
+ </zone>
+ <zone type="Africa/Brazzaville">
+ <exemplarCity>Brázavil</exemplarCity>
+ </zone>
+ <zone type="Europe/Zurich">
+ <exemplarCity>Zúrik</exemplarCity>
+ </zone>
+ <zone type="Africa/Abidjan">
+ <exemplarCity>Ábijan</exemplarCity>
+ </zone>
+ <zone type="Pacific/Rarotonga">
+ <exemplarCity>Raratónga</exemplarCity>
+ </zone>
+ <zone type="Pacific/Easter">
+ <exemplarCity>Ísta</exemplarCity>
+ </zone>
+ <zone type="America/Punta_Arenas">
+ <exemplarCity>Púntá Arẹ́nas</exemplarCity>
+ </zone>
+ <zone type="America/Santiago">
+ <exemplarCity>Santiágo</exemplarCity>
+ </zone>
+ <zone type="Africa/Douala">
+ <exemplarCity>Duála</exemplarCity>
+ </zone>
+ <zone type="Asia/Urumqi">
+ <exemplarCity>Yurọ́mki</exemplarCity>
+ </zone>
+ <zone type="Asia/Shanghai">
+ <exemplarCity>Shánghai</exemplarCity>
+ </zone>
+ <zone type="America/Bogota">
+ <exemplarCity>Bogota</exemplarCity>
+ </zone>
+ <zone type="America/Costa_Rica">
+ <exemplarCity>Kósta Ríka</exemplarCity>
+ </zone>
+ <zone type="America/Havana">
+ <exemplarCity>Havána</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Cape_Verde">
+ <exemplarCity>Kép Vẹd</exemplarCity>
+ </zone>
+ <zone type="America/Curacao">
+ <exemplarCity>Kiurásao</exemplarCity>
+ </zone>
+ <zone type="Indian/Christmas">
+ <exemplarCity>Krísmas</exemplarCity>
+ </zone>
+ <zone type="Asia/Nicosia">
+ <exemplarCity>Nikosia</exemplarCity>
+ </zone>
+ <zone type="Asia/Famagusta">
+ <exemplarCity>Fagústa</exemplarCity>
+ </zone>
+ <zone type="Europe/Prague">
+ <exemplarCity>Prag</exemplarCity>
+ </zone>
+ <zone type="Europe/Busingen">
+ <exemplarCity>Busíngẹn</exemplarCity>
+ </zone>
+ <zone type="Europe/Berlin">
+ <exemplarCity>Bẹlin</exemplarCity>
+ </zone>
+ <zone type="Africa/Djibouti">
+ <exemplarCity>Jibúti</exemplarCity>
+ </zone>
+ <zone type="Europe/Copenhagen">
+ <exemplarCity>Kọpẹnhágẹn</exemplarCity>
+ </zone>
+ <zone type="America/Dominica">
+ <exemplarCity>Dọmíníka</exemplarCity>
+ </zone>
+ <zone type="America/Santo_Domingo">
+ <exemplarCity>Sántó Domíngo</exemplarCity>
+ </zone>
+ <zone type="Africa/Algiers">
+ <exemplarCity>Aljíẹz</exemplarCity>
+ </zone>
+ <zone type="Pacific/Galapagos">
+ <exemplarCity>Galápágọs</exemplarCity>
+ </zone>
+ <zone type="America/Guayaquil">
+ <exemplarCity>Guáyakil</exemplarCity>
+ </zone>
+ <zone type="Europe/Tallinn">
+ <exemplarCity>Tálin</exemplarCity>
+ </zone>
+ <zone type="Africa/Cairo">
+ <exemplarCity>Kaíro</exemplarCity>
+ </zone>
+ <zone type="Africa/El_Aaiun">
+ <exemplarCity>Ẹl Aiun</exemplarCity>
+ </zone>
+ <zone type="Africa/Asmera">
+ <exemplarCity>Asmára</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Canary">
+ <exemplarCity>Kenerí</exemplarCity>
+ </zone>
+ <zone type="Africa/Ceuta">
+ <exemplarCity>Sẹúta</exemplarCity>
+ </zone>
+ <zone type="Europe/Madrid">
+ <exemplarCity>Madrid</exemplarCity>
+ </zone>
+ <zone type="Africa/Addis_Ababa">
+ <exemplarCity>Adí Abába</exemplarCity>
+ </zone>
+ <zone type="Europe/Helsinki">
+ <exemplarCity>Hẹlsínki</exemplarCity>
+ </zone>
+ <zone type="Pacific/Fiji">
+ <exemplarCity>Fíji</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Stanley">
+ <exemplarCity>Stánli</exemplarCity>
+ </zone>
+ <zone type="Pacific/Truk">
+ <exemplarCity>Chuk</exemplarCity>
+ </zone>
+ <zone type="Pacific/Ponape">
+ <exemplarCity>Pọnpẹ́i</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kosrae">
+ <exemplarCity>Kọ́sraẹ</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Faeroe">
+ <exemplarCity>Fáróis</exemplarCity>
+ </zone>
+ <zone type="Europe/Paris">
+ <exemplarCity>Páris</exemplarCity>
+ </zone>
+ <zone type="Africa/Libreville">
+ <exemplarCity>Líbrẹvil</exemplarCity>
+ </zone>
+ <zone type="Europe/London">
+ <long>
+ <daylight>Brítísh Họ́t Sízin Taim</daylight>
+ </long>
+ <exemplarCity>Lọ́ndọn</exemplarCity>
+ </zone>
+ <zone type="America/Grenada">
+ <exemplarCity>Grẹnéda</exemplarCity>
+ </zone>
+ <zone type="Asia/Tbilisi">
+ <exemplarCity>Tiblísi</exemplarCity>
+ </zone>
+ <zone type="America/Cayenne">
+ <exemplarCity>Kayẹn</exemplarCity>
+ </zone>
+ <zone type="Europe/Guernsey">
+ <exemplarCity>Guẹnzi</exemplarCity>
+ </zone>
+ <zone type="Africa/Accra">
+ <exemplarCity>Akrá</exemplarCity>
+ </zone>
+ <zone type="Europe/Gibraltar">
+ <exemplarCity>Jibrọ́lta</exemplarCity>
+ </zone>
+ <zone type="America/Thule">
+ <exemplarCity>Túli</exemplarCity>
+ </zone>
+ <zone type="America/Godthab">
+ <exemplarCity>Nuuk</exemplarCity>
+ </zone>
+ <zone type="America/Scoresbysund">
+ <exemplarCity>Itókotúrmit</exemplarCity>
+ </zone>
+ <zone type="America/Danmarkshavn">
+ <exemplarCity>Danmákshávun</exemplarCity>
+ </zone>
+ <zone type="Africa/Banjul">
+ <exemplarCity>Banjul</exemplarCity>
+ </zone>
+ <zone type="Africa/Conakry">
+ <exemplarCity>Kọnákri</exemplarCity>
+ </zone>
+ <zone type="America/Guadeloupe">
+ <exemplarCity>Guadalúpẹ</exemplarCity>
+ </zone>
+ <zone type="Africa/Malabo">
+ <exemplarCity>Malábo</exemplarCity>
+ </zone>
+ <zone type="Europe/Athens">
+ <exemplarCity>Átẹns</exemplarCity>
+ </zone>
+ <zone type="Atlantic/South_Georgia">
+ <exemplarCity>Saút Jọ́jia</exemplarCity>
+ </zone>
+ <zone type="America/Guatemala">
+ <exemplarCity>Guátẹmála</exemplarCity>
+ </zone>
+ <zone type="Pacific/Guam">
+ <exemplarCity>Guam</exemplarCity>
+ </zone>
+ <zone type="Africa/Bissau">
+ <exemplarCity>Bisau</exemplarCity>
+ </zone>
+ <zone type="America/Guyana">
+ <exemplarCity>Gayána</exemplarCity>
+ </zone>
+ <zone type="Asia/Hong_Kong">
+ <exemplarCity>Họng Kọng</exemplarCity>
+ </zone>
+ <zone type="America/Tegucigalpa">
+ <exemplarCity>Tẹgúsigálpa</exemplarCity>
+ </zone>
+ <zone type="Europe/Zagreb">
+ <exemplarCity>Zágrẹb</exemplarCity>
+ </zone>
+ <zone type="America/Port-au-Prince">
+ <exemplarCity>Pọt-o-Prins</exemplarCity>
+ </zone>
+ <zone type="Europe/Budapest">
+ <exemplarCity>Búdápẹst</exemplarCity>
+ </zone>
+ <zone type="Asia/Jakarta">
+ <exemplarCity>Jakáta</exemplarCity>
+ </zone>
+ <zone type="Asia/Pontianak">
+ <exemplarCity>Pọntiának</exemplarCity>
+ </zone>
+ <zone type="Asia/Makassar">
+ <exemplarCity>Makása</exemplarCity>
+ </zone>
+ <zone type="Asia/Jayapura">
+ <exemplarCity>Jayapúra</exemplarCity>
+ </zone>
+ <zone type="Europe/Dublin">
+ <long>
+ <daylight>Aírísh Fíksd Taim</daylight>
+ </long>
+ <exemplarCity>Dọ́blin</exemplarCity>
+ </zone>
+ <zone type="Asia/Jerusalem">
+ <exemplarCity>Jẹrúsálẹm</exemplarCity>
+ </zone>
+ <zone type="Europe/Isle_of_Man">
+ <exemplarCity>Aíl ọf Man</exemplarCity>
+ </zone>
+ <zone type="Asia/Calcutta">
+ <exemplarCity>Kolkáta</exemplarCity>
+ </zone>
+ <zone type="Indian/Chagos">
+ <exemplarCity>Chágọs</exemplarCity>
+ </zone>
+ <zone type="Asia/Baghdad">
+ <exemplarCity>Bágdad</exemplarCity>
+ </zone>
+ <zone type="Asia/Tehran">
+ <exemplarCity>Tẹran</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Reykjavik">
+ <exemplarCity>Rẹ́kjávik</exemplarCity>
+ </zone>
+ <zone type="Europe/Rome">
+ <exemplarCity>Rom</exemplarCity>
+ </zone>
+ <zone type="Europe/Jersey">
+ <exemplarCity>Jẹ́si</exemplarCity>
+ </zone>
+ <zone type="America/Jamaica">
+ <exemplarCity>Jamaíka</exemplarCity>
+ </zone>
+ <zone type="Asia/Amman">
+ <exemplarCity>Aman</exemplarCity>
+ </zone>
+ <zone type="Asia/Tokyo">
+ <exemplarCity>Tókyo</exemplarCity>
+ </zone>
+ <zone type="Africa/Nairobi">
+ <exemplarCity>Naíróbi</exemplarCity>
+ </zone>
+ <zone type="Asia/Bishkek">
+ <exemplarCity>Bishkẹk</exemplarCity>
+ </zone>
+ <zone type="Asia/Phnom_Penh">
+ <exemplarCity>Fnọ́m Pẹn</exemplarCity>
+ </zone>
+ <zone type="Pacific/Enderbury">
+ <exemplarCity>Ẹ́ndábẹ́ri</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kiritimati">
+ <exemplarCity>Kritímáti</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tarawa">
+ <exemplarCity>Taráwa</exemplarCity>
+ </zone>
+ <zone type="Indian/Comoro">
+ <exemplarCity>Kọ́mọ́ros</exemplarCity>
+ </zone>
+ <zone type="America/St_Kitts">
+ <exemplarCity>Sent Kits</exemplarCity>
+ </zone>
+ <zone type="Asia/Pyongyang">
+ <exemplarCity>Piọngyang</exemplarCity>
+ </zone>
+ <zone type="Asia/Seoul">
+ <exemplarCity>Sol</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuwait">
+ <exemplarCity>Kuwet</exemplarCity>
+ </zone>
+ <zone type="America/Cayman">
+ <exemplarCity>Kéman</exemplarCity>
+ </zone>
+ <zone type="Asia/Aqtau">
+ <exemplarCity>Aktáu</exemplarCity>
+ </zone>
+ <zone type="Asia/Oral">
+ <exemplarCity>Ọ́ral</exemplarCity>
+ </zone>
+ <zone type="Asia/Atyrau">
+ <exemplarCity>Átírau</exemplarCity>
+ </zone>
+ <zone type="Asia/Aqtobe">
+ <exemplarCity>Aktóbẹ</exemplarCity>
+ </zone>
+ <zone type="Asia/Qostanay">
+ <exemplarCity>Kostánai</exemplarCity>
+ </zone>
+ <zone type="Asia/Qyzylorda">
+ <exemplarCity>Kízilọ́da</exemplarCity>
+ </zone>
+ <zone type="Asia/Almaty">
+ <exemplarCity>Álmáti</exemplarCity>
+ </zone>
+ <zone type="Asia/Vientiane">
+ <exemplarCity>Viẹ́ntiẹn</exemplarCity>
+ </zone>
+ <zone type="Asia/Beirut">
+ <exemplarCity>Bẹrut</exemplarCity>
+ </zone>
+ <zone type="America/St_Lucia">
+ <exemplarCity>Sent Lúshia</exemplarCity>
+ </zone>
+ <zone type="Europe/Vaduz">
+ <exemplarCity>Vaduz</exemplarCity>
+ </zone>
+ <zone type="Asia/Colombo">
+ <exemplarCity>Kolómbo</exemplarCity>
+ </zone>
+ <zone type="Africa/Monrovia">
+ <exemplarCity>Monróvia</exemplarCity>
+ </zone>
+ <zone type="Africa/Maseru">
+ <exemplarCity>Masẹ́ru</exemplarCity>
+ </zone>
+ <zone type="Europe/Vilnius">
+ <exemplarCity>Vílnius</exemplarCity>
+ </zone>
+ <zone type="Europe/Luxembourg">
+ <exemplarCity>Lọ́ksẹ́mbọg</exemplarCity>
+ </zone>
+ <zone type="Europe/Riga">
+ <exemplarCity>Ríga</exemplarCity>
+ </zone>
+ <zone type="Africa/Tripoli">
+ <exemplarCity>Trípọ́li</exemplarCity>
+ </zone>
+ <zone type="Africa/Casablanca">
+ <exemplarCity>Kasablánka</exemplarCity>
+ </zone>
+ <zone type="Europe/Monaco">
+ <exemplarCity>Mọ́náko</exemplarCity>
+ </zone>
+ <zone type="Europe/Chisinau">
+ <exemplarCity>Chisináu</exemplarCity>
+ </zone>
+ <zone type="Europe/Podgorica">
+ <exemplarCity>Pọ́jóríka</exemplarCity>
+ </zone>
+ <zone type="America/Marigot">
+ <exemplarCity>Márígọt</exemplarCity>
+ </zone>
+ <zone type="Indian/Antananarivo">
+ <exemplarCity>Antánánarívo</exemplarCity>
+ </zone>
+ <zone type="Pacific/Kwajalein">
+ <exemplarCity>Kwájalẹn</exemplarCity>
+ </zone>
+ <zone type="Pacific/Majuro">
+ <exemplarCity>Majúro</exemplarCity>
+ </zone>
+ <zone type="Europe/Skopje">
+ <exemplarCity>Skọ́pyẹ</exemplarCity>
+ </zone>
+ <zone type="Africa/Bamako">
+ <exemplarCity>Bamáko</exemplarCity>
+ </zone>
+ <zone type="Asia/Rangoon">
+ <exemplarCity>Yangọn</exemplarCity>
+ </zone>
+ <zone type="Asia/Hovd">
+ <exemplarCity>Hovd</exemplarCity>
+ </zone>
+ <zone type="Asia/Ulaanbaatar">
+ <exemplarCity>Ulanbáta</exemplarCity>
+ </zone>
+ <zone type="Asia/Choibalsan">
+ <exemplarCity>Choibálsan</exemplarCity>
+ </zone>
+ <zone type="Asia/Macau">
+ <exemplarCity>Makáo</exemplarCity>
+ </zone>
+ <zone type="Pacific/Saipan">
+ <exemplarCity>Saipan</exemplarCity>
+ </zone>
+ <zone type="America/Martinique">
+ <exemplarCity>Matínik</exemplarCity>
+ </zone>
+ <zone type="Africa/Nouakchott">
+ <exemplarCity>Nouákshọt</exemplarCity>
+ </zone>
+ <zone type="America/Montserrat">
+ <exemplarCity>Mọntsẹrat</exemplarCity>
+ </zone>
+ <zone type="Europe/Malta">
+ <exemplarCity>Mọ́lta</exemplarCity>
+ </zone>
+ <zone type="Indian/Mauritius">
+ <exemplarCity>Mọríshọs</exemplarCity>
+ </zone>
+ <zone type="Indian/Maldives">
+ <exemplarCity>Mọ́ldivs</exemplarCity>
+ </zone>
+ <zone type="Africa/Blantyre">
+ <exemplarCity>Blantáya</exemplarCity>
+ </zone>
+ <zone type="America/Tijuana">
+ <exemplarCity>Tikhuána</exemplarCity>
+ </zone>
+ <zone type="America/Hermosillo">
+ <exemplarCity>Hẹ́mósílo</exemplarCity>
+ </zone>
+ <zone type="America/Mazatlan">
+ <exemplarCity>Mazátlan</exemplarCity>
+ </zone>
+ <zone type="America/Chihuahua">
+ <exemplarCity>Chiwuáwua</exemplarCity>
+ </zone>
+ <zone type="America/Bahia_Banderas">
+ <exemplarCity>Bahía Bandẹ́ras</exemplarCity>
+ </zone>
+ <zone type="America/Ojinaga">
+ <exemplarCity>Okhinága</exemplarCity>
+ </zone>
+ <zone type="America/Monterrey">
+ <exemplarCity>Mọntẹrẹẹ</exemplarCity>
+ </zone>
+ <zone type="America/Mexico_City">
+ <exemplarCity>Mẹ́ksíkó Síti</exemplarCity>
+ </zone>
+ <zone type="America/Matamoros">
+ <exemplarCity>Mátamóros</exemplarCity>
+ </zone>
+ <zone type="America/Merida">
+ <exemplarCity>Mẹ́rída</exemplarCity>
+ </zone>
+ <zone type="America/Cancun">
+ <exemplarCity>Kankun</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuala_Lumpur">
+ <exemplarCity>Kuála Lúmpọ</exemplarCity>
+ </zone>
+ <zone type="Asia/Kuching">
+ <exemplarCity>Kuching</exemplarCity>
+ </zone>
+ <zone type="Africa/Maputo">
+ <exemplarCity>Mapúto</exemplarCity>
+ </zone>
+ <zone type="Africa/Windhoek">
+ <exemplarCity>Wíndhok</exemplarCity>
+ </zone>
+ <zone type="Pacific/Noumea">
+ <exemplarCity>Númẹ́a</exemplarCity>
+ </zone>
+ <zone type="Africa/Niamey">
+ <exemplarCity>Niáme</exemplarCity>
+ </zone>
+ <zone type="Pacific/Norfolk">
+ <exemplarCity>Nọ́rfọ́lk</exemplarCity>
+ </zone>
+ <zone type="Africa/Lagos">
+ <exemplarCity>Légos</exemplarCity>
+ </zone>
+ <zone type="America/Managua">
+ <exemplarCity>Manágua</exemplarCity>
+ </zone>
+ <zone type="Europe/Amsterdam">
+ <exemplarCity>Ámstádam</exemplarCity>
+ </zone>
+ <zone type="Europe/Oslo">
+ <exemplarCity>Ọ́slo</exemplarCity>
+ </zone>
+ <zone type="Asia/Katmandu">
+ <exemplarCity>Katmándu</exemplarCity>
+ </zone>
+ <zone type="Pacific/Nauru">
+ <exemplarCity>Naúru</exemplarCity>
+ </zone>
+ <zone type="Pacific/Niue">
+ <exemplarCity>Niú</exemplarCity>
+ </zone>
+ <zone type="Pacific/Chatham">
+ <exemplarCity>Chátam</exemplarCity>
+ </zone>
+ <zone type="Pacific/Auckland">
+ <exemplarCity>Ọ́kland</exemplarCity>
+ </zone>
+ <zone type="Asia/Muscat">
+ <exemplarCity>Múskat</exemplarCity>
+ </zone>
+ <zone type="America/Panama">
+ <exemplarCity>Pánáma</exemplarCity>
+ </zone>
+ <zone type="America/Lima">
+ <exemplarCity>Líma</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tahiti">
+ <exemplarCity>Tahíti</exemplarCity>
+ </zone>
+ <zone type="Pacific/Marquesas">
+ <exemplarCity>Makwẹ́sas</exemplarCity>
+ </zone>
+ <zone type="Pacific/Gambier">
+ <exemplarCity>Gámbiẹr</exemplarCity>
+ </zone>
+ <zone type="Pacific/Port_Moresby">
+ <exemplarCity>Pọt Mọrẹ́sbi</exemplarCity>
+ </zone>
+ <zone type="Pacific/Bougainville">
+ <exemplarCity>Bugenvília</exemplarCity>
+ </zone>
+ <zone type="Asia/Manila">
+ <exemplarCity>Maníla</exemplarCity>
+ </zone>
+ <zone type="Asia/Karachi">
+ <exemplarCity>Karáchi</exemplarCity>
+ </zone>
+ <zone type="Europe/Warsaw">
+ <exemplarCity>Wọ́sọ</exemplarCity>
+ </zone>
+ <zone type="America/Miquelon">
+ <exemplarCity>Míkẹlọn</exemplarCity>
+ </zone>
+ <zone type="Pacific/Pitcairn">
+ <exemplarCity>Pítkan</exemplarCity>
+ </zone>
+ <zone type="America/Puerto_Rico">
+ <exemplarCity>Puẹ́rto Ríkọ</exemplarCity>
+ </zone>
+ <zone type="Asia/Gaza">
+ <exemplarCity>Gáza</exemplarCity>
+ </zone>
+ <zone type="Asia/Hebron">
+ <exemplarCity>Hẹ́brọn</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Azores">
+ <exemplarCity>Azọz</exemplarCity>
+ </zone>
+ <zone type="Atlantic/Madeira">
+ <exemplarCity>Madíra</exemplarCity>
+ </zone>
+ <zone type="Europe/Lisbon">
+ <exemplarCity>Lísbọn</exemplarCity>
+ </zone>
+ <zone type="Pacific/Palau">
+ <exemplarCity>Paláu</exemplarCity>
+ </zone>
+ <zone type="America/Asuncion">
+ <exemplarCity>Asunsiọn</exemplarCity>
+ </zone>
+ <zone type="Asia/Qatar">
+ <exemplarCity>Káta</exemplarCity>
+ </zone>
+ <zone type="Indian/Reunion">
+ <exemplarCity>Riyúniọn</exemplarCity>
+ </zone>
+ <zone type="Europe/Bucharest">
+ <exemplarCity>Búkárẹst</exemplarCity>
+ </zone>
+ <zone type="Europe/Belgrade">
+ <exemplarCity>Bẹ́lgréd</exemplarCity>
+ </zone>
+ <zone type="Europe/Kaliningrad">
+ <exemplarCity>Kalíníngrad</exemplarCity>
+ </zone>
+ <zone type="Europe/Simferopol">
+ <exemplarCity>Símfẹrópol</exemplarCity>
+ </zone>
+ <zone type="Europe/Moscow">
+ <exemplarCity>Mọ́sko</exemplarCity>
+ </zone>
+ <zone type="Europe/Volgograd">
+ <exemplarCity>Volvógrad</exemplarCity>
+ </zone>
+ <zone type="Europe/Saratov">
+ <exemplarCity>Sárátov</exemplarCity>
+ </zone>
+ <zone type="Europe/Astrakhan">
+ <exemplarCity>Ástrahán</exemplarCity>
+ </zone>
+ <zone type="Europe/Ulyanovsk">
+ <exemplarCity>Uliánọvsk</exemplarCity>
+ </zone>
+ <zone type="Europe/Kirov">
+ <exemplarCity>Kirọv</exemplarCity>
+ </zone>
+ <zone type="Europe/Samara">
+ <exemplarCity>Samára</exemplarCity>
+ </zone>
+ <zone type="Asia/Yekaterinburg">
+ <exemplarCity>Yẹketẹrínbug</exemplarCity>
+ </zone>
+ <zone type="Asia/Omsk">
+ <exemplarCity>Ọmsk</exemplarCity>
+ </zone>
+ <zone type="Asia/Novosibirsk">
+ <exemplarCity>Novosibisk</exemplarCity>
+ </zone>
+ <zone type="Asia/Barnaul">
+ <exemplarCity>Bárnául</exemplarCity>
+ </zone>
+ <zone type="Asia/Tomsk">
+ <exemplarCity>Tomsk</exemplarCity>
+ </zone>
+ <zone type="Asia/Novokuznetsk">
+ <exemplarCity>Novokuznẹ́sk</exemplarCity>
+ </zone>
+ <zone type="Asia/Krasnoyarsk">
+ <exemplarCity>Krasnoyask</exemplarCity>
+ </zone>
+ <zone type="Asia/Irkutsk">
+ <exemplarCity>Irkútsk</exemplarCity>
+ </zone>
+ <zone type="Asia/Chita">
+ <exemplarCity>Chítá</exemplarCity>
+ </zone>
+ <zone type="Asia/Yakutsk">
+ <exemplarCity>Yékútsk</exemplarCity>
+ </zone>
+ <zone type="Asia/Vladivostok">
+ <exemplarCity>Vladivọstọk</exemplarCity>
+ </zone>
+ <zone type="Asia/Khandyga">
+ <exemplarCity>Kandíga</exemplarCity>
+ </zone>
+ <zone type="Asia/Sakhalin">
+ <exemplarCity>Sákhalin</exemplarCity>
+ </zone>
+ <zone type="Asia/Ust-Nera">
+ <exemplarCity>Ust-Nẹ́ra</exemplarCity>
+ </zone>
+ <zone type="Asia/Magadan">
+ <exemplarCity>Mágádan</exemplarCity>
+ </zone>
+ <zone type="Asia/Srednekolymsk">
+ <exemplarCity>Srẹ́dnẹkolimsk</exemplarCity>
+ </zone>
+ <zone type="Asia/Kamchatka">
+ <exemplarCity>Kamchátké</exemplarCity>
+ </zone>
+ <zone type="Asia/Anadyr">
+ <exemplarCity>Ánadiar</exemplarCity>
+ </zone>
+ <zone type="Africa/Kigali">
+ <exemplarCity>Kigáli</exemplarCity>
+ </zone>
+ <zone type="Asia/Riyadh">
+ <exemplarCity>Riyád</exemplarCity>
+ </zone>
+ <zone type="Pacific/Guadalcanal">
+ <exemplarCity>Guádálkanal</exemplarCity>
+ </zone>
+ <zone type="Indian/Mahe">
+ <exemplarCity>Mahẹ́</exemplarCity>
+ </zone>
+ <zone type="Africa/Khartoum">
+ <exemplarCity>Kartum</exemplarCity>
+ </zone>
+ <zone type="Europe/Stockholm">
+ <exemplarCity>Stọ́khọm</exemplarCity>
+ </zone>
+ <zone type="Asia/Singapore">
+ <exemplarCity>Singapọ</exemplarCity>
+ </zone>
+ <zone type="Atlantic/St_Helena">
+ <exemplarCity>Sent Hẹlẹ́na</exemplarCity>
+ </zone>
+ <zone type="Europe/Ljubljana">
+ <exemplarCity>Lubliána</exemplarCity>
+ </zone>
+ <zone type="Arctic/Longyearbyen">
+ <exemplarCity>Lọngyẹ́abiẹn</exemplarCity>
+ </zone>
+ <zone type="Europe/Bratislava">
+ <exemplarCity>Bratísláva</exemplarCity>
+ </zone>
+ <zone type="Africa/Freetown">
+ <exemplarCity>Frítaun</exemplarCity>
+ </zone>
+ <zone type="Europe/San_Marino">
+ <exemplarCity>San Maríno</exemplarCity>
+ </zone>
+ <zone type="Africa/Dakar">
+ <exemplarCity>Dakár</exemplarCity>
+ </zone>
+ <zone type="Africa/Mogadishu">
+ <exemplarCity>Mọgádíshu</exemplarCity>
+ </zone>
+ <zone type="America/Paramaribo">
+ <exemplarCity>Párámaribo</exemplarCity>
+ </zone>
+ <zone type="Africa/Juba">
+ <exemplarCity>Júba</exemplarCity>
+ </zone>
+ <zone type="Africa/Sao_Tome">
+ <exemplarCity>Sao Tómẹ</exemplarCity>
+ </zone>
+ <zone type="America/El_Salvador">
+ <exemplarCity>El Sálvádọ</exemplarCity>
+ </zone>
+ <zone type="America/Lower_Princes">
+ <exemplarCity>Lówá Príns Im Kwọ́ta</exemplarCity>
+ </zone>
+ <zone type="Asia/Damascus">
+ <exemplarCity>Damáskọs</exemplarCity>
+ </zone>
+ <zone type="Africa/Mbabane">
+ <exemplarCity>Mbabánẹ</exemplarCity>
+ </zone>
+ <zone type="America/Grand_Turk">
+ <exemplarCity>Gránd Tọk</exemplarCity>
+ </zone>
+ <zone type="Africa/Ndjamena">
+ <exemplarCity>Njamẹ́na</exemplarCity>
+ </zone>
+ <zone type="Indian/Kerguelen">
+ <exemplarCity>Kẹ́rgúlẹn</exemplarCity>
+ </zone>
+ <zone type="Africa/Lome">
+ <exemplarCity>Lómẹ</exemplarCity>
+ </zone>
+ <zone type="Asia/Bangkok">
+ <exemplarCity>Bánkọk</exemplarCity>
+ </zone>
+ <zone type="Asia/Dushanbe">
+ <exemplarCity>Dushánbẹ</exemplarCity>
+ </zone>
+ <zone type="Pacific/Fakaofo">
+ <exemplarCity>Fakáófo</exemplarCity>
+ </zone>
+ <zone type="Asia/Dili">
+ <exemplarCity>Díli</exemplarCity>
+ </zone>
+ <zone type="Asia/Ashgabat">
+ <exemplarCity>Áshgabat</exemplarCity>
+ </zone>
+ <zone type="Africa/Tunis">
+ <exemplarCity>Túnis</exemplarCity>
+ </zone>
+ <zone type="Pacific/Tongatapu">
+ <exemplarCity>Tongatápu</exemplarCity>
+ </zone>
+ <zone type="Europe/Istanbul">
+ <exemplarCity>Ístánbul</exemplarCity>
+ </zone>
+ <zone type="America/Port_of_Spain">
+ <exemplarCity>Pọ́t ọf Spen</exemplarCity>
+ </zone>
+ <zone type="Pacific/Funafuti">
+ <exemplarCity>Funafúti</exemplarCity>
+ </zone>
+ <zone type="Asia/Taipei">
+ <exemplarCity>Taipẹi</exemplarCity>
+ </zone>
+ <zone type="Africa/Dar_es_Salaam">
+ <exemplarCity>Dar ẹ́s Salam</exemplarCity>
+ </zone>
+ <zone type="Europe/Uzhgorod">
+ <exemplarCity>Ọ́zhọrọd</exemplarCity>
+ </zone>
+ <zone type="Europe/Kiev">
+ <exemplarCity>Kiẹv</exemplarCity>
+ </zone>
+ <zone type="Europe/Zaporozhye">
+ <exemplarCity>Zaporózhia</exemplarCity>
+ </zone>
+ <zone type="Africa/Kampala">
+ <exemplarCity>Kampála</exemplarCity>
+ </zone>
+ <zone type="Pacific/Midway">
+ <exemplarCity>Mídwè</exemplarCity>
+ </zone>
+ <zone type="Pacific/Wake">
+ <exemplarCity>Wek</exemplarCity>
+ </zone>
+ <zone type="America/Adak">
+ <exemplarCity>Ádak</exemplarCity>
+ </zone>
+ <zone type="America/Nome">
+ <exemplarCity>Noom</exemplarCity>
+ </zone>
+ <zone type="Pacific/Johnston">
+ <exemplarCity>Jọ́nstun</exemplarCity>
+ </zone>
+ <zone type="America/Anchorage">
+ <exemplarCity>Ánkọ́rej</exemplarCity>
+ </zone>
+ <zone type="America/Yakutat">
+ <exemplarCity>Yakútat</exemplarCity>
+ </zone>
+ <zone type="America/Sitka">
+ <exemplarCity>Sitka</exemplarCity>
+ </zone>
+ <zone type="America/Juneau">
+ <exemplarCity>Júno</exemplarCity>
+ </zone>
+ <zone type="America/Metlakatla">
+ <exemplarCity>Mẹtlakátla</exemplarCity>
+ </zone>
+ <zone type="America/Los_Angeles">
+ <exemplarCity>Lọs Ánjẹ́lis</exemplarCity>
+ </zone>
+ <zone type="America/Boise">
+ <exemplarCity>Bọísi</exemplarCity>
+ </zone>
+ <zone type="America/Phoenix">
+ <exemplarCity>Fíniks</exemplarCity>
+ </zone>
+ <zone type="America/Denver">
+ <exemplarCity>Dẹ́nva</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/Beulah">
+ <exemplarCity>Biúla, Nọ́t Dakóta</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/New_Salem">
+ <exemplarCity>Niú Sélẹm, Nọ́t Dakóta</exemplarCity>
+ </zone>
+ <zone type="America/North_Dakota/Center">
+ <exemplarCity>Sẹ́nta, Nọ́t Dakóta</exemplarCity>
+ </zone>
+ <zone type="America/Chicago">
+ <exemplarCity>Chikágo</exemplarCity>
+ </zone>
+ <zone type="America/Menominee">
+ <exemplarCity>Mẹnọ́minii</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Vincennes">
+ <exemplarCity>Vínsẹn, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Petersburg">
+ <exemplarCity>Pításbọg, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Tell_City">
+ <exemplarCity>Tẹ́l Síti, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Knox">
+ <exemplarCity>Nọks, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Winamac">
+ <exemplarCity>Wínámak, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Marengo">
+ <exemplarCity>Marẹ́ngo, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Indianapolis">
+ <exemplarCity>Indiánápọ́lis</exemplarCity>
+ </zone>
+ <zone type="America/Louisville">
+ <exemplarCity>Luívil</exemplarCity>
+ </zone>
+ <zone type="America/Indiana/Vevay">
+ <exemplarCity>Vẹ́ve, Indiána</exemplarCity>
+ </zone>
+ <zone type="America/Kentucky/Monticello">
+ <exemplarCity>Mọntẹchẹ́lo, Kẹ́ntọ́ki</exemplarCity>
+ </zone>
+ <zone type="America/Detroit">
+ <exemplarCity>Ditrọit</exemplarCity>
+ </zone>
+ <zone type="America/New_York">
+ <exemplarCity>Niú Yọk</exemplarCity>
+ </zone>
+ <zone type="America/Montevideo">
+ <exemplarCity>Mọntẹvidẹo</exemplarCity>
+ </zone>
+ <zone type="Asia/Samarkand">
+ <exemplarCity>Sámákand</exemplarCity>
+ </zone>
+ <zone type="Asia/Tashkent">
+ <exemplarCity>Táshkẹnt</exemplarCity>
+ </zone>
+ <zone type="Europe/Vatican">
+ <exemplarCity>Vátíkan</exemplarCity>
+ </zone>
+ <zone type="America/St_Vincent">
+ <exemplarCity>Sent Vínsẹnt</exemplarCity>
+ </zone>
+ <zone type="America/Caracas">
+ <exemplarCity>Karákas</exemplarCity>
+ </zone>
+ <zone type="America/Tortola">
+ <exemplarCity>Tọtóla</exemplarCity>
+ </zone>
+ <zone type="America/St_Thomas">
+ <exemplarCity>Sent Tọmọs</exemplarCity>
+ </zone>
+ <zone type="Asia/Saigon">
+ <exemplarCity>Hó Chi Mín Síti</exemplarCity>
+ </zone>
+ <zone type="Pacific/Efate">
+ <exemplarCity>Ẹfátẹ</exemplarCity>
+ </zone>
+ <zone type="Pacific/Wallis">
+ <exemplarCity>Wáli</exemplarCity>
+ </zone>
+ <zone type="Pacific/Apia">
+ <exemplarCity>Ápia</exemplarCity>
+ </zone>
+ <zone type="Asia/Aden">
+ <exemplarCity>Édẹn</exemplarCity>
+ </zone>
+ <zone type="Indian/Mayotte">
+ <exemplarCity>Meyọt</exemplarCity>
+ </zone>
+ <zone type="Africa/Johannesburg">
+ <exemplarCity>Johánísbọg</exemplarCity>
+ </zone>
+ <zone type="Africa/Lusaka">
+ <exemplarCity>Lusáka</exemplarCity>
+ </zone>
+ <zone type="Africa/Harare">
+ <exemplarCity>Harárẹ</exemplarCity>
+ </zone>
+ <metazone type="Afghanistan">
+ <long>
+ <standard>Afgánístan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Africa_Central">
+ <long>
+ <standard>Mídúl Áfríká Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Africa_Eastern">
+ <long>
+ <standard>Íst Áfríká Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Africa_Southern">
+ <long>
+ <standard>Saút Áfríká Fíksd Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Africa_Western">
+ <long>
+ <generic>Wẹ́st Áfríká Taim</generic>
+ <standard>Wẹ́st Áfríká Fíksd Taim</standard>
+ <daylight>Wẹ́st Áfríká Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Alaska">
+ <long>
+ <generic>Aláská Taim</generic>
+ <standard>Aláská Fíksd Taim</standard>
+ <daylight>Aláská Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Amazon">
+ <long>
+ <generic>Ámázọn Taim</generic>
+ <standard>Ámázọn Fíksd Taim</standard>
+ <daylight>Ámázọn Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Central">
+ <long>
+ <generic>Nọ́t Amẹ́ríká Mídúl Ériá Taim</generic>
+ <standard>Nọ́t Amẹ́ríká Mídúl Ériá Fíksd Taim</standard>
+ <daylight>Nọ́t Amẹ́ríká Mídúl Ériá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>Nọ́t Amẹ́ríká Ístán Ériá Taim</generic>
+ <standard>Nọ́t Amẹ́ríká Ístán Ériá Fíksd Taim</standard>
+ <daylight>Nọ́t Amẹ́ríká Ístán Ériá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>Nọ́t Amẹ́ríká Maúntin Ériá Taim</generic>
+ <standard>Nọ́t Amẹ́ríká Maúntin Ériá Fíksd Taim</standard>
+ <daylight>Nọ́t Amẹ́ríká Maúntin Ériá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>Nọ́t Amẹ́ríká Pasífík Ériá Taim</generic>
+ <standard>Nọ́t Amẹ́ríká Pasífík Ériá Fíksd Taim</standard>
+ <daylight>Nọ́t Amẹ́ríká Pasífík Ériá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Apia">
+ <long>
+ <generic>Ápia Taim</generic>
+ <standard>Ápia Fíksd Taim</standard>
+ <daylight>Ápia Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Arabian">
+ <long>
+ <generic>Arébiá Taim</generic>
+ <standard>Arébiá Fíksd Taim</standard>
+ <daylight>Arébiá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Argentina">
+ <long>
+ <generic>Ajẹntína Taim</generic>
+ <standard>Ajẹntína Fíksd Taim</standard>
+ <daylight>Ajẹntína Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Argentina_Western">
+ <long>
+ <generic>Wẹ́stán Ajẹntína Taim</generic>
+ <standard>Wẹ́stán Ajẹntína Fíksd Taim</standard>
+ <daylight>Wẹ́stán Ajẹntína Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Armenia">
+ <long>
+ <generic>Armẹ́nia Taim</generic>
+ <standard>Armẹ́nia Fíksd Taim</standard>
+ <daylight>Armẹ́nia Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>Atlántík Taim</generic>
+ <standard>Atlántík Fíksd Taim</standard>
+ <daylight>Atlántík Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Australia_Central">
+ <long>
+ <generic>Mídúl Ọstrélia Taim</generic>
+ <standard>Ọstrélia Mídúl Fíksd Taim</standard>
+ <daylight>Ọstrélia Mídúl Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Australia_CentralWestern">
+ <long>
+ <generic>Ọstrélia Mídúl Wẹ́stán Taim</generic>
+ <standard>Ọstrélia Mídúl Wẹ́stán Fíksd Taim</standard>
+ <daylight>Ọstrélia Mídúl Wẹ́stán Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Australia_Eastern">
+ <long>
+ <generic>Ístán Ọstrélia Taim</generic>
+ <standard>Ọstrélia Ístán Fíksd Taim</standard>
+ <daylight>Ọstrélia Ístán Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Australia_Western">
+ <long>
+ <generic>Wẹ́stán Ọstrélia Taim</generic>
+ <standard>Ọstrélia Wẹ́stán Fíksd Taim</standard>
+ <daylight>Ọstrélia Wẹ́stán Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Azerbaijan">
+ <long>
+ <generic>Azẹrbaijan Taim</generic>
+ <standard>Azẹrbaijan Fíksd Taim</standard>
+ <daylight>Azẹrbaijan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Azores">
+ <long>
+ <generic>Azọz Taim</generic>
+ <standard>Azọz Fíksd Taim</standard>
+ <daylight>Azọz Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Bangladesh">
+ <long>
+ <generic>Bangladẹsh Taim</generic>
+ <standard>Bangladẹsh Fíksd Taim</standard>
+ <daylight>Bangladẹsh Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Bhutan">
+ <long>
+ <standard>Butan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Bolivia">
+ <long>
+ <standard>Bolívia Fíksd Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Brasilia">
+ <long>
+ <generic>Brasília Taim</generic>
+ <standard>Brasília Fíksd Taim</standard>
+ <daylight>Brasília Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Brunei">
+ <long>
+ <standard>Brunẹi Darúsalam Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Cape_Verde">
+ <long>
+ <generic>Kep Vẹ́d Taim</generic>
+ <standard>Kep Vẹ́d Fíksd Taim</standard>
+ <daylight>Kep Vẹ́d Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Chamorro">
+ <long>
+ <standard>Chamóro Fíksd Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Chatham">
+ <long>
+ <generic>Chátam Taim</generic>
+ <standard>Chátam Fíksd Taim</standard>
+ <daylight>Chátam Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Chile">
+ <long>
+ <generic>Chílẹ Taim</generic>
+ <standard>Chílẹ Fíksd Taim</standard>
+ <daylight>Chílẹ Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="China">
+ <long>
+ <generic>Chaína Taim</generic>
+ <standard>Chaína Fíksd Taim</standard>
+ <daylight>Chaína Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Choibalsan">
+ <long>
+ <generic>Choibálsan Taim</generic>
+ <standard>Choibálsan Fíksd Taim</standard>
+ <daylight>Choibálsan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Christmas">
+ <long>
+ <standard>Krísmás Aíland Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Cocos">
+ <long>
+ <standard>Kókós Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Colombia">
+ <long>
+ <generic>Kolómbia Taim</generic>
+ <standard>Kolómbia Fíksd Taim</standard>
+ <daylight>Kolómbia Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Cook">
+ <long>
+ <generic>Kúk Aílands Taim</generic>
+ <standard>Kúk Aílands Fíksd Taim</standard>
+ <daylight>Kúk Aílands Haf Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Cuba">
+ <long>
+ <generic>Kúba Taim</generic>
+ <standard>Kúba Fíksd Taim</standard>
+ <daylight>Kúba Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Davis">
+ <long>
+ <standard>Dévis Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="DumontDUrville">
+ <long>
+ <standard>Diúmọ́n-d’Uvil Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="East_Timor">
+ <long>
+ <standard>Íst Tímọ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Easter">
+ <long>
+ <generic>Ísta Taim</generic>
+ <standard>Ísta Fíksd Taim</standard>
+ <daylight>Ísta Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Ecuador">
+ <long>
+ <standard>Ẹ́kwuádọ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>Mídúl Yúrop Taim</generic>
+ <standard>Mídúl Yúrop Fíksd Taim</standard>
+ <daylight>Mídúl Yúrop Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>Ístán Yúrop Taim</generic>
+ <standard>Ístán Yúrop Fíksd Taim</standard>
+ <daylight>Ístán Yúrop Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Further_Eastern">
+ <long>
+ <standard>Faá-Ístán Yúrop Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>Wẹ́stán Yúrop Taim</generic>
+ <standard>Wẹ́stán Yúrop Fíksd Taim</standard>
+ <daylight>Wẹ́stán Yúrop Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Falkland">
+ <long>
+ <generic>Fọ́lkland Taim</generic>
+ <standard>Fọ́lkland Fíksd Taim</standard>
+ <daylight>Fọ́lkland Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Fiji">
+ <long>
+ <generic>Fíji Taim</generic>
+ <standard>Fíji Fíksd Taim</standard>
+ <daylight>Fíji Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="French_Guiana">
+ <long>
+ <standard>Frẹ́nch Giána Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="French_Southern">
+ <long>
+ <standard>Frẹ́nch Saútan an Antátík Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Galapagos">
+ <long>
+ <standard>Galápágọs Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Gambier">
+ <long>
+ <standard>Gámbiẹr Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Georgia">
+ <long>
+ <generic>Jọ́jia Taim</generic>
+ <standard>Jọ́jia Fíksd Taim</standard>
+ <daylight>Jọ́jia Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Gilbert_Islands">
+ <long>
+ <standard>Gílbat Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>Grínwích Mín Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Greenland_Eastern">
+ <long>
+ <generic>Íist Grínlánd Taim</generic>
+ <standard>Íist Grínlánd Fíksd Taim</standard>
+ <daylight>Íist Grínlánd Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Greenland_Western">
+ <long>
+ <generic>Wẹ́st Grínlánd Taim</generic>
+ <standard>Wẹ́st Grínlánd Fíksd Taim</standard>
+ <daylight>Wẹ́st Grínlánd Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Gulf">
+ <long>
+ <standard>Gọ́lf Fíksd Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Guyana">
+ <long>
+ <standard>Gayána Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Hawaii_Aleutian">
+ <long>
+ <generic>Hawaií-Elúshián Taim</generic>
+ <standard>Hawaií-Elúshián Fíksd Taim</standard>
+ <daylight>Hawaií-Elúshián Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Hong_Kong">
+ <long>
+ <generic>Họng Kọng Taim</generic>
+ <standard>Họng Kọng Fíksd Taim</standard>
+ <daylight>Họng Kọng Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Hovd">
+ <long>
+ <generic>Hovd Taim</generic>
+ <standard>Hovd Fíksd Taim</standard>
+ <daylight>Hovd Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="India">
+ <long>
+ <standard>Índia Fíksd Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Indian_Ocean">
+ <long>
+ <standard>Índián Óshẹ́n Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Indochina">
+ <long>
+ <standard>Indochaína Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Indonesia_Central">
+ <long>
+ <standard>Mídúl Indonẹ́shia Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Indonesia_Eastern">
+ <long>
+ <standard>Ístán Indonẹ́shia Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Indonesia_Western">
+ <long>
+ <standard>Wẹ́stán Indonẹ́shia Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Iran">
+ <long>
+ <generic>Iran Taim</generic>
+ <standard>Iran Fíksd Taim</standard>
+ <daylight>Iran Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Irkutsk">
+ <long>
+ <generic>Irkútsk Taim</generic>
+ <standard>Irkútsk Fíksd Taim</standard>
+ <daylight>Irkútsk Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Israel">
+ <long>
+ <generic>Ízrẹl Taim</generic>
+ <standard>Ízrẹl Fíksd Taim</standard>
+ <daylight>Ízrẹl Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Japan">
+ <long>
+ <generic>Japan Taim</generic>
+ <standard>Japan Fíksd Taim</standard>
+ <daylight>Japan Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Kazakhstan_Eastern">
+ <long>
+ <standard>Íst Kazékstan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Kazakhstan_Western">
+ <long>
+ <standard>Wẹ́st Kazékstan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Korea">
+ <long>
+ <generic>Koria Taim</generic>
+ <standard>Koria Fíksd Taim</standard>
+ <daylight>Koria Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Kosrae">
+ <long>
+ <standard>Kọ́sraẹ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Krasnoyarsk">
+ <long>
+ <generic>Krasnoyask Taim</generic>
+ <standard>Krasnoyask Fíksd Taim</standard>
+ <daylight>Krasnoyask Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Kyrgystan">
+ <long>
+ <standard>Kẹgistan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Line_Islands">
+ <long>
+ <standard>Laín Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Lord_Howe">
+ <long>
+ <generic>Lọd Haú Taim</generic>
+ <standard>Lọd Haú Fíksd Taim</standard>
+ <daylight>Lọd Haú Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Macquarie">
+ <long>
+ <standard>Makwuéí Aíland Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Magadan">
+ <long>
+ <generic>Mágádan Taim</generic>
+ <standard>Mágádan Fíksd Taim</standard>
+ <daylight>Mágádan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Malaysia">
+ <long>
+ <standard>Maléshia Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Maldives">
+ <long>
+ <standard>Mọ́divs Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Marquesas">
+ <long>
+ <standard>Makwẹ́sas Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Marshall_Islands">
+ <long>
+ <standard>Máshal Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Mauritius">
+ <long>
+ <generic>Mọríshọs Taim</generic>
+ <standard>Mọríshọs Fíksd Taim</standard>
+ <daylight>Mọríshọs Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Mawson">
+ <long>
+ <standard>Mọ́sọn Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Mexico_Northwest">
+ <long>
+ <generic>Nọ́twẹ́st Mẹ́ksíko Taim</generic>
+ <standard>Nọ́twẹ́st Mẹ́ksíko Fíksd Taim</standard>
+ <daylight>Nọ́twẹ́st Mẹ́ksíko Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Mexico_Pacific">
+ <long>
+ <generic>Mẹ́ksíkó Pasífík Taim</generic>
+ <standard>Mẹ́ksíkó Pasífík Fíksd Taim</standard>
+ <daylight>Mẹ́ksíkó Pasífík Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Mongolia">
+ <long>
+ <generic>Mọngólia Taim</generic>
+ <standard>Mọngólia Fíksd Taim</standard>
+ <daylight>Mọngólia Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Moscow">
+ <long>
+ <generic>Mọ́sko Taim</generic>
+ <standard>Mọ́sko Fíksd Taim</standard>
+ <daylight>Mọ́sko Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Myanmar">
+ <long>
+ <standard>Miánma Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Nauru">
+ <long>
+ <standard>Naúru Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Nepal">
+ <long>
+ <standard>Nẹpọl Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="New_Caledonia">
+ <long>
+ <generic>Niú Kalẹdónia Taim</generic>
+ <standard>Niú Kalẹdónia Fíksd Taim</standard>
+ <daylight>Niú Kalẹdónia Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="New_Zealand">
+ <long>
+ <generic>Niú Ziland Taim</generic>
+ <standard>Niú Ziland Fíksd Taim</standard>
+ <daylight>Niú Ziland Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Newfoundland">
+ <long>
+ <generic>Niúfaúndlánd Taim</generic>
+ <standard>Niúfaúndlánd Fíksd Taim</standard>
+ <daylight>Niúfaúndlánd Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Niue">
+ <long>
+ <standard>Niúẹ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Norfolk">
+ <long>
+ <generic draft="contributed">Nọ́rfọ́lk Aíland Taim</generic>
+ <standard draft="contributed">Nọ́rfọ́lk Aíland Fíksd Taim</standard>
+ <daylight draft="contributed">Nọ́rfọ́lk Aíland Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Noronha">
+ <long>
+ <generic>Fẹrnándó di Nọrónia Taim</generic>
+ <standard>Fẹrnándó di Nọrónia Fíksd Taim</standard>
+ <daylight>Fẹrnándó di Nọrónia Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Novosibirsk">
+ <long>
+ <generic>Novosibisk Taim</generic>
+ <standard>Novosibisk Fíksd Taim</standard>
+ <daylight>Novosibisk Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Omsk">
+ <long>
+ <generic>Ọmsk Taim</generic>
+ <standard>Ọmsk Fíksd Taim</standard>
+ <daylight>Ọmsk Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Pakistan">
+ <long>
+ <generic>Pákístan Taim</generic>
+ <standard>Pákístan Fíksd Taim</standard>
+ <daylight>Pákístan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Palau">
+ <long>
+ <standard>Paláu Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Papua_New_Guinea">
+ <long>
+ <standard>Pápuá Niú Gíni Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Paraguay">
+ <long>
+ <generic>Párágwue Taim</generic>
+ <standard>Párágwue Fíksd Taim</standard>
+ <daylight>Párágwue Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Peru">
+ <long>
+ <generic>Pẹru Taim</generic>
+ <standard>Pẹru Fíksd Taim</standard>
+ <daylight>Pẹru Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Philippines">
+ <long>
+ <generic>Fílípin Taim</generic>
+ <standard>Fílípin Fíksd Taim</standard>
+ <daylight>Fílípin Họt Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Phoenix_Islands">
+ <long>
+ <standard>Fíniks Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Pierre_Miquelon">
+ <long>
+ <generic>Sent Piẹr & Míkẹlọn Taim</generic>
+ <standard>Sent Piẹr an Míkẹlọn Fíksd Taim</standard>
+ <daylight>Sent Piẹr an Míkẹlọn Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Pitcairn">
+ <long>
+ <standard>Pítkan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Ponape">
+ <long>
+ <standard>Pónápẹ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Pyongyang">
+ <long>
+ <standard>Piọngyang Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Reunion">
+ <long>
+ <standard>Riyúniọn Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Rothera">
+ <long>
+ <standard>Rotẹ́ra Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Sakhalin">
+ <long>
+ <generic>Sákhalin Taim</generic>
+ <standard>Sákhalin Fíksd Taim</standard>
+ <daylight>Sákhalin Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Samoa">
+ <long>
+ <generic>Sámoá Taim</generic>
+ <standard>Sámoá Fíksd Taim</standard>
+ <daylight>Sámoá Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Seychelles">
+ <long>
+ <standard>Sẹ́chẹls Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Singapore">
+ <long>
+ <standard>Singapọ Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Solomon">
+ <long>
+ <standard>Sólómọ́n Aílands Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="South_Georgia">
+ <long>
+ <standard>Saút Jọ́jia Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Suriname">
+ <long>
+ <standard>Súrínam Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Syowa">
+ <long>
+ <standard>Siówa Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Tahiti">
+ <long>
+ <standard>Tahíti Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Taipei">
+ <long>
+ <generic>Taipẹi Taim</generic>
+ <standard>Taipẹi Fíksd Taim</standard>
+ <daylight>Taipẹi Délaít Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Tajikistan">
+ <long>
+ <standard>Tajíkistan Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Tokelau">
+ <long>
+ <standard>Tokẹláu Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Tonga">
+ <long>
+ <generic>Tọ́nga Taim</generic>
+ <standard>Tọ́nga Fíksd Taim</standard>
+ <daylight>Tọ́nga Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Truk">
+ <long>
+ <standard>Chuk Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Turkmenistan">
+ <long>
+ <generic>Tọkmẹnistan Taim</generic>
+ <standard>Tọkmẹnistan Fíksd Taim</standard>
+ <daylight>Tọkmẹnistan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Tuvalu">
+ <long>
+ <standard>Tuválu Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Uruguay">
+ <long>
+ <generic>Yúrugwue Taim</generic>
+ <standard>Yúrugwue Fíksd Taim</standard>
+ <daylight>Yúrugwue Họ́t Sízín Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Uzbekistan">
+ <long>
+ <generic>Uzbẹkistan Taim</generic>
+ <standard>Uzbẹkistan Fíksd Taim</standard>
+ <daylight>Uzbẹkistan Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Vanuatu">
+ <long>
+ <generic>Vanuátu Taim</generic>
+ <standard>Vanuátu Fíksd Taim</standard>
+ <daylight>Vanuátu Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Venezuela">
+ <long>
+ <standard>Vẹnẹzuẹ́la Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Vladivostok">
+ <long>
+ <generic>Vladivọstọk Taim</generic>
+ <standard>Vladivọstọk Fíksd Taim</standard>
+ <daylight>Vladivostok Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Volgograd">
+ <long>
+ <generic>Volvógrad Taim</generic>
+ <standard>Volvógrad Fíksd Taim</standard>
+ <daylight>Volvógrad Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Vostok">
+ <long>
+ <standard>Vọ́stọk Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Wake">
+ <long>
+ <standard>Wék Aíland Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Wallis">
+ <long>
+ <standard>Wális an Fútúna Taim</standard>
+ </long>
+ </metazone>
+ <metazone type="Yakutsk">
+ <long>
+ <generic>Yékútsk Taim</generic>
+ <standard>Yékútsk Fíksd Taim</standard>
+ <daylight>Yékútsk Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ <metazone type="Yekaterinburg">
+ <long>
+ <generic>Yẹketẹrínbug Taim</generic>
+ <standard>Yẹketẹrínbug Fíksd Taim</standard>
+ <daylight>Yẹketẹrínbug Họ́t Sízin Taim</daylight>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">latn</native>
+ </otherNumberingSystems>
+ <minimumGroupingDigits draft="contributed">↑↑↑</minimumGroupingDigits>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+ <list draft="unconfirmed">;</list>
+ <percentSign>%</percentSign>
+ <plusSign>+</plusSign>
+ <minusSign>-</minusSign>
+ <exponential>E</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>‰</perMille>
+ <infinity>∞</infinity>
+ <nan>NaN</nan>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>#,##0.###</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ <decimalFormatLength type="long">
+ <decimalFormat>
+ <pattern type="1000" count="one">0 Taúzan</pattern>
+ <pattern type="1000" count="other">0 Taúzan</pattern>
+ <pattern type="10000" count="one">00 Taúzan</pattern>
+ <pattern type="10000" count="other">00 Taúzan</pattern>
+ <pattern type="100000" count="one">000 Taúzan</pattern>
+ <pattern type="100000" count="other">000 Taúzan</pattern>
+ <pattern type="1000000" count="one">0 Míliọn</pattern>
+ <pattern type="1000000" count="other">0 Míliọn</pattern>
+ <pattern type="10000000" count="one">00 Míliọn</pattern>
+ <pattern type="10000000" count="other">00 Míliọn</pattern>
+ <pattern type="100000000" count="one">000 Míliọn</pattern>
+ <pattern type="100000000" count="other">000 Míliọn</pattern>
+ <pattern type="1000000000" count="one">0 Bíliọn</pattern>
+ <pattern type="1000000000" count="other">0 Bíliọn</pattern>
+ <pattern type="10000000000" count="one">00 Bíliọn</pattern>
+ <pattern type="10000000000" count="other">00 Bíliọn</pattern>
+ <pattern type="100000000000" count="one">000 Bíliọn</pattern>
+ <pattern type="100000000000" count="other">000 Bíliọn</pattern>
+ <pattern type="1000000000000" count="one">0 Tríliọn</pattern>
+ <pattern type="1000000000000" count="other">0 Tríliọn</pattern>
+ <pattern type="10000000000000" count="one">00 Tríliọn</pattern>
+ <pattern type="10000000000000" count="other">00 Tríliọn</pattern>
+ <pattern type="100000000000000" count="one">000 Tríliọn</pattern>
+ <pattern type="100000000000000" count="other">000 Tríliọn</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ <decimalFormatLength type="short">
+ <decimalFormat>
+ <pattern type="1000" count="one">0K</pattern>
+ <pattern type="1000" count="other">0K</pattern>
+ <pattern type="10000" count="one">00K</pattern>
+ <pattern type="10000" count="other">00K</pattern>
+ <pattern type="100000" count="one">000K</pattern>
+ <pattern type="100000" count="other">000K</pattern>
+ <pattern type="1000000" count="one">0M</pattern>
+ <pattern type="1000000" count="other">0M</pattern>
+ <pattern type="10000000" count="one">00M</pattern>
+ <pattern type="10000000" count="other">00M</pattern>
+ <pattern type="100000000" count="one">000M</pattern>
+ <pattern type="100000000" count="other">000M</pattern>
+ <pattern type="1000000000" count="one">0B</pattern>
+ <pattern type="1000000000" count="other">0B</pattern>
+ <pattern type="10000000000" count="one">00B</pattern>
+ <pattern type="10000000000" count="other">00B</pattern>
+ <pattern type="100000000000" count="one">000B</pattern>
+ <pattern type="100000000000" count="other">000B</pattern>
+ <pattern type="1000000000000" count="one">0T</pattern>
+ <pattern type="1000000000000" count="other">0T</pattern>
+ <pattern type="10000000000000" count="one">00T</pattern>
+ <pattern type="10000000000000" count="other">00T</pattern>
+ <pattern type="100000000000000" count="one">000T</pattern>
+ <pattern type="100000000000000" count="other">000T</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>#E0</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>#,##0%</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>¤#,##0.00</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>¤#,##0.00</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <currencyFormatLength type="short">
+ <currencyFormat type="standard">
+ <pattern type="1000" count="one">¤0K</pattern>
+ <pattern type="1000" count="other">¤0K</pattern>
+ <pattern type="10000" count="one">¤00K</pattern>
+ <pattern type="10000" count="other">¤00K</pattern>
+ <pattern type="100000" count="one">¤000K</pattern>
+ <pattern type="100000" count="other">¤000K</pattern>
+ <pattern type="1000000" count="one">¤0M</pattern>
+ <pattern type="1000000" count="other">¤0M</pattern>
+ <pattern type="10000000" count="one">¤00M</pattern>
+ <pattern type="10000000" count="other">¤00M</pattern>
+ <pattern type="100000000" count="one">¤000M</pattern>
+ <pattern type="100000000" count="other">¤000M</pattern>
+ <pattern type="1000000000" count="one">¤0B</pattern>
+ <pattern type="1000000000" count="other">¤0B</pattern>
+ <pattern type="10000000000" count="one">¤00B</pattern>
+ <pattern type="10000000000" count="other">¤00B</pattern>
+ <pattern type="100000000000" count="one">¤000B</pattern>
+ <pattern type="100000000000" count="other">¤000B</pattern>
+ <pattern type="1000000000000" count="one">¤0T</pattern>
+ <pattern type="1000000000000" count="other">¤0T</pattern>
+ <pattern type="10000000000000" count="one">¤00T</pattern>
+ <pattern type="10000000000000" count="other">¤00T</pattern>
+ <pattern type="100000000000000" count="one">¤000T</pattern>
+ <pattern type="100000000000000" count="other">¤000T</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">{0} {1}</unitPattern>
+ <unitPattern count="other">{0} {1}</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="AED">
+ <displayName>Yunaítẹ́d Áráb Ẹ́míréts Dírham</displayName>
+ <displayName count="one">Yunaítẹ́d Áráb Ẹ́míréts dírham</displayName>
+ <displayName count="other">Yunaítẹ́d Áráb Ẹ́míréts dírhams</displayName>
+ <symbol draft="contributed">AED</symbol>
+ </currency>
+ <currency type="AFN">
+ <displayName>Afgán Afgáni</displayName>
+ <displayName count="one">Afgán afgáni</displayName>
+ <displayName count="other">Afgán afgánis</displayName>
+ <symbol draft="contributed">AFN</symbol>
+ </currency>
+ <currency type="ALL">
+ <displayName>Albéniá Lẹk</displayName>
+ <displayName count="one">Albéniá Lẹk</displayName>
+ <displayName count="other">Albéniá Lẹk</displayName>
+ <symbol draft="contributed">ALL</symbol>
+ </currency>
+ <currency type="AMD">
+ <displayName>Armẹ́niá Dram</displayName>
+ <displayName count="one">Armẹ́nia ́dram</displayName>
+ <displayName count="other">Armẹ́niá drams</displayName>
+ <symbol draft="contributed">AMD</symbol>
+ </currency>
+ <currency type="ANG">
+ <displayName>Nẹ́dalánds Antílián Gílda</displayName>
+ <displayName count="one">Nẹ́dalánds Antílián Gílda</displayName>
+ <displayName count="other">Nẹ́dalánds Antílián Gílda</displayName>
+ <symbol draft="contributed">ANG</symbol>
+ </currency>
+ <currency type="AOA">
+ <displayName>Angólá Kwánza</displayName>
+ <displayName count="one">Angólá kwánza</displayName>
+ <displayName count="other">Angólá kwánzas</displayName>
+ <symbol draft="contributed">AOA</symbol>
+ <symbol alt="narrow" draft="contributed">Kz</symbol>
+ </currency>
+ <currency type="ARS">
+ <displayName>Ajẹntína Pẹ́so</displayName>
+ <displayName count="one">Ajẹntína Pẹ́so</displayName>
+ <displayName count="other">Ajẹntína Pẹ́so</displayName>
+ <symbol draft="contributed">ARS</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="AUD">
+ <displayName>Ọstréliá Dọ́la</displayName>
+ <displayName count="one">Ọstréliá dọ́la</displayName>
+ <displayName count="other">Ọstréliá dọ́las</displayName>
+ <symbol draft="contributed">A$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="AWG">
+ <displayName>Arúba Flọ́rin</displayName>
+ <displayName count="one">Arúba Flọ́rin</displayName>
+ <displayName count="other">Arúba Flọ́rin</displayName>
+ <symbol draft="contributed">AWG</symbol>
+ </currency>
+ <currency type="AZN">
+ <displayName>Azẹrbaiján Mánat</displayName>
+ <displayName count="one">Azẹrbaiján mánat</displayName>
+ <displayName count="other">Azẹrbaiján mánats</displayName>
+ <symbol draft="contributed">AZN</symbol>
+ </currency>
+ <currency type="BAM">
+ <displayName>Bọ́sniá an Hẹzẹgovína Mak Wé Pẹ́sin Fít Chenj</displayName>
+ <displayName count="one">Bọ́sniá an Hẹzẹgovína Mak Wé Pẹ́sin Fít Chenj</displayName>
+ <displayName count="other">Bọ́sniá an Hẹzẹgovína Mak Wé Pẹ́sin Fít Chenj</displayName>
+ <symbol draft="contributed">BAM</symbol>
+ <symbol alt="narrow" draft="contributed">KM</symbol>
+ </currency>
+ <currency type="BBD">
+ <displayName>Barbédọs Dọ́la</displayName>
+ <displayName count="one">Barbédọs Dọ́la</displayName>
+ <displayName count="other">Barbédọs Dọ́la</displayName>
+ <symbol draft="contributed">BBD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="BDT">
+ <displayName>Bangladẹ́sh Táka</displayName>
+ <displayName count="one">Bangladẹ́sh táka</displayName>
+ <displayName count="other">Bangladẹ́sh táka</displayName>
+ <symbol draft="contributed">BDT</symbol>
+ <symbol alt="narrow" draft="contributed">৳</symbol>
+ </currency>
+ <currency type="BGN">
+ <displayName>Bọlgériá Lẹv</displayName>
+ <displayName count="one">Bọlgériá Lẹv</displayName>
+ <displayName count="other">Bọlgériá Lẹv</displayName>
+ <symbol draft="contributed">BGN</symbol>
+ </currency>
+ <currency type="BHD">
+ <displayName>Baréin Dínar</displayName>
+ <displayName count="one">Baréin dínar</displayName>
+ <displayName count="other">Baréin dínars</displayName>
+ <symbol draft="contributed">BHD</symbol>
+ </currency>
+ <currency type="BIF">
+ <displayName>Burúndí Frank</displayName>
+ <displayName count="one">Burúndí frank</displayName>
+ <displayName count="other">Burúndí franks</displayName>
+ <symbol draft="contributed">BIF</symbol>
+ </currency>
+ <currency type="BMD">
+ <displayName>Bẹmiúda Dọ́la</displayName>
+ <displayName count="one">Bẹmiúda Dọ́la</displayName>
+ <displayName count="other">Bẹmiúda Dọ́la</displayName>
+ <symbol draft="contributed">BMD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="BND">
+ <displayName>Brunẹí Dọ́la</displayName>
+ <displayName count="one">Brunẹí dọ́la</displayName>
+ <displayName count="other">Brunẹí dọ́las</displayName>
+ <symbol draft="contributed">BND</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="BOB">
+ <displayName>Bolíviá Boliviáno</displayName>
+ <displayName count="one">Bolíviá Boliviáno</displayName>
+ <displayName count="other">Bolíviá Boliviáno</displayName>
+ <symbol draft="contributed">BOB</symbol>
+ <symbol alt="narrow" draft="contributed">Bs</symbol>
+ </currency>
+ <currency type="BRL">
+ <displayName>Brazíl Rẹal</displayName>
+ <displayName count="one">Brazíl Rẹal</displayName>
+ <displayName count="other">Brazíl Rẹal</displayName>
+ <symbol draft="contributed">R$</symbol>
+ <symbol alt="narrow" draft="contributed">R$</symbol>
+ </currency>
+ <currency type="BSD">
+ <displayName>Bahámas Dọ́la</displayName>
+ <displayName count="one">Bahámas Dọ́la</displayName>
+ <displayName count="other">Bahámas Dọ́la</displayName>
+ <symbol draft="contributed">BSD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="BTN">
+ <displayName>Bután Ngúltrum</displayName>
+ <displayName count="one">Bután ngúltrum</displayName>
+ <displayName count="other">Bután ngúltrums</displayName>
+ <symbol draft="contributed">BTN</symbol>
+ </currency>
+ <currency type="BWP">
+ <displayName>Botswáná Púla</displayName>
+ <displayName count="one">Botswáná púla</displayName>
+ <displayName count="other">Botswáná púlas</displayName>
+ <symbol draft="contributed">BWP</symbol>
+ <symbol alt="narrow" draft="contributed">P</symbol>
+ </currency>
+ <currency type="BYN">
+ <displayName>Bẹlarús Rúbul</displayName>
+ <displayName count="one">Bẹlarús Rúbul</displayName>
+ <displayName count="other">Bẹlarús Rúbul</displayName>
+ <symbol draft="contributed">BYN</symbol>
+ <symbol alt="narrow" draft="contributed">p.</symbol>
+ </currency>
+ <currency type="BZD">
+ <displayName>Bẹliz Dọ́la</displayName>
+ <displayName count="one">Bẹliz Dọ́la</displayName>
+ <displayName count="other">Bẹliz Dọ́la</displayName>
+ <symbol draft="contributed">BZD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CAD">
+ <displayName>Kánádá Dọ́la</displayName>
+ <displayName count="one">Kánádá Dọ́la</displayName>
+ <displayName count="other">Kánádá Dọ́la</displayName>
+ <symbol draft="contributed">KA$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CDF">
+ <displayName>Kóngó Frank</displayName>
+ <displayName count="one">Kóngó frank</displayName>
+ <displayName count="other">Kóngó franks</displayName>
+ <symbol draft="contributed">CDF</symbol>
+ </currency>
+ <currency type="CHF">
+ <displayName>Swís Frank</displayName>
+ <displayName count="one">Swís Frank</displayName>
+ <displayName count="other">Swís Frank</displayName>
+ <symbol draft="contributed">CHF</symbol>
+ </currency>
+ <currency type="CLP">
+ <displayName>Chílí Pẹ́so</displayName>
+ <displayName count="one">Chílí Pẹ́so</displayName>
+ <displayName count="other">Chílí Pẹ́so</displayName>
+ <symbol draft="contributed">CLP</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CNH">
+ <displayName>Chaíná Yuan (ples-dẹm aúsaíd chaína)</displayName>
+ <displayName count="one">Chaíná yuan (ples-dẹm aúsaíd chaína)</displayName>
+ <displayName count="other">Chaíná yuans (ples-dẹm aúsaíd chaína)</displayName>
+ <symbol draft="contributed">CNH</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>Chaíná Yuan</displayName>
+ <displayName count="one">Chaíná yuan</displayName>
+ <displayName count="other">Chaíná yuans</displayName>
+ <symbol draft="contributed">CN¥</symbol>
+ <symbol alt="narrow" draft="contributed">¥</symbol>
+ </currency>
+ <currency type="COP">
+ <displayName>Kolómbiá Pẹ́so</displayName>
+ <displayName count="one">Kolómbiá pẹ́so</displayName>
+ <displayName count="other">Kolómbiá pẹ́sos</displayName>
+ <symbol draft="contributed">COP</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CRC">
+ <displayName>Kósta Ríka Kólọn</displayName>
+ <displayName count="one">Kósta Ríka Kólọn</displayName>
+ <displayName count="other">Kósta Ríka Kólọn</displayName>
+ <symbol draft="contributed">CRC</symbol>
+ <symbol alt="narrow" draft="contributed">₡</symbol>
+ </currency>
+ <currency type="CUC">
+ <displayName>Kiúbá Pẹ́so Wé Pẹ́sin Fít Chenj</displayName>
+ <displayName count="one">Kiúbá Pẹ́so Wé Pẹ́sin Fít Chenj</displayName>
+ <displayName count="other">Kiúbá Pẹ́so Wé Pẹ́sin Fít Chenj</displayName>
+ <symbol draft="contributed">CUC</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CUP">
+ <displayName>Kiúbá Pẹ́so</displayName>
+ <displayName count="one">Kiúbá Pẹ́so</displayName>
+ <displayName count="other">Kiúbá Pẹ́so</displayName>
+ <symbol draft="contributed">CUP</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="CVE">
+ <displayName>Kép Vẹ́d Ẹskúdo</displayName>
+ <displayName count="one">Kép Vẹ́d ẹskúdo</displayName>
+ <displayName count="other">Kép Vẹ́d ẹskúdos</displayName>
+ <symbol draft="contributed">CVE</symbol>
+ </currency>
+ <currency type="CZK">
+ <displayName>Chẹ́k Kórúna</displayName>
+ <displayName count="one">Chẹ́k Kórúna</displayName>
+ <displayName count="other">Chẹ́k Kórúna</displayName>
+ <symbol draft="contributed">CZK</symbol>
+ <symbol alt="narrow" draft="contributed">Kč</symbol>
+ </currency>
+ <currency type="DJF">
+ <displayName>Jibútí Frank</displayName>
+ <displayName count="one">Jibútí frank</displayName>
+ <displayName count="other">Jibútí franks</displayName>
+ <symbol draft="contributed">DJF</symbol>
+ </currency>
+ <currency type="DKK">
+ <displayName>Dẹ́nmák Króna</displayName>
+ <displayName count="one">Dẹ́nmák Króna</displayName>
+ <displayName count="other">Dẹ́nmák Króna</displayName>
+ <symbol draft="contributed">DKK</symbol>
+ <symbol alt="narrow" draft="contributed">kr</symbol>
+ </currency>
+ <currency type="DOP">
+ <displayName>Dọmíníkan Pẹ́so</displayName>
+ <displayName count="one">Dọmíníkan Pẹ́so</displayName>
+ <displayName count="other">Dọmíníkan Pẹ́so</displayName>
+ <symbol draft="contributed">DOP</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="DZD">
+ <displayName>Aljíria Dínar</displayName>
+ <displayName count="one">Aljíria Dínar</displayName>
+ <displayName count="other">Aljíria Dínar</displayName>
+ <symbol draft="contributed">DZD</symbol>
+ </currency>
+ <currency type="EGP">
+ <displayName>Íjípt Paund</displayName>
+ <displayName count="one">Íjípt Paund</displayName>
+ <displayName count="other">Íjípt Paund</displayName>
+ <symbol draft="contributed">EGP</symbol>
+ <symbol alt="narrow" draft="contributed">E£</symbol>
+ </currency>
+ <currency type="ERN">
+ <displayName>Ẹritrẹá Nákfa</displayName>
+ <displayName count="one">Ẹritrẹá nákfa</displayName>
+ <displayName count="other">Ẹritrẹá nákfas</displayName>
+ <symbol draft="contributed">ERN</symbol>
+ </currency>
+ <currency type="ETB">
+ <displayName>Ẹtiópiá Berr</displayName>
+ <displayName count="one">Ẹtiópiá berr</displayName>
+ <displayName count="other">Ẹtiópiá berrs</displayName>
+ <symbol draft="contributed">ETB</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>Yúro</displayName>
+ <displayName count="one">eúro</displayName>
+ <displayName count="other">eúros</displayName>
+ <symbol draft="contributed">€</symbol>
+ <symbol alt="narrow" draft="contributed">€</symbol>
+ </currency>
+ <currency type="FJD">
+ <displayName>Fíjí Dọ́la</displayName>
+ <displayName count="one">Fíjí dọ́la</displayName>
+ <displayName count="other">Fíjí dọ́las</displayName>
+ <symbol draft="contributed">FJD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="FKP">
+ <displayName>Fọlkland Aílands Paund</displayName>
+ <displayName count="one">Fọlkland Aílands paund</displayName>
+ <displayName count="other">Fọlkland Aílands paunds</displayName>
+ <symbol draft="contributed">FKP</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>Brítísh Páund</displayName>
+ <displayName count="one">Brítísh Páund</displayName>
+ <displayName count="other">Brítísh Páund</displayName>
+ <symbol draft="contributed">£</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="GEL">
+ <displayName>Jọ́jiá Lári</displayName>
+ <displayName count="one">Jọ́jiá lári</displayName>
+ <displayName count="other">Jọ́jiá láris</displayName>
+ <symbol draft="contributed">GEL</symbol>
+ <symbol alt="narrow" draft="contributed">₾</symbol>
+ </currency>
+ <currency type="GHS">
+ <displayName>Ganá Sídi</displayName>
+ <displayName count="one">Ganá sídi</displayName>
+ <displayName count="other">Ganá sídis</displayName>
+ <symbol draft="contributed">GHS</symbol>
+ </currency>
+ <currency type="GIP">
+ <displayName>Jibrọ́lta Páund</displayName>
+ <displayName count="one">Jibrọ́lta Páund</displayName>
+ <displayName count="other">Jibrọ́lta Páund</displayName>
+ <symbol draft="contributed">GIP</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="GMD">
+ <displayName>Gámbiá Dalási</displayName>
+ <displayName count="one">Gámbiá dalási</displayName>
+ <displayName count="other">Gámbiá dalásis</displayName>
+ <symbol draft="contributed">GMD</symbol>
+ </currency>
+ <currency type="GNF">
+ <displayName>Gíní Frank</displayName>
+ <displayName count="one">Gíní frank</displayName>
+ <displayName count="other">Gíní franks</displayName>
+ <symbol draft="contributed">GNF</symbol>
+ <symbol alt="narrow" draft="contributed">FG</symbol>
+ </currency>
+ <currency type="GTQ">
+ <displayName>Guátẹmála Kwuẹ́tzal</displayName>
+ <displayName count="one">Guátẹmála Kwuẹ́tzal</displayName>
+ <displayName count="other">Guátẹmála Kwuẹ́tzal</displayName>
+ <symbol draft="contributed">GTQ</symbol>
+ <symbol alt="narrow" draft="contributed">Q</symbol>
+ </currency>
+ <currency type="GYD">
+ <displayName>Giyána Dọ́la</displayName>
+ <displayName count="one">Giyána dọ́la</displayName>
+ <displayName count="other">Giyána dọ́las</displayName>
+ <symbol draft="contributed">GYD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="HKD">
+ <displayName>Họng Kọ́ng Dọ́la</displayName>
+ <displayName count="one">Họng Kọ́ng dọ́la</displayName>
+ <displayName count="other">Họng Kọ́ng dọ́las</displayName>
+ <symbol draft="contributed">HK$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="HNL">
+ <displayName>Họndúrán Lẹmpíra</displayName>
+ <displayName count="one">Họndúrán Lẹmpíra</displayName>
+ <displayName count="other">Họndúrán Lẹmpíra</displayName>
+ <symbol draft="contributed">HNL</symbol>
+ <symbol alt="narrow" draft="contributed">L</symbol>
+ </currency>
+ <currency type="HRK">
+ <displayName>Kroéshia Kúna</displayName>
+ <displayName count="one">Kroéshia Kúna</displayName>
+ <displayName count="other">Kroéshia Kúna</displayName>
+ <symbol draft="contributed">HRK</symbol>
+ <symbol alt="narrow" draft="contributed">kn</symbol>
+ </currency>
+ <currency type="HTG">
+ <displayName>Haíti Gourd</displayName>
+ <displayName count="one">Haíti Gourd</displayName>
+ <displayName count="other">Haíti Gourd</displayName>
+ <symbol draft="contributed">HTG</symbol>
+ </currency>
+ <currency type="HUF">
+ <displayName>Họngériá Fọ́rint</displayName>
+ <displayName count="one">Họngériá Fọ́rint</displayName>
+ <displayName count="other">Họngériá Fọ́rint</displayName>
+ <symbol draft="contributed">HUF</symbol>
+ <symbol alt="narrow" draft="contributed">Ft</symbol>
+ </currency>
+ <currency type="IDR">
+ <displayName>Indoníshiá Rupia</displayName>
+ <displayName count="one">Indoníshiá rupia</displayName>
+ <displayName count="other">Indoníshiá rupias</displayName>
+ <symbol draft="contributed">IDR</symbol>
+ <symbol alt="narrow" draft="contributed">Rp</symbol>
+ </currency>
+ <currency type="ILS">
+ <displayName>Ízrẹ́l Niú Shẹ́kẹl</displayName>
+ <displayName count="one">Ízrẹ́l niú shẹ́kẹl</displayName>
+ <displayName count="other">Ízrẹ́l niú shẹ́kẹls</displayName>
+ <symbol draft="contributed">₪</symbol>
+ <symbol alt="narrow" draft="contributed">₪</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>Índiá Rúpi</displayName>
+ <displayName count="one">Índiá rúpi</displayName>
+ <displayName count="other">Índiá rúpis</displayName>
+ <symbol draft="contributed">₹</symbol>
+ <symbol alt="narrow" draft="contributed">₹</symbol>
+ </currency>
+ <currency type="IQD">
+ <displayName>Irák Dínar</displayName>
+ <displayName count="one">Irák dínar</displayName>
+ <displayName count="other">Irák dínars</displayName>
+ <symbol draft="contributed">IQD</symbol>
+ </currency>
+ <currency type="IRR">
+ <displayName>Irán Rial</displayName>
+ <displayName count="one">Irán rial</displayName>
+ <displayName count="other">Irán rials</displayName>
+ <symbol draft="contributed">IRR</symbol>
+ </currency>
+ <currency type="ISK">
+ <displayName>Aíslánd Króna</displayName>
+ <displayName count="one">Aíslánd Króna</displayName>
+ <displayName count="other">Aíslánd Króna</displayName>
+ <symbol draft="contributed">ISK</symbol>
+ <symbol alt="narrow" draft="contributed">kr</symbol>
+ </currency>
+ <currency type="JMD">
+ <displayName>Jamaíka Dọla</displayName>
+ <displayName count="one">Jamaíka Dọla</displayName>
+ <displayName count="other">Jamaíka Dọla</displayName>
+ <symbol draft="contributed">JMD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="JOD">
+ <displayName>Jọ́dán Dínar</displayName>
+ <displayName count="one">Jọ́dán dínar</displayName>
+ <displayName count="other">Jọ́dán dínars</displayName>
+ <symbol draft="contributed">JOD</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>Japán Yẹn</displayName>
+ <displayName count="one">Japán yẹn</displayName>
+ <displayName count="other">Japán yẹns</displayName>
+ <symbol draft="contributed">JP¥</symbol>
+ <symbol alt="narrow" draft="contributed">¥</symbol>
+ </currency>
+ <currency type="KES">
+ <displayName>Kẹ́nyá Shílin</displayName>
+ <displayName count="one">Kẹ́nyá shílin</displayName>
+ <displayName count="other">Kẹ́nyá shílins</displayName>
+ <symbol draft="contributed">KES</symbol>
+ </currency>
+ <currency type="KGS">
+ <displayName>Kẹjístan Som</displayName>
+ <displayName count="one">Kẹjístan som</displayName>
+ <displayName count="other">Kẹjístan soms</displayName>
+ <symbol draft="contributed">KGS</symbol>
+ </currency>
+ <currency type="KHR">
+ <displayName>Kambódiá Riẹl</displayName>
+ <displayName count="one">Kambódiá riẹl</displayName>
+ <displayName count="other">Kambódiá riẹls</displayName>
+ <symbol draft="contributed">KHR</symbol>
+ <symbol alt="narrow" draft="contributed">៛</symbol>
+ </currency>
+ <currency type="KMF">
+ <displayName>Kọ́mọ́ros Frank</displayName>
+ <displayName count="one">Kọ́mọ́ros frank</displayName>
+ <displayName count="other">Kọ́mọ́ros franks</displayName>
+ <symbol draft="contributed">KMF</symbol>
+ <symbol alt="narrow" draft="contributed">CF</symbol>
+ </currency>
+ <currency type="KPW">
+ <displayName>Nọ́t Koriá Wọn</displayName>
+ <displayName count="one">Nọ́t Koriá wọn</displayName>
+ <displayName count="other">Nọ́t Koriá wọns</displayName>
+ <symbol draft="contributed">KPW</symbol>
+ <symbol alt="narrow" draft="contributed">₩</symbol>
+ </currency>
+ <currency type="KRW">
+ <displayName>Saút Koriá Wọn</displayName>
+ <displayName count="one">Saút Koriá wọn</displayName>
+ <displayName count="other">Saút Koriá wọns</displayName>
+ <symbol draft="contributed">₩</symbol>
+ <symbol alt="narrow" draft="contributed">₩</symbol>
+ </currency>
+ <currency type="KWD">
+ <displayName>Kuwét Dínar</displayName>
+ <displayName count="one">Kuwét dínar</displayName>
+ <displayName count="other">Kuwét dínars</displayName>
+ <symbol draft="contributed">KWD</symbol>
+ </currency>
+ <currency type="KYD">
+ <displayName>Kéman Aílands Dọla</displayName>
+ <displayName count="one">Kéman Aílands Dọla</displayName>
+ <displayName count="other">Kéman Aílands Dọla</displayName>
+ <symbol draft="contributed">KYD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="KZT">
+ <displayName>Kazakstan Tẹ́nj</displayName>
+ <displayName count="one">Kazakstan tẹ́nj</displayName>
+ <displayName count="other">Kazakstan tẹ́njs</displayName>
+ <symbol draft="contributed">KZT</symbol>
+ <symbol alt="narrow" draft="contributed">₸</symbol>
+ </currency>
+ <currency type="LAK">
+ <displayName>Laós Kip</displayName>
+ <displayName count="one">Laós kip</displayName>
+ <displayName count="other">Laós kips</displayName>
+ <symbol draft="contributed">LAK</symbol>
+ <symbol alt="narrow" draft="contributed">₭</symbol>
+ </currency>
+ <currency type="LBP">
+ <displayName>Lẹ́bánọ́n Paund</displayName>
+ <displayName count="one">Lẹ́bánọ́n paund</displayName>
+ <displayName count="other">Lẹ́bánọ́n paunds</displayName>
+ <symbol draft="contributed">LBP</symbol>
+ <symbol alt="narrow" draft="contributed">L£</symbol>
+ </currency>
+ <currency type="LKR">
+ <displayName>Sri Lánká Rúpi</displayName>
+ <displayName count="one">Sri Lánká rúpi</displayName>
+ <displayName count="other">Sri Lánká rúpis</displayName>
+ <symbol draft="contributed">LKR</symbol>
+ <symbol alt="narrow" draft="contributed">Rs</symbol>
+ </currency>
+ <currency type="LRD">
+ <displayName>Laibẹ́riá Dọ́la</displayName>
+ <displayName count="one">Laibẹ́riá dọ́la</displayName>
+ <displayName count="other">Laibẹ́riá dọ́las</displayName>
+ <symbol draft="contributed">LRD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="LYD">
+ <displayName>Líbia Dínar</displayName>
+ <displayName count="one">Líbia Dínar</displayName>
+ <displayName count="other">Líbia Dínar</displayName>
+ <symbol draft="contributed">LYD</symbol>
+ </currency>
+ <currency type="MAD">
+ <displayName>Morọko Dírham</displayName>
+ <displayName count="one">Morọko Dírham</displayName>
+ <displayName count="other">Morọko Dírham</displayName>
+ <symbol draft="contributed">MAD</symbol>
+ </currency>
+ <currency type="MDL">
+ <displayName>Mọldóva Lu</displayName>
+ <displayName count="one">Mọldóva Lu</displayName>
+ <displayName count="other">Mọldóva Lu</displayName>
+ <symbol draft="contributed">MDL</symbol>
+ </currency>
+ <currency type="MGA">
+ <displayName>Malagásí Ariári</displayName>
+ <displayName count="one">Malagásí ariári</displayName>
+ <displayName count="other">Malagásí ariáris</displayName>
+ <symbol draft="contributed">MGA</symbol>
+ <symbol alt="narrow" draft="contributed">Ar</symbol>
+ </currency>
+ <currency type="MKD">
+ <displayName>Masẹdónia Dínar</displayName>
+ <displayName count="one">Masẹdónia Dínar</displayName>
+ <displayName count="other">Masẹdónia Dínar</displayName>
+ <symbol draft="contributed">MKD</symbol>
+ </currency>
+ <currency type="MMK">
+ <displayName>Miánmá Kiat</displayName>
+ <displayName count="one">Miánmá kiat</displayName>
+ <displayName count="other">Miánmá kiats</displayName>
+ <symbol draft="contributed">MMK</symbol>
+ <symbol alt="narrow" draft="contributed">K</symbol>
+ </currency>
+ <currency type="MNT">
+ <displayName>Mọngóliá Túgrik</displayName>
+ <displayName count="one">Mọngóliá túgrik</displayName>
+ <displayName count="other">Mọngóliá túgriks</displayName>
+ <symbol draft="contributed">MNT</symbol>
+ <symbol alt="narrow" draft="contributed">₮</symbol>
+ </currency>
+ <currency type="MOP">
+ <displayName>Makáo Pátáka</displayName>
+ <displayName count="one">Makáo pátáka</displayName>
+ <displayName count="other">Makáo pátákas</displayName>
+ <symbol draft="contributed">MOP</symbol>
+ </currency>
+ <currency type="MRU">
+ <displayName>Mọriténiá Uguíya</displayName>
+ <displayName count="one">Mọriténiá uguíya</displayName>
+ <displayName count="other">Mọriténiá uguíyas</displayName>
+ <symbol draft="contributed">MRU</symbol>
+ </currency>
+ <currency type="MUR">
+ <displayName>Mọríshọ́s Rúpi</displayName>
+ <displayName count="one">Mọríshọ́s rúpi</displayName>
+ <displayName count="other">Mọríshọ́s rúpis</displayName>
+ <symbol draft="contributed">MUR</symbol>
+ <symbol alt="narrow" draft="contributed">Rs</symbol>
+ </currency>
+ <currency type="MVR">
+ <displayName>Mọ́ldívs Rúfíya</displayName>
+ <displayName count="one">Mọ́ldívs rúfíya</displayName>
+ <displayName count="other">Mọ́ldívs rúfíyas</displayName>
+ <symbol draft="contributed">MVR</symbol>
+ </currency>
+ <currency type="MWK">
+ <displayName>Maláwi ́Kwácha</displayName>
+ <displayName count="one">Maláwi ́kwácha</displayName>
+ <displayName count="other">Maláwí kwáchas</displayName>
+ <symbol draft="contributed">MWK</symbol>
+ </currency>
+ <currency type="MXN">
+ <displayName>Mẹ́ksíko Pẹ́so</displayName>
+ <displayName count="one">Mẹ́ksíko Pẹ́so</displayName>
+ <displayName count="other">Mẹ́ksíko Pẹ́so</displayName>
+ <symbol draft="contributed">MX$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="MYR">
+ <displayName>Maléshiá Ríngit</displayName>
+ <displayName count="one">Maléshiá ríngit</displayName>
+ <displayName count="other">Maléshiá ríngits</displayName>
+ <symbol draft="contributed">MYR</symbol>
+ <symbol alt="narrow" draft="contributed">RM</symbol>
+ </currency>
+ <currency type="MZN">
+ <displayName>Mozámbík Métíkal</displayName>
+ <displayName count="one">Mozámbík métíkal</displayName>
+ <displayName count="other">Mozámbík métíkals</displayName>
+ <symbol draft="contributed">MZN</symbol>
+ </currency>
+ <currency type="NAD">
+ <displayName>Namíbiá Dọ́la</displayName>
+ <displayName count="one">Namíbiá dọ́la</displayName>
+ <displayName count="other">Namíbiá dọ́las</displayName>
+ <symbol draft="contributed">NAD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="NGN">
+ <displayName>Naijíriá Naíra</displayName>
+ <displayName count="one">Naijíriá naíra</displayName>
+ <displayName count="other">Naijíriá naíras</displayName>
+ <symbol draft="contributed">₦</symbol>
+ <symbol alt="narrow" draft="contributed">₦</symbol>
+ </currency>
+ <currency type="NIO">
+ <displayName>Nikarágwua Kordóba</displayName>
+ <displayName count="one">Nikarágwua Kordóba</displayName>
+ <displayName count="other">Nikarágwua Kordóba</displayName>
+ <symbol draft="contributed">NIO</symbol>
+ <symbol alt="narrow" draft="contributed">C$</symbol>
+ </currency>
+ <currency type="NOK">
+ <displayName>Nọ́wé Króna</displayName>
+ <displayName count="one">Nọ́wé Króna</displayName>
+ <displayName count="other">Nọ́wé Króna</displayName>
+ <symbol draft="contributed">NOK</symbol>
+ <symbol alt="narrow" draft="contributed">kr</symbol>
+ </currency>
+ <currency type="NPR">
+ <displayName>Nẹ́pál Rúpi</displayName>
+ <displayName count="one">Nẹ́pál rúpi</displayName>
+ <displayName count="other">Nẹ́pál rúpis</displayName>
+ <symbol draft="contributed">NPR</symbol>
+ <symbol alt="narrow" draft="contributed">Rs</symbol>
+ </currency>
+ <currency type="NZD">
+ <displayName>Niú Zílánd Dọ́las</displayName>
+ <displayName count="one">Niú Zílánd dọ́la</displayName>
+ <displayName count="other">Niú Zílánd dọ́las</displayName>
+ <symbol draft="contributed">NZ$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="OMR">
+ <displayName>Omán Rial</displayName>
+ <displayName count="one">Omán rial</displayName>
+ <displayName count="other">Omán rials</displayName>
+ <symbol draft="contributed">OMR</symbol>
+ </currency>
+ <currency type="PAB">
+ <displayName>Pánáma Balbóa</displayName>
+ <displayName count="one">Pánáma Balbóa</displayName>
+ <displayName count="other">Pánáma Balbóa</displayName>
+ <symbol draft="contributed">PAB</symbol>
+ </currency>
+ <currency type="PEN">
+ <displayName>Pẹrúvián Sol</displayName>
+ <displayName count="one">Pẹrúvián Sol</displayName>
+ <displayName count="other">Pẹrúvián Sol</displayName>
+ <symbol draft="contributed">PEN</symbol>
+ </currency>
+ <currency type="PGK">
+ <displayName>Pápuá Niú Gíni Kína</displayName>
+ <displayName count="one">Pápuá Niú Gíni kína</displayName>
+ <displayName count="other">Pápuá Niú Gíni kínas</displayName>
+ <symbol draft="contributed">PGK</symbol>
+ </currency>
+ <currency type="PHP">
+ <displayName>Fílípíns Píso</displayName>
+ <displayName count="one">Fílípíns píso</displayName>
+ <displayName count="other">Fílípíns písos</displayName>
+ <symbol draft="contributed">PHP</symbol>
+ <symbol alt="narrow" draft="contributed">₱</symbol>
+ </currency>
+ <currency type="PKR">
+ <displayName>Pakístán Rúpi</displayName>
+ <displayName count="one">Pakístán rúpi</displayName>
+ <displayName count="other">Pakístán rúpis</displayName>
+ <symbol draft="contributed">PKR</symbol>
+ <symbol alt="narrow" draft="contributed">Rs</symbol>
+ </currency>
+ <currency type="PLN">
+ <displayName>Pólánd Zílọ́ti</displayName>
+ <displayName count="one">Pólánd Zílọ́ti</displayName>
+ <displayName count="other">Pólánd Zílọ́ti</displayName>
+ <symbol draft="contributed">PLN</symbol>
+ <symbol alt="narrow" draft="contributed">zł</symbol>
+ </currency>
+ <currency type="PYG">
+ <displayName>Páragwuá Guaráni</displayName>
+ <displayName count="one">Páragwuá Guaráni</displayName>
+ <displayName count="other">Páragwuá Guaráni</displayName>
+ <symbol draft="contributed">PYG</symbol>
+ <symbol alt="narrow" draft="contributed">₲</symbol>
+ </currency>
+ <currency type="QAR">
+ <displayName>Kata Ríal</displayName>
+ <displayName count="one">Kata ríal</displayName>
+ <displayName count="other">Kata ríals</displayName>
+ <symbol draft="contributed">QAR</symbol>
+ </currency>
+ <currency type="RON">
+ <displayName>Roméniá Lu</displayName>
+ <displayName count="one">Roméniá Lu</displayName>
+ <displayName count="other">Roméniá Lu</displayName>
+ <symbol draft="contributed">RON</symbol>
+ <symbol alt="narrow" draft="contributed">lei</symbol>
+ </currency>
+ <currency type="RSD">
+ <displayName>Sẹrbia Dínar</displayName>
+ <displayName count="one">Sẹrbia Dínar</displayName>
+ <displayName count="other">Sẹrbia Dínar</displayName>
+ <symbol draft="contributed">RSD</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>Rọ́shiá Rúbul</displayName>
+ <displayName count="one">Rọ́shiá Rúbul</displayName>
+ <displayName count="other">Rọ́shiá Rúbul</displayName>
+ <symbol draft="contributed">RUB</symbol>
+ <symbol alt="narrow" draft="contributed">₽</symbol>
+ </currency>
+ <currency type="RWF">
+ <displayName>Ruwándá Frank</displayName>
+ <displayName count="one">Ruwándá frank</displayName>
+ <displayName count="other">Ruwándá franks</displayName>
+ <symbol draft="contributed">RWF</symbol>
+ <symbol alt="narrow" draft="contributed">RF</symbol>
+ </currency>
+ <currency type="SAR">
+ <displayName>Saúdí Arébiá Riyal</displayName>
+ <displayName count="one">Saúdí Arébiá riyal</displayName>
+ <displayName count="other">Saúdí Arébiá riyals</displayName>
+ <symbol draft="contributed">SAR</symbol>
+ </currency>
+ <currency type="SBD">
+ <displayName>Sólómọ́n Aílands Dọ́la</displayName>
+ <displayName count="one">Sólómọ́n Aílands dọ́la</displayName>
+ <displayName count="other">Sólómọ́n Aílands dọ́las</displayName>
+ <symbol draft="contributed">SBD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="SCR">
+ <displayName>Sẹ́chẹ́ls Rúpi</displayName>
+ <displayName count="one">Sẹ́chẹ́ls rúpi</displayName>
+ <displayName count="other">Sẹ́chẹ́ls rúpis</displayName>
+ <symbol draft="contributed">SCR</symbol>
+ </currency>
+ <currency type="SDG">
+ <displayName>Sudan Paund</displayName>
+ <displayName count="one">Sudan Paund</displayName>
+ <displayName count="other">Sudan Paund</displayName>
+ <symbol draft="contributed">SDG</symbol>
+ </currency>
+ <currency type="SEK">
+ <displayName>Swídẹ́n Króna</displayName>
+ <displayName count="one">Swídẹ́n Króna</displayName>
+ <displayName count="other">Swídẹ́n Króna</displayName>
+ <symbol draft="contributed">SEK</symbol>
+ <symbol alt="narrow" draft="contributed">kr</symbol>
+ </currency>
+ <currency type="SGD">
+ <displayName>Singapọ́ Dọ́la</displayName>
+ <displayName count="one">Singapọ́ dọ́la</displayName>
+ <displayName count="other">Singapọ́ dọ́las</displayName>
+ <symbol draft="contributed">SGD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="SHP">
+ <displayName>Sent Hẹlẹ́ná Paund</displayName>
+ <displayName count="one">Sent Hẹlẹ́ná paund</displayName>
+ <displayName count="other">Sent Hẹlẹ́ná paunds</displayName>
+ <symbol draft="contributed">SHP</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="SLL">
+ <displayName>Siẹ́ra Líoniá Liọn</displayName>
+ <displayName count="one">Siẹ́ra Líoniá liọn</displayName>
+ <displayName count="other">Siẹ́ra Líoniá liọns</displayName>
+ <symbol draft="contributed">SLL</symbol>
+ </currency>
+ <currency type="SOS">
+ <displayName>Sọmáliá Shílin</displayName>
+ <displayName count="one">Sọmáliá shílin</displayName>
+ <displayName count="other">Sọmáliá shílins</displayName>
+ <symbol draft="contributed">SOS</symbol>
+ </currency>
+ <currency type="SRD">
+ <displayName>Súrínám Dọla</displayName>
+ <displayName count="one">Súrínám Dọla</displayName>
+ <displayName count="other">Súrínám Dọla</displayName>
+ <symbol draft="contributed">SRD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="SSP">
+ <displayName>Saút Sudán Paund</displayName>
+ <displayName count="one">Saút Sudán paund</displayName>
+ <displayName count="other">Saút Sudán paunds</displayName>
+ <symbol draft="contributed">SSP</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="STN">
+ <displayName>Sao Tómẹ & Prínsípẹ Dóbra</displayName>
+ <displayName count="one">Sao Tómẹ & Prínsípẹ dóbra</displayName>
+ <displayName count="other">Sao Tómẹ & Prínsípẹ dóbras</displayName>
+ <symbol draft="contributed">STN</symbol>
+ <symbol alt="narrow" draft="contributed">Db</symbol>
+ </currency>
+ <currency type="SYP">
+ <displayName>Síriá Paund</displayName>
+ <displayName count="one">Síriá paund</displayName>
+ <displayName count="other">Síriá paunds</displayName>
+ <symbol draft="contributed">SYP</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="SZL">
+ <displayName>Swází Lilánjẹ́ni</displayName>
+ <displayName count="one">Swází lilánjẹ́ni</displayName>
+ <displayName count="other">Swází ẹmalánjẹ́ni</displayName>
+ <symbol draft="contributed">SZL</symbol>
+ </currency>
+ <currency type="THB">
+ <displayName>Taílánd Baht</displayName>
+ <displayName count="one">Taílánd baht</displayName>
+ <displayName count="other">Taílánd bahts</displayName>
+ <symbol draft="contributed">THB</symbol>
+ <symbol alt="narrow" draft="contributed">฿</symbol>
+ </currency>
+ <currency type="TJS">
+ <displayName>Tajíkstan Sómóni</displayName>
+ <displayName count="one">Tajíkstan sómóni</displayName>
+ <displayName count="other">Tajíkstan sómónis</displayName>
+ <symbol draft="contributed">TJS</symbol>
+ </currency>
+ <currency type="TMT">
+ <displayName>Tọkmẹ́nístán Mánat</displayName>
+ <displayName count="one">Tọkmẹ́nístán mánat</displayName>
+ <displayName count="other">Tọkmẹ́nístán mánats</displayName>
+ <symbol draft="contributed">TMT</symbol>
+ </currency>
+ <currency type="TND">
+ <displayName>Tuníshia Dínar</displayName>
+ <displayName count="one">Tuníshia Dínar</displayName>
+ <displayName count="other">Tuníshia Dínar</displayName>
+ <symbol draft="contributed">TND</symbol>
+ </currency>
+ <currency type="TOP">
+ <displayName>Tónga Pánga</displayName>
+ <displayName count="one">Tónga pánga</displayName>
+ <displayName count="other">Tónga pángas</displayName>
+ <symbol draft="contributed">TOP</symbol>
+ <symbol alt="narrow" draft="contributed">T$</symbol>
+ </currency>
+ <currency type="TRY">
+ <displayName>Tọ́kí Líra</displayName>
+ <displayName count="one">Tọ́kí líra</displayName>
+ <displayName count="other">Tọ́kí líras</displayName>
+ <symbol draft="contributed">TRY</symbol>
+ <symbol alt="narrow" draft="contributed">₺</symbol>
+ <symbol alt="variant" draft="contributed">TL</symbol>
+ </currency>
+ <currency type="TTD">
+ <displayName>Trínídad & Tobágo Dọ́la</displayName>
+ <displayName count="one">Trínídad & Tobágo Dọ́la</displayName>
+ <displayName count="other">Trínídad & Tobágo Dọ́la</displayName>
+ <symbol draft="contributed">TTD</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="TWD">
+ <displayName>Niú Taiwán Dọ́la</displayName>
+ <displayName count="one">Niú Taiwán dọ́la</displayName>
+ <displayName count="other">Niú Taiwán dọ́las</displayName>
+ <symbol draft="contributed">NT$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="TZS">
+ <displayName>Tanzániá Shílin</displayName>
+ <displayName count="one">Tanzániá shílin</displayName>
+ <displayName count="other">Tanzániá shílins</displayName>
+ <symbol draft="contributed">TZS</symbol>
+ </currency>
+ <currency type="UAH">
+ <displayName>Yukrẹín Rívnia</displayName>
+ <displayName count="one">Yukrẹín Rívnia</displayName>
+ <displayName count="other">Yukrẹín Rívnia</displayName>
+ <symbol draft="contributed">UAH</symbol>
+ <symbol alt="narrow" draft="contributed">₴</symbol>
+ </currency>
+ <currency type="UGX">
+ <displayName>Yugándá Shílin</displayName>
+ <displayName count="one">Yugándá shílin</displayName>
+ <displayName count="other">Yugándá shílins</displayName>
+ <symbol draft="contributed">UGX</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>US Dọ́la</displayName>
+ <displayName count="one">US Dọ́la</displayName>
+ <displayName count="other">Amẹ́ríká Dọ́la</displayName>
+ <symbol draft="contributed">US$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="UYU">
+ <displayName>Yurugwaí Pẹ́so</displayName>
+ <displayName count="one">Yurugwaí Pẹ́so</displayName>
+ <displayName count="other">Yurugwaí Pẹ́so</displayName>
+ <symbol draft="contributed">UYU</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="UZS">
+ <displayName>Uzbẹ́kistan Som</displayName>
+ <displayName count="one">Uzbẹ́kistan som</displayName>
+ <displayName count="other">Uzbẹ́kistan soms</displayName>
+ <symbol draft="contributed">UZS</symbol>
+ </currency>
+ <currency type="VES">
+ <displayName>Vẹnẹzuẹlá Bolívar</displayName>
+ <displayName count="one">Vẹnẹzuẹlá Bolívar</displayName>
+ <displayName count="other">Vẹnẹzuẹlá Bolívar</displayName>
+ <symbol draft="contributed">VES</symbol>
+ </currency>
+ <currency type="VND">
+ <displayName>Viẹ́tnám Dọng</displayName>
+ <displayName count="one">Viẹ́tnám dọng</displayName>
+ <displayName count="other">Viẹ́tnám dọngs</displayName>
+ <symbol draft="contributed">₫</symbol>
+ <symbol alt="narrow" draft="contributed">₫</symbol>
+ </currency>
+ <currency type="VUV">
+ <displayName>Vanuátú Vátu</displayName>
+ <displayName count="one">Vanuátú vátu</displayName>
+ <displayName count="other">Vanuátú vátus</displayName>
+ <symbol draft="contributed">VUV</symbol>
+ </currency>
+ <currency type="WST">
+ <displayName>Samóa Tála</displayName>
+ <displayName count="one">Samóa tála</displayName>
+ <displayName count="other">Samóa tálas</displayName>
+ <symbol draft="contributed">WST</symbol>
+ </currency>
+ <currency type="XAF">
+ <displayName>Sẹ́ntrál Áfríká Frank</displayName>
+ <displayName count="one">Sẹ́ntrál Áfríká frank</displayName>
+ <displayName count="other">Sẹ́ntrál Áfríká franks</displayName>
+ <symbol draft="contributed">FCFA</symbol>
+ </currency>
+ <currency type="XCD">
+ <displayName>Íst Karíbián Dọla</displayName>
+ <displayName count="one">Íst Karíbián Dọla</displayName>
+ <displayName count="other">Íst Karíbián Dọla</displayName>
+ <symbol draft="contributed">EC$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="XOF">
+ <displayName>Wẹ́st Afríká Sẹ́fa Frank</displayName>
+ <displayName count="one">Wẹ́st Afríká Sẹ́fa frank</displayName>
+ <displayName count="other">Wẹ́st Afríká Sẹ́fa franks</displayName>
+ <symbol draft="contributed">CFA</symbol>
+ </currency>
+ <currency type="XPF">
+ <displayName>Frẹ́nch Poliníshiá Frank</displayName>
+ <displayName count="one">Frẹ́nch Poliníshiá frank</displayName>
+ <displayName count="other">Frẹ́nch Poliníshiá franks</displayName>
+ <symbol draft="contributed">CFPF</symbol>
+ </currency>
+ <currency type="XXX">
+ <displayName>Mọní Wé Pípol Nọ No</displayName>
+ <displayName count="one">Amaúnt dẹm raít fọ mọní wé pípol nọ no</displayName>
+ <displayName count="other">(mọní wé pípol nọ no)</displayName>
+ </currency>
+ <currency type="YER">
+ <displayName>Yẹ́mẹ́n Rial</displayName>
+ <displayName count="one">Yẹ́mẹ́n rial</displayName>
+ <displayName count="other">Yẹ́mẹ́n rials</displayName>
+ <symbol draft="contributed">YER</symbol>
+ </currency>
+ <currency type="ZAR">
+ <displayName>Saút Áfríká Rand</displayName>
+ <displayName count="one">Saút Áfríká rand</displayName>
+ <displayName count="other">Saút Áfríká rands</displayName>
+ <symbol draft="contributed">ZAR</symbol>
+ <symbol alt="narrow" draft="contributed">R</symbol>
+ </currency>
+ <currency type="ZMW">
+ <displayName>Zámbiá Kwácha</displayName>
+ <displayName count="one">Zámbiá kwácha</displayName>
+ <displayName count="other">Zámbiá kwáchas</displayName>
+ <symbol draft="contributed">ZMW</symbol>
+ <symbol alt="narrow" draft="contributed">ZK</symbol>
+ </currency>
+ </currencies>
+ <miscPatterns numberSystem="latn">
+ <pattern type="approximately">~{0}</pattern>
+ <pattern type="atLeast">{0}+</pattern>
+ <pattern type="atMost">≤{0}</pattern>
+ <pattern type="range">{0}–{1}</pattern>
+ </miscPatterns>
+ <minimalPairs>
+ <pluralMinimalPairs count="one" draft="contributed">{0} dè</pluralMinimalPairs>
+ <pluralMinimalPairs count="other" draft="contributed">{0}?</pluralMinimalPairs>
+ <ordinalMinimalPairs ordinal="other" draft="contributed">Take the {0}th right.</ordinalMinimalPairs>
+ </minimalPairs>
+ </numbers>
+ <units>
+ <unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>Dẹsí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>Sẹntí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>Milí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>Maíkro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>Nanó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>Píko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>Fẹ́mto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>Áto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>Zẹ́pto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>Yókto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>Dẹ́ka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>Hẹ́kto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>Kílo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>Mẹ́ga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Gíga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Tẹ́ra{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>Pẹ́ta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0}Ẹ́ksa</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Zẹ́ta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Yóta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="per">
+ <compoundUnitPattern>{0} Fọ Ẹ́vri {1}</compoundUnitPattern>
+ </compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>Skwia {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">Skwia {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">Skwia {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>Kúbik {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">Kúbik {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">Kúbik {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="times">
+ <compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
+ </compoundUnit>
+ <unit type="acceleration-g-force">
+ <displayName>Grávíti Fọs</displayName>
+ <unitPattern count="one">{0} g-Fọs</unitPattern>
+ <unitPattern count="other">{0} g-Fọs</unitPattern>
+ </unit>
+ <unit type="acceleration-meter-per-square-second">
+ <displayName>Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn</displayName>
+ <unitPattern count="one">{0} Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Míta Fọ Ẹ́vrí Skwiá Sẹ́kọn</unitPattern>
+ </unit>
+ <unit type="angle-revolution">
+ <displayName>Rẹvolúshọn</displayName>
+ <unitPattern count="one">{0} Rẹvolúshọn</unitPattern>
+ <unitPattern count="other">{0} Rẹvolúshọn</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName>Rédian-dẹm fọ Ángúl Mẹ́zhọ́mẹnt</displayName>
+ <unitPattern count="one">{0} Rédian</unitPattern>
+ <unitPattern count="other">{0} Rédian</unitPattern>
+ </unit>
+ <unit type="angle-degree">
+ <displayName>Digrii-dẹm</displayName>
+ <unitPattern count="one">{0} Digrii</unitPattern>
+ <unitPattern count="other">{0} Digrii</unitPattern>
+ </unit>
+ <unit type="angle-arc-minute">
+ <displayName>Ákmínit-dẹm</displayName>
+ <unitPattern count="one">{0} Ákmínit</unitPattern>
+ <unitPattern count="other">{0} Ákmínit</unitPattern>
+ </unit>
+ <unit type="angle-arc-second">
+ <displayName>Áksẹ́kọn-dẹm</displayName>
+ <unitPattern count="one">{0} Áksẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Áksẹ́kọn</unitPattern>
+ </unit>
+ <unit type="area-square-kilometer">
+ <displayName>Skwiá Kilómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Kilómíta</unitPattern>
+ <unitPattern count="other">{0} Skwiá Kilómíta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Skwiá Kilómíta</perUnitPattern>
+ </unit>
+ <unit type="area-hectare">
+ <displayName>Hẹ́kta-dẹm</displayName>
+ <unitPattern count="one">{0} Hẹ́kta</unitPattern>
+ <unitPattern count="other">{0} Hẹ́kta</unitPattern>
+ </unit>
+ <unit type="area-square-meter">
+ <displayName>Skwiá Míta-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Míta</unitPattern>
+ <unitPattern count="other">{0} Skwiá Míta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Skwiá Míta</perUnitPattern>
+ </unit>
+ <unit type="area-square-centimeter">
+ <displayName>Skwiá Sẹntímíta-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Sẹntímíta</unitPattern>
+ <unitPattern count="other">{0} Skwiá Sẹntímíta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Skwiá Sẹntímíta</perUnitPattern>
+ </unit>
+ <unit type="area-square-mile">
+ <displayName>Skwiá Mail-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Mail</unitPattern>
+ <unitPattern count="other">{0} Skwiá Mail</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Skwiá Mail</perUnitPattern>
+ </unit>
+ <unit type="area-acre">
+ <displayName>Éka-dẹm</displayName>
+ <unitPattern count="one">{0} Éka</unitPattern>
+ <unitPattern count="other">{0} Éka</unitPattern>
+ </unit>
+ <unit type="area-square-yard">
+ <displayName>Skwiá Yad-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Yad</unitPattern>
+ <unitPattern count="other">{0} Skwiá Yad</unitPattern>
+ </unit>
+ <unit type="area-square-foot">
+ <displayName>Skwiá Fut-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Fut</unitPattern>
+ <unitPattern count="other">{0} Skwiá Fut</unitPattern>
+ </unit>
+ <unit type="area-square-inch">
+ <displayName>Skwiá Inch-dẹm</displayName>
+ <unitPattern count="one">{0} Skwiá Inch</unitPattern>
+ <unitPattern count="other">{0} Skwiá Inch</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Skwiá Inch</perUnitPattern>
+ </unit>
+ <unit type="area-dunam">
+ <displayName>Dúnam-dẹm</displayName>
+ <unitPattern count="one">{0} Dúnam</unitPattern>
+ <unitPattern count="other">{0} Dúnam</unitPattern>
+ </unit>
+ <unit type="concentr-karat">
+ <displayName>Karat-dẹm</displayName>
+ <unitPattern count="one">{0} Karat</unitPattern>
+ <unitPattern count="other">{0} Karat</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName>Mílígram-dẹm Fọ Ẹ́vrí Dẹsílíta</displayName>
+ <unitPattern count="one">{0} Mílígram Fọ Ẹ́vrí Dẹsílíta</unitPattern>
+ <unitPattern count="other">{0} Mílígram Fọ Ẹ́vrí Dẹsílíta</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName>Mílimol-dẹm Fọ Ẹ́vrí Líta</displayName>
+ <unitPattern count="one">{0} Mílimol Fọ Ẹ́vrí Líta</unitPattern>
+ <unitPattern count="other">{0} Mílimol Fọ Ẹ́vrí Líta</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName>Pat-dẹm Fọ Ích Míliọn</displayName>
+ <unitPattern count="one">{0} Pat Fọ Ích Míliọn</unitPattern>
+ <unitPattern count="other">{0} Pat Fọ Ích Míliọn</unitPattern>
+ </unit>
+ <unit type="concentr-percent">
+ <displayName>Pasẹnt</displayName>
+ <unitPattern count="one">{0} Pasẹnt</unitPattern>
+ <unitPattern count="other">{0} Pasẹnt</unitPattern>
+ </unit>
+ <unit type="concentr-permille">
+ <displayName>Fọ Ích Taúzan</displayName>
+ <unitPattern count="one">{0} Fọ Ích Taúzan</unitPattern>
+ <unitPattern count="other">{0} Fọ Ích Taúzan</unitPattern>
+ </unit>
+ <unit type="concentr-permyriad">
+ <displayName>Fọ Ích Tẹ́n Taúzan</displayName>
+ <unitPattern count="one">{0} Fọ Ích Tẹ́n Taúzan</unitPattern>
+ <unitPattern count="other">{0} Fọ Ích Tẹ́n Taúzan</unitPattern>
+ </unit>
+ <unit type="concentr-mole">
+ <displayName>Mol-dẹm</displayName>
+ <unitPattern count="one">{0} Mol</unitPattern>
+ <unitPattern count="other">{0} Mol</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-kilometer">
+ <displayName>Líta-dẹm Fọ Ẹ́vrí Kilómíta</displayName>
+ <unitPattern count="one">{0} Líta Fọ Ẹ́vrí Kilómíta</unitPattern>
+ <unitPattern count="other">{0} Líta Fọ Ẹ́vrí Kilómíta</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>Líta-dẹm Fọ Ẹ́vrí 100 Kilómíta</displayName>
+ <unitPattern count="one">{0} Líta Fọ Ẹ́vrí 100 Kilómíta</unitPattern>
+ <unitPattern count="other">{0} Líta Fọ Ẹ́vrí 100 Kilómíta</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName>Mail-dẹm Fọ Ẹ́vrí Gálọn</displayName>
+ <unitPattern count="one">{0} Mail Fọ Ẹ́vrí Gálọn</unitPattern>
+ <unitPattern count="other">{0} Mail Fọ Ẹ́vrí Gálọn</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName>Mail-dẹm Fọ Ẹ́vrí Brítísh Gálọn</displayName>
+ <unitPattern count="one">{0} Mail Fọ Ẹ́vrí Brítísh Gálọn</unitPattern>
+ <unitPattern count="other">{0} Mail Fọ Ẹ́vrí Brítísh Gálọn</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName>Pẹ́tábait-dẹm</displayName>
+ <unitPattern count="one">{0} Pẹ́tábait</unitPattern>
+ <unitPattern count="other">{0} Pẹ́tábait</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName>Tẹ́rábait-dẹm</displayName>
+ <unitPattern count="one">{0} Tẹ́rábait</unitPattern>
+ <unitPattern count="other">{0} Tẹ́rábait</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName>Tẹ́rábit-dẹm</displayName>
+ <unitPattern count="one">{0} Tẹ́rábit</unitPattern>
+ <unitPattern count="other">{0} Tẹ́rábit</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName>Gígábait-dẹm</displayName>
+ <unitPattern count="one">{0} Gígábait</unitPattern>
+ <unitPattern count="other">{0} Gígábait</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName>Gígábit-dẹm</displayName>
+ <unitPattern count="one">{0} Gígábit</unitPattern>
+ <unitPattern count="other">{0} Gígábit</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName>Mẹ́gábait-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gábait</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gábait</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName>Mẹ́gábit-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gábit</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gábit</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName>Kílóbait-dẹm</displayName>
+ <unitPattern count="one">{0} Kílóbait</unitPattern>
+ <unitPattern count="other">{0} Kílóbait</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName>Kílóbit-dẹm</displayName>
+ <unitPattern count="one">{0} Kílóbit</unitPattern>
+ <unitPattern count="other">{0} Kílóbit</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName>Bait-dẹm</displayName>
+ <unitPattern count="one">{0} Bait</unitPattern>
+ <unitPattern count="other">{0} Bait</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName>Bit-dem</displayName>
+ <unitPattern count="one">{0} bit</unitPattern>
+ <unitPattern count="other">{0} bit</unitPattern>
+ </unit>
+ <unit type="duration-century">
+ <displayName>Họ́ndrẹ́d-họ́ndrẹ́d-yiẹ́</displayName>
+ <unitPattern count="one">{0} Họ́ndrẹ́d-yiẹ́</unitPattern>
+ <unitPattern count="other">{0} Họ́ndrẹ́d-yiẹ́</unitPattern>
+ </unit>
+ <unit type="duration-decade">
+ <displayName>Tẹ́n-tẹ́n-yiẹ</displayName>
+ <unitPattern count="one">{0} Tẹ́n-yiẹ</unitPattern>
+ <unitPattern count="other">{0} Tẹ́n-yiẹ́</unitPattern>
+ </unit>
+ <unit type="duration-year">
+ <displayName>Yiẹ-dẹm</displayName>
+ <unitPattern count="one">{0} Yiẹ</unitPattern>
+ <unitPattern count="other">{0} Yiẹ</unitPattern>
+ <perUnitPattern>{0} Ích yiẹ</perUnitPattern>
+ </unit>
+ <unit type="duration-month">
+ <displayName>Mọnt-dẹm</displayName>
+ <unitPattern count="one">{0} Mọnt</unitPattern>
+ <unitPattern count="other">{0} Mọnt</unitPattern>
+ <perUnitPattern>{0} Ích mọnt</perUnitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName>Wik-dẹm</displayName>
+ <unitPattern count="one">{0} Wik</unitPattern>
+ <unitPattern count="other">{0} Wik</unitPattern>
+ <perUnitPattern>{0} Ích Wik</perUnitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName>Dè-dẹm</displayName>
+ <unitPattern count="one">{0} Dè</unitPattern>
+ <unitPattern count="other">{0} Dè</unitPattern>
+ <perUnitPattern>{0} Ích Dè</perUnitPattern>
+ </unit>
+ <unit type="duration-hour">
+ <displayName>Áwa-dẹm</displayName>
+ <unitPattern count="one">{0} Áwa</unitPattern>
+ <unitPattern count="other">{0} Áwa</unitPattern>
+ <perUnitPattern>{0} Ích Áwa</perUnitPattern>
+ </unit>
+ <unit type="duration-minute">
+ <displayName>Mínit-dẹm</displayName>
+ <unitPattern count="one">{0} Mínit</unitPattern>
+ <unitPattern count="other">{0} Mínit</unitPattern>
+ <perUnitPattern>{0} Ích Mínit</perUnitPattern>
+ </unit>
+ <unit type="duration-second">
+ <displayName>Sẹ́kọn-dẹm</displayName>
+ <unitPattern count="one">{0} Sẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Sẹ́kọn</unitPattern>
+ <perUnitPattern>{0} Ích Sẹ́kọn</perUnitPattern>
+ </unit>
+ <unit type="duration-millisecond">
+ <displayName>Mílisẹ́kọn-dẹm</displayName>
+ <unitPattern count="one">{0} Mílisẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Mílisẹ́kọn</unitPattern>
+ </unit>
+ <unit type="duration-microsecond">
+ <displayName>Maíkrosẹ́kọn-dẹm</displayName>
+ <unitPattern count="one">{0} Maíkrosẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Maíkrosẹ́kọn</unitPattern>
+ </unit>
+ <unit type="duration-nanosecond">
+ <displayName>Nánosẹ́kọn-dẹm</displayName>
+ <unitPattern count="one">{0} Nánosẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Nánosẹ́kọn</unitPattern>
+ </unit>
+ <unit type="electric-ampere">
+ <displayName>Ámpẹ́a-dẹm</displayName>
+ <unitPattern count="one">{0} ámpẹ́a</unitPattern>
+ <unitPattern count="other">{0} ámpẹ́a</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName>Míliámpẹ́a-dẹm</displayName>
+ <unitPattern count="one">{0} Míliámpẹ́a</unitPattern>
+ <unitPattern count="other">{0} Míliámpẹ́a</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName>Om-dẹm</displayName>
+ <unitPattern count="one">{0} Om</unitPattern>
+ <unitPattern count="other">{0} Om</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName>Volt-dẹm</displayName>
+ <unitPattern count="one">{0} Volt</unitPattern>
+ <unitPattern count="other">{0} Volt</unitPattern>
+ </unit>
+ <unit type="energy-kilocalorie">
+ <displayName>Kílokálọ́ri-dẹm</displayName>
+ <unitPattern count="one">{0} Kílokálọ́ri</unitPattern>
+ <unitPattern count="other">{0} Kílokálọ́ri</unitPattern>
+ </unit>
+ <unit type="energy-calorie">
+ <displayName>Kálọ́ri-dẹm</displayName>
+ <unitPattern count="one">{0} Kálọ́ri</unitPattern>
+ <unitPattern count="other">{0} Kálọ́ri</unitPattern>
+ </unit>
+ <unit type="energy-foodcalorie">
+ <displayName>Kálọ́ri-dẹm</displayName>
+ <unitPattern count="one">{0} Kálọ́ri</unitPattern>
+ <unitPattern count="other">{0} Kálọ́ri</unitPattern>
+ </unit>
+ <unit type="energy-kilojoule">
+ <displayName>Kílojul-dẹm</displayName>
+ <unitPattern count="one">{0} Kílojul</unitPattern>
+ <unitPattern count="other">{0} Kílojul</unitPattern>
+ </unit>
+ <unit type="energy-joule">
+ <displayName>Jul-dẹm</displayName>
+ <unitPattern count="one">{0} Jul</unitPattern>
+ <unitPattern count="other">{0} Jul</unitPattern>
+ </unit>
+ <unit type="energy-kilowatt-hour">
+ <displayName>Kílowát-Áwa-dẹm</displayName>
+ <unitPattern count="one">{0} Kílowát-Áwa</unitPattern>
+ <unitPattern count="other">{0} Kílowát-Áwa</unitPattern>
+ </unit>
+ <unit type="energy-electronvolt">
+ <displayName>Ẹlẹ́ktrọ́nvolt-dẹm</displayName>
+ <unitPattern count="one">{0} Ẹlẹ́ktrọ́nvolt</unitPattern>
+ <unitPattern count="other">{0} Ẹlẹ́ktrọ́nvolt</unitPattern>
+ </unit>
+ <unit type="energy-british-thermal-unit">
+ <displayName>Brítísh Támál Yúnit-dẹm</displayName>
+ <unitPattern count="one">{0} Brítísh Támál Yúnit</unitPattern>
+ <unitPattern count="other">{0} Brítísh Támál Yúnit</unitPattern>
+ </unit>
+ <unit type="energy-therm-us">
+ <displayName>US Támál Yúnit-dẹm</displayName>
+ <unitPattern count="one">{0} US Támál Yúnit</unitPattern>
+ <unitPattern count="other">{0} US Támál Yúnit</unitPattern>
+ </unit>
+ <unit type="force-pound-force">
+ <displayName>Páund-dẹm ọf Fọs</displayName>
+ <unitPattern count="one">{0} Paúnd ọf Fọs</unitPattern>
+ <unitPattern count="other">{0} Paúnd ọf Fọs</unitPattern>
+ </unit>
+ <unit type="force-newton">
+ <displayName>Niútons</displayName>
+ <unitPattern count="one">{0} Niúton</unitPattern>
+ <unitPattern count="other">{0} Niúton</unitPattern>
+ </unit>
+ <unit type="frequency-gigahertz">
+ <displayName>Gígahẹtz-dẹm</displayName>
+ <unitPattern count="one">{0} Gígahẹtz</unitPattern>
+ <unitPattern count="other">{0} Gígahẹtz</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName>Mẹ́gahẹtz-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gahẹtz</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gahẹtz</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName>Kílohẹtz-dẹm</displayName>
+ <unitPattern count="one">{0} Kílohẹtz</unitPattern>
+ <unitPattern count="other">{0} Kílohẹtz</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName>Hẹtz-dẹm</displayName>
+ <unitPattern count="one">{0} Hẹtz</unitPattern>
+ <unitPattern count="other">{0} Hẹtz</unitPattern>
+ </unit>
+ <unit type="graphics-em">
+ <displayName>Taipógráfik em</displayName>
+ <unitPattern count="one">{0} em</unitPattern>
+ <unitPattern count="other">{0} ems</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>Píksẹl-dẹm</displayName>
+ <unitPattern count="one">{0} Píksẹl</unitPattern>
+ <unitPattern count="other">{0} Píksẹl</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>Mẹ́gapíksẹl-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gapíksẹl</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gapíksẹl</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>Píksẹl-dẹm Fọ Ích Sẹntímíta</displayName>
+ <unitPattern count="one">{0} Píksẹl Fọ Ích Sẹntímíta</unitPattern>
+ <unitPattern count="other">{0} Píksẹl Fọ Ích Sẹntímíta</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>Píksẹl-dẹm Fọ Ẹ́vrí Inch</displayName>
+ <unitPattern count="one">{0} Píksẹl Fọ Ẹ́vrí Inch</unitPattern>
+ <unitPattern count="other">{0} Píksẹl Fọ Ẹ́vrí Inch</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>Pọint-dẹm fọ ích sẹntímíta</displayName>
+ <unitPattern count="one">{0} Pọint fọ ích sẹntímíta</unitPattern>
+ <unitPattern count="other">{0} Pọint fọ ích sẹntímíta</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>Pọint-Dẹm Fọ Ẹ́vrí Inch</displayName>
+ <unitPattern count="one">{0} Pọint Fọ Ẹ́vrí Inch</unitPattern>
+ <unitPattern count="other">{0} Pọint Fọ Ẹ́vrí Inch</unitPattern>
+ </unit>
+ <unit type="length-kilometer">
+ <displayName>Kílómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Kílómíta</unitPattern>
+ <unitPattern count="other">{0} Kílómíta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Kilómíta</perUnitPattern>
+ </unit>
+ <unit type="length-meter">
+ <displayName>Míta-dẹm</displayName>
+ <unitPattern count="one">{0} Míta</unitPattern>
+ <unitPattern count="other">{0} Míta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Míta</perUnitPattern>
+ </unit>
+ <unit type="length-decimeter">
+ <displayName>Dẹsímíta-dẹm</displayName>
+ <unitPattern count="one">{0} Dẹsímíta</unitPattern>
+ <unitPattern count="other">{0} Dẹsímíta</unitPattern>
+ </unit>
+ <unit type="length-centimeter">
+ <displayName>Sẹ́ntímíta-dẹm</displayName>
+ <unitPattern count="one">{0} Sẹ́ntímíta</unitPattern>
+ <unitPattern count="other">{0} Sẹ́ntímíta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Sẹ́ntímíta</perUnitPattern>
+ </unit>
+ <unit type="length-millimeter">
+ <displayName>Milímíta-dẹm</displayName>
+ <unitPattern count="one">{0} Milímíta</unitPattern>
+ <unitPattern count="other">{0} Milímíta</unitPattern>
+ </unit>
+ <unit type="length-micrometer">
+ <displayName>Maíkrómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Maíkrómíta</unitPattern>
+ <unitPattern count="other">{0} Maíkrómíta</unitPattern>
+ </unit>
+ <unit type="length-nanometer">
+ <displayName>Nanómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Nanómíta</unitPattern>
+ <unitPattern count="other">{0} Nanómíta</unitPattern>
+ </unit>
+ <unit type="length-picometer">
+ <displayName>Pikómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Pikómíta</unitPattern>
+ <unitPattern count="other">{0} Pikómíta</unitPattern>
+ </unit>
+ <unit type="length-mile">
+ <displayName>Mail-dẹm</displayName>
+ <unitPattern count="one">{0} Mail</unitPattern>
+ <unitPattern count="other">{0} Mail</unitPattern>
+ </unit>
+ <unit type="length-yard">
+ <displayName>Yad-dẹm</displayName>
+ <unitPattern count="one">{0} Yad</unitPattern>
+ <unitPattern count="other">{0} Yad</unitPattern>
+ </unit>
+ <unit type="length-foot">
+ <displayName>Fut-dẹm</displayName>
+ <unitPattern count="one">{0} Fut</unitPattern>
+ <unitPattern count="other">{0} Fut</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Fut</perUnitPattern>
+ </unit>
+ <unit type="length-inch">
+ <displayName>Inch-dẹm</displayName>
+ <unitPattern count="one">{0} inch</unitPattern>
+ <unitPattern count="other">{0} inch</unitPattern>
+ <perUnitPattern>{0} Fọ Ẹ́vrí Inch</perUnitPattern>
+ </unit>
+ <unit type="length-parsec">
+ <displayName>parsecs</displayName>
+ <unitPattern count="one">{0} parsec</unitPattern>
+ <unitPattern count="other">{0} parsecs</unitPattern>
+ </unit>
+ <unit type="length-light-year">
+ <displayName>Laít Yiẹ-dẹm</displayName>
+ <unitPattern count="one">{0} Laít Yiẹ</unitPattern>
+ <unitPattern count="other">{0} Laít Yiẹ</unitPattern>
+ </unit>
+ <unit type="length-astronomical-unit">
+ <displayName>Astrọnọ́míkál Yúnit-dem</displayName>
+ <unitPattern count="one">{0} Astrọnọ́míkál Yúnit</unitPattern>
+ <unitPattern count="other">{0} Astrọnọ́míkál Yúnit</unitPattern>
+ </unit>
+ <unit type="length-nautical-mile">
+ <displayName>Nọ́tíkál Mail-dẹm</displayName>
+ <unitPattern count="one">{0} Nọ́tíkál Mail</unitPattern>
+ <unitPattern count="other">{0} Nọ́tíkál Mail</unitPattern>
+ </unit>
+ <unit type="length-mile-scandinavian">
+ <displayName>Mail-Skandínévia</displayName>
+ <unitPattern count="one">{0} Mail-Skandínévia</unitPattern>
+ <unitPattern count="other">{0} Mail-Skandínévia</unitPattern>
+ </unit>
+ <unit type="length-point">
+ <displayName>Point-dẹm</displayName>
+ <unitPattern count="one">{0} point</unitPattern>
+ <unitPattern count="other">{0} point</unitPattern>
+ </unit>
+ <unit type="length-solar-radius">
+ <displayName>Sólá Rédiọs-dẹm</displayName>
+ <unitPattern count="one">{0} Sólá Rédiọs</unitPattern>
+ <unitPattern count="other">{0} Sólá Rédiọs</unitPattern>
+ </unit>
+ <unit type="light-lux">
+ <displayName>lux</displayName>
+ <unitPattern count="one">{0} lux</unitPattern>
+ <unitPattern count="other">{0} lux</unitPattern>
+ </unit>
+ <unit type="light-solar-luminosity">
+ <displayName>Sólá Luminósíti-dẹm</displayName>
+ <unitPattern count="one">{0} Sólá Luminósíti</unitPattern>
+ <unitPattern count="other">{0} Sólá Luminósíti</unitPattern>
+ </unit>
+ <unit type="mass-metric-ton">
+ <displayName>Mẹ́trík Tọn-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́trík Tọn</unitPattern>
+ <unitPattern count="other">{0} Mẹ́trík Tọn</unitPattern>
+ </unit>
+ <unit type="mass-kilogram">
+ <displayName>Kílógram-dẹm</displayName>
+ <unitPattern count="one">{0} Kílógram</unitPattern>
+ <unitPattern count="other">{0} Kílógram</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Kílógram</perUnitPattern>
+ </unit>
+ <unit type="mass-gram">
+ <displayName>Gram-dẹm</displayName>
+ <unitPattern count="one">{0} Gram</unitPattern>
+ <unitPattern count="other">{0} Gram</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Gram</perUnitPattern>
+ </unit>
+ <unit type="mass-milligram">
+ <displayName>Mílígram-dẹm</displayName>
+ <unitPattern count="one">{0} Mílígram</unitPattern>
+ <unitPattern count="other">{0} Mílígram</unitPattern>
+ </unit>
+ <unit type="mass-microgram">
+ <displayName>Maíkrógram-dẹm</displayName>
+ <unitPattern count="one">{0} Maíkrógram</unitPattern>
+ <unitPattern count="other">{0} Maíkrógram</unitPattern>
+ </unit>
+ <unit type="mass-ton">
+ <displayName>Tọn-dẹm</displayName>
+ <unitPattern count="one">{0} Tọn</unitPattern>
+ <unitPattern count="other">{0} Tọn</unitPattern>
+ </unit>
+ <unit type="mass-pound">
+ <displayName>Paund-dẹm</displayName>
+ <unitPattern count="one">{0} Paund</unitPattern>
+ <unitPattern count="other">{0} Paund</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Paund</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce">
+ <displayName>Áuns-dẹm</displayName>
+ <unitPattern count="one">{0} Áuns</unitPattern>
+ <unitPattern count="other">{0} Áuns</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Áuns</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce-troy">
+ <displayName>Trọí Áuns-dẹm</displayName>
+ <unitPattern count="one">{0} Trọí Áuns</unitPattern>
+ <unitPattern count="other">{0} Trọí Áuns</unitPattern>
+ </unit>
+ <unit type="mass-carat">
+ <displayName>Kárat-dẹm</displayName>
+ <unitPattern count="one">{0} Kárat</unitPattern>
+ <unitPattern count="other">{0} Kárat</unitPattern>
+ </unit>
+ <unit type="mass-dalton">
+ <displayName>Dọ́lton-dẹm</displayName>
+ <unitPattern count="one">{0} Dọ́lton</unitPattern>
+ <unitPattern count="other">{0} Dọ́lton</unitPattern>
+ </unit>
+ <unit type="mass-earth-mass">
+ <displayName>Ẹ́t Mas-dẹm</displayName>
+ <unitPattern count="one">{0} Ẹ́t Mas</unitPattern>
+ <unitPattern count="other">{0} Ẹ́t Mas</unitPattern>
+ </unit>
+ <unit type="mass-solar-mass">
+ <displayName>Sólá Mas-dẹm</displayName>
+ <unitPattern count="one">{0} Sólá Mas</unitPattern>
+ <unitPattern count="other">{0} Sólá Mas</unitPattern>
+ </unit>
+ <unit type="power-gigawatt">
+ <displayName>Gígáwat-dẹm</displayName>
+ <unitPattern count="one">{0} Gígáwat</unitPattern>
+ <unitPattern count="other">{0} Gígáwat</unitPattern>
+ </unit>
+ <unit type="power-megawatt">
+ <displayName>Mẹ́gáwat-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gáwat</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gáwat</unitPattern>
+ </unit>
+ <unit type="power-kilowatt">
+ <displayName>Kílówat-dẹm</displayName>
+ <unitPattern count="one">{0} Kílówat</unitPattern>
+ <unitPattern count="other">{0} Kílówat</unitPattern>
+ </unit>
+ <unit type="power-watt">
+ <displayName>Wat-dẹm</displayName>
+ <unitPattern count="one">{0} Wat</unitPattern>
+ <unitPattern count="other">{0} Wat</unitPattern>
+ </unit>
+ <unit type="power-milliwatt">
+ <displayName>Míliwat-dẹm</displayName>
+ <unitPattern count="one">{0} Míliwat</unitPattern>
+ <unitPattern count="other">{0} Míliwat</unitPattern>
+ </unit>
+ <unit type="power-horsepower">
+ <displayName>Họ́spáwa</displayName>
+ <unitPattern count="one">{0} Họ́spáwa</unitPattern>
+ <unitPattern count="other">{0} Họ́spáwa</unitPattern>
+ </unit>
+ <unit type="pressure-millimeter-ofhg">
+ <displayName>Milímítá-dẹm-ọf-Mẹ́kúri</displayName>
+ <unitPattern count="one">{0} Milímítá Mẹ́kúri</unitPattern>
+ <unitPattern count="other">{0} Milímítá Mẹ́kúri</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName>Páund-dẹm Fọ Ẹ́vrí Skwiá Inch</displayName>
+ <unitPattern count="one">{0} Páund Fọ Ẹ́vrí Skwiá Inch</unitPattern>
+ <unitPattern count="other">{0} Páund Fọ Ẹ́vrí Skwiá Inch</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName>Ínchís ọf Mẹ́kúri</displayName>
+ <unitPattern count="one">{0} Inch ọf Mẹ́kúri</unitPattern>
+ <unitPattern count="other">{0} Inch ọf Mẹ́kúri</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
+ <displayName>Baa-dẹm</displayName>
+ <unitPattern count="one">{0} Baa</unitPattern>
+ <unitPattern count="other">{0} Baa</unitPattern>
+ </unit>
+ <unit type="pressure-millibar">
+ <displayName>Mílibaa-dẹm</displayName>
+ <unitPattern count="one">{0} Mílibaa</unitPattern>
+ <unitPattern count="other">{0} Mílibaa</unitPattern>
+ </unit>
+ <unit type="pressure-atmosphere">
+ <displayName>Átmósfẹ-dẹm</displayName>
+ <unitPattern count="one">{0} Átmósfẹ</unitPattern>
+ <unitPattern count="other">{0} Átmósfẹ</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName>Páskal-dẹm</displayName>
+ <unitPattern count="one">{0} Páskal</unitPattern>
+ <unitPattern count="other">{0} Páskal</unitPattern>
+ </unit>
+ <unit type="pressure-hectopascal">
+ <displayName>Hẹ́ktopáskal-dẹm</displayName>
+ <unitPattern count="one">{0} Hẹ́ktopáskal</unitPattern>
+ <unitPattern count="other">{0} Hẹ́ktopáskal</unitPattern>
+ </unit>
+ <unit type="pressure-kilopascal">
+ <displayName>Kílopáskal-dẹm</displayName>
+ <unitPattern count="one">{0} Kílopáskal</unitPattern>
+ <unitPattern count="other">{0} Kílopáskal</unitPattern>
+ </unit>
+ <unit type="pressure-megapascal">
+ <displayName>Mẹ́gapáskal-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́gapáskal</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gapáskal</unitPattern>
+ </unit>
+ <unit type="speed-kilometer-per-hour">
+ <displayName>Kílómíta-dẹm Fọ Ẹ́vrí Áwa</displayName>
+ <unitPattern count="one">{0} Kílómíta Fọ Ẹ́vrí Áwa</unitPattern>
+ <unitPattern count="other">{0} Kílómíta Fọ Ẹ́vrí Áwa</unitPattern>
+ </unit>
+ <unit type="speed-meter-per-second">
+ <displayName>Míta-dẹm Fọ Ẹ́vrí Sẹ́kọn</displayName>
+ <unitPattern count="one">{0} Míta Fọ Ẹ́vrí Sẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Míta Fọ Ẹ́vrí Sẹ́kọn</unitPattern>
+ </unit>
+ <unit type="speed-mile-per-hour">
+ <displayName>Mail-dẹm Fọ Ẹ́vrí Áwa</displayName>
+ <unitPattern count="one">{0} Mail Fọ Ẹ́vrí Áwa</unitPattern>
+ <unitPattern count="other">{0} Mail Fọ Ẹ́vrí Áwa</unitPattern>
+ </unit>
+ <unit type="speed-knot">
+ <displayName>Nọt-dẹm</displayName>
+ <unitPattern count="one">{0} Nọt</unitPattern>
+ <unitPattern count="other">{0} Nọt</unitPattern>
+ </unit>
+ <unit type="temperature-generic">
+ <displayName>°</displayName>
+ <unitPattern count="one">{0}°</unitPattern>
+ <unitPattern count="other">{0}°</unitPattern>
+ </unit>
+ <unit type="temperature-celsius">
+ <displayName>Digrís Sẹ́lsiọs</displayName>
+ <unitPattern count="one">{0} Digrí Sẹ́lsiọs</unitPattern>
+ <unitPattern count="other">{0} Digrís Sẹ́lsiọs</unitPattern>
+ </unit>
+ <unit type="temperature-fahrenheit">
+ <displayName>Digrís Fárẹ́nhait</displayName>
+ <unitPattern count="one">{0} Digrí Fárẹ́nhait</unitPattern>
+ <unitPattern count="other">{0} Digrís Fárẹ́nhait</unitPattern>
+ </unit>
+ <unit type="temperature-kelvin">
+ <displayName>Kẹ́lvin-dẹm</displayName>
+ <unitPattern count="one">{0} Kẹ́lvin</unitPattern>
+ <unitPattern count="other">{0} Kẹ́lvin</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
+ <displayName>Páund-Fut</displayName>
+ <unitPattern count="one">{0} Páund-Fut</unitPattern>
+ <unitPattern count="other">{0} Páund-Fut</unitPattern>
+ </unit>
+ <unit type="torque-newton-meter">
+ <displayName>Niúton-Míta-dẹm</displayName>
+ <unitPattern count="one">{0} Niúton-Míta</unitPattern>
+ <unitPattern count="other">{0} Niúton-Míta</unitPattern>
+ </unit>
+ <unit type="volume-cubic-kilometer">
+ <displayName>Kúbík Kílómíta-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík Kílómíta</unitPattern>
+ <unitPattern count="other">{0} Kúbík Kílómíta</unitPattern>
+ </unit>
+ <unit type="volume-cubic-meter">
+ <displayName>Kúbík Míta-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík Míta</unitPattern>
+ <unitPattern count="other">{0} Kúbík Míta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Kúbík Míta</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-centimeter">
+ <displayName>Kúbík Sẹntímíta-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík Sẹntímíta</unitPattern>
+ <unitPattern count="other">{0} Kúbík Sẹntímíta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Kúbík Sẹntímíta</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-mile">
+ <displayName>Kúbík Mail-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík Mail</unitPattern>
+ <unitPattern count="other">{0} Kúbík Mail</unitPattern>
+ </unit>
+ <unit type="volume-cubic-yard">
+ <displayName>Kúbík Yad-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík</unitPattern>
+ <unitPattern count="other">{0} Kúbík</unitPattern>
+ </unit>
+ <unit type="volume-cubic-foot">
+ <displayName>Kúbík Fut-dẹm</displayName>
+ <unitPattern count="one">{0} Kúbík Fut</unitPattern>
+ <unitPattern count="other">{0} Kúbík Fut</unitPattern>
+ </unit>
+ <unit type="volume-cubic-inch">
+ <displayName>Kúbík Ínchis</displayName>
+ <unitPattern count="one">{0} Kúbík Ínch</unitPattern>
+ <unitPattern count="other">{0} Kúbík Ínchis</unitPattern>
+ </unit>
+ <unit type="volume-megaliter">
+ <displayName>Mẹ́galíta-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́galíta</unitPattern>
+ <unitPattern count="other">{0} Mẹ́galíta</unitPattern>
+ </unit>
+ <unit type="volume-hectoliter">
+ <displayName>Hẹ́któlíta-dẹm</displayName>
+ <unitPattern count="one">{0} Hẹ́któlíta</unitPattern>
+ <unitPattern count="other">{0} Hẹ́któlíta</unitPattern>
+ </unit>
+ <unit type="volume-liter">
+ <displayName>Líta-dẹm</displayName>
+ <unitPattern count="one">{0}Líta</unitPattern>
+ <unitPattern count="other">{0}Líta</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Líta</perUnitPattern>
+ </unit>
+ <unit type="volume-deciliter">
+ <displayName>Dẹsílíta-dẹm</displayName>
+ <unitPattern count="one">{0} Dẹsílíta</unitPattern>
+ <unitPattern count="other">{0} Dẹsílíta</unitPattern>
+ </unit>
+ <unit type="volume-centiliter">
+ <displayName>Sẹntílíta-dẹm</displayName>
+ <unitPattern count="one">{0} Sẹntílíta</unitPattern>
+ <unitPattern count="other">{0} Sẹntílíta</unitPattern>
+ </unit>
+ <unit type="volume-milliliter">
+ <displayName>Milílíta-dẹm</displayName>
+ <unitPattern count="one">{0} Milílíta</unitPattern>
+ <unitPattern count="other">{0} Milílíta</unitPattern>
+ </unit>
+ <unit type="volume-pint-metric">
+ <displayName>Mẹ́trík Paint-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́trík Paint</unitPattern>
+ <unitPattern count="other">{0} Mẹ́trík Paint</unitPattern>
+ </unit>
+ <unit type="volume-cup-metric">
+ <displayName>Mẹ́trík Kọp-dẹm</displayName>
+ <unitPattern count="one">{0} Mẹ́trík Kọp</unitPattern>
+ <unitPattern count="other">{0} Mẹ́trík Kọp</unitPattern>
+ </unit>
+ <unit type="volume-acre-foot">
+ <displayName>Éka-Fut-dẹm</displayName>
+ <unitPattern count="one">{0} Éka-Fut</unitPattern>
+ <unitPattern count="other">{0} Éka-Fut</unitPattern>
+ </unit>
+ <unit type="volume-gallon">
+ <displayName>Gálọn-dẹm</displayName>
+ <unitPattern count="one">{0} Gálọn</unitPattern>
+ <unitPattern count="other">{0} Gálọn</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Gálọn</perUnitPattern>
+ </unit>
+ <unit type="volume-gallon-imperial">
+ <displayName>Brítísh Galọn-dẹm</displayName>
+ <unitPattern count="one">{0} Brítísh Galọn</unitPattern>
+ <unitPattern count="other">{0} Brítísh Galọn</unitPattern>
+ <perUnitPattern>{0} Fọ Ích Brítísh Galọn</perUnitPattern>
+ </unit>
+ <unit type="volume-quart">
+ <displayName>Kwọt-dẹm</displayName>
+ <unitPattern count="one">{0} Kwọt</unitPattern>
+ <unitPattern count="other">{0} Kwọt</unitPattern>
+ </unit>
+ <unit type="volume-pint">
+ <displayName>Paint-dẹm</displayName>
+ <unitPattern count="one">{0} Paint</unitPattern>
+ <unitPattern count="other">{0} Paint</unitPattern>
+ </unit>
+ <unit type="volume-cup">
+ <displayName>Kọp-dẹm</displayName>
+ <unitPattern count="one">{0} Kọp</unitPattern>
+ <unitPattern count="other">{0} Kọp</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce">
+ <displayName>Líkwíd Áuns-dẹm</displayName>
+ <unitPattern count="one">{0} Líkwíd Áuns</unitPattern>
+ <unitPattern count="other">{0} Líkwíd Áuns</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce-imperial">
+ <displayName>Brítísh Líkwíd Aúnsis-dẹm</displayName>
+ <unitPattern count="one">{0} Brítísh Líkwíd Aúns</unitPattern>
+ <unitPattern count="other">{0} Brítísh Líkwíd Aúns</unitPattern>
+ </unit>
+ <unit type="volume-tablespoon">
+ <displayName>Tébulspun-dẹm</displayName>
+ <unitPattern count="one">{0} Tébulspun</unitPattern>
+ <unitPattern count="other">{0} Tébulspun</unitPattern>
+ </unit>
+ <unit type="volume-teaspoon">
+ <displayName>Tíspun-dẹm</displayName>
+ <unitPattern count="one">{0} Tíspun</unitPattern>
+ <unitPattern count="other">{0} Tíspun</unitPattern>
+ </unit>
+ <unit type="volume-barrel">
+ <displayName>Drọm-dẹm</displayName>
+ <unitPattern count="one">{0} Drọm</unitPattern>
+ <unitPattern count="other">{0} Drọm</unitPattern>
+ </unit>
+ <coordinateUnit>
+ <displayName>Kádínál Pọint</displayName>
+ <coordinateUnitPattern type="east">{0} Ist</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0} Nọt</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0} Sáut</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0} Wẹst</coordinateUnitPattern>
+ </coordinateUnit>
+ </unitLength>
+ <unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0}Ẹ</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="per">
+ <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+ </compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="times">
+ <compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
+ </compoundUnit>
+ <unit type="acceleration-g-force">
+ <displayName>g-Fọs</displayName>
+ <unitPattern count="one">{0} G</unitPattern>
+ <unitPattern count="other">{0} G</unitPattern>
+ </unit>
+ <unit type="acceleration-meter-per-square-second">
+ <displayName>Míta/sẹk²</displayName>
+ <unitPattern count="one">{0} m/s²</unitPattern>
+ <unitPattern count="other">{0} m/s²</unitPattern>
+ </unit>
+ <unit type="angle-revolution">
+ <displayName>rẹv</displayName>
+ <unitPattern count="one">{0} rẹv</unitPattern>
+ <unitPattern count="other">{0} rẹv</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName>Rédians</displayName>
+ <unitPattern count="one">{0}Réd</unitPattern>
+ <unitPattern count="other">{0}Réd</unitPattern>
+ </unit>
+ <unit type="angle-degree">
+ <displayName>Digriis</displayName>
+ <unitPattern count="one">{0} dig</unitPattern>
+ <unitPattern count="other">{0} dig</unitPattern>
+ </unit>
+ <unit type="angle-arc-minute">
+ <displayName>Ákmínits</displayName>
+ <unitPattern count="one">{0} Ákmín</unitPattern>
+ <unitPattern count="other">{0} Ákmín</unitPattern>
+ </unit>
+ <unit type="angle-arc-second">
+ <displayName>Áksẹ́kọns</displayName>
+ <unitPattern count="one">{0} Áksẹ́k</unitPattern>
+ <unitPattern count="other">{0} Áksẹ́k</unitPattern>
+ </unit>
+ <unit type="area-square-kilometer">
+ <displayName>km²</displayName>
+ <unitPattern count="one">{0} km²</unitPattern>
+ <unitPattern count="other">{0} km²</unitPattern>
+ <perUnitPattern>{0}/km²</perUnitPattern>
+ </unit>
+ <unit type="area-hectare">
+ <displayName>Hẹ́ktas</displayName>
+ <unitPattern count="one">{0} hẹ</unitPattern>
+ <unitPattern count="other">{0} hẹ</unitPattern>
+ </unit>
+ <unit type="area-square-meter">
+ <displayName>Mítas²</displayName>
+ <unitPattern count="one">{0} m²</unitPattern>
+ <unitPattern count="other">{0} m²</unitPattern>
+ <perUnitPattern>{0}/m²</perUnitPattern>
+ </unit>
+ <unit type="area-square-centimeter">
+ <displayName>sm²</displayName>
+ <unitPattern count="one">{0} sm²</unitPattern>
+ <unitPattern count="other">{0} sm²</unitPattern>
+ <perUnitPattern>{0}/sm²</perUnitPattern>
+ </unit>
+ <unit type="area-square-mile">
+ <displayName>Skwiá Mails</displayName>
+ <unitPattern count="one">{0} skw ma</unitPattern>
+ <unitPattern count="other">{0} skw ma</unitPattern>
+ <perUnitPattern>{0}/ma²</perUnitPattern>
+ </unit>
+ <unit type="area-acre">
+ <displayName>Ékas</displayName>
+ <unitPattern count="one">{0} ék</unitPattern>
+ <unitPattern count="other">{0} ék</unitPattern>
+ </unit>
+ <unit type="area-square-yard">
+ <displayName>Yads²</displayName>
+ <unitPattern count="one">{0} yd²</unitPattern>
+ <unitPattern count="other">{0} yd²</unitPattern>
+ </unit>
+ <unit type="area-square-foot">
+ <displayName>Skw Fut-dẹm</displayName>
+ <unitPattern count="one">{0} Skw ft</unitPattern>
+ <unitPattern count="other">{0} Skw ft</unitPattern>
+ </unit>
+ <unit type="area-square-inch">
+ <displayName>Ínchis2</displayName>
+ <unitPattern count="one">{0} in²</unitPattern>
+ <unitPattern count="other">{0} in²</unitPattern>
+ <perUnitPattern>{0}/in²</perUnitPattern>
+ </unit>
+ <unit type="area-dunam">
+ <displayName>Dúnams</displayName>
+ <unitPattern count="one">{0} Dúnam</unitPattern>
+ <unitPattern count="other">{0} Dúnam</unitPattern>
+ </unit>
+ <unit type="concentr-karat">
+ <displayName>Karats</displayName>
+ <unitPattern count="one">{0} kar</unitPattern>
+ <unitPattern count="other">{0} kar</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName>mg/dL</displayName>
+ <unitPattern count="one">{0} mg/dL</unitPattern>
+ <unitPattern count="other">{0} mg/dL</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName>Mílimol/Líta</displayName>
+ <unitPattern count="one">{0} mmol/L</unitPattern>
+ <unitPattern count="other">{0} mmol/L</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName>Pat/Míliọn</displayName>
+ <unitPattern count="one">{0} ppm</unitPattern>
+ <unitPattern count="other">{0} ppm</unitPattern>
+ </unit>
+ <unit type="concentr-percent">
+ <displayName>Pasẹnt</displayName>
+ <unitPattern count="one">{0}%</unitPattern>
+ <unitPattern count="other">{0}%</unitPattern>
+ </unit>
+ <unit type="concentr-permille">
+ <displayName>Fọ Ích Taúzan</displayName>
+ <unitPattern count="one">{0}‰</unitPattern>
+ <unitPattern count="other">{0}‰</unitPattern>
+ </unit>
+ <unit type="concentr-permyriad">
+ <displayName>Fọ Ích Tẹ́n Taúzan</displayName>
+ <unitPattern count="one">{0}‱</unitPattern>
+ <unitPattern count="other">{0}‱</unitPattern>
+ </unit>
+ <unit type="concentr-mole">
+ <displayName>mol</displayName>
+ <unitPattern count="one">{0} mol</unitPattern>
+ <unitPattern count="other">{0} mol</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-kilometer">
+ <displayName>Lítas/km</displayName>
+ <unitPattern count="one">{0} L/km</unitPattern>
+ <unitPattern count="other">{0} L/km</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>L/100 km</displayName>
+ <unitPattern count="one">{0} L/100 km</unitPattern>
+ <unitPattern count="other">{0} L/100 km</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName>Mails/gal</displayName>
+ <unitPattern count="one">{0} mfeg</unitPattern>
+ <unitPattern count="other">{0} mfeg</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName>Mails/gal Brítish</displayName>
+ <unitPattern count="one">{0} mfeg Brít</unitPattern>
+ <unitPattern count="other">{0} mfeg Brít</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName>PBaít</displayName>
+ <unitPattern count="one">{0} PB</unitPattern>
+ <unitPattern count="other">{0} PB</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName>TBait</displayName>
+ <unitPattern count="one">{0} TB</unitPattern>
+ <unitPattern count="other">{0} TB</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName>Tbit</displayName>
+ <unitPattern count="one">{0} Tb</unitPattern>
+ <unitPattern count="other">{0} Tb</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName>GBait</displayName>
+ <unitPattern count="one">{0} GB</unitPattern>
+ <unitPattern count="other">{0} GB</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName>Gbit</displayName>
+ <unitPattern count="one">{0} Gb</unitPattern>
+ <unitPattern count="other">{0} Gb</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName>MBait</displayName>
+ <unitPattern count="one">{0} MB</unitPattern>
+ <unitPattern count="other">{0} MB</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName>Mbit</displayName>
+ <unitPattern count="one">{0} Mb</unitPattern>
+ <unitPattern count="other">{0} Mb</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName>KBait</displayName>
+ <unitPattern count="one">{0} kB</unitPattern>
+ <unitPattern count="other">{0} kB</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName>kbit</displayName>
+ <unitPattern count="one">{0} kb</unitPattern>
+ <unitPattern count="other">{0} kb</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName>Bait</displayName>
+ <unitPattern count="one">{0} Bait</unitPattern>
+ <unitPattern count="other">{0} Bait</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName>Bit</displayName>
+ <unitPattern count="one">{0} Bit</unitPattern>
+ <unitPattern count="other">{0} Bit</unitPattern>
+ </unit>
+ <unit type="duration-century">
+ <displayName>Họ́ndrẹ́d-yiẹ</displayName>
+ <unitPattern count="one">{0} Họ́nd-yiẹ́</unitPattern>
+ <unitPattern count="other">{0} Họ́nd-yiẹ́</unitPattern>
+ </unit>
+ <unit type="duration-decade">
+ <displayName>Tẹ́n-tẹ́n-yiẹ</displayName>
+ <unitPattern count="one">{0} Tẹ́n-yiẹ</unitPattern>
+ <unitPattern count="other">{0}Tẹ́n-yiẹ</unitPattern>
+ </unit>
+ <unit type="duration-year">
+ <displayName>Yiẹ</displayName>
+ <unitPattern count="one">{0} Yiẹ</unitPattern>
+ <unitPattern count="other">{0} Yiẹ</unitPattern>
+ <perUnitPattern>{0}/Yiẹ</perUnitPattern>
+ </unit>
+ <unit type="duration-month">
+ <displayName>Mọnt-dẹm</displayName>
+ <unitPattern count="one">{0} Mọnt</unitPattern>
+ <unitPattern count="other">{0} Mọnt</unitPattern>
+ <perUnitPattern>{0}/Mt</perUnitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName>Wik</displayName>
+ <unitPattern count="one">{0} Wik</unitPattern>
+ <unitPattern count="other">Wik {0}</unitPattern>
+ <perUnitPattern>{0} Wik</perUnitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName>Dez</displayName>
+ <unitPattern count="one">{0} dè</unitPattern>
+ <unitPattern count="other">{0} dez</unitPattern>
+ <perUnitPattern>{0}/d</perUnitPattern>
+ </unit>
+ <unit type="duration-hour">
+ <displayName>Áwas</displayName>
+ <unitPattern count="one">{0} Áwa</unitPattern>
+ <unitPattern count="other">{0} Áwa</unitPattern>
+ <perUnitPattern>{0}/a</perUnitPattern>
+ </unit>
+ <unit type="duration-minute">
+ <displayName>Mínit</displayName>
+ <unitPattern count="one">{0} Mínit</unitPattern>
+ <unitPattern count="other">{0} Mínit</unitPattern>
+ <perUnitPattern>{0}/min</perUnitPattern>
+ </unit>
+ <unit type="duration-second">
+ <displayName>Sẹ́kọns</displayName>
+ <unitPattern count="one">{0} Sẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Sẹ́kọn</unitPattern>
+ <perUnitPattern>{0}/sẹ́k</perUnitPattern>
+ </unit>
+ <unit type="duration-millisecond">
+ <displayName>Mílisẹ́kọn</displayName>
+ <unitPattern count="one">{0} Mílisẹ́kọn</unitPattern>
+ <unitPattern count="other">{0} Mílisẹ́kọn</unitPattern>
+ </unit>
+ <unit type="duration-microsecond">
+ <displayName>Maíkrosẹ́kọns</displayName>
+ <unitPattern count="one">{0}Maíksẹ́k</unitPattern>
+ <unitPattern count="other">{0}Maiksẹk</unitPattern>
+ </unit>
+ <unit type="duration-nanosecond">
+ <displayName>Nánosẹ́kọns</displayName>
+ <unitPattern count="one">{0} Nansẹk</unitPattern>
+ <unitPattern count="other">{0} Nansẹk</unitPattern>
+ </unit>
+ <unit type="electric-ampere">
+ <displayName>amps</displayName>
+ <unitPattern count="one">{0} A</unitPattern>
+ <unitPattern count="other">{0} A</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName>Míliámps</displayName>
+ <unitPattern count="one">{0} mA</unitPattern>
+ <unitPattern count="other">{0} mA</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName>Oms</displayName>
+ <unitPattern count="one">{0} Ω</unitPattern>
+ <unitPattern count="other">{0} Ω</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName>Volts</displayName>
+ <unitPattern count="one">{0} V</unitPattern>
+ <unitPattern count="other">{0} V</unitPattern>
+ </unit>
+ <unit type="energy-kilocalorie">
+ <displayName>kkal</displayName>
+ <unitPattern count="one">{0} kkal</unitPattern>
+ <unitPattern count="other">{0} kkal</unitPattern>
+ </unit>
+ <unit type="energy-calorie">
+ <displayName>kal</displayName>
+ <unitPattern count="one">{0} kal</unitPattern>
+ <unitPattern count="other">{0} kal</unitPattern>
+ </unit>
+ <unit type="energy-foodcalorie">
+ <displayName>Kal</displayName>
+ <unitPattern count="one">{0} Kal</unitPattern>
+ <unitPattern count="other">{0} Kal</unitPattern>
+ </unit>
+ <unit type="energy-kilojoule">
+ <displayName>Kílojul</displayName>
+ <unitPattern count="one">{0} kJ</unitPattern>
+ <unitPattern count="other">{0} kJ</unitPattern>
+ </unit>
+ <unit type="energy-joule">
+ <displayName>Joules</displayName>
+ <unitPattern count="one">{0} J</unitPattern>
+ <unitPattern count="other">{0} J</unitPattern>
+ </unit>
+ <unit type="energy-kilowatt-hour">
+ <displayName>KW-áwa</displayName>
+ <unitPattern count="one">{0} kWa</unitPattern>
+ <unitPattern count="other">{0} kWa</unitPattern>
+ </unit>
+ <unit type="energy-electronvolt">
+ <displayName>Ẹlẹ́ktrọ́nvolt</displayName>
+ <unitPattern count="one">{0} ẹV</unitPattern>
+ <unitPattern count="other">{0} ẹV</unitPattern>
+ </unit>
+ <unit type="energy-british-thermal-unit">
+ <displayName>BTY</displayName>
+ <unitPattern count="one">{0}Bty</unitPattern>
+ <unitPattern count="other">{0}Bty</unitPattern>
+ </unit>
+ <unit type="energy-therm-us">
+ <displayName>US Támál</displayName>
+ <unitPattern count="one">{0} US Támal</unitPattern>
+ <unitPattern count="other">{0} US Támal</unitPattern>
+ </unit>
+ <unit type="force-pound-force">
+ <displayName>Páund-Fọs</displayName>
+ <unitPattern count="one">{0} lbf</unitPattern>
+ <unitPattern count="other">{0} lbf</unitPattern>
+ </unit>
+ <unit type="force-newton">
+ <displayName>Niúton</displayName>
+ <unitPattern count="one">{0} N</unitPattern>
+ <unitPattern count="other">{0} N</unitPattern>
+ </unit>
+ <unit type="frequency-gigahertz">
+ <displayName>GHz</displayName>
+ <unitPattern count="one">{0} GHz</unitPattern>
+ <unitPattern count="other">{0} GHz</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName>MHz</displayName>
+ <unitPattern count="one">{0} MHz</unitPattern>
+ <unitPattern count="other">{0} MHz</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName>kHz</displayName>
+ <unitPattern count="one">{0} kHz</unitPattern>
+ <unitPattern count="other">{0} kHz</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName>Hz</displayName>
+ <unitPattern count="one">{0} Hz</unitPattern>
+ <unitPattern count="other">{0} Hz</unitPattern>
+ </unit>
+ <unit type="graphics-em">
+ <displayName>em</displayName>
+ <unitPattern count="one">{0} em</unitPattern>
+ <unitPattern count="other">{0} em</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>Píksẹls</displayName>
+ <unitPattern count="one">{0} Píksẹl</unitPattern>
+ <unitPattern count="other">{0} Píksẹl</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>Mẹ́gapíksẹls</displayName>
+ <unitPattern count="one">{0} Mẹ́gapíks</unitPattern>
+ <unitPattern count="other">{0} Mẹ́gapíks</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>Píksẹls Fọ Ích Sẹntímíta</displayName>
+ <unitPattern count="one">{0} PFS</unitPattern>
+ <unitPattern count="other">{0} PFS</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>Píksẹl Fọ Ẹ́vrí Inch</displayName>
+ <unitPattern count="one">{0} PFI</unitPattern>
+ <unitPattern count="other">{0} PFI</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>Pọints fọ ích sẹntímíta</displayName>
+ <unitPattern count="one">{0} PFIS</unitPattern>
+ <unitPattern count="other">{0} PFIS</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>Pọints Fọ Ẹ́vrí Inch</displayName>
+ <unitPattern count="one">{0} PFẸI</unitPattern>
+ <unitPattern count="other">{0} PFẸI</unitPattern>
+ </unit>
+ <unit type="length-kilometer">
+ <displayName>km</displayName>
+ <unitPattern count="one">{0} km</unitPattern>
+ <unitPattern count="other">{0} km</unitPattern>
+ <perUnitPattern>{0}/km</perUnitPattern>
+ </unit>
+ <unit type="length-meter">
+ <displayName>m</displayName>
+ <unitPattern count="one">{0} m</unitPattern>
+ <unitPattern count="other">{0} m</unitPattern>
+ <perUnitPattern>{0}/m</perUnitPattern>
+ </unit>
+ <unit type="length-decimeter">
+ <displayName>dm</displayName>
+ <unitPattern count="one">{0} dm</unitPattern>
+ <unitPattern count="other">{0} dm</unitPattern>
+ </unit>
+ <unit type="length-centimeter">
+ <displayName>sm</displayName>
+ <unitPattern count="one">{0} sm</unitPattern>
+ <unitPattern count="other">{0} sm</unitPattern>
+ <perUnitPattern>{0}/sm</perUnitPattern>
+ </unit>
+ <unit type="length-millimeter">
+ <displayName>mm</displayName>
+ <unitPattern count="one">{0} mm</unitPattern>
+ <unitPattern count="other">{0} mm</unitPattern>
+ </unit>
+ <unit type="length-micrometer">
+ <displayName>µmíta</displayName>
+ <unitPattern count="one">{0} µm</unitPattern>
+ <unitPattern count="other">{0} µm</unitPattern>
+ </unit>
+ <unit type="length-nanometer">
+ <displayName>nm</displayName>
+ <unitPattern count="one">{0} nm</unitPattern>
+ <unitPattern count="other">{0} nm</unitPattern>
+ </unit>
+ <unit type="length-picometer">
+ <displayName>pm</displayName>
+ <unitPattern count="one">{0} pm</unitPattern>
+ <unitPattern count="other">{0} pm</unitPattern>
+ </unit>
+ <unit type="length-mile">
+ <displayName>Mails</displayName>
+ <unitPattern count="one">{0} ma</unitPattern>
+ <unitPattern count="other">{0} ma</unitPattern>
+ </unit>
+ <unit type="length-yard">
+ <displayName>Yads</displayName>
+ <unitPattern count="one">{0} yd</unitPattern>
+ <unitPattern count="other">{0} yd</unitPattern>
+ </unit>
+ <unit type="length-foot">
+ <displayName>Fut-dẹm</displayName>
+ <unitPattern count="one">{0} ft</unitPattern>
+ <unitPattern count="other">{0} ft</unitPattern>
+ <perUnitPattern>{0}/ft</perUnitPattern>
+ </unit>
+ <unit type="length-inch">
+ <displayName>Ínchis</displayName>
+ <unitPattern count="one">{0} in</unitPattern>
+ <unitPattern count="other">{0} in</unitPattern>
+ <perUnitPattern>{0}/in</perUnitPattern>
+ </unit>
+ <unit type="length-parsec">
+ <displayName>parsecs</displayName>
+ <unitPattern count="one">{0} pc</unitPattern>
+ <unitPattern count="other">{0} pc</unitPattern>
+ </unit>
+ <unit type="length-light-year">
+ <displayName>Laít Yiẹ</displayName>
+ <unitPattern count="one">{0}ly</unitPattern>
+ <unitPattern count="other">{0}ly</unitPattern>
+ </unit>
+ <unit type="length-astronomical-unit">
+ <displayName>ay</displayName>
+ <unitPattern count="one">{0} ay</unitPattern>
+ <unitPattern count="other">{0} ay</unitPattern>
+ </unit>
+ <unit type="length-nautical-mile">
+ <displayName>nmi</displayName>
+ <unitPattern count="one">{0} nmi</unitPattern>
+ <unitPattern count="other">{0} nmi</unitPattern>
+ </unit>
+ <unit type="length-mile-scandinavian">
+ <displayName>smi</displayName>
+ <unitPattern count="one">{0} smi</unitPattern>
+ <unitPattern count="other">{0} smi</unitPattern>
+ </unit>
+ <unit type="length-point">
+ <displayName>points</displayName>
+ <unitPattern count="one">{0} pt</unitPattern>
+ <unitPattern count="other">{0} pt</unitPattern>
+ </unit>
+ <unit type="length-solar-radius">
+ <displayName>Sólá Rédiọs-Dẹm</displayName>
+ <unitPattern count="one">{0} R☉</unitPattern>
+ <unitPattern count="other">{0} R☉</unitPattern>
+ </unit>
+ <unit type="light-lux">
+ <displayName>lux</displayName>
+ <unitPattern count="one">{0} lx</unitPattern>
+ <unitPattern count="other">{0} lx</unitPattern>
+ </unit>
+ <unit type="light-solar-luminosity">
+ <displayName>Sólá Luminósítis</displayName>
+ <unitPattern count="one">{0} L☉</unitPattern>
+ <unitPattern count="other">{0} L☉</unitPattern>
+ </unit>
+ <unit type="mass-metric-ton">
+ <displayName>T</displayName>
+ <unitPattern count="one">{0} t</unitPattern>
+ <unitPattern count="other">{0} t</unitPattern>
+ </unit>
+ <unit type="mass-kilogram">
+ <displayName>kg</displayName>
+ <unitPattern count="one">{0} kg</unitPattern>
+ <unitPattern count="other">{0} kg</unitPattern>
+ <perUnitPattern>{0}/kg</perUnitPattern>
+ </unit>
+ <unit type="mass-gram">
+ <displayName>Grams</displayName>
+ <unitPattern count="one">{0} g</unitPattern>
+ <unitPattern count="other">{0} g</unitPattern>
+ <perUnitPattern>{0}/g</perUnitPattern>
+ </unit>
+ <unit type="mass-milligram">
+ <displayName>mg</displayName>
+ <unitPattern count="one">{0} mg</unitPattern>
+ <unitPattern count="other">{0} mg</unitPattern>
+ </unit>
+ <unit type="mass-microgram">
+ <displayName>µg</displayName>
+ <unitPattern count="one">{0} µg</unitPattern>
+ <unitPattern count="other">{0} µg</unitPattern>
+ </unit>
+ <unit type="mass-ton">
+ <displayName>Tọns</displayName>
+ <unitPattern count="one">{0} tn</unitPattern>
+ <unitPattern count="other">{0} tn</unitPattern>
+ </unit>
+ <unit type="mass-pound">
+ <displayName>Paunds</displayName>
+ <unitPattern count="one">{0} lb</unitPattern>
+ <unitPattern count="other">{0} lb</unitPattern>
+ <perUnitPattern>{0}/lb</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce">
+ <displayName>oz</displayName>
+ <unitPattern count="one">{0} oz</unitPattern>
+ <unitPattern count="other">{0} oz</unitPattern>
+ <perUnitPattern>{0}/oz</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce-troy">
+ <displayName>oz trọi</displayName>
+ <unitPattern count="one">{0} oz t</unitPattern>
+ <unitPattern count="other">{0} oz t</unitPattern>
+ </unit>
+ <unit type="mass-carat">
+ <displayName>Kárats</displayName>
+ <unitPattern count="one">{0} Kt</unitPattern>
+ <unitPattern count="other">{0} Kt</unitPattern>
+ </unit>
+ <unit type="mass-dalton">
+ <displayName>Dọ́ltons</displayName>
+ <unitPattern count="one">{0} Dọ</unitPattern>
+ <unitPattern count="other">{0} Dọ</unitPattern>
+ </unit>
+ <unit type="mass-earth-mass">
+ <displayName>Ẹ́t Masís</displayName>
+ <unitPattern count="one">{0} M⊕</unitPattern>
+ <unitPattern count="other">{0} M⊕</unitPattern>
+ </unit>
+ <unit type="mass-solar-mass">
+ <displayName>Sólá Masís</displayName>
+ <unitPattern count="one">{0} M☉</unitPattern>
+ <unitPattern count="other">{0} M☉</unitPattern>
+ </unit>
+ <unit type="power-gigawatt">
+ <displayName>GW</displayName>
+ <unitPattern count="one">{0} GW</unitPattern>
+ <unitPattern count="other">{0} GW</unitPattern>
+ </unit>
+ <unit type="power-megawatt">
+ <displayName>MW</displayName>
+ <unitPattern count="one">{0} MW</unitPattern>
+ <unitPattern count="other">{0} MW</unitPattern>
+ </unit>
+ <unit type="power-kilowatt">
+ <displayName>kW</displayName>
+ <unitPattern count="one">{0} kW</unitPattern>
+ <unitPattern count="other">{0} kW</unitPattern>
+ </unit>
+ <unit type="power-watt">
+ <displayName>Wats</displayName>
+ <unitPattern count="one">{0} W</unitPattern>
+ <unitPattern count="other">{0} W</unitPattern>
+ </unit>
+ <unit type="power-milliwatt">
+ <displayName>mW</displayName>
+ <unitPattern count="one">{0} mW</unitPattern>
+ <unitPattern count="other">{0} mW</unitPattern>
+ </unit>
+ <unit type="power-horsepower">
+ <displayName>hp</displayName>
+ <unitPattern count="one">{0} hp</unitPattern>
+ <unitPattern count="other">{0} hp</unitPattern>
+ </unit>
+ <unit type="pressure-millimeter-ofhg">
+ <displayName>mmHg</displayName>
+ <unitPattern count="one">{0} mmHg</unitPattern>
+ <unitPattern count="other">{0} mmHg</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName>pfẹsi</displayName>
+ <unitPattern count="one">{0} pẹsi</unitPattern>
+ <unitPattern count="other">{0} pẹsi</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName>inHg</displayName>
+ <unitPattern count="one">{0} inHg</unitPattern>
+ <unitPattern count="other">{0} inHg</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
+ <displayName>Baa</displayName>
+ <unitPattern count="one">{0} Baa</unitPattern>
+ <unitPattern count="other">{0} Baa</unitPattern>
+ </unit>
+ <unit type="pressure-millibar">
+ <displayName>mbaa</displayName>
+ <unitPattern count="one">{0} mbaa</unitPattern>
+ <unitPattern count="other">{0} mbaa</unitPattern>
+ </unit>
+ <unit type="pressure-atmosphere">
+ <displayName>atm</displayName>
+ <unitPattern count="one">{0} atm</unitPattern>
+ <unitPattern count="other">{0} atm</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName>Pa</displayName>
+ <unitPattern count="one">{0} Pa</unitPattern>
+ <unitPattern count="other">{0} Pa</unitPattern>
+ </unit>
+ <unit type="pressure-hectopascal">
+ <displayName>hPa</displayName>
+ <unitPattern count="one">{0} hPa</unitPattern>
+ <unitPattern count="other">{0} hPa</unitPattern>
+ </unit>
+ <unit type="pressure-kilopascal">
+ <displayName>kPa</displayName>
+ <unitPattern count="one">{0} kPa</unitPattern>
+ <unitPattern count="other">{0} kPa</unitPattern>
+ </unit>
+ <unit type="pressure-megapascal">
+ <displayName>MPa</displayName>
+ <unitPattern count="one">{0} MPa</unitPattern>
+ <unitPattern count="other">{0} MPa</unitPattern>
+ </unit>
+ <unit type="speed-kilometer-per-hour">
+ <displayName>km/áwa</displayName>
+ <unitPattern count="one">{0} km/á</unitPattern>
+ <unitPattern count="other">{0} km/á</unitPattern>
+ </unit>
+ <unit type="speed-meter-per-second">
+ <displayName>Mítas/Sẹk</displayName>
+ <unitPattern count="one">{0} m/s</unitPattern>
+ <unitPattern count="other">{0} m/s</unitPattern>
+ </unit>
+ <unit type="speed-mile-per-hour">
+ <displayName>Mails/Áwa</displayName>
+ <unitPattern count="one">{0} mfẹa</unitPattern>
+ <unitPattern count="other">{0} mfẹa</unitPattern>
+ </unit>
+ <unit type="speed-knot">
+ <displayName>Nọt</displayName>
+ <unitPattern count="one">{0} Nọt</unitPattern>
+ <unitPattern count="other">{0} Nọt</unitPattern>
+ </unit>
+ <unit type="temperature-generic">
+ <displayName>°</displayName>
+ <unitPattern count="one">{0}°</unitPattern>
+ <unitPattern count="other">{0}°</unitPattern>
+ </unit>
+ <unit type="temperature-celsius">
+ <displayName>Dig. C</displayName>
+ <unitPattern count="one">{0}°C</unitPattern>
+ <unitPattern count="other">{0}°C</unitPattern>
+ </unit>
+ <unit type="temperature-fahrenheit">
+ <displayName>dig. F</displayName>
+ <unitPattern count="one">{0}°F</unitPattern>
+ <unitPattern count="other">{0}°F</unitPattern>
+ </unit>
+ <unit type="temperature-kelvin">
+ <displayName>K</displayName>
+ <unitPattern count="one">{0} K</unitPattern>
+ <unitPattern count="other">{0} K</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
+ <displayName>lbf⋅ft</displayName>
+ <unitPattern count="one">{0} lbf⋅ft</unitPattern>
+ <unitPattern count="other">{0} lbf⋅ft</unitPattern>
+ </unit>
+ <unit type="torque-newton-meter">
+ <displayName>N.m</displayName>
+ <unitPattern count="one">{0} N⋅m</unitPattern>
+ <unitPattern count="other">{0} N⋅m</unitPattern>
+ </unit>
+ <unit type="volume-cubic-kilometer">
+ <displayName>km³</displayName>
+ <unitPattern count="one">{0} km³</unitPattern>
+ <unitPattern count="other">{0} km³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-meter">
+ <displayName>m³</displayName>
+ <unitPattern count="one">{0} m³</unitPattern>
+ <unitPattern count="other">{0} m³</unitPattern>
+ <perUnitPattern>{0}/m³</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-centimeter">
+ <displayName>sm³</displayName>
+ <unitPattern count="one">{0} sm³</unitPattern>
+ <unitPattern count="other">{0} sm³</unitPattern>
+ <perUnitPattern>{0}/sm³</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-mile">
+ <displayName>ma³</displayName>
+ <unitPattern count="one">{0} ma³</unitPattern>
+ <unitPattern count="other">{0} ma³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-yard">
+ <displayName>Yáds³</displayName>
+ <unitPattern count="one">{0} yd³</unitPattern>
+ <unitPattern count="other">{0} yd³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-foot">
+ <displayName>Fut³</displayName>
+ <unitPattern count="one">{0} ft³</unitPattern>
+ <unitPattern count="other">{0} ft³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-inch">
+ <displayName>Ínchis³</displayName>
+ <unitPattern count="one">{0} in³</unitPattern>
+ <unitPattern count="other">{0} in³</unitPattern>
+ </unit>
+ <unit type="volume-megaliter">
+ <displayName>ML</displayName>
+ <unitPattern count="one">{0} ML</unitPattern>
+ <unitPattern count="other">{0} ML</unitPattern>
+ </unit>
+ <unit type="volume-hectoliter">
+ <displayName>hL</displayName>
+ <unitPattern count="one">{0} hL</unitPattern>
+ <unitPattern count="other">{0} hL</unitPattern>
+ </unit>
+ <unit type="volume-liter">
+ <displayName>Lítas</displayName>
+ <unitPattern count="one">{0} L</unitPattern>
+ <unitPattern count="other">{0} L</unitPattern>
+ <perUnitPattern>{0}/L</perUnitPattern>
+ </unit>
+ <unit type="volume-deciliter">
+ <displayName>dl</displayName>
+ <unitPattern count="one">{0} dl</unitPattern>
+ <unitPattern count="other">{0} dl</unitPattern>
+ </unit>
+ <unit type="volume-centiliter">
+ <displayName>sl</displayName>
+ <unitPattern count="one">{0} sl</unitPattern>
+ <unitPattern count="other">{0} sl</unitPattern>
+ </unit>
+ <unit type="volume-milliliter">
+ <displayName>ml</displayName>
+ <unitPattern count="one">{0} ml</unitPattern>
+ <unitPattern count="other">{0} ml</unitPattern>
+ </unit>
+ <unit type="volume-pint-metric">
+ <displayName>mpt</displayName>
+ <unitPattern count="one">{0} mpt</unitPattern>
+ <unitPattern count="other">{0} mpt</unitPattern>
+ </unit>
+ <unit type="volume-cup-metric">
+ <displayName>mkọp</displayName>
+ <unitPattern count="one">{0} mk</unitPattern>
+ <unitPattern count="other">{0} mk</unitPattern>
+ </unit>
+ <unit type="volume-acre-foot">
+ <displayName>Éka ft</displayName>
+ <unitPattern count="one">{0} ek ft</unitPattern>
+ <unitPattern count="other">{0} ek ft</unitPattern>
+ </unit>
+ <unit type="volume-gallon">
+ <displayName>gal</displayName>
+ <unitPattern count="one">{0} gal</unitPattern>
+ <unitPattern count="other">{0} gal</unitPattern>
+ <perUnitPattern>{0}/gal US</perUnitPattern>
+ </unit>
+ <unit type="volume-gallon-imperial">
+ <displayName>Brít. gal</displayName>
+ <unitPattern count="one">{0} Brít. gal</unitPattern>
+ <unitPattern count="other">{0} Brít. gal</unitPattern>
+ <perUnitPattern>{0} Brít. gal</perUnitPattern>
+ </unit>
+ <unit type="volume-quart">
+ <displayName>kwts</displayName>
+ <unitPattern count="one">{0} kwt</unitPattern>
+ <unitPattern count="other">{0} kwt</unitPattern>
+ </unit>
+ <unit type="volume-pint">
+ <displayName>Paints</displayName>
+ <unitPattern count="one">{0} pt</unitPattern>
+ <unitPattern count="other">{0} pt</unitPattern>
+ </unit>
+ <unit type="volume-cup">
+ <displayName>Kọps</displayName>
+ <unitPattern count="one">{0} Kọp</unitPattern>
+ <unitPattern count="other">{0} Kọp</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce">
+ <displayName>fl oz</displayName>
+ <unitPattern count="one">{0} fl oz</unitPattern>
+ <unitPattern count="other">{0} fl oz</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce-imperial">
+ <displayName>Brít. Fl oz</displayName>
+ <unitPattern count="one">{0} fl oz Brit.</unitPattern>
+ <unitPattern count="other">{0} fl oz Brit.</unitPattern>
+ </unit>
+ <unit type="volume-tablespoon">
+ <displayName>Tbsp</displayName>
+ <unitPattern count="one">{0} Tbsp</unitPattern>
+ <unitPattern count="other">{0} Tbsp</unitPattern>
+ </unit>
+ <unit type="volume-teaspoon">
+ <displayName>Tsp</displayName>
+ <unitPattern count="one">{0} Tsp</unitPattern>
+ <unitPattern count="other">{0} Tsp</unitPattern>
+ </unit>
+ <unit type="volume-barrel">
+ <displayName>Drọm</displayName>
+ <unitPattern count="one">{0}dr</unitPattern>
+ <unitPattern count="other">{0}dr</unitPattern>
+ </unit>
+ <coordinateUnit>
+ <displayName>Pọint</displayName>
+ <coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+ </coordinateUnit>
+ </unitLength>
+ <unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0}Ẹ</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="per">
+ <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+ </compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="times">
+ <compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
+ </compoundUnit>
+ <unit type="concentr-percent">
+ <displayName>%</displayName>
+ <unitPattern count="one">{0}%</unitPattern>
+ <unitPattern count="other">{0}%</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>L/100km</displayName>
+ <unitPattern count="one">{0}L/100km</unitPattern>
+ <unitPattern count="other">{0}L/100km</unitPattern>
+ </unit>
+ <unit type="duration-year">
+ <displayName>Yiẹ</displayName>
+ <unitPattern count="one">{0}Yiẹ</unitPattern>
+ <unitPattern count="other">{0}Yiẹ</unitPattern>
+ </unit>
+ <unit type="duration-month">
+ <displayName>Mọnt</displayName>
+ <unitPattern count="one">{0}Mọnt</unitPattern>
+ <unitPattern count="other">{0}Mọnt</unitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName>Wik</displayName>
+ <unitPattern count="one">{0}Wik</unitPattern>
+ <unitPattern count="other">{0}Wik</unitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName>Dè</displayName>
+ <unitPattern count="one">{0}Dè</unitPattern>
+ <unitPattern count="other">{0}Dè</unitPattern>
+ </unit>
+ <unit type="duration-hour">
+ <displayName>Áwa</displayName>
+ <unitPattern count="one">{0}Áwa</unitPattern>
+ <unitPattern count="other">{0}Áwa</unitPattern>
+ </unit>
+ <unit type="duration-minute">
+ <displayName>Mínit</displayName>
+ <unitPattern count="one">{0}Mínit</unitPattern>
+ <unitPattern count="other">{0}Mínit</unitPattern>
+ </unit>
+ <unit type="duration-second">
+ <displayName>Sẹ́kọn</displayName>
+ <unitPattern count="one">{0}Sẹ́kọn</unitPattern>
+ <unitPattern count="other">{0}Sẹ́kọn</unitPattern>
+ </unit>
+ <unit type="duration-millisecond">
+ <displayName>Mílisẹ́kọns</displayName>
+ <unitPattern count="one">{0} ms</unitPattern>
+ <unitPattern count="other">{0} ms</unitPattern>
+ </unit>
+ <unit type="length-kilometer">
+ <displayName>km</displayName>
+ <unitPattern count="one">{0}km</unitPattern>
+ <unitPattern count="other">{0}km</unitPattern>
+ </unit>
+ <unit type="length-meter">
+ <displayName>m</displayName>
+ <unitPattern count="one">{0}m</unitPattern>
+ <unitPattern count="other">{0}m</unitPattern>
+ </unit>
+ <unit type="length-centimeter">
+ <displayName>sm</displayName>
+ <unitPattern count="one">{0}sm</unitPattern>
+ <unitPattern count="other">{0}sm</unitPattern>
+ </unit>
+ <unit type="length-millimeter">
+ <displayName>mm</displayName>
+ <unitPattern count="one">{0}mm</unitPattern>
+ <unitPattern count="other">{0}mm</unitPattern>
+ </unit>
+ <unit type="mass-kilogram">
+ <displayName>kg</displayName>
+ <unitPattern count="one">{0}kg</unitPattern>
+ <unitPattern count="other">{0}kg</unitPattern>
+ </unit>
+ <unit type="mass-gram">
+ <displayName>Gram</displayName>
+ <unitPattern count="one">{0}g</unitPattern>
+ <unitPattern count="other">{0}g</unitPattern>
+ </unit>
+ <unit type="speed-kilometer-per-hour">
+ <displayName>km/áw</displayName>
+ <unitPattern count="one">{0} km/á</unitPattern>
+ <unitPattern count="other">{0} km/á</unitPattern>
+ </unit>
+ <unit type="temperature-celsius">
+ <displayName>°C</displayName>
+ <unitPattern count="one">{0}°C</unitPattern>
+ <unitPattern count="other">{0}°C</unitPattern>
+ </unit>
+ <unit type="volume-liter">
+ <displayName>Líta</displayName>
+ <unitPattern count="one">{0}L</unitPattern>
+ <unitPattern count="other">{0}L</unitPattern>
+ </unit>
+ <coordinateUnit>
+ <displayName>Pọint</displayName>
+ <coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+ </coordinateUnit>
+ </unitLength>
+ <durationUnit type="hm">
+ <durationUnitPattern>h:mm</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>h:mm:ss</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>m:ss</durationUnitPattern>
+ </durationUnit>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0}, an {1}</listPatternPart>
+ <listPatternPart type="2">{0} an {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="or">
+ <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="or-narrow">
+ <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="or-short">
+ <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="standard-narrow">
+ <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="standard-short">
+ <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">
+ <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-narrow">
+ <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-short">
+ <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>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>yẹs:y</yesstr>
+ <nostr>no:n</nostr>
+ </messages>
+ </posix>
+ <characterLabels>
+ <characterLabelPattern type="all">{0} — ọl</characterLabelPattern>
+ <characterLabelPattern type="category-list">{0}: {1}</characterLabelPattern>
+ <characterLabelPattern type="compatibility">{0} — Fít ích ọ́da</characterLabelPattern>
+ <characterLabelPattern type="enclosed">{0} — Sọráund</characterLabelPattern>
+ <characterLabelPattern type="extended">{0} — Strẹch</characterLabelPattern>
+ <characterLabelPattern type="historic">{0} — Impọ́tant</characterLabelPattern>
+ <characterLabelPattern type="miscellaneous">{0} — Dífrẹ́n Dífrẹ́n Tins</characterLabelPattern>
+ <characterLabelPattern type="other">{0} — Ọ́da</characterLabelPattern>
+ <characterLabelPattern type="scripts">Raítín Sístẹm-dẹm —{0}</characterLabelPattern>
+ <characterLabelPattern type="strokes" count="one">{0}Strok</characterLabelPattern>
+ <characterLabelPattern type="strokes" count="other">{0}Strok</characterLabelPattern>
+ <characterLabel type="activities">Tins Wé De Hápun</characterLabel>
+ <characterLabel type="african_scripts">Áfríká Raítín Sístẹm</characterLabel>
+ <characterLabel type="american_scripts">Amẹ́ríká Raítín Sístẹm</characterLabel>
+ <characterLabel type="animal">Ánímọl</characterLabel>
+ <characterLabel type="animals_nature">Ánímọl ọ Néchọ</characterLabel>
+ <characterLabel type="arrows">Áro</characterLabel>
+ <characterLabel type="body">Bọ́di</characterLabel>
+ <characterLabel type="box_drawing">Bọ́ks Drọyin</characterLabel>
+ <characterLabel type="braille">Blaínd Pípol Raítín Sístẹm</characterLabel>
+ <characterLabel type="building">Bíldin</characterLabel>
+ <characterLabel type="bullets_stars">Búlẹt ọ Sta</characterLabel>
+ <characterLabel type="consonantal_jamo">Jamo Kọ́nsónant</characterLabel>
+ <characterLabel type="currency_symbols">Mọní Símbol</characterLabel>
+ <characterLabel type="dash_connector">Dash ọ Kọnẹ́ktọ</characterLabel>
+ <characterLabel type="digits">Nọ́mba</characterLabel>
+ <characterLabel type="dingbats">Díngbat</characterLabel>
+ <characterLabel type="divination_symbols">Fọ́tiún Tẹ́lín Símbol</characterLabel>
+ <characterLabel type="downwards_arrows">Aro Wé Pọínt Daun</characterLabel>
+ <characterLabel type="downwards_upwards_arrows">Aro Wé Pọínt Ọ́p & Daun</characterLabel>
+ <characterLabel type="east_asian_scripts">Íst Éshiá Raítín Sístẹm</characterLabel>
+ <characterLabel type="emoji">Ẹ́móji</characterLabel>
+ <characterLabel type="european_scripts">Yúrop Raítín Sístẹm</characterLabel>
+ <characterLabel type="female">Wúman</characterLabel>
+ <characterLabel type="flag">Flag</characterLabel>
+ <characterLabel type="flags">Flag-dẹm</characterLabel>
+ <characterLabel type="food_drink">Fud & Drink</characterLabel>
+ <characterLabel type="format">Fọ́mat</characterLabel>
+ <characterLabel type="format_whitespace">Fọ́mat & Waítspes</characterLabel>
+ <characterLabel type="full_width_form_variant">Fúl-Waid Taíp</characterLabel>
+ <characterLabel type="geometric_shapes">Jiọmẹ́tri Shep</characterLabel>
+ <characterLabel type="half_width_form_variant">Háf-Waid Taíp</characterLabel>
+ <characterLabel type="han_characters">Hán ABChD</characterLabel>
+ <characterLabel type="han_radicals">Han Rádikál</characterLabel>
+ <characterLabel type="hanja">Hánja</characterLabel>
+ <characterLabel type="hanzi_simplified">Símpúl Hánzi</characterLabel>
+ <characterLabel type="hanzi_traditional">Nọ́mál Hánzi</characterLabel>
+ <characterLabel type="heart">Hat</characterLabel>
+ <characterLabel type="historic_scripts">Impọ́tánt Raítín Sístẹm</characterLabel>
+ <characterLabel type="ideographic_desc_characters">Idiógráfík dískr. Kárákta</characterLabel>
+ <characterLabel type="japanese_kana">Japán Kána</characterLabel>
+ <characterLabel type="kanbun">Kanbun</characterLabel>
+ <characterLabel type="kanji">Kánji</characterLabel>
+ <characterLabel type="keycap">Kíkap</characterLabel>
+ <characterLabel type="leftwards_arrows">Áro Wé Pọínt Lẹft</characterLabel>
+ <characterLabel type="leftwards_rightwards_arrows">Áro Wé Pọínt Lẹft & Rait</characterLabel>
+ <characterLabel type="letterlike_symbols">Símbul Wé Bi Laik ABChD</characterLabel>
+ <characterLabel type="limited_use">Límítẹ́d yuz</characterLabel>
+ <characterLabel type="male">Man</characterLabel>
+ <characterLabel type="math_symbols">Matimátík Símbọl</characterLabel>
+ <characterLabel type="middle_eastern_scripts">Mídúl Ístán Raítín Sístẹm</characterLabel>
+ <characterLabel type="miscellaneous">Dífrẹ́n Dífrẹ́n Tins</characterLabel>
+ <characterLabel type="modern_scripts">Mọ́dán Raítín Sístẹm</characterLabel>
+ <characterLabel type="modifier">Mọdifaya</characterLabel>
+ <characterLabel type="musical_symbols">Miúzík Símbul</characterLabel>
+ <characterLabel type="nature">Néchọ</characterLabel>
+ <characterLabel type="nonspacing">Nospes</characterLabel>
+ <characterLabel type="numbers">Nọ́mba-dẹm</characterLabel>
+ <characterLabel type="objects">Sọ́mtin</characterLabel>
+ <characterLabel type="other">Ọ́da</characterLabel>
+ <characterLabel type="paired">Tuú bai Tuu</characterLabel>
+ <characterLabel type="person">Pẹ́sin</characterLabel>
+ <characterLabel type="phonetic_alphabet">Fọnẹ́tík Álfábẹt</characterLabel>
+ <characterLabel type="pictographs">Piktógráfi</characterLabel>
+ <characterLabel type="place">Ples</characterLabel>
+ <characterLabel type="plant">Plant</characterLabel>
+ <characterLabel type="punctuation">Pọnkchuéshọn</characterLabel>
+ <characterLabel type="rightwards_arrows">Áro Wé Pọínt Rait</characterLabel>
+ <characterLabel type="sign_standard_symbols">Sain ọ Símbul</characterLabel>
+ <characterLabel type="small_form_variant">Tins Dẹm Smọ́l Smọ́l Taíp</characterLabel>
+ <characterLabel type="smiley">Smaílí</characterLabel>
+ <characterLabel type="smileys_people">Smaílí ọ Pẹ́sin</characterLabel>
+ <characterLabel type="south_asian_scripts">Saút Éshiá Raítín Sístẹm</characterLabel>
+ <characterLabel type="southeast_asian_scripts">Saút Íst Raítín Sístẹm</characterLabel>
+ <characterLabel type="spacing">Mék Spes</characterLabel>
+ <characterLabel type="sport">Átlẹ́tík Spọt</characterLabel>
+ <characterLabel type="symbols">Símbul</characterLabel>
+ <characterLabel type="technical_symbols">Tẹ́kíníkál Símbul</characterLabel>
+ <characterLabel type="tone_marks">Tón Mak</characterLabel>
+ <characterLabel type="travel">Trávul</characterLabel>
+ <characterLabel type="travel_places">Trávul ọ Ples</characterLabel>
+ <characterLabel type="upwards_arrows">Áro-dẹm Wé Pọínt Ọp</characterLabel>
+ <characterLabel type="variant_forms">dífrẹ́n dífrẹ́n taip</characterLabel>
+ <characterLabel type="vocalic_jamo">Vokálík Jámo</characterLabel>
+ <characterLabel type="weather">Wẹ́da</characterLabel>
+ <characterLabel type="western_asian_scripts">Wẹ́stán Éshiá Raítín Sístẹm</characterLabel>
+ <characterLabel type="whitespace">Waítspes</characterLabel>
+ </characterLabels>
+ <typographicNames>
+ <axisName type="ital">Itálik</axisName>
+ <axisName type="opsz">Taípfés Saiz An Dizain Fọ Príntín Tins</axisName>
+ <axisName type="slnt">Slop</axisName>
+ <axisName type="wdth">Di Waid</axisName>
+ <axisName type="wght">Hẹ́vi</axisName>
+ <styleName type="ital" subtype="1">Kọ́siv</styleName>
+ <styleName type="opsz" subtype="8">Raítin Wé Dé Ọ́ndá Píkchọ</styleName>
+ <styleName type="opsz" subtype="12">Di Mén Pát Ọf Wétín Pẹ́sin Rait</styleName>
+ <styleName type="opsz" subtype="18">Taítul</styleName>
+ <styleName type="opsz" subtype="72">Sho</styleName>
+ <styleName type="opsz" subtype="144">Pósta</styleName>
+ <styleName type="slnt" subtype="-12">I Slóp Gó Bákwọd</styleName>
+ <styleName type="slnt" subtype="0">Stánd Stret</styleName>
+ <styleName type="slnt" subtype="12">I Gẹ́t Slop</styleName>
+ <styleName type="slnt" subtype="24">I Gẹ́t Mọ́ Slop</styleName>
+ <styleName type="wdth" subtype="50">Ridiúz Waid Mọ́ Mọ</styleName>
+ <styleName type="wdth" subtype="50" alt="compressed">Kọmprẹ́s Mọ́ Mọ</styleName>
+ <styleName type="wdth" subtype="50" alt="narrow">Náró Mọ́ Mọ</styleName>
+ <styleName type="wdth" subtype="62.5">Ridiúz Waid Mọ</styleName>
+ <styleName type="wdth" subtype="62.5" alt="compressed">Kọmprẹ́s Mọ</styleName>
+ <styleName type="wdth" subtype="62.5" alt="narrow">Mọ́ Náro</styleName>
+ <styleName type="wdth" subtype="75">Ridiúz Waid</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">Kọmprẹs</styleName>
+ <styleName type="wdth" subtype="75" alt="narrow">Kọmprẹs - Náro</styleName>
+ <styleName type="wdth" subtype="87.5">Ridiúz Waid Háf Wè</styleName>
+ <styleName type="wdth" subtype="87.5" alt="compressed">Kọmprẹ́s Háf Wè</styleName>
+ <styleName type="wdth" subtype="87.5" alt="narrow">Háf Náro</styleName>
+ <styleName type="wdth" subtype="100">Nọ́mal</styleName>
+ <styleName type="wdth" subtype="112.5">Ẹspánd Háf Wè</styleName>
+ <styleName type="wdth" subtype="112.5" alt="extended">Háf Wé Mọ́ Lọng Ọ Waid</styleName>
+ <styleName type="wdth" subtype="112.5" alt="wide">Háf Waid</styleName>
+ <styleName type="wdth" subtype="125">Ẹspand</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">Mọ́ Lọng Ọ Waid</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">Waid</styleName>
+ <styleName type="wdth" subtype="150">Ẹspánd Mọ</styleName>
+ <styleName type="wdth" subtype="150" alt="extended">Mọ́ Mọ́ Lọng Ọ Waid</styleName>
+ <styleName type="wdth" subtype="150" alt="wide">Mọ́ Waid</styleName>
+ <styleName type="wdth" subtype="200">Ẹspánd Mọ́ Mọ</styleName>
+ <styleName type="wdth" subtype="200" alt="extended">Supa Lọng Ọ Waid</styleName>
+ <styleName type="wdth" subtype="200" alt="wide">Mọ́ Mọ́ Waid</styleName>
+ <styleName type="wght" subtype="100">Taíni</styleName>
+ <styleName type="wght" subtype="200">Nọ́ Dé Hẹ́vi Sám</styleName>
+ <styleName type="wght" subtype="200" alt="ultra">Nọ́ Dé Hẹ́vi Sám Sám</styleName>
+ <styleName type="wght" subtype="300">Nọ́ Dé Hẹ́vi</styleName>
+ <styleName type="wght" subtype="350">Sẹ́mílait</styleName>
+ <styleName type="wght" subtype="380">Buk</styleName>
+ <styleName type="wght" subtype="400">Rẹ́gula</styleName>
+ <styleName type="wght" subtype="500">Mídiọm</styleName>
+ <styleName type="wght" subtype="600">Háf Bold</styleName>
+ <styleName type="wght" subtype="600" alt="demi">Dẹmí Bold</styleName>
+ <styleName type="wght" subtype="700">Bold</styleName>
+ <styleName type="wght" subtype="800">Mọ́ Bold</styleName>
+ <styleName type="wght" subtype="900">Blak</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">Hẹ́vi</styleName>
+ <styleName type="wght" subtype="950">Mọ́ Blak</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">Mọ́ Mọ́ Blak</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">Supa Hẹ́vi</styleName>
+ <featureName type="afrc">Frákshọn-dẹm Wé Flát Lain Sẹprét Dẹm Tú Nọ́mba</featureName>
+ <featureName type="cpsp">Kápítál Lẹ́tá spésin</featureName>
+ <featureName type="dlig">ABChD Sain-dẹm Wé Jọín Togẹ́da An Wé Yu Fít Yuz Íf Yu Want</featureName>
+ <featureName type="frac">Frákshọn-dẹm Wé Slópín Lain Sẹprét Dẹm Tú Nọ́mba</featureName>
+ <featureName type="lnum">Mék Nọ́mba-dẹm Hait To Bi Di Sem Fọ Ọ́p An Bọtọm</featureName>
+ <featureName type="onum">Óld-Staíl Nọ́mba-dẹm</featureName>
+ <featureName type="ordn">Nọ́mba-dẹm Wé De Shó Pozíshọn Laik ‘Fẹst, ‘Sẹ́kọn’, ‘Tẹd’ …</featureName>
+ <featureName type="pnum">Nọ́mba-dẹm Wé De Gó Ọ́p An Daun As Sọm Ọ́dá Tins De Chenj</featureName>
+ <featureName type="smcp">Bíg ABChD Sain-dẹm Wé Di Saiz Smọl</featureName>
+ <featureName type="tnum">Nọ́mba-dẹm Wé Dé Laín Bai Lain An Ọ́nda Ích Ọda</featureName>
+ <featureName type="zero">Zíro Wé Dẹm Drọ́ Lain Akrọ́s Am</featureName>
+ </typographicNames>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/pcm_NG.xml
similarity index 82%
copy from seed/main/mni_IN.xml
copy to common/main/pcm_NG.xml
index 01c64c4..ba7ac87 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/pcm_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,7 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
- <territory type="IN"/>
+ <language type="pcm"/>
+ <territory type="NG"/>
</identity>
</ldml>
diff --git a/common/main/pl.xml b/common/main/pl.xml
index f7ee28f..ea0cd51 100644
--- a/common/main/pl.xml
+++ b/common/main/pl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="chr">czirokeski</language>
<language type="chy">czejeński</language>
<language type="ckb">sorani</language>
+ <language type="ckb" alt="menu">kurdyjski sorani</language>
<language type="co">korsykański</language>
<language type="cop">koptyjski</language>
<language type="cps">capiznon</language>
@@ -182,6 +183,7 @@
<language type="ewo">ewondo</language>
<language type="ext">estremadurski</language>
<language type="fa">perski</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulani</language>
@@ -649,6 +651,7 @@
<script type="Afak" draft="unconfirmed">afaka</script>
<script type="Arab">arabskie</script>
<script type="Arab" alt="variant">perso-arabskie</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">armi</script>
<script type="Armn">ormiańskie</script>
<script type="Avst">awestyjskie</script>
@@ -761,6 +764,7 @@
<script type="Phnx">fenicki</script>
<script type="Plrd">fonetyczny Pollard’a</script>
<script type="Prti">partyjski inskrypcyjny</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Roro">rongorongo</script>
<script type="Runr">runiczne</script>
@@ -1330,12 +1334,19 @@
<exemplarCharacters type="index" draft="contributed">[A Ą B C Ć D E Ę F G H I J K L Ł M N Ń O Ó P Q R S Ś T U V W X Y Z Ź Ż]</exemplarCharacters>
<exemplarCharacters type="numbers">[ \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
<exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ? . … ' " ” „ « » ( ) \[ \] \{ \} § @ * / \& # % † ‡ ′ ″ ° ~]</exemplarCharacters>
+ <ellipsis type="final" draft="contributed">↑↑↑</ellipsis>
+ <ellipsis type="initial" draft="contributed">↑↑↑</ellipsis>
+ <ellipsis type="medial" draft="contributed">↑↑↑</ellipsis>
<ellipsis type="word-final">{0}…</ellipsis>
<ellipsis type="word-initial">…{0}</ellipsis>
+ <ellipsis type="word-medial" draft="contributed">↑↑↑</ellipsis>
+ <moreInformation draft="contributed">↑↑↑</moreInformation>
<parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample=":" draft="contributed">[\:∶]</parseLenient>
</parseLenients>
<parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
@@ -1343,9 +1354,16 @@
<parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
<parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₹" draft="contributed">↑↑↑</parseLenient>
</parseLenients>
<parseLenients scope="number" level="lenient">
<parseLenient sample="-" draft="contributed">[\-‒⁻₋−➖﹣－]</parseLenient>
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="+" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
</parseLenients>
</characters>
<delimiters>
@@ -4835,7 +4853,7 @@
</metazone>
<metazone type="Alaska">
<long>
- <generic>Alaska</generic>
+ <generic>czas Alaska</generic>
<standard>Alaska (czas standardowy)</standard>
<daylight>Alaska (czas letni)</daylight>
</long>
@@ -4891,7 +4909,7 @@
</metazone>
<metazone type="Apia">
<long>
- <generic>Apia</generic>
+ <generic>czas Apia</generic>
<standard>Apia (czas standardowy)</standard>
<daylight>Apia (czas letni)</daylight>
</long>
@@ -4912,28 +4930,28 @@
</metazone>
<metazone type="Arabian">
<long>
- <generic>Półwysep Arabski</generic>
+ <generic>czas Półwysep Arabski</generic>
<standard>Półwysep Arabski (czas standardowy)</standard>
<daylight>Półwysep Arabski (czas letni)</daylight>
</long>
</metazone>
<metazone type="Argentina">
<long>
- <generic>Argentyna</generic>
+ <generic>czas Argentyna</generic>
<standard>Argentyna (czas standardowy)</standard>
<daylight>Argentyna (czas letni)</daylight>
</long>
</metazone>
<metazone type="Argentina_Western">
<long>
- <generic>Argentyna Zachodnia</generic>
+ <generic>czas Argentyna Zachodnia</generic>
<standard>Argentyna Zachodnia (czas standardowy)</standard>
<daylight>Argentyna Zachodnia (czas letni)</daylight>
</long>
</metazone>
<metazone type="Armenia">
<long>
- <generic>Armenia</generic>
+ <generic>czas Armenia</generic>
<standard>Armenia (czas standardowy)</standard>
<daylight>Armenia (czas letni)</daylight>
</long>
@@ -4975,143 +4993,128 @@
</metazone>
<metazone type="Azerbaijan">
<long>
- <generic>Azerbejdżan</generic>
+ <generic>czas Azerbejdżan</generic>
<standard>Azerbejdżan (czas standardowy)</standard>
<daylight>Azerbejdżan (czas letni)</daylight>
</long>
</metazone>
<metazone type="Azores">
<long>
- <generic>Azory</generic>
+ <generic>czas Azory</generic>
<standard>Azory (czas standardowy)</standard>
<daylight>Azory (czas letni)</daylight>
</long>
</metazone>
<metazone type="Bangladesh">
<long>
- <generic>Bangladesz</generic>
+ <generic>czas Bangladesz</generic>
<standard>Bangladesz (czas standardowy)</standard>
<daylight>Bangladesz (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Bhutan">
- <long>
- <standard>Bhutan</standard>
- </long>
- </metazone>
<metazone type="Bolivia">
<long>
- <standard>Boliwia</standard>
+ <standard>czas Boliwia</standard>
</long>
</metazone>
<metazone type="Brasilia">
<long>
- <generic>Brasília</generic>
+ <generic>czas Brasília</generic>
<standard>Brasília (czas standardowy)</standard>
<daylight>Brasília (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Brunei">
- <long>
- <standard>Brunei</standard>
- </long>
- </metazone>
<metazone type="Cape_Verde">
<long>
- <generic>Wyspy Zielonego Przylądka</generic>
+ <generic>czas Wyspy Zielonego Przylądka</generic>
<standard>Wyspy Zielonego Przylądka (czas standardowy)</standard>
<daylight>Wyspy Zielonego Przylądka (czas letni)</daylight>
</long>
</metazone>
<metazone type="Chamorro">
<long>
- <standard>Czamorro</standard>
+ <standard>czas Czamorro</standard>
</long>
</metazone>
<metazone type="Chatham">
<long>
- <generic>Chatham</generic>
+ <generic>czas Chatham</generic>
<standard>Chatham (czas standardowy)</standard>
<daylight>Chatham (czas letni)</daylight>
</long>
</metazone>
<metazone type="Chile">
<long>
- <generic>Chile</generic>
+ <generic>czas Chile</generic>
<standard>Chile (czas standardowy)</standard>
<daylight>Chile (czas letni)</daylight>
</long>
</metazone>
<metazone type="China">
<long>
- <generic>Chiny</generic>
+ <generic>czas Chiny</generic>
<standard>Chiny (czas standardowy)</standard>
<daylight>Chiny (czas letni)</daylight>
</long>
</metazone>
<metazone type="Choibalsan">
<long>
- <generic>Czojbalsan</generic>
+ <generic>czas Czojbalsan</generic>
<standard>Czojbalsan (czas standardowy)</standard>
<daylight>Czojbalsan (czas letni)</daylight>
</long>
</metazone>
<metazone type="Christmas">
<long>
- <standard>Wyspa Bożego Narodzenia</standard>
+ <standard>czas Wyspa Bożego Narodzenia</standard>
</long>
</metazone>
<metazone type="Cocos">
<long>
- <standard>Wyspy Kokosowe</standard>
+ <standard>czas Wyspy Kokosowe</standard>
</long>
</metazone>
<metazone type="Colombia">
<long>
- <generic>Kolumbia</generic>
+ <generic>czas Kolumbia</generic>
<standard>Kolumbia (czas standardowy)</standard>
<daylight>Kolumbia (czas letni)</daylight>
</long>
</metazone>
<metazone type="Cook">
<long>
- <generic>Wyspy Cooka</generic>
+ <generic>czas Wyspy Cooka</generic>
<standard>Wyspy Cooka (czas standardowy)</standard>
<daylight>Wyspy Cooka (czas letni)</daylight>
</long>
</metazone>
<metazone type="Cuba">
<long>
- <generic>Kuba</generic>
+ <generic>czas Kuba</generic>
<standard>Kuba (czas standardowy)</standard>
<daylight>Kuba (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Davis">
- <long>
- <standard>Davis</standard>
- </long>
- </metazone>
<metazone type="DumontDUrville">
<long>
- <standard>Dumont-d’Urville</standard>
+ <standard>czas Dumont-d’Urville</standard>
</long>
</metazone>
<metazone type="East_Timor">
<long>
- <standard>Timor Wschodni</standard>
+ <standard>czas Timor Wschodni</standard>
</long>
</metazone>
<metazone type="Easter">
<long>
- <generic>Wyspa Wielkanocna</generic>
+ <generic>czas Wyspa Wielkanocna</generic>
<standard>Wyspa Wielkanocna (czas standardowy)</standard>
<daylight>Wyspa Wielkanocna (czas letni)</daylight>
</long>
</metazone>
<metazone type="Ecuador">
<long>
- <standard>Ekwador</standard>
+ <standard>czas Ekwador</standard>
</long>
</metazone>
<metazone type="Europe_Central">
@@ -5157,48 +5160,43 @@
</metazone>
<metazone type="Falkland">
<long>
- <generic>Falklandy</generic>
+ <generic>czas Falklandy</generic>
<standard>Falklandy (czas standardowy)</standard>
<daylight>Falklandy (czas letni)</daylight>
</long>
</metazone>
<metazone type="Fiji">
<long>
- <generic>Fidżi</generic>
+ <generic>czas Fidżi</generic>
<standard>Fidżi (czas standardowy)</standard>
<daylight>Fidżi (czas letni)</daylight>
</long>
</metazone>
<metazone type="French_Guiana">
<long>
- <standard>Gujana Francuska</standard>
+ <standard>czas Gujana Francuska</standard>
</long>
</metazone>
<metazone type="French_Southern">
<long>
- <standard>Francuskie Terytoria Południowe i Antarktyczne</standard>
- </long>
- </metazone>
- <metazone type="Galapagos">
- <long>
- <standard>Galapagos</standard>
+ <standard>czas Francuskie Terytoria Południowe i Antarktyczne</standard>
</long>
</metazone>
<metazone type="Gambier">
<long>
- <standard>Wyspy Gambiera</standard>
+ <standard>czas Wyspy Gambiera</standard>
</long>
</metazone>
<metazone type="Georgia">
<long>
- <generic>Gruzja</generic>
+ <generic>czas Gruzja</generic>
<standard>Gruzja (czas standardowy)</standard>
<daylight>Gruzja (czas letni)</daylight>
</long>
</metazone>
<metazone type="Gilbert_Islands">
<long>
- <standard>Wyspy Gilberta</standard>
+ <standard>czas Wyspy Gilberta</standard>
</long>
</metazone>
<metazone type="GMT">
@@ -5208,45 +5206,45 @@
</metazone>
<metazone type="Greenland_Eastern">
<long>
- <generic>Grenlandia Wschodnia</generic>
+ <generic>czas Grenlandia Wschodnia</generic>
<standard>Grenlandia Wschodnia (czas standardowy)</standard>
<daylight>Grenlandia Wschodnia (czas letni)</daylight>
</long>
</metazone>
<metazone type="Greenland_Western">
<long>
- <generic>Grenlandia Zachodnia</generic>
+ <generic>czas Grenlandia Zachodnia</generic>
<standard>Grenlandia Zachodnia (czas standardowy)</standard>
<daylight>Grenlandia Zachodnia (czas letni)</daylight>
</long>
</metazone>
<metazone type="Gulf">
<long>
- <standard>Zatoka Perska</standard>
+ <standard>czas Zatoka Perska</standard>
</long>
</metazone>
<metazone type="Guyana">
<long>
- <standard>Gujana</standard>
+ <standard>czas Gujana</standard>
</long>
</metazone>
<metazone type="Hawaii_Aleutian">
<long>
- <generic>Hawaje-Aleuty</generic>
+ <generic>czas Hawaje-Aleuty</generic>
<standard>Hawaje-Aleuty (czas standardowy)</standard>
<daylight>Hawaje-Aleuty (czas letni)</daylight>
</long>
</metazone>
<metazone type="Hong_Kong">
<long>
- <generic>Hongkong</generic>
+ <generic>czas Hongkong</generic>
<standard>Hongkong (czas standardowy)</standard>
<daylight>Hongkong (czas letni)</daylight>
</long>
</metazone>
<metazone type="Hovd">
<long>
- <generic>Kobdo</generic>
+ <generic>czas Kobdo</generic>
<standard>Kobdo (czas standardowy)</standard>
<daylight>Kobdo (czas letni)</daylight>
</long>
@@ -5258,7 +5256,7 @@
</metazone>
<metazone type="Indian_Ocean">
<long>
- <standard>Ocean Indyjski</standard>
+ <standard>czas Ocean Indyjski</standard>
</long>
</metazone>
<metazone type="Indochina">
@@ -5268,43 +5266,43 @@
</metazone>
<metazone type="Indonesia_Central">
<long>
- <standard>Indonezja Środkowa</standard>
+ <standard>czas Indonezja Środkowa</standard>
</long>
</metazone>
<metazone type="Indonesia_Eastern">
<long>
- <standard>Indonezja Wschodnia</standard>
+ <standard>czas Indonezja Wschodnia</standard>
</long>
</metazone>
<metazone type="Indonesia_Western">
<long>
- <standard>Indonezja Zachodnia</standard>
+ <standard>czas Indonezja Zachodnia</standard>
</long>
</metazone>
<metazone type="Iran">
<long>
- <generic>Iran</generic>
+ <generic>czas Iran</generic>
<standard>Iran (czas standardowy)</standard>
<daylight>Iran (czas letni)</daylight>
</long>
</metazone>
<metazone type="Irkutsk">
<long>
- <generic>Irkuck</generic>
+ <generic>czas Irkuck</generic>
<standard>Irkuck (czas standardowy)</standard>
<daylight>Irkuck (czas letni)</daylight>
</long>
</metazone>
<metazone type="Israel">
<long>
- <generic>Izrael</generic>
+ <generic>czas Izrael</generic>
<standard>Izrael (czas standardowy)</standard>
<daylight>Izrael (czas letni)</daylight>
</long>
</metazone>
<metazone type="Japan">
<long>
- <generic>Japonia</generic>
+ <generic>czas Japonia</generic>
<standard>Japonia (czas standardowy)</standard>
<daylight>Japonia (czas letni)</daylight>
</long>
@@ -5318,97 +5316,82 @@
</metazone>
<metazone type="Kazakhstan_Eastern">
<long>
- <standard>Kazachstan Wschodni</standard>
+ <standard>czas Kazachstan Wschodni</standard>
</long>
</metazone>
<metazone type="Kazakhstan_Western">
<long>
- <standard>Kazachstan Zachodni</standard>
+ <standard>czas Kazachstan Zachodni</standard>
</long>
</metazone>
<metazone type="Korea">
<long>
- <generic>Korea</generic>
+ <generic>czas Korea</generic>
<standard>Korea (czas standardowy)</standard>
<daylight>Korea (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Kosrae">
- <long>
- <standard>Kosrae</standard>
- </long>
- </metazone>
<metazone type="Krasnoyarsk">
<long>
- <generic>Krasnojarsk</generic>
+ <generic>czas Krasnojarsk</generic>
<standard>Krasnojarsk (czas standardowy)</standard>
<daylight>Krasnojarsk (czas letni)</daylight>
</long>
</metazone>
<metazone type="Kyrgystan">
<long>
- <standard>Kirgistan</standard>
+ <standard>czas Kirgistan</standard>
</long>
</metazone>
<metazone type="Line_Islands">
<long>
- <standard>Line Islands</standard>
+ <standard>czas Line Islands</standard>
</long>
</metazone>
<metazone type="Lord_Howe">
<long>
- <generic>Lord Howe</generic>
+ <generic>czas Lord Howe</generic>
<standard>Lord Howe (czas standardowy)</standard>
<daylight>Lord Howe (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Macquarie">
- <long>
- <standard>Macquarie</standard>
- </long>
- </metazone>
<metazone type="Magadan">
<long>
- <generic>Magadan</generic>
+ <generic>czas Magadan</generic>
<standard>Magadan (czas standardowy)</standard>
<daylight>Magadan (czas letni)</daylight>
</long>
</metazone>
<metazone type="Malaysia">
<long>
- <standard>Malezja</standard>
+ <standard>czas Malezja</standard>
</long>
</metazone>
<metazone type="Maldives">
<long>
- <standard>Malediwy</standard>
+ <standard>czas Malediwy</standard>
</long>
</metazone>
<metazone type="Marquesas">
<long>
- <standard>Markizy</standard>
+ <standard>czas Markizy</standard>
</long>
</metazone>
<metazone type="Marshall_Islands">
<long>
- <standard>Wyspy Marshalla</standard>
+ <standard>czas Wyspy Marshalla</standard>
</long>
</metazone>
<metazone type="Mauritius">
<long>
- <generic>Mauritius</generic>
+ <generic>czas Mauritius</generic>
<standard>Mauritius (czas standardowy)</standard>
<daylight>Mauritius (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Mawson">
- <long>
- <standard>Mawson</standard>
- </long>
- </metazone>
<metazone type="Mexico_Northwest">
<long>
- <generic>Meksyk Północno-Zachodni</generic>
+ <generic>czas Meksyk Północno-Zachodni</generic>
<standard>Meksyk Północno-Zachodni (czas standardowy)</standard>
<daylight>Meksyk Północno-Zachodni (czas letni)</daylight>
</long>
@@ -5422,148 +5405,118 @@
</metazone>
<metazone type="Mongolia">
<long>
- <generic>Ułan Bator</generic>
+ <generic>czas Ułan Bator</generic>
<standard>Ułan Bator (czas standardowy)</standard>
<daylight>Ułan Bator (czas letni)</daylight>
</long>
</metazone>
<metazone type="Moscow">
<long>
- <generic>Moskwa</generic>
+ <generic>czas Moskwa</generic>
<standard>Moskwa (czas standardowy)</standard>
<daylight>Moskwa (czas letni)</daylight>
</long>
</metazone>
<metazone type="Myanmar">
<long>
- <standard>Mjanma</standard>
- </long>
- </metazone>
- <metazone type="Nauru">
- <long>
- <standard>Nauru</standard>
- </long>
- </metazone>
- <metazone type="Nepal">
- <long>
- <standard>Nepal</standard>
+ <standard>czas Mjanma</standard>
</long>
</metazone>
<metazone type="New_Caledonia">
<long>
- <generic>Nowa Kaledonia</generic>
+ <generic>czas Nowa Kaledonia</generic>
<standard>Nowa Kaledonia (czas standardowy)</standard>
<daylight>Nowa Kaledonia (czas letni)</daylight>
</long>
</metazone>
<metazone type="New_Zealand">
<long>
- <generic>Nowa Zelandia</generic>
+ <generic>czas Nowa Zelandia</generic>
<standard>Nowa Zelandia (czas standardowy)</standard>
<daylight>Nowa Zelandia (czas letni)</daylight>
</long>
</metazone>
<metazone type="Newfoundland">
<long>
- <generic>Nowa Fundlandia</generic>
+ <generic>czas Nowa Fundlandia</generic>
<standard>Nowa Fundlandia (czas standardowy)</standard>
<daylight>Nowa Fundlandia (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Niue">
- <long>
- <standard>Niue</standard>
- </long>
- </metazone>
- <metazone type="Norfolk">
- <long>
- <standard>Norfolk</standard>
- </long>
- </metazone>
<metazone type="Noronha">
<long>
- <generic>Fernando de Noronha</generic>
+ <generic>czas Fernando de Noronha</generic>
<standard>Fernando de Noronha (czas standardowy)</standard>
<daylight>Fernando de Noronha (czas letni)</daylight>
</long>
</metazone>
<metazone type="Novosibirsk">
<long>
- <generic>Nowosybirsk</generic>
+ <generic>czas Nowosybirsk</generic>
<standard>Nowosybirsk (czas standardowy)</standard>
<daylight>Nowosybirsk (czas letni)</daylight>
</long>
</metazone>
<metazone type="Omsk">
<long>
- <generic>Omsk</generic>
+ <generic>czas Omsk</generic>
<standard>Omsk (czas standardowy)</standard>
<daylight>Omsk (czas letni)</daylight>
</long>
</metazone>
<metazone type="Pakistan">
<long>
- <generic>Pakistan</generic>
+ <generic>czas Pakistan</generic>
<standard>Pakistan (czas standardowy)</standard>
<daylight>Pakistan (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Palau">
- <long>
- <standard>Palau</standard>
- </long>
- </metazone>
<metazone type="Papua_New_Guinea">
<long>
- <standard>Papua-Nowa Gwinea</standard>
+ <standard>czas Papua-Nowa Gwinea</standard>
</long>
</metazone>
<metazone type="Paraguay">
<long>
- <generic>Paragwaj</generic>
+ <generic>czas Paragwaj</generic>
<standard>Paragwaj (czas standardowy)</standard>
<daylight>Paragwaj (czas letni)</daylight>
</long>
</metazone>
<metazone type="Peru">
<long>
- <generic>Peru</generic>
+ <generic>czas Peru</generic>
<standard>Peru (czas standardowy)</standard>
<daylight>Peru (czas letni)</daylight>
</long>
</metazone>
<metazone type="Philippines">
<long>
- <generic>Filipiny</generic>
+ <generic>czas Filipiny</generic>
<standard>Filipiny (czas standardowy)</standard>
<daylight>Filipiny (czas letni)</daylight>
</long>
</metazone>
<metazone type="Phoenix_Islands">
<long>
- <standard>Feniks</standard>
+ <standard>czas Feniks</standard>
</long>
</metazone>
<metazone type="Pierre_Miquelon">
<long>
- <generic>Saint-Pierre i Miquelon</generic>
+ <generic>czas Saint-Pierre i Miquelon</generic>
<standard>Saint-Pierre i Miquelon (czas standardowy)</standard>
<daylight>Saint-Pierre i Miquelon (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Pitcairn">
- <long>
- <standard>Pitcairn</standard>
- </long>
- </metazone>
<metazone type="Ponape">
<long>
- <standard>Pohnpei</standard>
+ <standard>czas Pohnpei</standard>
</long>
</metazone>
<metazone type="Pyongyang">
<long>
- <standard>Pjongjang</standard>
+ <standard>czas Pjongjang</standard>
</long>
</metazone>
<metazone type="Qyzylorda">
@@ -5573,19 +5526,9 @@
<daylight draft="unconfirmed">czas kyzyłordzki letni</daylight>
</long>
</metazone>
- <metazone type="Reunion">
- <long>
- <standard>Reunion</standard>
- </long>
- </metazone>
- <metazone type="Rothera">
- <long>
- <standard>Rothera</standard>
- </long>
- </metazone>
<metazone type="Sakhalin">
<long>
- <generic>Sachalin</generic>
+ <generic>czas Sachalin</generic>
<standard>Sachalin (czas standardowy)</standard>
<daylight>Sachalin (czas letni)</daylight>
</long>
@@ -5599,152 +5542,127 @@
</metazone>
<metazone type="Samoa">
<long>
- <generic>Samoa</generic>
+ <generic>czas Samoa</generic>
<standard>Samoa (czas standardowy)</standard>
<daylight>Samoa (czas letni)</daylight>
</long>
</metazone>
<metazone type="Seychelles">
<long>
- <standard>Seszele</standard>
+ <standard>czas Seszele</standard>
</long>
</metazone>
<metazone type="Singapore">
<long>
- <standard>Singapur</standard>
+ <standard>czas Singapur</standard>
</long>
</metazone>
<metazone type="Solomon">
<long>
- <standard>Wyspy Salomona</standard>
+ <standard>czas Wyspy Salomona</standard>
</long>
</metazone>
<metazone type="South_Georgia">
<long>
- <standard>Georgia Południowa</standard>
+ <standard>czas Georgia Południowa</standard>
</long>
</metazone>
<metazone type="Suriname">
<long>
- <standard>Surinam</standard>
- </long>
- </metazone>
- <metazone type="Syowa">
- <long>
- <standard>Syowa</standard>
- </long>
- </metazone>
- <metazone type="Tahiti">
- <long>
- <standard>Tahiti</standard>
+ <standard>czas Surinam</standard>
</long>
</metazone>
<metazone type="Taipei">
<long>
- <generic>Tajpej</generic>
+ <generic>czas Tajpej</generic>
<standard>Tajpej (czas standardowy)</standard>
<daylight>Tajpej (czas letni)</daylight>
</long>
</metazone>
<metazone type="Tajikistan">
<long>
- <standard>Tadżykistan</standard>
- </long>
- </metazone>
- <metazone type="Tokelau">
- <long>
- <standard>Tokelau</standard>
+ <standard>czas Tadżykistan</standard>
</long>
</metazone>
<metazone type="Tonga">
<long>
- <generic>Tonga</generic>
+ <generic>czas Tonga</generic>
<standard>Tonga (czas standardowy)</standard>
<daylight>Tonga (czas letni)</daylight>
</long>
</metazone>
<metazone type="Truk">
<long>
- <standard>Chuuk</standard>
+ <standard>czas Chuuk</standard>
</long>
</metazone>
<metazone type="Turkmenistan">
<long>
- <generic>Turkmenistan</generic>
+ <generic>czas Turkmenistan</generic>
<standard>Turkmenistan (czas standardowy)</standard>
<daylight>Turkmenistan (czas letni)</daylight>
</long>
</metazone>
- <metazone type="Tuvalu">
- <long>
- <standard>Tuvalu</standard>
- </long>
- </metazone>
<metazone type="Uruguay">
<long>
- <generic>Urugwaj</generic>
+ <generic>czas Urugwaj</generic>
<standard>Urugwaj (czas standardowy)</standard>
<daylight>Urugwaj (czas letni)</daylight>
</long>
</metazone>
<metazone type="Uzbekistan">
<long>
- <generic>Uzbekistan</generic>
+ <generic>czas Uzbekistan</generic>
<standard>Uzbekistan (czas standardowy)</standard>
<daylight>Uzbekistan (czas letni)</daylight>
</long>
</metazone>
<metazone type="Vanuatu">
<long>
- <generic>Vanuatu</generic>
+ <generic>czas Vanuatu</generic>
<standard>Vanuatu (czas standardowy)</standard>
<daylight>Vanuatu (czas letni)</daylight>
</long>
</metazone>
<metazone type="Venezuela">
<long>
- <standard>Wenezuela</standard>
+ <standard>czas Wenezuela</standard>
</long>
</metazone>
<metazone type="Vladivostok">
<long>
- <generic>Władywostok</generic>
+ <generic>czas Władywostok</generic>
<standard>Władywostok (czas standardowy)</standard>
<daylight>Władywostok (czas letni)</daylight>
</long>
</metazone>
<metazone type="Volgograd">
<long>
- <generic>Wołgograd</generic>
+ <generic>czas Wołgograd</generic>
<standard>Wołgograd (czas standardowy)</standard>
<daylight>Wołgograd (czas letni)</daylight>
</long>
</metazone>
<metazone type="Vostok">
<long>
- <standard>Wostok</standard>
- </long>
- </metazone>
- <metazone type="Wake">
- <long>
- <standard>Wake</standard>
+ <standard>czas Wostok</standard>
</long>
</metazone>
<metazone type="Wallis">
<long>
- <standard>Wallis i Futuna</standard>
+ <standard>czas Wallis i Futuna</standard>
</long>
</metazone>
<metazone type="Yakutsk">
<long>
- <generic>Jakuck</generic>
+ <generic>czas Jakuck</generic>
<standard>Jakuck (czas standardowy)</standard>
<daylight>Jakuck (czas letni)</daylight>
</long>
</metazone>
<metazone type="Yekaterinburg">
<long>
- <generic>Jekaterynburg</generic>
+ <generic>czas Jekaterynburg</generic>
<standard>Jekaterynburg (czas standardowy)</standard>
<daylight>Jekaterynburg (czas letni)</daylight>
</long>
@@ -5752,6 +5670,10 @@
</timeZoneNames>
</dates>
<numbers>
+ <defaultNumberingSystem draft="contributed">↑↑↑</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">↑↑↑</native>
+ </otherNumberingSystems>
<minimumGroupingDigits draft="contributed">2</minimumGroupingDigits>
<symbols numberSystem="latn">
<decimal>,</decimal>
@@ -7788,7 +7710,7 @@
</currencies>
<miscPatterns numberSystem="latn">
<pattern type="approximately">~{0}</pattern>
- <pattern type="atLeast">{0}+</pattern>
+ <pattern type="atLeast">≥{0}</pattern>
<pattern type="atMost">≤{0}</pattern>
<pattern type="range">{0}–{1}</pattern>
</miscPatterns>
@@ -7797,14 +7719,88 @@
<pluralMinimalPairs count="few">{0} miesiące</pluralMinimalPairs>
<pluralMinimalPairs count="many">{0} miesięcy</pluralMinimalPairs>
<pluralMinimalPairs count="other">{0} miesiąca</pluralMinimalPairs>
- <ordinalMinimalPairs ordinal="other">Skręć w {0} w prawo.</ordinalMinimalPairs>
+ <ordinalMinimalPairs ordinal="other">Skręć w {0}. w prawo.</ordinalMinimalPairs>
</minimalPairs>
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>decy{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centy{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} na {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} kw.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kw.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0} kw.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0} kw.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kw.</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} sześc.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} sześc.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0} sześc.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">{0} sześc.</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} sześc.</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7815,7 +7811,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metry na sekundę do kwadratu</displayName>
<unitPattern count="one">{0} metr na sekundę do kwadratu</unitPattern>
<unitPattern count="few">{0} metry na sekundę do kwadratu</unitPattern>
@@ -7953,7 +7949,7 @@
<unitPattern count="many">{0} milimoli na litr</unitPattern>
<unitPattern count="other">{0} milimola na litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>części na milion</displayName>
<unitPattern count="one">{0} część na milion</unitPattern>
<unitPattern count="few">{0} części na milion</unitPattern>
@@ -7995,7 +7991,7 @@
<unitPattern count="many">{0} litrów na kilometr</unitPattern>
<unitPattern count="other">{0} litra na kilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litry na 100 kilometrów</displayName>
<unitPattern count="one">{0} litr na 100 kilometrów</unitPattern>
<unitPattern count="few">{0} litry na 100 kilometrów</unitPattern>
@@ -8655,21 +8651,21 @@
<unitPattern count="many">{0} koni mechanicznych</unitPattern>
<unitPattern count="other">{0} konia mechanicznego</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetry słupa rtęci</displayName>
<unitPattern count="one">{0} milimetr słupa rtęci</unitPattern>
<unitPattern count="few">{0} milimetry słupa rtęci</unitPattern>
<unitPattern count="many">{0} milimetrów słupa rtęci</unitPattern>
<unitPattern count="other">{0} milimetra słupa rtęci</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funty na cal kwadratowy</displayName>
<unitPattern count="one">{0} funt na cal kwadratowy</unitPattern>
<unitPattern count="few">{0} funty na cal kwadratowy</unitPattern>
<unitPattern count="many">{0} funtów na cal kwadratowy</unitPattern>
<unitPattern count="other">{0} funta na cal kwadratowy</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>cale słupa rtęci</displayName>
<unitPattern count="one">{0} cal słupa rtęci</unitPattern>
<unitPattern count="few">{0} cale słupa rtęci</unitPattern>
@@ -8781,7 +8777,7 @@
<unitPattern count="many">{0} kelwinów</unitPattern>
<unitPattern count="other">{0} kelwina</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>stopofunty</displayName>
<unitPattern count="one">{0} stopofunt</unitPattern>
<unitPattern count="few">{0} stopofunty</unitPattern>
@@ -8991,9 +8987,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9004,7 +9074,7 @@
<unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
<unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
@@ -9142,7 +9212,7 @@
<unitPattern count="many">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>części/milion</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -9184,7 +9254,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -9416,11 +9486,11 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="energy-foodcalorie">
- <displayName>cal</displayName>
- <unitPattern count="one">{0} cal</unitPattern>
- <unitPattern count="few">{0} cal</unitPattern>
- <unitPattern count="many">{0} cal</unitPattern>
- <unitPattern count="other">{0} cal</unitPattern>
+ <displayName>kcal</displayName>
+ <unitPattern count="one">{0} kcal</unitPattern>
+ <unitPattern count="few">{0} kcal</unitPattern>
+ <unitPattern count="many">{0} kcal</unitPattern>
+ <unitPattern count="other">{0} kcal</unitPattern>
</unit>
<unit type="energy-kilojoule">
<displayName>↑↑↑</displayName>
@@ -9844,21 +9914,21 @@
<unitPattern count="many">{0} KM</unitPattern>
<unitPattern count="other">{0} KM</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -9970,7 +10040,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="few">{0} lbf⋅ft</unitPattern>
@@ -10180,9 +10250,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10211,7 +10355,7 @@
<unitPattern count="many">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -10242,9 +10386,9 @@
<unit type="duration-day">
<displayName>dzień</displayName>
<unitPattern count="one">{0} d.</unitPattern>
- <unitPattern count="few">{0} dn.</unitPattern>
- <unitPattern count="many">{0} dn.</unitPattern>
- <unitPattern count="other">{0} dn.</unitPattern>
+ <unitPattern count="few">{0} d.</unitPattern>
+ <unitPattern count="many">{0} d.</unitPattern>
+ <unitPattern count="other">{0} d.</unitPattern>
<perUnitPattern draft="contributed">{0}/d.</perUnitPattern>
</unit>
<unit type="duration-hour">
@@ -10565,7 +10709,6 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
@@ -10575,8 +10718,6 @@
<styleName type="wdth" subtype="112.5" alt="extended">semiextended</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">semiwide</styleName>
<styleName type="wdth" subtype="125">expanded</styleName>
- <styleName type="wdth" subtype="125" alt="extended">extended</styleName>
- <styleName type="wdth" subtype="125" alt="wide">wide</styleName>
<styleName type="wdth" subtype="150">extra-expanded</styleName>
<styleName type="wdth" subtype="150" alt="extended">extra-extended</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra-wide</styleName>
@@ -10596,10 +10737,7 @@
<styleName type="wght" subtype="700">bold</styleName>
<styleName type="wght" subtype="800">extra-bold</styleName>
<styleName type="wght" subtype="900">black</styleName>
- <styleName type="wght" subtype="900" alt="heavy">heavy</styleName>
<styleName type="wght" subtype="950">extra-black</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">ultrablack</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">ultraheavy</styleName>
<featureName type="afrc">ułamki pionowe</featureName>
<featureName type="cpsp">odstępy między kapitalikami</featureName>
<featureName type="dlig">opcjonalne ligatury</featureName>
diff --git a/common/main/pl_PL.xml b/common/main/pl_PL.xml
index a0ca9ea..2df79c7 100644
--- a/common/main/pl_PL.xml
+++ b/common/main/pl_PL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/prg.xml b/common/main/prg.xml
index 3c3b9ab..1892aea 100644
--- a/common/main/prg.xml
+++ b/common/main/prg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -137,7 +137,6 @@
<territory type="MC" draft="unconfirmed">Mōnakō</territory>
<territory type="MD" draft="unconfirmed">Mōldawija</territory>
<territory type="ME" draft="unconfirmed">Mōntenegran</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="MT" draft="unconfirmed">Mālta</territory>
<territory type="MX" draft="unconfirmed">Meksiku</territory>
<territory type="NI" draft="unconfirmed">Nikarāgwa</territory>
diff --git a/common/main/prg_001.xml b/common/main/prg_001.xml
index 6f8b6b9..023b236 100644
--- a/common/main/prg_001.xml
+++ b/common/main/prg_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ps.xml b/common/main/ps.xml
index eb67f7f..130407a 100644
--- a/common/main/ps.xml
+++ b/common/main/ps.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -117,6 +117,7 @@
<language type="eu">باسکي</language>
<language type="ewo">اوونڊو</language>
<language type="fa">فارسي</language>
+ <language type="fa_AF">دری (افغانستان)</language>
<language type="ff">فولاح</language>
<language type="fi">فینلنډي</language>
<language type="fil">فلیپیني</language>
@@ -129,7 +130,6 @@
<language type="fur">فرائیلیین</language>
<language type="fy">لوېديځ فريشي</language>
<language type="ga">ائيرلېنډي</language>
- <language type="gaa">gaa</language>
<language type="gd">سکاټلېنډي ګېلک</language>
<language type="gez">ګیز</language>
<language type="gil">گلبرتي</language>
@@ -3166,7 +3166,7 @@
<exemplarCity>نووک</exemplarCity>
</zone>
<zone type="America/Scoresbysund">
- <exemplarCity draft="provisional">اټوکوټورمیټ</exemplarCity>
+ <exemplarCity>اټوکوټورمیټ</exemplarCity>
</zone>
<zone type="America/Danmarkshavn">
<exemplarCity>ډنمارکشان</exemplarCity>
@@ -3532,7 +3532,7 @@
<exemplarCity>پورټ مورسبی</exemplarCity>
</zone>
<zone type="Pacific/Bougainville">
- <exemplarCity draft="provisional">بوګن ویل</exemplarCity>
+ <exemplarCity>بوګن ویل</exemplarCity>
</zone>
<zone type="Asia/Manila">
<exemplarCity>منیلا</exemplarCity>
@@ -4557,7 +4557,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>د نورفکاس ټاپو وخت</standard>
+ <generic draft="contributed">د نورفکاس ټاپو وخت</generic>
+ <standard draft="contributed">د نورفکاس ټاپو معياري وخت</standard>
+ <daylight draft="contributed">د نورفکاس ټاپو اوړي وخت</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5310,16 +5312,16 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GBP">
- <displayName draft="provisional">برتانوې پونډ</displayName>
- <displayName count="one" draft="provisional">برتانوې پونډ</displayName>
- <displayName count="other" draft="provisional">برتانوې پونډونه</displayName>
+ <displayName>برتانوې پونډ</displayName>
+ <displayName count="one">برتانوې پونډ</displayName>
+ <displayName count="other">برتانوې پونډونه</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GEL">
- <displayName draft="provisional">جارجیاېي لارې</displayName>
- <displayName count="one" draft="provisional">جارجیا لاري</displayName>
- <displayName count="other" draft="provisional">جارجیاېي لارېز</displayName>
+ <displayName>جارجیاېي لارې</displayName>
+ <displayName count="one">جارجیا لاري</displayName>
+ <displayName count="other">جارجیاېي لارېز</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -5412,9 +5414,9 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="INR">
- <displayName draft="provisional">↑↑↑</displayName>
- <displayName count="one" draft="provisional">↑↑↑</displayName>
- <displayName count="other" draft="provisional">↑↑↑</displayName>
+ <displayName>هندي روپۍ</displayName>
+ <displayName count="one">هندي روپۍ</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -5518,9 +5520,9 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LAK">
- <displayName draft="provisional">لاشې کپ</displayName>
- <displayName count="one" draft="provisional">لاشې کپ</displayName>
- <displayName count="other" draft="provisional">لاشې کپس</displayName>
+ <displayName>لاشې کپ</displayName>
+ <displayName count="one">لاشې کپ</displayName>
+ <displayName count="other">لاشې کپس</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
@@ -6043,9 +6045,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>پرېکړه{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سانتي {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ملی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>مایکرو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نانو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پیکو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فيمتو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>أتو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زیپټو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یکوټو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ډیکا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>هیکو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کیلو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>میگا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ګیګا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>تیرا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پیټا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>إکساء {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زیټا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوټا {0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}في {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}مربع</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} مربع</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>کیوبک {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}معکب</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6054,7 +6126,7 @@
<unitPattern count="one">{0} د جاذبې قوه</unitPattern>
<unitPattern count="other">{0} د جاذبې قوه</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ميترز في مربع سيکنډ</displayName>
<unitPattern count="one">{0} ميتر في مربع سيکنډ</unitPattern>
<unitPattern count="other">{0} ميتر في مربع سيکنډ</unitPattern>
@@ -6154,7 +6226,7 @@
<unitPattern count="one">{0} ملي مول في ليټر</unitPattern>
<unitPattern count="other">{0} ملي مول في ليټر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>پارټتس في مليون</displayName>
<unitPattern count="one">{0} پارټ في مليون</unitPattern>
<unitPattern count="other">{0} پارټس في مليون</unitPattern>
@@ -6184,7 +6256,7 @@
<unitPattern count="one">{0} ليټر في کيلو متر</unitPattern>
<unitPattern count="other">{0} ليټرز في کيلو متر</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ليټرز في ۱۰۰ کيلو مترز</displayName>
<unitPattern count="one">{0} ليټر في ۱۰۰ کلو ميترز</unitPattern>
<unitPattern count="other">{0} ليټرز في ۱۰۰ کيلو مترز</unitPattern>
@@ -6290,21 +6362,21 @@
</unit>
<unit type="duration-hour">
<displayName>↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
- <perUnitPattern draft="provisional">↑↑↑</perUnitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-minute">
<displayName>دقيقې</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
- <perUnitPattern draft="provisional">↑↑↑</perUnitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-second">
<displayName>ثانيې</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
- <perUnitPattern draft="provisional">↑↑↑</perUnitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-millisecond">
<displayName>↑↑↑</displayName>
@@ -6517,7 +6589,7 @@
<perUnitPattern>{0} هر انچ</perUnitPattern>
</unit>
<unit type="length-parsec">
- <displayName draft="provisional">پارسيکس</displayName>
+ <displayName>پارسيکس</displayName>
<unitPattern count="one" draft="provisional">{0} في ثانيه</unitPattern>
<unitPattern count="other" draft="provisional">{0} في ثانيې</unitPattern>
</unit>
@@ -6553,8 +6625,8 @@
</unit>
<unit type="light-lux">
<displayName>لکس</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="light-solar-luminosity">
<displayName>لمريز ځلښتونه</displayName>
@@ -6660,25 +6732,25 @@
<unitPattern count="one">{0} هارس پاور</unitPattern>
<unitPattern count="other">{0} هارس پاور</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>د پارې ملي مترز</displayName>
<unitPattern count="one">{0} د پارې ملي متر</unitPattern>
<unitPattern count="other">{0} د پارې ملي مترز</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پاونډز في مربع انچ</displayName>
<unitPattern count="one">{0} پاونډ في مربع انچ</unitPattern>
<unitPattern count="other">{0} پاونډز في مربع انچ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>د پارې انچې</displayName>
<unitPattern count="one">{0} د پارې انچ</unitPattern>
<unitPattern count="other">{0} د پارې انچې</unitPattern>
</unit>
<unit type="pressure-bar">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="pressure-millibar">
<displayName>ملي بارز</displayName>
@@ -6750,7 +6822,7 @@
<unitPattern count="one">{0} کيلون</unitPattern>
<unitPattern count="other">{0} کيلونز</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>پاونډ فټونه</displayName>
<unitPattern count="one">{0} پاونډ فټ</unitPattern>
<unitPattern count="other">{0} پاونډ فټونه</unitPattern>
@@ -6871,9 +6943,9 @@
<unitPattern count="other">{0} پيالې</unitPattern>
</unit>
<unit type="volume-fluid-ounce">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="volume-fluid-ounce-imperial">
<displayName>امپيريل مايع اونس</displayName>
@@ -6882,8 +6954,8 @@
</unit>
<unit type="volume-tablespoon">
<displayName>د ميز کاچوغه</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="volume-teaspoon">
<displayName>د ميز کاچوغې</displayName>
@@ -6904,9 +6976,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6915,7 +7057,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7015,7 +7157,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>پارټس/مليون</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7045,7 +7187,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7521,25 +7663,25 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
<unit type="pressure-bar">
- <displayName draft="provisional">bar</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} bar</unitPattern>
+ <displayName>bar</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">{0} bar</unitPattern>
</unit>
<unit type="pressure-millibar">
<displayName>mbar</displayName>
@@ -7611,7 +7753,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7765,9 +7907,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7776,7 +7988,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
diff --git a/common/main/ps_AF.xml b/common/main/ps_AF.xml
index 5996b81..e8c5aea 100644
--- a/common/main/ps_AF.xml
+++ b/common/main/ps_AF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ps_PK.xml b/common/main/ps_PK.xml
index 64eeb18..7f00fd8 100644
--- a/common/main/ps_PK.xml
+++ b/common/main/ps_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -327,12 +327,12 @@
<unitPattern count="one">{0} فلکي احد</unitPattern>
<unitPattern count="other">{0} فلکي احدے</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>د پارے ملي مترز</displayName>
<unitPattern count="one">{0} د پارے ملي متر</unitPattern>
<unitPattern count="other">{0} د پارے ملي مترز</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>د پارے انچے</displayName>
<unitPattern count="one">{0} د پارے انچ</unitPattern>
<unitPattern count="other">{0} د پارے انچے</unitPattern>
diff --git a/common/main/pt.xml b/common/main/pt.xml
index f13f0cd..5f5f254 100644
--- a/common/main/pt.xml
+++ b/common/main/pt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -106,6 +106,7 @@
<language type="chr">cheroqui</language>
<language type="chy">cheiene</language>
<language type="ckb">curdo central</language>
+ <language type="ckb" alt="variant">curdo sorâni</language>
<language type="co">corso</language>
<language type="cop">copta</language>
<language type="cr">cree</language>
@@ -161,6 +162,7 @@
<language type="eu">basco</language>
<language type="ewo">ewondo</language>
<language type="fa">persa</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fangue</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -565,6 +567,7 @@
<scripts>
<script type="Arab">árabe</script>
<script type="Arab" alt="variant">perso-árabe</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi" draft="contributed">armi</script>
<script type="Armn">armênio</script>
<script type="Avst">avéstico</script>
@@ -662,6 +665,7 @@
<script type="Phnx">fenício</script>
<script type="Plrd" draft="contributed">fonético pollard</script>
<script type="Prti" draft="contributed">prti</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng" draft="contributed">rejang</script>
<script type="Roro" draft="contributed">rongorongo</script>
<script type="Runr">rúnico</script>
@@ -4885,7 +4889,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Horário da Ilha Norfolk</standard>
+ <generic draft="contributed">Horário da Ilha Norfolk</generic>
+ <standard draft="contributed">Horário Padrão da Ilha Norfolk</standard>
+ <daylight draft="contributed">Horário de Verão da Ilha Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7069,9 +7075,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>iocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>quilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>iota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} por {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7080,7 +7156,7 @@
<unitPattern count="one">{0} força g</unitPattern>
<unitPattern count="other">{0} força g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros por segundo ao quadrado</displayName>
<unitPattern count="one">{0} metro por segundo ao quadrado</unitPattern>
<unitPattern count="other">{0} metros por segundo ao quadrado</unitPattern>
@@ -7180,7 +7256,7 @@
<unitPattern count="one">{0} milimol por litro</unitPattern>
<unitPattern count="other">{0} milimols por litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes por milhão</displayName>
<unitPattern count="one">{0} parte por milhão</unitPattern>
<unitPattern count="other">{0} partes por milhão</unitPattern>
@@ -7210,7 +7286,7 @@
<unitPattern count="one">{0} litro por quilômetro</unitPattern>
<unitPattern count="other">{0} litros por quilômetro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros por 100 quilômetros</displayName>
<unitPattern count="one">{0} litro por 100 quilômetros</unitPattern>
<unitPattern count="other">{0} litros por 100 quilômetros</unitPattern>
@@ -7701,17 +7777,17 @@
<unitPattern count="one">{0} cavalo-vapor</unitPattern>
<unitPattern count="other">{0} cavalos-vapor</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetros de mercúrio</displayName>
<unitPattern count="one">{0} milímetro de mercúrio</unitPattern>
<unitPattern count="other">{0} milímetros de mercúrio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libras por polegada quadrada</displayName>
<unitPattern count="one">{0} libra por polegada quadrada</unitPattern>
<unitPattern count="other">{0} libras por polegada quadrada</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>polegadas de mercúrio</displayName>
<unitPattern count="one">{0} polegada de mercúrio</unitPattern>
<unitPattern count="other">{0} polegadas de mercúrio</unitPattern>
@@ -7791,7 +7867,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pés-libra</displayName>
<unitPattern count="one">{0} pé-libra</unitPattern>
<unitPattern count="other">{0} pés-libra</unitPattern>
@@ -7945,9 +8021,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7956,7 +8102,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros/seg²</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8056,7 +8202,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>partes/milhão</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8086,7 +8232,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8573,17 +8719,17 @@
<unitPattern count="one">{0} cv</unitPattern>
<unitPattern count="other">{0} cv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8663,7 +8809,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8817,9 +8963,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8843,7 +9059,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -8987,12 +9203,12 @@
<unitPattern count="one">{0} cv</unitPattern>
<unitPattern count="other">{0} cv</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mmHg</displayName>
<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
diff --git a/common/main/pt_AO.xml b/common/main/pt_AO.xml
index 20d44ec..5d49ee0 100644
--- a/common/main/pt_AO.xml
+++ b/common/main/pt_AO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_BR.xml b/common/main/pt_BR.xml
index f1c77a1..ea241b5 100644
--- a/common/main/pt_BR.xml
+++ b/common/main/pt_BR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_CH.xml b/common/main/pt_CH.xml
index ff0bc14..814f131 100644
--- a/common/main/pt_CH.xml
+++ b/common/main/pt_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_CV.xml b/common/main/pt_CV.xml
index 7d58263..7d05326 100644
--- a/common/main/pt_CV.xml
+++ b/common/main/pt_CV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_GQ.xml b/common/main/pt_GQ.xml
index e0e3e78..44d4b87 100644
--- a/common/main/pt_GQ.xml
+++ b/common/main/pt_GQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_GW.xml b/common/main/pt_GW.xml
index 7ecdc66..ae6a569 100644
--- a/common/main/pt_GW.xml
+++ b/common/main/pt_GW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_LU.xml b/common/main/pt_LU.xml
index d13af2c..bb5dbbe 100644
--- a/common/main/pt_LU.xml
+++ b/common/main/pt_LU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_MO.xml b/common/main/pt_MO.xml
index a8c2efb..d12fe64 100644
--- a/common/main/pt_MO.xml
+++ b/common/main/pt_MO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_MZ.xml b/common/main/pt_MZ.xml
index 088328e..46d51ec 100644
--- a/common/main/pt_MZ.xml
+++ b/common/main/pt_MZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_PT.xml b/common/main/pt_PT.xml
index f0798a5..6212fc8 100644
--- a/common/main/pt_PT.xml
+++ b/common/main/pt_PT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -107,6 +107,8 @@
<language type="chr">cherokee</language>
<language type="chy">cheyenne</language>
<language type="ckb">sorani curdo</language>
+ <language type="ckb" alt="menu">curdo sorani</language>
+ <language type="ckb" alt="variant">↑↑↑</language>
<language type="co">córsico</language>
<language type="cop" draft="contributed">copta</language>
<language type="cr">↑↑↑</language>
@@ -162,6 +164,7 @@
<language type="eu">↑↑↑</language>
<language type="ewo">↑↑↑</language>
<language type="fa">persa</language>
+ <language type="fa_AF">dari</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">↑↑↑</language>
@@ -419,7 +422,7 @@
<language type="ro_MD">moldávio</language>
<language type="rof">rombo</language>
<language type="rom">↑↑↑</language>
- <language type="root">root</language>
+ <language type="root">↑↑↑</language>
<language type="ru">russo</language>
<language type="rup">↑↑↑</language>
<language type="rw">quiniaruanda</language>
@@ -544,7 +547,7 @@
<language type="yi">↑↑↑</language>
<language type="yo">ioruba</language>
<language type="yue">↑↑↑</language>
- <language type="yue" alt="menu" draft="provisional">↑↑↑</language>
+ <language type="yue" alt="menu" draft="contributed">↑↑↑</language>
<language type="za">↑↑↑</language>
<language type="zap">↑↑↑</language>
<language type="zbl" draft="contributed">símbolos blis</language>
@@ -564,6 +567,7 @@
<scripts>
<script type="Arab">árabe</script>
<script type="Arab" alt="variant">perso-árabe</script>
+ <script type="Aran" draft="contributed">nasta’liq</script>
<script type="Armi" draft="provisional">aramaico imperial</script>
<script type="Armn">arménio</script>
<script type="Beng">bengalês</script>
@@ -6419,9 +6423,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>decí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milí{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micró{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nanó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>picó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>fentó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ató{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zeptó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ioctó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>decâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hectó{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>quiló{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>megâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>gigâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>terâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>petâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetâ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>iotâ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} por {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} quadrados</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} quadrado</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} quadrados</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} cúbicos</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} cúbico</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} cúbicos</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6430,7 +6504,7 @@
<unitPattern count="one">{0} força G</unitPattern>
<unitPattern count="other">{0} força G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metros por segundo quadrado</displayName>
<unitPattern count="one">{0} metro por segundo quadrado</unitPattern>
<unitPattern count="other">{0} metros por segundo quadrado</unitPattern>
@@ -6530,7 +6604,7 @@
<unitPattern count="one">{0} milimole por litro</unitPattern>
<unitPattern count="other">{0} milimoles por litro</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6560,7 +6634,7 @@
<unitPattern count="one">{0} litro por quilómetro</unitPattern>
<unitPattern count="other">{0} litros por quilómetro</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litros por 100 quilómetros</displayName>
<unitPattern count="one">{0} litro por 100 quilómetros</unitPattern>
<unitPattern count="other">{0} litros por 100 quilómetros</unitPattern>
@@ -6997,7 +7071,7 @@
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="mass-earth-mass">
- <displayName draft="contributed">↑↑↑</displayName>
+ <displayName>↑↑↑</displayName>
<unitPattern count="one">{0} massa da Terra</unitPattern>
<unitPattern count="other">{0} massas da Terra</unitPattern>
</unit>
@@ -7036,17 +7110,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milímetros de mercúrio</displayName>
<unitPattern count="one">{0} milímetro de mercúrio</unitPattern>
<unitPattern count="other">{0} milímetros de mercúrio</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>polegadas de mercúrio</displayName>
<unitPattern count="one">{0} polegada de mercúrio</unitPattern>
<unitPattern count="other">{0} polegadas de mercúrio</unitPattern>
@@ -7126,7 +7200,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7280,9 +7354,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7291,7 +7435,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7391,7 +7535,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7421,7 +7565,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -7897,17 +8041,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7987,7 +8131,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8141,9 +8285,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8180,7 +8394,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}l/100km</unitPattern>
<unitPattern count="other">{0}l/100km</unitPattern>
@@ -8303,7 +8517,7 @@
<unitPattern count="one" draft="contributed">{0} cv</unitPattern>
<unitPattern count="other" draft="contributed">{0} cv</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0}" Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0}" Hg</unitPattern>
</unit>
@@ -8348,7 +8562,7 @@
</unit>
<coordinateUnit>
<displayName>↑↑↑</displayName>
- <coordinateUnitPattern type="east" draft="provisional">↑↑↑</coordinateUnitPattern>
+ <coordinateUnitPattern type="east">↑↑↑</coordinateUnitPattern>
<coordinateUnitPattern type="north">↑↑↑</coordinateUnitPattern>
<coordinateUnitPattern type="south">↑↑↑</coordinateUnitPattern>
<coordinateUnitPattern type="west">↑↑↑</coordinateUnitPattern>
diff --git a/common/main/pt_ST.xml b/common/main/pt_ST.xml
index 4e07755..e58ac28 100644
--- a/common/main/pt_ST.xml
+++ b/common/main/pt_ST.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/pt_TL.xml b/common/main/pt_TL.xml
index 15f3076..1ce07bb 100644
--- a/common/main/pt_TL.xml
+++ b/common/main/pt_TL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/qu.xml b/common/main/qu.xml
index 09076f8..b86fcef 100644
--- a/common/main/qu.xml
+++ b/common/main/qu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3839,7 +3839,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Hora de la Isla Norfolk</standard>
+ <generic draft="contributed">Hora de la Isla Norfolk</generic>
+ <standard draft="contributed">Hora Estandar de la Isla Norfolk</standard>
+ <daylight draft="contributed">Hora de Verano de la Isla Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4200,7 +4202,6 @@
</currencyFormats>
<currencies>
<currency type="AED">
- <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">AED</symbol>
</currency>
<currency type="AFN">
@@ -4214,7 +4215,6 @@
<symbol draft="contributed">ALL</symbol>
</currency>
<currency type="AMD">
- <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">AMD</symbol>
</currency>
<currency type="ANG">
@@ -4246,7 +4246,6 @@
<symbol draft="contributed">AWG</symbol>
</currency>
<currency type="AZN">
- <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">AZN</symbol>
</currency>
<currency type="BAM">
@@ -5093,7 +5092,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5174,7 +5173,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5198,7 +5197,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5582,15 +5581,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5654,7 +5653,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5790,7 +5789,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5871,7 +5870,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5895,7 +5894,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6279,15 +6278,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6351,7 +6350,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6487,7 +6486,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6754,7 +6753,6 @@
<styleName type="wdth" subtype="62.5" alt="compressed">↑↑↑</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">↑↑↑</styleName>
<styleName type="wdth" subtype="75">↑↑↑</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">↑↑↑</styleName>
<styleName type="wdth" subtype="75" alt="narrow">↑↑↑</styleName>
<styleName type="wdth" subtype="87.5">↑↑↑</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">↑↑↑</styleName>
@@ -6764,8 +6762,6 @@
<styleName type="wdth" subtype="112.5" alt="extended">↑↑↑</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">↑↑↑</styleName>
<styleName type="wdth" subtype="125">↑↑↑</styleName>
- <styleName type="wdth" subtype="125" alt="extended">↑↑↑</styleName>
- <styleName type="wdth" subtype="125" alt="wide">↑↑↑</styleName>
<styleName type="wdth" subtype="150">↑↑↑</styleName>
<styleName type="wdth" subtype="150" alt="extended">↑↑↑</styleName>
<styleName type="wdth" subtype="150" alt="wide">↑↑↑</styleName>
@@ -6785,10 +6781,7 @@
<styleName type="wght" subtype="700">↑↑↑</styleName>
<styleName type="wght" subtype="800">↑↑↑</styleName>
<styleName type="wght" subtype="900">↑↑↑</styleName>
- <styleName type="wght" subtype="900" alt="heavy">↑↑↑</styleName>
<styleName type="wght" subtype="950">↑↑↑</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">↑↑↑</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">↑↑↑</styleName>
<featureName type="afrc">↑↑↑</featureName>
<featureName type="cpsp">↑↑↑</featureName>
<featureName type="dlig">↑↑↑</featureName>
diff --git a/common/main/qu_BO.xml b/common/main/qu_BO.xml
index 72d6028..ab7c771 100644
--- a/common/main/qu_BO.xml
+++ b/common/main/qu_BO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/qu_EC.xml b/common/main/qu_EC.xml
index 92b3e48..84be9a1 100644
--- a/common/main/qu_EC.xml
+++ b/common/main/qu_EC.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/qu_PE.xml b/common/main/qu_PE.xml
index c82a2d5..0c6ec28 100644
--- a/common/main/qu_PE.xml
+++ b/common/main/qu_PE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rm.xml b/common/main/rm.xml
index 87f0f22..fa9f9ed 100644
--- a/common/main/rm.xml
+++ b/common/main/rm.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -761,7 +761,6 @@
<territory type="MF" draft="contributed">Saint Martin</territory>
<territory type="MG" draft="contributed">Madagascar</territory>
<territory type="MH" draft="contributed">Inslas da Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML" draft="contributed">Mali</territory>
<territory type="MM" draft="contributed">Myanmar</territory>
<territory type="MN" draft="contributed">Mongolia</territory>
diff --git a/common/main/rm_CH.xml b/common/main/rm_CH.xml
index 904b923..a82a63b 100644
--- a/common/main/rm_CH.xml
+++ b/common/main/rm_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rn.xml b/common/main/rn.xml
index df75101..5b56e82 100644
--- a/common/main/rn.xml
+++ b/common/main/rn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moludavi</territory>
<territory type="MG">Madagasikari</territory>
<territory type="MH">Izinga rya Marishari</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Birimaniya</territory>
<territory type="MN">Mongoliya</territory>
diff --git a/common/main/rn_BI.xml b/common/main/rn_BI.xml
index 3ebc731..e026577 100644
--- a/common/main/rn_BI.xml
+++ b/common/main/rn_BI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ro.xml b/common/main/ro.xml
index 1b1f3d0..75b813a 100644
--- a/common/main/ro.xml
+++ b/common/main/ro.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -105,6 +105,7 @@
<language type="chr">cherokee</language>
<language type="chy">cheyenne</language>
<language type="ckb">kurdă centrală</language>
+ <language type="ckb" alt="variant">kurdă sorani</language>
<language type="co">corsicană</language>
<language type="cop">coptă</language>
<language type="cr">cree</language>
@@ -160,6 +161,7 @@
<language type="eu">bască</language>
<language type="ewo">ewondo</language>
<language type="fa">persană</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulah</language>
@@ -418,7 +420,7 @@
<language type="ro">română</language>
<language type="rof">rombo</language>
<language type="rom">romani</language>
- <language type="root">root</language>
+ <language type="root" draft="provisional">rădăcină</language>
<language type="ru">rusă</language>
<language type="rup">aromână</language>
<language type="rw">kinyarwanda</language>
@@ -563,6 +565,7 @@
<scripts>
<script type="Arab">arabă</script>
<script type="Arab" alt="variant">persano-arabă</script>
+ <script type="Aran" draft="contributed">nastaaliq</script>
<script type="Armn">armeană</script>
<script type="Bali">balineză</script>
<script type="Beng">bengaleză</script>
@@ -616,9 +619,12 @@
<script type="Maya">hieroglife maya</script>
<script type="Mlym">malayalam</script>
<script type="Mong">mongolă</script>
+ <script type="Mtei" draft="contributed">meitei mayek</script>
<script type="Mymr">birmană</script>
+ <script type="Olck" draft="contributed">ol chiki</script>
<script type="Orya">oriya</script>
<script type="Phnx">feniciană</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Runr">runică</script>
<script type="Sinh">singaleză</script>
<script type="Syrc">siriacă</script>
@@ -990,7 +996,6 @@
<variant type="WADEGILE">Wade-Giles</variant>
</variants>
<keys>
- <key type="calendar">calendar</key>
<key type="cf">Format monedă</key>
<key type="colAlternate">sortare cu ignorarea simbolurilo</key>
<key type="colBackwards">sortare inversă după accent</key>
@@ -5622,7 +5627,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Ora Insulelor Norfolk</standard>
+ <generic draft="contributed">Ora Insulelor Norfolk</generic>
+ <standard draft="contributed">Ora standard Insulelor Norfolk</standard>
+ <daylight draft="contributed">Ora de vară Insulelor Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7757,9 +7764,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deca{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} pe {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern draft="contributed">{0}-{1}</compoundUnitPattern>
</compoundUnit>
@@ -7769,7 +7848,7 @@
<unitPattern count="few">{0} forță g</unitPattern>
<unitPattern count="other">{0} forță g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri pe secundă la pătrat</displayName>
<unitPattern count="one">{0} metru pe secundă la pătrat</unitPattern>
<unitPattern count="few">{0} metri pe secundă la pătrat</unitPattern>
@@ -7888,7 +7967,7 @@
<unitPattern count="few">{0} milimoli pe litru</unitPattern>
<unitPattern count="other">{0} de milimoli pe litru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>părți pe milion</displayName>
<unitPattern count="one">{0} parte pe milion</unitPattern>
<unitPattern count="few">{0} părți pe milion</unitPattern>
@@ -7924,7 +8003,7 @@
<unitPattern count="few">{0} litri pe kilometru</unitPattern>
<unitPattern count="other">{0} de litri pe kilometru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litri la suta de kilometri</displayName>
<unitPattern count="one">{0} litru la suta de kilometri</unitPattern>
<unitPattern count="few">{0} litri la suta de kilometri</unitPattern>
@@ -8492,19 +8571,19 @@
<unitPattern count="few">{0} cai putere</unitPattern>
<unitPattern count="other">{0} de cai putere</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetri coloană de mercur</displayName>
<unitPattern count="one">{0} milimetru coloană de mercur</unitPattern>
<unitPattern count="few">{0} milimetri coloană de mercur</unitPattern>
<unitPattern count="other">{0} de milimetri coloană de mercur</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>livre pe inch pătrat</displayName>
<unitPattern count="one">{0} livră pe inch pătrat</unitPattern>
<unitPattern count="few">{0} livre pe inch pătrat</unitPattern>
<unitPattern count="other">{0} de livre pe inch pătrat</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inchi coloană de mercur</displayName>
<unitPattern count="one">{0} inch coloană de mercur</unitPattern>
<unitPattern count="few">{0} inchi coloană de mercur</unitPattern>
@@ -8600,7 +8679,7 @@
<unitPattern count="few">{0} kelvini</unitPattern>
<unitPattern count="other">{0} de kelvini</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>livră-forță picioare</displayName>
<unitPattern count="one">{0} livră-forță picior</unitPattern>
<unitPattern count="few">{0} livră-forță picioare</unitPattern>
@@ -8782,9 +8861,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -8794,7 +8945,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -8913,7 +9064,7 @@
<unitPattern count="few">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -8949,7 +9100,7 @@
<unitPattern count="few">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -9517,19 +9668,19 @@
<unitPattern count="few">{0} CP</unitPattern>
<unitPattern count="other">{0} CP</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in Hg</displayName>
<unitPattern count="one">{0} in Hg</unitPattern>
<unitPattern count="few">{0} in Hg</unitPattern>
@@ -9625,7 +9776,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>livră-forță picior</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -9807,9 +9958,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -9818,7 +10041,7 @@
<unitPattern count="few" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
<unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
@@ -9875,7 +10098,7 @@
<unitPattern count="few">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -10152,19 +10375,19 @@
<unitPattern count="few" draft="contributed">{0} CP</unitPattern>
<unitPattern count="other" draft="contributed">{0} CP</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">in Hg</displayName>
</unit>
<unit type="pressure-millibar">
diff --git a/common/main/ro_MD.xml b/common/main/ro_MD.xml
index f6d22c0..ed11568 100644
--- a/common/main/ro_MD.xml
+++ b/common/main/ro_MD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ro_RO.xml b/common/main/ro_RO.xml
index 6c074d4..0b8a6f9 100644
--- a/common/main/ro_RO.xml
+++ b/common/main/ro_RO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rof.xml b/common/main/rof.xml
index f0a0141..7fc4f54 100644
--- a/common/main/rof.xml
+++ b/common/main/rof.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/rof_TZ.xml b/common/main/rof_TZ.xml
index fcf8069..2d15e73 100644
--- a/common/main/rof_TZ.xml
+++ b/common/main/rof_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/root.xml b/common/main/root.xml
index d78e5da..500f7cf 100644
--- a/common/main/root.xml
+++ b/common/main/root.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4236,9 +4236,77 @@
<alias source="locale" path="../unitLength[@type='short']"/>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -4246,7 +4314,7 @@
<displayName>g-force</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -4327,7 +4395,7 @@
<displayName>mmol/L</displayName>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -4351,7 +4419,7 @@
<displayName>L/km</displayName>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0} L/100km</unitPattern>
</unit>
@@ -4467,8 +4535,8 @@
<unitPattern count="other">{0} ms</unitPattern>
</unit>
<unit type="duration-microsecond">
- <displayName>μs</displayName>
- <unitPattern count="other">{0} μs</unitPattern>
+ <displayName>µs</displayName>
+ <unitPattern count="other">{0} µs</unitPattern>
</unit>
<unit type="duration-nanosecond">
<displayName>ns</displayName>
@@ -4759,15 +4827,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
@@ -4831,7 +4899,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
</unit>
diff --git a/common/main/ru.xml b/common/main/ru.xml
index 7e9edba..2b56f3e 100644
--- a/common/main/ru.xml
+++ b/common/main/ru.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">мапуче</language>
<language type="arp">арапахо</language>
<language type="ars">недждийский арабский</language>
+ <language type="ars" alt="menu">арабская (недждийский)</language>
<language type="arw">аравакский</language>
<language type="as">ассамский</language>
<language type="asa">асу</language>
@@ -105,6 +106,7 @@
<language type="chr">чероки</language>
<language type="chy">шайенский</language>
<language type="ckb">сорани</language>
+ <language type="ckb" alt="menu">курдская (сорани)</language>
<language type="co">корсиканский</language>
<language type="cop">коптский</language>
<language type="cr">кри</language>
@@ -160,6 +162,7 @@
<language type="eu">баскский</language>
<language type="ewo">эвондо</language>
<language type="fa">персидский</language>
+ <language type="fa_AF">дари</language>
<language type="fan">фанг</language>
<language type="fat">фанти</language>
<language type="ff">фулах</language>
@@ -565,6 +568,7 @@
<script type="Afak" draft="contributed">афака</script>
<script type="Arab">арабица</script>
<script type="Arab" alt="variant">персидско-арабская</script>
+ <script type="Aran" draft="contributed">насталик</script>
<script type="Armi">арамейская</script>
<script type="Armn">армянская</script>
<script type="Avst">авестийская</script>
@@ -677,6 +681,7 @@
<script type="Phnx" draft="contributed">финикийская</script>
<script type="Plrd" draft="contributed">поллардовская фонетика</script>
<script type="Prti" draft="contributed">парфянская</script>
+ <script type="Qaag" draft="contributed">зоджи</script>
<script type="Rjng" draft="contributed">реджангская</script>
<script type="Roro">ронго-ронго</script>
<script type="Runr">руническая</script>
@@ -6009,7 +6014,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк</standard>
+ <generic draft="contributed">Норфолк</generic>
+ <standard draft="contributed">Норфолк, стандартное время</standard>
+ <daylight draft="contributed">Норфолк, летнее время</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8287,9 +8294,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>санти{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>милли{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>атто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>иокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>гекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>экса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зетта{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>иотта{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>кв. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кв. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">кв. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">кв. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кв. {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>куб. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">куб. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">куб. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">куб. {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">куб. {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8300,7 +8381,7 @@
<unitPattern count="many">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метры в секунду в квадрате</displayName>
<unitPattern count="one">{0} метр в секунду в квадрате</unitPattern>
<unitPattern count="few">{0} метра в секунду в квадрате</unitPattern>
@@ -8438,7 +8519,7 @@
<unitPattern count="many">{0} миллимолей на литр</unitPattern>
<unitPattern count="other">{0} миллимоля на литр</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>миллионные доли</displayName>
<unitPattern count="one">{0} миллионная доля</unitPattern>
<unitPattern count="few">{0} миллионные доли</unitPattern>
@@ -8480,7 +8561,7 @@
<unitPattern count="many">{0} литров на километр</unitPattern>
<unitPattern count="other">{0} литра на километр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>литры на 100 километров</displayName>
<unitPattern count="one">{0} литр на 100 километров</unitPattern>
<unitPattern count="few">{0} литра на 100 километров</unitPattern>
@@ -9161,21 +9242,21 @@
<unitPattern count="many">{0} лошадиных сил</unitPattern>
<unitPattern count="other">{0} лошадиной силы</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>миллиметры ртутного столба</displayName>
<unitPattern count="one">{0} миллиметр ртутного столба</unitPattern>
<unitPattern count="few">{0} миллиметра ртутного столба</unitPattern>
<unitPattern count="many">{0} миллиметров ртутного столба</unitPattern>
<unitPattern count="other">{0} миллиметра ртутного столба</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунты на квадратный дюйм</displayName>
<unitPattern count="one">{0} фунт на квадратный дюйм</unitPattern>
<unitPattern count="few">{0} фунта на квадратный дюйм</unitPattern>
<unitPattern count="many">{0} фунтов на квадратный дюйм</unitPattern>
<unitPattern count="other">{0} фунта на квадратный дюйм</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюймы ртутного столба</displayName>
<unitPattern count="one">{0} дюйм ртутного столба</unitPattern>
<unitPattern count="few">{0} дюйма ртутного столба</unitPattern>
@@ -9287,7 +9368,7 @@
<unitPattern count="many">{0} кельвинов</unitPattern>
<unitPattern count="other">{0} кельвина</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-футы</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="few">{0} фунт-фута</unitPattern>
@@ -9497,9 +9578,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>и{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>И{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9510,7 +9665,7 @@
<unitPattern count="many">{0} g</unitPattern>
<unitPattern count="other">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>м/с²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="few">{0} м/с²</unitPattern>
@@ -9648,7 +9803,7 @@
<unitPattern count="many">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -9690,7 +9845,7 @@
<unitPattern count="many">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
@@ -10371,21 +10526,21 @@
<unitPattern count="many">{0} л. с.</unitPattern>
<unitPattern count="other">{0} л. с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм рт. ст.</displayName>
<unitPattern count="one">{0} мм рт. ст.</unitPattern>
<unitPattern count="few">{0} мм рт. ст.</unitPattern>
<unitPattern count="many">{0} мм рт. ст.</unitPattern>
<unitPattern count="other">{0} мм рт. ст.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ф. на дюйм²</displayName>
<unitPattern count="one">{0} ф/дюйм²</unitPattern>
<unitPattern count="few">{0} ф/дюйм²</unitPattern>
<unitPattern count="many">{0} ф/дюйм²</unitPattern>
<unitPattern count="other">{0} ф/дюйм²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>д. рт. ст.</displayName>
<unitPattern count="one">{0} д. рт. ст.</unitPattern>
<unitPattern count="few">{0} д. рт. ст.</unitPattern>
@@ -10497,7 +10652,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фнт-фт</displayName>
<unitPattern count="one">{0} фнт-фт</unitPattern>
<unitPattern count="few">{0} фнт-фт</unitPattern>
@@ -10707,9 +10862,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>з{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>и{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Э{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>И{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10720,7 +10949,7 @@
<unitPattern count="many" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">м/с²</displayName>
<unitPattern count="one" draft="contributed">{0} м/с²</unitPattern>
<unitPattern count="few" draft="contributed">{0} м/с²</unitPattern>
@@ -10788,7 +11017,7 @@
<unitPattern count="many">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
@@ -11123,21 +11352,21 @@
<unitPattern count="many" draft="contributed">{0} л.с.</unitPattern>
<unitPattern count="other" draft="contributed">{0} л.с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">мм рт. ст.</displayName>
<unitPattern count="one" draft="contributed">{0} мм рт. ст.</unitPattern>
<unitPattern count="few" draft="contributed">{0} мм рт. ст.</unitPattern>
<unitPattern count="many" draft="contributed">{0} мм рт. ст.</unitPattern>
<unitPattern count="other" draft="contributed">{0} мм рт. ст.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">ф. на дюйм²</displayName>
<unitPattern count="one" draft="contributed">{0} ф./дюйм²</unitPattern>
<unitPattern count="few" draft="contributed">{0} ф./дюйм²</unitPattern>
<unitPattern count="many" draft="contributed">{0} ф./дюйм²</unitPattern>
<unitPattern count="other" draft="contributed">{0} ф./дюйм²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">д. рт. ст.</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/ru_BY.xml b/common/main/ru_BY.xml
index e93b4d5..dbd52fe 100644
--- a/common/main/ru_BY.xml
+++ b/common/main/ru_BY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ru_KG.xml b/common/main/ru_KG.xml
index b5d433a..3d02f64 100644
--- a/common/main/ru_KG.xml
+++ b/common/main/ru_KG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ru_KZ.xml b/common/main/ru_KZ.xml
index 75c0320..04ab260 100644
--- a/common/main/ru_KZ.xml
+++ b/common/main/ru_KZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ru_MD.xml b/common/main/ru_MD.xml
index a1cf91d..6b95790 100644
--- a/common/main/ru_MD.xml
+++ b/common/main/ru_MD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ru_RU.xml b/common/main/ru_RU.xml
index 4cfe3ed..55805de 100644
--- a/common/main/ru_RU.xml
+++ b/common/main/ru_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ru_UA.xml b/common/main/ru_UA.xml
index 031bed6..7bdac43 100644
--- a/common/main/ru_UA.xml
+++ b/common/main/ru_UA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rw.xml b/common/main/rw.xml
index 12ec9ad..c67135b 100644
--- a/common/main/rw.xml
+++ b/common/main/rw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rw_RW.xml b/common/main/rw_RW.xml
index 51416f4..0c0b4db 100644
--- a/common/main/rw_RW.xml
+++ b/common/main/rw_RW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/rwk.xml b/common/main/rwk.xml
index 4ba9bc7..37f2540 100644
--- a/common/main/rwk.xml
+++ b/common/main/rwk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/rwk_TZ.xml b/common/main/rwk_TZ.xml
index 5a47b07..4b9e10e 100644
--- a/common/main/rwk_TZ.xml
+++ b/common/main/rwk_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sah.xml b/common/main/sah.xml
index 0437652..c562478 100644
--- a/common/main/sah.xml
+++ b/common/main/sah.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sah_RU.xml b/common/main/sah_RU.xml
index 9700961..e321250 100644
--- a/common/main/sah_RU.xml
+++ b/common/main/sah_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/saq.xml b/common/main/saq.xml
index 84ea2f6..923072e 100644
--- a/common/main/saq.xml
+++ b/common/main/saq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/saq_KE.xml b/common/main/saq_KE.xml
index 53fe461..3a76978 100644
--- a/common/main/saq_KE.xml
+++ b/common/main/saq_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sat.xml b/common/main/sat.xml
new file mode 100644
index 0000000..a7d896d
--- /dev/null
+++ b/common/main/sat.xml
@@ -0,0 +1,798 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="sat"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>↑↑↑</localePattern>
+ <localeSeparator>↑↑↑</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="de">ᱡᱟᱨᱢᱟᱱ</language>
+ <language type="de_AT">ᱚᱥᱴᱨᱤᱭᱟ ᱡᱟᱨᱢᱟᱱ</language>
+ <language type="de_CH">ᱥᱩᱣᱤᱥ ᱦᱟᱤ ᱡᱟᱨᱢᱟᱱ</language>
+ <language type="en">ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_AU">ᱚᱥᱴᱨᱮᱞᱤᱭᱟᱱ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_CA">ᱠᱟᱱᱟᱰᱤᱭᱟᱱ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_GB">ᱵᱨᱤᱴᱤᱥ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_GB" alt="short">ᱭᱩᱠᱮ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_US">ᱟᱢᱮᱨᱤᱠᱟᱱ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="en_US" alt="short">ᱭᱩᱮᱥ ᱟᱝᱜᱽᱨᱮᱡᱤ</language>
+ <language type="es">ᱮᱥᱯᱮᱱᱤᱥ</language>
+ <language type="es_419">ᱞᱮᱴᱤᱱ ᱟᱢᱮᱨᱤᱠᱟᱱ ᱮᱥᱯᱮᱱᱤᱥ</language>
+ <language type="es_ES">ᱨᱩᱥᱤᱭᱟᱱ ᱮᱥᱯᱮᱱᱤᱥ</language>
+ <language type="es_MX">ᱢᱮᱠᱥᱤᱠᱟᱱ ᱮᱥᱯᱮᱱᱤᱥ</language>
+ <language type="fr">ᱯᱷᱨᱮᱧᱪ</language>
+ <language type="fr_CA">ᱠᱟᱱᱟᱰᱤᱭᱟᱱ ᱯᱷᱨᱮᱧᱪ</language>
+ <language type="fr_CH">ᱥᱩᱣᱤᱥ ᱯᱷᱨᱮᱧᱪ</language>
+ <language type="it">ᱤᱴᱟᱞᱤᱟᱱ</language>
+ <language type="ja">ᱡᱟᱯᱟᱱᱤ</language>
+ <language type="pt">ᱯᱩᱨᱛᱜᱟᱞᱤ</language>
+ <language type="pt_BR">ᱵᱨᱟᱡᱤᱞᱤᱭᱟᱱ ᱯᱩᱨᱛᱜᱟᱞᱤ</language>
+ <language type="pt_PT">ᱭᱩᱨᱚᱯᱤᱭᱟᱱ ᱯᱩᱨᱛᱜᱟᱞᱤ</language>
+ <language type="ru">ᱨᱩᱥᱤᱭᱟᱱ</language>
+ <language type="sat">ᱥᱟᱱᱛᱟᱲᱤ</language>
+ <language type="und">ᱵᱟᱝ ᱩᱨᱩᱢ ᱯᱟᱹᱨᱥᱤ</language>
+ <language type="zh">ᱪᱟᱭᱱᱤᱡᱽ</language>
+ <language type="zh" alt="menu">ᱪᱟᱭᱱᱤᱡᱽ, ᱢᱟᱱᱰᱟᱨᱤᱱ</language>
+ <language type="zh_Hans">ᱟᱞᱜᱟᱣᱟᱠᱟᱱ ᱪᱟᱭᱱᱤᱡᱽ</language>
+ <language type="zh_Hans" alt="long">ᱟᱞᱜᱟᱣᱟᱠᱟᱱ ᱢᱟᱫᱟᱨᱤᱱ ᱪᱟᱭᱱᱤᱡᱽ</language>
+ <language type="zh_Hant">ᱴᱨᱮᱰᱤᱥᱱᱟᱞ ᱪᱟᱭᱱᱤᱡᱽ</language>
+ <language type="zh_Hant" alt="long">ᱴᱨᱮᱰᱤᱥᱱᱟᱞ ᱢᱟᱫᱟᱨᱤᱱ ᱪᱟᱭᱱᱤᱡᱽ</language>
+ </languages>
+ <scripts>
+ <script type="Arab">ᱟᱨᱵᱤᱠ</script>
+ <script type="Cyrl">ᱥᱤᱨᱤᱞᱤᱠ</script>
+ <script type="Deva" draft="contributed">ᱫᱮᱣᱟᱱᱟᱜᱟᱨᱤ</script>
+ <script type="Hans">ᱥᱤᱢᱯᱞᱤᱯᱟᱭᱤᱰ</script>
+ <script type="Hans" alt="stand-alone">ᱥᱤᱢᱯᱞᱤᱯᱟᱭᱤᱰ ᱦᱟᱱ</script>
+ <script type="Hant">ᱴᱨᱮᱰᱤᱥᱚᱱ</script>
+ <script type="Hant" alt="stand-alone">ᱴᱨᱮᱰᱤᱥᱚᱱ ᱦᱟᱱ</script>
+ <script type="Latn">ᱞᱮᱴᱤᱱ</script>
+ <script type="Olck">ᱚᱞ ᱪᱤᱠᱤ</script>
+ <script type="Zxxx">ᱵᱟᱝ ᱚᱞ ᱟᱠᱟᱱ</script>
+ <script type="Zzzz">ᱵᱟᱝ ᱩᱨᱩᱢ ᱪᱤᱠᱤ</script>
+ </scripts>
+ <territories>
+ <territory type="BR">ᱵᱨᱟᱡᱤᱞ</territory>
+ <territory type="CN">ᱪᱤᱱ</territory>
+ <territory type="DE">ᱡᱟᱨᱢᱟᱱᱤ</territory>
+ <territory type="FR">ᱯᱷᱨᱟᱱᱥ</territory>
+ <territory type="GB">ᱭᱩᱱᱤᱭᱴᱮᱰ ᱠᱤᱝᱰᱚᱢ</territory>
+ <territory type="IN">ᱤᱱᱰᱤᱭᱟ</territory>
+ <territory type="IT">ᱤᱴᱞᱤ</territory>
+ <territory type="JP">ᱡᱟᱯᱟᱱ</territory>
+ <territory type="RU">ᱨᱩᱥ</territory>
+ <territory type="US">ᱭᱩᱱᱟᱭᱴᱮᱰ ᱮᱥᱴᱮᱴ</territory>
+ <territory type="ZZ">ᱵᱟᱝᱩᱨᱩᱢ ᱴᱚᱴᱷᱟ</territory>
+ </territories>
+ <types>
+ <type key="calendar" type="gregorian">ᱜᱨᱮᱜᱚᱨᱤᱭᱟᱱ ᱠᱟᱞᱮᱱᱰᱟᱨ</type>
+ <type key="collation" type="standard">ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
+ <type key="numbers" type="latn">ᱣᱮᱥᱴᱟᱨᱱ ᱮᱞ</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">ᱢᱤᱴᱨᱤᱠ</measurementSystemName>
+ <measurementSystemName type="UK">ᱭᱩᱠᱮ</measurementSystemName>
+ <measurementSystemName type="US">ᱭᱩᱮᱥ</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">ᱯᱟᱹᱨᱥᱤ: {0}</codePattern>
+ <codePattern type="script">ᱪᱤᱠᱤ/ᱦᱟᱨᱚᱯᱺ {0}</codePattern>
+ <codePattern type="territory">ᱴᱚᱴᱷᱟᱺ {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[ᱚ ᱛ ᱜ ᱝ ᱞ ᱟ ᱠ ᱡ ᱢ ᱣ ᱤ ᱥ ᱦ ᱧ ᱨ ᱩ ᱪ ᱫ ᱬ ᱭ ᱮ ᱯ ᱰ ᱱ ᱲ ᱳ ᱴ ᱵ ᱶ ᱷ ᱸ ᱹ ᱺ ᱻ ᱼ ᱽ]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary" draft="contributed">↑↑↑</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % + 0᱐ 1᱑ 2᱒ 3᱓ 4᱔ 5᱕ 6᱖ 7᱗ 8᱘ 9᱙]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="contributed">↑↑↑</exemplarCharacters>
+ </characters>
+ <delimiters>
+ <quotationStart>“</quotationStart>
+ <quotationEnd>”</quotationEnd>
+ <alternateQuotationStart>‘</alternateQuotationStart>
+ <alternateQuotationEnd>’</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">ᱡᱟᱱ</month>
+ <month type="2">ᱯᱷᱟ</month>
+ <month type="3">ᱢᱟᱨ</month>
+ <month type="4">ᱟᱯᱨ</month>
+ <month type="5">ᱢᱮ</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">ᱡᱩᱞ</month>
+ <month type="8">ᱟᱜᱟ</month>
+ <month type="9">ᱥᱮᱯ</month>
+ <month type="10">ᱚᱠᱴ</month>
+ <month type="11">ᱱᱟᱣ</month>
+ <month type="12">ᱫᱤᱥ</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">ᱡ</month>
+ <month type="2">ᱯ</month>
+ <month type="3">ᱢ</month>
+ <month type="4">ᱟ</month>
+ <month type="5">ᱢ</month>
+ <month type="6">ᱡ</month>
+ <month type="7">ᱡ</month>
+ <month type="8">ᱟ</month>
+ <month type="9">ᱥ</month>
+ <month type="10">ᱚ</month>
+ <month type="11">ᱱ</month>
+ <month type="12">ᱫ</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">ᱡᱟᱱᱣᱟᱨᱤ</month>
+ <month type="2">ᱯᱷᱟᱨᱣᱟᱨᱤ</month>
+ <month type="3">ᱢᱟᱨᱪ</month>
+ <month type="4">ᱟᱯᱨᱮᱞ</month>
+ <month type="5">ᱢᱮ</month>
+ <month type="6">ᱡᱩᱱ</month>
+ <month type="7">ᱡᱩᱞᱟᱭ</month>
+ <month type="8">ᱟᱜᱟᱥᱛ</month>
+ <month type="9">ᱥᱮᱯᱴᱮᱢᱵᱟᱨ</month>
+ <month type="10">ᱚᱠᱴᱚᱵᱟᱨ</month>
+ <month type="11">ᱱᱟᱣᱟᱢᱵᱟᱨ</month>
+ <month type="12">ᱫᱤᱥᱟᱢᱵᱟᱨ</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">ᱡᱟᱱ</month>
+ <month type="2">ᱯᱷᱟ</month>
+ <month type="3">ᱢᱟᱨ</month>
+ <month type="4">ᱟᱯᱨ</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">ᱡᱩᱞ</month>
+ <month type="8">ᱟᱜᱟ</month>
+ <month type="9">ᱥᱮᱯ</month>
+ <month type="10">ᱚᱠᱴ</month>
+ <month type="11">ᱱᱟᱣ</month>
+ <month type="12">ᱫᱤᱥ</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">ᱡ</month>
+ <month type="2">ᱯ</month>
+ <month type="3">ᱢ</month>
+ <month type="4">ᱟ</month>
+ <month type="5">ᱢ</month>
+ <month type="6">ᱡ</month>
+ <month type="7">ᱡ</month>
+ <month type="8">ᱟ</month>
+ <month type="9">ᱥ</month>
+ <month type="10">ᱚ</month>
+ <month type="11">ᱱ</month>
+ <month type="12">ᱫ</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">ᱥᱤᱸ</day>
+ <day type="mon">ᱚᱛ</day>
+ <day type="tue">ᱵᱟ</day>
+ <day type="wed">ᱥᱟᱹ</day>
+ <day type="thu">ᱥᱟᱹᱨ</day>
+ <day type="fri">ᱡᱟᱹ</day>
+ <day type="sat">ᱧᱩ</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">ᱥ</day>
+ <day type="mon">ᱚ</day>
+ <day type="tue">ᱵ</day>
+ <day type="wed">ᱥ</day>
+ <day type="thu">ᱥ</day>
+ <day type="fri">ᱡ</day>
+ <day type="sat">ᱧ</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">ᱥᱤᱸᱜᱮ</day>
+ <day type="mon">ᱚᱛᱮ</day>
+ <day type="tue">ᱵᱟᱞᱮ</day>
+ <day type="wed">ᱥᱟᱹᱜᱩᱱ</day>
+ <day type="thu">ᱥᱟᱹᱨᱫᱤ</day>
+ <day type="fri">ᱡᱟᱹᱨᱩᱢ</day>
+ <day type="sat">ᱧᱩᱦᱩᱢ</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">↑↑↑</day>
+ <day type="tue">↑↑↑</day>
+ <day type="wed">↑↑↑</day>
+ <day type="thu">ᱥᱟᱹᱨ</day>
+ <day type="fri">ᱡᱟᱹ</day>
+ <day type="sat">ᱧᱩ</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">ᱥ</day>
+ <day type="mon">ᱚ</day>
+ <day type="tue">ᱵ</day>
+ <day type="wed">ᱥ</day>
+ <day type="thu">ᱥ</day>
+ <day type="fri">ᱡ</day>
+ <day type="sat">ᱧ</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">↑↑↑</day>
+ <day type="tue">↑↑↑</day>
+ <day type="wed">↑↑↑</day>
+ <day type="thu">↑↑↑</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">↑↑↑</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">᱒ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="3">᱓ᱭᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="4">᱔ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">᱑</quarter>
+ <quarter type="2">᱒</quarter>
+ <quarter type="3">᱓</quarter>
+ <quarter type="4">᱔</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">᱑ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="2">᱒ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="3">᱓ᱭᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="4">᱔ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">᱑</quarter>
+ <quarter type="2">᱒</quarter>
+ <quarter type="3">᱓</quarter>
+ <quarter type="4">᱔</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">᱒ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="3">᱓ᱭᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ <quarter type="4">᱔ᱟᱜ ᱯᱮ ᱪᱟᱸᱫᱚᱠᱤᱭᱟᱹ</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">ᱥᱤᱧ/ᱥᱮᱛᱟᱜ</dayPeriod>
+ <dayPeriod type="pm">ᱟᱹᱭᱩᱵ/ᱧᱤᱫᱟ</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ <era type="0" alt="variant">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ <era type="1" alt="variant">↑↑↑</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="Bh">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ehm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ehms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EHms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="h">↑↑↑</dateFormatItem>
+ <dateFormatItem id="H">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmsv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hmv">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="ms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>ᱡᱩᱜᱽ</displayName>
+ </field>
+ <field type="year">
+ <displayName>ᱥᱮᱨᱢᱟ/ᱵᱚᱪᱷᱚᱞᱨ</displayName>
+ </field>
+ <field type="year-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="year-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="quarter">
+ <displayName>ᱯᱮᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="quarter-short">
+ <displayName>ᱯᱮᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>ᱯᱮᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="month">
+ <displayName>ᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="month-short">
+ <displayName>ᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="month-narrow">
+ <displayName>ᱪᱟᱸᱫᱚ</displayName>
+ </field>
+ <field type="week">
+ <displayName>ᱦᱟᱯᱛᱟ/ᱮᱢᱦᱟ</displayName>
+ </field>
+ <field type="week-short">
+ <displayName>ᱦᱟᱯᱛᱟ/ᱮᱢᱦᱟ</displayName>
+ </field>
+ <field type="week-narrow">
+ <displayName>ᱦᱟᱯᱛᱟ/ᱮᱢᱦᱟ</displayName>
+ </field>
+ <field type="day">
+ <displayName>ᱢᱟᱦᱟ</displayName>
+ <relative type="-1">ᱦᱚᱞᱟ</relative>
+ <relative type="0">ᱛᱮᱦᱮᱧ</relative>
+ <relative type="1">ᱜᱟᱯᱟ</relative>
+ </field>
+ <field type="day-short">
+ <displayName>ᱢᱟᱦᱟ</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ </field>
+ <field type="day-narrow">
+ <displayName>ᱢᱟᱦᱟ</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ </field>
+ <field type="weekday">
+ <displayName>ᱦᱟᱯᱛᱟ ᱨᱮᱭᱟᱜ ᱢᱟᱦᱟ</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>ᱥᱮᱛᱟᱜ/ᱟᱹᱭᱩᱵ</displayName>
+ </field>
+ <field type="hour">
+ <displayName>ᱴᱟᱲᱟᱝ</displayName>
+ </field>
+ <field type="hour-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="hour-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute">
+ <displayName>ᱴᱤᱯᱤᱡ</displayName>
+ </field>
+ <field type="minute-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="second">
+ <displayName>ᱴᱤᱡ</displayName>
+ </field>
+ <field type="second-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="second-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="zone">
+ <displayName>ᱴᱚᱴᱷᱟ</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>↑↑↑</hourFormat>
+ <gmtFormat>ᱡᱤᱮᱢᱴᱤ{0}</gmtFormat>
+ <gmtZeroFormat>ᱡᱤᱮᱢᱴᱤ</gmtZeroFormat>
+ <regionFormat>{0} ᱚᱠᱛᱚ</regionFormat>
+ <regionFormat type="daylight">{0} ᱫᱤᱱᱵᱮᱲᱟ ᱚᱠᱛᱚ</regionFormat>
+ <regionFormat type="standard">{0} ᱮᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</regionFormat>
+ <fallbackFormat>↑↑↑</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>ᱠᱚᱨᱰᱤᱱᱮᱴᱮᱰ ᱭᱩᱱᱤᱣᱟᱨᱥᱟᱞ ᱚᱠᱛᱚ</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>ᱵᱟᱝ ᱪᱤᱱᱦᱟᱹᱣ ᱵᱟᱡᱟᱨ</exemplarCity>
+ </zone>
+ <metazone type="America_Central">
+ <long>
+ <generic>ᱛᱟᱱᱟᱞᱟ ᱚᱠᱛᱚ</generic>
+ <standard>ᱛᱟᱱᱟᱞᱟ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱛᱟᱱᱟᱞᱟ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>ᱤᱥᱴᱟᱨᱱ ᱚᱠᱛᱚ</generic>
+ <standard>ᱤᱥᱴᱟᱨᱱ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱤᱥᱴᱟᱨᱱ ᱥᱤᱧᱟᱜ ᱵᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>ᱢᱟᱩᱱᱴᱮᱱ ᱚᱠᱛᱚ</generic>
+ <standard>ᱢᱟᱩᱱᱴᱮᱱ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱢᱟᱩᱱᱴᱮᱱ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>ᱯᱮᱥᱤᱯᱷᱤᱠ ᱚᱠᱛᱚ</generic>
+ <standard>ᱯᱮᱥᱤᱯᱷᱤᱠ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱯᱮᱥᱤᱯᱷᱤᱠ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>ᱮᱴᱞᱟᱱᱴᱤᱠ ᱚᱠᱛᱚ</generic>
+ <standard>ᱮᱴᱞᱟᱱᱴᱤᱠ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱮᱴᱞᱟᱱᱴᱤᱠ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>ᱥᱮᱱᱴᱨᱟᱞ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱚᱠᱛᱚ</generic>
+ <standard>ᱥᱮᱱᱴᱨᱟᱞ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱥᱮᱱᱴᱨᱟᱞ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱥᱟᱢᱟᱨ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>ᱤᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱚᱠᱛᱚ</generic>
+ <standard>ᱤᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱤᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱥᱟᱢᱟᱨ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>ᱣᱮᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱚᱠᱛᱚ</generic>
+ <standard>ᱣᱮᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱮᱥᱴᱮᱱᱰᱟᱨᱰ ᱚᱠᱛᱚ</standard>
+ <daylight>ᱣᱮᱥᱴᱟᱨᱱ ᱩᱨᱚᱯᱤᱭᱟᱱ ᱥᱟᱢᱟᱨ ᱚᱠᱛᱚ</daylight>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>ᱜᱨᱤᱱᱣᱤᱪ ᱢᱤᱱ ᱚᱠᱛᱚ</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem>olck</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">↑↑↑</native>
+ </otherNumberingSystems>
+ <symbols numberSystem="latn">
+ <decimal>↑↑↑</decimal>
+ <group>↑↑↑</group>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign>↑↑↑</plusSign>
+ <minusSign>↑↑↑</minusSign>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="two">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="BRL">
+ <displayName>ᱵᱨᱟᱡᱤᱞᱤᱭᱟᱱ ᱨᱤᱭᱟᱹᱞ</displayName>
+ <displayName count="one">ᱵᱨᱟᱡᱤᱞᱤᱭᱟᱱ ᱨᱤᱭᱟᱹᱞ</displayName>
+ <displayName count="two">ᱵᱨᱟᱡᱤᱞᱤᱭᱟᱱ ᱨᱤᱭᱟᱹᱞᱥ</displayName>
+ <displayName count="other">ᱵᱨᱟᱡᱤᱞᱤᱭᱟᱱ ᱨᱤᱭᱟᱹᱞᱥ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>ᱪᱤᱱᱤ ᱭᱩᱣᱟᱱ</displayName>
+ <displayName count="one">↑↑↑</displayName>
+ <displayName count="two">↑↑↑</displayName>
+ <displayName count="other">↑↑↑</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>ᱭᱩᱨᱚ</displayName>
+ <displayName count="one">ᱭᱩᱨᱚ</displayName>
+ <displayName count="two">ᱭᱩᱨᱚ</displayName>
+ <displayName count="other">ᱭᱩᱨᱚ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>ᱵᱨᱤᱴᱤᱥ ᱯᱟᱣᱩᱸᱰ</displayName>
+ <displayName count="one">ᱵᱨᱤᱴᱤᱥ ᱯᱟᱣᱩᱸᱰ</displayName>
+ <displayName count="two">ᱵᱨᱤᱴᱤᱥ ᱯᱟᱣᱩᱸᱰᱥ</displayName>
+ <displayName count="other">ᱵᱨᱤᱴᱤᱥ ᱯᱟᱣᱩᱸᱰᱥ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>ᱥᱤᱧᱚᱛ ᱨᱮᱱᱟᱜ ᱴᱟᱠᱟ</displayName>
+ <displayName count="one">ᱥᱤᱧᱚᱛ ᱨᱮᱱᱟᱜ ᱴᱟᱠᱟ</displayName>
+ <displayName count="two">ᱥᱤᱧᱚᱛ ᱨᱮᱱᱟᱜ ᱴᱟᱠᱟ</displayName>
+ <displayName count="other">ᱥᱤᱧᱚᱛ ᱨᱮᱱᱟᱜ ᱴᱟᱠᱟ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>ᱡᱟᱯᱟᱱᱤ ᱭᱮᱱ</displayName>
+ <displayName count="one">ᱡᱟᱯᱟᱱᱤ ᱭᱮᱱ</displayName>
+ <displayName count="two">ᱡᱟᱯᱟᱱᱤ ᱭᱮᱱ</displayName>
+ <displayName count="other">ᱡᱟᱯᱟᱱᱤ ᱭᱮᱱ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>ᱨᱩᱥᱤ ᱨᱩᱵᱟᱹᱞ</displayName>
+ <displayName count="one">ᱨᱩᱥᱤ ᱨᱩᱵᱟᱹᱞ</displayName>
+ <displayName count="two">ᱨᱩᱥᱤ ᱨᱩᱵᱟᱹᱞᱥ</displayName>
+ <displayName count="other">ᱨᱩᱥᱤ ᱨᱩᱵᱟᱹᱞᱥ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>ᱭᱩᱮᱥ ᱰᱚᱞᱟᱨ</displayName>
+ <displayName count="one">ᱭᱩᱮᱥ ᱰᱚᱞᱟᱨ</displayName>
+ <displayName count="two">ᱭᱩᱮᱥ ᱰᱚᱞᱟᱨ</displayName>
+ <displayName count="other">ᱭᱩᱮᱥ ᱰᱚᱞᱟᱨ</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="XXX">
+ <displayName>ᱵᱟᱝᱩᱨᱩᱢ ᱠᱟᱨᱮᱱᱥᱤ</displayName>
+ <displayName count="one">ᱵᱟᱝᱩᱨᱩᱢ ᱠᱟᱨᱮᱱᱥᱤ</displayName>
+ <displayName count="two">ᱵᱟᱝᱩᱨᱩᱢ ᱠᱟᱨᱮᱱᱥᱤ</displayName>
+ <displayName count="other">ᱵᱟᱝᱩᱨᱩᱢ ᱠᱟᱨᱮᱱᱥᱤ</displayName>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <durationUnit type="hm">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>ᱦᱚᱸᱺᱦ</yesstr>
+ <nostr>ᱵᱟᱝᱺᱵ</nostr>
+ </messages>
+ </posix>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/sat_Olck.xml
similarity index 82%
copy from seed/main/mni_IN.xml
copy to common/main/sat_Olck.xml
index 01c64c4..b60e599 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/sat_Olck.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,7 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
- <territory type="IN"/>
+ <language type="sat"/>
+ <script type="Olck"/>
</identity>
</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/sat_Olck_IN.xml
similarity index 83%
copy from seed/main/mni_IN.xml
copy to common/main/sat_Olck_IN.xml
index 01c64c4..c026d6e 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/sat_Olck_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,8 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
+ <language type="sat"/>
+ <script type="Olck"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/common/main/sbp.xml b/common/main/sbp.xml
index 1b9cb5f..debaf0d 100644
--- a/common/main/sbp.xml
+++ b/common/main/sbp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Molidova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Figunguli ifya Malishali</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Muyama</territory>
<territory type="MN">Mongoliya</territory>
diff --git a/common/main/sbp_TZ.xml b/common/main/sbp_TZ.xml
index 14d0bb9..585475e 100644
--- a/common/main/sbp_TZ.xml
+++ b/common/main/sbp_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sd.xml b/common/main/sd.xml
index c4a71e1..1925c08 100644
--- a/common/main/sd.xml
+++ b/common/main/sd.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -116,6 +116,7 @@
<language type="eu">باسڪي</language>
<language type="ewo">اوانڊو</language>
<language type="fa">فارسي</language>
+ <language type="fa_AF">دري</language>
<language type="ff">فلاهه</language>
<language type="fi">فنش</language>
<language type="fil">فلپائني</language>
@@ -4206,7 +4207,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>نار فوڪ آئي لينڊ جو وقت</standard>
+ <generic draft="contributed">نار فوڪ آئي لينڊ جو وقت</generic>
+ <standard draft="contributed">نار فوڪ آئي لينڊ جو معياري وقت</standard>
+ <daylight draft="contributed">نار فوڪ آئي لينڊ جي ڏينهن جو وقت</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4760,9 +4763,6 @@
<symbol alt="narrow" draft="contributed">р.</symbol>
</currency>
<currency type="BYR">
- <displayName>BYR</displayName>
- <displayName count="one">BYR</displayName>
- <displayName count="other">BYR</displayName>
<symbol draft="contributed">BYR</symbol>
</currency>
<currency type="BZD">
@@ -5671,9 +5671,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>في {1} تي {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>اسڪوائر {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">اسڪوائر {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">اسڪوائر {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ڪيوبڪ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ڪيوبڪ{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -5682,7 +5752,7 @@
<unitPattern count="one">{0} ڪشش ثقل</unitPattern>
<unitPattern count="other">{0} ڪشش ثقل</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ميٽر في سيڪنڊ اسڪوائر</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} ميٽر في سيڪنڊ اسڪوائر</unitPattern>
@@ -5782,7 +5852,7 @@
<unitPattern count="one">{0} ملي مولز في ليٽر</unitPattern>
<unitPattern count="other">{0} ملي مولز في ليٽر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>حصا في ملين</displayName>
<unitPattern count="one">{0} حصا في ملين</unitPattern>
<unitPattern count="other">{0} حصا في ملين</unitPattern>
@@ -5812,7 +5882,7 @@
<unitPattern count="one">{0} ليٽرز في ڪلو ميٽر</unitPattern>
<unitPattern count="other">{0} ليٽرز في ڪلو ميٽر</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ليٽرز في 100 ڪلو ميٽر</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} ليٽرز في 100 ڪلو ميٽر</unitPattern>
@@ -6288,17 +6358,17 @@
<unitPattern count="one">{0} هارس پاور</unitPattern>
<unitPattern count="other">{0} هارس پاور</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>مرڪري جو ملي ميٽر</displayName>
<unitPattern count="one">مرڪري جو {0} ملي ميٽر</unitPattern>
<unitPattern count="other">مرڪري جو {0} ملي ميٽر</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پائونڊز في اسڪوائر انچ</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} پائونڊز في اسڪوائر انچ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>مرڪري جا انچز</displayName>
<unitPattern count="one">مرڪري جا {0} انچز</unitPattern>
<unitPattern count="other">مرڪري جا {0} انچز</unitPattern>
@@ -6378,7 +6448,7 @@
<unitPattern count="one">{0} ڪيلونز</unitPattern>
<unitPattern count="other">{0} ڪيلونز</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>پائونڊ-فيٽ</displayName>
<unitPattern count="one">{0} پائونڊ-فوٽ</unitPattern>
<unitPattern count="other">{0} پائونڊ-فيٽ</unitPattern>
@@ -6532,9 +6602,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6543,7 +6683,7 @@
<unitPattern count="one">{0} ڪشش ثقل</unitPattern>
<unitPattern count="other">{0} ڪشش ثقل</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>ميٽر في سيڪنڊ اسڪوائر</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6643,7 +6783,7 @@
<unitPattern count="one">{0} ملي مولز في ليٽر</unitPattern>
<unitPattern count="other">{0} ملي مولز في ليٽر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>حصا في ملين</displayName>
<unitPattern count="one">{0} حصا في ملين</unitPattern>
<unitPattern count="other">{0} حصا في ملين</unitPattern>
@@ -6673,7 +6813,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7149,17 +7289,17 @@
<unitPattern count="one">{0} هارس پاور</unitPattern>
<unitPattern count="other">{0} هارس پاور</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>مرڪري جو ملي ميٽر</displayName>
<unitPattern count="one">مرڪري جو {0} ملي ميٽر</unitPattern>
<unitPattern count="other">مرڪري جو {0} ملي ميٽر</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پائونڊز في اسڪوائر انچ</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>مرڪري جا انچز</displayName>
<unitPattern count="one">مرڪري جا {0} انچز</unitPattern>
<unitPattern count="other">مرڪري جا {0} انچز</unitPattern>
@@ -7239,7 +7379,7 @@
<unitPattern count="one">{0} ڪيلونز</unitPattern>
<unitPattern count="other">{0} ڪيلونز</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7393,9 +7533,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7404,7 +7614,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
diff --git a/common/main/sd_PK.xml b/common/main/sd_Arab.xml
similarity index 87%
rename from common/main/sd_PK.xml
rename to common/main/sd_Arab.xml
index ef7a768..4a3d891 100644
--- a/common/main/sd_PK.xml
+++ b/common/main/sd_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,6 @@
<identity>
<version number="$Revision$"/>
<language type="sd"/>
- <territory type="PK"/>
+ <script type="Arab"/>
</identity>
</ldml>
diff --git a/common/main/sd_PK.xml b/common/main/sd_Arab_PK.xml
similarity index 87%
copy from common/main/sd_PK.xml
copy to common/main/sd_Arab_PK.xml
index ef7a768..28adc46 100644
--- a/common/main/sd_PK.xml
+++ b/common/main/sd_Arab_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,7 @@
<identity>
<version number="$Revision$"/>
<language type="sd"/>
+ <script type="Arab"/>
<territory type="PK"/>
</identity>
</ldml>
diff --git a/common/main/sd_Deva.xml b/common/main/sd_Deva.xml
new file mode 100644
index 0000000..6a6123e
--- /dev/null
+++ b/common/main/sd_Deva.xml
@@ -0,0 +1,794 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="sd"/>
+ <script type="Deva"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>↑↑↑</localePattern>
+ <localeSeparator>↑↑↑</localeSeparator>
+ <localeKeyTypePattern>↑↑↑</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="de">जर्मन</language>
+ <language type="de_AT">आसट्रियन जो जर्मन</language>
+ <language type="de_CH">स्विसु हाई जर्मनु</language>
+ <language type="en">अंगरेज़ी</language>
+ <language type="en_AU">ऑसटेलियन अंगरेज़ी</language>
+ <language type="en_CA">केनेडियन अंगरेज़ी</language>
+ <language type="en_GB">↑↑↑</language>
+ <language type="en_GB" alt="short">यूके जी अंगरेज़ी</language>
+ <language type="en_US">↑↑↑</language>
+ <language type="en_US" alt="short">यूएस जी अंगरेज़ी</language>
+ <language type="es">स्पेनिश</language>
+ <language type="es_419">लैटिणु अमिरिकी स्पेन वारो</language>
+ <language type="es_ES">यूरोपियन स्पेनी</language>
+ <language type="es_MX">मैक्सिकन स्पेनिश</language>
+ <language type="fr">फ़्रांस जी ॿोली</language>
+ <language type="fr_CA">↑↑↑</language>
+ <language type="fr_CH">↑↑↑</language>
+ <language type="it">इटालियनु</language>
+ <language type="ja">जापानीज़</language>
+ <language type="pt">पुर्तगीज़</language>
+ <language type="pt_BR">↑↑↑</language>
+ <language type="pt_PT">.यूरोपी पुर्तगीज़</language>
+ <language type="ru">रशियनु</language>
+ <language type="sd">सिन्धी</language>
+ <language type="und">अणवाकुफु भाषा</language>
+ <language type="zh">चीनी(लिप्यंतरण जो इशारो: खास करे, मेंडिरिन चीनी जे लाइ</language>
+ <language type="zh" alt="menu">चीनी,मेंडारिन</language>
+ <language type="zh_Hans">↑↑↑</language>
+ <language type="zh_Hans" alt="long">सवली मेंडिरिन चीनी</language>
+ <language type="zh_Hant">रवायती चीनी</language>
+ <language type="zh_Hant" alt="long">रवायती मेंडिरिन चीनी</language>
+ </languages>
+ <scripts>
+ <script type="Arab">अरेबिक</script>
+ <script type="Cyrl">सिरिलिक</script>
+ <script type="Deva">देवनागिरी</script>
+ <script type="Hans">सवलो थियण(लिप्यंतरण जो इशारो: लिपि नालो जो इहो तर्जमो चीनी भाषा जे नाले सां ॻडु ॻढिण में कमु इंदो आहे</script>
+ <script type="Hans" alt="stand-alone">सवलो थियण हान(लिप्यंतरण जो इशारो: लिपि नालो जो इहो तर्जमो जुदा रुप में इस्तेमाल थींदो आहे चीनी भाषा जे नाले सां ॻडु थी करे ना थींदो आहे)</script>
+ <script type="Hant">रवायती (लिप्यंतरण जो इशारो: लिपि नालो जो इहो तर्जमो चीनी भाषा जे नाले सां ॻडु करे ॻढिंजी करे थींदो आहे )</script>
+ <script type="Hant" alt="stand-alone">रवायती हान (लिप्यंतरण जो इशारो: लिपि नालो जो इहो तर्जमो जुदा सां इस्तेमाल थींदो आहे चीनी भाषा जे नाले सा ॻढिंजी करे न थींदो आहे )</script>
+ <script type="Latn">लैटिन</script>
+ <script type="Zxxx">अणलिखयल</script>
+ <script type="Zzzz">अणवाकुफु लिपि</script>
+ </scripts>
+ <territories>
+ <territory type="BR">ब्राजील</territory>
+ <territory type="CN">चाइना</territory>
+ <territory type="DE">जर्मनी</territory>
+ <territory type="FR">फ़्रांस</territory>
+ <territory type="GB">यूनाइटेड किंगडम</territory>
+ <territory type="IN">भारत</territory>
+ <territory type="IT">इटली</territory>
+ <territory type="JP">जापान</territory>
+ <territory type="RU">रशिया</territory>
+ <territory type="US">अमेरिका</territory>
+ <territory type="ZZ">अणवाकुफु इलाको</territory>
+ </territories>
+ <types>
+ <type key="calendar" type="gregorian">ग्रेगेरियन कलेंडरु</type>
+ <type key="collation" type="standard">मअयारी तरीके वारो आदेश</type>
+ <type key="numbers" type="arab">अरेबिक-इंडिक डिजिट</type>
+ <type key="numbers" type="deva">देवनागिरी लिपि</type>
+ <type key="numbers" type="latn">मग़रबी डिजिट</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">मीट्रिकु</measurementSystemName>
+ <measurementSystemName type="UK">यूके</measurementSystemName>
+ <measurementSystemName type="US">यूएस</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">भाषा: {0}</codePattern>
+ <codePattern type="script">लिपि: {0}</codePattern>
+ <codePattern type="territory">इलाको: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[\u093C \u0902 अ आ इ ई उ ऊ ए ऐ ओ औ क ख ग ॻ घ ङ च छ ज ॼ झ ञ ट ठ ड ॾ ढ ण त थ द ध न प फ ब ॿ भ म य र ल व श ष स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="contributed">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters>
+ </characters>
+ <delimiters>
+ <quotationStart>↑↑↑</quotationStart>
+ <quotationEnd>↑↑↑</quotationEnd>
+ <alternateQuotationStart>↑↑↑</alternateQuotationStart>
+ <alternateQuotationEnd>↑↑↑</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <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/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'at' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'at' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>{1}, {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>{1}, {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">जन</month>
+ <month type="2">फर</month>
+ <month type="3">मार्च</month>
+ <month type="4">अप्रै</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जु</month>
+ <month type="8">अग</month>
+ <month type="9">सितं</month>
+ <month type="10">अक्टू</month>
+ <month type="11">नवं</month>
+ <month type="12">दिसं</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">जनवरी</month>
+ <month type="2">फरवरी</month>
+ <month type="3">मार्चु</month>
+ <month type="4">अप्रैल</month>
+ <month type="5">मई</month>
+ <month type="6">जून</month>
+ <month type="7">जुलाई</month>
+ <month type="8">अगस्त</month>
+ <month type="9">सितंबर</month>
+ <month type="10">अक्टूबर</month>
+ <month type="11">नवंबर</month>
+ <month type="12">दिसंबर</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">जुला</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">ज</month>
+ <month type="2">फ़</month>
+ <month type="3">म</month>
+ <month type="4">अ</month>
+ <month type="5">म</month>
+ <month type="6">जू</month>
+ <month type="7">जु</month>
+ <month type="8">अ</month>
+ <month type="9">सि</month>
+ <month type="10">अ</month>
+ <month type="11">न</month>
+ <month type="12">द</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">आर्त</day>
+ <day type="mon">सू</day>
+ <day type="tue">मंग</day>
+ <day type="wed">बुध</day>
+ <day type="thu">विस</day>
+ <day type="fri">जुम</day>
+ <day type="sat">छंछ</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">↑↑↑</day>
+ <day type="mon">म</day>
+ <day type="tue">मं</day>
+ <day type="wed">बु</day>
+ <day type="thu">↑↑↑</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">↑↑↑</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">आर्तवार</day>
+ <day type="mon">सूमर</day>
+ <day type="tue">मंगलु</day>
+ <day type="wed">बुधर</day>
+ <day type="thu">विस्पत</day>
+ <day type="fri">जुमओ</day>
+ <day type="sat">छंछर</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">आ</day>
+ <day type="mon">सू</day>
+ <day type="tue">मं</day>
+ <day type="wed">बुध</day>
+ <day type="thu">विस्</day>
+ <day type="fri">↑↑↑</day>
+ <day type="sat">↑↑↑</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">आ</day>
+ <day type="mon">सू</day>
+ <day type="tue">मं</day>
+ <day type="wed">बु</day>
+ <day type="thu">वि</day>
+ <day type="fri">शु</day>
+ <day type="sat">छं</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">आर्त</day>
+ <day type="mon">सू</day>
+ <day type="tue">मं</day>
+ <day type="wed">बुध</day>
+ <day type="thu">विस</day>
+ <day type="fri">जुम</day>
+ <day type="sat">छंछ</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">पहिरों पाड़ो</quarter>
+ <quarter type="2">ॿियो पाड़ो</quarter>
+ <quarter type="3">टियो पाड़ो</quarter>
+ <quarter type="4">चोथो पाड़ो</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">1</quarter>
+ <quarter type="2">2</quarter>
+ <quarter type="3">3</quarter>
+ <quarter type="4">1</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">पहिरों पाड़ो</quarter>
+ <quarter type="2">ॿियो पाड़ो</quarter>
+ <quarter type="3">टियो पाड़ो</quarter>
+ <quarter type="4">चोथो पाड़ो</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">पहिरों पाड़ो</quarter>
+ <quarter type="2">ॿियो पाड़ो</quarter>
+ <quarter type="3">टियो पाड़ो</quarter>
+ <quarter type="4">चोथो पाड़ो</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">1</quarter>
+ <quarter type="2">2</quarter>
+ <quarter type="3">3</quarter>
+ <quarter type="4">4</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">ॿियो पाड़ो</quarter>
+ <quarter type="3">टियो पाड़ो</quarter>
+ <quarter type="4">चोथो पाड़ो</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">मंझंदि का पहिंरो</dayPeriod>
+ <dayPeriod type="pm">मंझंदि को पोए</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">बीसी</era>
+ <era type="0" alt="variant">बीसीई</era>
+ <era type="1">एडी</era>
+ <era type="1" alt="variant">सीई</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>a h:mm:ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>a h:mm:ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>a h:mm:ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>a h:mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'at' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</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="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h:mm:ss B</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">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
+ <dateFormatItem id="h">h a</dateFormatItem>
+ <dateFormatItem id="H">HH</dateFormatItem>
+ <dateFormatItem id="hm">h:mm a</dateFormatItem>
+ <dateFormatItem id="Hm">HH:mm</dateFormatItem>
+ <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+ <dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+ <dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+ <dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">M/d</dateFormatItem>
+ <dateFormatItem id="MEd">E, M/d</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">M/y</dateFormatItem>
+ <dateFormatItem id="yMd">M/d/y</dateFormatItem>
+ <dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+ <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="year">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="year-short">
+ <displayName>साल</displayName>
+ </field>
+ <field type="year-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="quarter">
+ <displayName>चोथो</displayName>
+ </field>
+ <field type="quarter-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="month">
+ <displayName>महीनो</displayName>
+ </field>
+ <field type="month-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="month-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="week">
+ <displayName>हफ्तो</displayName>
+ </field>
+ <field type="week-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="week-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="day">
+ <displayName>ॾींहु</displayName>
+ <relative type="-1">कल</relative>
+ <relative type="0">अॼु</relative>
+ <relative type="1">सुभाणे</relative>
+ </field>
+ <field type="day-short">
+ <displayName>↑↑↑</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ </field>
+ <field type="day-narrow">
+ <displayName>↑↑↑</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ </field>
+ <field type="weekday">
+ <displayName>हफ्ते जो ॾींहु</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>ॾींहु/रातु</displayName>
+ </field>
+ <field type="hour">
+ <displayName>कलाक</displayName>
+ </field>
+ <field type="hour-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="hour-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="minute-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="second">
+ <displayName>सेकिंडु</displayName>
+ </field>
+ <field type="second-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="second-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="zone">
+ <displayName>वक्तु जो दायरो</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>↑↑↑</hourFormat>
+ <gmtFormat>↑↑↑</gmtFormat>
+ <gmtZeroFormat>जीएमटी</gmtZeroFormat>
+ <regionFormat>{0} भेरो</regionFormat>
+ <regionFormat type="daylight">↑↑↑</regionFormat>
+ <regionFormat type="standard">{0} (+0) मअयारी भेरो</regionFormat>
+ <fallbackFormat>{1} ({0})</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>आस्थानी चालू टाइमु</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>बेखबरो शहरु</exemplarCity>
+ </zone>
+ <metazone type="America_Central">
+ <long>
+ <generic>विचो भेरो</generic>
+ <standard>विचो मअयारी भेरो</standard>
+ <daylight>विचो ॾींह वारो भेरो</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>उभिरंदो भेरो</generic>
+ <standard>उभिरंदो मअयारी वारो भेरो</standard>
+ <daylight>उभिरंदो विचो वारो भेरो</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>टकरु वारो भेरो</generic>
+ <standard>टकरु वारो मअयारी भेरो</standard>
+ <daylight>टकरु जो ॾींह वारो भेरो</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>पेसीफिक वारो टाइमु</generic>
+ <standard>पेसीफिक वारो मअयारी वारो भेरो</standard>
+ <daylight>पेसीफिक जो ॾींह वारो भेरो</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>अटलांटिक टाइमु</generic>
+ <standard>अंटलांटिक जे मअयारी वारो भेरो</standard>
+ <daylight>अंटलांटिक जे ॾींह वारो भेरो</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>सेंटरलु यूरपी टाइमु</generic>
+ <standard>सेंटरलु यूरपी मयआरी वारो टाइमु</standard>
+ <daylight>सेंटरलु यूरपी गरमी वारो टाइमु</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>उभिरंदो यूरोपी टाइमु</generic>
+ <standard>उभिरंदो यूरोपी मअयारी वारो वक्तु</standard>
+ <daylight>उभिरंदो यूरोपी गरमी वारो वक्तु</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>उलहंदो वारो यूरोपी वारो वक्तु</generic>
+ <standard>उलहंदो जे मअयारी वारो वक्तु</standard>
+ <daylight>उलहंदो जे यूरोपीअ गरमी वारो वक्तु</daylight>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>ग्रीन विचु मीन टाइमु</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">latn</native>
+ </otherNumberingSystems>
+ <symbols numberSystem="latn">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="shrd">
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="BRL">
+ <displayName>बरजिलियन रियलु</displayName>
+ <displayName count="one">बरजिलियन रियलु</displayName>
+ <displayName count="other">बरजिलियन रियल</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>चीना युआनु</displayName>
+ <displayName count="one">चीना युआनु</displayName>
+ <displayName count="other">चीना युआन</displayName>
+ <symbol draft="contributed">CN¥</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>यूरो</displayName>
+ <displayName count="one">↑↑↑</displayName>
+ <displayName count="other">↑↑↑</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>बरतानवी पाउंडु</displayName>
+ <displayName count="one">↑↑↑</displayName>
+ <displayName count="other">बरतानवी पाउंड</displayName>
+ <symbol draft="contributed">£</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>हिंदुस्तानी रुपयो</displayName>
+ <displayName count="one">↑↑↑</displayName>
+ <displayName count="other">↑↑↑</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>जापानी येनु</displayName>
+ <displayName count="one">जापानी येनु</displayName>
+ <displayName count="other">जापानी येन</displayName>
+ <symbol draft="contributed">¥</symbol>
+ <symbol alt="narrow" draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>रशियनु रुबलु</displayName>
+ <displayName count="one">रशियनु रुबलु</displayName>
+ <displayName count="other">रशियनु रुबल</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ <symbol alt="narrow" draft="contributed">₽</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>यूएस जो डॉलल</displayName>
+ <displayName count="one">यूएस जो डॉलर</displayName>
+ <displayName count="other">यूएस जा डॉलर</displayName>
+ <symbol draft="contributed">$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ <currency type="XXX">
+ <displayName>अणवाकुफु चालू सिक्को</displayName>
+ <displayName count="one">अणवाकुफु चालू सिक्के जो एको</displayName>
+ <displayName count="other">↑↑↑</displayName>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <durationUnit type="hm">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>↑↑↑</durationUnitPattern>
+ </durationUnit>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>↑↑↑</yesstr>
+ <nostr>↑↑↑</nostr>
+ </messages>
+ </posix>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/common/main/sd_Deva_IN.xml
similarity index 83%
copy from seed/main/mni_IN.xml
copy to common/main/sd_Deva_IN.xml
index 01c64c4..f6d443e 100644
--- a/seed/main/mni_IN.xml
+++ b/common/main/sd_Deva_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,8 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
+ <language type="sd"/>
+ <script type="Deva"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/common/main/se.xml b/common/main/se.xml
index 7f98c62..b34ba4d 100644
--- a/common/main/se.xml
+++ b/common/main/se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -321,7 +321,6 @@
<territory type="MF" draft="contributed">Frankriikka Saint Martin</territory>
<territory type="MG" draft="contributed">Madagaskar</territory>
<territory type="MH" draft="contributed">Marshallsullot</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML" draft="contributed">Mali</territory>
<territory type="MM" draft="contributed">Burma</territory>
<territory type="MN" draft="contributed">Mongolia</territory>
@@ -1661,7 +1660,7 @@
<unitPattern count="two" draft="contributed">{0} hevosvoima</unitPattern>
<unitPattern count="other" draft="contributed">{0} hevosvoima</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">bealgi kvikksølv</displayName>
<unitPattern count="one" draft="contributed">{0} bealgi kvikksølv</unitPattern>
<unitPattern count="two" draft="contributed">{0} bealgi kvikksølv</unitPattern>
@@ -1745,7 +1744,7 @@
<unitPattern count="two" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="unconfirmed">{0} m/s²</unitPattern>
<unitPattern count="two" draft="unconfirmed">{0} m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} m/s²</unitPattern>
@@ -2035,7 +2034,7 @@
<unitPattern count="two" draft="contributed">{0} hv</unitPattern>
<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">bealgi kvikksølv</displayName>
<unitPattern count="one" draft="contributed">{0} bealgi Hg</unitPattern>
<unitPattern count="two" draft="contributed">{0} bealgi Hg</unitPattern>
@@ -2161,7 +2160,7 @@
<unitPattern count="two" draft="contributed">{0}G</unitPattern>
<unitPattern count="other" draft="contributed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
<unitPattern count="two" draft="unconfirmed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
@@ -2409,7 +2408,7 @@
<unitPattern count="two" draft="contributed">{0}hv</unitPattern>
<unitPattern count="other" draft="contributed">{0}hv</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0} bealgi Hg</unitPattern>
<unitPattern count="two" draft="contributed">{0} bealgi Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} bealgi Hg</unitPattern>
diff --git a/common/main/se_FI.xml b/common/main/se_FI.xml
index ca6e64b..e1f289d 100644
--- a/common/main/se_FI.xml
+++ b/common/main/se_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -98,7 +98,6 @@
<type key="calendar" type="ethiopic">etiohpalaš kaleandar</type>
<type key="calendar" type="ethiopic-amete-alem">etiohpalaš-amete-alem kaleandar</type>
<type key="calendar" type="gregorian">gregorialaš kalendar</type>
- <type key="numbers" type="fullwide">fullwide</type>
</types>
<codePatterns>
<codePattern type="script">čállin: {0}</codePattern>
diff --git a/common/main/se_NO.xml b/common/main/se_NO.xml
index d787097..c540a9d 100644
--- a/common/main/se_NO.xml
+++ b/common/main/se_NO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/se_SE.xml b/common/main/se_SE.xml
index d05bebf..4624f53 100644
--- a/common/main/se_SE.xml
+++ b/common/main/se_SE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/seh.xml b/common/main/seh.xml
index 7017440..9d5b147 100644
--- a/common/main/seh.xml
+++ b/common/main/seh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldávia</territory>
<territory type="MG">Madagascar</territory>
<territory type="MH">Ilhas Marshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Mianmar</territory>
<territory type="MN">Mongólia</territory>
diff --git a/common/main/seh_MZ.xml b/common/main/seh_MZ.xml
index 19b21e6..3291e0f 100644
--- a/common/main/seh_MZ.xml
+++ b/common/main/seh_MZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ses.xml b/common/main/ses.xml
index 87a48cd..6dab961 100644
--- a/common/main/ses.xml
+++ b/common/main/ses.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldovi</territory>
<territory type="MG">Madagascar</territory>
<territory type="MH">Maršal gungey</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Maali</territory>
<territory type="MM">Maynamar</territory>
<territory type="MN">Mongooli</territory>
diff --git a/common/main/ses_ML.xml b/common/main/ses_ML.xml
index 1bcea53..bb6727b 100644
--- a/common/main/ses_ML.xml
+++ b/common/main/ses_ML.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sg.xml b/common/main/sg.xml
index ca087e8..4b9c3a7 100644
--- a/common/main/sg.xml
+++ b/common/main/sg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldavùii</territory>
<territory type="MG">Madagaskära</territory>
<territory type="MH">Âzûâ Märshâl</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Malïi</territory>
<territory type="MM">Myämâra</territory>
<territory type="MN">Mongolïi</territory>
diff --git a/common/main/sg_CF.xml b/common/main/sg_CF.xml
index a1cde6e..33aa5d3 100644
--- a/common/main/sg_CF.xml
+++ b/common/main/sg_CF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/shi.xml b/common/main/shi.xml
index bd3342a..80fcb4d 100644
--- a/common/main/shi.xml
+++ b/common/main/shi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">ⵎⵓⵍⴷⵓⴼⵢⴰ</territory>
<territory type="MG">ⵎⴰⴷⴰⵖⴰⵛⵇⴰⵔ</territory>
<territory type="MH">ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⵎⴰⵔⵛⴰⵍ</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">ⵎⴰⵍⵉ</territory>
<territory type="MM">ⵎⵢⴰⵏⵎⴰⵔ</territory>
<territory type="MN">ⵎⵏⵖⵓⵍⵢⴰ</territory>
diff --git a/common/main/shi_Latn.xml b/common/main/shi_Latn.xml
index 0f67923..26ed7a5 100644
--- a/common/main/shi_Latn.xml
+++ b/common/main/shi_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -185,7 +185,6 @@
<territory type="MD">muldufya</territory>
<territory type="MG">madaɣacqar</territory>
<territory type="MH">tigzirin n marcal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">mali</territory>
<territory type="MM">myanmar</territory>
<territory type="MN">mnɣulya</territory>
diff --git a/common/main/shi_Latn_MA.xml b/common/main/shi_Latn_MA.xml
index e45d5b5..9ebf8e0 100644
--- a/common/main/shi_Latn_MA.xml
+++ b/common/main/shi_Latn_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/shi_Tfng.xml b/common/main/shi_Tfng.xml
index 4ff42a6..f00f8f6 100644
--- a/common/main/shi_Tfng.xml
+++ b/common/main/shi_Tfng.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/shi_Tfng_MA.xml b/common/main/shi_Tfng_MA.xml
index c2d79e8..a66700a 100644
--- a/common/main/shi_Tfng_MA.xml
+++ b/common/main/shi_Tfng_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/si.xml b/common/main/si.xml
index 3b3749e..6084dd1 100644
--- a/common/main/si.xml
+++ b/common/main/si.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -120,6 +120,7 @@
<language type="eu">බාස්ක්</language>
<language type="ewo">එවොන්ඩො</language>
<language type="fa">පර්සියානු</language>
+ <language type="fa_AF">ඩාරි</language>
<language type="ff">ෆුලාහ්</language>
<language type="fi">ෆින්ලන්ත</language>
<language type="fil">පිලිපීන</language>
@@ -896,8 +897,13 @@
</parseLenients>
<parseLenients scope="general" level="lenient">
<parseLenient sample="." draft="contributed">[.․。︒﹒．｡]</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="$" draft="contributed">[\$﹩＄$]</parseLenient>
<parseLenient sample="£" draft="contributed">[£₤]</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
<parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient>
</parseLenients>
<parseLenients scope="number" level="lenient">
@@ -4299,7 +4305,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>නොෆොල්ක් දුපත් වේලාව</standard>
+ <generic draft="contributed">නොෆොල්ක් දුපත් වේලාව</generic>
+ <standard draft="contributed">නොෆොල්ක් දුපත් සම්මත වේලාව</standard>
+ <daylight draft="contributed">නොෆොල්ක් දුපත් ග්රීෂ්ම වේලාව</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5779,9 +5787,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ඩෙසි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>සෙන්ටි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>මිලි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>මයික්රො{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>නැනෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>පිකෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ෆෙම්ටෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ඇටෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>සෙප්ටෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>යොක්ටෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ඩෙකා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>හෙක්ටෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>කිලෝ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>මෙගා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ගිගා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ටෙරා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>පෙටා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>එක්සා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>සෙටා{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>යොටා{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1} ට {0} බැගින්</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>වර්ගය {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">වර්ග {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">වර්ග {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>ඝන {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">ඝන {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">ඝන {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5790,7 +5868,7 @@
<unitPattern count="one">g-බලය {0}</unitPattern>
<unitPattern count="other">g-බලය {0}</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>තත්පර වර්ගයට මීටර</displayName>
<unitPattern count="one">තත්පර වර්ගයට මීටර {0}</unitPattern>
<unitPattern count="other">තත්පර වර්ගයට මීටර {0}</unitPattern>
@@ -5890,7 +5968,7 @@
<unitPattern count="one">ලීටරයකට මිලිමෝල් {0}</unitPattern>
<unitPattern count="other">ලීටරයකට මිලිමෝල් {0}</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>මිලියනයට කොටස්</displayName>
<unitPattern count="one">මිලියනයට කොටස් {0}</unitPattern>
<unitPattern count="other">මිලියනයට කොටස් {0}</unitPattern>
@@ -5920,7 +5998,7 @@
<unitPattern count="one">කිලෝ මීටරයට ලීටරය {0}</unitPattern>
<unitPattern count="other">කිලෝ මීටරයට ලීටරය {0}</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>කිලෝ මීටර 100 ට ලීටර</displayName>
<unitPattern count="one">කිලෝ මීටර 100 ට ලීටර {0}</unitPattern>
<unitPattern count="other">කිලෝ මීටර 100 ට ලීටර {0}</unitPattern>
@@ -6396,17 +6474,17 @@
<unitPattern count="one">අශ්වබල {0}</unitPattern>
<unitPattern count="other">අශ්වබල {0}</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>රසදිය මිලිමීටර</displayName>
<unitPattern count="one">රසදිය මිලිමීටර {0}</unitPattern>
<unitPattern count="other">රසදිය මිලිමීටර {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>වර්ග අලඟකට රාත්තල්</displayName>
<unitPattern count="one">වර්ග අලඟකට රාත්තල් {0}</unitPattern>
<unitPattern count="other">වර්ග අලඟකට රාත්තල් {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>රසදිය අඟල්</displayName>
<unitPattern count="one">රසදිය අඟල් {0}</unitPattern>
<unitPattern count="other">රසදිය අඟල් {0}</unitPattern>
@@ -6486,7 +6564,7 @@
<unitPattern count="one">කෙල්වින් අංශක {0}</unitPattern>
<unitPattern count="other">කෙල්වින් අංශක {0}</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>රාත්තල්-පාදය</displayName>
<unitPattern count="one">{0} රාත්තල්-පාදය</unitPattern>
<unitPattern count="other">{0} රාත්තල්-පාදය</unitPattern>
@@ -6640,9 +6718,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ඩෙස{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>සෙන්{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>මි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>නැ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>පි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ෆෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ඇ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>සෙප්{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>යො{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ඩෙක{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>හෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>කි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>මෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ගි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ටෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>පෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>එ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>සෙට{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>යොට{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6651,7 +6799,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>මීටර/තත්පර වර්ගයට</displayName>
<unitPattern count="one">මී/තව {0}</unitPattern>
<unitPattern count="other">මී/තව {0}</unitPattern>
@@ -6751,7 +6899,7 @@
<unitPattern count="one">{0} මිමෝල්/ලී</unitPattern>
<unitPattern count="other">{0} මිමෝල්/ලී</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>කොටස්/මිලියනය</displayName>
<unitPattern count="one">{0} මිලිකො</unitPattern>
<unitPattern count="other">{0} මිලිකො</unitPattern>
@@ -6781,7 +6929,7 @@
<unitPattern count="one">ලී/කිමී {0}</unitPattern>
<unitPattern count="other">ලී/කිමී {0}</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ලී/කිමී100</displayName>
<unitPattern count="one">ලී/කිමී100 {0}</unitPattern>
<unitPattern count="other">ලී/100කිමී {0}</unitPattern>
@@ -7257,17 +7405,17 @@
<unitPattern count="one">අබ {0}</unitPattern>
<unitPattern count="other">අබ {0}</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ර මිමී</displayName>
<unitPattern count="one">ර මිමී {0}</unitPattern>
<unitPattern count="other">ර මිමී {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>වඅ රා</displayName>
<unitPattern count="one">වඅ රා {0}</unitPattern>
<unitPattern count="other">වඅ රා {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ර අඟ</displayName>
<unitPattern count="one">ර අඟ {0}</unitPattern>
<unitPattern count="other">ර අඟ {0}</unitPattern>
@@ -7347,7 +7495,7 @@
<unitPattern count="one">කෙල්. {0}°</unitPattern>
<unitPattern count="other">කෙල්. {0}°</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>රාත්-පාද</displayName>
<unitPattern count="one">{0} රාත්-පාද</unitPattern>
<unitPattern count="other">{0} රාත්-පාද</unitPattern>
@@ -7501,9 +7649,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ඩෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>සෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>මි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>නැ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>පි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ෆෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ඇ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>සෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>යො{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ඩෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>හෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>කි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>මෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ගි{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ටෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>පෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>එ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>සෙ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>යො{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7552,7 +7770,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ලී/කිමී100</displayName>
<unitPattern count="one">ලී/කිමී100 {0}</unitPattern>
<unitPattern count="other">ලී/කිමී100 {0}</unitPattern>
@@ -7671,7 +7889,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">රසදිය {0}"</unitPattern>
<unitPattern count="other">රසදිය {0}"</unitPattern>
</unit>
diff --git a/common/main/si_LK.xml b/common/main/si_LK.xml
index 9cb357a..88a6eb7 100644
--- a/common/main/si_LK.xml
+++ b/common/main/si_LK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sk.xml b/common/main/sk.xml
index 172692e..a83a146 100644
--- a/common/main/sk.xml
+++ b/common/main/sk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -160,6 +160,7 @@
<language type="eu">baskičtina</language>
<language type="ewo">ewondo</language>
<language type="fa">perzština</language>
+ <language type="fa_AF">daríjčina</language>
<language type="fan">fangčina</language>
<language type="fat">fanti</language>
<language type="ff">fulbčina</language>
@@ -558,6 +559,7 @@
<scripts>
<script type="Arab">arabské</script>
<script type="Arab" alt="variant">perzsko-arabské</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armn">arménske</script>
<script type="Bali" draft="contributed">balijský</script>
<script type="Beng">bengálske</script>
@@ -596,9 +598,12 @@
<script type="Maya" draft="contributed">mayské hieroglyfy</script>
<script type="Mlym">malajálamske</script>
<script type="Mong">mongolské</script>
+ <script type="Mtei" draft="contributed">mejtej majek (manipurské)</script>
<script type="Mymr">barmské</script>
+ <script type="Olck" draft="contributed">santálske (ol chiki)</script>
<script type="Orya">uríjske</script>
<script type="Osma" draft="contributed">osmanský</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Runr" draft="contributed">Runové písmo</script>
<script type="Sinh">sinhálske</script>
<script type="Taml">tamilské</script>
@@ -5286,7 +5291,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>norfolský čas</standard>
+ <generic draft="contributed">norfolský čas</generic>
+ <standard draft="contributed">norfolský štandardný čas</standard>
+ <daylight draft="contributed">norfolský letný čas</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8311,9 +8318,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>štvorcové {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">štvorcový {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">štvorcové {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">štvorcového {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">štvorcových {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubické {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubický {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kubické {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">kubického {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubických {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -8324,7 +8405,7 @@
<unitPattern count="many">{0} jednotky preťaženia</unitPattern>
<unitPattern count="other">{0} jednotiek preťaženia</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metre za sekundu na druhú</displayName>
<unitPattern count="one">{0} meter za sekundu na druhú</unitPattern>
<unitPattern count="few">{0} metre za sekundu na druhú</unitPattern>
@@ -8462,7 +8543,7 @@
<unitPattern count="many">{0} milimolu na liter</unitPattern>
<unitPattern count="other">{0} milimolov na liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>milióntiny</displayName>
<unitPattern count="one">{0} milióntina</unitPattern>
<unitPattern count="few">{0} milióntiny</unitPattern>
@@ -8504,7 +8585,7 @@
<unitPattern count="many">{0} litra na kilometer</unitPattern>
<unitPattern count="other">{0} litrov na kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litre na 100 kilometrov</displayName>
<unitPattern count="one">{0} liter na 100 kilometrov</unitPattern>
<unitPattern count="few">{0} litre na 100 kilometrov</unitPattern>
@@ -9171,21 +9252,21 @@
<unitPattern count="many">{0} konskej sily</unitPattern>
<unitPattern count="other">{0} konských síl</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetre ortuťového stĺpca</displayName>
<unitPattern count="one">{0} milimeter ortuťového stĺpca</unitPattern>
<unitPattern count="few">{0} milimetre ortuťového stĺpca</unitPattern>
<unitPattern count="many">{0} milimetra ortuťového stĺpca</unitPattern>
<unitPattern count="other">{0} milimetrov ortuťového stĺpca</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libry sily na štvorcový palec</displayName>
<unitPattern count="one">{0} libra sily na štvorcový palec</unitPattern>
<unitPattern count="few">{0} libry sily na štvorcový palec</unitPattern>
<unitPattern count="many">{0} libry sily na štvorcový palec</unitPattern>
<unitPattern count="other">{0} libier sily na štvorcový palec</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>palce ortuťového stĺpca</displayName>
<unitPattern count="one">{0} palec ortuťového stĺpca</unitPattern>
<unitPattern count="few">{0} palce ortuťového stĺpca</unitPattern>
@@ -9297,7 +9378,7 @@
<unitPattern count="many">{0} kelvina</unitPattern>
<unitPattern count="other">{0} kelvinov</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>librostopy</displayName>
<unitPattern count="one">{0} librostopa</unitPattern>
<unitPattern count="few">{0} librostopy</unitPattern>
@@ -9507,9 +9588,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -9520,7 +9675,7 @@
<unitPattern count="many">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -9658,7 +9813,7 @@
<unitPattern count="many">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -9700,7 +9855,7 @@
<unitPattern count="many">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -10367,21 +10522,21 @@
<unitPattern count="many">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="many">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="many">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -10493,7 +10648,7 @@
<unitPattern count="many">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="few">{0} lbf⋅ft</unitPattern>
@@ -10703,9 +10858,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}{1}</compoundUnitPattern>
</compoundUnit>
@@ -10716,7 +10945,7 @@
<unitPattern count="many">{0}G</unitPattern>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -10820,7 +11049,7 @@
<unitPattern count="many" draft="contributed">{0} l/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="few">{0} l/100 km</unitPattern>
@@ -11177,21 +11406,21 @@
<unitPattern count="many">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="many" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
<unitPattern count="many" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one">{0}" Hg</unitPattern>
<unitPattern count="few">{0}" Hg</unitPattern>
diff --git a/common/main/sk_SK.xml b/common/main/sk_SK.xml
index 35721e4..d342f63 100644
--- a/common/main/sk_SK.xml
+++ b/common/main/sk_SK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sl.xml b/common/main/sl.xml
index 56930e8..075042e 100644
--- a/common/main/sl.xml
+++ b/common/main/sl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -150,6 +150,7 @@
<language type="eu">baskovščina</language>
<language type="ewo">evondovščina</language>
<language type="fa">perzijščina</language>
+ <language type="fa_AF">darijščina</language>
<language type="fan">fangijščina</language>
<language type="fat">fantijščina</language>
<language type="ff">fulščina</language>
@@ -552,7 +553,6 @@
<script type="Bugi">buginski</script>
<script type="Buhd">buhidski</script>
<script type="Cans">poenotena zlogovna pisava kanadskih staroselcev</script>
- <script type="Cham">Cham</script>
<script type="Cher">čerokeški</script>
<script type="Cirt">kirt</script>
<script type="Copt">koptski</script>
@@ -4847,7 +4847,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Čas: Norfolški otoki</standard>
+ <generic draft="contributed">Norfolški otoki čas</generic>
+ <standard draft="contributed">Norfolški otoki standardni čas</standard>
+ <daylight draft="contributed">Norfolški otoki poletni čas</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7098,9 +7100,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} na {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadratni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadratni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubični {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubični {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7111,7 +7187,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter na kvadratno sekundo</displayName>
<unitPattern count="one">{0} meter na kvadratno sekundo</unitPattern>
<unitPattern count="two">{0} metra na kvadratno sekundo</unitPattern>
@@ -7249,7 +7325,7 @@
<unitPattern count="few">{0} milimoli na liter</unitPattern>
<unitPattern count="other">{0} milimolov na liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>delci na milijon</displayName>
<unitPattern count="one">{0} delec na milijon</unitPattern>
<unitPattern count="two">{0} delca na milijon</unitPattern>
@@ -7291,7 +7367,7 @@
<unitPattern count="few">{0} litrov na kilometer</unitPattern>
<unitPattern count="other">{0} litrov na kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0} liter na 100 kilometrov</unitPattern>
<unitPattern count="two">{0} litra na 100 kilometrov</unitPattern>
@@ -7957,21 +8033,21 @@
<unitPattern count="few">{0} konjske moči</unitPattern>
<unitPattern count="other">{0} konjskih moči</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetri živega srebra</displayName>
<unitPattern count="one">{0} milimeter živega srebra</unitPattern>
<unitPattern count="two">{0} milimetra živega srebra</unitPattern>
<unitPattern count="few">{0} milimetri živega srebra</unitPattern>
<unitPattern count="other">{0} milimetrov živega srebra</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funti na kvadratni palec</displayName>
<unitPattern count="one">{0} funt na kvadratni palec</unitPattern>
<unitPattern count="two">{0} funta na kvadratni palec</unitPattern>
<unitPattern count="few">{0} funti na kvadratni palec</unitPattern>
<unitPattern count="other">{0} funtov na kvadratni palec</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>palci živega srebra</displayName>
<unitPattern count="one">{0} palec živega srebra</unitPattern>
<unitPattern count="two">{0} palca živega srebra</unitPattern>
@@ -8083,7 +8159,7 @@
<unitPattern count="few">{0} kelvini</unitPattern>
<unitPattern count="other">{0} kelvinov</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funt-čevelj</displayName>
<unitPattern count="one">{0} funt-čevelj</unitPattern>
<unitPattern count="two">{0} funt-čevlja</unitPattern>
@@ -8293,9 +8369,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8306,7 +8456,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="two">{0} m/s²</unitPattern>
@@ -8444,7 +8594,7 @@
<unitPattern count="few">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="two">{0} ppm</unitPattern>
@@ -8486,7 +8636,7 @@
<unitPattern count="few">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="two">{0} l/100 km</unitPattern>
@@ -9152,21 +9302,21 @@
<unitPattern count="few">{0} KM</unitPattern>
<unitPattern count="other">{0} KM</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHG</unitPattern>
<unitPattern count="two">{0} mmHG</unitPattern>
<unitPattern count="few">{0} mmHG</unitPattern>
<unitPattern count="other">{0} mmHG</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="two">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
@@ -9278,7 +9428,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="two">{0} lbf⋅ft</unitPattern>
@@ -9488,9 +9638,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="two">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9528,7 +9752,7 @@
<unitPattern count="few">{0} %</unitPattern>
<unitPattern count="other">{0} %</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="two">{0} l/100 km</unitPattern>
@@ -9711,7 +9935,7 @@
<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
<unitPattern count="other" draft="contributed">{0} KM</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="two">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
diff --git a/common/main/sl_SI.xml b/common/main/sl_SI.xml
index 86ad0be..9e808aa 100644
--- a/common/main/sl_SI.xml
+++ b/common/main/sl_SI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/smn.xml b/common/main/smn.xml
index 3094eab..d54ffca 100644
--- a/common/main/smn.xml
+++ b/common/main/smn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/smn_FI.xml b/common/main/smn_FI.xml
index a92f81f..1f29e95 100644
--- a/common/main/smn_FI.xml
+++ b/common/main/smn_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sn.xml b/common/main/sn.xml
index 62a85ac..e1cced1 100644
--- a/common/main/sn.xml
+++ b/common/main/sn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Madagascar</territory>
<territory type="MH">Zvitsuwa zveMarshall</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/sn_ZW.xml b/common/main/sn_ZW.xml
index df04ceb..3d469f8 100644
--- a/common/main/sn_ZW.xml
+++ b/common/main/sn_ZW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/so.xml b/common/main/so.xml
index 2a28d6e..855198e 100644
--- a/common/main/so.xml
+++ b/common/main/so.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -79,6 +79,7 @@
<language type="eu">Basquu</language>
<language type="ewo">Eewondho</language>
<language type="fa">Faarisi</language>
+ <language type="fa_AF">Faarsi</language>
<language type="ff">Fuulah</language>
<language type="fi">Finishka</language>
<language type="fil">Tagalog</language>
@@ -86,6 +87,7 @@
<language type="fr">Faransiis</language>
<language type="fr_CA">Faransiiska Kanada</language>
<language type="fr_CH">Faransiis (Iswiiserlaand)</language>
+ <language type="frc">Faransiiska Cajun</language>
<language type="fur">Firiyuuliyaan</language>
<language type="fy">Firiisiyan Galbeed</language>
<language type="ga">Ayrish</language>
@@ -146,12 +148,14 @@
<language type="lkt">Laakoota</language>
<language type="ln">Lingala</language>
<language type="lo">Lao</language>
+ <language type="lou">Louisiana Creole</language>
<language type="lrc">Koonfurta Luuri</language>
<language type="lt">Lituwaanays</language>
<language type="lu">Luuba-kataanga</language>
<language type="luo">Luwada</language>
<language type="luy">Luhya</language>
<language type="lv">Laatfiyaan</language>
+ <language type="mai">Dadka Maithili</language>
<language type="mas">Masaay</language>
<language type="mer">Meeru</language>
<language type="mfe">Moorisayn</language>
@@ -173,6 +177,7 @@
<language type="nb">Noorwijiyaan Bokma</language>
<language type="nd">Indhebeele</language>
<language type="nds">Jarmal Hooseeya</language>
+ <language type="nds_NL">↑↑↑</language>
<language type="ne">Nebaali</language>
<language type="nl">Holandays</language>
<language type="nl_BE">Af faleemi</language>
@@ -198,7 +203,9 @@
<language type="rm">Romaanis</language>
<language type="rn">Rundhi</language>
<language type="ro">Romanka</language>
+ <language type="ro_MD">↑↑↑</language>
<language type="rof">Rombo</language>
+ <language type="root">Xidid</language>
<language type="ru">Ruush</language>
<language type="rw">Ruwaandha</language>
<language type="rwk">Raawa</language>
@@ -226,6 +233,7 @@
<language type="su">Suudaaniis</language>
<language type="sv">Swiidhis</language>
<language type="sw">Sawaaxili</language>
+ <language type="sw_CD">↑↑↑</language>
<language type="ta">Tamiil</language>
<language type="te">Teluugu</language>
<language type="teo">Teeso</language>
@@ -269,46 +277,172 @@
<language type="zxx">Luuqad Looma Hayo</language>
</languages>
<scripts>
+ <script type="Adlm">Adlam</script>
+ <script type="Aghb">Qoraalka Luuqada Caucasian Albanian</script>
+ <script type="Ahom">Dadka Ahom</script>
<script type="Arab">Carabi</script>
+ <script type="Aran">Farta Luuqada Faarsiga</script>
+ <script type="Armi">Luuqada Imperial Aramaic</script>
<script type="Armn">Armeeniyaan</script>
+ <script type="Avst">Luuqada Avestan</script>
+ <script type="Bali">Baliniis</script>
+ <script type="Bamu">Bamum</script>
+ <script type="Bass">Qoraalka Vah</script>
+ <script type="Batk">Batak</script>
<script type="Beng">Baangla</script>
- <script type="Bopo">↑↑↑</script>
+ <script type="Bhks">Qoraalka Bhaiksuki</script>
+ <script type="Bopo">Farta Manadariinka Taywaan</script>
+ <script type="Brah">Dhirta Brahmi</script>
<script type="Brai">Qoraalka Indhoolaha</script>
+ <script type="Bugi">Luuqada Buginiiska</script>
+ <script type="Buhd">Luuqada Buhid</script>
+ <script type="Cakm">Jakma</script>
+ <script type="Cans">Qoraalka Luuqada Aborajiinka ee Kanada</script>
+ <script type="Cari">Luuqada kaariyaanka</script>
+ <script type="Cham">Jam</script>
+ <script type="Cher">Jerokee</script>
+ <script type="Chrs">Luuqada Korasmiyaanka</script>
+ <script type="Copt">Dadka Kotiga</script>
+ <script type="Cprt">sibraas dhalad ah</script>
<script type="Cyrl">Siriylik</script>
<script type="Deva">Dhefangaari</script>
+ <script type="Diak">Luuqadaha Dives Akuru</script>
+ <script type="Dogr">Dadka Dogra</script>
+ <script type="Dsrt">Gobalka Deseret</script>
+ <script type="Dupl">Qoraalka Duployan shorthand</script>
+ <script type="Egyp">Fartii hore ee Masaarida</script>
+ <script type="Elba">Magaalada Elbasan</script>
+ <script type="Elym">Qoraalka Elymaic</script>
<script type="Ethi">Itoobiya</script>
<script type="Geor">Jiyoorjoyaan</script>
+ <script type="Glag">Qoraalka Glagolitic</script>
+ <script type="Gong">Gumjala Gondi</script>
+ <script type="Gonm">Qoraalka Masaram Gondi</script>
+ <script type="Goth">Dadka Gothic</script>
+ <script type="Gran">Qoraalka Grantha</script>
<script type="Grek">Giriik</script>
<script type="Gujr">Gujaraati</script>
- <script type="Guru">↑↑↑</script>
- <script type="Hanb">↑↑↑</script>
+ <script type="Guru">Luuqada gujarati</script>
+ <script type="Hanb">luuqada Han iyo Farta Mandariinka Taywaan</script>
<script type="Hang">Hanguul</script>
- <script type="Hani">↑↑↑</script>
+ <script type="Hani">Luuqada Han</script>
+ <script type="Hano">Qoraalka Hanunoo</script>
<script type="Hans">La fududeeyay</script>
<script type="Hans" alt="stand-alone">Haan La fududeeyay</script>
<script type="Hant">Hore</script>
<script type="Hant" alt="stand-alone">Haanti hore</script>
+ <script type="Hatr">Qoraalka Hatran</script>
<script type="Hebr">Cibraani</script>
<script type="Hira">Hiragana</script>
+ <script type="Hluw">Qoraalka Anatolian Hieroglyphs</script>
+ <script type="Hmng">Hmonga pahawh</script>
+ <script type="Hmnp">Hmonga Nyiakeng Puachue</script>
<script type="Hrkt">Qoraalka Xuruufta Jabaaniiska</script>
+ <script type="Hung">Hangariyaankii Hore</script>
+ <script type="Ital">Itaaliggii Hore</script>
<script type="Jamo">Jaamo</script>
+ <script type="Java">Jafaniis</script>
<script type="Jpan">Jabaaniis</script>
+ <script type="Kali">Kayah LI</script>
<script type="Kana">Katakaana</script>
+ <script type="Khar">Koraalka kharooshi</script>
<script type="Khmr">Khamer</script>
+ <script type="Khoj">Qoraalka Khojki</script>
+ <script type="Kits">Qoraalka yar ee Khitan</script>
<script type="Knda">Kanada</script>
<script type="Kore">Kuuriyaan</script>
- <script type="Laoo">↑↑↑</script>
+ <script type="Kthi">kaithi</script>
+ <script type="Lana">Lanna</script>
+ <script type="Laoo">Dalka Lao</script>
<script type="Latn">Laatiin</script>
+ <script type="Lepc">Lebja</script>
+ <script type="Limb">Limbu</script>
+ <script type="Lina">Nidaamka qoraalka Linear A</script>
+ <script type="Linb">Nidaamka qoraalka Linear B</script>
+ <script type="Lisu">Wabiga Fraser</script>
+ <script type="Lyci">Lyciantii Hore</script>
+ <script type="Lydi">Lydian</script>
+ <script type="Mahj">Mahajani</script>
+ <script type="Maka">Makasar</script>
+ <script type="Mand">Luuqada Mandaean</script>
+ <script type="Mani">Manichaean</script>
+ <script type="Marc">Marchen</script>
+ <script type="Medf">Madefaidrin</script>
+ <script type="Mend">Mende</script>
+ <script type="Merc">Meroitic Curve</script>
+ <script type="Mero">Meroitic</script>
<script type="Mlym">Maalayalam</script>
+ <script type="Modi">Moodi</script>
<script type="Mong">Mongooliyaan</script>
+ <script type="Mroo">Mro</script>
+ <script type="Mtei">Qoraalka Luuqada Meitei</script>
+ <script type="Mult">Multani</script>
<script type="Mymr">Mayanmaar</script>
+ <script type="Nand">Nandinagari</script>
+ <script type="Narb">Carabiyadii Hore ee Wuqooye</script>
+ <script type="Nbat">Nabataean</script>
+ <script type="Newa">Newa</script>
+ <script type="Nkoo">N’Ko</script>
+ <script type="Nshu">Nüshu</script>
+ <script type="Ogam">Ogham</script>
+ <script type="Olck">Ol Jiki</script>
+ <script type="Orkh">Orkhon</script>
<script type="Orya">Oodhiya</script>
+ <script type="Osge">Osage</script>
+ <script type="Osma">Osmanya</script>
+ <script type="Palm">Palmyrene</script>
+ <script type="Pauc">Baaw Sin Haaw</script>
+ <script type="Perm">Permic gii hore</script>
+ <script type="Phag">Qoraalka Phags-pa</script>
+ <script type="Phli">Qoraaladii hore ee Pahlavi</script>
+ <script type="Phlp">Qoraalka midig laga bilaabo ee faarsiyiintii</script>
+ <script type="Phnx">Luuqada Phoenicianka</script>
+ <script type="Plrd">Shibanaha</script>
+ <script type="Prti">Qoraalka Parthian</script>
+ <script type="Qaag">Qoraalka Sawgiga</script>
+ <script type="Rjng">Dadka Rejan</script>
+ <script type="Rohg">Hanifi Rohingya</script>
+ <script type="Runr">Dadka Rejang</script>
+ <script type="Samr">Dadka Samaritan</script>
+ <script type="Sarb">Crabiyaankii Hore ee Wuqooyi</script>
+ <script type="Saur">Sawrashtra</script>
+ <script type="Sgnw">Qaabka dhagoolka loola hadlo</script>
+ <script type="Shaw">calaamad qoris</script>
+ <script type="Shrd">Sharada</script>
+ <script type="Sidd">Siddham</script>
+ <script type="Sind">khudwadi</script>
<script type="Sinh">Sinhaala</script>
+ <script type="Sogd">Sogdiyaan</script>
+ <script type="Sogo">Sogdiyaankii Hore</script>
+ <script type="Sora">Qoraalka Sora Sompeng</script>
+ <script type="Soyo">Soyombo</script>
+ <script type="Sund">Dadka Sundaniiska</script>
+ <script type="Sylo">Qoraalka Luuqada Sylheti</script>
+ <script type="Syrc">Lahjada Syriac</script>
+ <script type="Tagb">Tagbanwa</script>
+ <script type="Takr">Takri</script>
+ <script type="Tale">Tai Le</script>
+ <script type="Talu">Tai Lue cusub</script>
<script type="Taml">Taamiil</script>
+ <script type="Tang">Luuqada Tangut</script>
+ <script type="Tavt">Farta lagu Qoro Luuqadaha Tai</script>
<script type="Telu">Teeluguu</script>
+ <script type="Tfng">Farta Tifinagh</script>
+ <script type="Tglg">Luuqada Tagalog</script>
<script type="Thaa">Daana</script>
<script type="Thai">Taay</script>
<script type="Tibt">Tibetaan</script>
+ <script type="Tirh">Qoraalka Luuqada Maithili</script>
+ <script type="Ugar">Luuqada Ugaritic</script>
+ <script type="Vaii">Dadka Vai</script>
+ <script type="Wara">Nidaamka Qoraalka Luuqada Ho</script>
+ <script type="Wcho">Dadka wanjo</script>
+ <script type="Xpeo">Faarsigii Hore</script>
+ <script type="Xsux">Qoraalkii Hore ee dadka Sumaariyiinta ee dhulka mesobataamiya</script>
+ <script type="Yezi">Dadka Yesiidiga</script>
+ <script type="Yiii">Tiknoolajiyada Yi</script>
+ <script type="Zanb">Xarafka laba jibaaran ee kujira Xarfaha Zanabazar</script>
+ <script type="Zinh">Dhaxlay</script>
<script type="Zmth">Aqoonsiga Xisaabta</script>
<script type="Zsye">Calaamad Dareen Muujin</script>
<script type="Zsym">Calaamado</script>
@@ -400,7 +534,7 @@
<territory type="CL">Jili</territory>
<territory type="CM">Kaameruun</territory>
<territory type="CN">Shiinaha</territory>
- <territory type="CO">↑↑↑</territory>
+ <territory type="CO">Koloombiya</territory>
<territory type="CP">Jasiiradda Kilibarton</territory>
<territory type="CR">Kosta Riika</territory>
<territory type="CU">Kuuba</territory>
@@ -453,7 +587,7 @@
<territory type="GT">Guwaatamaala</territory>
<territory type="GU">Guaam</territory>
<territory type="GW">Gini-Bisaaw</territory>
- <territory type="GY">↑↑↑</territory>
+ <territory type="GY">Guyana</territory>
<territory type="HK">Hong Kong</territory>
<territory type="HK" alt="short">Hong Kong</territory>
<territory type="HM">Jasiiradda Haad & MakDonald</territory>
@@ -614,8 +748,8 @@
<territory type="VU">Fanuaatu</territory>
<territory type="WF">Walis & Futuna</territory>
<territory type="WS">Samoowa</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">Shigshiga</territory>
+ <territory type="XB">Pseudo-Bidi</territory>
<territory type="XK">Koosofo</territory>
<territory type="YE">Yaman</territory>
<territory type="YT">Mayotte</territory>
@@ -629,6 +763,55 @@
<subdivision type="gbsct">Skotland</subdivision>
<subdivision type="gbwls">Waalis</subdivision>
</subdivisions>
+ <variants>
+ <variant type="1901">orthofraphygii hore ee Jarmalka</variant>
+ <variant type="1994">Heerka orthographyga Resiyaanka</variant>
+ <variant type="1996">Orthigraphygii jarmal ee 1996</variant>
+ <variant type="1606NICT">Fransiiskii dhexe ee ugu dambeeyay ilaa 1606</variant>
+ <variant type="1694ACAD">Faransiiskii Hore</variant>
+ <variant type="1959ACAD">Tacliin</variant>
+ <variant type="ABL1943">Qaacideeynta orthographygii 1943</variant>
+ <variant type="ALALC97">ALA-LC Romanization, 1997 daabacaad</variant>
+ <variant type="ALUKU">Lahjada Aluku</variant>
+ <variant type="AO1990">Heshiiska luuqada orthografiga burtuqiiska 1990</variant>
+ <variant type="BAKU1926">Farta Latin Turkiga ee Mideeysan</variant>
+ <variant type="BALANKA">Lahjada Balanka ee Anii</variant>
+ <variant type="BARLA">lahjada kooxda Barlavento ee kabuverdianu</variant>
+ <variant type="BISKE">Lahjada San Giorgio/Bila</variant>
+ <variant type="BOHORIC">Farta Bohorič</variant>
+ <variant type="BOONT">Luuqada Boontling</variant>
+ <variant type="BORNHOLM">BOONHOLM</variant>
+ <variant type="COLB1945">Shirkii orthografiga ee Portuguese-Brazilian 1945</variant>
+ <variant type="DAJNKO">alfabeetka Dajnko</variant>
+ <variant type="EKAVSK">dhaqyada isku jirka ah ee Serbiyaanka iyo Ekviyaan</variant>
+ <variant type="EMODENG">Ingiriiskii hore ee casriga ahaa</variant>
+ <variant type="IJEKAVSK">dhawaaqyada Serbiyaanka iyo Ijekaviyaan</variant>
+ <variant type="KKCOR">orhographyga caadiga ah</variant>
+ <variant type="KSCOR">heerka orthographyga</variant>
+ <variant type="LENGADOC">LENGADOK</variant>
+ <variant type="LIPAW">Lahjada Lipavaz ee Resiyaanka</variant>
+ <variant type="LUNA1918">LUUNA1918</variant>
+ <variant type="METELKO">alfaabeetka nmetelko</variant>
+ <variant type="MONOTON">MOONOTOONIK</variant>
+ <variant type="NDYUKA">lahjada Ndyuka</variant>
+ <variant type="NEDIS">lahjada Natisone</variant>
+ <variant type="NEWFOUND">HELITAANCUSUB</variant>
+ <variant type="NICARD">KAARKANI</variant>
+ <variant type="NJIVA">lahjada Gniva/Njiva</variant>
+ <variant type="NULIK">Folabuka casriga ah</variant>
+ <variant type="OSOJS">lahjada Oseacco/Osojane</variant>
+ <variant type="OXENDICT">hinggaadinta Qaamuuska Ingiriisiga Oxford</variant>
+ <variant type="POSIX">Kombiyuutar</variant>
+ <variant type="SAAHO">Saaho</variant>
+ <variant type="SCOTLAND">Heerka Ingiriisiga Iskootishka</variant>
+ <variant type="SCOUSE">GARAACID</variant>
+ <variant type="SIMPLE">Fudud</variant>
+ <variant type="SOLBA">lahjada Stolvizza/Solbica</variant>
+ <variant type="TARASK">orthographyga Taraskievica</variant>
+ <variant type="UCCOR">orthograpghyga mideeysan</variant>
+ <variant type="UCRCOR">orthographyga mideeysan ee hadana ladul maray</variant>
+ <variant type="VALENCIA">Faleensiyaawi</variant>
+ </variants>
<keys>
<key type="calendar">Habeentiris</key>
<key type="cf">Habka Lacagta</key>
@@ -642,20 +825,41 @@
<types>
<type key="calendar" type="buddhist">Habeentiriska Buudhist</type>
<type key="calendar" type="chinese">Habeetiriska Shiinaha</type>
+ <type key="calendar" type="coptic">Habeentiriska Koptiga</type>
<type key="calendar" type="dangi">Habeetiriska Dangi</type>
<type key="calendar" type="ethiopic">Habeentiriska Itoobiya</type>
+ <type key="calendar" type="ethiopic-amete-alem">Taariikhda Itoobiya ee Amete Alem</type>
<type key="calendar" type="gregorian">Habeetiriska Geregoriyaan</type>
<type key="calendar" type="hebrew">Habeentiriska yuhuudda</type>
+ <type key="calendar" type="indian">Taariikhda Qaranka Hindiya</type>
<type key="calendar" type="islamic">Habeentiriska islaamka</type>
+ <type key="calendar" type="islamic-civil">Taariikhda Islaamiga (tabular, civil epoch)</type>
+ <type key="calendar" type="islamic-rgsa">Habeentiriska Islaamka (Sacuudiga, aragtida)</type>
+ <type key="calendar" type="islamic-tbla">Taariikhda Islaamiga (tabular, astronomical epoch)</type>
+ <type key="calendar" type="islamic-umalqura">Taariikhda Islaamiga(Umm al-Qura)</type>
<type key="calendar" type="iso8601">Habeentiriska ISO-8601</type>
<type key="calendar" type="japanese">Habeentiriska jabbaanka</type>
<type key="calendar" type="persian">Habeentiriska Baarshiyaanka</type>
<type key="calendar" type="roc">Habeentiriska Minguwo</type>
<type key="cf" type="account">Habka Xisaabinta Lacagta</type>
<type key="cf" type="standard">Habka Heerka Lacagta</type>
+ <type key="collation" type="big5han">Isku hagaajinta Shiineeskii Hore - Big5</type>
+ <type key="collation" type="compat">Iswaafajinta Isku hajintii hore</type>
+ <type key="collation" type="dictionary">Isku hagaajinta Qaamuuska</type>
<type key="collation" type="ducet">Lambar Sireedka Caalamiga ee Kala Soocidda Dalabka</type>
+ <type key="collation" type="emoji">Isku hagaajinta Emojiga</type>
+ <type key="collation" type="eor">Xeerarka Dalabka Yurub</type>
+ <type key="collation" type="gb2312han">Isku hagaajinta Farta shiineeska</type>
+ <type key="collation" type="phonebook">Isku hagaajinta foonbuuga</type>
+ <type key="collation" type="pinyin">Isku hagaajinta Pinyin</type>
+ <type key="collation" type="reformed">Isku hagaajinta Reformed</type>
<type key="collation" type="search">Raadinta Guud</type>
+ <type key="collation" type="searchjl">Raadinta Shibanaha Hangul</type>
<type key="collation" type="standard">Amarka Kala Soocidda Caadiga ah</type>
+ <type key="collation" type="stroke">Isku hagaajinta Farta</type>
+ <type key="collation" type="traditional">Isku hagaajin Fareedkii Hore</type>
+ <type key="collation" type="unihan">Isku hagaajinta Farta Radical-Stroke</type>
+ <type key="collation" type="zhuyin">Isku hagaajinta Farta Zhuyin</type>
<type key="hc" type="h11">12 Saac ee Nidaamka Saacadda (0–12)</type>
<type key="hc" type="h12">12 Saac ee Nidaamka Saacadda (1–12)</type>
<type key="hc" type="h23">24 Saac ee Nidaamka Saacadda (0–23)</type>
@@ -666,15 +870,24 @@
<type key="ms" type="metric">Nidaamka Metric</type>
<type key="ms" type="uksystem">Nidaamka Cabbirka Imperial-ka</type>
<type key="ms" type="ussystem">Nidaamka Cabbirka ee US</type>
+ <type key="numbers" type="ahom">Godadka Ahom</type>
<type key="numbers" type="arab">Gdadka Carabi-Hindiya</type>
<type key="numbers" type="arabext">Tirooyinka Dheeraadka ah ee Godadka Carabi-Hindiya</type>
<type key="numbers" type="armn">Nidaam Tireedka Armeeniya</type>
<type key="numbers" type="armnlow">Nidaam Tireedka Yaryar ee Armeeniya</type>
+ <type key="numbers" type="bali">Godadka Balinese</type>
<type key="numbers" type="beng">Godadka Banglaa</type>
+ <type key="numbers" type="brah">Godadka Brahmi</type>
+ <type key="numbers" type="cakm">Godadka Chakma</type>
+ <type key="numbers" type="cham">Godadka cham</type>
+ <type key="numbers" type="cyrl">Lambarada Cyrillic</type>
<type key="numbers" type="deva">Godadka Defangaari</type>
+ <type key="numbers" type="diak">Godadka Dives Akuru</type>
<type key="numbers" type="ethi">Nidaam Tireedka Itoobiya</type>
<type key="numbers" type="fullwide">Ballac Godadka Buuxa</type>
<type key="numbers" type="geor">Nidaam Tireedka Giyoorgiyaanka</type>
+ <type key="numbers" type="gong">Godadka Gunjala Gondi</type>
+ <type key="numbers" type="gonm">Lambarada Masaram Gondi</type>
<type key="numbers" type="grek">Nidaam Tireedka Giriiga</type>
<type key="numbers" type="greklow">Nidaam Tireedka Yaryar ee Giriiga</type>
<type key="numbers" type="gujr">Godadka Gujaraati</type>
@@ -685,22 +898,57 @@
<type key="numbers" type="hant">Nidaam Tireedka Hore ee Shiinaha</type>
<type key="numbers" type="hantfin">Nidaam Tireedkii Hore ee Dhaqaalaha Shiinaha</type>
<type key="numbers" type="hebr">Nidaam Tireedka Cibraanka</type>
+ <type key="numbers" type="hmng">Nidaam Tireedka Hebrew</type>
+ <type key="numbers" type="hmnp">Godadka Nyiakeng Puachue Hmong</type>
+ <type key="numbers" type="java">Godadka Javanese</type>
<type key="numbers" type="jpan">Nidaam Tireedka Jabbaanka</type>
<type key="numbers" type="jpanfin">Nidaam Tireedka Dhaqaalaha Jabbaanka</type>
+ <type key="numbers" type="kali">Godadka Kayah Li</type>
<type key="numbers" type="khmr">Godadka Khamer</type>
<type key="numbers" type="knda">Godadka Kanada</type>
+ <type key="numbers" type="lana">Godadka Tai Tham Hora</type>
+ <type key="numbers" type="lanatham">Godadka Tai Tham</type>
<type key="numbers" type="laoo">Godadka Laao</type>
<type key="numbers" type="latn">Godadka Ree Galbeedka</type>
+ <type key="numbers" type="lepc">Godadka Lepcha</type>
+ <type key="numbers" type="limb">Godadka Limbu</type>
+ <type key="numbers" type="mathbold">Godad Xisaabeedka Waaweeyn</type>
+ <type key="numbers" type="mathdbl">Godad Xisaabeedka Labalaabma</type>
+ <type key="numbers" type="mathmono">Godad Xisaabeedka Monospace</type>
+ <type key="numbers" type="mathsanb">Godad xisaabeedka waaweeyn ee Sans-Serif</type>
+ <type key="numbers" type="mathsans">Godad xisaabeedka Sans-Serif</type>
<type key="numbers" type="mlym">Godadka Malayalam</type>
+ <type key="numbers" type="modi">Godadka Modi</type>
+ <type key="numbers" type="mong">Godadka Mongooliyaanka</type>
+ <type key="numbers" type="mroo">Godadka Mro</type>
+ <type key="numbers" type="mtei">Godadka Meetei Mayek</type>
<type key="numbers" type="mymr">Godadka Mayanmaar</type>
+ <type key="numbers" type="mymrshan">Godadka Myanmar Shan</type>
+ <type key="numbers" type="mymrtlng">Godadka Myanmar Tai Laing</type>
+ <type key="numbers" type="nkoo">Godadka N’Ko</type>
+ <type key="numbers" type="olck">Godadka Ol Chiki</type>
<type key="numbers" type="orya">Godadka Oodhiya</type>
+ <type key="numbers" type="osma">Godadka Osmanya</type>
+ <type key="numbers" type="rohg">Godadka Hanifi Rohingya</type>
<type key="numbers" type="roman">Nidaam Tireedka Roomaanka</type>
<type key="numbers" type="romanlow">Nidaam Tireedka yaryar ee Roomaanka</type>
+ <type key="numbers" type="saur">Godadka Saurashtra</type>
+ <type key="numbers" type="shrd">Godadka Sharada</type>
+ <type key="numbers" type="sind">Godadka Khudawadi</type>
+ <type key="numbers" type="sinh">Godadka Sinhala Lith</type>
+ <type key="numbers" type="sora">Godadka Sora Sompeng</type>
+ <type key="numbers" type="sund">Godadka Sundaniiska</type>
+ <type key="numbers" type="takr">Godadka Takri</type>
+ <type key="numbers" type="talu">Godadka cusub ee Tai Lue</type>
<type key="numbers" type="taml">Nidaam Tireedki Hore ee Taaamiil</type>
<type key="numbers" type="tamldec">Godka Tirada Taamiil</type>
<type key="numbers" type="telu">Godka Tirada Telugu</type>
<type key="numbers" type="thai">Godka Tirada Thai</type>
<type key="numbers" type="tibt">Godka Tirada Tibetan</type>
+ <type key="numbers" type="tirh">Godadka Tirhuta</type>
+ <type key="numbers" type="vaii">Godadka Vai</type>
+ <type key="numbers" type="wara">Godadka Warang Citi</type>
+ <type key="numbers" type="wcho">Godadka Wancho</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -759,6 +1007,1681 @@
</delimiters>
<dates>
<calendars>
+ <calendar type="buddhist">
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="chinese">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">Bisha1</month>
+ <month type="2">Bisha2</month>
+ <month type="3">Bisha3</month>
+ <month type="4">Bisha4</month>
+ <month type="5">Bisha5</month>
+ <month type="6">Bisha6</month>
+ <month type="7">Bisha7</month>
+ <month type="8">Bisha8</month>
+ <month type="9">Bisha9</month>
+ <month type="10">Bisha10</month>
+ <month type="11">Bisha11</month>
+ <month type="12">Bisha12</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Bisha Koobaad</month>
+ <month type="2">bisha labaad</month>
+ <month type="3">bisha saddexaad</month>
+ <month type="4">bisha afaraad</month>
+ <month type="5">bisha shanaad</month>
+ <month type="6">bisha lixaad</month>
+ <month type="7">bisha todobaad</month>
+ <month type="8">bisha siddedad</month>
+ <month type="9">bisha sagaalad</month>
+ <month type="10">bisha tobnaad</month>
+ <month type="11">bisha kow iyo tobnaad</month>
+ <month type="12">bisha laba iyo tobnaad</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Bisha Koobaad</month>
+ <month type="2">Bisha Labaad</month>
+ <month type="3">Bisha Sadexaad</month>
+ <month type="4">Bisha Afraad</month>
+ <month type="5">Bisha Shanaad</month>
+ <month type="6">Bisha Lixaad</month>
+ <month type="7">Bisha Todabaad</month>
+ <month type="8">Bisha Sideedaad</month>
+ <month type="9">Bisha Sagaalaad</month>
+ <month type="10">Bisha Tobnaad</month>
+ <month type="11">Bisha Kow iyo Tobnaad</month>
+ <month type="12">Bisha laba iyo Tobnaad</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <monthPatterns>
+ <monthPatternContext type="format">
+ <monthPatternWidth type="abbreviated">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ <monthPatternWidth type="narrow">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ <monthPatternWidth type="wide">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ </monthPatternContext>
+ <monthPatternContext type="numeric">
+ <monthPatternWidth type="all">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ </monthPatternContext>
+ <monthPatternContext type="stand-alone">
+ <monthPatternWidth type="abbreviated">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ <monthPatternWidth type="narrow">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ <monthPatternWidth type="wide">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ </monthPatternContext>
+ </monthPatterns>
+ <cyclicNameSets>
+ <cyclicNameSet type="dayParts">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="9">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ <cyclicNameSet type="solarTerms">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="1">guga ayaa bilaabmaya</cyclicName>
+ <cyclicName type="2">biyaha roobka</cyclicName>
+ <cyclicName type="3">xayayaan lakiciyay</cyclicName>
+ <cyclicName type="4">guga ekuinikis</cyclicName>
+ <cyclicName type="5">dhalaalaya cad na</cyclicName>
+ <cyclicName type="6">hadhuudha roobka</cyclicName>
+ <cyclicName type="7">jiilaalka ayaa bilaabmaya</cyclicName>
+ <cyclicName type="8">hadhuudh buuxda</cyclicName>
+ <cyclicName type="9">hadhuudh dhagta kujirta</cyclicName>
+ <cyclicName type="10">xaalka kulka</cyclicName>
+ <cyclicName type="11">kulayl yar</cyclicName>
+ <cyclicName type="12">kulayl weeyn</cyclicName>
+ <cyclicName type="13">daayrta ayaa bilaabmaysa</cyclicName>
+ <cyclicName type="14">dhamaadka kulaylka</cyclicName>
+ <cyclicName type="15">dhado cad</cyclicName>
+ <cyclicName type="16">ekuinokiska daayrta</cyclicName>
+ <cyclicName type="17">dhado qaboow</cyclicName>
+ <cyclicName type="18">baraf soo dhacaya</cyclicName>
+ <cyclicName type="19">qaboowbaha ayaa bilaabmaya</cyclicName>
+ <cyclicName type="20">baraf yar</cyclicName>
+ <cyclicName type="21">baraf weeyn</cyclicName>
+ <cyclicName type="22">qorax qabow</cyclicName>
+ <cyclicName type="23">qaboow yar</cyclicName>
+ <cyclicName type="24">qaboow weeyn</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="1">guga ayaa bilaabmaya</cyclicName>
+ <cyclicName type="2">biyaha roobka</cyclicName>
+ <cyclicName type="3">cayayaan kacay</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">dhalaalya cad na</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">kulka ayaa bilaabmaya</cyclicName>
+ <cyclicName type="8">hadhuudh buuxda</cyclicName>
+ <cyclicName type="9">hadhuudh ku jirta dhagaha</cyclicName>
+ <cyclicName type="10">xaalada kulka</cyclicName>
+ <cyclicName type="11">kuleeyl yar</cyclicName>
+ <cyclicName type="12">kulayl weeyn</cyclicName>
+ <cyclicName type="13">deyrta ayaa bilaameeysa</cyclicName>
+ <cyclicName type="14">↑↑↑</cyclicName>
+ <cyclicName type="15">↑↑↑</cyclicName>
+ <cyclicName type="16">↑↑↑</cyclicName>
+ <cyclicName type="17">↑↑↑</cyclicName>
+ <cyclicName type="18">↑↑↑</cyclicName>
+ <cyclicName type="19">kulka ayaa bilaabmaya</cyclicName>
+ <cyclicName type="20">barafka yar</cyclicName>
+ <cyclicName type="21">baraf weeyn</cyclicName>
+ <cyclicName type="22">xaalada qaboobaha</cyclicName>
+ <cyclicName type="23">qaboow weeyn</cyclicName>
+ <cyclicName type="24">qaboow weeyn</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="wide">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">cayayaan lakiciyay</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">xaalada kulka</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ <cyclicName type="13">↑↑↑</cyclicName>
+ <cyclicName type="14">↑↑↑</cyclicName>
+ <cyclicName type="15">↑↑↑</cyclicName>
+ <cyclicName type="16">↑↑↑</cyclicName>
+ <cyclicName type="17">↑↑↑</cyclicName>
+ <cyclicName type="18">↑↑↑</cyclicName>
+ <cyclicName type="19">↑↑↑</cyclicName>
+ <cyclicName type="20">↑↑↑</cyclicName>
+ <cyclicName type="21">↑↑↑</cyclicName>
+ <cyclicName type="22">↑↑↑</cyclicName>
+ <cyclicName type="23">↑↑↑</cyclicName>
+ <cyclicName type="24">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ <cyclicNameSet type="zodiacs">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="1">Jiir</cyclicName>
+ <cyclicName type="2">Dibi</cyclicName>
+ <cyclicName type="3">Shabeel</cyclicName>
+ <cyclicName type="4">Bakeeyle</cyclicName>
+ <cyclicName type="5">Masduullaa</cyclicName>
+ <cyclicName type="6">Mas</cyclicName>
+ <cyclicName type="7">Faras</cyclicName>
+ <cyclicName type="8">Ri</cyclicName>
+ <cyclicName type="9">Daanyeer</cyclicName>
+ <cyclicName type="10">Diiq</cyclicName>
+ <cyclicName type="11">Eey</cyclicName>
+ <cyclicName type="12">Doofaar</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="1">Jiir</cyclicName>
+ <cyclicName type="2">Dibi</cyclicName>
+ <cyclicName type="3">Shabeel</cyclicName>
+ <cyclicName type="4">Bakeeyle</cyclicName>
+ <cyclicName type="5">Masduullaa</cyclicName>
+ <cyclicName type="6">Mas</cyclicName>
+ <cyclicName type="7">Faras</cyclicName>
+ <cyclicName type="8">Ri</cyclicName>
+ <cyclicName type="9">Daanyeer</cyclicName>
+ <cyclicName type="10">Diiq</cyclicName>
+ <cyclicName type="11">Eey</cyclicName>
+ <cyclicName type="12">Doofaar</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="wide">
+ <cyclicName type="1">Jiir</cyclicName>
+ <cyclicName type="2">Dibi</cyclicName>
+ <cyclicName type="3">Shabeel</cyclicName>
+ <cyclicName type="4">Bakeeyle</cyclicName>
+ <cyclicName type="5">Masduullaa</cyclicName>
+ <cyclicName type="6">Mas</cyclicName>
+ <cyclicName type="7">Faras</cyclicName>
+ <cyclicName type="8">Ri</cyclicName>
+ <cyclicName type="9">daanyeer</cyclicName>
+ <cyclicName type="10">Diiq</cyclicName>
+ <cyclicName type="11">Eey</cyclicName>
+ <cyclicName type="12">Doofaar</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ </cyclicNameSets>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="Bh">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="h">↑↑↑</dateFormatItem>
+ <dateFormatItem id="H">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Hms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="ms">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="coptic">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="dangi">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <monthPatterns>
+ <monthPatternContext type="format">
+ <monthPatternWidth type="narrow">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ </monthPatternContext>
+ <monthPatternContext type="stand-alone">
+ <monthPatternWidth type="narrow">
+ <monthPattern type="leap">↑↑↑</monthPattern>
+ </monthPatternWidth>
+ </monthPatternContext>
+ </monthPatterns>
+ <cyclicNameSets>
+ <cyclicNameSet type="dayParts">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ <cyclicNameSet type="solarTerms">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ <cyclicName type="13">↑↑↑</cyclicName>
+ <cyclicName type="14">↑↑↑</cyclicName>
+ <cyclicName type="15">↑↑↑</cyclicName>
+ <cyclicName type="16">↑↑↑</cyclicName>
+ <cyclicName type="17">↑↑↑</cyclicName>
+ <cyclicName type="18">↑↑↑</cyclicName>
+ <cyclicName type="19">↑↑↑</cyclicName>
+ <cyclicName type="20">↑↑↑</cyclicName>
+ <cyclicName type="21">↑↑↑</cyclicName>
+ <cyclicName type="22">↑↑↑</cyclicName>
+ <cyclicName type="23">↑↑↑</cyclicName>
+ <cyclicName type="24">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ <cyclicName type="13">↑↑↑</cyclicName>
+ <cyclicName type="14">↑↑↑</cyclicName>
+ <cyclicName type="15">↑↑↑</cyclicName>
+ <cyclicName type="16">↑↑↑</cyclicName>
+ <cyclicName type="17">↑↑↑</cyclicName>
+ <cyclicName type="18">↑↑↑</cyclicName>
+ <cyclicName type="19">↑↑↑</cyclicName>
+ <cyclicName type="20">↑↑↑</cyclicName>
+ <cyclicName type="21">↑↑↑</cyclicName>
+ <cyclicName type="22">↑↑↑</cyclicName>
+ <cyclicName type="23">↑↑↑</cyclicName>
+ <cyclicName type="24">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="wide">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ <cyclicName type="13">↑↑↑</cyclicName>
+ <cyclicName type="14">↑↑↑</cyclicName>
+ <cyclicName type="15">↑↑↑</cyclicName>
+ <cyclicName type="16">↑↑↑</cyclicName>
+ <cyclicName type="17">↑↑↑</cyclicName>
+ <cyclicName type="18">↑↑↑</cyclicName>
+ <cyclicName type="19">↑↑↑</cyclicName>
+ <cyclicName type="20">↑↑↑</cyclicName>
+ <cyclicName type="21">↑↑↑</cyclicName>
+ <cyclicName type="22">↑↑↑</cyclicName>
+ <cyclicName type="23">↑↑↑</cyclicName>
+ <cyclicName type="24">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ <cyclicNameSet type="years">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="12">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ <cyclicNameSet type="zodiacs">
+ <cyclicNameContext type="format">
+ <cyclicNameWidth type="abbreviated">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="wide">
+ <cyclicName type="1">↑↑↑</cyclicName>
+ <cyclicName type="2">↑↑↑</cyclicName>
+ <cyclicName type="3">↑↑↑</cyclicName>
+ <cyclicName type="4">↑↑↑</cyclicName>
+ <cyclicName type="5">↑↑↑</cyclicName>
+ <cyclicName type="6">↑↑↑</cyclicName>
+ <cyclicName type="7">↑↑↑</cyclicName>
+ <cyclicName type="8">↑↑↑</cyclicName>
+ <cyclicName type="9">↑↑↑</cyclicName>
+ <cyclicName type="10">↑↑↑</cyclicName>
+ <cyclicName type="11">↑↑↑</cyclicName>
+ <cyclicName type="12">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ </cyclicNameContext>
+ </cyclicNameSet>
+ </cyclicNameSets>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="UMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="ethiopic">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="ethiopic-amete-alem">
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ </calendar>
<calendar type="generic">
<dateFormats>
<dateFormatLength type="full">
@@ -910,20 +2833,34 @@
<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">HH – HH</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="hm">
<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
<greatestDifference id="m" draft="unconfirmed">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" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
<greatestDifference id="m" draft="unconfirmed">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" draft="unconfirmed">h a – h a v</greatestDifference>
<greatestDifference id="h" draft="unconfirmed">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>
</intervalFormatItem>
@@ -1238,6 +3175,12 @@
<era type="1">CD</era>
<era type="1" alt="variant">TM</era>
</eraAbbr>
+ <eraNarrow>
+ <era type="0">B</era>
+ <era type="0" alt="variant">↑↑↑</era>
+ <era type="1">A</era>
+ <era type="1" alt="variant">CE</era>
+ </eraNarrow>
</eras>
<dateFormats>
<dateFormatLength type="full">
@@ -1502,6 +3445,666 @@
</intervalFormats>
</dateTimeFormats>
</calendar>
+ <calendar type="hebrew">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="7" yeartype="leap">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ <month type="13">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'barta' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'barta' {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">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="indian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'barta' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'barta' {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">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
<calendar type="islamic">
<months>
<monthContext type="format">
@@ -1594,9 +4197,15 @@
</monthContext>
</months>
<eras>
+ <eraNames>
+ <era type="0">AH</era>
+ </eraNames>
<eraAbbr>
<era type="0">HD</era>
</eraAbbr>
+ <eraNarrow>
+ <era type="0">AH</era>
+ </eraNarrow>
</eras>
<dateFormats>
<dateFormatLength type="full">
@@ -1621,6 +4230,26 @@
</dateFormatLength>
</dateFormats>
<dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
<availableFormats>
<dateFormatItem id="d">↑↑↑</dateFormatItem>
<dateFormatItem id="E">↑↑↑</dateFormatItem>
@@ -1656,6 +4285,1651 @@
<dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
<dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
</availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="japanese">
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ <era type="2">↑↑↑</era>
+ <era type="3">↑↑↑</era>
+ <era type="4">↑↑↑</era>
+ <era type="5">↑↑↑</era>
+ <era type="6">↑↑↑</era>
+ <era type="7">↑↑↑</era>
+ <era type="8">↑↑↑</era>
+ <era type="9">↑↑↑</era>
+ <era type="10">↑↑↑</era>
+ <era type="11">↑↑↑</era>
+ <era type="12">↑↑↑</era>
+ <era type="13">↑↑↑</era>
+ <era type="14">↑↑↑</era>
+ <era type="15">↑↑↑</era>
+ <era type="16">↑↑↑</era>
+ <era type="17">↑↑↑</era>
+ <era type="18">↑↑↑</era>
+ <era type="19">↑↑↑</era>
+ <era type="20">↑↑↑</era>
+ <era type="21">↑↑↑</era>
+ <era type="22">↑↑↑</era>
+ <era type="23">↑↑↑</era>
+ <era type="24">↑↑↑</era>
+ <era type="25">↑↑↑</era>
+ <era type="26">↑↑↑</era>
+ <era type="27">↑↑↑</era>
+ <era type="28">↑↑↑</era>
+ <era type="29">↑↑↑</era>
+ <era type="30">↑↑↑</era>
+ <era type="31">↑↑↑</era>
+ <era type="32">↑↑↑</era>
+ <era type="33">↑↑↑</era>
+ <era type="34">↑↑↑</era>
+ <era type="35">↑↑↑</era>
+ <era type="36">↑↑↑</era>
+ <era type="37">↑↑↑</era>
+ <era type="38">↑↑↑</era>
+ <era type="39">↑↑↑</era>
+ <era type="40">↑↑↑</era>
+ <era type="41">↑↑↑</era>
+ <era type="42">↑↑↑</era>
+ <era type="43">↑↑↑</era>
+ <era type="44">↑↑↑</era>
+ <era type="45">↑↑↑</era>
+ <era type="46">↑↑↑</era>
+ <era type="47">↑↑↑</era>
+ <era type="48">↑↑↑</era>
+ <era type="49">↑↑↑</era>
+ <era type="50">↑↑↑</era>
+ <era type="51">↑↑↑</era>
+ <era type="52">↑↑↑</era>
+ <era type="53">↑↑↑</era>
+ <era type="54">↑↑↑</era>
+ <era type="55">↑↑↑</era>
+ <era type="56">↑↑↑</era>
+ <era type="57">↑↑↑</era>
+ <era type="58">↑↑↑</era>
+ <era type="59">↑↑↑</era>
+ <era type="60">↑↑↑</era>
+ <era type="61">↑↑↑</era>
+ <era type="62">↑↑↑</era>
+ <era type="63">↑↑↑</era>
+ <era type="64">↑↑↑</era>
+ <era type="65">↑↑↑</era>
+ <era type="66">↑↑↑</era>
+ <era type="67">↑↑↑</era>
+ <era type="68">↑↑↑</era>
+ <era type="69">↑↑↑</era>
+ <era type="70">↑↑↑</era>
+ <era type="71">↑↑↑</era>
+ <era type="72">↑↑↑</era>
+ <era type="73">↑↑↑</era>
+ <era type="74">↑↑↑</era>
+ <era type="75">↑↑↑</era>
+ <era type="76">↑↑↑</era>
+ <era type="77">↑↑↑</era>
+ <era type="78">↑↑↑</era>
+ <era type="79">↑↑↑</era>
+ <era type="80">↑↑↑</era>
+ <era type="81">↑↑↑</era>
+ <era type="82">↑↑↑</era>
+ <era type="83">↑↑↑</era>
+ <era type="84">↑↑↑</era>
+ <era type="85">↑↑↑</era>
+ <era type="86">↑↑↑</era>
+ <era type="87">↑↑↑</era>
+ <era type="88">↑↑↑</era>
+ <era type="89">↑↑↑</era>
+ <era type="90">↑↑↑</era>
+ <era type="91">↑↑↑</era>
+ <era type="92">↑↑↑</era>
+ <era type="93">↑↑↑</era>
+ <era type="94">↑↑↑</era>
+ <era type="95">↑↑↑</era>
+ <era type="96">↑↑↑</era>
+ <era type="97">↑↑↑</era>
+ <era type="98">↑↑↑</era>
+ <era type="99">↑↑↑</era>
+ <era type="100">↑↑↑</era>
+ <era type="101">↑↑↑</era>
+ <era type="102">↑↑↑</era>
+ <era type="103">↑↑↑</era>
+ <era type="104">↑↑↑</era>
+ <era type="105">↑↑↑</era>
+ <era type="106">↑↑↑</era>
+ <era type="107">↑↑↑</era>
+ <era type="108">↑↑↑</era>
+ <era type="109">↑↑↑</era>
+ <era type="110">↑↑↑</era>
+ <era type="111">↑↑↑</era>
+ <era type="112">↑↑↑</era>
+ <era type="113">↑↑↑</era>
+ <era type="114">↑↑↑</era>
+ <era type="115">↑↑↑</era>
+ <era type="116">↑↑↑</era>
+ <era type="117">↑↑↑</era>
+ <era type="118">↑↑↑</era>
+ <era type="119">↑↑↑</era>
+ <era type="120">↑↑↑</era>
+ <era type="121">↑↑↑</era>
+ <era type="122">↑↑↑</era>
+ <era type="123">↑↑↑</era>
+ <era type="124">↑↑↑</era>
+ <era type="125">↑↑↑</era>
+ <era type="126">↑↑↑</era>
+ <era type="127">↑↑↑</era>
+ <era type="128">↑↑↑</era>
+ <era type="129">↑↑↑</era>
+ <era type="130">↑↑↑</era>
+ <era type="131">↑↑↑</era>
+ <era type="132">↑↑↑</era>
+ <era type="133">↑↑↑</era>
+ <era type="134">↑↑↑</era>
+ <era type="135">↑↑↑</era>
+ <era type="136">↑↑↑</era>
+ <era type="137">↑↑↑</era>
+ <era type="138">↑↑↑</era>
+ <era type="139">↑↑↑</era>
+ <era type="140">↑↑↑</era>
+ <era type="141">↑↑↑</era>
+ <era type="142">↑↑↑</era>
+ <era type="143">↑↑↑</era>
+ <era type="144">↑↑↑</era>
+ <era type="145">↑↑↑</era>
+ <era type="146">↑↑↑</era>
+ <era type="147">↑↑↑</era>
+ <era type="148">↑↑↑</era>
+ <era type="149">↑↑↑</era>
+ <era type="150">↑↑↑</era>
+ <era type="151">↑↑↑</era>
+ <era type="152">↑↑↑</era>
+ <era type="153">↑↑↑</era>
+ <era type="154">↑↑↑</era>
+ <era type="155">↑↑↑</era>
+ <era type="156">↑↑↑</era>
+ <era type="157">↑↑↑</era>
+ <era type="158">↑↑↑</era>
+ <era type="159">↑↑↑</era>
+ <era type="160">↑↑↑</era>
+ <era type="161">↑↑↑</era>
+ <era type="162">↑↑↑</era>
+ <era type="163">↑↑↑</era>
+ <era type="164">↑↑↑</era>
+ <era type="165">↑↑↑</era>
+ <era type="166">↑↑↑</era>
+ <era type="167">↑↑↑</era>
+ <era type="168">↑↑↑</era>
+ <era type="169">↑↑↑</era>
+ <era type="170">↑↑↑</era>
+ <era type="171">↑↑↑</era>
+ <era type="172">↑↑↑</era>
+ <era type="173">↑↑↑</era>
+ <era type="174">↑↑↑</era>
+ <era type="175">↑↑↑</era>
+ <era type="176">↑↑↑</era>
+ <era type="177">↑↑↑</era>
+ <era type="178">↑↑↑</era>
+ <era type="179">↑↑↑</era>
+ <era type="180">↑↑↑</era>
+ <era type="181">↑↑↑</era>
+ <era type="182">↑↑↑</era>
+ <era type="183">↑↑↑</era>
+ <era type="184">↑↑↑</era>
+ <era type="185">↑↑↑</era>
+ <era type="186">↑↑↑</era>
+ <era type="187">↑↑↑</era>
+ <era type="188">↑↑↑</era>
+ <era type="189">↑↑↑</era>
+ <era type="190">↑↑↑</era>
+ <era type="191">↑↑↑</era>
+ <era type="192">↑↑↑</era>
+ <era type="193">↑↑↑</era>
+ <era type="194">↑↑↑</era>
+ <era type="195">↑↑↑</era>
+ <era type="196">↑↑↑</era>
+ <era type="197">↑↑↑</era>
+ <era type="198">↑↑↑</era>
+ <era type="199">↑↑↑</era>
+ <era type="200">↑↑↑</era>
+ <era type="201">↑↑↑</era>
+ <era type="202">↑↑↑</era>
+ <era type="203">↑↑↑</era>
+ <era type="204">↑↑↑</era>
+ <era type="205">↑↑↑</era>
+ <era type="206">↑↑↑</era>
+ <era type="207">↑↑↑</era>
+ <era type="208">↑↑↑</era>
+ <era type="209">↑↑↑</era>
+ <era type="210">↑↑↑</era>
+ <era type="211">↑↑↑</era>
+ <era type="212">↑↑↑</era>
+ <era type="213">↑↑↑</era>
+ <era type="214">↑↑↑</era>
+ <era type="215">↑↑↑</era>
+ <era type="216">↑↑↑</era>
+ <era type="217">↑↑↑</era>
+ <era type="218">↑↑↑</era>
+ <era type="219">↑↑↑</era>
+ <era type="220">↑↑↑</era>
+ <era type="221">↑↑↑</era>
+ <era type="222">↑↑↑</era>
+ <era type="223">↑↑↑</era>
+ <era type="224">↑↑↑</era>
+ <era type="225">↑↑↑</era>
+ <era type="226">↑↑↑</era>
+ <era type="227">↑↑↑</era>
+ <era type="228">↑↑↑</era>
+ <era type="229">↑↑↑</era>
+ <era type="230">↑↑↑</era>
+ <era type="231">↑↑↑</era>
+ <era type="232">↑↑↑</era>
+ <era type="233">↑↑↑</era>
+ <era type="234">↑↑↑</era>
+ <era type="235">↑↑↑</era>
+ <era type="236">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ <era type="2">↑↑↑</era>
+ <era type="3">↑↑↑</era>
+ <era type="4">↑↑↑</era>
+ <era type="5">↑↑↑</era>
+ <era type="6">↑↑↑</era>
+ <era type="7">↑↑↑</era>
+ <era type="8">↑↑↑</era>
+ <era type="9">↑↑↑</era>
+ <era type="10">↑↑↑</era>
+ <era type="11">↑↑↑</era>
+ <era type="12">↑↑↑</era>
+ <era type="13">↑↑↑</era>
+ <era type="14">↑↑↑</era>
+ <era type="15">↑↑↑</era>
+ <era type="16">↑↑↑</era>
+ <era type="17">↑↑↑</era>
+ <era type="18">↑↑↑</era>
+ <era type="19">↑↑↑</era>
+ <era type="20">↑↑↑</era>
+ <era type="21">↑↑↑</era>
+ <era type="22">↑↑↑</era>
+ <era type="23">↑↑↑</era>
+ <era type="24">↑↑↑</era>
+ <era type="25">↑↑↑</era>
+ <era type="26">↑↑↑</era>
+ <era type="27">↑↑↑</era>
+ <era type="28">↑↑↑</era>
+ <era type="29">↑↑↑</era>
+ <era type="30">↑↑↑</era>
+ <era type="31">↑↑↑</era>
+ <era type="32">↑↑↑</era>
+ <era type="33">↑↑↑</era>
+ <era type="34">↑↑↑</era>
+ <era type="35">↑↑↑</era>
+ <era type="36">↑↑↑</era>
+ <era type="37">↑↑↑</era>
+ <era type="38">↑↑↑</era>
+ <era type="39">↑↑↑</era>
+ <era type="40">↑↑↑</era>
+ <era type="41">↑↑↑</era>
+ <era type="42">↑↑↑</era>
+ <era type="43">↑↑↑</era>
+ <era type="44">↑↑↑</era>
+ <era type="45">↑↑↑</era>
+ <era type="46">↑↑↑</era>
+ <era type="47">↑↑↑</era>
+ <era type="48">↑↑↑</era>
+ <era type="49">↑↑↑</era>
+ <era type="50">↑↑↑</era>
+ <era type="51">↑↑↑</era>
+ <era type="52">↑↑↑</era>
+ <era type="53">↑↑↑</era>
+ <era type="54">↑↑↑</era>
+ <era type="55">↑↑↑</era>
+ <era type="56">↑↑↑</era>
+ <era type="57">↑↑↑</era>
+ <era type="58">↑↑↑</era>
+ <era type="59">↑↑↑</era>
+ <era type="60">↑↑↑</era>
+ <era type="61">↑↑↑</era>
+ <era type="62">↑↑↑</era>
+ <era type="63">↑↑↑</era>
+ <era type="64">↑↑↑</era>
+ <era type="65">↑↑↑</era>
+ <era type="66">↑↑↑</era>
+ <era type="67">↑↑↑</era>
+ <era type="68">↑↑↑</era>
+ <era type="69">↑↑↑</era>
+ <era type="70">↑↑↑</era>
+ <era type="71">↑↑↑</era>
+ <era type="72">↑↑↑</era>
+ <era type="73">↑↑↑</era>
+ <era type="74">↑↑↑</era>
+ <era type="75">↑↑↑</era>
+ <era type="76">↑↑↑</era>
+ <era type="77">↑↑↑</era>
+ <era type="78">↑↑↑</era>
+ <era type="79">↑↑↑</era>
+ <era type="80">↑↑↑</era>
+ <era type="81">↑↑↑</era>
+ <era type="82">↑↑↑</era>
+ <era type="83">↑↑↑</era>
+ <era type="84">↑↑↑</era>
+ <era type="85">↑↑↑</era>
+ <era type="86">↑↑↑</era>
+ <era type="87">↑↑↑</era>
+ <era type="88">↑↑↑</era>
+ <era type="89">↑↑↑</era>
+ <era type="90">↑↑↑</era>
+ <era type="91">↑↑↑</era>
+ <era type="92">↑↑↑</era>
+ <era type="93">↑↑↑</era>
+ <era type="94">↑↑↑</era>
+ <era type="95">↑↑↑</era>
+ <era type="96">↑↑↑</era>
+ <era type="97">↑↑↑</era>
+ <era type="98">↑↑↑</era>
+ <era type="99">↑↑↑</era>
+ <era type="100">↑↑↑</era>
+ <era type="101">↑↑↑</era>
+ <era type="102">↑↑↑</era>
+ <era type="103">↑↑↑</era>
+ <era type="104">↑↑↑</era>
+ <era type="105">↑↑↑</era>
+ <era type="106">↑↑↑</era>
+ <era type="107">↑↑↑</era>
+ <era type="108">↑↑↑</era>
+ <era type="109">↑↑↑</era>
+ <era type="110">↑↑↑</era>
+ <era type="111">↑↑↑</era>
+ <era type="112">↑↑↑</era>
+ <era type="113">↑↑↑</era>
+ <era type="114">↑↑↑</era>
+ <era type="115">↑↑↑</era>
+ <era type="116">↑↑↑</era>
+ <era type="117">↑↑↑</era>
+ <era type="118">↑↑↑</era>
+ <era type="119">↑↑↑</era>
+ <era type="120">↑↑↑</era>
+ <era type="121">↑↑↑</era>
+ <era type="122">↑↑↑</era>
+ <era type="123">↑↑↑</era>
+ <era type="124">↑↑↑</era>
+ <era type="125">↑↑↑</era>
+ <era type="126">↑↑↑</era>
+ <era type="127">↑↑↑</era>
+ <era type="128">↑↑↑</era>
+ <era type="129">↑↑↑</era>
+ <era type="130">↑↑↑</era>
+ <era type="131">↑↑↑</era>
+ <era type="132">↑↑↑</era>
+ <era type="133">↑↑↑</era>
+ <era type="134">↑↑↑</era>
+ <era type="135">↑↑↑</era>
+ <era type="136">↑↑↑</era>
+ <era type="137">↑↑↑</era>
+ <era type="138">↑↑↑</era>
+ <era type="139">↑↑↑</era>
+ <era type="140">↑↑↑</era>
+ <era type="141">↑↑↑</era>
+ <era type="142">↑↑↑</era>
+ <era type="143">↑↑↑</era>
+ <era type="144">↑↑↑</era>
+ <era type="145">↑↑↑</era>
+ <era type="146">↑↑↑</era>
+ <era type="147">↑↑↑</era>
+ <era type="148">↑↑↑</era>
+ <era type="149">↑↑↑</era>
+ <era type="150">↑↑↑</era>
+ <era type="151">↑↑↑</era>
+ <era type="152">↑↑↑</era>
+ <era type="153">↑↑↑</era>
+ <era type="154">↑↑↑</era>
+ <era type="155">↑↑↑</era>
+ <era type="156">↑↑↑</era>
+ <era type="157">↑↑↑</era>
+ <era type="158">↑↑↑</era>
+ <era type="159">↑↑↑</era>
+ <era type="160">↑↑↑</era>
+ <era type="161">↑↑↑</era>
+ <era type="162">↑↑↑</era>
+ <era type="163">↑↑↑</era>
+ <era type="164">↑↑↑</era>
+ <era type="165">↑↑↑</era>
+ <era type="166">↑↑↑</era>
+ <era type="167">↑↑↑</era>
+ <era type="168">↑↑↑</era>
+ <era type="169">↑↑↑</era>
+ <era type="170">↑↑↑</era>
+ <era type="171">↑↑↑</era>
+ <era type="172">↑↑↑</era>
+ <era type="173">↑↑↑</era>
+ <era type="174">↑↑↑</era>
+ <era type="175">↑↑↑</era>
+ <era type="176">↑↑↑</era>
+ <era type="177">↑↑↑</era>
+ <era type="178">↑↑↑</era>
+ <era type="179">↑↑↑</era>
+ <era type="180">↑↑↑</era>
+ <era type="181">↑↑↑</era>
+ <era type="182">↑↑↑</era>
+ <era type="183">↑↑↑</era>
+ <era type="184">↑↑↑</era>
+ <era type="185">↑↑↑</era>
+ <era type="186">↑↑↑</era>
+ <era type="187">↑↑↑</era>
+ <era type="188">↑↑↑</era>
+ <era type="189">↑↑↑</era>
+ <era type="190">↑↑↑</era>
+ <era type="191">↑↑↑</era>
+ <era type="192">↑↑↑</era>
+ <era type="193">↑↑↑</era>
+ <era type="194">↑↑↑</era>
+ <era type="195">↑↑↑</era>
+ <era type="196">↑↑↑</era>
+ <era type="197">↑↑↑</era>
+ <era type="198">↑↑↑</era>
+ <era type="199">↑↑↑</era>
+ <era type="200">↑↑↑</era>
+ <era type="201">↑↑↑</era>
+ <era type="202">↑↑↑</era>
+ <era type="203">↑↑↑</era>
+ <era type="204">↑↑↑</era>
+ <era type="205">↑↑↑</era>
+ <era type="206">↑↑↑</era>
+ <era type="207">↑↑↑</era>
+ <era type="208">↑↑↑</era>
+ <era type="209">↑↑↑</era>
+ <era type="210">↑↑↑</era>
+ <era type="211">↑↑↑</era>
+ <era type="212">↑↑↑</era>
+ <era type="213">↑↑↑</era>
+ <era type="214">↑↑↑</era>
+ <era type="215">↑↑↑</era>
+ <era type="216">↑↑↑</era>
+ <era type="217">↑↑↑</era>
+ <era type="218">↑↑↑</era>
+ <era type="219">↑↑↑</era>
+ <era type="220">↑↑↑</era>
+ <era type="221">↑↑↑</era>
+ <era type="222">↑↑↑</era>
+ <era type="223">↑↑↑</era>
+ <era type="224">↑↑↑</era>
+ <era type="225">↑↑↑</era>
+ <era type="226">↑↑↑</era>
+ <era type="227">↑↑↑</era>
+ <era type="228">↑↑↑</era>
+ <era type="229">↑↑↑</era>
+ <era type="230">↑↑↑</era>
+ <era type="231">↑↑↑</era>
+ <era type="232">↑↑↑</era>
+ <era type="233">↑↑↑</era>
+ <era type="234">↑↑↑</era>
+ <era type="235">↑↑↑</era>
+ <era type="236">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ <era type="1">↑↑↑</era>
+ <era type="2">↑↑↑</era>
+ <era type="3">↑↑↑</era>
+ <era type="4">↑↑↑</era>
+ <era type="5">↑↑↑</era>
+ <era type="6">↑↑↑</era>
+ <era type="7">↑↑↑</era>
+ <era type="8">↑↑↑</era>
+ <era type="9">↑↑↑</era>
+ <era type="10">↑↑↑</era>
+ <era type="11">↑↑↑</era>
+ <era type="12">↑↑↑</era>
+ <era type="13">↑↑↑</era>
+ <era type="14">↑↑↑</era>
+ <era type="15">↑↑↑</era>
+ <era type="16">↑↑↑</era>
+ <era type="17">↑↑↑</era>
+ <era type="18">↑↑↑</era>
+ <era type="19">↑↑↑</era>
+ <era type="20">↑↑↑</era>
+ <era type="21">↑↑↑</era>
+ <era type="22">↑↑↑</era>
+ <era type="23">↑↑↑</era>
+ <era type="24">↑↑↑</era>
+ <era type="25">↑↑↑</era>
+ <era type="26">↑↑↑</era>
+ <era type="27">↑↑↑</era>
+ <era type="28">↑↑↑</era>
+ <era type="29">↑↑↑</era>
+ <era type="30">↑↑↑</era>
+ <era type="31">↑↑↑</era>
+ <era type="32">↑↑↑</era>
+ <era type="33">↑↑↑</era>
+ <era type="34">↑↑↑</era>
+ <era type="35">↑↑↑</era>
+ <era type="36">↑↑↑</era>
+ <era type="37">↑↑↑</era>
+ <era type="38">↑↑↑</era>
+ <era type="39">↑↑↑</era>
+ <era type="40">↑↑↑</era>
+ <era type="41">↑↑↑</era>
+ <era type="42">↑↑↑</era>
+ <era type="43">↑↑↑</era>
+ <era type="44">↑↑↑</era>
+ <era type="45">↑↑↑</era>
+ <era type="46">↑↑↑</era>
+ <era type="47">↑↑↑</era>
+ <era type="48">↑↑↑</era>
+ <era type="49">↑↑↑</era>
+ <era type="50">↑↑↑</era>
+ <era type="51">↑↑↑</era>
+ <era type="52">↑↑↑</era>
+ <era type="53">↑↑↑</era>
+ <era type="54">↑↑↑</era>
+ <era type="55">↑↑↑</era>
+ <era type="56">↑↑↑</era>
+ <era type="57">↑↑↑</era>
+ <era type="58">↑↑↑</era>
+ <era type="59">↑↑↑</era>
+ <era type="60">↑↑↑</era>
+ <era type="61">↑↑↑</era>
+ <era type="62">↑↑↑</era>
+ <era type="63">↑↑↑</era>
+ <era type="64">↑↑↑</era>
+ <era type="65">↑↑↑</era>
+ <era type="66">↑↑↑</era>
+ <era type="67">↑↑↑</era>
+ <era type="68">↑↑↑</era>
+ <era type="69">↑↑↑</era>
+ <era type="70">↑↑↑</era>
+ <era type="71">↑↑↑</era>
+ <era type="72">↑↑↑</era>
+ <era type="73">↑↑↑</era>
+ <era type="74">↑↑↑</era>
+ <era type="75">↑↑↑</era>
+ <era type="76">↑↑↑</era>
+ <era type="77">↑↑↑</era>
+ <era type="78">↑↑↑</era>
+ <era type="79">↑↑↑</era>
+ <era type="80">↑↑↑</era>
+ <era type="81">↑↑↑</era>
+ <era type="82">↑↑↑</era>
+ <era type="83">↑↑↑</era>
+ <era type="84">↑↑↑</era>
+ <era type="85">↑↑↑</era>
+ <era type="86">↑↑↑</era>
+ <era type="87">↑↑↑</era>
+ <era type="88">↑↑↑</era>
+ <era type="89">↑↑↑</era>
+ <era type="90">↑↑↑</era>
+ <era type="91">↑↑↑</era>
+ <era type="92">↑↑↑</era>
+ <era type="93">↑↑↑</era>
+ <era type="94">↑↑↑</era>
+ <era type="95">↑↑↑</era>
+ <era type="96">↑↑↑</era>
+ <era type="97">↑↑↑</era>
+ <era type="98">↑↑↑</era>
+ <era type="99">↑↑↑</era>
+ <era type="100">↑↑↑</era>
+ <era type="101">↑↑↑</era>
+ <era type="102">↑↑↑</era>
+ <era type="103">↑↑↑</era>
+ <era type="104">↑↑↑</era>
+ <era type="105">↑↑↑</era>
+ <era type="106">↑↑↑</era>
+ <era type="107">↑↑↑</era>
+ <era type="108">↑↑↑</era>
+ <era type="109">↑↑↑</era>
+ <era type="110">↑↑↑</era>
+ <era type="111">↑↑↑</era>
+ <era type="112">↑↑↑</era>
+ <era type="113">↑↑↑</era>
+ <era type="114">↑↑↑</era>
+ <era type="115">↑↑↑</era>
+ <era type="116">↑↑↑</era>
+ <era type="117">↑↑↑</era>
+ <era type="118">↑↑↑</era>
+ <era type="119">↑↑↑</era>
+ <era type="120">↑↑↑</era>
+ <era type="121">↑↑↑</era>
+ <era type="122">↑↑↑</era>
+ <era type="123">↑↑↑</era>
+ <era type="124">↑↑↑</era>
+ <era type="125">↑↑↑</era>
+ <era type="126">↑↑↑</era>
+ <era type="127">↑↑↑</era>
+ <era type="128">↑↑↑</era>
+ <era type="129">↑↑↑</era>
+ <era type="130">↑↑↑</era>
+ <era type="131">↑↑↑</era>
+ <era type="132">↑↑↑</era>
+ <era type="133">↑↑↑</era>
+ <era type="134">↑↑↑</era>
+ <era type="135">↑↑↑</era>
+ <era type="136">↑↑↑</era>
+ <era type="137">↑↑↑</era>
+ <era type="138">↑↑↑</era>
+ <era type="139">↑↑↑</era>
+ <era type="140">↑↑↑</era>
+ <era type="141">↑↑↑</era>
+ <era type="142">↑↑↑</era>
+ <era type="143">↑↑↑</era>
+ <era type="144">↑↑↑</era>
+ <era type="145">↑↑↑</era>
+ <era type="146">↑↑↑</era>
+ <era type="147">↑↑↑</era>
+ <era type="148">↑↑↑</era>
+ <era type="149">↑↑↑</era>
+ <era type="150">↑↑↑</era>
+ <era type="151">↑↑↑</era>
+ <era type="152">↑↑↑</era>
+ <era type="153">↑↑↑</era>
+ <era type="154">↑↑↑</era>
+ <era type="155">↑↑↑</era>
+ <era type="156">↑↑↑</era>
+ <era type="157">↑↑↑</era>
+ <era type="158">↑↑↑</era>
+ <era type="159">↑↑↑</era>
+ <era type="160">↑↑↑</era>
+ <era type="161">↑↑↑</era>
+ <era type="162">↑↑↑</era>
+ <era type="163">↑↑↑</era>
+ <era type="164">↑↑↑</era>
+ <era type="165">↑↑↑</era>
+ <era type="166">↑↑↑</era>
+ <era type="167">↑↑↑</era>
+ <era type="168">↑↑↑</era>
+ <era type="169">↑↑↑</era>
+ <era type="170">↑↑↑</era>
+ <era type="171">↑↑↑</era>
+ <era type="172">↑↑↑</era>
+ <era type="173">↑↑↑</era>
+ <era type="174">↑↑↑</era>
+ <era type="175">↑↑↑</era>
+ <era type="176">↑↑↑</era>
+ <era type="177">↑↑↑</era>
+ <era type="178">↑↑↑</era>
+ <era type="179">↑↑↑</era>
+ <era type="180">↑↑↑</era>
+ <era type="181">↑↑↑</era>
+ <era type="182">↑↑↑</era>
+ <era type="183">↑↑↑</era>
+ <era type="184">↑↑↑</era>
+ <era type="185">↑↑↑</era>
+ <era type="186">↑↑↑</era>
+ <era type="187">↑↑↑</era>
+ <era type="188">↑↑↑</era>
+ <era type="189">↑↑↑</era>
+ <era type="190">↑↑↑</era>
+ <era type="191">↑↑↑</era>
+ <era type="192">↑↑↑</era>
+ <era type="193">↑↑↑</era>
+ <era type="194">↑↑↑</era>
+ <era type="195">↑↑↑</era>
+ <era type="196">↑↑↑</era>
+ <era type="197">↑↑↑</era>
+ <era type="198">↑↑↑</era>
+ <era type="199">↑↑↑</era>
+ <era type="200">↑↑↑</era>
+ <era type="201">↑↑↑</era>
+ <era type="202">↑↑↑</era>
+ <era type="203">↑↑↑</era>
+ <era type="204">↑↑↑</era>
+ <era type="205">↑↑↑</era>
+ <era type="206">↑↑↑</era>
+ <era type="207">↑↑↑</era>
+ <era type="208">↑↑↑</era>
+ <era type="209">↑↑↑</era>
+ <era type="210">↑↑↑</era>
+ <era type="211">↑↑↑</era>
+ <era type="212">↑↑↑</era>
+ <era type="213">↑↑↑</era>
+ <era type="214">↑↑↑</era>
+ <era type="215">↑↑↑</era>
+ <era type="216">↑↑↑</era>
+ <era type="217">↑↑↑</era>
+ <era type="218">↑↑↑</era>
+ <era type="219">↑↑↑</era>
+ <era type="220">↑↑↑</era>
+ <era type="221">↑↑↑</era>
+ <era type="222">↑↑↑</era>
+ <era type="223">↑↑↑</era>
+ <era type="224">↑↑↑</era>
+ <era type="225">↑↑↑</era>
+ <era type="226">↑↑↑</era>
+ <era type="227">↑↑↑</era>
+ <era type="228">↑↑↑</era>
+ <era type="229">↑↑↑</era>
+ <era type="230">↑↑↑</era>
+ <era type="231">↑↑↑</era>
+ <era type="232">↑↑↑</era>
+ <era type="233">↑↑↑</era>
+ <era type="234">↑↑↑</era>
+ <era type="235">↑↑↑</era>
+ <era type="236">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="persian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Janaayo</month>
+ <month type="2">Feebraayo</month>
+ <month type="3">Maarso</month>
+ <month type="4">Abril</month>
+ <month type="5">Maayo</month>
+ <month type="6">Juun</month>
+ <month type="7">Luuliyo</month>
+ <month type="8">Agoosto</month>
+ <month type="9">Sabteembar</month>
+ <month type="10">Oktoobar</month>
+ <month type="11">Noofeembar</month>
+ <month type="12">Diiseembar</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">↑↑↑</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">↑↑↑</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="roc">
+ <eras>
+ <eraNames>
+ <era type="0">Kahor R.O.C.</era>
+ <era type="1">Minguo</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">Kahor R.O.C.</era>
+ <era type="1">Minguo</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">Kahor R.O.C.</era>
+ <era type="1">↑↑↑</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>↑↑↑</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <availableFormats>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Ed">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Gy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="M">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Md">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yQQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyy">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">↑↑↑</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="G">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="h">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hm">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hmv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hmv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="hv">
+ <greatestDifference id="a">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="M">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">↑↑↑</greatestDifference>
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">↑↑↑</greatestDifference>
+ <greatestDifference id="y">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
</dateTimeFormats>
</calendar>
</calendars>
@@ -1727,6 +6001,9 @@
</field>
<field type="quarter-short">
<displayName>rbc</displayName>
+ <relative type="-1">Rubucii ugu dambeeyay</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">Rubuca xiga</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} rbc</relativeTimePattern>
<relativeTimePattern count="other">{0} rbc</relativeTimePattern>
@@ -1738,6 +6015,9 @@
</field>
<field type="quarter-narrow">
<displayName>rbc</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">↑↑↑</relativeTimePattern>
<relativeTimePattern count="other">↑↑↑</relativeTimePattern>
@@ -2208,6 +6488,7 @@
</field>
<field type="hour-short">
<displayName>scd</displayName>
+ <relative type="0">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} scd</relativeTimePattern>
<relativeTimePattern count="other">{0} scd</relativeTimePattern>
@@ -2219,6 +6500,7 @@
</field>
<field type="hour-narrow">
<displayName>scd</displayName>
+ <relative type="0">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">↑↑↑</relativeTimePattern>
<relativeTimePattern count="other">↑↑↑</relativeTimePattern>
@@ -2242,6 +6524,7 @@
</field>
<field type="minute-short">
<displayName>dqqd</displayName>
+ <relative type="0">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} dqqd</relativeTimePattern>
<relativeTimePattern count="other">{0} dqqd</relativeTimePattern>
@@ -2253,6 +6536,7 @@
</field>
<field type="minute-narrow">
<displayName>↑↑↑</displayName>
+ <relative type="0">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">↑↑↑</relativeTimePattern>
<relativeTimePattern count="other">↑↑↑</relativeTimePattern>
@@ -2276,6 +6560,7 @@
</field>
<field type="second-short">
<displayName>ilbrqsi</displayName>
+ <relative type="0">Iminka</relative>
<relativeTime type="future">
<relativeTimePattern count="one">{0} ilbrqsi</relativeTimePattern>
<relativeTimePattern count="other">{0} ilbrqsi</relativeTimePattern>
@@ -2287,6 +6572,7 @@
</field>
<field type="second-narrow">
<displayName>↑↑↑</displayName>
+ <relative type="0">↑↑↑</relative>
<relativeTime type="future">
<relativeTimePattern count="one">↑↑↑</relativeTimePattern>
<relativeTimePattern count="other">↑↑↑</relativeTimePattern>
@@ -2318,6 +6604,9 @@
<long>
<standard>Waqtiga Isku-xiran ee Caalamka</standard>
</long>
+ <short>
+ <standard>Waqtiga UTC</standard>
+ </short>
</zone>
<zone type="Etc/Unknown">
<exemplarCity>Magaalo Aan La Garanayn</exemplarCity>
@@ -3603,6 +7892,13 @@
<zone type="Africa/Harare">
<exemplarCity>Haraare</exemplarCity>
</zone>
+ <metazone type="Acre">
+ <long>
+ <generic>Wakhtiga Acre</generic>
+ <standard>Wakhtiga Caadiga ah ee Acre</standard>
+ <daylight>Wakhtiga Kulka ee Acre</daylight>
+ </long>
+ </metazone>
<metazone type="Afghanistan">
<long>
<standard>Waqtiga Afggaanistaan</standard>
@@ -3637,6 +7933,13 @@
<daylight>Waqtiga Dharaarta ee Alaska</daylight>
</long>
</metazone>
+ <metazone type="Almaty">
+ <long>
+ <generic>Waqtiga Almaty</generic>
+ <standard>Waqtiga Caadiga ah ee Almaty</standard>
+ <daylight>Saacada Waqtiga Kulaylaha ee Almaty</daylight>
+ </long>
+ </metazone>
<metazone type="Amazon">
<long>
<generic>Waqtiga Amason</generic>
@@ -3672,6 +7975,13 @@
<daylight>Waqtiga Dharaarta ee Basifika Waqooyiga Ameerika</daylight>
</long>
</metazone>
+ <metazone type="Anadyr">
+ <long>
+ <generic>Wakhtiga Anadyr</generic>
+ <standard>Wakhtiga Caadiga ah ee Anadyr</standard>
+ <daylight>Wakhtiga Kulka ee Anadyr</daylight>
+ </long>
+ </metazone>
<metazone type="Apia">
<long>
<generic>Waqtiga Abiya</generic>
@@ -3679,6 +7989,20 @@
<daylight>Waqtiga Dharaarta ee Abiya</daylight>
</long>
</metazone>
+ <metazone type="Aqtau">
+ <long>
+ <generic>Waqtiga Aqtau</generic>
+ <standard>Waqtiga Caadiga ah ee Aqtau</standard>
+ <daylight>Saacada Waqtiga Kulaylaha Aqtau</daylight>
+ </long>
+ </metazone>
+ <metazone type="Aqtobe">
+ <long>
+ <generic>Waqtiga Aqtobe</generic>
+ <standard>Waqtiga Caadiga ah ee Aqtobe</standard>
+ <daylight>Saacada Waqtiga kulaylaha Aqtobe</daylight>
+ </long>
+ </metazone>
<metazone type="Arabian">
<long>
<generic>Waqtiga Carabta</generic>
@@ -3990,6 +8314,11 @@
<standard>Waqtiga Caadiga Ah ee Hawaay-Alutiyaan</standard>
<daylight>Waqtiga Dharaarta ee Hawaay-Alutiyaan</daylight>
</long>
+ <short>
+ <generic draft="contributed">HAT</generic>
+ <standard draft="contributed">HAST</standard>
+ <daylight draft="contributed">HADT</daylight>
+ </short>
</metazone>
<metazone type="Hong_Kong">
<long>
@@ -4063,6 +8392,13 @@
<daylight>Waqtiga Dharaarta ee Jabaan</daylight>
</long>
</metazone>
+ <metazone type="Kamchatka">
+ <long>
+ <generic>Wakhtiga Petropavlovsk-Kamchatski</generic>
+ <standard>Wakhtiga Caadiga ah ee Petropavlovsk-Kamchatski</standard>
+ <daylight>Wakhtiga Kulka ee Petropavlovsk-Kamchatski</daylight>
+ </long>
+ </metazone>
<metazone type="Kazakhstan_Eastern">
<long>
<standard>Waqtiga Bariga Kasakhistaan</standard>
@@ -4224,7 +8560,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Waqtiga Noorfek Aylaan</standard>
+ <generic draft="contributed">Waqtiga Noorfek Aylaan</generic>
+ <standard draft="contributed">Waqtiga Caadiga Ah ee Noorfek Aylaan</standard>
+ <daylight draft="contributed">Waqtiga Xagaaga ee Noorfek Aylaan</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4313,6 +8651,13 @@
<standard>Waqtiga Boyongyang</standard>
</long>
</metazone>
+ <metazone type="Qyzylorda">
+ <long>
+ <generic>Waqtiga Qyzylorda</generic>
+ <standard>Waqtiga Caadiga ah ee Qyzylorda</standard>
+ <daylight>Saacada Waqtiga Kulaylaha Qyzylorda</daylight>
+ </long>
+ </metazone>
<metazone type="Reunion">
<long>
<standard>Waqtiga Riyuuniyon</standard>
@@ -4330,6 +8675,13 @@
<daylight>Waqtiga Xagaaga ee Sakhalin</daylight>
</long>
</metazone>
+ <metazone type="Samara">
+ <long>
+ <generic>Wakhtiga Samara</generic>
+ <standard>Wakhtiga Caadiga ah ee Samara</standard>
+ <daylight>Wakhtiga Kulka ee Samara</daylight>
+ </long>
+ </metazone>
<metazone type="Samoa">
<long>
<generic>Waqtiga Samoa</generic>
@@ -4490,9 +8842,318 @@
<native draft="contributed">↑↑↑</native>
</otherNumberingSystems>
<minimumGroupingDigits draft="contributed">↑↑↑</minimumGroupingDigits>
+ <symbols numberSystem="adlm">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="arab">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>E</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="arabext">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>E</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="bali">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="beng">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">+</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="brah">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="cakm">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="cham">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="deva">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="fullwide">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>(^)</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="gong">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="gonm">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="gujr">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="guru">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="hanidec">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="java">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="kali">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="khmr">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="knda">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="lana">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>∞</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="lanatham">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="laoo">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
<symbols numberSystem="latn">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
<percentSign>↑↑↑</percentSign>
<plusSign draft="contributed">↑↑↑</plusSign>
<minusSign draft="contributed">↑↑↑</minusSign>
@@ -4501,7 +9162,484 @@
<perMille>↑↑↑</perMille>
<infinity>↑↑↑</infinity>
<nan>MaL</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
</symbols>
+ <symbols numberSystem="lepc">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>(^)</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="limb">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="mlym">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="mong">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="mtei">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="mymr">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="mymrshan">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="nkoo">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="olck">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="orya">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="osma">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>(^)</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="rohg">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="saur">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="shrd">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="sora">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>↑↑↑</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="sund">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="takr">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="talu">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="tamldec">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="telu">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="thai">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="tibt">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="vaii">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <group draft="contributed">↑↑↑</group>
+ <list>↑↑↑</list>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ <minusSign draft="contributed">↑↑↑</minusSign>
+ <exponential>↑↑↑</exponential>
+ <superscriptingExponent>↑↑↑</superscriptingExponent>
+ <perMille>↑↑↑</perMille>
+ <infinity>↑↑↑</infinity>
+ <nan>NaN</nan>
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <decimalFormats numberSystem="adlm">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="arab">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="arabext">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="bali">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="beng">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="brah">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="cakm">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="cham">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="deva">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="fullwide">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="gong">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="gonm">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="gujr">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="guru">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="hanidec">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="java">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="kali">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="khmr">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="knda">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="lana">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="lanatham">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="laoo">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
<decimalFormats numberSystem="latn">
<decimalFormatLength>
<decimalFormat>
@@ -4565,6 +9703,321 @@
</decimalFormat>
</decimalFormatLength>
</decimalFormats>
+ <decimalFormats numberSystem="lepc">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="limb">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="mlym">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="mong">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="mtei">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="mymr">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="mymrshan">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="nkoo">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="olck">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="orya">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="osma">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="rohg">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="saur">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="shrd">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="sora">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="sund">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="takr">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="talu">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="tamldec">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="telu">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="thai">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="tibt">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <decimalFormats numberSystem="vaii">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="adlm">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="arab">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="arabext">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="bali">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="beng">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="brah">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="cakm">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="cham">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="deva">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="fullwide">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="gong">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="gonm">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="gujr">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="guru">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="hanidec">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="java">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="kali">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="khmr">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="knda">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="lana">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="lanatham">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="laoo">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
<scientificFormats numberSystem="latn">
<scientificFormatLength>
<scientificFormat>
@@ -4572,6 +10025,321 @@
</scientificFormat>
</scientificFormatLength>
</scientificFormats>
+ <scientificFormats numberSystem="lepc">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="limb">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="mlym">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="mong">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="mtei">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="mymr">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="mymrshan">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="nkoo">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="olck">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="orya">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="osma">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="rohg">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="saur">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="shrd">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="sora">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="sund">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="takr">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="talu">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="tamldec">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="telu">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="thai">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="tibt">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <scientificFormats numberSystem="vaii">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="adlm">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="arab">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="arabext">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="bali">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="beng">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="brah">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="cakm">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="cham">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="deva">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="fullwide">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="gong">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="gonm">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="gujr">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="guru">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="hanidec">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="java">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="kali">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="khmr">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="knda">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="lana">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="lanatham">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="laoo">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
<percentFormats numberSystem="latn">
<percentFormatLength>
<percentFormat>
@@ -4579,6 +10347,429 @@
</percentFormat>
</percentFormatLength>
</percentFormats>
+ <percentFormats numberSystem="lepc">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="limb">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="mlym">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="mong">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="mtei">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="mymr">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="mymrshan">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="nkoo">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="olck">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="orya">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="osma">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="rohg">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="saur">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="shrd">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="sora">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="sund">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="takr">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="talu">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="tamldec">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="telu">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="thai">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="tibt">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <percentFormats numberSystem="vaii">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="adlm">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="arab">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ </currencyFormats>
+ <currencyFormats numberSystem="arabext">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="bali">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="beng">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="brah">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="cakm">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="cham">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="deva">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="fullwide">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="gong">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="gonm">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="gujr">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="guru">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="hanidec">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="java">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="kali">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="khmr">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="knda">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="lana">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="lanatham">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="laoo">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
<currencyFormats numberSystem="latn">
<currencyFormatLength>
<currencyFormat type="standard">
@@ -4619,6 +10810,282 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</currencyFormats>
+ <currencyFormats numberSystem="lepc">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="limb">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="mlym">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="mong">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="mtei">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="mymr">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="mymrshan">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="nkoo">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="olck">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="orya">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="osma">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="rohg">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="saur">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="shrd">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="sora">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="sund">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="takr">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="talu">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="tamldec">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="telu">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="thai">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="tibt">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
+ <currencyFormats numberSystem="vaii">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </currencyFormats>
<currencies>
<currency type="AED">
<displayName>Dirhamka Isutaga Imaaraatka Carabta</displayName>
@@ -4657,6 +11124,30 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="ARA">
+ <displayName>Argentine Austral</displayName>
+ <displayName count="one">Argentine Austral</displayName>
+ <displayName count="other">Argentine Australs</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="ARL">
+ <displayName>Beesada Ley ee Arjentiin (1970–1983)</displayName>
+ <displayName count="one">Beesada Ley ee Arjentiin (1970–1983)</displayName>
+ <displayName count="other">Beesada Ley ee Arjentiin (1970–1983)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="ARM">
+ <displayName>Beesada Ley ee Arjentiin (1881–1970)</displayName>
+ <displayName count="one">Beesada Ley ee Arjentiin (1881–1970)</displayName>
+ <displayName count="other">Beesada Ley ee Arjentiin (1881–1970)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="ARP">
+ <displayName>Beesada Ley ee Arjentiin (1883–1985)</displayName>
+ <displayName count="one">Beesada Ley ee Arjentiin (1883–1985)</displayName>
+ <displayName count="other">Beesada Ley ee Arjentiin (1883–1985)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="ARS">
<displayName>Beesada Arjentiin</displayName>
<displayName count="one">Beesada Arjentiin</displayName>
@@ -4683,6 +11174,11 @@
<displayName count="other">manaata Asarbeyjan</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="BAD">
+ <displayName>Diinaarka BBosnia-Hersogofina 1.00 konfatibal maakta Bosnia-Hersogofina 1 konfatibal maaka Bosnia-Hersogofina (1992–1994)</displayName>
+ <displayName count="one">Diinaarka BBosnia-Hersogofina (1992–1994)</displayName>
+ <displayName count="other">↑↑↑</displayName>
+ </currency>
<currency type="BAM">
<displayName>Konfatibal Maakta Bosnia-Hersogofina</displayName>
<displayName count="one">konfatibal maakta Bosnia-Hersogofina</displayName>
@@ -4743,6 +11239,12 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="BOL">
+ <displayName>Bolifiyaabka Bolifiyaano(1863–1963)</displayName>
+ <displayName count="one">Bolifiyaabka Bolifiyaano(1863–1963)</displayName>
+ <displayName count="other">Bolifiyaabka Bolifiyaano(1863–1963)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="BRL">
<displayName>Realka Barasil</displayName>
<displayName count="one">Realka Barasil</displayName>
@@ -4750,6 +11252,12 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="BRN">
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
+ <currency type="BRR">
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="BSD">
<displayName>Doolarka Bahamaas</displayName>
<displayName count="one">doolarka Bahamaas</displayName>
@@ -4890,6 +11398,11 @@
<displayName count="other">dinaarka Aljeriya</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="EEK">
+ <displayName>Kroonka Estooniya</displayName>
+ <displayName count="one">Kroonka Estooniya</displayName>
+ <displayName count="other">Kroonka Estooniya</displayName>
+ </currency>
<currency type="EGP">
<displayName>Bowndka Masar</displayName>
<displayName count="one">bowndka Masar</displayName>
@@ -4916,6 +11429,12 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="FIM">
+ <displayName>Markkada Fiinishka ah</displayName>
+ <displayName count="one">Markkada Fiinishka ah</displayName>
+ <displayName count="other">Markkada Fiinishka ah</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="FJD">
<displayName>Doolarka Fiji</displayName>
<displayName count="one">doolarka Fiji</displayName>
@@ -5025,6 +11544,12 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="IEP">
+ <displayName>baawnka Ayrishka</displayName>
+ <displayName count="one">baawnka Ayrishka</displayName>
+ <displayName count="other">baawnka Ayrishka</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="ILS">
<displayName>Niyuu Shekelka Israaiil</displayName>
<displayName count="one">niyuu shekelka Israaiil</displayName>
@@ -5051,6 +11576,11 @@
<displayName count="other">riyaalka Iran</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="ISJ">
+ <displayName count="one">krónaha Iceland (1918–1981)</displayName>
+ <displayName count="other">krónaha Iceland (1918–1981)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
+ </currency>
<currency type="ISK">
<displayName>Koronada Eysland</displayName>
<displayName count="one">Koronada Eysland</displayName>
@@ -5166,6 +11696,11 @@
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
+ <currency type="LVR">
+ <displayName>Rubalka Latfiya</displayName>
+ <displayName count="one">rubalka Latvia</displayName>
+ <displayName count="other">rubalka Latfiya</displayName>
+ </currency>
<currency type="LYD">
<displayName>Dinaarka Libya</displayName>
<displayName count="one">dinaarka Libya</displayName>
@@ -5663,12 +12198,282 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
</currencies>
+ <miscPatterns numberSystem="adlm">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="arab">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="arabext">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="bali">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="beng">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="brah">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="cakm">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="cham">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="deva">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="fullwide">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="gong">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="gonm">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="gujr">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="guru">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="hanidec">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="java">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="kali">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="khmr">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="knda">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="lana">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="lanatham">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="laoo">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
<miscPatterns numberSystem="latn">
<pattern type="approximately">↑↑↑</pattern>
<pattern type="atLeast">↑↑↑</pattern>
<pattern type="atMost">↑↑↑</pattern>
<pattern type="range">↑↑↑</pattern>
</miscPatterns>
+ <miscPatterns numberSystem="lepc">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="limb">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="mlym">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="mong">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="mtei">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="mymr">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="mymrshan">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="nkoo">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="olck">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="orya">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="osma">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="rohg">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="saur">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="shrd">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="sora">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="sund">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="takr">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="talu">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="tamldec">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="telu">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="thai">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="tibt">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
+ <miscPatterns numberSystem="vaii">
+ <pattern type="approximately">↑↑↑</pattern>
+ <pattern type="atLeast">↑↑↑</pattern>
+ <pattern type="atMost">↑↑↑</pattern>
+ <pattern type="range">↑↑↑</pattern>
+ </miscPatterns>
<minimalPairs>
<pluralMinimalPairs count="one" draft="contributed">{0} maalin</pluralMinimalPairs>
<pluralMinimalPairs count="other" draft="contributed">{0} maalmood</pluralMinimalPairs>
@@ -5677,9 +12482,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5688,7 +12563,7 @@
<unitPattern count="one">{0} cadaadis dib ku riixaya</unitPattern>
<unitPattern count="other">{0} cadaadis dib ku riixaya</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mitir ilbiriqsigii jibaaranba</displayName>
<unitPattern count="one">{0} mitir ilbiriqsigii jibaaranba</unitPattern>
<unitPattern count="other">{0} mitir ilbiriqsigii jibaaranba</unitPattern>
@@ -5788,7 +12663,7 @@
<unitPattern count="one">{0} milimool litirkiiba</unitPattern>
<unitPattern count="other">{0} milimool litirkiiba</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>baart milyankiiba</displayName>
<unitPattern count="one">{0} baart milyankiiba</unitPattern>
<unitPattern count="other">{0} baart milyankiiba</unitPattern>
@@ -5818,7 +12693,7 @@
<unitPattern count="one">litar kiilomitirkiiba</unitPattern>
<unitPattern count="other">{0} litir kiilomitirkiiba</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litar 100-kii kiilomitirba</displayName>
<unitPattern count="one">{0} litar 100-kii kiilomitirba</unitPattern>
<unitPattern count="other">{0} litar 100-kii kiilomitirba</unitPattern>
@@ -6165,6 +13040,16 @@
<unitPattern count="one">{0} unuga xidigiska</unitPattern>
<unitPattern count="other">{0} unuga xidigiska</unitPattern>
</unit>
+ <unit type="length-furlong">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-fathom">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-nautical-mile">
<displayName>Nuutikal meyl</displayName>
<unitPattern count="one">nuutika meyl</unitPattern>
@@ -6227,6 +13112,11 @@
<unitPattern count="one">{0} tan</unitPattern>
<unitPattern count="other">{0} tan</unitPattern>
</unit>
+ <unit type="mass-stone">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="mass-pound">
<displayName>bownd</displayName>
<unitPattern count="one">{0} bownd</unitPattern>
@@ -6294,17 +13184,17 @@
<unitPattern count="one">{0} horasbaawar</unitPattern>
<unitPattern count="other">{0} horasbaawar</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimitir maarkuri</displayName>
<unitPattern count="one">{0} milimitir maarkuri</unitPattern>
<unitPattern count="other">{0} milimitir maarkuri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>bownd injigii jibaaranba</displayName>
<unitPattern count="one">{0} bownd injigii jibaaranba</unitPattern>
<unitPattern count="other">{0} bownd injigii jibaaranba</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>injis maarkuri</displayName>
<unitPattern count="one">{0} inji maarkuri</unitPattern>
<unitPattern count="other">{0} inji maarkuri</unitPattern>
@@ -6384,7 +13274,7 @@
<unitPattern count="one">{0} kelfin</unitPattern>
<unitPattern count="other">{0} kelfin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>bownd-fiit</displayName>
<unitPattern count="one">{0} bownd-fiit</unitPattern>
<unitPattern count="other">{0} bownd-fiit</unitPattern>
@@ -6477,6 +13367,11 @@
<unitPattern count="one">{0} akre-fiit</unitPattern>
<unitPattern count="other">{0} akre-fiit</unitPattern>
</unit>
+ <unit type="volume-bushel">
+ <displayName>cabirka bushels</displayName>
+ <unitPattern count="one">{0}cabirka bushel</unitPattern>
+ <unitPattern count="other">{0}cabirka bushels</unitPattern>
+ </unit>
<unit type="volume-gallon">
<displayName>galaan</displayName>
<unitPattern count="one">{0} galaan</unitPattern>
@@ -6538,9 +13433,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6549,7 +13514,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} C</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mitir/ilbrqsi²</displayName>
<unitPattern count="one">{0} m/i²</unitPattern>
<unitPattern count="other">{0} m/i²</unitPattern>
@@ -6649,7 +13614,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>baart/milyan</displayName>
<unitPattern count="one">{0} bbm</unitPattern>
<unitPattern count="other">{0} bbm</unitPattern>
@@ -6679,7 +13644,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7026,6 +13991,16 @@
<unitPattern count="one">{0} ux</unitPattern>
<unitPattern count="other">{0} ux</unitPattern>
</unit>
+ <unit type="length-furlong">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-fathom">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-nautical-mile">
<displayName>nmy</displayName>
<unitPattern count="one">{0} nmy</unitPattern>
@@ -7088,6 +14063,11 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="mass-stone">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="mass-pound">
<displayName>bownd</displayName>
<unitPattern count="one">{0} bw</unitPattern>
@@ -7155,17 +14135,17 @@
<unitPattern count="one">{0} hb</unitPattern>
<unitPattern count="other">{0} hb</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mmHg</displayName>
<unitPattern count="one">{0} mmHg</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>bij</displayName>
<unitPattern count="one">{0} bij</unitPattern>
<unitPattern count="other">{0} bij</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7245,7 +14225,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>bwd⋅ft</displayName>
<unitPattern count="one">{0} bwd⋅ft</unitPattern>
<unitPattern count="other">{0} bwd⋅ft</unitPattern>
@@ -7338,6 +14318,11 @@
<unitPattern count="one">{0} akr ft</unitPattern>
<unitPattern count="other">{0} akr ft</unitPattern>
</unit>
+ <unit type="volume-bushel">
+ <displayName>cabirka bushels</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="volume-gallon">
<displayName>gal</displayName>
<unitPattern count="one">{0} gal</unitPattern>
@@ -7399,31 +14384,308 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <unit type="acceleration-g-force">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="acceleration-meter-per-square-second">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-revolution">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-degree">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-arc-minute">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-arc-second">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="area-square-kilometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="area-hectare">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="area-square-meter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="area-square-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="area-square-mile">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="area-acre">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="area-square-yard">
+ <displayName>yd²</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="area-square-foot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="area-square-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="area-dunam">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-karat">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="concentr-percent">
<displayName>%</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="concentr-permille">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="concentr-permyriad">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-mole">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-kilometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="duration-century">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="duration-decade">
+ <displayName>toban sano</displayName>
+ <unitPattern count="one">{0}diis</unitPattern>
+ <unitPattern count="other">{0}diis</unitPattern>
+ </unit>
<unit type="duration-year">
<displayName>snd</displayName>
<unitPattern count="one">{0}s</unitPattern>
<unitPattern count="other">{0}s</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-month">
<displayName>Bil</displayName>
<unitPattern count="one">{0}b</unitPattern>
<unitPattern count="other">{0}b</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-week">
<displayName>t</displayName>
@@ -7441,66 +14703,628 @@
<displayName>scd</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">{0} s</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-minute">
<displayName>dqqd</displayName>
<unitPattern count="one">{0}d</unitPattern>
<unitPattern count="other">{0}d</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}il</unitPattern>
<unitPattern count="other">{0}il</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="duration-millisecond">
<displayName>mlsek</displayName>
<unitPattern count="one">{0}ms</unitPattern>
<unitPattern count="other">{0}ms</unitPattern>
</unit>
+ <unit type="duration-microsecond">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="duration-nanosecond">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-ampere">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-kilocalorie">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-calorie">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-foodcalorie">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-kilojoule">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-joule">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-kilowatt-hour">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-electronvolt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-british-thermal-unit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="energy-therm-us">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="force-pound-force">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="force-newton">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-gigahertz">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-em">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="length-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}km</unitPattern>
<unitPattern count="other">{0}km</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="length-meter">
<displayName>m</displayName>
<unitPattern count="one">{0}m</unitPattern>
<unitPattern count="other">{0}m</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="length-decimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="length-centimeter">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}cm</unitPattern>
<unitPattern count="other">{0}cm</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="length-millimeter">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}mm</unitPattern>
<unitPattern count="other">{0}mm</unitPattern>
</unit>
+ <unit type="length-micrometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-nanometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-picometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-mile">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-yard">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-foot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="length-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="length-parsec">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-light-year">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-astronomical-unit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-furlong">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-fathom">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-nautical-mile">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-mile-scandinavian">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-point">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="length-solar-radius">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="light-lux">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="light-solar-luminosity">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-metric-ton">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="mass-kilogram">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0}kg</unitPattern>
<unitPattern count="other">{0}kg</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
</unit>
<unit type="mass-gram">
<displayName>garaam</displayName>
<unitPattern count="one">{0}g</unitPattern>
<unitPattern count="other">{0}g</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="mass-milligram">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-microgram">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-ton">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-stone">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-pound">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce-troy">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-carat">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-dalton">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-earth-mass">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="mass-solar-mass">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-gigawatt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-megawatt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-kilowatt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-watt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-milliwatt">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="power-horsepower">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-millimeter-ofhg">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-millibar">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-atmosphere">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-hectopascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-kilopascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-megapascal">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="speed-kilometer-per-hour">
<displayName>km/s</displayName>
<unitPattern count="one">{0} km/s</unitPattern>
<unitPattern count="other">{0} km/s</unitPattern>
</unit>
+ <unit type="speed-meter-per-second">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="speed-mile-per-hour">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="speed-knot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="temperature-generic">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="temperature-celsius">
<displayName>°C</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
+ <unit type="temperature-fahrenheit">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="temperature-kelvin">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="torque-newton-meter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cubic-kilometer">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cubic-meter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-centimeter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-mile">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cubic-yard">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cubic-foot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cubic-inch">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-megaliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-hectoliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
<unit type="volume-liter">
<displayName>litar</displayName>
<unitPattern count="one">{0}L</unitPattern>
<unitPattern count="other">{0}L</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="volume-deciliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-centiliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-milliliter">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-pint-metric">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cup-metric">
+ <displayName>mkoob</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-acre-foot">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-bushel">
+ <displayName>cabirka bushel</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-gallon">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="volume-gallon-imperial">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ <perUnitPattern>↑↑↑</perUnitPattern>
+ </unit>
+ <unit type="volume-quart">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-pint">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-cup">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce-imperial">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-tablespoon">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-teaspoon">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
+ </unit>
+ <unit type="volume-barrel">
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<coordinateUnit>
<displayName>jiho</displayName>
diff --git a/common/main/so_DJ.xml b/common/main/so_DJ.xml
index ff4929d..e9a13b1 100644
--- a/common/main/so_DJ.xml
+++ b/common/main/so_DJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/so_ET.xml b/common/main/so_ET.xml
index 7be4777..9ef8460 100644
--- a/common/main/so_ET.xml
+++ b/common/main/so_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/so_KE.xml b/common/main/so_KE.xml
index 46a88ec..54247fe 100644
--- a/common/main/so_KE.xml
+++ b/common/main/so_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/so_SO.xml b/common/main/so_SO.xml
index 3ab9e62..0e525f3 100644
--- a/common/main/so_SO.xml
+++ b/common/main/so_SO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sq.xml b/common/main/sq.xml
index ddd8d2d..5b52dc0 100644
--- a/common/main/sq.xml
+++ b/common/main/sq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="eu">baskisht</language>
<language type="ewo">euondoisht</language>
<language type="fa">persisht</language>
+ <language type="fa_AF">darisht</language>
<language type="ff">fulaisht</language>
<language type="fi">finlandisht</language>
<language type="fil">filipinisht</language>
@@ -420,9 +421,9 @@
<language type="zh">kinezisht</language>
<language type="zh" alt="menu">kinezishte mandarine</language>
<language type="zh_Hans">kinezishte e thjeshtuar</language>
- <language type="zh_Hans" alt="long" draft="provisional">kinezishte mandarine (e thjeshtuar)</language>
+ <language type="zh_Hans" alt="long">kinezishte mandarine (e thjeshtuar)</language>
<language type="zh_Hant">kinezishte tradicionale</language>
- <language type="zh_Hant" alt="long" draft="provisional">kinezishte mandarine (tradicionale)</language>
+ <language type="zh_Hant" alt="long">kinezishte mandarine (tradicionale)</language>
<language type="zu">zuluisht</language>
<language type="zun">zunisht</language>
<language type="zxx">nuk ka përmbajtje gjuhësore</language>
@@ -4374,7 +4375,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Ora e Ishullit Norfolk</standard>
+ <generic draft="contributed">Ora e Ishullit Norfolk</generic>
+ <standard draft="contributed">Ora standarde e Ishullit Norfolk</standard>
+ <daylight draft="contributed">Ora verore e Ishullit Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4838,7 +4841,7 @@
<displayName>Dollari australian</displayName>
<displayName count="one">dollar australian</displayName>
<displayName count="other">dollarë australian</displayName>
- <symbol draft="provisional">A$</symbol>
+ <symbol draft="contributed">A$</symbol>
<symbol alt="narrow" draft="contributed">AUD</symbol>
</currency>
<currency type="AWG">
@@ -4964,7 +4967,7 @@
<displayName>Dollari kanadez</displayName>
<displayName count="one">dollar kanadez</displayName>
<displayName count="other">dollarë kanadez</displayName>
- <symbol draft="provisional">CA$</symbol>
+ <symbol draft="contributed">CA$</symbol>
<symbol alt="narrow" draft="contributed">CAD</symbol>
</currency>
<currency type="CDF">
@@ -4996,7 +4999,7 @@
<displayName>Juani kinez</displayName>
<displayName count="one">juan kinez</displayName>
<displayName count="other">juanë kinez</displayName>
- <symbol draft="provisional">CN¥</symbol>
+ <symbol draft="contributed">CN¥</symbol>
<symbol alt="narrow" draft="contributed">CNY</symbol>
</currency>
<currency type="COP">
@@ -5089,7 +5092,7 @@
<displayName>Euroja</displayName>
<displayName count="one">euro</displayName>
<displayName count="other">euro</displayName>
- <symbol draft="provisional">€</symbol>
+ <symbol draft="contributed">€</symbol>
<symbol alt="narrow" draft="contributed">EUR</symbol>
</currency>
<currency type="FJD">
@@ -5110,7 +5113,7 @@
<displayName>Sterlina britanike</displayName>
<displayName count="one">sterlinë britanike</displayName>
<displayName count="other">sterlina britanike</displayName>
- <symbol draft="provisional">£</symbol>
+ <symbol draft="contributed">£</symbol>
<symbol alt="narrow" draft="contributed">GBP</symbol>
</currency>
<currency type="GEL">
@@ -5205,14 +5208,14 @@
<displayName>Shekeli izrealit</displayName>
<displayName count="one">shekel izrealit</displayName>
<displayName count="other">shekelë izrealit</displayName>
- <symbol draft="provisional">₪</symbol>
+ <symbol draft="contributed">₪</symbol>
<symbol alt="narrow" draft="contributed">ILS</symbol>
</currency>
<currency type="INR">
<displayName>Rupia indiane</displayName>
<displayName count="one">rupi indiane</displayName>
<displayName count="other">rupi indiane</displayName>
- <symbol draft="provisional">₹</symbol>
+ <symbol draft="contributed">₹</symbol>
<symbol alt="narrow" draft="contributed">INR</symbol>
</currency>
<currency type="IQD">
@@ -5251,7 +5254,7 @@
<displayName>Jeni japonez</displayName>
<displayName count="one">jen japonez</displayName>
<displayName count="other">jenë japonez</displayName>
- <symbol draft="provisional">JP¥</symbol>
+ <symbol draft="contributed">JP¥</symbol>
<symbol alt="narrow" draft="contributed">JPY</symbol>
</currency>
<currency type="KES">
@@ -5291,7 +5294,7 @@
<displayName>Uoni koreano-jugor</displayName>
<displayName count="one">uon koreano-jugor</displayName>
<displayName count="other">uonë koreano-jugor</displayName>
- <symbol draft="provisional">₩</symbol>
+ <symbol draft="contributed">₩</symbol>
<symbol alt="narrow" draft="contributed">KRW</symbol>
</currency>
<currency type="KWD">
@@ -5440,7 +5443,7 @@
<displayName>Pesoja meksikane</displayName>
<displayName count="one">peso meksikane</displayName>
<displayName count="other">peso meksikane</displayName>
- <symbol draft="provisional">MX$</symbol>
+ <symbol draft="contributed">MX$</symbol>
<symbol alt="narrow" draft="contributed">MXN</symbol>
</currency>
<currency type="MYR">
@@ -5495,7 +5498,7 @@
<displayName>Dollari i Zelandës së Re</displayName>
<displayName count="one">dollar i Zelandës së Re</displayName>
<displayName count="other">dollarë të Zelandës së Re</displayName>
- <symbol draft="provisional">NZ$</symbol>
+ <symbol draft="contributed">NZ$</symbol>
<symbol alt="narrow" draft="contributed">NZD</symbol>
</currency>
<currency type="OMR">
@@ -5732,7 +5735,7 @@
<displayName>Dollari tajvanez</displayName>
<displayName count="one">dollar tajvanez</displayName>
<displayName count="other">dollarë tajvanez</displayName>
- <symbol draft="provisional">NT$</symbol>
+ <symbol draft="contributed">NT$</symbol>
<symbol alt="narrow" draft="contributed">TWD</symbol>
</currency>
<currency type="TZS">
@@ -5758,7 +5761,7 @@
<displayName>Dollari amerikan</displayName>
<displayName count="one">dollar amerikan</displayName>
<displayName count="other">dollarë amerikan</displayName>
- <symbol draft="provisional">US$</symbol>
+ <symbol draft="contributed">US$</symbol>
<symbol alt="narrow" draft="contributed">USD</symbol>
</currency>
<currency type="UYU">
@@ -5790,7 +5793,7 @@
<displayName>Donga vietnameze</displayName>
<displayName count="one">dongë vietnameze</displayName>
<displayName count="other">donga vietnameze</displayName>
- <symbol draft="provisional">₫</symbol>
+ <symbol draft="contributed">₫</symbol>
<symbol alt="narrow" draft="contributed">VND</symbol>
</currency>
<currency type="VUV">
@@ -5809,13 +5812,13 @@
<displayName>Franga kamerunase</displayName>
<displayName count="one">frangë kamerunase</displayName>
<displayName count="other">franga kamerunase</displayName>
- <symbol draft="provisional">FCFA</symbol>
+ <symbol draft="contributed">FCFA</symbol>
</currency>
<currency type="XCD">
<displayName>Dollari i Karaibeve Lindore</displayName>
<displayName count="one">dollar i Karaibeve Lindore</displayName>
<displayName count="other">dollarë të Karaibeve Lindore</displayName>
- <symbol draft="provisional">EC$</symbol>
+ <symbol draft="contributed">EC$</symbol>
<symbol alt="narrow" draft="contributed">XCD</symbol>
</currency>
<currency type="XOF">
@@ -5828,7 +5831,7 @@
<displayName>Franga franceze e Polinezisë</displayName>
<displayName count="one">frangë franceze e Polinezisë</displayName>
<displayName count="other">franga franceze të Polinezisë</displayName>
- <symbol draft="provisional">CFPF</symbol>
+ <symbol draft="contributed">CFPF</symbol>
</currency>
<currency type="XXX">
<displayName>Valutë e panjohur</displayName>
@@ -5872,9 +5875,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>josto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ekza{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} në {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} katror</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} katror</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} katror</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} kub</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kub</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kub</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5883,7 +5956,7 @@
<unitPattern count="one">{0} g-forcë</unitPattern>
<unitPattern count="other">{0} g-forcë</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metra për sekondë në katror</displayName>
<unitPattern count="one">{0} metër për sekondë në katror</unitPattern>
<unitPattern count="other">{0} metra për sekondë në katror</unitPattern>
@@ -5983,7 +6056,7 @@
<unitPattern count="one">{0} milimol për litër</unitPattern>
<unitPattern count="other">{0} milimolë për litër</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>pjesë për milion</displayName>
<unitPattern count="one">{0} pjesë për milion</unitPattern>
<unitPattern count="other">{0} pjesë për milion</unitPattern>
@@ -6013,7 +6086,7 @@
<unitPattern count="one">{0} litër për kilometër</unitPattern>
<unitPattern count="other">{0} litra për kilometër</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litra për 100 kilometra</displayName>
<unitPattern count="one">{0} litër për 100 kilometra</unitPattern>
<unitPattern count="other">{0} litra për 100 kilometra</unitPattern>
@@ -6489,17 +6562,17 @@
<unitPattern count="one">{0} kalë-fuqi</unitPattern>
<unitPattern count="other">{0} kuaj-fuqi</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetra mërkuri</displayName>
<unitPattern count="one">{0} milimetër mërkuri</unitPattern>
<unitPattern count="other">{0} milimetra mërkuri</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>paund për inç në katror</displayName>
<unitPattern count="one">{0} paund për inç në katror</unitPattern>
<unitPattern count="other">{0} paund për inç në katror</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inç merkuri</displayName>
<unitPattern count="one">{0} inç merkuri</unitPattern>
<unitPattern count="other">{0} inç merkuri</unitPattern>
@@ -6520,9 +6593,9 @@
<unitPattern count="other">{0} atmosferë</unitPattern>
</unit>
<unit type="pressure-pascal">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName>↑↑↑</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="pressure-hectopascal">
<displayName>hektopaskal</displayName>
@@ -6579,7 +6652,7 @@
<unitPattern count="one">{0} Kelvin</unitPattern>
<unitPattern count="other">{0} Kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>paund-këmbë</displayName>
<unitPattern count="one">{0} paund-këmbë</unitPattern>
<unitPattern count="other">{0} paund-këmbë</unitPattern>
@@ -6733,9 +6806,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6744,7 +6887,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6844,7 +6987,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6874,7 +7017,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7350,17 +7493,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7440,7 +7583,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7594,9 +7737,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7645,7 +7858,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7773,17 +7986,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inç Hg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
diff --git a/common/main/sq_AL.xml b/common/main/sq_AL.xml
index 7c8343c..ca9fc69 100644
--- a/common/main/sq_AL.xml
+++ b/common/main/sq_AL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sq_MK.xml b/common/main/sq_MK.xml
index dc1a03f..3bb6f0f 100644
--- a/common/main/sq_MK.xml
+++ b/common/main/sq_MK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sq_XK.xml b/common/main/sq_XK.xml
index 51b364c..c1ea858 100644
--- a/common/main/sq_XK.xml
+++ b/common/main/sq_XK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr.xml b/common/main/sr.xml
index 1529731..096a1d3 100644
--- a/common/main/sr.xml
+++ b/common/main/sr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -81,7 +81,7 @@
<language type="cad">кадо</language>
<language type="car">карипски</language>
<language type="cch">атсам</language>
- <language type="ccp" draft="contributed">↑↑↑</language>
+ <language type="ccp">чакма</language>
<language type="ce">чеченски</language>
<language type="ceb">себуански</language>
<language type="cgg">чига</language>
@@ -151,6 +151,7 @@
<language type="eu">баскијски</language>
<language type="ewo">евондо</language>
<language type="fa">персијски</language>
+ <language type="fa_AF">дари</language>
<language type="fan">фанг</language>
<language type="fat">фанти</language>
<language type="ff">фула</language>
@@ -979,8 +980,8 @@
<territory type="VU">Вануату</territory>
<territory type="WF">Валис и Футуна</territory>
<territory type="WS">Самоа</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">Псеудоакценти</territory>
+ <territory type="XB">Псеудобиди</territory>
<territory type="XK">Косово</territory>
<territory type="YE">Јемен</territory>
<territory type="YT">Мајот</territory>
@@ -5213,7 +5214,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк Острво време</standard>
+ <generic draft="contributed">Норфолк Острво време</generic>
+ <standard draft="contributed">Норфолк Острво, стандардно време</standard>
+ <daylight draft="contributed">Норфолк Острво, летње време</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7733,9 +7736,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>центи{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мили{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>микро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>пико{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ато{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>јокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>хекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кило{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гига{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>екса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>јота{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадратни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">квадратни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">квадратна {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">квадратних {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кубни {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">кубна {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кубних {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7745,7 +7820,7 @@
<unitPattern count="few">{0} ге сила</unitPattern>
<unitPattern count="other">{0} ге сила</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри у секунди на квадрат</displayName>
<unitPattern count="one">{0} метар у секунди на квадрат</unitPattern>
<unitPattern count="few">{0} метра у секунди на квадрат</unitPattern>
@@ -7864,7 +7939,7 @@
<unitPattern count="few">{0} милимола по литри</unitPattern>
<unitPattern count="other">{0} милимола по литри</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>честица на милион</displayName>
<unitPattern count="one">{0} честица на милион</unitPattern>
<unitPattern count="few">{0} честице на милион</unitPattern>
@@ -7900,7 +7975,7 @@
<unitPattern count="few">{0} литра по километру</unitPattern>
<unitPattern count="other">{0} литара по километру</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} литар на 100 километара</unitPattern>
<unitPattern count="few">{0} литра на 100 километара</unitPattern>
@@ -8468,19 +8543,19 @@
<unitPattern count="few">{0} коњске снаге</unitPattern>
<unitPattern count="other">{0} коњских снага</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>милиметри живиног стуба</displayName>
<unitPattern count="one">{0} милиметар живиног стуба</unitPattern>
<unitPattern count="few">{0} милиметра живиног стуба</unitPattern>
<unitPattern count="other">{0} милиметара живиног стуба</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунте по квадратном инчу</displayName>
<unitPattern count="one">{0} фунта по квадратном инчу</unitPattern>
<unitPattern count="few">{0} фунте по квадратном инчу</unitPattern>
<unitPattern count="other">{0} фунти по квадратном инчу</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>инчи живиног стуба</displayName>
<unitPattern count="one">{0} инч живиног стуба</unitPattern>
<unitPattern count="few">{0} инча живиног стуба</unitPattern>
@@ -8576,7 +8651,7 @@
<unitPattern count="few">{0} келвина</unitPattern>
<unitPattern count="other">{0} келвина</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунта-фити</displayName>
<unitPattern count="one">{0} фунта-фит</unitPattern>
<unitPattern count="few">{0} фунта-фита</unitPattern>
@@ -8758,9 +8833,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8770,7 +8917,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -8889,7 +9036,7 @@
<unitPattern count="few">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -8925,7 +9072,7 @@
<unitPattern count="few">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="few">{0} L/100 km</unitPattern>
@@ -9493,19 +9640,19 @@
<unitPattern count="few">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -9601,7 +9748,7 @@
<unitPattern count="few">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="few">↑↑↑</unitPattern>
@@ -9783,9 +9930,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -9845,7 +10064,7 @@
<unitPattern count="few">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="few">{0} L/100km</unitPattern>
@@ -9991,7 +10210,7 @@
<unitPattern count="few" draft="contributed">{0} кс</unitPattern>
<unitPattern count="other" draft="contributed">{0} кс</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -10252,7 +10471,7 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">збијено</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
@@ -10262,8 +10481,8 @@
<styleName type="wdth" subtype="112.5" alt="extended">semiextended</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">semiwide</styleName>
<styleName type="wdth" subtype="125">expanded</styleName>
- <styleName type="wdth" subtype="125" alt="extended">extended</styleName>
- <styleName type="wdth" subtype="125" alt="wide">wide</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">продужено</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">широко</styleName>
<styleName type="wdth" subtype="150">extra-expanded</styleName>
<styleName type="wdth" subtype="150" alt="extended">extra-extended</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra-wide</styleName>
@@ -10283,10 +10502,10 @@
<styleName type="wght" subtype="700">bold</styleName>
<styleName type="wght" subtype="800">extra-bold</styleName>
<styleName type="wght" subtype="900">black</styleName>
- <styleName type="wght" subtype="900" alt="heavy">heavy</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">тешко</styleName>
<styleName type="wght" subtype="950">extra-black</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">ultrablack</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">ultraheavy</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">изузетно црно</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">изузетно тешко</styleName>
<featureName type="afrc">vertical fractions</featureName>
<featureName type="cpsp">capital spacing</featureName>
<featureName type="dlig">optional ligatures</featureName>
diff --git a/common/main/sr_Cyrl.xml b/common/main/sr_Cyrl.xml
index fef0c0b..31adb66 100644
--- a/common/main/sr_Cyrl.xml
+++ b/common/main/sr_Cyrl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Cyrl_BA.xml b/common/main/sr_Cyrl_BA.xml
index b218d0b..d1f6ce2 100644
--- a/common/main/sr_Cyrl_BA.xml
+++ b/common/main/sr_Cyrl_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Cyrl_ME.xml b/common/main/sr_Cyrl_ME.xml
index 45c4e7b..55d53cc 100644
--- a/common/main/sr_Cyrl_ME.xml
+++ b/common/main/sr_Cyrl_ME.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Cyrl_RS.xml b/common/main/sr_Cyrl_RS.xml
index be62dfa..0a82a9f 100644
--- a/common/main/sr_Cyrl_RS.xml
+++ b/common/main/sr_Cyrl_RS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Cyrl_XK.xml b/common/main/sr_Cyrl_XK.xml
index e805c22..a9e04b7 100644
--- a/common/main/sr_Cyrl_XK.xml
+++ b/common/main/sr_Cyrl_XK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Latn.xml b/common/main/sr_Latn.xml
index ad60acc..fe62d2a 100644
--- a/common/main/sr_Latn.xml
+++ b/common/main/sr_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -80,6 +80,7 @@
<language type="cad">kado</language>
<language type="car">karipski</language>
<language type="cch">atsam</language>
+ <language type="ccp">čakma</language>
<language type="ce">čečenski</language>
<language type="ceb">sebuanski</language>
<language type="cgg">čiga</language>
@@ -144,6 +145,7 @@
<language type="eu">baskijski</language>
<language type="ewo">evondo</language>
<language type="fa">persijski</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fula</language>
@@ -967,6 +969,8 @@
<territory type="VU">Vanuatu</territory>
<territory type="WF">Valis i Futuna</territory>
<territory type="WS">Samoa</territory>
+ <territory type="XA">Pseudoakcenti</territory>
+ <territory type="XB">Pseudobidi</territory>
<territory type="XK">Kosovo</territory>
<territory type="YE">Jemen</territory>
<territory type="YT">Majot</territory>
@@ -5087,7 +5091,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Ostrvo vreme</standard>
+ <generic draft="contributed">Norfolk Ostrvo vreme</generic>
+ <standard draft="contributed">Norfolk Ostrvo, standardno vreme</standard>
+ <daylight draft="contributed">Norfolk Ostrvo, letnje vreme</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7607,9 +7613,81 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ato{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>jokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zeta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>jota{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadratni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadratni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kvadratna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadratnih {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubni {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">kubna {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubnih {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7619,7 +7697,7 @@
<unitPattern count="few">{0} ge sila</unitPattern>
<unitPattern count="other">{0} ge sila</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metri u sekundi na kvadrat</displayName>
<unitPattern count="one">{0} metar u sekundi na kvadrat</unitPattern>
<unitPattern count="few">{0} metra u sekundi na kvadrat</unitPattern>
@@ -7738,7 +7816,7 @@
<unitPattern count="few">{0} milimola po litri</unitPattern>
<unitPattern count="other">{0} milimola po litri</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>čestica na milion</displayName>
<unitPattern count="one">{0} čestica na milion</unitPattern>
<unitPattern count="few">{0} čestice na milion</unitPattern>
@@ -7768,7 +7846,7 @@
<unitPattern count="few">{0} litra po kilometru</unitPattern>
<unitPattern count="other">{0} litara po kilometru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} litar na 100 kilometara</unitPattern>
<unitPattern count="few">{0} litra na 100 kilometara</unitPattern>
@@ -8285,19 +8363,19 @@
<unitPattern count="few">{0} konjske snage</unitPattern>
<unitPattern count="other">{0} konjskih snaga</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetri živinog stuba</displayName>
<unitPattern count="one">{0} milimetar živinog stuba</unitPattern>
<unitPattern count="few">{0} milimetra živinog stuba</unitPattern>
<unitPattern count="other">{0} milimetara živinog stuba</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funte po kvadratnom inču</displayName>
<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inči živinog stuba</displayName>
<unitPattern count="one">{0} inč živinog stuba</unitPattern>
<unitPattern count="few">{0} inča živinog stuba</unitPattern>
@@ -8393,7 +8471,7 @@
<unitPattern count="few">{0} kelvina</unitPattern>
<unitPattern count="other">{0} kelvina</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funta-fiti</displayName>
<unitPattern count="one">{0} funta-fit</unitPattern>
<unitPattern count="few">{0} funta-fita</unitPattern>
@@ -8578,6 +8656,11 @@
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8587,7 +8670,7 @@
<unitPattern count="few">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="few">{0} m/s²</unitPattern>
@@ -8706,7 +8789,7 @@
<unitPattern count="few">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -8730,7 +8813,7 @@
<unitPattern count="few">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="few">{0} L/100 km</unitPattern>
@@ -9239,19 +9322,19 @@
<unitPattern count="few">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="few">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="few">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="few">{0} inHg</unitPattern>
@@ -9496,6 +9579,10 @@
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">{0}²</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -9555,7 +9642,7 @@
<unitPattern count="few">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="few">{0} L/100km</unitPattern>
@@ -9701,7 +9788,7 @@
<unitPattern count="few" draft="contributed">{0} ks</unitPattern>
<unitPattern count="other" draft="contributed">{0} ks</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -9944,7 +10031,7 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">zbijeno</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
@@ -9954,8 +10041,8 @@
<styleName type="wdth" subtype="112.5" alt="extended">semiextended</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">semiwide</styleName>
<styleName type="wdth" subtype="125">expanded</styleName>
- <styleName type="wdth" subtype="125" alt="extended">extended</styleName>
- <styleName type="wdth" subtype="125" alt="wide">wide</styleName>
+ <styleName type="wdth" subtype="125" alt="extended">produženo</styleName>
+ <styleName type="wdth" subtype="125" alt="wide">široko</styleName>
<styleName type="wdth" subtype="150">extra-expanded</styleName>
<styleName type="wdth" subtype="150" alt="extended">extra-extended</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra-wide</styleName>
@@ -9975,10 +10062,10 @@
<styleName type="wght" subtype="700">bold</styleName>
<styleName type="wght" subtype="800">extra-bold</styleName>
<styleName type="wght" subtype="900">black</styleName>
- <styleName type="wght" subtype="900" alt="heavy">heavy</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">teško</styleName>
<styleName type="wght" subtype="950">extra-black</styleName>
- <styleName type="wght" subtype="950" alt="ultrablack">ultrablack</styleName>
- <styleName type="wght" subtype="950" alt="ultraheavy">ultraheavy</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack">izuzetno crno</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">izuzetno teško</styleName>
<featureName type="afrc">vertical fractions</featureName>
<featureName type="cpsp">capital spacing</featureName>
<featureName type="dlig">optional ligatures</featureName>
diff --git a/common/main/sr_Latn_BA.xml b/common/main/sr_Latn_BA.xml
index a29e3cb..08ab61b 100644
--- a/common/main/sr_Latn_BA.xml
+++ b/common/main/sr_Latn_BA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Latn_ME.xml b/common/main/sr_Latn_ME.xml
index 5dcdab2..91e5467 100644
--- a/common/main/sr_Latn_ME.xml
+++ b/common/main/sr_Latn_ME.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Latn_RS.xml b/common/main/sr_Latn_RS.xml
index 70cd942..205ae06 100644
--- a/common/main/sr_Latn_RS.xml
+++ b/common/main/sr_Latn_RS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sr_Latn_XK.xml b/common/main/sr_Latn_XK.xml
index 20efa6b..34fc423 100644
--- a/common/main/sr_Latn_XK.xml
+++ b/common/main/sr_Latn_XK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/su.xml b/common/main/su.xml
new file mode 100644
index 0000000..9ae126b
--- /dev/null
+++ b/common/main/su.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="su"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="de">Jérman</language>
+ <language type="de_AT">Jérman Austria</language>
+ <language type="de_CH">Jérman Swiss Luhur</language>
+ <language type="en">Inggris</language>
+ <language type="en_AU">Inggris Australia</language>
+ <language type="en_CA">Inggris Kanada</language>
+ <language type="en_GB">Inggris Inggris</language>
+ <language type="en_GB" alt="short">Inggris UK</language>
+ <language type="en_US">Inggris Amerika</language>
+ <language type="en_US" alt="short">Inggris AS</language>
+ <language type="es">Spanyol</language>
+ <language type="es_419">Spanyol Amérika Latin</language>
+ <language type="es_ES">Spanyol Éropa</language>
+ <language type="es_MX">Spanyol Méksiko</language>
+ <language type="fr">Prancis</language>
+ <language type="fr_CA">Prancis Kanada</language>
+ <language type="fr_CH">Prancis Swiss</language>
+ <language type="it">Italia</language>
+ <language type="ja">Jepang</language>
+ <language type="pt">Portugis</language>
+ <language type="pt_BR">Portugis Brasil</language>
+ <language type="pt_PT">Portugis Éropa</language>
+ <language type="ru">Rusia</language>
+ <language type="su">Basa Sunda</language>
+ <language type="und">Teu Dipikaterang</language>
+ <language type="zh">Tiongkok</language>
+ <language type="zh" alt="menu">Tiongkok, Mandarin</language>
+ <language type="zh_Hans">Tiongkok Sederhana</language>
+ <language type="zh_Hans" alt="long">Tiongkok Mandarin Sederhana</language>
+ <language type="zh_Hant">Tiongkok Tradisional</language>
+ <language type="zh_Hant" alt="long">Tiongkok Mandarin Tradisional</language>
+ </languages>
+ <scripts>
+ <script type="Arab">Basa Arab</script>
+ <script type="Cyrl">Sirilik</script>
+ <script type="Hans">Sederhana</script>
+ <script type="Hans" alt="stand-alone">Han Sederhana</script>
+ <script type="Hant">Tradisional</script>
+ <script type="Hant" alt="stand-alone">Han Tradisional</script>
+ <script type="Latn">Latin</script>
+ <script type="Zxxx">Non-tulisan</script>
+ <script type="Zzzz">Skrip Teu Dipikaterang</script>
+ </scripts>
+ <territories>
+ <territory type="BR">Brasil</territory>
+ <territory type="CN">Tiongkok</territory>
+ <territory type="DE">Jérman</territory>
+ <territory type="FR">Prancis</territory>
+ <territory type="GB">Inggris Raya</territory>
+ <territory type="IN">India</territory>
+ <territory type="IT">Italia</territory>
+ <territory type="JP">Jepang</territory>
+ <territory type="RU">Rusia</territory>
+ <territory type="US">Amérika Sarikat</territory>
+ <territory type="ZZ">Wilayah Teu Dipikaterang</territory>
+ </territories>
+ <types>
+ <type key="calendar" type="gregorian">Kalender Grégorian</type>
+ <type key="collation" type="standard">Aturan Runtuyan Standar</type>
+ <type key="numbers" type="latn">Digit Barat</type>
+ </types>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">Métrik</measurementSystemName>
+ <measurementSystemName type="UK">U.K.</measurementSystemName>
+ <measurementSystemName type="US">A.S.</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">Basa: {0}</codePattern>
+ <codePattern type="script">Skrip: {0}</codePattern>
+ <codePattern type="territory">Daérah: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[a b c d e é f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary" draft="contributed">[á à ă â å ä ã ā æ ç è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]</exemplarCharacters>
+ <exemplarCharacters type="index" draft="contributed">[A B C D E É F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="contributed">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters>
+ <ellipsis type="final">↑↑↑</ellipsis>
+ <ellipsis type="initial">↑↑↑</ellipsis>
+ <ellipsis type="medial">↑↑↑</ellipsis>
+ <ellipsis type="word-final">↑↑↑</ellipsis>
+ <ellipsis type="word-initial">↑↑↑</ellipsis>
+ <ellipsis type="word-medial">↑↑↑</ellipsis>
+ <moreInformation>↑↑↑</moreInformation>
+ <parseLenients scope="date" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample=":" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="general" level="lenient">
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="’" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="%" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="‰" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="$" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="£" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="¥" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₩" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="₹" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="lenient">
+ <parseLenient sample="-" draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="+" draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ <parseLenients scope="number" level="stricter">
+ <parseLenient sample="," draft="contributed">↑↑↑</parseLenient>
+ <parseLenient sample="." draft="contributed">↑↑↑</parseLenient>
+ </parseLenients>
+ </characters>
+ <delimiters>
+ <quotationStart>↑↑↑</quotationStart>
+ <quotationEnd>”</quotationEnd>
+ <alternateQuotationStart>↑↑↑</alternateQuotationStart>
+ <alternateQuotationEnd>↑↑↑</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'pukul' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'pukul' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern>{1}, {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern>{1}, {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">Jan</month>
+ <month type="2">Péb</month>
+ <month type="3">Mar</month>
+ <month type="4">Apr</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">Jun</month>
+ <month type="7">Jul</month>
+ <month type="8">Ags</month>
+ <month type="9">Sép</month>
+ <month type="10">Okt</month>
+ <month type="11">Nop</month>
+ <month type="12">Dés</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">J</month>
+ <month type="2">P</month>
+ <month type="3">M</month>
+ <month type="4">A</month>
+ <month type="5">M</month>
+ <month type="6">J</month>
+ <month type="7">J</month>
+ <month type="8">A</month>
+ <month type="9">S</month>
+ <month type="10">O</month>
+ <month type="11">N</month>
+ <month type="12">D</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Januari</month>
+ <month type="2">Pébruari</month>
+ <month type="3">Maret</month>
+ <month type="4">April</month>
+ <month type="5">Méi</month>
+ <month type="6">Juni</month>
+ <month type="7">Juli</month>
+ <month type="8">Agustus</month>
+ <month type="9">Séptémber</month>
+ <month type="10">Oktober</month>
+ <month type="11">Nopémber</month>
+ <month type="12">Désémber</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="abbreviated">
+ <month type="1">↑↑↑</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ <monthWidth type="narrow">
+ <month type="1">J</month>
+ <month type="2">P</month>
+ <month type="3">M</month>
+ <month type="4">A</month>
+ <month type="5">M</month>
+ <month type="6">J</month>
+ <month type="7">J</month>
+ <month type="8">A</month>
+ <month type="9">S</month>
+ <month type="10">O</month>
+ <month type="11">N</month>
+ <month type="12">D</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Januari</month>
+ <month type="2">↑↑↑</month>
+ <month type="3">↑↑↑</month>
+ <month type="4">↑↑↑</month>
+ <month type="5">↑↑↑</month>
+ <month type="6">↑↑↑</month>
+ <month type="7">↑↑↑</month>
+ <month type="8">↑↑↑</month>
+ <month type="9">↑↑↑</month>
+ <month type="10">↑↑↑</month>
+ <month type="11">↑↑↑</month>
+ <month type="12">↑↑↑</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">Mng</day>
+ <day type="mon">Sen</day>
+ <day type="tue">Sal</day>
+ <day type="wed">Reb</day>
+ <day type="thu">Kam</day>
+ <day type="fri">Jum</day>
+ <day type="sat">Sap</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">M</day>
+ <day type="mon">S</day>
+ <day type="tue">S</day>
+ <day type="wed">R</day>
+ <day type="thu">K</day>
+ <day type="fri">J</day>
+ <day type="sat">S</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">Minggu</day>
+ <day type="mon">Senén</day>
+ <day type="tue">Salasa</day>
+ <day type="wed">Rebo</day>
+ <day type="thu">Kamis</day>
+ <day type="fri">Jumaah</day>
+ <day type="sat">Saptu</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="abbreviated">
+ <day type="sun">Mng</day>
+ <day type="mon">Sen</day>
+ <day type="tue">Sal</day>
+ <day type="wed">Reb</day>
+ <day type="thu">Kam</day>
+ <day type="fri">Jum</day>
+ <day type="sat">Sap</day>
+ </dayWidth>
+ <dayWidth type="narrow">
+ <day type="sun">M</day>
+ <day type="mon">S</day>
+ <day type="tue">S</day>
+ <day type="wed">R</day>
+ <day type="thu">K</day>
+ <day type="fri">J</day>
+ <day type="sat">S</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">Minggu</day>
+ <day type="mon">Senén</day>
+ <day type="tue">Salasa</day>
+ <day type="wed">Rebo</day>
+ <day type="thu">Kamis</day>
+ <day type="fri">Jumaah</day>
+ <day type="sat">Saptu</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <quarters>
+ <quarterContext type="format">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">K1</quarter>
+ <quarter type="2">K2</quarter>
+ <quarter type="3">K3</quarter>
+ <quarter type="4">K4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">kuartal ka-1</quarter>
+ <quarter type="2">kuartal ka-2</quarter>
+ <quarter type="3">kuartal ka-3</quarter>
+ <quarter type="4">kuartal ka-4</quarter>
+ </quarterWidth>
+ </quarterContext>
+ <quarterContext type="stand-alone">
+ <quarterWidth type="abbreviated">
+ <quarter type="1">K1</quarter>
+ <quarter type="2">K2</quarter>
+ <quarter type="3">K3</quarter>
+ <quarter type="4">K4</quarter>
+ </quarterWidth>
+ <quarterWidth type="narrow">
+ <quarter type="1">↑↑↑</quarter>
+ <quarter type="2">↑↑↑</quarter>
+ <quarter type="3">↑↑↑</quarter>
+ <quarter type="4">↑↑↑</quarter>
+ </quarterWidth>
+ <quarterWidth type="wide">
+ <quarter type="1">kuartal ka-1</quarter>
+ <quarter type="2">kuartal ka-2</quarter>
+ <quarter type="3">kuartal ka-3</quarter>
+ <quarter type="4">kuartal-ka 4</quarter>
+ </quarterWidth>
+ </quarterContext>
+ </quarters>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="am">↑↑↑</dayPeriod>
+ <dayPeriod type="pm">↑↑↑</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">SM</era>
+ <era type="0" alt="variant">SM</era>
+ <era type="1">M</era>
+ <era type="1" alt="variant">M</era>
+ </eraAbbr>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>H.mm.ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>H.mm.ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>H.mm.ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>H.mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern>{1} 'pukul' {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern>{1} 'pukul' {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="Bh">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhm">h.mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h.mm.ss B</dateFormatItem>
+ <dateFormatItem id="d">↑↑↑</dateFormatItem>
+ <dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">E h.mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h.mm.ss B</dateFormatItem>
+ <dateFormatItem id="Ed">E d</dateFormatItem>
+ <dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+ <dateFormatItem id="EHm">E HH.mm</dateFormatItem>
+ <dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+ <dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="Gy">y G</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+ <dateFormatItem id="h">h a</dateFormatItem>
+ <dateFormatItem id="H">↑↑↑</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="hmsv">h.mm.ss a v</dateFormatItem>
+ <dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+ <dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+ <dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+ <dateFormatItem id="M">L</dateFormatItem>
+ <dateFormatItem id="Md">d/M</dateFormatItem>
+ <dateFormatItem id="MEd">E, d/M</dateFormatItem>
+ <dateFormatItem id="MMM">↑↑↑</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="ms">mm.ss</dateFormatItem>
+ <dateFormatItem id="y">↑↑↑</dateFormatItem>
+ <dateFormatItem id="yM">M/y</dateFormatItem>
+ <dateFormatItem id="yMd">d/M/y</dateFormatItem>
+ <dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+ <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="era">
+ <displayName>éra</displayName>
+ </field>
+ <field type="era-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="era-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="year">
+ <displayName>taun</displayName>
+ <relative type="-1">taun kamari</relative>
+ <relative type="0">taun ieu</relative>
+ <relative type="1">taun payun</relative>
+ </field>
+ <field type="year-short">
+ <displayName>tn.</displayName>
+ </field>
+ <field type="year-narrow">
+ <displayName>tn.</displayName>
+ </field>
+ <field type="quarter">
+ <displayName>triwulan</displayName>
+ </field>
+ <field type="quarter-short">
+ <displayName>tri.</displayName>
+ </field>
+ <field type="quarter-narrow">
+ <displayName>tri.</displayName>
+ </field>
+ <field type="month">
+ <displayName>sasih</displayName>
+ </field>
+ <field type="month-short">
+ <displayName>sa.</displayName>
+ </field>
+ <field type="month-narrow">
+ <displayName>sa.</displayName>
+ </field>
+ <field type="week">
+ <displayName>minggu</displayName>
+ </field>
+ <field type="week-short">
+ <displayName>mgg.</displayName>
+ </field>
+ <field type="week-narrow">
+ <displayName>mgg.</displayName>
+ </field>
+ <field type="day">
+ <displayName>dinten</displayName>
+ <relative type="-1">kamari</relative>
+ <relative type="0">dinten ieu</relative>
+ <relative type="1">énjing</relative>
+ </field>
+ <field type="day-short">
+ <displayName>dinten</displayName>
+ <relative type="-1">kamari</relative>
+ <relative type="0">dinten ieu</relative>
+ <relative type="1">énjing</relative>
+ </field>
+ <field type="day-narrow">
+ <displayName>dinten</displayName>
+ <relative type="-1">kamari</relative>
+ <relative type="0">dinten ieu</relative>
+ <relative type="1">énjing</relative>
+ </field>
+ <field type="weekday">
+ <displayName>dinten dina saminggu</displayName>
+ </field>
+ <field type="dayperiod">
+ <displayName>AM/PM</displayName>
+ </field>
+ <field type="hour">
+ <displayName>jam</displayName>
+ </field>
+ <field type="hour-short">
+ <displayName>j.</displayName>
+ </field>
+ <field type="hour-narrow">
+ <displayName>j.</displayName>
+ </field>
+ <field type="minute">
+ <displayName>menit</displayName>
+ </field>
+ <field type="minute-short">
+ <displayName>mnt.</displayName>
+ </field>
+ <field type="minute-narrow">
+ <displayName>mnt.</displayName>
+ </field>
+ <field type="second">
+ <displayName>detik</displayName>
+ </field>
+ <field type="second-short">
+ <displayName>dtk.</displayName>
+ </field>
+ <field type="second-narrow">
+ <displayName>dtk.</displayName>
+ </field>
+ <field type="zone">
+ <displayName>zona waktu</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>↑↑↑</hourFormat>
+ <gmtFormat>↑↑↑</gmtFormat>
+ <gmtZeroFormat>↑↑↑</gmtZeroFormat>
+ <regionFormat>↑↑↑</regionFormat>
+ <regionFormat type="daylight">↑↑↑</regionFormat>
+ <regionFormat type="standard">↑↑↑</regionFormat>
+ <fallbackFormat>{1} ({0})</fallbackFormat>
+ <zone type="Etc/UTC">
+ <long>
+ <standard>Waktu Universal Terkoordinasi</standard>
+ </long>
+ </zone>
+ <zone type="Etc/Unknown">
+ <exemplarCity>Kota Teu Dikenal</exemplarCity>
+ </zone>
+ <zone type="Asia/Macau">
+ <exemplarCity draft="unconfirmed">Makau</exemplarCity>
+ </zone>
+ <metazone type="America_Central">
+ <long>
+ <generic>Waktu Tengah</generic>
+ <standard>Waktu Standar Tengah</standard>
+ <daylight>Waktu Usum Panas Tengah</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Eastern">
+ <long>
+ <generic>Waktu Wétan</generic>
+ <standard>Waktu Standar Wétan</standard>
+ <daylight>Waktu Usum Panas Wétan</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Mountain">
+ <long>
+ <generic>Waktu Pagunungan</generic>
+ <standard>Waktu Standar Pagunungan</standard>
+ <daylight>Waktu Usum Panas Pagunungan</daylight>
+ </long>
+ </metazone>
+ <metazone type="America_Pacific">
+ <long>
+ <generic>Waktu Pasifik</generic>
+ <standard>Waktu Standar Pasifik</standard>
+ <daylight>Waktu Usum Panas Pasifik</daylight>
+ </long>
+ </metazone>
+ <metazone type="Atlantic">
+ <long>
+ <generic>Waktu Atlantik</generic>
+ <standard>Waktu Standar Atlantik</standard>
+ <daylight>Waktu Usum Panas Atlantik</daylight>
+ </long>
+ </metazone>
+ <metazone type="Colombia">
+ <long>
+ <generic>Waktu Kolombia</generic>
+ <standard>Waktu Standar Kolombia</standard>
+ <daylight>Waktu Usum Panas Kolombia</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Central">
+ <long>
+ <generic>Waktu Éropa Tengah</generic>
+ <standard>Waktu Standar Éropa Tengah</standard>
+ <daylight>Waktu Usum Panas Éropa Tengah</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Eastern">
+ <long>
+ <generic>Waktu Éropa Timur</generic>
+ <standard>Waktu Standar Éropa Timur</standard>
+ <daylight>Waktu Usum Panas Éropa Timur</daylight>
+ </long>
+ </metazone>
+ <metazone type="Europe_Western">
+ <long>
+ <generic>Waktu Éropa Barat</generic>
+ <standard>Waktu Standar Éropa Barat</standard>
+ <daylight>Waktu Usum Panas Éropa Barat</daylight>
+ </long>
+ </metazone>
+ <metazone type="Galapagos">
+ <long>
+ <standard>Waktu Galapagos</standard>
+ </long>
+ </metazone>
+ <metazone type="GMT">
+ <long>
+ <standard>Waktu Greenwich</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem draft="contributed">↑↑↑</defaultNumberingSystem>
+ <otherNumberingSystems>
+ <native draft="contributed">↑↑↑</native>
+ </otherNumberingSystems>
+ <symbols numberSystem="latn">
+ <decimal>,</decimal>
+ <group>.</group>
+ <percentSign>↑↑↑</percentSign>
+ <plusSign>+</plusSign>
+ <minusSign>↑↑↑</minusSign>
+ <timeSeparator draft="contributed">.</timeSeparator>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>#,##0.###</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>↑↑↑</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>↑↑↑</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>↑↑↑</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="other">{0} {1}</unitPattern>
+ </currencyFormats>
+ <currencies>
+ <currency type="BRL">
+ <displayName>Real Brasil</displayName>
+ <displayName count="other">real Brasil</displayName>
+ <symbol draft="contributed">R$</symbol>
+ <symbol alt="narrow" draft="contributed">R$</symbol>
+ </currency>
+ <currency type="CNY">
+ <displayName>Yuan Tiongkok</displayName>
+ <displayName count="other">yuan Tiongkok</displayName>
+ <symbol draft="contributed">CN¥</symbol>
+ <symbol alt="narrow" draft="contributed">¥</symbol>
+ </currency>
+ <currency type="EUR">
+ <displayName>Euro</displayName>
+ <displayName count="other">euro</displayName>
+ <symbol draft="contributed">€</symbol>
+ <symbol alt="narrow" draft="contributed">€</symbol>
+ </currency>
+ <currency type="GBP">
+ <displayName>Pound Inggris</displayName>
+ <displayName count="other">pound Inggris</displayName>
+ <symbol draft="contributed">£</symbol>
+ <symbol alt="narrow" draft="contributed">£</symbol>
+ </currency>
+ <currency type="IDR">
+ <displayName>Rupee Indonésia</displayName>
+ <displayName count="other">rupee Indonésia</displayName>
+ <symbol>Rp</symbol>
+ <symbol alt="narrow" draft="contributed">Rp</symbol>
+ </currency>
+ <currency type="INR">
+ <displayName>Rupee India</displayName>
+ <displayName count="other">rupee India</displayName>
+ <symbol draft="contributed">₹</symbol>
+ <symbol alt="narrow" draft="contributed">₹</symbol>
+ </currency>
+ <currency type="JPY">
+ <displayName>Yén Jepang</displayName>
+ <displayName count="other">yén Jepang</displayName>
+ <symbol draft="contributed">¥</symbol>
+ <symbol alt="narrow" draft="contributed">¥</symbol>
+ </currency>
+ <currency type="RUB">
+ <displayName>Rubel Rusia</displayName>
+ <displayName count="other">rubel Rusia</displayName>
+ <symbol draft="contributed">RUB</symbol>
+ <symbol alt="narrow" draft="contributed">₽</symbol>
+ </currency>
+ <currency type="USD">
+ <displayName>Dolar A.S.</displayName>
+ <displayName count="other">dolar A.S.</displayName>
+ <symbol draft="contributed">$</symbol>
+ <symbol alt="narrow" draft="contributed">$</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <durationUnit type="hm">
+ <durationUnitPattern>h.mm</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="hms">
+ <durationUnitPattern>h.mm.ss</durationUnitPattern>
+ </durationUnit>
+ <durationUnit type="ms">
+ <durationUnitPattern>m.ss</durationUnitPattern>
+ </durationUnit>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0}, sareng {1}</listPatternPart>
+ <listPatternPart type="2">{0} sareng {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="standard-short">
+ <listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+ <listPatternPart type="2" draft="unconfirmed">{0} & {1}</listPatternPart>
+ </listPattern>
+ </listPatterns>
+ <posix>
+ <messages>
+ <yesstr>enya:e</yesstr>
+ <nostr>teu:t</nostr>
+ </messages>
+ </posix>
+</ldml>
diff --git a/seed/main/su_Latn.xml b/common/main/su_Latn.xml
similarity index 91%
rename from seed/main/su_Latn.xml
rename to common/main/su_Latn.xml
index bf608e7..5ba88e4 100644
--- a/seed/main/su_Latn.xml
+++ b/common/main/su_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/su_Latn_ID.xml b/common/main/su_Latn_ID.xml
similarity index 92%
rename from seed/main/su_Latn_ID.xml
rename to common/main/su_Latn_ID.xml
index 34f9f35..5e852b0 100644
--- a/seed/main/su_Latn_ID.xml
+++ b/common/main/su_Latn_ID.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sv.xml b/common/main/sv.xml
index c71b39d..de61ac8 100644
--- a/common/main/sv.xml
+++ b/common/main/sv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,6 +49,7 @@
<language type="arp">arapaho</language>
<language type="arq">algerisk arabiska</language>
<language type="ars">najdiarabiska</language>
+ <language type="ars" alt="menu">arabiska (najd)</language>
<language type="arw">arawakiska</language>
<language type="ary">marockansk arabiska</language>
<language type="arz">egyptisk arabiska</language>
@@ -122,6 +123,7 @@
<language type="chr">cherokesiska</language>
<language type="chy">cheyenne</language>
<language type="ckb">soranisk kurdiska</language>
+ <language type="ckb" alt="menu">kurdiska (sorani)</language>
<language type="co">korsikanska</language>
<language type="cop">koptiska</language>
<language type="cps">kapisnon</language>
@@ -182,6 +184,7 @@
<language type="ewo">ewondo</language>
<language type="ext">extremaduriska</language>
<language type="fa">persiska</language>
+ <language type="fa_AF">dari</language>
<language type="fan">fang</language>
<language type="fat">fanti</language>
<language type="ff">fulani</language>
@@ -652,6 +655,7 @@
<script type="Aghb">kaukasiska albanska</script>
<script type="Ahom">ahom</script>
<script type="Arab">arabiska</script>
+ <script type="Aran" draft="contributed">nastaliq</script>
<script type="Armi">imperisk arameiska</script>
<script type="Armn">armeniska</script>
<script type="Avst">avestiska</script>
@@ -782,7 +786,7 @@
<script type="Phnx">feniciska</script>
<script type="Plrd">pollardtecken</script>
<script type="Prti">tidig parthianska</script>
- <script type="Qaag" draft="provisional">Zawgyi</script>
+ <script type="Qaag" draft="contributed">zawgyi</script>
<script type="Rjng">rejang</script>
<script type="Rohg">hanifiska</script>
<script type="Roro">rongo-rongo</script>
@@ -1875,7 +1879,7 @@
</intervalFormatItem>
<intervalFormatItem id="Gy">
<greatestDifference id="G">↑↑↑</greatestDifference>
- <greatestDifference id="y" draft="provisional">y – y G</greatestDifference>
+ <greatestDifference id="y" draft="contributed">y – y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">↑↑↑</greatestDifference>
@@ -1889,10 +1893,10 @@
<greatestDifference id="y">↑↑↑</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
- <greatestDifference id="d" draft="provisional">y-MM-dd, E – y-MM-dd, E GGGGG</greatestDifference>
- <greatestDifference id="G" draft="provisional">y-MM-dd, E GGGG – y-MM-dd, E GGGG</greatestDifference>
- <greatestDifference id="M" draft="provisional">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
- <greatestDifference id="y" draft="provisional">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+ <greatestDifference id="d" draft="contributed">y-MM-dd, E – y-MM-dd, E GGGGG</greatestDifference>
+ <greatestDifference id="G" draft="contributed">y-MM-dd, E GGGG – y-MM-dd, E GGGG</greatestDifference>
+ <greatestDifference id="M" draft="contributed">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+ <greatestDifference id="y" draft="contributed">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -1906,10 +1910,10 @@
<greatestDifference id="y">d MMM y G – d MMM d y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMEd">
- <greatestDifference id="d" draft="provisional">E d MMM – E d MMM y G</greatestDifference>
- <greatestDifference id="G" draft="provisional">E d MMM y G – E d MMM y G</greatestDifference>
- <greatestDifference id="M" draft="provisional">E d MMM – E d MMM y G</greatestDifference>
- <greatestDifference id="y" draft="provisional">E d MMM y – E d MMM y G</greatestDifference>
+ <greatestDifference id="d" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
+ <greatestDifference id="G" draft="contributed">E d MMM y G – E d MMM y G</greatestDifference>
+ <greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
+ <greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
@@ -5859,7 +5863,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolköns tid</standard>
+ <generic draft="contributed">Norfolköns tid</generic>
+ <standard draft="contributed">Norfolköns, normaltid</standard>
+ <daylight draft="contributed">Norfolköns, sommartid</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6188,6 +6194,18 @@
<timeSeparator draft="contributed">:</timeSeparator>
<timeSeparator alt="variant" draft="contributed">.</timeSeparator>
</symbols>
+ <symbols numberSystem="nkoo">
+ <decimal draft="contributed">↑↑↑</decimal>
+ <plusSign draft="contributed">↑↑↑</plusSign>
+ </symbols>
+ <symbols numberSystem="olck">
+ <timeSeparator draft="contributed">↑↑↑</timeSeparator>
+ <timeSeparator alt="variant" draft="contributed">↑↑↑</timeSeparator>
+ </symbols>
+ <symbols numberSystem="thai">
+ <percentSign draft="contributed">↑↑↑</percentSign>
+ <perMille draft="contributed">↑↑↑</perMille>
+ </symbols>
<decimalFormats numberSystem="latn">
<decimalFormatLength>
<decimalFormat>
@@ -6715,7 +6733,7 @@
<currency type="CNH">
<displayName>kinesisk yuan (offshore)</displayName>
<displayName count="one">kinesisk yuan (offshore)</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNX">
@@ -7950,9 +7968,9 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="UYW">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="one" draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
+ <displayName>uruguayansk indexenhet för nominell lön</displayName>
+ <displayName count="one">uruguayansk indexenhet för nominell lön</displayName>
+ <displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
@@ -8240,9 +8258,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kvadrat{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kvadrat{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kubik{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kubik{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
</compoundUnit>
@@ -8251,7 +8339,7 @@
<unitPattern count="one">{0} gånger jordens gravitation</unitPattern>
<unitPattern count="other">{0} gånger jordens gravitation</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>meter per kvadratsekund</displayName>
<unitPattern count="one">{0} meter per kvadratsekund</unitPattern>
<unitPattern count="other">{0} meter per kvadratsekund</unitPattern>
@@ -8351,7 +8439,7 @@
<unitPattern count="one">{0} millimol per liter</unitPattern>
<unitPattern count="other">{0} millimol per liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>miljondelar</displayName>
<unitPattern count="one">{0} miljondel</unitPattern>
<unitPattern count="other">{0} miljondelar</unitPattern>
@@ -8381,7 +8469,7 @@
<unitPattern count="one">{0} liter per kilometer</unitPattern>
<unitPattern count="other">{0} liter per kilometer</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>liter per 100 kilometer</displayName>
<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
@@ -8872,17 +8960,17 @@
<unitPattern count="one">{0} hästkraft</unitPattern>
<unitPattern count="other">{0} hästkrafter</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimeter kvicksilver</displayName>
<unitPattern count="one">{0} millimeter kvicksilver</unitPattern>
<unitPattern count="other">{0} millimeter kvicksilver</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pund per kvadrattum</displayName>
<unitPattern count="one">{0} pund per kvadrattum</unitPattern>
<unitPattern count="other">{0} pund per kvadrattum</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tum kvicksilver</displayName>
<unitPattern count="one">{0} tum kvicksilver</unitPattern>
<unitPattern count="other">{0} tum kvicksilver</unitPattern>
@@ -8962,9 +9050,9 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">pound-feet</displayName>
- <unitPattern count="one" draft="contributed">{0} pound-foot</unitPattern>
+ <unitPattern count="one" draft="contributed">{0} pound-force-foot</unitPattern>
<unitPattern count="other" draft="contributed">{0} pound-feet</unitPattern>
</unit>
<unit type="torque-newton-meter">
@@ -9121,9 +9209,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9132,7 +9290,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -9232,7 +9390,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>miljondelar</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -9262,7 +9420,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -9753,17 +9911,17 @@
<unitPattern count="one">{0} hk</unitPattern>
<unitPattern count="other">{0} hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tum Hg</displayName>
<unitPattern count="one">{0} tum Hg</unitPattern>
<unitPattern count="other">{0} tum Hg</unitPattern>
@@ -9843,7 +10001,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -10002,9 +10160,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10013,7 +10241,7 @@
<unitPattern count="one" draft="contributed">{0}G</unitPattern>
<unitPattern count="other" draft="contributed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/s²</displayName>
<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
@@ -10108,7 +10336,7 @@
<unitPattern count="one" draft="contributed">{0}mmol/L</unitPattern>
<unitPattern count="other" draft="contributed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">miljondelar</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="other" draft="contributed">{0} ppm</unitPattern>
@@ -10138,7 +10366,7 @@
<unitPattern count="one" draft="contributed">{0}L/km</unitPattern>
<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -10227,7 +10455,7 @@
<displayName>m</displayName>
<unitPattern count="one">{0}m</unitPattern>
<unitPattern count="other">{0}m</unitPattern>
- <perUnitPattern draft="provisional">{0}/m</perUnitPattern>
+ <perUnitPattern draft="contributed">{0}/m</perUnitPattern>
</unit>
<unit type="duration-second">
<displayName>sek</displayName>
@@ -10589,17 +10817,17 @@
<unitPattern count="one" draft="contributed">{0}hk</unitPattern>
<unitPattern count="other" draft="contributed">{0}hk</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0}mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0}mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">s:d/tum²</displayName>
<unitPattern count="one" draft="contributed">{0}s:d/tum²</unitPattern>
<unitPattern count="other" draft="contributed">{0}s:d/tum²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>tum Hg</displayName>
<unitPattern count="one">{0} tum Hg</unitPattern>
<unitPattern count="other">{0} tum Hg</unitPattern>
@@ -11018,24 +11246,33 @@
<styleName type="slnt" subtype="12">lutande</styleName>
<styleName type="slnt" subtype="24">extralutande</styleName>
<styleName type="wdth" subtype="50">ultrakondenserad</styleName>
+ <styleName type="wdth" subtype="50" alt="compressed" draft="contributed">ultrakomprimerat</styleName>
<styleName type="wdth" subtype="50" alt="narrow">ultrasmal</styleName>
<styleName type="wdth" subtype="62.5">extrakondenserad</styleName>
+ <styleName type="wdth" subtype="62.5" alt="compressed" draft="contributed">extra komprimerat</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extrasmal</styleName>
<styleName type="wdth" subtype="75">kondenserad</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">komprimerat</styleName>
<styleName type="wdth" subtype="75" alt="narrow">smal</styleName>
<styleName type="wdth" subtype="87.5">halvkondenserad</styleName>
+ <styleName type="wdth" subtype="87.5" alt="compressed" draft="contributed">semikomprimerat</styleName>
<styleName type="wdth" subtype="87.5" alt="narrow">halvsmal</styleName>
<styleName type="wdth" subtype="100">normalbredd</styleName>
<styleName type="wdth" subtype="112.5">halvexpanderad</styleName>
+ <styleName type="wdth" subtype="112.5" alt="extended" draft="contributed">semiutsträckt</styleName>
<styleName type="wdth" subtype="112.5" alt="wide">halvbred</styleName>
<styleName type="wdth" subtype="125">expanderad</styleName>
+ <styleName type="wdth" subtype="125" alt="extended" draft="contributed">utsträckt</styleName>
<styleName type="wdth" subtype="125" alt="wide">bred</styleName>
<styleName type="wdth" subtype="150">extraexpanderad</styleName>
+ <styleName type="wdth" subtype="150" alt="extended" draft="contributed">extra utsträckt</styleName>
<styleName type="wdth" subtype="150" alt="wide">extra bred</styleName>
<styleName type="wdth" subtype="200">ultraexpanderad</styleName>
+ <styleName type="wdth" subtype="200" alt="extended" draft="contributed">ultrautsträckt</styleName>
<styleName type="wdth" subtype="200" alt="wide">ultrabred</styleName>
<styleName type="wght" subtype="100">ultramager</styleName>
<styleName type="wght" subtype="200">extramager</styleName>
+ <styleName type="wght" subtype="200" alt="ultra" draft="contributed">ultratunn</styleName>
<styleName type="wght" subtype="300">mager</styleName>
<styleName type="wght" subtype="350">halvmager</styleName>
<styleName type="wght" subtype="380">kvartsmager</styleName>
@@ -11045,8 +11282,11 @@
<styleName type="wght" subtype="600" alt="demi">halvfet</styleName>
<styleName type="wght" subtype="700">fet</styleName>
<styleName type="wght" subtype="800">extrafet</styleName>
- <styleName type="wght" subtype="900">ultrafet</styleName>
+ <styleName type="wght" subtype="900">tjock</styleName>
+ <styleName type="wght" subtype="900" alt="heavy">tjock</styleName>
<styleName type="wght" subtype="950">hyperfet</styleName>
+ <styleName type="wght" subtype="950" alt="ultrablack" draft="contributed">ultrasvart</styleName>
+ <styleName type="wght" subtype="950" alt="ultraheavy">ultrafet</styleName>
<featureName type="afrc">vertikala bråk</featureName>
<featureName type="cpsp">versalavstånd</featureName>
<featureName type="dlig">valfria ligaturer</featureName>
diff --git a/common/main/sv_AX.xml b/common/main/sv_AX.xml
index a29ef1d..4b0c015 100644
--- a/common/main/sv_AX.xml
+++ b/common/main/sv_AX.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sv_FI.xml b/common/main/sv_FI.xml
index 25f1a1d..b6a9721 100644
--- a/common/main/sv_FI.xml
+++ b/common/main/sv_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sv_SE.xml b/common/main/sv_SE.xml
index a6c19f3..ce6f754 100644
--- a/common/main/sv_SE.xml
+++ b/common/main/sv_SE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sw.xml b/common/main/sw.xml
index 8754e49..8e4e403 100644
--- a/common/main/sw.xml
+++ b/common/main/sw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -134,6 +134,7 @@
<language type="eu">Kibaski</language>
<language type="ewo">Kiewondo</language>
<language type="fa">Kiajemi</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="ff">Kifulani</language>
<language type="fi">Kifini</language>
<language type="fil">Kifilipino</language>
@@ -477,7 +478,7 @@
<script type="Grek">Kigiriki</script>
<script type="Gujr">Kigujarati</script>
<script type="Guru">Kigurmukhi</script>
- <script type="Hanb">Hanb</script>
+ <script type="Hanb">Kihan chenye Bopomofo</script>
<script type="Hang">Kihangul</script>
<script type="Hani">Kihan</script>
<script type="Hans">Rahisi</script>
@@ -622,7 +623,7 @@
<territory type="ES">Uhispania</territory>
<territory type="ET">Ethiopia</territory>
<territory type="EU">Umoja wa Ulaya</territory>
- <territory type="EZ">EZ</territory>
+ <territory type="EZ">Jumuiya ya Ulaya</territory>
<territory type="FI">Ufini</territory>
<territory type="FJ">Fiji</territory>
<territory type="FK">Visiwa vya Falkland</territory>
@@ -3144,6 +3145,9 @@
<zone type="Asia/Aqtobe">
<exemplarCity>Aqtobe</exemplarCity>
</zone>
+ <zone type="Asia/Qostanay">
+ <exemplarCity>Kostanay</exemplarCity>
+ </zone>
<zone type="Asia/Qyzylorda">
<exemplarCity>Qyzylorda</exemplarCity>
</zone>
@@ -4394,7 +4398,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Saa za Kisiwa cha Norfolk</standard>
+ <generic draft="contributed">Saa za Kisiwa cha Norfolk</generic>
+ <standard draft="contributed">Saa za Wastani za Kisiwa cha Norfolk</standard>
+ <daylight draft="contributed">Saa za Majira ya joto za Kisiwa cha Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5043,7 +5049,7 @@
<symbol draft="contributed">CVE</symbol>
</currency>
<currency type="CZK">
- <displayName>CZK</displayName>
+ <displayName>koruna ya Jamhuri ya Czech</displayName>
<displayName count="one">koruna ya Jamhuri ya Czech</displayName>
<displayName count="other">koruna za Jamhuri ya Czech</displayName>
<symbol draft="contributed">CZK</symbol>
@@ -5906,9 +5912,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} kwa kila {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} mraba</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} mraba</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} mraba</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} mchemraba</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} mchemraba</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} mchemraba</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5917,7 +5993,7 @@
<unitPattern count="one">mvuto wa graviti {0}</unitPattern>
<unitPattern count="other">mvuto wa graviti {0}</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mita kwa kila sekunde mraba</displayName>
<unitPattern count="one">mita {0} kwa kila sekunde mraba</unitPattern>
<unitPattern count="other">mita {0} kwa kila sekunde mraba</unitPattern>
@@ -6017,7 +6093,7 @@
<unitPattern count="one">milimoli {0} kwa kila lita</unitPattern>
<unitPattern count="other">milimoli {0} kwa kila lita</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">ppm {0}</unitPattern>
<unitPattern count="other">ppm {0}</unitPattern>
@@ -6047,7 +6123,7 @@
<unitPattern count="one">lita {0} kwa kilomita</unitPattern>
<unitPattern count="other">lita {0} kwa kilomita</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lita kwa kilomita 100</displayName>
<unitPattern count="one">lita {0} kwa kilomita 100</unitPattern>
<unitPattern count="other">lita {0} kwa kilomita 100</unitPattern>
@@ -6523,17 +6599,17 @@
<unitPattern count="one">kipimo cha hospawa {0}</unitPattern>
<unitPattern count="other">kipimo cha hospawa {0}</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimita za zebaki</displayName>
<unitPattern count="one">milimita {0} ya zebaki</unitPattern>
<unitPattern count="other">milimita {0} za zebaki</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pauni kwa kila inchi mraba</displayName>
<unitPattern count="one">pauni {0} kwa kila inchi mraba</unitPattern>
<unitPattern count="other">pauni {0} kwa kila inchi mraba</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inchi za zebaki</displayName>
<unitPattern count="one">inchi {0} ya zebaki</unitPattern>
<unitPattern count="other">inchi {0} za zebaki</unitPattern>
@@ -6613,7 +6689,7 @@
<unitPattern count="one">kelvini {0}</unitPattern>
<unitPattern count="other">kelvini {0}</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>paunifuti</displayName>
<unitPattern count="one">paunifuti {0}</unitPattern>
<unitPattern count="other">paunifuti {0}</unitPattern>
@@ -6767,9 +6843,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6778,7 +6924,7 @@
<unitPattern count="one">G {0}</unitPattern>
<unitPattern count="other">G {0}</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mita kwa kila sekunde mraba</displayName>
<unitPattern count="one">m {0}/s²</unitPattern>
<unitPattern count="other">m {0}/s²</unitPattern>
@@ -6878,7 +7024,7 @@
<unitPattern count="one">mmol {0}/lita</unitPattern>
<unitPattern count="other">mmol {0}/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">ppm {0}</unitPattern>
<unitPattern count="other">ppm {0}</unitPattern>
@@ -6908,7 +7054,7 @@
<unitPattern count="one">lita {0} kwa kilomita</unitPattern>
<unitPattern count="other">lita {0} kwa kilomita</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lita kwa kilomita 100</displayName>
<unitPattern count="one">lita {0} kwa kilomita 100</unitPattern>
<unitPattern count="other">lita {0}/km100</unitPattern>
@@ -7384,17 +7530,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimita za zebaki</displayName>
<unitPattern count="one">milimita {0} ya zebaki</unitPattern>
<unitPattern count="other">mm Hg {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pauni kwa kila inchi mraba</displayName>
<unitPattern count="one">psi {0}</unitPattern>
<unitPattern count="other">psi {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inchi za zebaki</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7474,7 +7620,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7628,9 +7774,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>senti{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7679,7 +7895,7 @@
<unitPattern count="one">asilimia {0}</unitPattern>
<unitPattern count="other">asilimia {0}</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lita kwa kilomita 100</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -7803,7 +8019,7 @@
<unitPattern count="one">hp {0}</unitPattern>
<unitPattern count="other">hp {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/sw_CD.xml b/common/main/sw_CD.xml
index 6d29e69..2a20a92 100644
--- a/common/main/sw_CD.xml
+++ b/common/main/sw_CD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -30,7 +30,6 @@
<language type="ky">Kikirigizi</language>
<language type="lam">Kilamba</language>
<language type="li">Kilimburgi</language>
- <language type="mak">mak</language>
<language type="mdf">Kimoksha</language>
<language type="mic">Kimikmaki</language>
<language type="mk">Kimasedonia</language>
diff --git a/common/main/sw_KE.xml b/common/main/sw_KE.xml
index 3620905..4d90226 100644
--- a/common/main/sw_KE.xml
+++ b/common/main/sw_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5754,7 +5754,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -5854,7 +5854,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -5884,7 +5884,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6360,17 +6360,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6450,7 +6450,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6615,7 +6615,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6715,7 +6715,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -6745,7 +6745,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7221,17 +7221,17 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">mm Hg {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="one">inHg {0}</unitPattern>
<unitPattern count="other">inHg {0}</unitPattern>
@@ -7311,7 +7311,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7476,7 +7476,7 @@
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
diff --git a/common/main/sw_TZ.xml b/common/main/sw_TZ.xml
index aed97bb..3f4c564 100644
--- a/common/main/sw_TZ.xml
+++ b/common/main/sw_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/sw_UG.xml b/common/main/sw_UG.xml
index 869a939..cfbd614 100644
--- a/common/main/sw_UG.xml
+++ b/common/main/sw_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ta.xml b/common/main/ta.xml
index c763cd8..f2d69ef 100644
--- a/common/main/ta.xml
+++ b/common/main/ta.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -154,6 +154,7 @@
<language type="eu">பாஸ்க்</language>
<language type="ewo">எவோன்டோ</language>
<language type="fa">பெர்ஷியன்</language>
+ <language type="fa_AF">தாரி</language>
<language type="fan">ஃபேங்க்</language>
<language type="fat">ஃபான்டி</language>
<language type="ff">ஃபுலா</language>
@@ -5263,7 +5264,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>நார்ஃபோக் தீவு நேரம்</standard>
+ <generic draft="contributed">நார்ஃபோக் தீவு நேரம்</generic>
+ <standard draft="contributed">நார்ஃபோக் தீவு நிலையான நேரம்</standard>
+ <daylight draft="contributed">நார்ஃபோக் தீவு கோடை நேரம்</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6809,9 +6812,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>டெசி{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>சென்டி{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>மில்லி{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>மைக்ரோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>நானோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>பிக்கோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>பெம்டோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>அட்டோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ஜெப்டோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>யொக்டோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>டெக்கா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ஹெக்டா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>கிலோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>மெகா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ஜிகா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>டெரா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>பெட்டா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>எக்ஸா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ஜெட்டா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>யாட்டா{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>சதுர {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">சதுர {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">சதுர {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>கன {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">கன {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">கன {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6820,7 +6893,7 @@
<unitPattern count="one">{0} ஜி-ஃபோர்ஸ்</unitPattern>
<unitPattern count="other">{0} ஜி-ஃபோர்ஸ்</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>மீட்டர்/சதுரவிநாடி</displayName>
<unitPattern count="one">{0} மீட்டர்/சதுரவிநாடி</unitPattern>
<unitPattern count="other">{0} மீட்டர்கள்/சதுரவிநாடி</unitPattern>
@@ -6920,7 +6993,7 @@
<unitPattern count="one">{0} மில்லிமோல்/லிட்டர்</unitPattern>
<unitPattern count="other">{0} மில்லிமோல்கள்/லிட்டர்</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>பகுதிகள்/மில்லியன்</displayName>
<unitPattern count="one">{0} பகுதி/மில்லியன்</unitPattern>
<unitPattern count="other">{0} பகுதிகள்/மில்லியன்</unitPattern>
@@ -6950,7 +7023,7 @@
<unitPattern count="one">{0} லிட்டர்/கிலோமீட்டர்</unitPattern>
<unitPattern count="other">{0} லிட்டர்கள்/கிலோமீட்டர்</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>லிட்டர்/100கி.மீ</displayName>
<unitPattern count="one">{0} லிட்டர்/100கி.மீ</unitPattern>
<unitPattern count="other">{0} லிட்டர்/100கி.மீ</unitPattern>
@@ -7431,17 +7504,17 @@
<unitPattern count="one">{0} குதிரைத்திறன்</unitPattern>
<unitPattern count="other">{0} குதிரைத்திறன்</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>பாதரச மில்லிமீட்டர்கள்</displayName>
<unitPattern count="one">{0} பாதரச மில்லிமீட்டர்</unitPattern>
<unitPattern count="other">{0} பாதரச மில்லிமீட்டர்கள்</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>பவுண்டுகள்/சதுர அங்குலம்</displayName>
<unitPattern count="one">{0} பவுண்டு/சதுர அங்குலம்</unitPattern>
<unitPattern count="other">{0} பவுண்டுகள்/சதுர அங்குலம்</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>பாதரச அங்குலங்கள்</displayName>
<unitPattern count="one">{0} பாதரச அங்குலம்</unitPattern>
<unitPattern count="other">{0} பாதரச அங்குலங்கள்</unitPattern>
@@ -7521,7 +7594,7 @@
<unitPattern count="one">{0} கெல்வின்</unitPattern>
<unitPattern count="other">{0} கெல்வின்</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>பவுண்ட்-அடி</displayName>
<unitPattern count="one">{0} பவுண்ட்-அடி</unitPattern>
<unitPattern count="other">{0} பவுண்ட்-அடி</unitPattern>
@@ -7675,9 +7748,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>டெ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>செ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>மி.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>நா.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>பி.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>பெ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>அட்.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ஜெப்.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>யொ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>டெக்.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ஹெ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>கி.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>மெ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>ஜி.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>டெரா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>பெட்.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>எ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>ஜெ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>யா.{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7686,7 +7829,7 @@
<unitPattern count="one">{0} ஜி.ஃபோ.</unitPattern>
<unitPattern count="other">{0} ஜி.ஃபோ.</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>மீ/வி²</displayName>
<unitPattern count="one">{0} மீ/வி²</unitPattern>
<unitPattern count="other">{0} மீ/வி²</unitPattern>
@@ -7786,7 +7929,7 @@
<unitPattern count="one">{0} மி.மோ./லி.</unitPattern>
<unitPattern count="other">{0} மி.மோ./லி.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ப./மி.</displayName>
<unitPattern count="one">{0} ப./மி.</unitPattern>
<unitPattern count="other">{0} ப./மி.</unitPattern>
@@ -7816,7 +7959,7 @@
<unitPattern count="one">{0} லி./கி.மீ.</unitPattern>
<unitPattern count="other">{0} லி./கி.மீ.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>லி./100கி.மீ</displayName>
<unitPattern count="one">{0} லி./100கி.மீ</unitPattern>
<unitPattern count="other">{0} லி./100கி.மீ</unitPattern>
@@ -8297,17 +8440,17 @@
<unitPattern count="one">{0} கு.தி.</unitPattern>
<unitPattern count="other">{0} கு.தி.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>பாத. மி.மீ.</displayName>
<unitPattern count="one">{0} பாத. மி.மீ.</unitPattern>
<unitPattern count="other">{0} பாத. மி.மீ.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>பாத. அங்.</displayName>
<unitPattern count="one">{0} பாத. அங்.</unitPattern>
<unitPattern count="other">{0} பாத. அங்.</unitPattern>
@@ -8387,7 +8530,7 @@
<unitPattern count="one">{0} கெல்.</unitPattern>
<unitPattern count="other">{0} கெல்.</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ப.அடி</displayName>
<unitPattern count="one">{0} ப.அடி</unitPattern>
<unitPattern count="other">{0} ப.அடி</unitPattern>
@@ -8541,9 +8684,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>மைக்ரோ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>டெரா{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8592,7 +8805,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>லி./100கி.மீ</displayName>
<unitPattern count="one">{0}லி./100கி.மீ</unitPattern>
<unitPattern count="other">{0}லி./100கி.மீ</unitPattern>
@@ -8745,17 +8958,17 @@
<unitPattern count="one">{0} கு.வே.</unitPattern>
<unitPattern count="other">{0} கு.வே.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">பாத. மி.மீ.</displayName>
<unitPattern count="one" draft="contributed">{0} பாத. மி.மீ.</unitPattern>
<unitPattern count="other" draft="contributed">{0} பாத. மி.மீ.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">பா. அங்.</displayName>
<unitPattern count="one">{0} பா.அங்.</unitPattern>
<unitPattern count="other">{0} பா.அங்.</unitPattern>
diff --git a/common/main/ta_IN.xml b/common/main/ta_IN.xml
index 4b08fcb..2444c78 100644
--- a/common/main/ta_IN.xml
+++ b/common/main/ta_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ta_LK.xml b/common/main/ta_LK.xml
index 147856f..085841e 100644
--- a/common/main/ta_LK.xml
+++ b/common/main/ta_LK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ta_MY.xml b/common/main/ta_MY.xml
index ca1c859..84e5df1 100644
--- a/common/main/ta_MY.xml
+++ b/common/main/ta_MY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ta_SG.xml b/common/main/ta_SG.xml
index aeb6868..b8c62c6 100644
--- a/common/main/ta_SG.xml
+++ b/common/main/ta_SG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/te.xml b/common/main/te.xml
index a2883d6..fe4c2e2 100644
--- a/common/main/te.xml
+++ b/common/main/te.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -154,6 +154,7 @@
<language type="eu">బాస్క్యూ</language>
<language type="ewo">ఎవోండొ</language>
<language type="fa">పర్షియన్</language>
+ <language type="fa_AF">డారి</language>
<language type="fan">ఫాంగ్</language>
<language type="fat">ఫాంటి</language>
<language type="ff">ఫ్యుల</language>
@@ -5299,7 +5300,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>నార్ఫోక్ దీవి సమయం</standard>
+ <generic draft="contributed">నార్ఫోక్ దీవి సమయం</generic>
+ <standard draft="contributed">నార్ఫోక్ దీవి ప్రామాణిక సమయం</standard>
+ <daylight draft="contributed">నార్ఫోక్ దీవి వేసవి సమయం</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6859,9 +6862,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>డెసీ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>సెంటి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>మిల్లీ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>మైక్రో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>నానో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>పికో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ఫెమిటో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>అట్టో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>జెప్టో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>యోక్టో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>డెకా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>హెక్టో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>కిలో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>మెగా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>గిగా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>టెరా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>పెటా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ఎక్సా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>జెట్టా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>యొట్టా{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>చదరపు {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">చదరపు {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">చదరపు {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>క్యూబిక్ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">క్యూబిక్ {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">క్యూబిక్ {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6870,7 +6943,7 @@
<unitPattern count="one">{0} గు-శక్తి</unitPattern>
<unitPattern count="other">{0} గు-శక్తి</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>మీటర్లు/స్క్వేర్ సెకన్లు</displayName>
<unitPattern count="one">{0} మీటరు/స్క్వేర్ సెకను</unitPattern>
<unitPattern count="other">{0} మీటర్లు/స్క్వేర్ సెకన్లు</unitPattern>
@@ -6970,7 +7043,7 @@
<unitPattern count="one">{0} మిల్లీమోల్/లీటర్</unitPattern>
<unitPattern count="other">{0} మిల్లీమోల్లు/లీటర్</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>భాగాలు/మిలియన్</displayName>
<unitPattern count="one">{0} భాగం/మిలియన్</unitPattern>
<unitPattern count="other">{0} భాగాలు/మిలియన్</unitPattern>
@@ -7000,7 +7073,7 @@
<unitPattern count="one">{0} లీటరు/కిలోమీటరు</unitPattern>
<unitPattern count="other">{0} లీటర్లు/కిలోమీటరు</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>లీటర్లు/100 కీలోమీటర్లు</displayName>
<unitPattern count="one">{0} లీటరు/100 కీలోమీటర్లు</unitPattern>
<unitPattern count="other">{0} లీటర్లు/100 కీలోమీటర్లు</unitPattern>
@@ -7486,17 +7559,17 @@
<unitPattern count="one">{0} హార్స్పవర్</unitPattern>
<unitPattern count="other">{0} హార్స్పవర్</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>మిల్లీమీటర్ల పాదరసం</displayName>
<unitPattern count="one">{0} మిల్లీమీటర్ పాదరసం</unitPattern>
<unitPattern count="other">{0} మిల్లీమీటర్ల పాదరసం</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>చదరపు అంగుళానికి పౌండ్లు</displayName>
<unitPattern count="one">చదరపు అంగుళానికి {0} పౌండు</unitPattern>
<unitPattern count="other">చదరపు అంగుళానికి {0} పౌండ్లు</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>అంగుళాల పాదరసం</displayName>
<unitPattern count="one">{0} అంగుళం పాదరసం</unitPattern>
<unitPattern count="other">{0} అంగుళాల పాదరసం</unitPattern>
@@ -7576,7 +7649,7 @@
<unitPattern count="one">{0} కెల్విన్</unitPattern>
<unitPattern count="other">{0} కెల్విన్స్</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>పౌండ్-ఫీట్</displayName>
<unitPattern count="one">{0} పౌండ్-ఫూట్</unitPattern>
<unitPattern count="other">{0} పౌండ్-ఫీట్</unitPattern>
@@ -7730,9 +7803,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>డె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>సెం.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>మి.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>మై.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>నా.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ఫె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>అ.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>జె.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>యో.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>డెక్.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>హె.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>కి.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>గి.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>టె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>పె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ఎ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>జెట్.{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>యొ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -7741,7 +7884,7 @@
<unitPattern count="one">{0} గు</unitPattern>
<unitPattern count="other">{0} గు</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>మీటర్లు/సెక²</displayName>
<unitPattern count="one">{0} మీ/సె²</unitPattern>
<unitPattern count="other">{0} మీ/సె²</unitPattern>
@@ -7841,7 +7984,7 @@
<unitPattern count="one">{0} మి.మో./లీ.</unitPattern>
<unitPattern count="other">{0} మి.మో./లీ.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>భాగాలు/మిలియన్</displayName>
<unitPattern count="one">{0} భా./మి.</unitPattern>
<unitPattern count="other">{0} భా./మి.</unitPattern>
@@ -7871,7 +8014,7 @@
<unitPattern count="one">{0} లీ./కి.మీ</unitPattern>
<unitPattern count="other">{0} లీ./కి.మీ</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>లీ/100 కి.మీ.</displayName>
<unitPattern count="one">{0} లీ/100 కి.మీ.</unitPattern>
<unitPattern count="other">{0} లీ/100 కి.మీ.</unitPattern>
@@ -8355,17 +8498,17 @@
<unitPattern count="one">{0} హా.ప</unitPattern>
<unitPattern count="other">{0} హా.ప</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>మిమీ. పాద</displayName>
<unitPattern count="one">{0} మిమీ. పాద</unitPattern>
<unitPattern count="other">{0} మిమీ. పాద</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>పౌ/చ.అం</displayName>
<unitPattern count="one">{0} పౌ/చ.అం</unitPattern>
<unitPattern count="other">{0} పౌ/చ.అం</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>అం.పాద</displayName>
<unitPattern count="one">{0} అం.పాద</unitPattern>
<unitPattern count="other">{0} అం.పాద</unitPattern>
@@ -8445,7 +8588,7 @@
<unitPattern count="one">{0} కె</unitPattern>
<unitPattern count="other">{0} కె</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8599,9 +8742,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>డెసీ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>సెం{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>మి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>మై{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>నా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>పి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ఫెమి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>అ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>జె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>యో{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>డెకా{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>హె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>కి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>మె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>గి{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>టె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>పె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ఎ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>జె{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>యొ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -8646,7 +8859,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>లీ/100కి.మీ.</displayName>
<unitPattern count="one">{0}లీ/100కి.మీ.</unitPattern>
<unitPattern count="other">{0}లీ/100కి.మీ.</unitPattern>
@@ -8803,17 +9016,17 @@
<unitPattern count="one">{0} హా.ప</unitPattern>
<unitPattern count="other">{0} హా.ప</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">మిమీ. పాద</displayName>
<unitPattern count="one" draft="contributed">{0} మిమీ. పాద</unitPattern>
<unitPattern count="other" draft="contributed">{0} మిమీ. పాద</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">పౌ/చ.అం</displayName>
<unitPattern count="one" draft="contributed">{0} పౌ/చ.అం</unitPattern>
<unitPattern count="other" draft="contributed">{0} పౌ/చ.అం</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">అం.పాద</displayName>
<unitPattern count="one">{0} అం.పాద</unitPattern>
<unitPattern count="other">{0} అం.పాద</unitPattern>
diff --git a/common/main/te_IN.xml b/common/main/te_IN.xml
index 32eedde..33c38c9 100644
--- a/common/main/te_IN.xml
+++ b/common/main/te_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/teo.xml b/common/main/teo.xml
index 6d3ba30..0bcdbcc 100644
--- a/common/main/teo.xml
+++ b/common/main/teo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/teo_KE.xml b/common/main/teo_KE.xml
index 31eda92..e5e61a4 100644
--- a/common/main/teo_KE.xml
+++ b/common/main/teo_KE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/teo_UG.xml b/common/main/teo_UG.xml
index 2fcb05f..82d26db 100644
--- a/common/main/teo_UG.xml
+++ b/common/main/teo_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tg.xml b/common/main/tg.xml
index 453ac3f..437bb3f 100644
--- a/common/main/tg.xml
+++ b/common/main/tg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -960,18 +960,18 @@
<month type="12">↑↑↑</month>
</monthWidth>
<monthWidth type="wide">
- <month type="1" draft="provisional">муҳаррам</month>
- <month type="2" draft="provisional">сафар</month>
- <month type="3" draft="provisional">Рабеъ I</month>
- <month type="4" draft="provisional">Рабеъ II</month>
- <month type="5" draft="provisional">ҷимоди-ул-уло</month>
- <month type="6" draft="provisional">ҷимоди-ул-сони</month>
- <month type="7" draft="provisional">раҷаб</month>
- <month type="8" draft="provisional">Шабан</month>
- <month type="9" draft="provisional">Рамадан</month>
- <month type="10" draft="provisional">Шаввал</month>
- <month type="11" draft="provisional">Дхут-Қидаҳ</month>
- <month type="12" draft="provisional">Дхут-Ҳиҷҷаҳ</month>
+ <month type="1">муҳаррам</month>
+ <month type="2">сафар</month>
+ <month type="3">Рабеъ I</month>
+ <month type="4">Рабеъ II</month>
+ <month type="5">ҷимоди-ул-уло</month>
+ <month type="6">ҷимоди-ул-сони</month>
+ <month type="7">раҷаб</month>
+ <month type="8">Шабан</month>
+ <month type="9">Рамадан</month>
+ <month type="10">Шаввал</month>
+ <month type="11">Дхут-Қидаҳ</month>
+ <month type="12">Дхут-Ҳиҷҷаҳ</month>
</monthWidth>
</monthContext>
<monthContext type="stand-alone">
@@ -1004,18 +1004,18 @@
<month type="12">↑↑↑</month>
</monthWidth>
<monthWidth type="wide">
- <month type="1" draft="provisional">муҳаррам</month>
- <month type="2" draft="provisional">сафар</month>
- <month type="3" draft="provisional">Рабеъ I</month>
- <month type="4" draft="provisional">Рабеъ II</month>
- <month type="5" draft="provisional">ҷимоди-ул-уло</month>
- <month type="6" draft="provisional">ҷимоди-ул-сони</month>
- <month type="7" draft="provisional">раҷаб</month>
- <month type="8" draft="provisional">Шабан</month>
- <month type="9" draft="provisional">Рамадан</month>
- <month type="10" draft="provisional">Шаввал</month>
- <month type="11" draft="provisional">Дхул-Қидаҳ</month>
- <month type="12" draft="provisional">Дхул-Ҳиҷҷаҳ</month>
+ <month type="1">муҳаррам</month>
+ <month type="2">сафар</month>
+ <month type="3">Рабеъ I</month>
+ <month type="4">Рабеъ II</month>
+ <month type="5">ҷимоди-ул-уло</month>
+ <month type="6">ҷимоди-ул-сони</month>
+ <month type="7">раҷаб</month>
+ <month type="8">Шабан</month>
+ <month type="9">Рамадан</month>
+ <month type="10">Шаввал</month>
+ <month type="11">Дхул-Қидаҳ</month>
+ <month type="12">Дхул-Ҳиҷҷаҳ</month>
</monthWidth>
</monthContext>
</months>
diff --git a/common/main/tg_TJ.xml b/common/main/tg_TJ.xml
index 1f636cf..b07a0fe 100644
--- a/common/main/tg_TJ.xml
+++ b/common/main/tg_TJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/th.xml b/common/main/th.xml
index 7504aed..e0af591 100644
--- a/common/main/th.xml
+++ b/common/main/th.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -122,6 +122,7 @@
<language type="chr">เชอโรกี</language>
<language type="chy">เชเยนเน</language>
<language type="ckb">เคิร์ดตอนกลาง</language>
+ <language type="ckb" alt="variant">เคิร์ดโซรานี</language>
<language type="co">คอร์ซิกา</language>
<language type="cop">คอปติก</language>
<language type="cps">กาปิซนอน</language>
@@ -182,6 +183,7 @@
<language type="ewo">อีวันโด</language>
<language type="ext">เอกซ์เตรมาดูรา</language>
<language type="fa">เปอร์เซีย</language>
+ <language type="fa_AF">ดารี</language>
<language type="fan">ฟอง</language>
<language type="fat">ฟันติ</language>
<language type="ff">ฟูลาห์</language>
@@ -2918,20 +2920,20 @@
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">MM/GGGGG y – MM/GGGGG y</greatestDifference>
- <greatestDifference id="M">M/y – M/y</greatestDifference>
- <greatestDifference id="y">M/y – M/y</greatestDifference>
+ <greatestDifference id="M">M/y – M/y G</greatestDifference>
+ <greatestDifference id="y">M/y – M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
- <greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+ <greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
<greatestDifference id="G">d/MM/GGGGG y – d/MM/GGGGG y</greatestDifference>
- <greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
- <greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
+ <greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
+ <greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
- <greatestDifference id="d">E d/M/y – E d/M/y</greatestDifference>
+ <greatestDifference id="d">E d/M/y – E d/M/y G</greatestDifference>
<greatestDifference id="G">E d/MM/GGGGG y – E d/MM/GGGGG y</greatestDifference>
- <greatestDifference id="M">E d/M/y – E d/M/y</greatestDifference>
- <greatestDifference id="y">E d/M/y – E d/M/y</greatestDifference>
+ <greatestDifference id="M">E d/M/y – E d/M/y G</greatestDifference>
+ <greatestDifference id="y">E d/M/y – E d/M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
<greatestDifference id="G">MMM G y – MMM G y</greatestDifference>
@@ -6477,7 +6479,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>เวลาเกาะนอร์ฟอล์ก</standard>
+ <generic draft="contributed">เวลาเกาะนอร์ฟอล์ก</generic>
+ <standard draft="contributed">เวลามาตรฐานเกาะนอร์ฟอล์ก</standard>
+ <daylight draft="contributed">เวลาฤดูร้อนเกาะนอร์ฟอล์ก</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8321,9 +8325,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>เดซิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>เซนติ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>มิลลิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ไมโคร{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>นาโน{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>พิโค{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>เฟมโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>อัตโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>เซปโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ยอกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>เดคา{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>เฮกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>กิโล{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>เมกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>จิกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>เทระ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>เพตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>เอกซะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>เซตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ยอตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}ต่อ{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8331,7 +8403,7 @@
<displayName>แรง G</displayName>
<unitPattern count="other">{0} แรง G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>เมตรต่อวินาทีกำลังสอง</displayName>
<unitPattern count="other">{0} เมตรต่อวินาทีกำลังสอง</unitPattern>
</unit>
@@ -8412,7 +8484,7 @@
<displayName>มิลลิโมลต่อลิตร</displayName>
<unitPattern count="other">{0} มิลลิโมลต่อลิตร</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ส่วนต่อล้าน</displayName>
<unitPattern count="other">{0} ส่วนต่อล้าน</unitPattern>
</unit>
@@ -8436,7 +8508,7 @@
<displayName>ลิตรต่อกิโลเมตร</displayName>
<unitPattern count="other">{0} ลิตรต่อกิโลเมตร</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ลิตรต่อ100 กิโลเมตร</displayName>
<unitPattern count="other">{0} ลิตรต่อ100 กิโลเมตร</unitPattern>
</unit>
@@ -8820,15 +8892,15 @@
<displayName>แรงม้า</displayName>
<unitPattern count="other">{0} แรงม้า</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>มิลลิเมตรปรอท</displayName>
<unitPattern count="other">{0} มิลลิเมตรปรอท</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ปอนด์ต่อตารางนิ้ว</displayName>
<unitPattern count="other">{0} ปอนด์ต่อตารางนิ้ว</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>นิ้วปรอท</displayName>
<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
</unit>
@@ -8892,7 +8964,7 @@
<displayName>เคลวิน</displayName>
<unitPattern count="other">{0} เคลวิน</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>ปอนด์-ฟุต</displayName>
<unitPattern count="other">{0} ปอนด์-ฟุต</unitPattern>
</unit>
@@ -9018,9 +9090,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>เดซิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>เซนติ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>มิลลิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ไมโคร{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>นาโน{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>พิโค{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>เฟมโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>อัตโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>เซปโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ยอกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>เดคา{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>เฮกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>กิโล{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>เมกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>จิกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>เทระ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>เพตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>เอกซะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>เซตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ยอตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9028,7 +9168,7 @@
<displayName>แรง G</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>เมตร/วินาที²</displayName>
<unitPattern count="other">{0} ม./วิ²</unitPattern>
</unit>
@@ -9109,7 +9249,7 @@
<displayName>มิลลิโมล/ลิตร</displayName>
<unitPattern count="other">{0} มลม./ล.</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ส่วน/ล้าน</displayName>
<unitPattern count="other">{0} สตล.</unitPattern>
</unit>
@@ -9133,7 +9273,7 @@
<displayName>ลิตร/กม.</displayName>
<unitPattern count="other">{0} ล./กม.</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ล./100 กม.</displayName>
<unitPattern count="other">{0} ล./100กม.</unitPattern>
</unit>
@@ -9517,15 +9657,15 @@
<displayName>แรงม้า</displayName>
<unitPattern count="other">{0} แรงม้า</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>มม. ปรอท</displayName>
<unitPattern count="other">{0} มม. ปรอท</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>ปอนด์/ตร.นิ้ว</displayName>
<unitPattern count="other">{0} ปอนด์/ตร.นิ้ว</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>นิ้วปรอท</displayName>
<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
</unit>
@@ -9589,7 +9729,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9715,9 +9855,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>เดซิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>เซนติ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>มิลลิ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>ไมโคร{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>นาโน{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>พิโค{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>เฟมโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>อัตโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>เซปโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>ยอกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>เดคา{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>เฮกโต{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>กิโล{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>เมกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>จิกะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>เทระ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>เพตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>เอกซะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>เซตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>ยอตตะ{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9755,7 +9963,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>ล. /100 กม.</displayName>
<unitPattern count="other">{0} ล./100กม.</unitPattern>
</unit>
@@ -9860,7 +10068,7 @@
<unit type="power-horsepower">
<unitPattern count="other">{0}แรงม้า</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
<unit type="pressure-millibar">
diff --git a/common/main/th_TH.xml b/common/main/th_TH.xml
index 2ed713d..2fc09ee 100644
--- a/common/main/th_TH.xml
+++ b/common/main/th_TH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ti.xml b/common/main/ti.xml
index 1235d67..daaae6f 100644
--- a/common/main/ti.xml
+++ b/common/main/ti.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -200,7 +200,6 @@
<territory type="CX">ደሴታት ክሪስትማስ</territory>
<territory type="CY">ሳይፕረስ</territory>
<territory type="CZ">ቼክ ሪፓብሊክ</territory>
- <territory type="CZ" alt="variant">CZ</territory>
<territory type="DE">ጀርመን</territory>
<territory type="DG">ዲየጎ ጋርሺያ</territory>
<territory type="DJ">ጂቡቲ</territory>
diff --git a/common/main/ti_ER.xml b/common/main/ti_ER.xml
index 4d4be0f..7a6e4b2 100644
--- a/common/main/ti_ER.xml
+++ b/common/main/ti_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ti_ET.xml b/common/main/ti_ET.xml
index c3ad330..8a82ca5 100644
--- a/common/main/ti_ET.xml
+++ b/common/main/ti_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tk.xml b/common/main/tk.xml
index ce8ca13..b8db1f9 100644
--- a/common/main/tk.xml
+++ b/common/main/tk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -116,6 +116,7 @@
<language type="eu">bask dili</language>
<language type="ewo">ewondo dili</language>
<language type="fa">pars dili</language>
+ <language type="fa_AF">dari dili</language>
<language type="ff">fula dili</language>
<language type="fi">fin dili</language>
<language type="fil">filippin dili</language>
@@ -935,28 +936,6 @@
</dateFormat>
</dateFormatLength>
</dateFormats>
- <timeFormats>
- <timeFormatLength type="full">
- <timeFormat>
- <pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="long">
- <timeFormat>
- <pattern draft="unconfirmed">HH:mm:ss z</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="medium">
- <timeFormat>
- <pattern draft="provisional">HH:mm:ss</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="short">
- <timeFormat>
- <pattern draft="provisional">HH:mm</pattern>
- </timeFormat>
- </timeFormatLength>
- </timeFormats>
<dateTimeFormats>
<dateTimeFormatLength type="full">
<dateTimeFormat>
@@ -4265,7 +4244,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk adasy wagty</standard>
+ <generic draft="contributed">Norfolk adasy wagty</generic>
+ <standard draft="contributed">Norfolk adasy standart wagty</standard>
+ <daylight draft="contributed">Norfolk adasy tomusky wagty</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5735,9 +5716,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{1} başyna {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kwadrat {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kwadrat {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">kub {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">kub {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}.{1}</compoundUnitPattern>
</compoundUnit>
@@ -5746,7 +5797,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>inedördül sekuntda metr</displayName>
<unitPattern count="one">{0} metr/inedördül sekunt</unitPattern>
<unitPattern count="other">{0} metr/inedördül sekunt</unitPattern>
@@ -5846,7 +5897,7 @@
<unitPattern count="one">{0} millimol/litr</unitPattern>
<unitPattern count="other">{0} millimol/litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bölejik/million</displayName>
<unitPattern count="one">{0} bölejik/million</unitPattern>
<unitPattern count="other">{0} bölejik/million</unitPattern>
@@ -5876,7 +5927,7 @@
<unitPattern count="one">{0} litr/kilometr</unitPattern>
<unitPattern count="other">{0} litr/kilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litr/100 kilometr</displayName>
<unitPattern count="one">{0} litr/100 kilometr</unitPattern>
<unitPattern count="other">{0} litr/100 kilometr</unitPattern>
@@ -6124,22 +6175,22 @@
<unitPattern count="other">{0} megapiksel</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
- <displayName draft="provisional">santimetr başyna piksel</displayName>
+ <displayName>santimetr başyna piksel</displayName>
<unitPattern count="one">{0} santimetr başyna piksel</unitPattern>
<unitPattern count="other">{0} santimetr başyna piksel</unitPattern>
</unit>
<unit type="graphics-pixel-per-inch">
- <displayName draft="provisional">dýuým başyna piksel</displayName>
+ <displayName>dýuým başyna piksel</displayName>
<unitPattern count="one">{0} dýuým başyna piksel</unitPattern>
<unitPattern count="other">{0} dýuým başyna piksel</unitPattern>
</unit>
<unit type="graphics-dot-per-centimeter">
- <displayName draft="provisional">santimetr başyna nokat</displayName>
+ <displayName>santimetr başyna nokat</displayName>
<unitPattern count="one">{0} santimetr başyna nokat</unitPattern>
<unitPattern count="other">{0} santimetr başyna nokat</unitPattern>
</unit>
<unit type="graphics-dot-per-inch">
- <displayName draft="provisional">dýuým başyna nokat</displayName>
+ <displayName>dýuým başyna nokat</displayName>
<unitPattern count="one">{0} dýuým başyna nokat</unitPattern>
<unitPattern count="other">{0} dýuým başyna nokat</unitPattern>
</unit>
@@ -6352,17 +6403,17 @@
<unitPattern count="one">{0} at güýji</unitPattern>
<unitPattern count="other">{0} at güýji</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>millimetr simap sütüni</displayName>
<unitPattern count="one">{0} millimetr simap sütüni</unitPattern>
<unitPattern count="other">{0} millimetr simap sütüni</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funt/inedördül dýuým</displayName>
<unitPattern count="one">{0} funt/inedördül dýuým</unitPattern>
<unitPattern count="other">{0} funt/inedördül dýuým</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>dýuým simap sütüni</displayName>
<unitPattern count="one">{0} dýuým simap sütüni</unitPattern>
<unitPattern count="other">{0} dýuým simap sütüni</unitPattern>
@@ -6442,7 +6493,7 @@
<unitPattern count="one">{0} Kelwin gradusy</unitPattern>
<unitPattern count="other">{0} Kelwin gradusy</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funt-futlar</displayName>
<unitPattern count="one">{0} funt-fut</unitPattern>
<unitPattern count="other">{0} funt-fut</unitPattern>
@@ -6596,9 +6647,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}.{1}</compoundUnitPattern>
</compoundUnit>
@@ -6607,7 +6728,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6707,7 +6828,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>bölejik/million</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6737,7 +6858,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7213,17 +7334,17 @@
<unitPattern count="one">{0} a.g.</unitPattern>
<unitPattern count="other">{0} a.g.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm sim.süt.</displayName>
<unitPattern count="one">{0} mm sim.süt.</unitPattern>
<unitPattern count="other">{0} mm sim.süt.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>dý sim.süt.</displayName>
<unitPattern count="one">{0} dý sim.süt.</unitPattern>
<unitPattern count="other">{0} dý sim.süt.</unitPattern>
@@ -7303,7 +7424,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -7457,9 +7578,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}.{1}</compoundUnitPattern>
</compoundUnit>
@@ -7468,7 +7659,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
diff --git a/common/main/tk_TM.xml b/common/main/tk_TM.xml
index a648998..c3169f7 100644
--- a/common/main/tk_TM.xml
+++ b/common/main/tk_TM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/to.xml b/common/main/to.xml
index a269292..249d5fc 100644
--- a/common/main/to.xml
+++ b/common/main/to.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4787,7 +4787,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>houa fakanoafōki</standard>
+ <generic draft="contributed">houa fakanoafōki</generic>
+ <standard draft="contributed">houa fakanoafōki taimi totonu</standard>
+ <daylight draft="contributed">houa fakanoafōki taimi liliu</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7106,10 +7108,6 @@
<symbol>AUD$</symbol>
<symbol alt="narrow" draft="contributed">AU$</symbol>
</currency>
- <currency type="BRL">
- <displayName>BRL</displayName>
- <displayName count="other">↑↑↑</displayName>
- </currency>
<currency type="FJD">
<displayName>Tola fakafisi</displayName>
<displayName count="other">Tola fakafisi</displayName>
@@ -7353,7 +7351,7 @@
<displayName>k-mālohi</displayName>
<unitPattern count="other">k-mālohi ʻe {0}</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>mita he sekoni sikuea</displayName>
<unitPattern count="other">mita he sekoni sikuea ʻe {0}</unitPattern>
</unit>
@@ -7434,7 +7432,7 @@
<displayName>milimole he lita</displayName>
<unitPattern count="other">milimole ʻe {0} he lita</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>konga he miliona</displayName>
<unitPattern count="other">konga ʻe {0} he miliona</unitPattern>
</unit>
@@ -7458,7 +7456,7 @@
<displayName>lita he kilomita</displayName>
<unitPattern count="other">lita ʻe {0} he kilomita</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lita he kilomita ʻe 100</displayName>
<unitPattern count="other">lita ʻe {0} he kilomita ʻe 100</unitPattern>
</unit>
@@ -7854,15 +7852,15 @@
<displayName>hoosipaoa</displayName>
<unitPattern count="other">hoosipaoa ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimita meakuli</displayName>
<unitPattern count="other">milimita meakuli ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pāuni he ʻinisi sikuea</displayName>
<unitPattern count="other">pāuni he ʻinisi sikuea ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>ʻinisi meakuli</displayName>
<unitPattern count="other">ʻinisi meakuli ʻe {0}</unitPattern>
</unit>
@@ -7926,7 +7924,7 @@
<displayName>kelevini</displayName>
<unitPattern count="other">kelevini ʻe {0}</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pāunifute</displayName>
<unitPattern count="other">pāunifute ʻe {0}</unitPattern>
</unit>
@@ -8066,7 +8064,7 @@
<displayName>k-mā</displayName>
<unitPattern count="other">k-mā ʻe {0}</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">m/s² ʻe {0}</unitPattern>
</unit>
@@ -8147,7 +8145,7 @@
<displayName>mmol/l</displayName>
<unitPattern count="other">mmol ʻe {0}/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>khm</displayName>
<unitPattern count="other">khm ʻe {0}</unitPattern>
</unit>
@@ -8171,7 +8169,7 @@
<displayName>l/km</displayName>
<unitPattern count="other">l ʻe {0}/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="other">l ʻe {0}/100km</unitPattern>
</unit>
@@ -8567,15 +8565,15 @@
<displayName>hp</displayName>
<unitPattern count="other">hp ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm-Hg</displayName>
<unitPattern count="other">mm-Hg ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pā/in²</displayName>
<unitPattern count="other">pā/in² ʻe {0}</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in-Hg</displayName>
<unitPattern count="other">in-Hg ʻe {0}</unitPattern>
</unit>
@@ -8639,7 +8637,7 @@
<displayName>K</displayName>
<unitPattern count="other">K ʻe {0}</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pā⋅ft</displayName>
<unitPattern count="other">pā⋅ft ʻe {0}</unitPattern>
</unit>
@@ -8779,7 +8777,7 @@
<displayName>k-mā</displayName>
<unitPattern count="other">{0} k-mā</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="other">{0} m/s²</unitPattern>
</unit>
@@ -8860,7 +8858,7 @@
<displayName draft="unconfirmed">mmol/l</displayName>
<unitPattern count="other" draft="unconfirmed">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">khm</displayName>
<unitPattern count="other" draft="unconfirmed">{0} khm</unitPattern>
</unit>
@@ -8884,7 +8882,7 @@
<displayName>l/km</displayName>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="other">{0} l/100km</unitPattern>
</unit>
@@ -9280,15 +9278,15 @@
<displayName>hp</displayName>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm-Hg</displayName>
<unitPattern count="other">{0} mm-Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pā/in²</displayName>
<unitPattern count="other">{0} pā/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>in-Hg</displayName>
<unitPattern count="other">{0} in-Hg</unitPattern>
</unit>
@@ -9352,7 +9350,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">pā⋅ft</displayName>
<unitPattern count="other" draft="unconfirmed">{0} pā⋅ft</unitPattern>
</unit>
diff --git a/common/main/to_TO.xml b/common/main/to_TO.xml
index 8a2dec5..43e1a80 100644
--- a/common/main/to_TO.xml
+++ b/common/main/to_TO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tr.xml b/common/main/tr.xml
index beb3a32..8bfad34 100644
--- a/common/main/tr.xml
+++ b/common/main/tr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -49,6 +49,7 @@
<language type="arp">Arapaho Dili</language>
<language type="arq">Cezayir Arapçası</language>
<language type="ars">Necd Arapçası</language>
+ <language type="ars" alt="menu">Arapça, Necd</language>
<language type="arw">Arawak Dili</language>
<language type="ary">Fas Arapçası</language>
<language type="arz">Mısır Arapçası</language>
@@ -123,6 +124,7 @@
<language type="chr">Çerokice</language>
<language type="chy">Şayence</language>
<language type="ckb">Orta Kürtçe</language>
+ <language type="ckb" alt="menu" draft="contributed">Kürtçe, Sorani</language>
<language type="co">Korsikaca</language>
<language type="cop">Kıptice</language>
<language type="cps">Capiznon</language>
@@ -183,6 +185,7 @@
<language type="ewo">Ewondo</language>
<language type="ext">Ekstremadura Dili</language>
<language type="fa">Farsça</language>
+ <language type="fa_AF">Darice</language>
<language type="fan">Fang</language>
<language type="fat">Fanti</language>
<language type="ff">Fula dili</language>
@@ -650,6 +653,7 @@
<script type="Aghb" draft="contributed">Kafkas Albanyası</script>
<script type="Arab">Arap</script>
<script type="Arab" alt="variant">Fars-Arap</script>
+ <script type="Aran" draft="contributed">Nestâlik</script>
<script type="Armi">İmparatorluk Aramicesi</script>
<script type="Armn">Ermeni</script>
<script type="Avst">Avesta</script>
@@ -716,7 +720,7 @@
<script type="Khmr">Kmer</script>
<script type="Khoj" draft="contributed">Khojki</script>
<script type="Knda">Kannada</script>
- <script type="Kore">Kore</script>
+ <script type="Kore">Korece</script>
<script type="Kpel" draft="contributed">Kpelle</script>
<script type="Kthi">Kaithi</script>
<script type="Lana">Lanna</script>
@@ -734,7 +738,6 @@
<script type="Lydi">Lidya</script>
<script type="Mahj" draft="contributed">Mahajani</script>
<script type="Mand">Manden</script>
- <script type="Mani" draft="contributed">Mani</script>
<script type="Maya">Maya Hiyeroglifleri</script>
<script type="Mend" draft="contributed">Mende</script>
<script type="Merc" draft="contributed">Meroitik El Yazısı</script>
@@ -766,6 +769,7 @@
<script type="Phnx">Fenike</script>
<script type="Plrd">Pollard Fonetik</script>
<script type="Prti">Partça Kitabe Dili</script>
+ <script type="Qaag" draft="contributed">Zawgyi</script>
<script type="Rjng">Rejang</script>
<script type="Roro">Rongorongo</script>
<script type="Runr">Runik</script>
@@ -5366,7 +5370,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Adası Saati</standard>
+ <generic draft="contributed">Norfolk Adası Saati</generic>
+ <standard draft="contributed">Norfolk Adası Standart Saati</standard>
+ <daylight draft="contributed">Norfolk Adası Yaz Saati</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7606,9 +7612,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>desi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>santi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}kare</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}kare</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}kare</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}küp</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}küp</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}küp</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7617,7 +7693,7 @@
<unitPattern count="one">{0} g kuvveti</unitPattern>
<unitPattern count="other">{0} g kuvveti</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metre/saniye²</displayName>
<unitPattern count="one">{0} metre/saniye²</unitPattern>
<unitPattern count="other">{0} metre/saniye²</unitPattern>
@@ -7717,7 +7793,7 @@
<unitPattern count="one">{0} milimol/litre</unitPattern>
<unitPattern count="other">{0} milimol/litre</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>parça/milyon</displayName>
<unitPattern count="one">{0} parça/milyon</unitPattern>
<unitPattern count="other">{0} parça/milyon</unitPattern>
@@ -7747,7 +7823,7 @@
<unitPattern count="one">{0} litre/kilometre</unitPattern>
<unitPattern count="other">{0} litre/kilometre</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litre/100 kilometre</displayName>
<unitPattern count="one">{0} litre/100 kilometre</unitPattern>
<unitPattern count="other">{0} litre/100 kilometre</unitPattern>
@@ -8238,17 +8314,17 @@
<unitPattern count="one">{0} beygir gücü</unitPattern>
<unitPattern count="other">{0} beygir gücü</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimetre cıva</displayName>
<unitPattern count="one">{0} milimetre cıva</unitPattern>
<unitPattern count="other">{0} milimetre cıva</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>libre/inç kare</displayName>
<unitPattern count="one">{0} libre/inç kare</unitPattern>
<unitPattern count="other">{0} libre/inç kare</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inç cıva</displayName>
<unitPattern count="one">{0} inç cıva</unitPattern>
<unitPattern count="other">{0} inç cıva</unitPattern>
@@ -8328,7 +8404,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound fit</displayName>
<unitPattern count="one">{0} pound fit</unitPattern>
<unitPattern count="other">{0} pound fit</unitPattern>
@@ -8487,9 +8563,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8498,7 +8644,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/sn²</displayName>
<unitPattern count="one">{0} m/sn²</unitPattern>
<unitPattern count="other">{0} m/sn²</unitPattern>
@@ -8598,7 +8744,7 @@
<unitPattern count="one">{0} mmol/l</unitPattern>
<unitPattern count="other">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -8628,7 +8774,7 @@
<unitPattern count="one">{0} l/km</unitPattern>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100 km</displayName>
<unitPattern count="one">{0} l/100 km</unitPattern>
<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -9119,17 +9265,17 @@
<unitPattern count="one">{0} bg</unitPattern>
<unitPattern count="other">{0} bg</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>lb/in²</displayName>
<unitPattern count="one">{0} lb/in²</unitPattern>
<unitPattern count="other">{0} lb/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -9209,7 +9355,7 @@
<unitPattern count="one">{0}K</unitPattern>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="one">{0} lbf⋅ft</unitPattern>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
@@ -9368,9 +9514,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9379,7 +9595,7 @@
<unitPattern count="one" draft="contributed">{0}G</unitPattern>
<unitPattern count="other" draft="contributed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">m/sn²</displayName>
<unitPattern count="one" draft="contributed">{0} m/sn²</unitPattern>
<unitPattern count="other" draft="contributed">{0} m/sn²</unitPattern>
@@ -9468,7 +9684,7 @@
<unitPattern count="one" draft="contributed">{0} mmol/L</unitPattern>
<unitPattern count="other" draft="contributed">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">ppm</displayName>
<unitPattern count="one" draft="contributed">{0} ppm</unitPattern>
<unitPattern count="other" draft="contributed">{0} ppm</unitPattern>
@@ -9488,7 +9704,7 @@
<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>l/100km</displayName>
<unitPattern count="one">{0} l/100km</unitPattern>
<unitPattern count="other">{0} l/100km</unitPattern>
@@ -9860,17 +10076,17 @@
<unitPattern count="one" draft="contributed">{0} bg</unitPattern>
<unitPattern count="other" draft="contributed">{0} bg</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">lb/in²</displayName>
<unitPattern count="one" draft="contributed">{0} lb/in²</unitPattern>
<unitPattern count="other" draft="contributed">{0} lb/in²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">inHg</displayName>
<unitPattern count="one" draft="contributed">{0}" Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0}" Hg</unitPattern>
diff --git a/common/main/tr_CY.xml b/common/main/tr_CY.xml
index 4f0c2dc..217361d 100644
--- a/common/main/tr_CY.xml
+++ b/common/main/tr_CY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tr_TR.xml b/common/main/tr_TR.xml
index 31a4b2f..2e68874 100644
--- a/common/main/tr_TR.xml
+++ b/common/main/tr_TR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tt.xml b/common/main/tt.xml
index fd03eb5..7ac36ab 100644
--- a/common/main/tt.xml
+++ b/common/main/tt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tt_RU.xml b/common/main/tt_RU.xml
index 9568e19..5d0fb4e 100644
--- a/common/main/tt_RU.xml
+++ b/common/main/tt_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/twq.xml b/common/main/twq.xml
index 7c394b1..4c53e02 100644
--- a/common/main/twq.xml
+++ b/common/main/twq.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldovi</territory>
<territory type="MG">Madagascar</territory>
<territory type="MH">Maršal gungey</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Maali</territory>
<territory type="MM">Maynamar</territory>
<territory type="MN">Mongooli</territory>
diff --git a/common/main/twq_NE.xml b/common/main/twq_NE.xml
index 0ab2bcf..4fe672f 100644
--- a/common/main/twq_NE.xml
+++ b/common/main/twq_NE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/tzm.xml b/common/main/tzm.xml
index 2e4b945..a16dc52 100644
--- a/common/main/tzm.xml
+++ b/common/main/tzm.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Mulḍavya</territory>
<territory type="MG">Madaɣacqar</territory>
<territory type="MH">Tigzirin n Marcal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanmar</territory>
<territory type="MN">Manɣulya</territory>
diff --git a/common/main/tzm_MA.xml b/common/main/tzm_MA.xml
index 9c6d14b..6830d2a 100644
--- a/common/main/tzm_MA.xml
+++ b/common/main/tzm_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ug.xml b/common/main/ug.xml
index fd43852..9ff3285 100644
--- a/common/main/ug.xml
+++ b/common/main/ug.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2808,7 +2808,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard draft="contributed">نورفولك ئاراللىرى ۋاقتى</standard>
+ <generic draft="contributed">نورفولك ئاراللىرى ۋاقتى</generic>
+ <standard draft="contributed">نورفولك ئاراللىرى ئۆلچەملىك ۋاقتى</standard>
+ <daylight draft="contributed">نورفولك ئاراللىرى يازلىق ۋاقتى</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -4903,7 +4905,7 @@
<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">ديۇيم سىماب تۈۋرۇكى</displayName>
<unitPattern count="one" draft="contributed">{0} ديۇيم سىماب تۈۋرۇكى</unitPattern>
<unitPattern count="other" draft="contributed">{0} ديۇيم سىماب تۈۋرۇكى</unitPattern>
@@ -5128,7 +5130,7 @@
<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">ديۇيم سىماب تۈۋرۇكى</displayName>
<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -5309,7 +5311,7 @@
<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one" draft="contributed">{0}" Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0}" Hg</unitPattern>
</unit>
diff --git a/common/main/ug_CN.xml b/common/main/ug_CN.xml
index 41ccee5..92114b4 100644
--- a/common/main/ug_CN.xml
+++ b/common/main/ug_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uk.xml b/common/main/uk.xml
index 76963ec..74cae29 100644
--- a/common/main/uk.xml
+++ b/common/main/uk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -47,6 +47,7 @@
<language type="arp">арапахо</language>
<language type="arq">алжирська арабська</language>
<language type="ars">надждійська арабська</language>
+ <language type="ars" alt="menu">арабська, надждійська</language>
<language type="arw">аравакська</language>
<language type="as">асамська</language>
<language type="asa">асу</language>
@@ -116,6 +117,7 @@
<language type="chr">черокі</language>
<language type="chy">чейєнн</language>
<language type="ckb">центральнокурдська</language>
+ <language type="ckb" alt="menu" draft="contributed">курдська, сорані</language>
<language type="co">корсиканська</language>
<language type="cop">коптська</language>
<language type="cr">крі</language>
@@ -171,6 +173,7 @@
<language type="eu">баскська</language>
<language type="ewo">евондо</language>
<language type="fa">перська</language>
+ <language type="fa_AF">дарі</language>
<language type="fan">фанг</language>
<language type="fat">фанті</language>
<language type="ff">фула</language>
@@ -580,6 +583,7 @@
<script type="Ahom" draft="contributed">ахом</script>
<script type="Arab">арабиця</script>
<script type="Arab" alt="variant">персько-арабська</script>
+ <script type="Aran" draft="contributed">насталік</script>
<script type="Armi">армі</script>
<script type="Armn">вірменська</script>
<script type="Avst">авестійський</script>
@@ -668,6 +672,7 @@
<script type="Nkoo">нко</script>
<script type="Ogam">огамічний</script>
<script type="Olck">сантальський</script>
+ <script type="Olck" alt="variant" draft="contributed">ол чікі</script>
<script type="Orkh">орхонський</script>
<script type="Orya">орія</script>
<script type="Osge" draft="contributed">осейджиська</script>
@@ -680,6 +685,7 @@
<script type="Phnx">фінікійський</script>
<script type="Plrd">писемність Полларда</script>
<script type="Prti">парфянський</script>
+ <script type="Qaag" draft="contributed">зоджі</script>
<script type="Rjng">реджанг</script>
<script type="Roro">ронго-ронго</script>
<script type="Runr">рунічний</script>
@@ -3103,9 +3109,9 @@
</field>
<field type="week-narrow">
<displayName>т</displayName>
- <relative type="-1" draft="contributed">минулого тижня</relative>
- <relative type="0" draft="contributed">цього тижня</relative>
- <relative type="1" draft="contributed">наступного тижня</relative>
+ <relative type="-1">минулого тижня</relative>
+ <relative type="0">цього тижня</relative>
+ <relative type="1">наступного тижня</relative>
<relativeTime type="future">
<relativeTimePattern count="one">за {0} тиж.</relativeTimePattern>
<relativeTimePattern count="few">за {0} тиж.</relativeTimePattern>
@@ -5691,7 +5697,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>за часом на острові Норфолк</standard>
+ <generic draft="contributed">за часом на острові Норфолк</generic>
+ <standard draft="contributed">за стандартним часом на острові Норфолк</standard>
+ <daylight draft="contributed">за літнім часом на острові Норфолк</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8030,9 +8038,83 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>деци{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>санти{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>мілі{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мікро{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>нано{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>піко{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>фемто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ато{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зепто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>йокто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>дека{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>гекто{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>кіло{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>мега{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>гіга{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>тера{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>пета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>екса{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>зета{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>йота{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} на {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>квадратні {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">квадратний {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">квадратні {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">квадратних {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">квадратного {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>кубічні {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">кубічний {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">кубічні {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">кубічних {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">кубічного {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8043,7 +8125,7 @@
<unitPattern count="many">{0} сил тяжіння</unitPattern>
<unitPattern count="other">{0} сили тяжіння</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри на секунду в квадраті</displayName>
<unitPattern count="one">{0} метр на секунду в квадраті</unitPattern>
<unitPattern count="few">{0} метри на секунду в квадраті</unitPattern>
@@ -8181,7 +8263,7 @@
<unitPattern count="many">{0} мілімолів на літр</unitPattern>
<unitPattern count="other">{0} мілімоля на літр</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>мільйонні долі</displayName>
<unitPattern count="one">{0} мільйонна доля</unitPattern>
<unitPattern count="few">{0} мільйонні долі</unitPattern>
@@ -8223,7 +8305,7 @@
<unitPattern count="many">{0} літрів на кілометр</unitPattern>
<unitPattern count="other">{0} літра на кілометр</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>літри на 100 кілометрів</displayName>
<unitPattern count="one">{0} літр на 100 кілометрів</unitPattern>
<unitPattern count="few">{0} літри на 100 кілометрів</unitPattern>
@@ -8329,11 +8411,11 @@
<unitPattern count="other">{0} століття</unitPattern>
</unit>
<unit type="duration-decade">
- <displayName draft="provisional">декади</displayName>
- <unitPattern count="one" draft="provisional">{0} декада</unitPattern>
- <unitPattern count="few" draft="provisional">{0} декади</unitPattern>
- <unitPattern count="many" draft="provisional">{0} декад</unitPattern>
- <unitPattern count="other" draft="provisional">{0} декади</unitPattern>
+ <displayName draft="contributed">декади</displayName>
+ <unitPattern count="one" draft="contributed">{0} декада</unitPattern>
+ <unitPattern count="few" draft="contributed">{0} декади</unitPattern>
+ <unitPattern count="many" draft="contributed">{0} декад</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} декади</unitPattern>
</unit>
<unit type="duration-year">
<displayName>роки</displayName>
@@ -8497,7 +8579,7 @@
<unitPattern count="other">{0} одиниці теплової британської</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">американський терм</displayName>
+ <displayName draft="contributed">американський терм</displayName>
<unitPattern count="one">{0} американський терм</unitPattern>
<unitPattern count="few">{0} американських терми</unitPattern>
<unitPattern count="many">{0} американських термів</unitPattern>
@@ -8546,18 +8628,18 @@
<unitPattern count="other">{0} герца</unitPattern>
</unit>
<unit type="graphics-em">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="graphics-megapixel">
<displayName>мегапікселі</displayName>
@@ -8567,32 +8649,32 @@
<unitPattern count="other">{0} мегапікселя</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="graphics-pixel-per-inch">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="graphics-dot-per-centimeter">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="graphics-dot-per-inch">
- <displayName draft="provisional">↑↑↑</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">↑↑↑</unitPattern>
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
<unit type="length-kilometer">
<displayName>кілометри</displayName>
@@ -8726,7 +8808,7 @@
<unitPattern count="other">{0} пункту</unitPattern>
</unit>
<unit type="length-solar-radius">
- <displayName draft="contributed">радіус Сонця</displayName>
+ <displayName>радіус Сонця</displayName>
<unitPattern count="one">{0} радіус Сонця</unitPattern>
<unitPattern count="few">{0} радіуси Сонця</unitPattern>
<unitPattern count="many">{0} радіусів Сонця</unitPattern>
@@ -8890,21 +8972,21 @@
<unitPattern count="many">{0} кінських сил</unitPattern>
<unitPattern count="other">{0} кінської сили</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>міліметри ртутного стовпа</displayName>
<unitPattern count="one">{0} міліметр ртутного стовпа</unitPattern>
<unitPattern count="few">{0} міліметри ртутного стовпа</unitPattern>
<unitPattern count="many">{0} міліметрів ртутного стовпа</unitPattern>
<unitPattern count="other">{0} міліметра ртутного стовпа</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунти на квадратний дюйм</displayName>
<unitPattern count="one">{0} фунт на квадратний дюйм</unitPattern>
<unitPattern count="few">{0} фунти на квадратний дюйм</unitPattern>
<unitPattern count="many">{0} фунтів на квадратний дюйм</unitPattern>
<unitPattern count="other">{0} фунта на квадратний дюйм</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйми ртутного стовпа</displayName>
<unitPattern count="one">{0} дюйм ртутного стовпа</unitPattern>
<unitPattern count="few">{0} дюйми ртутного стовпа</unitPattern>
@@ -9016,7 +9098,7 @@
<unitPattern count="many">{0} кельвінів</unitPattern>
<unitPattern count="other">{0} кельвіна</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>фунт-фути</displayName>
<unitPattern count="one">{0} фунт-фут</unitPattern>
<unitPattern count="few">{0} фунт-фути</unitPattern>
@@ -9233,20 +9315,94 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зп{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Е{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<displayName>сили тяжіння</displayName>
- <unitPattern count="one" draft="provisional">{0} g</unitPattern>
- <unitPattern count="few" draft="provisional">{0} g</unitPattern>
- <unitPattern count="many" draft="provisional">{0} g</unitPattern>
- <unitPattern count="other" draft="provisional">{0} g</unitPattern>
+ <unitPattern count="one" draft="contributed">{0} g</unitPattern>
+ <unitPattern count="few" draft="contributed">{0} g</unitPattern>
+ <unitPattern count="many" draft="contributed">{0} g</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>метри/с²</displayName>
<unitPattern count="one">{0} м/с²</unitPattern>
<unitPattern count="few">{0} м/с²</unitPattern>
@@ -9384,7 +9540,7 @@
<unitPattern count="many">{0} ммоль/л</unitPattern>
<unitPattern count="other">{0} ммоль/л</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>мільйонні долі</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="few">{0} ppm</unitPattern>
@@ -9426,7 +9582,7 @@
<unitPattern count="many">{0} л/км</unitPattern>
<unitPattern count="other">{0} л/км</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
@@ -9532,11 +9688,11 @@
<unitPattern count="other">{0} ст.</unitPattern>
</unit>
<unit type="duration-decade">
- <displayName draft="provisional">10-річчя</displayName>
- <unitPattern count="one" draft="provisional">{0} 10-річчя</unitPattern>
- <unitPattern count="few" draft="provisional">{0} 10-річчя</unitPattern>
- <unitPattern count="many" draft="provisional">{0} 10-річ</unitPattern>
- <unitPattern count="other" draft="provisional">{0} 10-річчя</unitPattern>
+ <displayName draft="contributed">10-річчя</displayName>
+ <unitPattern count="one" draft="contributed">{0} 10-річчя</unitPattern>
+ <unitPattern count="few" draft="contributed">{0} 10-річчя</unitPattern>
+ <unitPattern count="many" draft="contributed">{0} 10-річ</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} 10-річчя</unitPattern>
</unit>
<unit type="duration-year">
<displayName>р.</displayName>
@@ -9700,14 +9856,14 @@
<unitPattern count="other">{0} Отб</unitPattern>
</unit>
<unit type="energy-therm-us">
- <displayName draft="provisional">ам. терми</displayName>
- <unitPattern count="one" draft="provisional">{0} ам. терм</unitPattern>
- <unitPattern count="few" draft="provisional">{0} ам. терми</unitPattern>
- <unitPattern count="many" draft="provisional">{0} ам. термів</unitPattern>
- <unitPattern count="other" draft="provisional">{0} ам. терма</unitPattern>
+ <displayName draft="contributed">ам. терми</displayName>
+ <unitPattern count="one" draft="contributed">{0} ам. терм</unitPattern>
+ <unitPattern count="few" draft="contributed">{0} ам. терми</unitPattern>
+ <unitPattern count="many" draft="contributed">{0} ам. термів</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} ам. терма</unitPattern>
</unit>
<unit type="force-pound-force">
- <displayName draft="contributed">фунт-сила</displayName>
+ <displayName>фунт-сила</displayName>
<unitPattern count="one">{0} фнтс</unitPattern>
<unitPattern count="few">{0} фнтс</unitPattern>
<unitPattern count="many">{0} фнтс</unitPattern>
@@ -9749,18 +9905,18 @@
<unitPattern count="other">{0} Гц</unitPattern>
</unit>
<unit type="graphics-em">
- <displayName draft="provisional">em</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} em</unitPattern>
+ <displayName draft="contributed">em</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} em</unitPattern>
</unit>
<unit type="graphics-pixel">
- <displayName draft="provisional">px</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} px</unitPattern>
+ <displayName draft="contributed">px</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} px</unitPattern>
</unit>
<unit type="graphics-megapixel">
<displayName>Мп</displayName>
@@ -9770,32 +9926,32 @@
<unitPattern count="other">{0} Мп</unitPattern>
</unit>
<unit type="graphics-pixel-per-centimeter">
- <displayName draft="provisional">ppcm</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} ppcm</unitPattern>
+ <displayName draft="contributed">ppcm</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} ppcm</unitPattern>
</unit>
<unit type="graphics-pixel-per-inch">
- <displayName draft="provisional">ppi</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} ppi</unitPattern>
+ <displayName draft="contributed">ppi</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} ppi</unitPattern>
</unit>
<unit type="graphics-dot-per-centimeter">
- <displayName draft="provisional">dpcm</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} dpcm</unitPattern>
+ <displayName draft="contributed">dpcm</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} dpcm</unitPattern>
</unit>
<unit type="graphics-dot-per-inch">
- <displayName draft="provisional">dpi</displayName>
- <unitPattern count="one" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="few" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="many" draft="provisional">↑↑↑</unitPattern>
- <unitPattern count="other" draft="provisional">{0} dpi</unitPattern>
+ <displayName draft="contributed">dpi</displayName>
+ <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} dpi</unitPattern>
</unit>
<unit type="length-kilometer">
<displayName>км</displayName>
@@ -9929,11 +10085,11 @@
<unitPattern count="other">{0} пт</unitPattern>
</unit>
<unit type="length-solar-radius">
- <displayName draft="contributed">радіус Сонця</displayName>
- <unitPattern count="one" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="few" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="many" draft="contributed">↑↑↑</unitPattern>
- <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ <displayName>радіус Сонця</displayName>
+ <unitPattern count="one">↑↑↑</unitPattern>
+ <unitPattern count="few">↑↑↑</unitPattern>
+ <unitPattern count="many">↑↑↑</unitPattern>
+ <unitPattern count="other">↑↑↑</unitPattern>
</unit>
<unit type="light-lux">
<displayName>люкс</displayName>
@@ -10086,21 +10242,21 @@
<unitPattern count="many">{0} к. с.</unitPattern>
<unitPattern count="other">{0} к. с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>мм рт. ст.</displayName>
<unitPattern count="one">{0} мм рт. ст.</unitPattern>
<unitPattern count="few">{0} мм рт. ст.</unitPattern>
<unitPattern count="many">{0} мм рт. ст.</unitPattern>
<unitPattern count="other">{0} мм рт. ст.</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>фунт/дюйм²</displayName>
<unitPattern count="one">{0} фунт/дюйм²</unitPattern>
<unitPattern count="few">{0} фунти/дюйм²</unitPattern>
<unitPattern count="many">{0} фунтів/дюйм²</unitPattern>
<unitPattern count="other">{0} фунта/дюйм²</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>дюйми рт. ст.</displayName>
<unitPattern count="one">{0} дюйм рт. ст.</unitPattern>
<unitPattern count="few">{0} дюйми рт. ст.</unitPattern>
@@ -10108,7 +10264,7 @@
<unitPattern count="other">{0} дюйма рт. ст.</unitPattern>
</unit>
<unit type="pressure-bar">
- <displayName draft="provisional">бар</displayName>
+ <displayName draft="contributed">бар</displayName>
<unitPattern count="one">{0} бар</unitPattern>
<unitPattern count="few">{0} бар</unitPattern>
<unitPattern count="many">{0} бар</unitPattern>
@@ -10212,8 +10368,8 @@
<unitPattern count="many">{0} К</unitPattern>
<unitPattern count="other">{0} К</unitPattern>
</unit>
- <unit type="torque-pound-foot">
- <displayName draft="contributed">фунт-фут</displayName>
+ <unit type="torque-pound-force-foot">
+ <displayName>фунт-фут</displayName>
<unitPattern count="one">{0} фнт-фт</unitPattern>
<unitPattern count="few">{0} фнт-фт</unitPattern>
<unitPattern count="many">{0} фнт-фт</unitPattern>
@@ -10414,7 +10570,7 @@
<unitPattern count="other">{0} ч. л.</unitPattern>
</unit>
<unit type="volume-barrel">
- <displayName draft="contributed">барель</displayName>
+ <displayName>барель</displayName>
<unitPattern count="one">{0} бр.</unitPattern>
<unitPattern count="few">{0} бр.</unitPattern>
<unitPattern count="many">{0} бр.</unitPattern>
@@ -10429,9 +10585,83 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>д{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>с{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>м{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>мк{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>н{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>п{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>ф{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>а{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>зп{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>й{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>да{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>к{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>М{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>Г{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>Т{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>П{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>Е{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>З{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Й{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="few">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="many">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10442,7 +10672,7 @@
<unitPattern count="many" draft="contributed">{0} G</unitPattern>
<unitPattern count="other" draft="contributed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">м/с²</displayName>
<unitPattern count="one" draft="contributed">{0}м/с²</unitPattern>
<unitPattern count="few" draft="contributed">{0}м/с²</unitPattern>
@@ -10531,7 +10761,7 @@
<unitPattern count="many" draft="contributed">{0}моль</unitPattern>
<unitPattern count="other" draft="contributed">{0}моль</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>л/100 км</displayName>
<unitPattern count="one">{0} л/100 км</unitPattern>
<unitPattern count="few">{0} л/100 км</unitPattern>
@@ -10877,14 +11107,14 @@
<unitPattern count="many" draft="contributed">{0} к.с.</unitPattern>
<unitPattern count="other" draft="contributed">{0} к.с.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">ммрс</displayName>
<unitPattern count="one" draft="contributed">{0}ммрс</unitPattern>
<unitPattern count="few" draft="contributed">{0}ммрс</unitPattern>
<unitPattern count="many" draft="contributed">{0}ммрс</unitPattern>
<unitPattern count="other" draft="contributed">{0}ммрс</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="one" draft="contributed">{0}psi</unitPattern>
<unitPattern count="few" draft="contributed">{0}psi</unitPattern>
<unitPattern count="many" draft="contributed">{0}psi</unitPattern>
@@ -10940,7 +11170,7 @@
<unitPattern count="other" draft="contributed">{0}°</unitPattern>
</unit>
<unit type="temperature-celsius">
- <displayName draft="provisional">° Цельсія</displayName>
+ <displayName draft="contributed">° Цельсія</displayName>
<unitPattern count="one">{0}°C</unitPattern>
<unitPattern count="few">{0}°C</unitPattern>
<unitPattern count="many">{0}°C</unitPattern>
@@ -10958,7 +11188,7 @@
<unitPattern count="many" draft="contributed">{0} К</unitPattern>
<unitPattern count="other" draft="contributed">{0} К</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="one" draft="contributed">{0}фн-фт</unitPattern>
<unitPattern count="few" draft="contributed">{0}фн-фт</unitPattern>
@@ -11076,14 +11306,14 @@
<listPattern type="unit-narrow">
<listPatternPart type="start">{0}, {1}</listPatternPart>
<listPatternPart type="middle">{0}, {1}</listPatternPart>
- <listPatternPart type="end" draft="provisional">↑↑↑</listPatternPart>
- <listPatternPart type="2" draft="provisional">↑↑↑</listPatternPart>
+ <listPatternPart type="end" draft="contributed">↑↑↑</listPatternPart>
+ <listPatternPart type="2" draft="contributed">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="unit-short">
<listPatternPart type="start">{0}, {1}</listPatternPart>
<listPatternPart type="middle">{0}, {1}</listPatternPart>
- <listPatternPart type="end" draft="provisional">↑↑↑</listPatternPart>
- <listPatternPart type="2" draft="provisional">↑↑↑</listPatternPart>
+ <listPatternPart type="end" draft="contributed">↑↑↑</listPatternPart>
+ <listPatternPart type="2" draft="contributed">↑↑↑</listPatternPart>
</listPattern>
</listPatterns>
<posix>
diff --git a/common/main/uk_UA.xml b/common/main/uk_UA.xml
index 0f8ac58..8ea6a87 100644
--- a/common/main/uk_UA.xml
+++ b/common/main/uk_UA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ur.xml b/common/main/ur.xml
index b90b8f4..f606337 100644
--- a/common/main/ur.xml
+++ b/common/main/ur.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -121,6 +121,7 @@
<language type="eu">باسکی</language>
<language type="ewo">ایوانڈو</language>
<language type="fa">فارسی</language>
+ <language type="fa_AF">دری</language>
<language type="ff">فولہ</language>
<language type="fi">فینیش</language>
<language type="fil">فلیپینو</language>
@@ -149,7 +150,6 @@
<language type="gv">مینکس</language>
<language type="gwi">گوئچ ان</language>
<language type="ha">ہؤسا</language>
- <language type="hak">hak</language>
<language type="haw">ہوائی</language>
<language type="he">عبرانی</language>
<language type="hi">ہندی</language>
@@ -157,7 +157,6 @@
<language type="hmn">ہمانگ</language>
<language type="hr">کراتی</language>
<language type="hsb">اپر سربیائی</language>
- <language type="hsn">hsn</language>
<language type="ht">ہیتی</language>
<language type="hu">ہنگیرین</language>
<language type="hup">ہیوپا</language>
@@ -273,7 +272,6 @@
<language type="myv">ارزیا</language>
<language type="mzn">مزندرانی</language>
<language type="na">ناؤرو</language>
- <language type="nan">nan</language>
<language type="nap">نیاپولیٹن</language>
<language type="naq">ناما</language>
<language type="nb">نارویجین بوکمل</language>
@@ -416,7 +414,6 @@
<language type="war">وارے</language>
<language type="wbp">وارلپیری</language>
<language type="wo">وولوف</language>
- <language type="wuu">wuu</language>
<language type="xal">کالمیک</language>
<language type="xh">ژوسا</language>
<language type="xog">سوگا</language>
@@ -441,6 +438,7 @@
<scripts>
<script type="Arab">عربی</script>
<script type="Arab" alt="variant">فارسی عربی</script>
+ <script type="Aran" draft="contributed">نستعلیق</script>
<script type="Armn">آرمینیائی</script>
<script type="Beng">بنگالی</script>
<script type="Bopo">بوپوموفو</script>
@@ -4948,7 +4946,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>نارفوک آئلینڈ کا وقت</standard>
+ <generic draft="contributed">نارفوک آئلینڈ کا وقت</generic>
+ <standard draft="contributed">نارفوک آئلینڈ کا معیاری وقت</standard>
+ <daylight draft="contributed">نارفوک آئلینڈ کا موسم گرما کا وقت</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -6500,9 +6500,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ڈیسی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سینٹی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ملی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>مائکرو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نینو {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پکو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فیمٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>اٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زپٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ڈیکا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ہیکٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>میگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گیگا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ٹیرا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پیٹا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>اکسا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زیٹا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوٹا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} فی {1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">مربع {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">مربع {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>کیوبک {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">کیوبک {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">کیوبک {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6511,7 +6581,7 @@
<unitPattern count="one">{0} جی-فورس</unitPattern>
<unitPattern count="other">{0} جی-فورس</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>میٹر فی مربع سیکنڈ</displayName>
<unitPattern count="one">{0} میٹر فی مربع سیکنڈ</unitPattern>
<unitPattern count="other">{0} میٹر فی مربع سیکنڈ</unitPattern>
@@ -6611,7 +6681,7 @@
<unitPattern count="one">{0} ملی مول فی لیٹر</unitPattern>
<unitPattern count="other">{0} ملی مول فی لیٹر</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>فی ملین حصے</displayName>
<unitPattern count="one">{0} فی ملین حصے</unitPattern>
<unitPattern count="other">{0} فی ملین حصے</unitPattern>
@@ -6641,7 +6711,7 @@
<unitPattern count="one">{0} لیٹر فی کلومیٹر</unitPattern>
<unitPattern count="other">{0} لیٹر فی کلومیٹر</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیٹر فی 100 کلو میٹر</displayName>
<unitPattern count="one">{0} لیٹر فی 100 کلو میٹر</unitPattern>
<unitPattern count="other">{0} لیٹر فی 100 کلو میٹر</unitPattern>
@@ -7122,17 +7192,17 @@
<unitPattern count="one">{0} ہارس پاور</unitPattern>
<unitPattern count="other">{0} ہارس پاور</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>ملی میٹر مرکری</displayName>
<unitPattern count="one">{0} ملی میٹر مرکری</unitPattern>
<unitPattern count="other">{0} ملی میٹر مرکری</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>پاؤنڈز فی مربع انچ</displayName>
<unitPattern count="one">{0} پاؤنڈ فی مربع انچ</unitPattern>
<unitPattern count="other">{0} پاؤنڈز فی مربع انچ</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>انچ مرکری</displayName>
<unitPattern count="one">{0} انچ مرکری</unitPattern>
<unitPattern count="other">{0} انچ مرکری</unitPattern>
@@ -7212,7 +7282,7 @@
<unitPattern count="one">{0} کیلون</unitPattern>
<unitPattern count="other">{0} کیلون</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>پاؤنڈ فٹ</displayName>
<unitPattern count="one">{0} پاؤنڈ فٹ</unitPattern>
<unitPattern count="other">{0} پاؤنڈ فٹ</unitPattern>
@@ -7366,9 +7436,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ڈی۔ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سی۔ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>می۔ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نے۔ {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پی۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>ا۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>ز۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ڈے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ہے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کی{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>مے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گی۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ٹے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پے۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>ای۔{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زے{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یو{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7377,7 +7517,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7477,7 +7617,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>حصے/ملین</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7507,7 +7647,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیٹر/100 کلو میٹر</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7988,17 +8128,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8078,7 +8218,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8232,9 +8372,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>ڈیسی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>سینٹی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>ملی {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>نینو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>پکو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>فیمٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>اٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>زپٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>یوکٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>ڈیکا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>ہیکٹو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>کلو{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>میگا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>گیگا {0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>ٹیرا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>پیٹا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>اکسا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>زیٹا{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>یوٹا{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8283,7 +8493,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>لیٹر/100 کلو میٹر</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -8429,17 +8639,17 @@
<unitPattern count="one">{0}hp</unitPattern>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">mm Hg</displayName>
<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">psi</displayName>
<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">″ Hg</displayName>
<unitPattern count="one">{0} انچ مرکری</unitPattern>
<unitPattern count="other">{0} انچ مرکری</unitPattern>
diff --git a/common/main/ur_IN.xml b/common/main/ur_IN.xml
index 73ffbfe..a503289 100644
--- a/common/main/ur_IN.xml
+++ b/common/main/ur_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/ur_PK.xml b/common/main/ur_PK.xml
index 9efa514..a346076 100644
--- a/common/main/ur_PK.xml
+++ b/common/main/ur_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uz.xml b/common/main/uz.xml
index aaaa050..232e1c7 100644
--- a/common/main/uz.xml
+++ b/common/main/uz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="eu">bask</language>
<language type="ewo">evondo</language>
<language type="fa">fors</language>
+ <language type="fa_AF">dari</language>
<language type="ff">fula</language>
<language type="fi">fincha</language>
<language type="fil">filipincha</language>
@@ -146,7 +147,6 @@
<language type="gv">men</language>
<language type="gwi">gvichin</language>
<language type="ha">xausa</language>
- <language type="hak">hak</language>
<language type="haw">gavaycha</language>
<language type="he">ivrit</language>
<language type="hi">hind</language>
@@ -154,7 +154,6 @@
<language type="hmn">xmong</language>
<language type="hr">xorvat</language>
<language type="hsb">yuqori sorb</language>
- <language type="hsn">hsn</language>
<language type="ht">gaityan</language>
<language type="hu">venger</language>
<language type="hup">xupa</language>
@@ -268,7 +267,6 @@
<language type="myv">erzya</language>
<language type="mzn">mozandaron</language>
<language type="na">nauru</language>
- <language type="nan">nan</language>
<language type="nap">neapolitan</language>
<language type="naq">nama</language>
<language type="nb">norveg-bokmal</language>
@@ -407,7 +405,6 @@
<language type="war">varay</language>
<language type="wbp">valbiri</language>
<language type="wo">volof</language>
- <language type="wuu">wuu</language>
<language type="xal">qalmoq</language>
<language type="xh">kxosa</language>
<language type="xog">soga</language>
@@ -3155,7 +3152,7 @@
<exemplarCity>Oqto‘ba</exemplarCity>
</zone>
<zone type="Asia/Qostanay">
- <exemplarCity draft="provisional">Kustanay</exemplarCity>
+ <exemplarCity>Kustanay</exemplarCity>
</zone>
<zone type="Asia/Qyzylorda">
<exemplarCity>Qizilo‘rda</exemplarCity>
@@ -4393,7 +4390,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk oroli vaqti</standard>
+ <generic draft="contributed">Norfolk oroli vaqti</generic>
+ <standard draft="contributed">Norfolk oroli standart vaqti</standard>
+ <daylight draft="contributed">Norfolk oroli yozgi vaqti</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5028,9 +5027,9 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName>Xitoy yuani (ofshor)</displayName>
+ <displayName count="one">Xitoy yuani (ofshor)</displayName>
+ <displayName count="other">Xitoy yuani (ofshor)</displayName>
<symbol draft="contributed">CNH</symbol>
</currency>
<currency type="CNY">
@@ -5913,9 +5912,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>detsi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>santi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>mikro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>piko{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yokto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>gekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>eksa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0} kvadrat</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kvadrat</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kvadrat</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0} kub</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0} kub</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0} kub</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5924,7 +5993,7 @@
<unitPattern count="one">{0} grav. kuchi</unitPattern>
<unitPattern count="other">{0} grav. kuchi</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metr/soniya kvadrat</displayName>
<unitPattern count="one">{0} metr/soniya kvadrat</unitPattern>
<unitPattern count="other">{0} metr/soniya kvadrat</unitPattern>
@@ -6024,7 +6093,7 @@
<unitPattern count="one">{0} millimol/litr</unitPattern>
<unitPattern count="other">{0} millimol/litr</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>millionning ulushi</displayName>
<unitPattern count="one">milliondan {0}</unitPattern>
<unitPattern count="other">milliondan {0}</unitPattern>
@@ -6054,7 +6123,7 @@
<unitPattern count="one">{0} litr/kilometr</unitPattern>
<unitPattern count="other">{0} litr/kilometr</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>litr/100 km</displayName>
<unitPattern count="one">{0} litr/100 km</unitPattern>
<unitPattern count="other">{0} litr/100 km</unitPattern>
@@ -6530,17 +6599,17 @@
<unitPattern count="one">{0} ot kuchi</unitPattern>
<unitPattern count="other">{0} ot kuchi</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm simob ustuni</displayName>
<unitPattern count="one">{0} mm simob ustuni</unitPattern>
<unitPattern count="other">{0} mm simob ustuni</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funt/kvadrat duym</displayName>
<unitPattern count="one">{0} funt/kvadrat duym</unitPattern>
<unitPattern count="other">{0} funt/kvadrat duym</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>duym simob ustuni</displayName>
<unitPattern count="one">{0} duym simob ustuni</unitPattern>
<unitPattern count="other">{0} duym simob ustuni</unitPattern>
@@ -6620,7 +6689,7 @@
<unitPattern count="one">{0} kelvin</unitPattern>
<unitPattern count="other">{0} kelvin</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funt-fut</displayName>
<unitPattern count="one">{0} funt-fut</unitPattern>
<unitPattern count="other">{0} funt-fut</unitPattern>
@@ -6774,9 +6843,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>gekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -6785,7 +6924,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>metr/soniya²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6885,7 +7024,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6915,7 +7054,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0} L/100 km</unitPattern>
<unitPattern count="other">{0} L/100 km</unitPattern>
@@ -7391,17 +7530,17 @@
<unitPattern count="one">{0} o.k.</unitPattern>
<unitPattern count="other">{0} o.k.</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm sim.ust</displayName>
<unitPattern count="one">{0} mm sim.ust</unitPattern>
<unitPattern count="other">{0} mm sim.ust</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>funt/kv.dy</displayName>
<unitPattern count="one">{0} funt/kv.dy</unitPattern>
<unitPattern count="other">{0} funt/kv.dy</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>dy sim.ust</displayName>
<unitPattern count="one">{0} dy sim.ust</unitPattern>
<unitPattern count="other">{0} dy sim.ust</unitPattern>
@@ -7481,7 +7620,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>funt-fut</displayName>
<unitPattern count="one">{0} funt-fut</unitPattern>
<unitPattern count="other">{0} funt-fut</unitPattern>
@@ -7635,9 +7774,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>s{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>gekto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7686,7 +7895,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100 km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -7805,7 +8014,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/uz_Arab.xml b/common/main/uz_Arab.xml
index 6b8cf45..bc632b3 100644
--- a/common/main/uz_Arab.xml
+++ b/common/main/uz_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uz_Arab_AF.xml b/common/main/uz_Arab_AF.xml
index 68bdb4d..4e59b3d 100644
--- a/common/main/uz_Arab_AF.xml
+++ b/common/main/uz_Arab_AF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uz_Cyrl.xml b/common/main/uz_Cyrl.xml
index 4fba154..60be9e6 100644
--- a/common/main/uz_Cyrl.xml
+++ b/common/main/uz_Cyrl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2250,7 +2250,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Норфолк ороли вақти</standard>
+ <generic draft="contributed">Норфолк ороли вақти</generic>
+ <standard draft="contributed">Норфолк ороли стандарт вақти</standard>
+ <daylight draft="contributed">Норфолк ороли ёзги вақти</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -3137,7 +3139,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -3372,7 +3374,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="provisional">inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -3572,7 +3574,7 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
</unit>
diff --git a/common/main/uz_Cyrl_UZ.xml b/common/main/uz_Cyrl_UZ.xml
index 7274df5..f56f90d 100644
--- a/common/main/uz_Cyrl_UZ.xml
+++ b/common/main/uz_Cyrl_UZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uz_Latn.xml b/common/main/uz_Latn.xml
index 1a815f1..c2ee6ec 100644
--- a/common/main/uz_Latn.xml
+++ b/common/main/uz_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/uz_Latn_UZ.xml b/common/main/uz_Latn_UZ.xml
index 582dc86..54150e5 100644
--- a/common/main/uz_Latn_UZ.xml
+++ b/common/main/uz_Latn_UZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vai.xml b/common/main/vai.xml
index b226f96..8cad738 100644
--- a/common/main/vai.xml
+++ b/common/main/vai.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -206,7 +206,6 @@
<territory type="MF">ꕪꘋꕓ ꗞꗢ ꕮꕊꔳꘋ</territory>
<territory type="MG">ꕮꕜꕭꔻꕪ</territory>
<territory type="MH">ꕮꕊꕣ ꔳꘋꗣ</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">ꕮꔷ</territory>
<territory type="MM">ꕆꕩꘋꕮ</territory>
<territory type="MN">ꗞꖐꔷꕩ</territory>
diff --git a/common/main/vai_Latn.xml b/common/main/vai_Latn.xml
index 56af00a..577d76a 100644
--- a/common/main/vai_Latn.xml
+++ b/common/main/vai_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Mɔlidova</territory>
<territory type="MG">Madagasita</territory>
<territory type="MH">Masha Tiŋŋɛ</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Miyamaha</territory>
<territory type="MN">Mɔngoliya</territory>
@@ -349,24 +348,6 @@
</dateTimeFormats>
</calendar>
<calendar type="gregorian">
- <months>
- <monthContext type="format">
- <monthWidth type="wide">
- <month type="1">luukao kemã</month>
- <month type="2">ɓandaɓu</month>
- <month type="3">vɔɔ</month>
- <month type="4">fulu</month>
- <month type="5">goo</month>
- <month type="6">6</month>
- <month type="7">7</month>
- <month type="8">kɔnde</month>
- <month type="9">saah</month>
- <month type="10">galo</month>
- <month type="11">kenpkato ɓololɔ</month>
- <month type="12">luukao lɔma</month>
- </monthWidth>
- </monthContext>
- </months>
<days>
<dayContext type="format">
<dayWidth type="wide">
diff --git a/common/main/vai_Latn_LR.xml b/common/main/vai_Latn_LR.xml
index e298881..01cc552 100644
--- a/common/main/vai_Latn_LR.xml
+++ b/common/main/vai_Latn_LR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vai_Vaii.xml b/common/main/vai_Vaii.xml
index a0a416c..943eeb1 100644
--- a/common/main/vai_Vaii.xml
+++ b/common/main/vai_Vaii.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vai_Vaii_LR.xml b/common/main/vai_Vaii_LR.xml
index 319aee9..4ac0f29 100644
--- a/common/main/vai_Vaii_LR.xml
+++ b/common/main/vai_Vaii_LR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vi.xml b/common/main/vi.xml
index 53c79bf..eded1e6 100644
--- a/common/main/vi.xml
+++ b/common/main/vi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -119,6 +119,7 @@
<language type="chr">Tiếng Cherokee</language>
<language type="chy">Tiếng Cheyenne</language>
<language type="ckb">Tiếng Kurd Miền Trung</language>
+ <language type="ckb" alt="variant">Tiếng Kurd Sorani</language>
<language type="co">Tiếng Corsica</language>
<language type="cop">Tiếng Coptic</language>
<language type="cps">Tiếng Capiznon</language>
@@ -179,6 +180,7 @@
<language type="ewo">Tiếng Ewondo</language>
<language type="ext">Tiếng Extremadura</language>
<language type="fa">Tiếng Ba Tư</language>
+ <language type="fa_AF" draft="contributed">Tiếng Dari</language>
<language type="fan">Tiếng Fang</language>
<language type="fat">Tiếng Fanti</language>
<language type="ff">Tiếng Fulah</language>
@@ -591,12 +593,11 @@
<language type="zza">Tiếng Zaza</language>
</languages>
<scripts>
- <script type="Adlm" draft="contributed">↑↑↑</script>
<script type="Afak" draft="contributed">Chữ Afaka</script>
- <script type="Aghb" draft="contributed">↑↑↑</script>
<script type="Ahom" draft="contributed">↑↑↑</script>
<script type="Arab">Chữ Ả Rập</script>
<script type="Arab" alt="variant">Chữ Ba Tư-Ả Rập</script>
+ <script type="Aran" draft="contributed">Chữ Nastaliq</script>
<script type="Armi" draft="contributed">Chữ Imperial Aramaic</script>
<script type="Armn">Chữ Armenia</script>
<script type="Avst" draft="contributed">Chữ Avestan</script>
@@ -605,7 +606,6 @@
<script type="Bass" draft="contributed">Chữ Bassa Vah</script>
<script type="Batk" draft="contributed">Chữ Batak</script>
<script type="Beng">Chữ Bangla</script>
- <script type="Bhks" draft="contributed">↑↑↑</script>
<script type="Blis" draft="contributed">Chữ Blissymbols</script>
<script type="Bopo">Chữ Bopomofo</script>
<script type="Brah" draft="contributed">Chữ Brahmi</script>
@@ -623,20 +623,15 @@
<script type="Cyrl">Chữ Kirin</script>
<script type="Cyrs" draft="contributed">Chữ Kirin Slavơ Nhà thờ cổ</script>
<script type="Deva">Chữ Devanagari</script>
- <script type="Dogr" draft="contributed">↑↑↑</script>
<script type="Dsrt" draft="contributed">Chữ Deseret</script>
<script type="Dupl" draft="contributed">Chữ tốc ký Duployan</script>
<script type="Egyd" draft="contributed">Chữ Ai Cập bình dân</script>
<script type="Egyh" draft="contributed">Chữ Ai Cập thày tu</script>
<script type="Egyp" draft="contributed">Chữ tượng hình Ai Cập</script>
- <script type="Elba" draft="contributed">↑↑↑</script>
- <script type="Elym" draft="contributed">↑↑↑</script>
<script type="Ethi">Chữ Ethiopia</script>
<script type="Geok" draft="contributed">Chữ Khutsuri Georgia</script>
<script type="Geor">Chữ Georgia</script>
<script type="Glag" draft="contributed">Chữ Glagolitic</script>
- <script type="Gong" draft="contributed">↑↑↑</script>
- <script type="Gonm" draft="contributed">↑↑↑</script>
<script type="Goth" draft="contributed">Chữ Gô-tích</script>
<script type="Gran" draft="contributed">Chữ Grantha</script>
<script type="Grek">Chữ Hy Lạp</script>
@@ -650,12 +645,10 @@
<script type="Hans" alt="stand-alone">Chữ Hán giản thể</script>
<script type="Hant">Phồn thể</script>
<script type="Hant" alt="stand-alone">Chữ Hán phồn thể</script>
- <script type="Hatr" draft="contributed">↑↑↑</script>
<script type="Hebr">Chữ Do Thái</script>
<script type="Hira">Chữ Hiragana</script>
<script type="Hluw" draft="contributed">Chữ tượng hình Anatolia</script>
<script type="Hmng" draft="contributed">Chữ Pahawh Hmong</script>
- <script type="Hmnp" draft="contributed">↑↑↑</script>
<script type="Hrkt">Bảng ký hiệu âm tiết Tiếng Nhật</script>
<script type="Hung" draft="contributed">Chữ Hungary cổ</script>
<script type="Inds" draft="contributed">Chữ Indus</script>
@@ -686,13 +679,9 @@
<script type="Loma" draft="contributed">Chữ Loma</script>
<script type="Lyci" draft="contributed">Chữ Lycia</script>
<script type="Lydi" draft="contributed">Chữ Lydia</script>
- <script type="Mahj" draft="contributed">↑↑↑</script>
- <script type="Maka" draft="contributed">↑↑↑</script>
<script type="Mand" draft="contributed">Chữ Mandaean</script>
<script type="Mani" draft="contributed">Chữ Manichaean</script>
- <script type="Marc" draft="contributed">↑↑↑</script>
<script type="Maya" draft="contributed">Chữ tượng hình Maya</script>
- <script type="Medf" draft="contributed">↑↑↑</script>
<script type="Mend" draft="contributed">Chữ Mende</script>
<script type="Merc" draft="contributed">Chữ Meroitic Nét thảo</script>
<script type="Mero" draft="contributed">Chữ Meroitic</script>
@@ -702,9 +691,7 @@
<script type="Moon" draft="contributed">Chữ nổi Moon</script>
<script type="Mroo" draft="contributed">Chữ Mro</script>
<script type="Mtei" draft="contributed">Chữ Meitei Mayek</script>
- <script type="Mult" draft="contributed">↑↑↑</script>
<script type="Mymr">Chữ Myanmar</script>
- <script type="Nand" draft="contributed">↑↑↑</script>
<script type="Narb" draft="contributed">Chữ Bắc Ả Rập cổ</script>
<script type="Nbat" draft="contributed">Chữ Nabataean</script>
<script type="Newa" draft="contributed">↑↑↑</script>
@@ -715,10 +702,8 @@
<script type="Olck" draft="contributed">Chữ Ol Chiki</script>
<script type="Orkh" draft="contributed">Chữ Orkhon</script>
<script type="Orya">Chữ Odia</script>
- <script type="Osge" draft="contributed">↑↑↑</script>
<script type="Osma" draft="contributed">Chữ Osmanya</script>
<script type="Palm" draft="contributed">Chữ Palmyrene</script>
- <script type="Pauc" draft="contributed">↑↑↑</script>
<script type="Perm" draft="contributed">Chữ Permic cổ</script>
<script type="Phag" draft="contributed">Chữ Phags-pa</script>
<script type="Phli" draft="contributed">Chữ Pahlavi Văn bia</script>
@@ -727,9 +712,8 @@
<script type="Phnx" draft="contributed">Chữ Phoenicia</script>
<script type="Plrd" draft="contributed">Ngữ âm Pollard</script>
<script type="Prti" draft="contributed">Chữ Parthia Văn bia</script>
- <script type="Qaag" draft="contributed">↑↑↑</script>
+ <script type="Qaag" draft="contributed">Chữ Zawgyi</script>
<script type="Rjng" draft="contributed">Chữ Rejang</script>
- <script type="Rohg" draft="contributed">↑↑↑</script>
<script type="Roro" draft="contributed">Chữ Rongorongo</script>
<script type="Runr" draft="contributed">Chữ Runic</script>
<script type="Samr" draft="contributed">Chữ Samaritan</script>
@@ -739,13 +723,9 @@
<script type="Sgnw" draft="contributed">Chữ viết Ký hiệu</script>
<script type="Shaw" draft="contributed">Chữ Shavian</script>
<script type="Shrd" draft="contributed">Chữ Sharada</script>
- <script type="Sidd" draft="contributed">↑↑↑</script>
<script type="Sind" draft="contributed">Chữ Khudawadi</script>
<script type="Sinh">Chữ Sinhala</script>
- <script type="Sogd" draft="contributed">↑↑↑</script>
- <script type="Sogo" draft="contributed">↑↑↑</script>
<script type="Sora" draft="contributed">Chữ Sora Sompeng</script>
- <script type="Soyo" draft="contributed">↑↑↑</script>
<script type="Sund" draft="contributed">Chữ Xu-đăng</script>
<script type="Sylo" draft="contributed">Chữ Syloti Nagri</script>
<script type="Syrc" draft="contributed">Chữ Syria</script>
@@ -771,12 +751,10 @@
<script type="Vaii" draft="contributed">Chữ Vai</script>
<script type="Visp" draft="contributed">Tiếng nói Nhìn thấy được</script>
<script type="Wara" draft="contributed">Chữ Varang Kshiti</script>
- <script type="Wcho" draft="contributed">↑↑↑</script>
<script type="Wole" draft="contributed">Chữ Woleai</script>
<script type="Xpeo" draft="contributed">Chữ Ba Tư cổ</script>
<script type="Xsux" draft="contributed">Chữ hình nêm Sumero-Akkadian</script>
<script type="Yiii" draft="contributed">Chữ Di</script>
- <script type="Zanb" draft="contributed">↑↑↑</script>
<script type="Zinh" draft="contributed">Chữ Kế thừa</script>
<script type="Zmth">Ký hiệu Toán học</script>
<script type="Zsye">Biểu tượng</script>
@@ -1106,84 +1084,45 @@
<variant type="1606NICT" draft="contributed">Tiếng Pháp từ Cuối thời Trung cổ đến 1606</variant>
<variant type="1694ACAD" draft="contributed">Tiếng Pháp Hiện đại Thời kỳ đầu</variant>
<variant type="1959ACAD" draft="contributed">Hàn lâm</variant>
- <variant type="ABL1943" draft="contributed">↑↑↑</variant>
- <variant type="AKUAPEM" draft="contributed">↑↑↑</variant>
<variant type="ALALC97" draft="contributed">La Mã hóa ALA-LC, ấn bản năm 1997</variant>
<variant type="ALUKU" draft="contributed">Phương ngữ Aluku</variant>
- <variant type="AO1990" draft="contributed">↑↑↑</variant>
- <variant type="ARANES" draft="contributed">↑↑↑</variant>
<variant type="AREVELA" draft="contributed">Tiếng Armenia Miền Đông</variant>
<variant type="AREVMDA" draft="contributed">Tiếng Armenia Miền Tây</variant>
- <variant type="ASANTE" draft="contributed">↑↑↑</variant>
- <variant type="AUVERN" draft="contributed">↑↑↑</variant>
<variant type="BAKU1926" draft="contributed">Bảng chữ cái La-tinh Tiếng Turk Hợp nhất</variant>
- <variant type="BALANKA" draft="contributed">↑↑↑</variant>
- <variant type="BARLA" draft="contributed">↑↑↑</variant>
- <variant type="BASICENG" draft="contributed">↑↑↑</variant>
<variant type="BISKE" draft="contributed">Phương ngữ San Giorgio/Bila</variant>
<variant type="BOHORIC" draft="contributed">Bảng chữ cái Bohorič</variant>
<variant type="BOONT" draft="contributed">Tiếng Boontling</variant>
- <variant type="CISAUP" draft="contributed">↑↑↑</variant>
- <variant type="COLB1945" draft="contributed">↑↑↑</variant>
- <variant type="CORNU" draft="contributed">↑↑↑</variant>
- <variant type="CREISS" draft="contributed">↑↑↑</variant>
<variant type="DAJNKO" draft="contributed">Bảng chữ cái Dajnko</variant>
- <variant type="EKAVSK" draft="contributed">↑↑↑</variant>
<variant type="EMODENG" draft="contributed">Tiếng Anh Hiện đại Thời kỳ đầu</variant>
<variant type="FONIPA" draft="contributed">Ngữ âm học IPA</variant>
- <variant type="FONKIRSH" draft="contributed">↑↑↑</variant>
- <variant type="FONNAPA" draft="contributed">↑↑↑</variant>
<variant type="FONUPA" draft="contributed">Ngữ âm học UPA</variant>
- <variant type="GASCON" draft="contributed">↑↑↑</variant>
- <variant type="GRCLASS" draft="contributed">↑↑↑</variant>
- <variant type="GRITAL" draft="contributed">↑↑↑</variant>
- <variant type="GRMISTR" draft="contributed">↑↑↑</variant>
<variant type="HEPBURN" draft="contributed">La mã hóa Hepburn</variant>
- <variant type="HSISTEMO" draft="contributed">↑↑↑</variant>
- <variant type="IJEKAVSK" draft="contributed">↑↑↑</variant>
- <variant type="IVANCHOV" draft="contributed">↑↑↑</variant>
<variant type="KKCOR" draft="contributed">Phép chính tả Chung</variant>
- <variant type="KOCIEWIE" draft="contributed">↑↑↑</variant>
<variant type="KSCOR" draft="contributed">Phép chính tả Chuẩn</variant>
- <variant type="LEMOSIN" draft="contributed">↑↑↑</variant>
- <variant type="LENGADOC" draft="contributed">↑↑↑</variant>
<variant type="LIPAW" draft="contributed">Phương ngữ Lipovaz của người Resian</variant>
<variant type="METELKO" draft="contributed">Bảng chữ cái Metelko</variant>
<variant type="MONOTON" draft="contributed">Đơn âm</variant>
<variant type="NDYUKA" draft="contributed">Phương ngữ Ndyuka</variant>
<variant type="NEDIS" draft="contributed">Phương ngữ Natisone</variant>
- <variant type="NEWFOUND" draft="contributed">↑↑↑</variant>
- <variant type="NICARD" draft="contributed">↑↑↑</variant>
<variant type="NJIVA" draft="contributed">Phương ngữ Gniva/Njiva</variant>
<variant type="NULIK" draft="contributed">Tiếng Volapük Hiện đại</variant>
<variant type="OSOJS" draft="contributed">Phương ngữ Oseacco/Osojane</variant>
- <variant type="OXENDICT" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH2" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH3" draft="contributed">↑↑↑</variant>
- <variant type="PAHAWH4" draft="contributed">↑↑↑</variant>
<variant type="PAMAKA" draft="contributed">Phương ngữ Pamaka</variant>
<variant type="PINYIN" draft="contributed">La Mã hóa Bính âm</variant>
<variant type="POLYTON" draft="contributed">Đa âm</variant>
<variant type="POSIX" draft="contributed">Máy tính</variant>
- <variant type="PROVENC" draft="contributed">↑↑↑</variant>
<variant type="REVISED" draft="contributed">Phép chính tả Sửa đổi</variant>
<variant type="RIGIK" draft="contributed">Tiếng Volapük Cổ điển</variant>
<variant type="ROZAJ" draft="contributed">Tiếng Resian</variant>
<variant type="SAAHO" draft="contributed">Tiếng Saho</variant>
<variant type="SCOTLAND" draft="contributed">Tiếng Anh chuẩn tại Scotland</variant>
<variant type="SCOUSE" draft="contributed">Phương ngữ Liverpool</variant>
- <variant type="SIMPLE" draft="contributed">↑↑↑</variant>
<variant type="SOLBA" draft="contributed">Phương ngữ Stolvizza/Solbica</variant>
- <variant type="SOTAV" draft="contributed">↑↑↑</variant>
- <variant type="SPANGLIS" draft="contributed">↑↑↑</variant>
<variant type="TARASK" draft="contributed">Phép chính tả Taraskievica</variant>
<variant type="UCCOR" draft="contributed">Phép chính tả Hợp nhất</variant>
<variant type="UCRCOR" draft="contributed">Phép chính tả Sửa đổi Hợp nhất</variant>
- <variant type="UNIFON" draft="contributed">↑↑↑</variant>
<variant type="VALENCIA" draft="contributed">Tiếng Valencia</variant>
- <variant type="VIVARAUP" draft="contributed">↑↑↑</variant>
<variant type="WADEGILE" draft="contributed">La Mã hóa Wade-Giles</variant>
- <variant type="XSISTEMO" draft="contributed">↑↑↑</variant>
</variants>
<keys>
<key type="calendar">Lịch</key>
@@ -7248,7 +7187,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Giờ đảo Norfolk</standard>
+ <generic draft="contributed">Giờ Đảo Norfolk</generic>
+ <standard draft="contributed">Giờ Chuẩn Đảo Norfolk</standard>
+ <daylight draft="contributed">Giờ Mùa Hè Đảo Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -7689,8 +7630,6 @@
<symbol draft="contributed">AFN</symbol>
</currency>
<currency type="ALK">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
@@ -7950,8 +7889,6 @@
<symbol draft="contributed">CNH</symbol>
</currency>
<currency type="CNX">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNY">
@@ -8207,8 +8144,6 @@
<displayName draft="contributed">Pao Ixraen</displayName>
</currency>
<currency type="ILR">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ILS">
@@ -8234,8 +8169,6 @@
<symbol draft="contributed">IRR</symbol>
</currency>
<currency type="ISJ">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ISK">
@@ -8456,8 +8389,6 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVP">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVR">
@@ -8844,8 +8775,6 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UYW">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
@@ -8945,16 +8874,12 @@
<displayName draft="contributed">Quỹ RINET</displayName>
</currency>
<currency type="XSU">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XTS">
<displayName draft="contributed">Mã Tiền tệ Kiểm tra</displayName>
</currency>
<currency type="XUA">
- <displayName draft="contributed">↑↑↑</displayName>
- <displayName count="other" draft="contributed">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XXX">
@@ -9031,9 +8956,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>đề-xi-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>xăng-ti-{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>mili{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9041,7 +9034,7 @@
<displayName>lực g</displayName>
<unitPattern count="other">{0} lực g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9122,7 +9115,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9146,7 +9139,7 @@
<displayName>lít/km</displayName>
<unitPattern count="other">{0} lít/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>lít/100km</displayName>
<unitPattern count="other">{0} l/100km</unitPattern>
</unit>
@@ -9542,15 +9535,15 @@
<displayName>mã lực</displayName>
<unitPattern count="other">{0} mã lực</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>milimét thủy ngân</displayName>
<unitPattern count="other">{0} milimét thủy ngân</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>pound/inch vuông</displayName>
<unitPattern count="other">{0} pound/inch vuông</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inch thủy ngân</displayName>
<unitPattern count="other">{0} inch thủy ngân</unitPattern>
</unit>
@@ -9614,7 +9607,7 @@
<displayName>độ K</displayName>
<unitPattern count="other">{0} độ K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>pound-feet</displayName>
<unitPattern count="other">{0} pound-feet</unitPattern>
</unit>
@@ -9744,9 +9737,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9754,7 +9815,7 @@
<displayName>lực g</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9835,7 +9896,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -9859,7 +9920,7 @@
<displayName>l/km</displayName>
<unitPattern count="other">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -10255,15 +10316,15 @@
<displayName>hp</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -10327,7 +10388,7 @@
<displayName>K</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
</unit>
@@ -10457,9 +10518,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -10494,7 +10623,7 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -10635,7 +10764,7 @@
<unit type="power-horsepower">
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
<unit type="pressure-millibar">
@@ -10666,7 +10795,7 @@
<displayName>°C</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
diff --git a/common/main/vi_VN.xml b/common/main/vi_VN.xml
index 1c015ed..1d62f93 100644
--- a/common/main/vi_VN.xml
+++ b/common/main/vi_VN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vo.xml b/common/main/vo.xml
index 55013f1..448a2aa 100644
--- a/common/main/vo.xml
+++ b/common/main/vo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vo_001.xml b/common/main/vo_001.xml
index 325ff46..d77aadd 100644
--- a/common/main/vo_001.xml
+++ b/common/main/vo_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/vun.xml b/common/main/vun.xml
index f217fb0..02bf87c 100644
--- a/common/main/vun.xml
+++ b/common/main/vun.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Moldova</territory>
<territory type="MG">Bukini</territory>
<territory type="MH">Visiwa vya Marshal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myama</territory>
<territory type="MN">Mongolia</territory>
diff --git a/common/main/vun_TZ.xml b/common/main/vun_TZ.xml
index 736162e..d8d0716 100644
--- a/common/main/vun_TZ.xml
+++ b/common/main/vun_TZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/wae.xml b/common/main/wae.xml
index 83cd58b..0237052 100644
--- a/common/main/wae.xml
+++ b/common/main/wae.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -374,7 +374,6 @@
<territory type="MF" draft="contributed">St. Martin</territory>
<territory type="MG" draft="contributed">Madagaskar</territory>
<territory type="MH" draft="contributed">Maršalinslä</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML" draft="contributed">Mali</territory>
<territory type="MM" draft="contributed">Burma</territory>
<territory type="MN" draft="contributed">Mongolei</territory>
diff --git a/common/main/wae_CH.xml b/common/main/wae_CH.xml
index 93caece..e862a7e 100644
--- a/common/main/wae_CH.xml
+++ b/common/main/wae_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/wo.xml b/common/main/wo.xml
index eda6f37..ac2b2bf 100644
--- a/common/main/wo.xml
+++ b/common/main/wo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/wo_SN.xml b/common/main/wo_SN.xml
index c48f979..b64c902 100644
--- a/common/main/wo_SN.xml
+++ b/common/main/wo_SN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/xh.xml b/common/main/xh.xml
index 25798e0..8fea1b1 100644
--- a/common/main/xh.xml
+++ b/common/main/xh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/xh_ZA.xml b/common/main/xh_ZA.xml
index 31c1509..7496967 100644
--- a/common/main/xh_ZA.xml
+++ b/common/main/xh_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/xog.xml b/common/main/xog.xml
index 0677237..6526c64 100644
--- a/common/main/xog.xml
+++ b/common/main/xog.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">Molodova</territory>
<territory type="MG">Madagasika</territory>
<territory type="MH">Bizinga bya Mariso</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">Mali</territory>
<territory type="MM">Myanima</territory>
<territory type="MN">Mongoliya</territory>
diff --git a/common/main/xog_UG.xml b/common/main/xog_UG.xml
index 140f083..c1eb676 100644
--- a/common/main/xog_UG.xml
+++ b/common/main/xog_UG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yav.xml b/common/main/yav.xml
index ef61467..e2454fa 100644
--- a/common/main/yav.xml
+++ b/common/main/yav.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -184,7 +184,6 @@
<territory type="MD">moltafí</territory>
<territory type="MG">matakaskáal</territory>
<territory type="MH">ílmalasáal</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">malí</territory>
<territory type="MM">miaŋmáal</territory>
<territory type="MN">mongolí</territory>
diff --git a/common/main/yav_CM.xml b/common/main/yav_CM.xml
index f54983a..b136b68 100644
--- a/common/main/yav_CM.xml
+++ b/common/main/yav_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yi.xml b/common/main/yi.xml
index 1c56e77..1e5083e 100644
--- a/common/main/yi.xml
+++ b/common/main/yi.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -140,7 +140,6 @@
<language type="sk">סלאוואַקיש</language>
<language type="sl">סלאוועניש</language>
<language type="sli">אונטער שלעזיש</language>
- <language type="sly">sly</language>
<language type="sm">סאַמאאַניש</language>
<language type="sn">שאנאַ</language>
<language type="so">סאמאַליש</language>
@@ -314,7 +313,6 @@
<territory type="ME">מאנטענעגרא</territory>
<territory type="MG">מאַדאַגאַסקאַר</territory>
<territory type="MH">מאַרשאַל אינזלען</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">מאַלי</territory>
<territory type="MM">מיאַנמאַר</territory>
<territory type="MN">מאנגאליי</territory>
diff --git a/common/main/yi_001.xml b/common/main/yi_001.xml
index 1e2e19f..cf9dca7 100644
--- a/common/main/yi_001.xml
+++ b/common/main/yi_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yo.xml b/common/main/yo.xml
index 025d4e7..d1a9106 100644
--- a/common/main/yo.xml
+++ b/common/main/yo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -18,35 +18,50 @@
</localeDisplayPattern>
<languages>
<language type="af">Èdè Afrikani</language>
+ <language type="agq">Ágẹ̀ẹ̀mù</language>
<language type="ak">Èdè Akani</language>
<language type="am">Èdè Amariki</language>
<language type="ar">Èdè Árábìkì</language>
<language type="ar_001">↑↑↑</language>
<language type="as">Ti Assam</language>
- <language type="asa">↑↑↑</language>
- <language type="ast">↑↑↑</language>
+ <language type="asa">Asu</language>
+ <language type="ast">Asturian</language>
<language type="az">Èdè Azerbaijani</language>
<language type="az" alt="short">↑↑↑</language>
- <language type="bas">↑↑↑</language>
+ <language type="bas">Basaa</language>
<language type="be">Èdè Belarusi</language>
- <language type="bem">↑↑↑</language>
- <language type="bez">↑↑↑</language>
+ <language type="bem">Béḿbà</language>
+ <language type="bez">Bẹ́nà</language>
<language type="bg">Èdè Bugaria</language>
- <language type="bm">↑↑↑</language>
+ <language type="bm">Báḿbàrà</language>
<language type="bn">Èdè Bengali</language>
+ <language type="bo">Tibetán</language>
<language type="br">Èdè Bretoni</language>
- <language type="brx">↑↑↑</language>
+ <language type="brx">Bódò</language>
<language type="bs">Èdè Bosnia</language>
<language type="ca">Èdè Catala</language>
- <language type="ccp">↑↑↑</language>
- <language type="ceb">↑↑↑</language>
- <language type="ckb">↑↑↑</language>
+ <language type="ccp">Chakma</language>
+ <language type="ce">Chechen</language>
+ <language type="ceb">Cebuano</language>
+ <language type="cgg">Chiga</language>
+ <language type="chr">Shẹ́rókiì</language>
+ <language type="ckb">Ààrin Gbùngbùn Kurdish</language>
+ <language type="co">Corsican</language>
<language type="cs">Èdè seeki</language>
+ <language type="cu">Síláfííkì Ilé Ìjọ́sìn</language>
<language type="cy">Èdè Welshi</language>
<language type="da">Èdè Ilẹ̀ Denmark</language>
+ <language type="dav">Táítà</language>
<language type="de">Èdè Jámánì</language>
<language type="de_AT">Èdè Jámánì (Ọ́síríà )</language>
<language type="de_CH">Èdè Ilẹ̀ Jámánì (Orílẹ́ède swítsàlandì)</language>
+ <language type="dje">Ṣárúmà</language>
+ <language type="dsb">Ṣobíànù Ìpìlẹ̀</language>
+ <language type="dua">Duala</language>
+ <language type="dyo">Jola-Fonyi</language>
+ <language type="dz">Dzongkha</language>
+ <language type="ebu">Ẹmbù</language>
+ <language type="ee">Ewè</language>
<language type="el">Èdè Giriki</language>
<language type="en">Èdè Gẹ̀ẹ́sì</language>
<language type="en_AU">Èdè Gẹ̀ẹ́sì (órílẹ̀-èdè Ọsirélíà)</language>
@@ -62,7 +77,9 @@
<language type="es_MX">Èdè Sípáníìṣì (orílẹ̀-èdè Mẹ́síkò)</language>
<language type="et">Èdè Estonia</language>
<language type="eu">Èdè Baski</language>
+ <language type="ewo">Èwóǹdò</language>
<language type="fa">Èdè Pasia</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="ff">Èdè Fúlàní</language>
<language type="fi">Èdè Finisi</language>
<language type="fil">Èdè Filipino</language>
@@ -70,58 +87,139 @@
<language type="fr">Èdè Faransé</language>
<language type="fr_CA">Èdè Faransé (orílẹ̀-èdè Kánádà)</language>
<language type="fr_CH">Èdè Faranṣé (Súwísàlaǹdì)</language>
+ <language type="fur">Firiúlíànì</language>
<language type="fy">Èdè Frisia</language>
<language type="ga">Èdè Ireland</language>
<language type="gd">Èdè Gaelik ti Ilu Scotland</language>
<language type="gl">Èdè Galicia</language>
<language type="gn">Èdè Guarani</language>
+ <language type="gsw">Súwísì ti Jámánì</language>
<language type="gu">Èdè Gujarati</language>
+ <language type="guz">Gusii</language>
+ <language type="gv">Máǹkì</language>
<language type="ha">Èdè Hausa</language>
+ <language type="haw">Hawaiian</language>
<language type="he">Èdè Heberu</language>
<language type="hi">Èdè Híńdì</language>
+ <language type="hmn">Hmong</language>
<language type="hr">Èdè Kroatia</language>
+ <language type="hsb">Sorbian Apá Òkè</language>
+ <language type="ht">Haitian Creole</language>
<language type="hu">Èdè Hungaria</language>
<language type="hy">Èdè Ile Armenia</language>
<language type="ia">Èdè pipo</language>
<language type="id">Èdè Indonéṣíà</language>
<language type="ie">Iru Èdè</language>
<language type="ig">Èdè Yíbò</language>
+ <language type="ii">Ṣíkuán Yì</language>
<language type="is">Èdè Icelandic</language>
<language type="it">Èdè Ítálì</language>
<language type="ja">Èdè Jàpáànù</language>
+ <language type="jgo">Ńgòmbà</language>
+ <language type="jmc">Máṣámè</language>
<language type="jv">Èdè Javanasi</language>
<language type="ka">Èdè Georgia</language>
+ <language type="kab">Kabilè</language>
+ <language type="kam">Káńbà</language>
+ <language type="kde">Mákondé</language>
+ <language type="kea">Kabufadíánù</language>
+ <language type="khq">Koira Ṣíínì</language>
+ <language type="ki">Kíkúyù</language>
+ <language type="kk">Kaṣakì</language>
+ <language type="kkj">Kàkó</language>
+ <language type="kl">Kalaalísùtì</language>
+ <language type="kln">Kálẹnjín</language>
<language type="km">Èdè kameri</language>
<language type="kn">Èdè Kannada</language>
<language type="ko">Èdè Kòríà</language>
- <language type="ksf">↑↑↑</language>
+ <language type="kok">Kónkánì</language>
+ <language type="ks">Kaṣímirì</language>
+ <language type="ksb">Ṣáńbálà</language>
+ <language type="ksf">Báfíà</language>
+ <language type="ksh">Colognian</language>
+ <language type="ku">Kọdiṣì</language>
+ <language type="kw">Kọ́nììṣì</language>
+ <language type="ky">Kírígíìsì</language>
<language type="la">Èdè Latini</language>
+ <language type="lag">Láńgì</language>
+ <language type="lb">Lùṣẹ́mbọ́ọ̀gì</language>
+ <language type="lg">Ganda</language>
+ <language type="lkt">Lákota</language>
+ <language type="ln">Lìǹgálà</language>
+ <language type="lo">Láò</language>
+ <language type="lrc">Apáàríwá Lúrì</language>
<language type="lt">Èdè Lithuania</language>
+ <language type="lu">Lúbà-Katanga</language>
+ <language type="luo">↑↑↑</language>
+ <language type="luy">Luyíà</language>
<language type="lv">Èdè Latvianu</language>
+ <language type="mas">Másáì</language>
+ <language type="mer">Mérù</language>
+ <language type="mfe">Morisiyen</language>
+ <language type="mg">Malagasì</language>
+ <language type="mgh">Makhuwa-Meeto</language>
+ <language type="mgo">Métà</language>
+ <language type="mi">Màórì</language>
<language type="mk">Èdè Macedonia</language>
+ <language type="ml">Málàyálámù</language>
+ <language type="mn">Mòngólíà</language>
<language type="mr">Èdè marathi</language>
<language type="ms">Èdè Malaya</language>
<language type="mt">Èdè Malta</language>
+ <language type="mua">Múndàngì</language>
+ <language type="mul">Ọlọ́pọ̀ èdè</language>
<language type="my">Èdè Bumiisi</language>
+ <language type="mzn">Masanderani</language>
+ <language type="naq">Námà</language>
+ <language type="nb">Nọ́ọ́wè Bokímàl</language>
+ <language type="nd">Àríwá Ndebele</language>
+ <language type="nds">Jámánì ìpìlẹ̀</language>
<language type="ne">Èdè Nepali</language>
<language type="nl">Èdè Dọ́ọ̀ṣì</language>
<language type="nl_BE">↑↑↑</language>
+ <language type="nmg">Kíwáṣíò</language>
+ <language type="nn">Nọ́ọ́wè Nínọ̀sìkì</language>
+ <language type="nnh">Ngiembùnù</language>
<language type="no">Èdè Norway</language>
+ <language type="nus">Núẹ̀</language>
+ <language type="ny">Ńyájà</language>
+ <language type="nyn">Ńyákọ́lè</language>
<language type="oc">Èdè Occitani</language>
+ <language type="om">Òròmọ́</language>
+ <language type="or">Òdíà</language>
+ <language type="os">Ọṣẹ́tíìkì</language>
<language type="pa">Èdè Punjabi</language>
<language type="pl">Èdè Póláǹdì</language>
+ <language type="prg">Púrúṣíànù</language>
+ <language type="ps">Páshítò</language>
<language type="pt">Èdè Pọtogí</language>
<language type="pt_BR">Èdè Pọtogí (Orilẹ̀-èdè Bràsíl)</language>
<language type="pt_PT">Èdè Pọtogí (orílẹ̀-èdè Yúróòpù)</language>
+ <language type="qu">Kúẹ́ńjùà</language>
+ <language type="rm">Rómáǹṣì</language>
+ <language type="rn">Rúńdì</language>
<language type="ro">Èdè Romania</language>
+ <language type="rof">Róńbò</language>
<language type="ru">Èdè Rọ́ṣíà</language>
<language type="rw">Èdè Ruwanda</language>
+ <language type="rwk">Riwa</language>
<language type="sa">Èdè awon ara Indo</language>
+ <language type="sah">Sàkíhà</language>
+ <language type="saq">Samburu</language>
+ <language type="sbp">Sangu</language>
<language type="sd">Èdè Sindhi</language>
+ <language type="se">Apáàríwá Sami</language>
+ <language type="seh">Ṣẹnà</language>
+ <language type="ses">Koiraboro Seni</language>
+ <language type="sg">Sango</language>
<language type="sh">Èdè Serbo-Croatiani</language>
+ <language type="shi">Taṣelíìtì</language>
<language type="si">Èdè Sinhalese</language>
<language type="sk">Èdè Slovaki</language>
<language type="sl">Èdè Slovenia</language>
+ <language type="sm">Sámóánù</language>
+ <language type="smn">Inari Sami</language>
+ <language type="sn">Ṣọnà</language>
<language type="so">Èdè ara Somalia</language>
<language type="sq">Èdè Albania</language>
<language type="sr">Èdè Serbia</language>
@@ -131,56 +229,106 @@
<language type="sw">Èdè Swahili</language>
<language type="ta">Èdè Tamili</language>
<language type="te">Èdè Telugu</language>
+ <language type="teo">Tẹ́sò</language>
+ <language type="tg">Tàjíìkì</language>
<language type="th">Èdè Tai</language>
<language type="ti">Èdè Tigrinya</language>
<language type="tk">Èdè Turkmen</language>
<language type="tlh">Èdè Klingoni</language>
+ <language type="to">Tóńgàn</language>
<language type="tr">Èdè Tọọkisi</language>
- <language type="tzm">↑↑↑</language>
+ <language type="tt">Tatarí</language>
+ <language type="twq">Tasawak</language>
+ <language type="tzm">Ààrin Gbùngbùn Atlas Tamazight</language>
+ <language type="ug">Yúgọ̀</language>
<language type="uk">Èdè Ukania</language>
<language type="und">Èdè àìmọ̀</language>
<language type="ur">Èdè Udu</language>
<language type="uz">Èdè Uzbek</language>
+ <language type="vai">↑↑↑</language>
<language type="vi">Èdè Jetinamu</language>
+ <language type="vo">Fọ́lápùùkù</language>
+ <language type="vun">Funjo</language>
+ <language type="wae">Wọsà</language>
+ <language type="wo">Wọ́lọ́ọ̀fù</language>
<language type="xh">Èdè Xhosa</language>
+ <language type="xog">Ṣógà</language>
+ <language type="yav">Yangbẹn</language>
<language type="yi">Èdè Yiddishi</language>
<language type="yo">Èdè Yorùbá</language>
- <language type="yue">↑↑↑</language>
+ <language type="yue">Cantonese</language>
<language type="yue" alt="menu">↑↑↑</language>
+ <language type="zgh">Àfẹnùkò Támásáìtì ti Mòrókò</language>
<language type="zh">Èdè Mandarin tí wọ́n ń sọ lórílẹ̀-èdè Ṣáínà</language>
<language type="zh" alt="menu">Ṣáídà, Mandrínì</language>
- <language type="zh_Hans" draft="provisional">↑↑↑</language>
- <language type="zh_Hans" alt="long" draft="provisional">↑↑↑</language>
- <language type="zh_Hant" draft="provisional">Èdè Ìbílẹ̀ Ṣáínà</language>
- <language type="zh_Hant" alt="long" draft="provisional">↑↑↑</language>
+ <language type="zh_Hans">↑↑↑</language>
+ <language type="zh_Hans" alt="long">↑↑↑</language>
+ <language type="zh_Hant">Èdè Ìbílẹ̀ Ṣáínà</language>
+ <language type="zh_Hant" alt="long">↑↑↑</language>
<language type="zu">Èdè Ṣulu</language>
+ <language type="zxx">Kò sí àkóònú elédè</language>
</languages>
<scripts>
<script type="Arab">èdè Lárúbáwá</script>
+ <script type="Armn">Àmẹ́níà</script>
+ <script type="Beng">Báńgílà</script>
+ <script type="Bopo">Bopomófò</script>
+ <script type="Brai">Bíráìlè</script>
<script type="Cyrl">èdè ilẹ̀ Rọ́ṣíà</script>
+ <script type="Deva">Dẹfanagárì</script>
+ <script type="Ethi">Ẹtiópíìkì</script>
+ <script type="Geor">Jọ́jíànù</script>
+ <script type="Grek">Jọ́jíà</script>
+ <script type="Gujr">Gujaráti</script>
+ <script type="Guru">Gurumúkhì</script>
+ <script type="Hanb">Han pẹ̀lú Bopomófò</script>
+ <script type="Hang">Háńgùlù</script>
+ <script type="Hani">Háànù</script>
<script type="Hans">tí wọ́n mú rọrùn.</script>
<script type="Hans" alt="stand-alone">Hans tí wọ́n mú rọrùn.</script>
<script type="Hant">Hans àtọwọ́dọ́wọ́</script>
<script type="Hant" alt="stand-alone">Hans àtọwọ́dọ́wọ́</script>
+ <script type="Hebr">Hébérù</script>
+ <script type="Hira">Hiragánà</script>
+ <script type="Hrkt">ìlànà àfọwọ́kọ ará Jàpánù</script>
+ <script type="Jamo">↑↑↑</script>
<script type="Jpan">èdè jàpáànù</script>
+ <script type="Kana">Katakánà</script>
+ <script type="Khmr">Kẹmẹ̀</script>
+ <script type="Knda">Kanada</script>
<script type="Kore">Kóríà</script>
+ <script type="Laoo">Láò</script>
<script type="Latn">Èdè Látìn</script>
+ <script type="Mlym">Málàyálámù</script>
+ <script type="Mong">Mòngólíà</script>
+ <script type="Mymr">Myánmarà</script>
+ <script type="Orya">Òdíà</script>
+ <script type="Sinh">Sìnhálà</script>
+ <script type="Taml">Támílì</script>
+ <script type="Telu">Télúgù</script>
+ <script type="Thaa">Taana</script>
+ <script type="Thai">↑↑↑</script>
+ <script type="Tibt">Tíbétán</script>
+ <script type="Zmth">Àmì Ìṣèsìrò</script>
+ <script type="Zsye">Émójì</script>
+ <script type="Zsym">Àwọn àmì</script>
<script type="Zxxx">Aikọsilẹ</script>
+ <script type="Zyyy">Wọ́pọ̀</script>
<script type="Zzzz">Ìṣọwọ́kọ̀wé àìmọ̀</script>
</scripts>
<territories>
- <territory type="001">↑↑↑</territory>
- <territory type="002">↑↑↑</territory>
+ <territory type="001">Agbáyé</territory>
+ <territory type="002">Áfíríkà</territory>
<territory type="003">Àríwá Amẹ́ríkà</territory>
<territory type="005">Gúúṣù Amẹ́ríkà</territory>
- <territory type="009">↑↑↑</territory>
+ <territory type="009">Oceania</territory>
<territory type="011">Ìwọ̀ oorùn Afíríkà</territory>
<territory type="013">Ààrin Gbùgbùn Àmẹ́ríkà</territory>
<territory type="014">Ìlà Oorùn Áfíríkà</territory>
- <territory type="015">↑↑↑</territory>
+ <territory type="015">Northern Africa</territory>
<territory type="017">Ààrín gbùngbùn Afíríkà</territory>
<territory type="018">Apágúúsù Áfíríkà</territory>
- <territory type="019">↑↑↑</territory>
+ <territory type="019">Amẹ́ríkà</territory>
<territory type="021">Apáàríwá Amẹ́ríkà</territory>
<territory type="029">Káríbíànù</territory>
<territory type="030">Ìlà Òòrùn Eṣíà</territory>
@@ -191,16 +339,16 @@
<territory type="054">Mẹlanéṣíà</territory>
<territory type="057">Agbègbè Maikironéṣíà</territory>
<territory type="061">Polineṣíà</territory>
- <territory type="142">↑↑↑</territory>
+ <territory type="142">Asia</territory>
<territory type="143">Ààrin Gbùngbùn Éṣíà</territory>
<territory type="145">Ìwọ̀ Òòrùn Eṣíà</territory>
- <territory type="150">↑↑↑</territory>
+ <territory type="150">Europe</territory>
<territory type="151">Ìlà Òrùn Yúrópù</territory>
<territory type="154">Northern Europe</territory>
<territory type="155">Ìwọ̀ Òòrùn Yúrópù</territory>
- <territory type="202">↑↑↑</territory>
+ <territory type="202">Sàhárà Áfíríkà</territory>
<territory type="419">Látín Amẹ́ríkà</territory>
- <territory type="AC">↑↑↑</territory>
+ <territory type="AC">Erékùsù Ascension</territory>
<territory type="AD">Orílẹ́ède Ààndórà</territory>
<territory type="AE">Orílẹ́ède Ẹmirate ti Awọn Arabu</territory>
<territory type="AF">Orílẹ́ède Àfùgànístánì</territory>
@@ -209,13 +357,13 @@
<territory type="AL">Orílẹ́ède Àlùbàníánì</territory>
<territory type="AM">Orílẹ́ède Améníà</territory>
<territory type="AO">Orílẹ́ède Ààngólà</territory>
- <territory type="AQ">↑↑↑</territory>
+ <territory type="AQ">Antakítíkà</territory>
<territory type="AR">Orílẹ́ède Agentínà</territory>
<territory type="AS">Sámóánì ti Orílẹ́ède Àméríkà</territory>
<territory type="AT">Orílẹ́ède Asítíríà</territory>
<territory type="AU">Orílẹ́ède Ástràlìá</territory>
<territory type="AW">Orílẹ́ède Árúbà</territory>
- <territory type="AX">↑↑↑</territory>
+ <territory type="AX">Àwọn Erékùsù ti Åland</territory>
<territory type="AZ">Orílẹ́ède Asẹ́bájánì</territory>
<territory type="BA">Orílẹ́ède Bọ̀síníà àti Ẹtisẹgófínà</territory>
<territory type="BB">Orílẹ́ède Bábádósì</territory>
@@ -226,20 +374,20 @@
<territory type="BH">Orílẹ́ède Báránì</territory>
<territory type="BI">Orílẹ́ède Bùùrúndì</territory>
<territory type="BJ">Orílẹ́ède Bẹ̀nẹ̀</territory>
- <territory type="BL">↑↑↑</territory>
+ <territory type="BL">St. Barthélemy</territory>
<territory type="BM">Orílẹ́ède Bémúdà</territory>
<territory type="BN">Orílẹ́ède Búrúnẹ́lì</territory>
<territory type="BO">Orílẹ́ède Bọ̀lífíyà</territory>
- <territory type="BQ">↑↑↑</territory>
+ <territory type="BQ">Caribbean Netherlands</territory>
<territory type="BR">Orilẹ̀-èdè Bàràsílì</territory>
<territory type="BS">Orílẹ́ède Bàhámásì</territory>
<territory type="BT">Orílẹ́ède Bútánì</territory>
- <territory type="BV">↑↑↑</territory>
+ <territory type="BV">Erékùsù Bouvet</territory>
<territory type="BW">Orílẹ́ède Bọ̀tìsúwánà</territory>
<territory type="BY">Orílẹ́ède Bélárúsì</territory>
<territory type="BZ">Orílẹ́ède Bèlísẹ̀</territory>
<territory type="CA">Orílẹ́ède Kánádà</territory>
- <territory type="CC">↑↑↑</territory>
+ <territory type="CC">Erékùsù Cocos (Keeling)</territory>
<territory type="CD">Orilẹ́ède Kóngò</territory>
<territory type="CD" alt="variant">↑↑↑</territory>
<territory type="CF">Orílẹ́ède Àrin gùngun Áfíríkà</territory>
@@ -253,23 +401,23 @@
<territory type="CM">Orílẹ́ède Kamerúúnì</territory>
<territory type="CN">Orilẹ̀-èdè Ṣáínà</territory>
<territory type="CO">Orílẹ́ède Kòlómíbìa</territory>
- <territory type="CP">↑↑↑</territory>
+ <territory type="CP">Erékùsù Clipperston</territory>
<territory type="CR">Orílẹ́ède Kuusita Ríkà</territory>
<territory type="CU">Orílẹ́ède Kúbà</territory>
<territory type="CV">Orílẹ́ède Etíokun Kápé féndè</territory>
- <territory type="CW">↑↑↑</territory>
- <territory type="CX">↑↑↑</territory>
+ <territory type="CW">Curaçao</territory>
+ <territory type="CX">Erékùsù Christmas</territory>
<territory type="CY">Orílẹ́ède Kúrúsì</territory>
<territory type="CZ">Orílẹ́ède ṣẹ́ẹ́kì</territory>
<territory type="CZ" alt="variant">↑↑↑</territory>
<territory type="DE">Orílẹèdè Jámánì</territory>
- <territory type="DG">↑↑↑</territory>
+ <territory type="DG">Diego Gaṣia</territory>
<territory type="DJ">Orílẹ́ède Díbọ́ótì</territory>
<territory type="DK">Orílẹ́ède Dẹ́mákì</territory>
<territory type="DM">Orílẹ́ède Dòmíníkà</territory>
<territory type="DO">Orilẹ́ède Dòmíníkánì</territory>
<territory type="DZ">Orílẹ́ède Àlùgèríánì</territory>
- <territory type="EA">↑↑↑</territory>
+ <territory type="EA">Seuta àti Melilla</territory>
<territory type="EC">Orílẹ́ède Ekuádò</territory>
<territory type="EE">Orílẹ́ède Esitonia</territory>
<territory type="EG">Orílẹ́ède Égípítì</territory>
@@ -278,13 +426,13 @@
<territory type="ES">Orílẹ́ède Sipani</territory>
<territory type="ET">Orílẹ́ède Etopia</territory>
<territory type="EU">Ìṣọ̀kan Yúròpù</territory>
- <territory type="EZ">↑↑↑</territory>
+ <territory type="EZ">Agbègbè Euro</territory>
<territory type="FI">Orílẹ́ède Filandi</territory>
<territory type="FJ">Orílẹ́ède Fiji</territory>
<territory type="FK">Orílẹ́ède Etikun Fakalandi</territory>
<territory type="FK" alt="variant">↑↑↑</territory>
<territory type="FM">Orílẹ́ède Makoronesia</territory>
- <territory type="FO">↑↑↑</territory>
+ <territory type="FO">Àwọn Erékùsù ti Faroe</territory>
<territory type="FR">Orílẹ́ède Faranse</territory>
<territory type="GA">Orílẹ́ède Gabon</territory>
<territory type="GB">Orílẹ́èdè Gẹ̀ẹ́sì</territory>
@@ -292,7 +440,7 @@
<territory type="GD">Orílẹ́ède Genada</territory>
<territory type="GE">Orílẹ́ède Gọgia</territory>
<territory type="GF">Orílẹ́ède Firenṣi Guana</territory>
- <territory type="GG">↑↑↑</territory>
+ <territory type="GG">Guernsey</territory>
<territory type="GH">Orílẹ́ède Gana</territory>
<territory type="GI">Orílẹ́ède Gibaratara</territory>
<territory type="GL">Orílẹ́ède Gerelandi</territory>
@@ -301,30 +449,30 @@
<territory type="GP">Orílẹ́ède Gadelope</territory>
<territory type="GQ">Orílẹ́ède Ekutoria Gini</territory>
<territory type="GR">Orílẹ́ède Geriisi</territory>
- <territory type="GS">↑↑↑</territory>
+ <territory type="GS">Gúúsù Georgia àti Gúúsù Àwọn Erékùsù Sandwich</territory>
<territory type="GT">Orílẹ́ède Guatemala</territory>
<territory type="GU">Orílẹ́ède Guamu</territory>
<territory type="GW">Orílẹ́ède Gene-Busau</territory>
<territory type="GY">Orílẹ́ède Guyana</territory>
- <territory type="HK">↑↑↑</territory>
+ <territory type="HK">Hong Kong SAR ti Ṣáìnà</territory>
<territory type="HK" alt="short">↑↑↑</territory>
- <territory type="HM">↑↑↑</territory>
+ <territory type="HM">Erékùsù Heard àti Erékùsù McDonald</territory>
<territory type="HN">Orílẹ́ède Hondurasi</territory>
<territory type="HR">Orílẹ́ède Kòróátíà</territory>
<territory type="HT">Orílẹ́ède Haati</territory>
<territory type="HU">Orílẹ́ède Hungari</territory>
- <territory type="IC">↑↑↑</territory>
+ <territory type="IC">Ẹrékùsù Kánárì</territory>
<territory type="ID">Orílẹ́ède Indonesia</territory>
<territory type="IE">Orílẹ́ède Ailandi</territory>
<territory type="IL">Orílẹ́ède Iserẹli</territory>
- <territory type="IM">↑↑↑</territory>
+ <territory type="IM">Isle of Man</territory>
<territory type="IN">Orílẹ́ède India</territory>
<territory type="IO">Orílẹ́ède Etíkun Índíánì ti Ìlú Bírítísì</territory>
<territory type="IQ">Orílẹ́ède Iraki</territory>
<territory type="IR">Orílẹ́ède Irani</territory>
<territory type="IS">Orílẹ́ède Aṣilandi</territory>
<territory type="IT">Orílẹ́ède Itáli</territory>
- <territory type="JE">↑↑↑</territory>
+ <territory type="JE">Jersey</territory>
<territory type="JM">Orílẹ́ède Jamaika</territory>
<territory type="JO">Orílẹ́ède Jọdani</territory>
<territory type="JP">Orílẹ́ède Japani</territory>
@@ -353,15 +501,15 @@
<territory type="MA">Orílẹ́ède Moroko</territory>
<territory type="MC">Orílẹ́ède Monako</territory>
<territory type="MD">Orílẹ́ède Modofia</territory>
- <territory type="ME">↑↑↑</territory>
- <territory type="MF">↑↑↑</territory>
+ <territory type="ME">Montenegro</territory>
+ <territory type="MF">St. Martin</territory>
<territory type="MG">Orílẹ́ède Madasika</territory>
<territory type="MH">Orílẹ́ède Etikun Máṣali</territory>
<territory type="MK">Àríwá Macedonia</territory>
<territory type="ML">Orílẹ́ède Mali</territory>
<territory type="MM">Orílẹ́ède Manamari</territory>
<territory type="MN">Orílẹ́ède Mogolia</territory>
- <territory type="MO">↑↑↑</territory>
+ <territory type="MO">Macao SAR ti Ṣáìnà</territory>
<territory type="MO" alt="short">Màkáò</territory>
<territory type="MP">Orílẹ́ède Etikun Guusu Mariana</territory>
<territory type="MQ">Orílẹ́ède Matinikuwi</territory>
@@ -403,10 +551,10 @@
<territory type="PW">Orílẹ́ède Paalu</territory>
<territory type="PY">Orílẹ́ède Paraguye</territory>
<territory type="QA">Orílẹ́ède Kota</territory>
- <territory type="QO">↑↑↑</territory>
+ <territory type="QO">Agbègbè Oceania</territory>
<territory type="RE">Orílẹ́ède Riuniyan</territory>
<territory type="RO">Orílẹ́ède Romaniya</territory>
- <territory type="RS">↑↑↑</territory>
+ <territory type="RS">Serbia</territory>
<territory type="RU">Orílẹ́ède Rọṣia</territory>
<territory type="RW">Orílẹ́ède Ruwanda</territory>
<territory type="SA">Orílẹ́ède Saudi Arabia</territory>
@@ -417,7 +565,7 @@
<territory type="SG">Orílẹ́ède Singapo</territory>
<territory type="SH">Orílẹ́ède Hẹlena</territory>
<territory type="SI">Orílẹ́ède Silofania</territory>
- <territory type="SJ">↑↑↑</territory>
+ <territory type="SJ">Svalbard & Jan Mayen</territory>
<territory type="SK">Orílẹ́ède Silofakia</territory>
<territory type="SL">Orílẹ́ède Siria looni</territory>
<territory type="SM">Orílẹ́ède Sani Marino</territory>
@@ -427,11 +575,11 @@
<territory type="SS">Gúúsù Sudan</territory>
<territory type="ST">Orílẹ́ède Sao tomi ati piriiṣipi</territory>
<territory type="SV">Orílẹ́ède Ẹẹsáfádò</territory>
- <territory type="SX">↑↑↑</territory>
+ <territory type="SX">Sint Maarten</territory>
<territory type="SY">Orílẹ́ède Siria</territory>
<territory type="SZ">Orílẹ́ède Saṣiland</territory>
<territory type="SZ" alt="variant">Síwásìlandì</territory>
- <territory type="TA">↑↑↑</territory>
+ <territory type="TA">Tristan da Kunha</territory>
<territory type="TC">Orílẹ́ède Tọọki ati Etikun Kakọsi</territory>
<territory type="TD">Orílẹ́ède ṣààdì</territory>
<territory type="TF">Agbègbè Gúúsù Faranṣé</territory>
@@ -451,7 +599,7 @@
<territory type="TZ">Orílẹ́ède Tàǹsáníà</territory>
<territory type="UA">Orílẹ́ède Ukarini</territory>
<territory type="UG">Orílẹ́ède Uganda</territory>
- <territory type="UM">↑↑↑</territory>
+ <territory type="UM">Àwọn Erékùsù Kékèké Agbègbè US</territory>
<territory type="UN">Ìṣọ̀kan àgbáyé</territory>
<territory type="US">Orílẹ̀-èdè Amẹrikà</territory>
<territory type="US" alt="short">↑↑↑</territory>
@@ -466,8 +614,8 @@
<territory type="VU">Orílẹ́ède Faniatu</territory>
<territory type="WF">Orílẹ́ède Wali ati futuna</territory>
<territory type="WS">Orílẹ́ède Samọ</territory>
- <territory type="XA">↑↑↑</territory>
- <territory type="XB">↑↑↑</territory>
+ <territory type="XA">Pseudo-Accents</territory>
+ <territory type="XB">Pseudo-Bidi</territory>
<territory type="XK">Kòsófò</territory>
<territory type="YE">Orílẹ́ède yemeni</territory>
<territory type="YT">Orílẹ́ède Mayote</territory>
@@ -481,11 +629,78 @@
<subdivision type="gbsct">Skọ́tlándì</subdivision>
<subdivision type="gbwls">Wélsì</subdivision>
</subdivisions>
+ <keys>
+ <key type="calendar">Kàlẹ́ńdà</key>
+ <key type="cf">Ìgúnrégé Kọ́rẹ́ńsì</key>
+ <key type="collation">Ètò Ẹlẹ́sẹẹsẹ</key>
+ <key type="currency">Kọ́rẹ́ńsì</key>
+ <key type="hc">Òbíríkiti Wákàtí (12 vs 24)</key>
+ <key type="lb">Àra Ìda Ìlà</key>
+ <key type="ms">Èto Ìdiwọ̀n</key>
+ <key type="numbers">Àwọn nọ́ńbà</key>
+ </keys>
<types>
+ <type key="calendar" type="buddhist">Kàlẹ̀ńdà Buddhist</type>
+ <type key="calendar" type="chinese">Kàlẹ̀ńdà ti Ṣáìnà</type>
+ <type key="calendar" type="dangi">Kàlẹ̀ńdà dangi</type>
+ <type key="calendar" type="ethiopic">Kàlẹ̀ńdà Ẹtíópíìkì</type>
<type key="calendar" type="gregorian">Kàlẹ́ńdà Gregory</type>
+ <type key="calendar" type="hebrew">Kàlẹ̀ńdà Hébérù</type>
+ <type key="calendar" type="islamic">Kàlẹ̀ńdà Lárúbáwá</type>
<type key="calendar" type="iso8601">Kàlẹ́ńdà ISO-8601</type>
+ <type key="calendar" type="japanese">Kàlẹ̀ńdà ti Jàpánù</type>
+ <type key="calendar" type="persian">Kàlẹ̀ńdà Pásíànù</type>
+ <type key="calendar" type="roc">Kàlẹ̀ńdà Minguo</type>
+ <type key="cf" type="account">Ìgúnrégé Ìṣirò Owó Kọ́rẹ́ńsì</type>
+ <type key="cf" type="standard">Ìgúnrégé Gbèdéke Kọ́rẹ́ńsì</type>
+ <type key="collation" type="ducet">Ètò Ẹlẹ́sẹẹsẹ Àkùàyàn Unicode</type>
+ <type key="collation" type="search">Ìṣàwárí Ète-Gbogbogbò</type>
<type key="collation" type="standard">Ìlànà Onírúurú Ètò</type>
+ <type key="hc" type="h11">Èto Wákàtí 12 (0–11)</type>
+ <type key="hc" type="h12">Èto Wákàtí 12 (1–12)</type>
+ <type key="hc" type="h23">Èto Wákàtí 24 (0–23)</type>
+ <type key="hc" type="h24">Èto Wákàtí 24 (1–24)</type>
+ <type key="lb" type="loose">Àra Ìda Ìlà Títú</type>
+ <type key="lb" type="normal">Àra Ìda Ìlà Déédéé</type>
+ <type key="lb" type="strict">Àra Ìda Ìlà Mímúná</type>
+ <type key="ms" type="metric">Èto Mẹ́tíríìkì</type>
+ <type key="ms" type="uksystem">Èto Ìdiwọ̀n Ọba</type>
+ <type key="ms" type="ussystem">Èto Ìdiwọ̀n US</type>
+ <type key="numbers" type="arab">àwọn díjítì Làrubáwá-Índíà</type>
+ <type key="numbers" type="arabext">Àwọn Díjíìtì Lárúbáwá-Índíà fífẹ̀</type>
+ <type key="numbers" type="armn">Àwọn nọ́ńbà Àmẹ́níà</type>
+ <type key="numbers" type="armnlow">Àwọn Nọ́ńbà Kékèké ti Amẹ́ríkà</type>
+ <type key="numbers" type="beng">Àwọn díjíìtì Báńgílà</type>
+ <type key="numbers" type="deva">Àwọn díjììtì Defanagárì</type>
+ <type key="numbers" type="ethi">Àwọn nọ́ńbà Ẹtiópíìkì</type>
+ <type key="numbers" type="fullwide">Àwọn Díjíìtì Fífẹ̀-Ẹ̀kún</type>
+ <type key="numbers" type="geor">Àwọn nọ́ńbà Jọ́jíà</type>
+ <type key="numbers" type="grek">Àwọn nọ́ńbà Gíríìkì</type>
+ <type key="numbers" type="greklow">Àwọn Nọ́ńbà Gíríìkì Kékèké</type>
+ <type key="numbers" type="gujr">Àwọn díjíìtì Gùjárátì</type>
+ <type key="numbers" type="guru">Àwọn Díjíìtì Gurumukì</type>
+ <type key="numbers" type="hanidec">Àwọn nọ́ńbà Dẹ́símà Ṣáìnà</type>
+ <type key="numbers" type="hans">Àwọn nọ́ńbà Ìrọ̀rùn ti Ṣáìnà</type>
+ <type key="numbers" type="hansfin">Àwọn nọ́ńbà Ìṣúná Ìrọ̀rùn Ṣáìnà</type>
+ <type key="numbers" type="hant">Àwọn nọ́ńbà Ìbílẹ̀ Ṣáìnà</type>
+ <type key="numbers" type="hantfin">Àwọn nọ́ńbà Ìṣúná Ìbílẹ̀ Ṣáìnà</type>
+ <type key="numbers" type="hebr">Àwọn nọ́ńbà Hébérù</type>
+ <type key="numbers" type="jpan">Àwọn nọ́ńbà Jápànù</type>
+ <type key="numbers" type="jpanfin">Àwọn nọ́ńbà Ìṣúná Jàpáànù</type>
+ <type key="numbers" type="khmr">Àwọn díjíìtì Kẹ́mẹ̀</type>
+ <type key="numbers" type="knda">Àwọn díjíìtì kanada</type>
+ <type key="numbers" type="laoo">Àwọn díjíìtì Láó</type>
<type key="numbers" type="latn">Díjíítì Ìwọ̀ Oòrùn</type>
+ <type key="numbers" type="mlym">Àwọn díjíìtì Málàyálámù</type>
+ <type key="numbers" type="mymr">Àwọn díjíìtì Myánmarí</type>
+ <type key="numbers" type="orya">Àwọn díjíìtì Òdíà</type>
+ <type key="numbers" type="roman">Àwọn díjíìtì Rómánù</type>
+ <type key="numbers" type="romanlow">Àwọn díjíìtì Rómánù Kékeré</type>
+ <type key="numbers" type="taml">Àwọn díjíìtì Ìbílẹ̀ Támílù</type>
+ <type key="numbers" type="tamldec">Àwọn díjíìtì Tàmílù</type>
+ <type key="numbers" type="telu">Àwọn díjíìtì Télúgù</type>
+ <type key="numbers" type="thai">Àwọn díjíìtì Thai</type>
+ <type key="numbers" type="tibt">Àwọn díjíìtì Tibetán</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Mẹ́tíríìkì</measurementSystemName>
@@ -589,8 +804,13 @@
</dateTimeFormat>
</dateTimeFormatLength>
<availableFormats>
+ <dateFormatItem id="Bh">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="Bhms">↑↑↑</dateFormatItem>
<dateFormatItem id="d">d</dateFormatItem>
<dateFormatItem id="E">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhm">↑↑↑</dateFormatItem>
+ <dateFormatItem id="EBhms">↑↑↑</dateFormatItem>
<dateFormatItem id="Ed">↑↑↑</dateFormatItem>
<dateFormatItem id="Ehm">↑↑↑</dateFormatItem>
<dateFormatItem id="EHm">↑↑↑</dateFormatItem>
@@ -636,6 +856,15 @@
</availableFormats>
<intervalFormats>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="d">
<greatestDifference id="d">↑↑↑</greatestDifference>
</intervalFormatItem>
@@ -1111,6 +1340,15 @@
</appendItems>
<intervalFormats>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">↑↑↑</greatestDifference>
+ <greatestDifference id="h">↑↑↑</greatestDifference>
+ <greatestDifference id="m">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="d">
<greatestDifference id="d">d–d</greatestDifference>
</intervalFormatItem>
@@ -1249,56 +1487,125 @@
<field type="era">
<displayName>Ìgbà</displayName>
</field>
+ <field type="era-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="era-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
<field type="year">
<displayName>Ọdún</displayName>
<relative type="-1">Èṣín</relative>
<relative type="0">Ọdúnǹí</relative>
<relative type="1">Àmọ́dún</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="year-short">
<displayName>↑↑↑</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="year-narrow">
<displayName>↑↑↑</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="quarter">
<displayName>Ìdá mẹ́rin</displayName>
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="quarter-short">
<displayName>↑↑↑</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="quarter-narrow">
<displayName>Ìdá mẹ́rin</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="month">
<displayName>Osù</displayName>
<relative type="-1">óṣù tó kọjá</relative>
<relative type="0">oṣù yìí</relative>
<relative type="1">óṣù tó ń bọ̀,</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="month-short">
<displayName>↑↑↑</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="month-narrow">
<displayName>Oṣù</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="week">
<displayName>Ọ̀sẹ̀</displayName>
<relative type="-1">ọ̀sẹ̀ tó kọjá</relative>
<relative type="0">ọ̀sẹ̀ yìí</relative>
<relative type="1">ọ́sẹ̀ tó ń bọ̀</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
<relativePeriod>↑↑↑</relativePeriod>
</field>
<field type="week-short">
@@ -1306,6 +1613,12 @@
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
<relativePeriod>ọ̀ṣẹ̀ {0}</relativePeriod>
</field>
<field type="week-narrow">
@@ -1313,8 +1626,23 @@
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
<relativePeriod>↑↑↑</relativePeriod>
</field>
+ <field type="weekOfMonth">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekOfMonth-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekOfMonth-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
<field type="day">
<displayName>Ọjọ́</displayName>
<relative type="-2">íjẹta</relative>
@@ -1322,60 +1650,221 @@
<relative type="0">Òní</relative>
<relative type="1">Ọ̀la</relative>
<relative type="2">òtúùnla</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="day-short">
<displayName>↑↑↑</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="day-narrow">
<displayName>↑↑↑</displayName>
<relative type="-1">↑↑↑</relative>
<relative type="0">↑↑↑</relative>
<relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="dayOfYear">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="dayOfYear-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="dayOfYear-narrow">
+ <displayName>↑↑↑</displayName>
</field>
<field type="weekday">
<displayName>Ọjọ́ tó wà láàárín ọ̀sẹ̀</displayName>
</field>
+ <field type="weekday-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekday-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekdayOfMonth">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekdayOfMonth-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="weekdayOfMonth-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
<field type="sun">
<relative type="-1">Ọjọ́ Àìkú tó kọjá</relative>
<relative type="0">Ọjọ́ Àìkú yìí</relative>
<relative type="1">Ọjọ́ Àìkú tó ń bọ̀</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sun-short">
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="sun-narrow">
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">Ọjọ́ Àíkú +{0}</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="mon">
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="mon-short">
+ <relative type="-1">↑↑↑</relative>
+ <relative type="0">↑↑↑</relative>
+ <relative type="1">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="dayperiod-short">
+ <displayName>↑↑↑</displayName>
</field>
<field type="dayperiod">
<displayName>Àárọ̀/ọ̀sán</displayName>
</field>
+ <field type="dayperiod-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
<field type="hour">
<displayName>Wákàtí</displayName>
+ <relative type="0">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="hour-short">
<displayName>↑↑↑</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="hour-narrow">
<displayName>↑↑↑</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="minute">
<displayName>Ìsẹ́jú</displayName>
+ <relative type="0">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="minute-short">
<displayName>↑↑↑</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="minute-narrow">
<displayName>↑↑↑</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="second">
<displayName>Ìsẹ́jú Ààyá</displayName>
+ <relative type="0">↑↑↑</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="second-short">
<displayName>Ìsẹ́jú Ààyá</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="second-narrow">
<displayName>Ìsẹ́jú Ààyá</displayName>
+ <relativeTime type="future">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="other">↑↑↑</relativeTimePattern>
+ </relativeTime>
</field>
<field type="zone">
<displayName>Agbègbè àkókò</displayName>
</field>
+ <field type="zone-short">
+ <displayName>↑↑↑</displayName>
+ </field>
+ <field type="zone-narrow">
+ <displayName>↑↑↑</displayName>
+ </field>
</fields>
<timeZoneNames>
<hourFormat>+HH:mm;-HH:mm</hourFormat>
@@ -2882,6 +3371,13 @@
<daylight>Chile Summer Time</daylight>
</long>
</metazone>
+ <metazone type="China">
+ <long>
+ <generic>Àkókò Ṣáínà</generic>
+ <standard>Àkókò Ìfẹnukòsí Ṣáínà</standard>
+ <daylight>Àkókò Ojúmọmọ Ṣáínà</daylight>
+ </long>
+ </metazone>
<metazone type="Choibalsan">
<long>
<generic>Choibalsan Time</generic>
@@ -2915,9 +3411,9 @@
</metazone>
<metazone type="Cuba">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Kúbà</generic>
+ <standard>Àkókò Àfẹnukò Kúbà</standard>
+ <daylight>Àkókò Ojúmọmọ Kúbà</daylight>
</long>
</metazone>
<metazone type="Davis">
@@ -2932,7 +3428,7 @@
</metazone>
<metazone type="East_Timor">
<long>
- <standard>↑↑↑</standard>
+ <standard>Àkókò Ìlà oorùn Timor</standard>
</long>
</metazone>
<metazone type="Easter">
@@ -3026,16 +3522,16 @@
</metazone>
<metazone type="Greenland_Eastern">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Ìlà oorùn Greenland</generic>
+ <standard>Àkókò Ìwọ̀ Ìfẹnukò oorùn Greenland</standard>
+ <daylight>Àkókò ìgbà Ooru Greenland</daylight>
</long>
</metazone>
<metazone type="Greenland_Western">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Ìwọ̀ oorùn Greenland</generic>
+ <standard>Àkókò Àfẹnukò Ìwọ̀ Oòrùn Greenland</standard>
+ <daylight>Àkókò Àfẹnukò Ìgba Oòru Greenland</daylight>
</long>
</metazone>
<metazone type="Gulf">
@@ -3050,9 +3546,9 @@
</metazone>
<metazone type="Hawaii_Aleutian">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Hawaii-Aleutian</generic>
+ <standard>Àkókò Àfẹnukò Hawaii-Aleutian</standard>
+ <daylight>Àkókò Ojúmọmọ Hawaii-Aleutian</daylight>
</long>
</metazone>
<metazone type="Hong_Kong">
@@ -3081,12 +3577,12 @@
</metazone>
<metazone type="Indochina">
<long>
- <standard>↑↑↑</standard>
+ <standard>Àkókò Indochina</standard>
</long>
</metazone>
<metazone type="Indonesia_Central">
<long>
- <standard>↑↑↑</standard>
+ <standard>Àkókò Ààrin Gbùngbùn Indonesia</standard>
</long>
</metazone>
<metazone type="Indonesia_Eastern">
@@ -3096,7 +3592,7 @@
</metazone>
<metazone type="Indonesia_Western">
<long>
- <standard>↑↑↑</standard>
+ <standard>Àkókò Ìwọ̀ oorùn Indonesia</standard>
</long>
</metazone>
<metazone type="Iran">
@@ -3219,16 +3715,16 @@
</metazone>
<metazone type="Mexico_Northwest">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</generic>
+ <standard>Àkókò Àfẹnukò Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</standard>
+ <daylight>Àkókò Ojúmọmọ Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</daylight>
</long>
</metazone>
<metazone type="Mexico_Pacific">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Pásífíìkì Mẹ́ṣíkò</generic>
+ <standard>Àkókò Àfẹnukò Pásífíìkì Mẹ́síkò</standard>
+ <daylight>Àkókò Ojúmọmọ Pásífíìkì Mẹ́síkò</daylight>
</long>
</metazone>
<metazone type="Mongolia">
@@ -3276,9 +3772,9 @@
</metazone>
<metazone type="Newfoundland">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Newfoundland</generic>
+ <standard>Àkókò Àfẹnukò Newfoundland</standard>
+ <daylight>Àkókò Ojúmọmọ Newfoundland</daylight>
</long>
</metazone>
<metazone type="Niue">
@@ -3288,7 +3784,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic draft="contributed">Norfolk Island Time</generic>
+ <standard draft="contributed">Norfolk Island Standard Time</standard>
+ <daylight draft="contributed">Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -3357,9 +3855,9 @@
</metazone>
<metazone type="Pierre_Miquelon">
<long>
- <generic>↑↑↑</generic>
- <standard>↑↑↑</standard>
- <daylight>↑↑↑</daylight>
+ <generic>Àkókò Pierre & Miquelon</generic>
+ <standard>Àkókò Àfẹnukò Pierre & Miquelon</standard>
+ <daylight>Àkókò Ojúmọmọ Pierre & Miquelon</daylight>
</long>
</metazone>
<metazone type="Pitcairn">
@@ -3572,6 +4070,38 @@
<pattern>#,##0.###</pattern>
</decimalFormat>
</decimalFormatLength>
+ <decimalFormatLength type="long">
+ <decimalFormat>
+ <pattern type="1000" count="other">0 ẹgbẹ̀rún</pattern>
+ <pattern type="10000" count="other">00 ẹgbẹ̀rún</pattern>
+ <pattern type="100000" count="other">000 ẹgbẹ̀rún</pattern>
+ <pattern type="1000000" count="other">0 mílíọ̀nù</pattern>
+ <pattern type="10000000" count="other">00 mílíọ̀nù</pattern>
+ <pattern type="100000000" count="other">000 mílíọ̀nù</pattern>
+ <pattern type="1000000000" count="other">0 bilíọ̀nù</pattern>
+ <pattern type="10000000000" count="other">00 bilíọ̀nù</pattern>
+ <pattern type="100000000000" count="other">000 bilíọ̀nù</pattern>
+ <pattern type="1000000000000" count="other">0 tiriliọ̀nù</pattern>
+ <pattern type="10000000000000" count="other">00 tiriliọ̀nù</pattern>
+ <pattern type="100000000000000" count="other">000 tiriliọ̀nù</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ <decimalFormatLength type="short">
+ <decimalFormat>
+ <pattern type="1000" count="other">↑↑↑</pattern>
+ <pattern type="10000" count="other">↑↑↑</pattern>
+ <pattern type="100000" count="other">↑↑↑</pattern>
+ <pattern type="1000000" count="other">↑↑↑</pattern>
+ <pattern type="10000000" count="other">↑↑↑</pattern>
+ <pattern type="100000000" count="other">↑↑↑</pattern>
+ <pattern type="1000000000" count="other">↑↑↑</pattern>
+ <pattern type="10000000000" count="other">↑↑↑</pattern>
+ <pattern type="100000000000" count="other">↑↑↑</pattern>
+ <pattern type="1000000000000" count="other">↑↑↑</pattern>
+ <pattern type="10000000000000" count="other">↑↑↑</pattern>
+ <pattern type="100000000000000" count="other">↑↑↑</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
</decimalFormats>
<scientificFormats numberSystem="latn">
<scientificFormatLength>
@@ -3621,22 +4151,22 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AFN">
- <displayName>↑↑↑</displayName>
+ <displayName>Afugánì Afuganísítàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
- <displayName>↑↑↑</displayName>
+ <displayName>Lẹ́kẹ̀ Àlìbéníà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dírààmù Àmẹ́níà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ANG">
- <displayName>↑↑↑</displayName>
+ <displayName>Gílídà Netherlands Antillean</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3647,7 +4177,7 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ARS">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Agẹntínà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3659,35 +4189,35 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AWG">
- <displayName>↑↑↑</displayName>
+ <displayName>Fuloríìnì Àrúbà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="AZN">
- <displayName>↑↑↑</displayName>
+ <displayName>Mánààtì Àsàbáíjáì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BAM">
- <displayName>↑↑↑</displayName>
+ <displayName>Àmi Yíyípadà Bosnia-Herzegovina</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BBD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Bábádọ̀ọ̀sì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BDT">
- <displayName>↑↑↑</displayName>
+ <displayName>Tákà Báńgíládẹ̀ẹ̀ṣì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BGN">
- <displayName>↑↑↑</displayName>
+ <displayName>Owó Lẹ́fì Bọ̀lìgéríà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3702,19 +4232,19 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Bẹ̀múdà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BND">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Bùrùnéì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BOB">
- <displayName>↑↑↑</displayName>
+ <displayName>Bọlifiánò Bọ̀lífíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3726,13 +4256,13 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BSD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Bàhámà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BTN">
- <displayName>↑↑↑</displayName>
+ <displayName>Ìngọ́tírọ̀mù Bútàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3743,13 +4273,13 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BYN">
- <displayName>↑↑↑</displayName>
+ <displayName>Rọ́bù Bẹ̀lárùùsì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="BZD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Bẹ̀lísè</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3771,13 +4301,13 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CLP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Ṣílè</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNH">
- <displayName>↑↑↑</displayName>
+ <displayName>Yúànì Sháínà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -3788,25 +4318,25 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="COP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Kòlóḿbíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CRC">
- <displayName>↑↑↑</displayName>
+ <displayName>Kólọ́ọ̀nì Kosita Ríkà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUC">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Yíyípadà Kúbà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CUP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Kúbà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3817,7 +4347,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CZK">
- <displayName>↑↑↑</displayName>
+ <displayName>Koruna Ṣẹ́ẹ̀kì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3828,13 +4358,13 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DKK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kírónì Dáníṣì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="DOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Dòníníkà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3867,13 +4397,13 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FJD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Fíjì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="FKP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pọ́n-ùn Erékùsù Falkland</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3885,7 +4415,7 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GEL">
- <displayName>↑↑↑</displayName>
+ <displayName>Lárì Jọ́jíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3894,12 +4424,12 @@
<displayName>ṣidi ti Orílẹ́ède Gana</displayName>
</currency>
<currency type="GHS">
- <displayName>↑↑↑</displayName>
+ <displayName>Sídì Ghanaian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GIP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pọ́n-ùn Gibraltar</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3910,7 +4440,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GNF">
- <displayName>↑↑↑</displayName>
+ <displayName>Fírànkì Gíníànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3919,54 +4449,54 @@
<displayName>Faransi ti Orílẹ́ède Gini</displayName>
</currency>
<currency type="GTQ">
- <displayName>↑↑↑</displayName>
+ <displayName>Kúẹ́tísààlì Guatimílà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="GYD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Gùyánà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HKD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Hong Kong</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HNL">
- <displayName>↑↑↑</displayName>
+ <displayName>Lẹmipírà Ọ́ńdúrà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HRK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kúnà Croatian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HTG">
- <displayName>↑↑↑</displayName>
+ <displayName>Gọ́dì Àítì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="HUF">
- <displayName>↑↑↑</displayName>
+ <displayName>Fọ́ríǹtì Họ̀ngérí</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IDR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rúpìyá Indonésíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ILS">
- <displayName>↑↑↑</displayName>
+ <displayName>Ṣékélì Tuntun Ísírẹ̀ẹ̀lì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -3978,29 +4508,29 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IQD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dínárì Ìráákì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="IRR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rial Iranian</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ISK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kòrónà Icelandic</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JMD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Jàmáíkà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="JOD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dínárì Jọ́dàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4016,12 +4546,12 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KGS">
- <displayName>↑↑↑</displayName>
+ <displayName>Sómú Kirijísítàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KHR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ráyò Kàm̀bọ́díà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4033,48 +4563,48 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KPW">
- <displayName>↑↑↑</displayName>
+ <displayName>Wọ́ọ̀nù Àríwá Kòríà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KRW">
- <displayName>↑↑↑</displayName>
+ <displayName>Wọ́ọ̀nù Gúúsù Kòríà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">₩</symbol>
</currency>
<currency type="KWD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dínárì Kuwaiti</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KYD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Erékùsù Cayman</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="KZT">
- <displayName>↑↑↑</displayName>
+ <displayName>Tẹngé Kasakísítàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LAK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kíììpù Làótì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LBP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pọ́n-ùn Lebanese</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="LKR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rúpìì Siri Láńkà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4099,7 +4629,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MDL">
- <displayName>↑↑↑</displayName>
+ <displayName>Owó Léhù Moldovan</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4110,24 +4640,24 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MKD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dẹ́nà Masidóníà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MMK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kíyàtì Myanmar</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MNT">
- <displayName>↑↑↑</displayName>
+ <displayName>Túgúrììkì Mòǹgólíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pàtákà Màkáò</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4146,7 +4676,7 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MVR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rúfìyá Mọ̀lìdífà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4156,13 +4686,13 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MXN">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Mẹ́síkò</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="MYR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ríngìtì Màléṣíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4171,7 +4701,7 @@
<displayName>Metika ti Orílẹ́ède Mosamibiki</displayName>
</currency>
<currency type="MZN">
- <displayName>↑↑↑</displayName>
+ <displayName>Mẹ́tíkààlì Mòsáḿbíìkì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4188,86 +4718,86 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NIO">
- <displayName>↑↑↑</displayName>
+ <displayName>Kọ̀dóbà Naikarágúà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NOK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kírónì Nọ́ọ́wè</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NPR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rúpìì Nẹ̵́pààlì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="NZD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là New Zealand</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="OMR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ráyò Omani</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PAB">
- <displayName>↑↑↑</displayName>
+ <displayName>Bálíbóà Pànámà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PEN">
- <displayName>↑↑↑</displayName>
+ <displayName>Sólì Pèrúù</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PGK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kínà Papua Guinea Tuntun</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PHP">
- <displayName>↑↑↑</displayName>
+ <displayName>Písò Fílípìnì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PKR">
- <displayName>↑↑↑</displayName>
+ <displayName>Rúpìì Pakisitánì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PLN">
- <displayName>↑↑↑</displayName>
+ <displayName>Sílọ̀tì Pọ́líṣì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="PYG">
- <displayName>↑↑↑</displayName>
+ <displayName>Gúáránì Párágúwè</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="QAR">
- <displayName>↑↑↑</displayName>
+ <displayName>Ráyò Kàtárì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RON">
- <displayName>↑↑↑</displayName>
+ <displayName>Léhù Ròméníà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="RSD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dínárì Sàbíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4289,7 +4819,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SBD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Erékùsù Sọ́lómọ́nì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4308,13 +4838,13 @@
<displayName>Pọọun ti Orílẹ́ède Sudani</displayName>
</currency>
<currency type="SEK">
- <displayName>↑↑↑</displayName>
+ <displayName>Kòrónà Súwídìn</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SGD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Síngápọ̀</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4336,13 +4866,13 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SRD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Súrínámì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SSP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pọ́n-ùn Gúúsù Sùdáànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4357,7 +4887,7 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="SYP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pọ́n-ùn Sírìà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4368,18 +4898,18 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="THB">
- <displayName>↑↑↑</displayName>
+ <displayName>Báàtì Tháì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TJS">
- <displayName>↑↑↑</displayName>
+ <displayName>Sómónì Tajikístàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TMT">
- <displayName>↑↑↑</displayName>
+ <displayName>Mánààtì Tọkimẹnístàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4389,26 +4919,26 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TOP">
- <displayName>↑↑↑</displayName>
+ <displayName>Pàángà Tóńgà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TRY">
- <displayName>↑↑↑</displayName>
+ <displayName>Lírà Tọ́kì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
<symbol alt="variant" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TTD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Trinidad & Tobago</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="TWD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Tàìwánì Tuntun</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4419,7 +4949,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UAH">
- <displayName>↑↑↑</displayName>
+ <displayName>Ọrifiníyà Yukiréníà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4436,34 +4966,34 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UYU">
- <displayName>↑↑↑</displayName>
+ <displayName>Pẹ́sò Úrúgúwè</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="UZS">
- <displayName>↑↑↑</displayName>
+ <displayName>Sómú Usibẹkísítàànì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VES">
- <displayName>↑↑↑</displayName>
+ <displayName>Bọ̀lífà Fẹnẹsuẹ́là</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VND">
- <displayName>↑↑↑</displayName>
+ <displayName>Dáhùn Vietnamese</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VUV">
- <displayName>↑↑↑</displayName>
+ <displayName>Fátù Vanuatu</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="WST">
- <displayName>↑↑↑</displayName>
+ <displayName>Tálà Sàmóà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4473,7 +5003,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XCD">
- <displayName>↑↑↑</displayName>
+ <displayName>Dọ́là Ilà Oòrùn Karíbíà</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
@@ -4484,7 +5014,7 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="XPF">
- <displayName>↑↑↑</displayName>
+ <displayName>Fírànkì CFP</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4493,7 +5023,7 @@
<displayName count="other">owóníná àìmọ̀</displayName>
</currency>
<currency type="YER">
- <displayName>↑↑↑</displayName>
+ <displayName>Ráyò Yẹ́mẹ̀nì</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -4529,9 +5059,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -4539,7 +5137,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4620,7 +5218,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -4644,7 +5242,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5028,15 +5626,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5100,7 +5698,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5226,9 +5824,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5236,7 +5902,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5317,7 +5983,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5341,7 +6007,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5725,15 +6391,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5797,7 +6463,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -5923,9 +6589,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -5933,7 +6667,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -6085,4 +6819,16 @@
<nostr>Bẹ́ẹ̀kọ́:K</nostr>
</messages>
</posix>
+ <characterLabels>
+ <characterLabel type="emoji">↑↑↑</characterLabel>
+ <characterLabel type="european_scripts">↑↑↑</characterLabel>
+ <characterLabel type="female">↑↑↑</characterLabel>
+ <characterLabel type="leftwards_arrows">↑↑↑</characterLabel>
+ <characterLabel type="numbers">↑↑↑</characterLabel>
+ <characterLabel type="pictographs">↑↑↑</characterLabel>
+ <characterLabel type="punctuation">↑↑↑</characterLabel>
+ <characterLabel type="symbols">↑↑↑</characterLabel>
+ <characterLabel type="upwards_arrows">↑↑↑</characterLabel>
+ <characterLabel type="whitespace">↑↑↑</characterLabel>
+ </characterLabels>
</ldml>
diff --git a/common/main/yo_BJ.xml b/common/main/yo_BJ.xml
index 835fe33..6b78840 100644
--- a/common/main/yo_BJ.xml
+++ b/common/main/yo_BJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -19,23 +19,48 @@
</localeDisplayPattern>
<languages>
<language type="af">Èdè Afrikani</language>
+ <language type="agq">Ágɛ̀ɛ̀mù</language>
<language type="ak">Èdè Akani</language>
<language type="am">Èdè Amariki</language>
<language type="ar">Èdè Árábìkì</language>
<language type="as">Ti Assam</language>
+ <language type="asa">Asu</language>
+ <language type="ast">Asturian</language>
<language type="az">Èdè Azerbaijani</language>
+ <language type="bas">Basaa</language>
<language type="be">Èdè Belarusi</language>
+ <language type="bem">Béḿbà</language>
+ <language type="bez">Bɛ́nà</language>
<language type="bg">Èdè Bugaria</language>
+ <language type="bm">Báḿbàrà</language>
<language type="bn">Èdè Bengali</language>
+ <language type="bo">Tibetán</language>
<language type="br">Èdè Bretoni</language>
+ <language type="brx">Bódò</language>
<language type="bs">Èdè Bosnia</language>
<language type="ca">Èdè Catala</language>
+ <language type="ccp">Chakma</language>
+ <language type="ce">Chechen</language>
+ <language type="ceb">Cebuano</language>
+ <language type="cgg">Chiga</language>
+ <language type="chr">Shɛ́rókiì</language>
+ <language type="ckb">Ààrin Gbùngbùn Kurdish</language>
+ <language type="co">Corsican</language>
<language type="cs">Èdè seeki</language>
+ <language type="cu">Síláfííkì Ilé Ìjɔ́sìn</language>
<language type="cy">Èdè Welshi</language>
<language type="da">Èdè Ilɛ̀ Denmark</language>
+ <language type="dav">Táítà</language>
<language type="de">Èdè Jámánì</language>
<language type="de_AT">Èdè Jámánì (Ɔ́síríà )</language>
<language type="de_CH">Èdè Ilɛ̀ Jámánì (Orílɛ́ède swítsàlandì)</language>
+ <language type="dje">Shárúmà</language>
+ <language type="dsb">Shobíànù Ìpìlɛ̀</language>
+ <language type="dua">Duala</language>
+ <language type="dyo">Jola-Fonyi</language>
+ <language type="dz">Dzongkha</language>
+ <language type="ebu">Ɛmbù</language>
+ <language type="ee">Ewè</language>
<language type="el">Èdè Giriki</language>
<language type="en">Èdè Gɛ̀ɛ́sì</language>
<language type="en_AU">Èdè Gɛ̀ɛ́sì (órílɛ̀-èdè Ɔsirélíà)</language>
@@ -50,6 +75,7 @@
<language type="es_MX">Èdè Sípáníìshì (orílɛ̀-èdè Mɛ́síkò)</language>
<language type="et">Èdè Estonia</language>
<language type="eu">Èdè Baski</language>
+ <language type="ewo">Èwóǹdò</language>
<language type="fa">Èdè Pasia</language>
<language type="ff">Èdè Fúlàní</language>
<language type="fi">Èdè Finisi</language>
@@ -58,56 +84,137 @@
<language type="fr">Èdè Faransé</language>
<language type="fr_CA">Èdè Faransé (orílɛ̀-èdè Kánádà)</language>
<language type="fr_CH">Èdè Faranshé (Súwísàlaǹdì)</language>
+ <language type="fur">Firiúlíànì</language>
<language type="fy">Èdè Frisia</language>
<language type="ga">Èdè Ireland</language>
<language type="gd">Èdè Gaelik ti Ilu Scotland</language>
<language type="gl">Èdè Galicia</language>
<language type="gn">Èdè Guarani</language>
+ <language type="gsw">Súwísì ti Jámánì</language>
<language type="gu">Èdè Gujarati</language>
+ <language type="guz">Gusii</language>
+ <language type="gv">Máǹkì</language>
<language type="ha">Èdè Hausa</language>
+ <language type="haw">Hawaiian</language>
<language type="he">Èdè Heberu</language>
<language type="hi">Èdè Híńdì</language>
+ <language type="hmn">Hmong</language>
<language type="hr">Èdè Kroatia</language>
+ <language type="hsb">Sorbian Apá Òkè</language>
+ <language type="ht">Haitian Creole</language>
<language type="hu">Èdè Hungaria</language>
<language type="hy">Èdè Ile Armenia</language>
<language type="ia">Èdè pipo</language>
<language type="id">Èdè Indonéshíà</language>
<language type="ie">Iru Èdè</language>
<language type="ig">Èdè Yíbò</language>
+ <language type="ii">Shíkuán Yì</language>
<language type="is">Èdè Icelandic</language>
<language type="it">Èdè Ítálì</language>
<language type="ja">Èdè Jàpáànù</language>
+ <language type="jgo">Ńgòmbà</language>
+ <language type="jmc">Máshámè</language>
<language type="jv">Èdè Javanasi</language>
<language type="ka">Èdè Georgia</language>
+ <language type="kab">Kabilè</language>
+ <language type="kam">Káńbà</language>
+ <language type="kde">Mákondé</language>
+ <language type="kea">Kabufadíánù</language>
+ <language type="khq">Koira Shíínì</language>
+ <language type="ki">Kíkúyù</language>
+ <language type="kk">Kashakì</language>
+ <language type="kkj">Kàkó</language>
+ <language type="kl">Kalaalísùtì</language>
+ <language type="kln">Kálɛnjín</language>
<language type="km">Èdè kameri</language>
<language type="kn">Èdè Kannada</language>
<language type="ko">Èdè Kòríà</language>
+ <language type="kok">Kónkánì</language>
+ <language type="ks">Kashímirì</language>
+ <language type="ksb">Sháńbálà</language>
+ <language type="ksf">Báfíà</language>
+ <language type="ksh">Colognian</language>
+ <language type="ku">Kɔdishì</language>
+ <language type="kw">Kɔ́nììshì</language>
+ <language type="ky">Kírígíìsì</language>
<language type="la">Èdè Latini</language>
+ <language type="lag">Láńgì</language>
+ <language type="lb">Lùshɛ́mbɔ́ɔ̀gì</language>
+ <language type="lg">Ganda</language>
+ <language type="lkt">Lákota</language>
+ <language type="ln">Lìǹgálà</language>
+ <language type="lo">Láò</language>
+ <language type="lrc">Apáàríwá Lúrì</language>
<language type="lt">Èdè Lithuania</language>
+ <language type="lu">Lúbà-Katanga</language>
+ <language type="luy">Luyíà</language>
<language type="lv">Èdè Latvianu</language>
+ <language type="mas">Másáì</language>
+ <language type="mer">Mérù</language>
+ <language type="mfe">Morisiyen</language>
+ <language type="mg">Malagasì</language>
+ <language type="mgh">Makhuwa-Meeto</language>
+ <language type="mgo">Métà</language>
+ <language type="mi">Màórì</language>
<language type="mk">Èdè Macedonia</language>
+ <language type="ml">Málàyálámù</language>
+ <language type="mn">Mòngólíà</language>
<language type="mr">Èdè marathi</language>
<language type="ms">Èdè Malaya</language>
<language type="mt">Èdè Malta</language>
+ <language type="mua">Múndàngì</language>
+ <language type="mul">Ɔlɔ́pɔ̀ èdè</language>
<language type="my">Èdè Bumiisi</language>
+ <language type="mzn">Masanderani</language>
+ <language type="naq">Námà</language>
+ <language type="nb">Nɔ́ɔ́wè Bokímàl</language>
+ <language type="nd">Àríwá Ndebele</language>
+ <language type="nds">Jámánì ìpìlɛ̀</language>
<language type="ne">Èdè Nepali</language>
<language type="nl">Èdè Dɔ́ɔ̀shì</language>
+ <language type="nmg">Kíwáshíò</language>
+ <language type="nn">Nɔ́ɔ́wè Nínɔ̀sìkì</language>
+ <language type="nnh">Ngiembùnù</language>
<language type="no">Èdè Norway</language>
+ <language type="nus">Núɛ̀</language>
+ <language type="ny">Ńyájà</language>
+ <language type="nyn">Ńyákɔ́lè</language>
<language type="oc">Èdè Occitani</language>
+ <language type="om">Òròmɔ́</language>
+ <language type="or">Òdíà</language>
+ <language type="os">Ɔshɛ́tíìkì</language>
<language type="pa">Èdè Punjabi</language>
<language type="pl">Èdè Póláǹdì</language>
+ <language type="prg">Púrúshíànù</language>
+ <language type="ps">Páshítò</language>
<language type="pt">Èdè Pɔtogí</language>
<language type="pt_BR">Èdè Pɔtogí (Orilɛ̀-èdè Bràsíl)</language>
<language type="pt_PT">Èdè Pɔtogí (orílɛ̀-èdè Yúróòpù)</language>
+ <language type="qu">Kúɛ́ńjùà</language>
+ <language type="rm">Rómáǹshì</language>
+ <language type="rn">Rúńdì</language>
<language type="ro">Èdè Romania</language>
+ <language type="rof">Róńbò</language>
<language type="ru">Èdè Rɔ́shíà</language>
<language type="rw">Èdè Ruwanda</language>
+ <language type="rwk">Riwa</language>
<language type="sa">Èdè awon ara Indo</language>
+ <language type="sah">Sàkíhà</language>
+ <language type="saq">Samburu</language>
+ <language type="sbp">Sangu</language>
<language type="sd">Èdè Sindhi</language>
+ <language type="se">Apáàríwá Sami</language>
+ <language type="seh">Shɛnà</language>
+ <language type="ses">Koiraboro Seni</language>
+ <language type="sg">Sango</language>
<language type="sh">Èdè Serbo-Croatiani</language>
+ <language type="shi">Tashelíìtì</language>
<language type="si">Èdè Sinhalese</language>
<language type="sk">Èdè Slovaki</language>
<language type="sl">Èdè Slovenia</language>
+ <language type="sm">Sámóánù</language>
+ <language type="smn">Inari Sami</language>
+ <language type="sn">Shɔnà</language>
<language type="so">Èdè ara Somalia</language>
<language type="sq">Èdè Albania</language>
<language type="sr">Èdè Serbia</language>
@@ -117,45 +224,99 @@
<language type="sw">Èdè Swahili</language>
<language type="ta">Èdè Tamili</language>
<language type="te">Èdè Telugu</language>
+ <language type="teo">Tɛ́sò</language>
+ <language type="tg">Tàjíìkì</language>
<language type="th">Èdè Tai</language>
<language type="ti">Èdè Tigrinya</language>
<language type="tk">Èdè Turkmen</language>
<language type="tlh">Èdè Klingoni</language>
+ <language type="to">Tóńgàn</language>
<language type="tr">Èdè Tɔɔkisi</language>
+ <language type="tt">Tatarí</language>
+ <language type="twq">Tasawak</language>
+ <language type="tzm">Ààrin Gbùngbùn Atlas Tamazight</language>
+ <language type="ug">Yúgɔ̀</language>
<language type="uk">Èdè Ukania</language>
<language type="und">Èdè àìmɔ̀</language>
<language type="ur">Èdè Udu</language>
<language type="uz">Èdè Uzbek</language>
<language type="vi">Èdè Jetinamu</language>
+ <language type="vo">Fɔ́lápùùkù</language>
+ <language type="vun">Funjo</language>
+ <language type="wae">Wɔsà</language>
+ <language type="wo">Wɔ́lɔ́ɔ̀fù</language>
<language type="xh">Èdè Xhosa</language>
+ <language type="xog">Shógà</language>
+ <language type="yav">Yangbɛn</language>
<language type="yi">Èdè Yiddishi</language>
<language type="yo">Èdè Yorùbá</language>
+ <language type="yue">Cantonese</language>
+ <language type="zgh">Àfɛnùkò Támásáìtì ti Mòrókò</language>
<language type="zh">Èdè Mandarin tí wɔ́n ń sɔ lórílɛ̀-èdè Sháínà</language>
<language type="zh" alt="menu">Sháídà, Mandrínì</language>
- <language type="zh_Hant" draft="provisional">Èdè Ìbílɛ̀ Sháínà</language>
+ <language type="zh_Hant">Èdè Ìbílɛ̀ Sháínà</language>
<language type="zu">Èdè Shulu</language>
+ <language type="zxx">Kò sí àkóònú elédè</language>
</languages>
<scripts>
<script type="Arab">èdè Lárúbáwá</script>
+ <script type="Armn">Àmɛ́níà</script>
+ <script type="Beng">Báńgílà</script>
+ <script type="Bopo">Bopomófò</script>
+ <script type="Brai">Bíráìlè</script>
<script type="Cyrl">èdè ilɛ̀ Rɔ́shíà</script>
+ <script type="Deva">Dɛfanagárì</script>
+ <script type="Ethi">Ɛtiópíìkì</script>
+ <script type="Geor">Jɔ́jíànù</script>
+ <script type="Grek">Jɔ́jíà</script>
+ <script type="Gujr">Gujaráti</script>
+ <script type="Guru">Gurumúkhì</script>
+ <script type="Hanb">Han pɛ̀lú Bopomófò</script>
+ <script type="Hang">Háńgùlù</script>
+ <script type="Hani">Háànù</script>
<script type="Hans">tí wɔ́n mú rɔrùn.</script>
<script type="Hans" alt="stand-alone">Hans tí wɔ́n mú rɔrùn.</script>
<script type="Hant">Hans àtɔwɔ́dɔ́wɔ́</script>
<script type="Hant" alt="stand-alone">Hans àtɔwɔ́dɔ́wɔ́</script>
+ <script type="Hebr">Hébérù</script>
+ <script type="Hira">Hiragánà</script>
+ <script type="Hrkt">ìlànà àfɔwɔ́kɔ ará Jàpánù</script>
<script type="Jpan">èdè jàpáànù</script>
+ <script type="Kana">Katakánà</script>
+ <script type="Khmr">Kɛmɛ̀</script>
+ <script type="Knda">Kanada</script>
<script type="Kore">Kóríà</script>
+ <script type="Laoo">Láò</script>
<script type="Latn">Èdè Látìn</script>
+ <script type="Mlym">Málàyálámù</script>
+ <script type="Mong">Mòngólíà</script>
+ <script type="Mymr">Myánmarà</script>
+ <script type="Orya">Òdíà</script>
+ <script type="Sinh">Sìnhálà</script>
+ <script type="Taml">Támílì</script>
+ <script type="Telu">Télúgù</script>
+ <script type="Thaa">Taana</script>
+ <script type="Tibt">Tíbétán</script>
+ <script type="Zmth">Àmì Ìshèsìrò</script>
+ <script type="Zsye">Émójì</script>
+ <script type="Zsym">Àwɔn àmì</script>
<script type="Zxxx">Aikɔsilɛ</script>
+ <script type="Zyyy">Wɔ́pɔ̀</script>
<script type="Zzzz">Ìshɔwɔ́kɔ̀wé àìmɔ̀</script>
</scripts>
<territories>
+ <territory type="001">Agbáyé</territory>
+ <territory type="002">Áfíríkà</territory>
<territory type="003">Àríwá Amɛ́ríkà</territory>
<territory type="005">Gúúshù Amɛ́ríkà</territory>
+ <territory type="009">Oceania</territory>
<territory type="011">Ìwɔ̀ oorùn Afíríkà</territory>
<territory type="013">Ààrin Gbùgbùn Àmɛ́ríkà</territory>
<territory type="014">Ìlà Oorùn Áfíríkà</territory>
+ <territory type="015">Northern Africa</territory>
<territory type="017">Ààrín gbùngbùn Afíríkà</territory>
<territory type="018">Apágúúsù Áfíríkà</territory>
+ <territory type="019">Amɛ́ríkà</territory>
<territory type="021">Apáàríwá Amɛ́ríkà</territory>
<territory type="029">Káríbíànù</territory>
<territory type="030">Ìlà Òòrùn Eshíà</territory>
@@ -166,12 +327,16 @@
<territory type="054">Mɛlanéshíà</territory>
<territory type="057">Agbègbè Maikironéshíà</territory>
<territory type="061">Polineshíà</territory>
+ <territory type="142">Asia</territory>
<territory type="143">Ààrin Gbùngbùn Éshíà</territory>
<territory type="145">Ìwɔ̀ Òòrùn Eshíà</territory>
+ <territory type="150">Europe</territory>
<territory type="151">Ìlà Òrùn Yúrópù</territory>
<territory type="154">Northern Europe</territory>
<territory type="155">Ìwɔ̀ Òòrùn Yúrópù</territory>
+ <territory type="202">Sàhárà Áfíríkà</territory>
<territory type="419">Látín Amɛ́ríkà</territory>
+ <territory type="AC">Erékùsù Ascension</territory>
<territory type="AD">Orílɛ́ède Ààndórà</territory>
<territory type="AE">Orílɛ́ède Ɛmirate ti Awɔn Arabu</territory>
<territory type="AF">Orílɛ́ède Àfùgànístánì</territory>
@@ -180,11 +345,13 @@
<territory type="AL">Orílɛ́ède Àlùbàníánì</territory>
<territory type="AM">Orílɛ́ède Améníà</territory>
<territory type="AO">Orílɛ́ède Ààngólà</territory>
+ <territory type="AQ">Antakítíkà</territory>
<territory type="AR">Orílɛ́ède Agentínà</territory>
<territory type="AS">Sámóánì ti Orílɛ́ède Àméríkà</territory>
<territory type="AT">Orílɛ́ède Asítíríà</territory>
<territory type="AU">Orílɛ́ède Ástràlìá</territory>
<territory type="AW">Orílɛ́ède Árúbà</territory>
+ <territory type="AX">Àwɔn Erékùsù ti Åland</territory>
<territory type="AZ">Orílɛ́ède Asɛ́bájánì</territory>
<territory type="BA">Orílɛ́ède Bɔ̀síníà àti Ɛtisɛgófínà</territory>
<territory type="BB">Orílɛ́ède Bábádósì</territory>
@@ -195,16 +362,20 @@
<territory type="BH">Orílɛ́ède Báránì</territory>
<territory type="BI">Orílɛ́ède Bùùrúndì</territory>
<territory type="BJ">Orílɛ́ède Bɛ̀nɛ̀</territory>
+ <territory type="BL">St. Barthélemy</territory>
<territory type="BM">Orílɛ́ède Bémúdà</territory>
<territory type="BN">Orílɛ́ède Búrúnɛ́lì</territory>
<territory type="BO">Orílɛ́ède Bɔ̀lífíyà</territory>
+ <territory type="BQ">Caribbean Netherlands</territory>
<territory type="BR">Orilɛ̀-èdè Bàràsílì</territory>
<territory type="BS">Orílɛ́ède Bàhámásì</territory>
<territory type="BT">Orílɛ́ède Bútánì</territory>
+ <territory type="BV">Erékùsù Bouvet</territory>
<territory type="BW">Orílɛ́ède Bɔ̀tìsúwánà</territory>
<territory type="BY">Orílɛ́ède Bélárúsì</territory>
<territory type="BZ">Orílɛ́ède Bèlísɛ̀</territory>
<territory type="CA">Orílɛ́ède Kánádà</territory>
+ <territory type="CC">Erékùsù Cocos (Keeling)</territory>
<territory type="CD">Orilɛ́ède Kóngò</territory>
<territory type="CF">Orílɛ́ède Àrin gùngun Áfíríkà</territory>
<territory type="CG">Orílɛ́ède Kóngò</territory>
@@ -215,17 +386,22 @@
<territory type="CM">Orílɛ́ède Kamerúúnì</territory>
<territory type="CN">Orilɛ̀-èdè Sháínà</territory>
<territory type="CO">Orílɛ́ède Kòlómíbìa</territory>
+ <territory type="CP">Erékùsù Clipperston</territory>
<territory type="CR">Orílɛ́ède Kuusita Ríkà</territory>
<territory type="CU">Orílɛ́ède Kúbà</territory>
<territory type="CV">Orílɛ́ède Etíokun Kápé féndè</territory>
+ <territory type="CW">Curaçao</territory>
+ <territory type="CX">Erékùsù Christmas</territory>
<territory type="CY">Orílɛ́ède Kúrúsì</territory>
<territory type="CZ">Orílɛ́ède shɛ́ɛ́kì</territory>
<territory type="DE">Orílɛèdè Jámánì</territory>
+ <territory type="DG">Diego Gashia</territory>
<territory type="DJ">Orílɛ́ède Díbɔ́ótì</territory>
<territory type="DK">Orílɛ́ède Dɛ́mákì</territory>
<territory type="DM">Orílɛ́ède Dòmíníkà</territory>
<territory type="DO">Orilɛ́ède Dòmíníkánì</territory>
<territory type="DZ">Orílɛ́ède Àlùgèríánì</territory>
+ <territory type="EA">Seuta àti Melilla</territory>
<territory type="EC">Orílɛ́ède Ekuádò</territory>
<territory type="EE">Orílɛ́ède Esitonia</territory>
<territory type="EG">Orílɛ́ède Égípítì</territory>
@@ -234,16 +410,19 @@
<territory type="ES">Orílɛ́ède Sipani</territory>
<territory type="ET">Orílɛ́ède Etopia</territory>
<territory type="EU">Ìshɔ̀kan Yúròpù</territory>
+ <territory type="EZ">Agbègbè Euro</territory>
<territory type="FI">Orílɛ́ède Filandi</territory>
<territory type="FJ">Orílɛ́ède Fiji</territory>
<territory type="FK">Orílɛ́ède Etikun Fakalandi</territory>
<territory type="FM">Orílɛ́ède Makoronesia</territory>
+ <territory type="FO">Àwɔn Erékùsù ti Faroe</territory>
<territory type="FR">Orílɛ́ède Faranse</territory>
<territory type="GA">Orílɛ́ède Gabon</territory>
<territory type="GB">Orílɛ́èdè Gɛ̀ɛ́sì</territory>
<territory type="GD">Orílɛ́ède Genada</territory>
<territory type="GE">Orílɛ́ède Gɔgia</territory>
<territory type="GF">Orílɛ́ède Firenshi Guana</territory>
+ <territory type="GG">Guernsey</territory>
<territory type="GH">Orílɛ́ède Gana</territory>
<territory type="GI">Orílɛ́ède Gibaratara</territory>
<territory type="GL">Orílɛ́ède Gerelandi</territory>
@@ -252,23 +431,29 @@
<territory type="GP">Orílɛ́ède Gadelope</territory>
<territory type="GQ">Orílɛ́ède Ekutoria Gini</territory>
<territory type="GR">Orílɛ́ède Geriisi</territory>
+ <territory type="GS">Gúúsù Georgia àti Gúúsù Àwɔn Erékùsù Sandwich</territory>
<territory type="GT">Orílɛ́ède Guatemala</territory>
<territory type="GU">Orílɛ́ède Guamu</territory>
<territory type="GW">Orílɛ́ède Gene-Busau</territory>
<territory type="GY">Orílɛ́ède Guyana</territory>
+ <territory type="HK">Hong Kong SAR ti Sháìnà</territory>
+ <territory type="HM">Erékùsù Heard àti Erékùsù McDonald</territory>
<territory type="HN">Orílɛ́ède Hondurasi</territory>
<territory type="HR">Orílɛ́ède Kòróátíà</territory>
<territory type="HT">Orílɛ́ède Haati</territory>
<territory type="HU">Orílɛ́ède Hungari</territory>
+ <territory type="IC">Ɛrékùsù Kánárì</territory>
<territory type="ID">Orílɛ́ède Indonesia</territory>
<territory type="IE">Orílɛ́ède Ailandi</territory>
<territory type="IL">Orílɛ́ède Iserɛli</territory>
+ <territory type="IM">Isle of Man</territory>
<territory type="IN">Orílɛ́ède India</territory>
<territory type="IO">Orílɛ́ède Etíkun Índíánì ti Ìlú Bírítísì</territory>
<territory type="IQ">Orílɛ́ède Iraki</territory>
<territory type="IR">Orílɛ́ède Irani</territory>
<territory type="IS">Orílɛ́ède Ashilandi</territory>
<territory type="IT">Orílɛ́ède Itáli</territory>
+ <territory type="JE">Jersey</territory>
<territory type="JM">Orílɛ́ède Jamaika</territory>
<territory type="JO">Orílɛ́ède Jɔdani</territory>
<territory type="JP">Orílɛ́ède Japani</territory>
@@ -297,12 +482,15 @@
<territory type="MA">Orílɛ́ède Moroko</territory>
<territory type="MC">Orílɛ́ède Monako</territory>
<territory type="MD">Orílɛ́ède Modofia</territory>
+ <territory type="ME">Montenegro</territory>
+ <territory type="MF">St. Martin</territory>
<territory type="MG">Orílɛ́ède Madasika</territory>
<territory type="MH">Orílɛ́ède Etikun Máshali</territory>
<territory type="MK">Àríwá Macedonia</territory>
<territory type="ML">Orílɛ́ède Mali</territory>
<territory type="MM">Orílɛ́ède Manamari</territory>
<territory type="MN">Orílɛ́ède Mogolia</territory>
+ <territory type="MO">Macao SAR ti Sháìnà</territory>
<territory type="MO" alt="short">Màkáò</territory>
<territory type="MP">Orílɛ́ède Etikun Guusu Mariana</territory>
<territory type="MQ">Orílɛ́ède Matinikuwi</territory>
@@ -344,8 +532,10 @@
<territory type="PW">Orílɛ́ède Paalu</territory>
<territory type="PY">Orílɛ́ède Paraguye</territory>
<territory type="QA">Orílɛ́ède Kota</territory>
+ <territory type="QO">Agbègbè Oceania</territory>
<territory type="RE">Orílɛ́ède Riuniyan</territory>
<territory type="RO">Orílɛ́ède Romaniya</territory>
+ <territory type="RS">Serbia</territory>
<territory type="RU">Orílɛ́ède Rɔshia</territory>
<territory type="RW">Orílɛ́ède Ruwanda</territory>
<territory type="SA">Orílɛ́ède Saudi Arabia</territory>
@@ -356,6 +546,7 @@
<territory type="SG">Orílɛ́ède Singapo</territory>
<territory type="SH">Orílɛ́ède Hɛlena</territory>
<territory type="SI">Orílɛ́ède Silofania</territory>
+ <territory type="SJ">Svalbard & Jan Mayen</territory>
<territory type="SK">Orílɛ́ède Silofakia</territory>
<territory type="SL">Orílɛ́ède Siria looni</territory>
<territory type="SM">Orílɛ́ède Sani Marino</territory>
@@ -365,9 +556,11 @@
<territory type="SS">Gúúsù Sudan</territory>
<territory type="ST">Orílɛ́ède Sao tomi ati piriishipi</territory>
<territory type="SV">Orílɛ́ède Ɛɛsáfádò</territory>
+ <territory type="SX">Sint Maarten</territory>
<territory type="SY">Orílɛ́ède Siria</territory>
<territory type="SZ">Orílɛ́ède Sashiland</territory>
<territory type="SZ" alt="variant">Síwásìlandì</territory>
+ <territory type="TA">Tristan da Kunha</territory>
<territory type="TC">Orílɛ́ède Tɔɔki ati Etikun Kakɔsi</territory>
<territory type="TD">Orílɛ́ède shààdì</territory>
<territory type="TF">Agbègbè Gúúsù Faranshé</territory>
@@ -387,6 +580,7 @@
<territory type="TZ">Orílɛ́ède Tàǹsáníà</territory>
<territory type="UA">Orílɛ́ède Ukarini</territory>
<territory type="UG">Orílɛ́ède Uganda</territory>
+ <territory type="UM">Àwɔn Erékùsù Kékèké Agbègbè US</territory>
<territory type="UN">Ìshɔ̀kan àgbáyé</territory>
<territory type="US">Orílɛ̀-èdè Amɛrikà</territory>
<territory type="UY">Orílɛ́ède Nruguayi</territory>
@@ -400,6 +594,8 @@
<territory type="VU">Orílɛ́ède Faniatu</territory>
<territory type="WF">Orílɛ́ède Wali ati futuna</territory>
<territory type="WS">Orílɛ́ède Samɔ</territory>
+ <territory type="XA">Pseudo-Accents</territory>
+ <territory type="XB">Pseudo-Bidi</territory>
<territory type="XK">Kòsófò</territory>
<territory type="YE">Orílɛ́ède yemeni</territory>
<territory type="YT">Orílɛ́ède Mayote</territory>
@@ -413,11 +609,78 @@
<subdivision type="gbsct">Skɔ́tlándì</subdivision>
<subdivision type="gbwls">Wélsì</subdivision>
</subdivisions>
+ <keys>
+ <key type="calendar">Kàlɛ́ńdà</key>
+ <key type="cf">Ìgúnrégé Kɔ́rɛ́ńsì</key>
+ <key type="collation">Ètò Ɛlɛ́sɛɛsɛ</key>
+ <key type="currency">Kɔ́rɛ́ńsì</key>
+ <key type="hc">Òbíríkiti Wákàtí (12 vs 24)</key>
+ <key type="lb">Àra Ìda Ìlà</key>
+ <key type="ms">Èto Ìdiwɔ̀n</key>
+ <key type="numbers">Àwɔn nɔ́ńbà</key>
+ </keys>
<types>
+ <type key="calendar" type="buddhist">Kàlɛ̀ńdà Buddhist</type>
+ <type key="calendar" type="chinese">Kàlɛ̀ńdà ti Sháìnà</type>
+ <type key="calendar" type="dangi">Kàlɛ̀ńdà dangi</type>
+ <type key="calendar" type="ethiopic">Kàlɛ̀ńdà Ɛtíópíìkì</type>
<type key="calendar" type="gregorian">Kàlɛ́ńdà Gregory</type>
+ <type key="calendar" type="hebrew">Kàlɛ̀ńdà Hébérù</type>
+ <type key="calendar" type="islamic">Kàlɛ̀ńdà Lárúbáwá</type>
<type key="calendar" type="iso8601">Kàlɛ́ńdà ISO-8601</type>
+ <type key="calendar" type="japanese">Kàlɛ̀ńdà ti Jàpánù</type>
+ <type key="calendar" type="persian">Kàlɛ̀ńdà Pásíànù</type>
+ <type key="calendar" type="roc">Kàlɛ̀ńdà Minguo</type>
+ <type key="cf" type="account">Ìgúnrégé Ìshirò Owó Kɔ́rɛ́ńsì</type>
+ <type key="cf" type="standard">Ìgúnrégé Gbèdéke Kɔ́rɛ́ńsì</type>
+ <type key="collation" type="ducet">Ètò Ɛlɛ́sɛɛsɛ Àkùàyàn Unicode</type>
+ <type key="collation" type="search">Ìshàwárí Ète-Gbogbogbò</type>
<type key="collation" type="standard">Ìlànà Onírúurú Ètò</type>
+ <type key="hc" type="h11">Èto Wákàtí 12 (0–11)</type>
+ <type key="hc" type="h12">Èto Wákàtí 12 (1–12)</type>
+ <type key="hc" type="h23">Èto Wákàtí 24 (0–23)</type>
+ <type key="hc" type="h24">Èto Wákàtí 24 (1–24)</type>
+ <type key="lb" type="loose">Àra Ìda Ìlà Títú</type>
+ <type key="lb" type="normal">Àra Ìda Ìlà Déédéé</type>
+ <type key="lb" type="strict">Àra Ìda Ìlà Mímúná</type>
+ <type key="ms" type="metric">Èto Mɛ́tíríìkì</type>
+ <type key="ms" type="uksystem">Èto Ìdiwɔ̀n Ɔba</type>
+ <type key="ms" type="ussystem">Èto Ìdiwɔ̀n US</type>
+ <type key="numbers" type="arab">àwɔn díjítì Làrubáwá-Índíà</type>
+ <type key="numbers" type="arabext">Àwɔn Díjíìtì Lárúbáwá-Índíà fífɛ̀</type>
+ <type key="numbers" type="armn">Àwɔn nɔ́ńbà Àmɛ́níà</type>
+ <type key="numbers" type="armnlow">Àwɔn Nɔ́ńbà Kékèké ti Amɛ́ríkà</type>
+ <type key="numbers" type="beng">Àwɔn díjíìtì Báńgílà</type>
+ <type key="numbers" type="deva">Àwɔn díjììtì Defanagárì</type>
+ <type key="numbers" type="ethi">Àwɔn nɔ́ńbà Ɛtiópíìkì</type>
+ <type key="numbers" type="fullwide">Àwɔn Díjíìtì Fífɛ̀-Ɛ̀kún</type>
+ <type key="numbers" type="geor">Àwɔn nɔ́ńbà Jɔ́jíà</type>
+ <type key="numbers" type="grek">Àwɔn nɔ́ńbà Gíríìkì</type>
+ <type key="numbers" type="greklow">Àwɔn Nɔ́ńbà Gíríìkì Kékèké</type>
+ <type key="numbers" type="gujr">Àwɔn díjíìtì Gùjárátì</type>
+ <type key="numbers" type="guru">Àwɔn Díjíìtì Gurumukì</type>
+ <type key="numbers" type="hanidec">Àwɔn nɔ́ńbà Dɛ́símà Sháìnà</type>
+ <type key="numbers" type="hans">Àwɔn nɔ́ńbà Ìrɔ̀rùn ti Sháìnà</type>
+ <type key="numbers" type="hansfin">Àwɔn nɔ́ńbà Ìshúná Ìrɔ̀rùn Sháìnà</type>
+ <type key="numbers" type="hant">Àwɔn nɔ́ńbà Ìbílɛ̀ Sháìnà</type>
+ <type key="numbers" type="hantfin">Àwɔn nɔ́ńbà Ìshúná Ìbílɛ̀ Sháìnà</type>
+ <type key="numbers" type="hebr">Àwɔn nɔ́ńbà Hébérù</type>
+ <type key="numbers" type="jpan">Àwɔn nɔ́ńbà Jápànù</type>
+ <type key="numbers" type="jpanfin">Àwɔn nɔ́ńbà Ìshúná Jàpáànù</type>
+ <type key="numbers" type="khmr">Àwɔn díjíìtì Kɛ́mɛ̀</type>
+ <type key="numbers" type="knda">Àwɔn díjíìtì kanada</type>
+ <type key="numbers" type="laoo">Àwɔn díjíìtì Láó</type>
<type key="numbers" type="latn">Díjíítì Ìwɔ̀ Oòrùn</type>
+ <type key="numbers" type="mlym">Àwɔn díjíìtì Málàyálámù</type>
+ <type key="numbers" type="mymr">Àwɔn díjíìtì Myánmarí</type>
+ <type key="numbers" type="orya">Àwɔn díjíìtì Òdíà</type>
+ <type key="numbers" type="roman">Àwɔn díjíìtì Rómánù</type>
+ <type key="numbers" type="romanlow">Àwɔn díjíìtì Rómánù Kékeré</type>
+ <type key="numbers" type="taml">Àwɔn díjíìtì Ìbílɛ̀ Támílù</type>
+ <type key="numbers" type="tamldec">Àwɔn díjíìtì Tàmílù</type>
+ <type key="numbers" type="telu">Àwɔn díjíìtì Télúgù</type>
+ <type key="numbers" type="thai">Àwɔn díjíìtì Thai</type>
+ <type key="numbers" type="tibt">Àwɔn díjíìtì Tibetán</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">Mɛ́tíríìkì</measurementSystemName>
@@ -1005,6 +1268,11 @@
<relative type="0">Ɔjɔ́ Àìkú yìí</relative>
<relative type="1">Ɔjɔ́ Àìkú tó ń bɔ̀</relative>
</field>
+ <field type="sun-narrow">
+ <relativeTime type="future">
+ <relativeTimePattern count="other">Ɔjɔ́ Àíkú +{0}</relativeTimePattern>
+ </relativeTime>
+ </field>
<field type="dayperiod">
<displayName>Àárɔ̀/ɔ̀sán</displayName>
</field>
@@ -1261,6 +1529,13 @@
<daylight>Chile Summer Time</daylight>
</long>
</metazone>
+ <metazone type="China">
+ <long>
+ <generic>Àkókò Sháínà</generic>
+ <standard>Àkókò Ìfɛnukòsí Sháínà</standard>
+ <daylight>Àkókò Ojúmɔmɔ Sháínà</daylight>
+ </long>
+ </metazone>
<metazone type="Choibalsan">
<long>
<generic>Choibalsan Time</generic>
@@ -1292,6 +1567,13 @@
<daylight>Cook Islands Half Summer Time</daylight>
</long>
</metazone>
+ <metazone type="Cuba">
+ <long>
+ <generic>Àkókò Kúbà</generic>
+ <standard>Àkókò Àfɛnukò Kúbà</standard>
+ <daylight>Àkókò Ojúmɔmɔ Kúbà</daylight>
+ </long>
+ </metazone>
<metazone type="Davis">
<long>
<standard>Davis Time</standard>
@@ -1302,6 +1584,11 @@
<standard>Dumont-d’Urville Time</standard>
</long>
</metazone>
+ <metazone type="East_Timor">
+ <long>
+ <standard>Àkókò Ìlà oorùn Timor</standard>
+ </long>
+ </metazone>
<metazone type="Easter">
<long>
<generic>Easter Island Time</generic>
@@ -1391,6 +1678,20 @@
<standard>Greenwich Mean Time</standard>
</long>
</metazone>
+ <metazone type="Greenland_Eastern">
+ <long>
+ <generic>Àkókò Ìlà oorùn Greenland</generic>
+ <standard>Àkókò Ìwɔ̀ Ìfɛnukò oorùn Greenland</standard>
+ <daylight>Àkókò ìgbà Ooru Greenland</daylight>
+ </long>
+ </metazone>
+ <metazone type="Greenland_Western">
+ <long>
+ <generic>Àkókò Ìwɔ̀ oorùn Greenland</generic>
+ <standard>Àkókò Àfɛnukò Ìwɔ̀ Oòrùn Greenland</standard>
+ <daylight>Àkókò Àfɛnukò Ìgba Oòru Greenland</daylight>
+ </long>
+ </metazone>
<metazone type="Gulf">
<long>
<standard>Gulf Standard Time [translation hint: translate as just "Gulf Time"]</standard>
@@ -1401,6 +1702,13 @@
<standard>Guyana Time</standard>
</long>
</metazone>
+ <metazone type="Hawaii_Aleutian">
+ <long>
+ <generic>Àkókò Hawaii-Aleutian</generic>
+ <standard>Àkókò Àfɛnukò Hawaii-Aleutian</standard>
+ <daylight>Àkókò Ojúmɔmɔ Hawaii-Aleutian</daylight>
+ </long>
+ </metazone>
<metazone type="Hong_Kong">
<long>
<generic>Hong Kong Time</generic>
@@ -1425,11 +1733,26 @@
<standard>Indian Ocean Time</standard>
</long>
</metazone>
+ <metazone type="Indochina">
+ <long>
+ <standard>Àkókò Indochina</standard>
+ </long>
+ </metazone>
+ <metazone type="Indonesia_Central">
+ <long>
+ <standard>Àkókò Ààrin Gbùngbùn Indonesia</standard>
+ </long>
+ </metazone>
<metazone type="Indonesia_Eastern">
<long>
<standard>Eastern Indonesia Time</standard>
</long>
</metazone>
+ <metazone type="Indonesia_Western">
+ <long>
+ <standard>Àkókò Ìwɔ̀ oorùn Indonesia</standard>
+ </long>
+ </metazone>
<metazone type="Iran">
<long>
<generic>Iran Time</generic>
@@ -1548,6 +1871,20 @@
<standard>Mawson Time</standard>
</long>
</metazone>
+ <metazone type="Mexico_Northwest">
+ <long>
+ <generic>Àkókò Apá Ìwɔ̀ Oorùn Mɛ́shíkò</generic>
+ <standard>Àkókò Àfɛnukò Apá Ìwɔ̀ Oorùn Mɛ́shíkò</standard>
+ <daylight>Àkókò Ojúmɔmɔ Apá Ìwɔ̀ Oorùn Mɛ́shíkò</daylight>
+ </long>
+ </metazone>
+ <metazone type="Mexico_Pacific">
+ <long>
+ <generic>Àkókò Pásífíìkì Mɛ́shíkò</generic>
+ <standard>Àkókò Àfɛnukò Pásífíìkì Mɛ́síkò</standard>
+ <daylight>Àkókò Ojúmɔmɔ Pásífíìkì Mɛ́síkò</daylight>
+ </long>
+ </metazone>
<metazone type="Mongolia">
<long>
<generic>Ulaanbaatar Time</generic>
@@ -1591,6 +1928,13 @@
<daylight>New Zealand Daylight Time</daylight>
</long>
</metazone>
+ <metazone type="Newfoundland">
+ <long>
+ <generic>Àkókò Newfoundland</generic>
+ <standard>Àkókò Àfɛnukò Newfoundland</standard>
+ <daylight>Àkókò Ojúmɔmɔ Newfoundland</daylight>
+ </long>
+ </metazone>
<metazone type="Niue">
<long>
<standard>Niue Time</standard>
@@ -1598,7 +1942,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Norfolk Island Time</standard>
+ <generic draft="contributed">Norfolk Island Time</generic>
+ <standard draft="contributed">Norfolk Island Standard Time</standard>
+ <daylight draft="contributed">Norfolk Island Daylight Time</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -1665,6 +2011,13 @@
<standard>Phoenix Islands Time</standard>
</long>
</metazone>
+ <metazone type="Pierre_Miquelon">
+ <long>
+ <generic>Àkókò Pierre & Miquelon</generic>
+ <standard>Àkókò Àfɛnukò Pierre & Miquelon</standard>
+ <daylight>Àkókò Ojúmɔmɔ Pierre & Miquelon</daylight>
+ </long>
+ </metazone>
<metazone type="Pitcairn">
<long>
<standard>Pitcairn Time</standard>
@@ -1871,6 +2224,22 @@
<pattern>#,##0.###</pattern>
</decimalFormat>
</decimalFormatLength>
+ <decimalFormatLength type="long">
+ <decimalFormat>
+ <pattern type="1000" count="other">0 ɛgbɛ̀rún</pattern>
+ <pattern type="10000" count="other">00 ɛgbɛ̀rún</pattern>
+ <pattern type="100000" count="other">000 ɛgbɛ̀rún</pattern>
+ <pattern type="1000000" count="other">0 mílíɔ̀nù</pattern>
+ <pattern type="10000000" count="other">00 mílíɔ̀nù</pattern>
+ <pattern type="100000000" count="other">000 mílíɔ̀nù</pattern>
+ <pattern type="1000000000" count="other">0 bilíɔ̀nù</pattern>
+ <pattern type="10000000000" count="other">00 bilíɔ̀nù</pattern>
+ <pattern type="100000000000" count="other">000 bilíɔ̀nù</pattern>
+ <pattern type="1000000000000" count="other">0 tiriliɔ̀nù</pattern>
+ <pattern type="10000000000000" count="other">00 tiriliɔ̀nù</pattern>
+ <pattern type="100000000000000" count="other">000 tiriliɔ̀nù</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
</decimalFormats>
<scientificFormats numberSystem="latn">
<scientificFormatLength>
@@ -1917,25 +2286,79 @@
<currency type="AED">
<displayName>Diami ti Awon Orílɛ́ède Arabu</displayName>
</currency>
+ <currency type="AFN">
+ <displayName>Afugánì Afuganísítàànì</displayName>
+ </currency>
+ <currency type="ALL">
+ <displayName>Lɛ́kɛ̀ Àlìbéníà</displayName>
+ </currency>
+ <currency type="AMD">
+ <displayName>Dírààmù Àmɛ́níà</displayName>
+ </currency>
+ <currency type="ANG">
+ <displayName>Gílídà Netherlands Antillean</displayName>
+ </currency>
<currency type="AOA">
<displayName>Wansa ti Orílɛ́ède Àngólà</displayName>
</currency>
+ <currency type="ARS">
+ <displayName>Pɛ́sò Agɛntínà</displayName>
+ </currency>
<currency type="AUD">
<displayName>Dɔla ti Orílɛ́ède Ástràlìá</displayName>
</currency>
+ <currency type="AWG">
+ <displayName>Fuloríìnì Àrúbà</displayName>
+ </currency>
+ <currency type="AZN">
+ <displayName>Mánààtì Àsàbáíjáì</displayName>
+ </currency>
+ <currency type="BAM">
+ <displayName>Àmi Yíyípadà Bosnia-Herzegovina</displayName>
+ </currency>
+ <currency type="BBD">
+ <displayName>Dɔ́là Bábádɔ̀ɔ̀sì</displayName>
+ </currency>
+ <currency type="BDT">
+ <displayName>Tákà Báńgíládɛ̀ɛ̀shì</displayName>
+ </currency>
+ <currency type="BGN">
+ <displayName>Owó Lɛ́fì Bɔ̀lìgéríà</displayName>
+ </currency>
<currency type="BHD">
<displayName>Dina ti Orílɛ́ède Báránì</displayName>
</currency>
<currency type="BIF">
<displayName>Faransi ti Orílɛ́ède Bùùrúndì</displayName>
</currency>
+ <currency type="BMD">
+ <displayName>Dɔ́là Bɛ̀múdà</displayName>
+ </currency>
+ <currency type="BND">
+ <displayName>Dɔ́là Bùrùnéì</displayName>
+ </currency>
+ <currency type="BOB">
+ <displayName>Bɔlifiánò Bɔ̀lífíà</displayName>
+ </currency>
<currency type="BRL">
<displayName>Owó ti Orílɛ̀-èdè Brazil</displayName>
<displayName count="other">Awon owó ti Orílɛ̀-èdè Brazil</displayName>
</currency>
+ <currency type="BSD">
+ <displayName>Dɔ́là Bàhámà</displayName>
+ </currency>
+ <currency type="BTN">
+ <displayName>Ìngɔ́tírɔ̀mù Bútàànì</displayName>
+ </currency>
<currency type="BWP">
<displayName>Pula ti Orílɛ́ède Bɔ̀tìsúwánà</displayName>
</currency>
+ <currency type="BYN">
+ <displayName>Rɔ́bù Bɛ̀lárùùsì</displayName>
+ </currency>
+ <currency type="BZD">
+ <displayName>Dɔ́là Bɛ̀lísè</displayName>
+ </currency>
<currency type="CAD">
<displayName>Dɔla ti Orílɛ́ède Kánádà</displayName>
</currency>
@@ -1945,15 +2368,42 @@
<currency type="CHF">
<displayName>Faransi ti Orílɛ́ède Siwisi</displayName>
</currency>
+ <currency type="CLP">
+ <displayName>Pɛ́sò Shílè</displayName>
+ </currency>
+ <currency type="CNH">
+ <displayName>Yúànì Sháínà</displayName>
+ </currency>
<currency type="CNY">
<displayName>Reminibi ti Orílɛ́ède sháínà</displayName>
</currency>
+ <currency type="COP">
+ <displayName>Pɛ́sò Kòlóḿbíà</displayName>
+ </currency>
+ <currency type="CRC">
+ <displayName>Kólɔ́ɔ̀nì Kosita Ríkà</displayName>
+ </currency>
+ <currency type="CUC">
+ <displayName>Pɛ́sò Yíyípadà Kúbà</displayName>
+ </currency>
+ <currency type="CUP">
+ <displayName>Pɛ́sò Kúbà</displayName>
+ </currency>
<currency type="CVE">
<displayName>Kabofediano ti Orílɛ́ède Esuodo</displayName>
</currency>
+ <currency type="CZK">
+ <displayName>Koruna Shɛ́ɛ̀kì</displayName>
+ </currency>
<currency type="DJF">
<displayName>Faransi ti Orílɛ́ède Dibouti</displayName>
</currency>
+ <currency type="DKK">
+ <displayName>Kírónì Dáníshì</displayName>
+ </currency>
+ <currency type="DOP">
+ <displayName>Pɛ́sò Dòníníkà</displayName>
+ </currency>
<currency type="DZD">
<displayName>Dina ti Orílɛ́ède Àlùgèríánì</displayName>
</currency>
@@ -1971,33 +2421,121 @@
<displayName>owó Yúrò</displayName>
<displayName count="other">Awon owó Yúrò</displayName>
</currency>
+ <currency type="FJD">
+ <displayName>Dɔ́là Fíjì</displayName>
+ </currency>
+ <currency type="FKP">
+ <displayName>Pɔ́n-ùn Erékùsù Falkland</displayName>
+ </currency>
<currency type="GBP">
<displayName>Pɔ́n-ùn ti Orilɛ̀-èdè Gɛ̀ɛ́sì</displayName>
</currency>
+ <currency type="GEL">
+ <displayName>Lárì Jɔ́jíà</displayName>
+ </currency>
<currency type="GHC">
<displayName>shidi ti Orílɛ́ède Gana</displayName>
</currency>
+ <currency type="GHS">
+ <displayName>Sídì Ghanaian</displayName>
+ </currency>
+ <currency type="GIP">
+ <displayName>Pɔ́n-ùn Gibraltar</displayName>
+ </currency>
<currency type="GMD">
<displayName>Dalasi ti Orílɛ́ède Gamibia</displayName>
</currency>
+ <currency type="GNF">
+ <displayName>Fírànkì Gíníànì</displayName>
+ </currency>
<currency type="GNS">
<displayName>Faransi ti Orílɛ́ède Gini</displayName>
</currency>
+ <currency type="GTQ">
+ <displayName>Kúɛ́tísààlì Guatimílà</displayName>
+ </currency>
+ <currency type="GYD">
+ <displayName>Dɔ́là Gùyánà</displayName>
+ </currency>
+ <currency type="HKD">
+ <displayName>Dɔ́là Hong Kong</displayName>
+ </currency>
+ <currency type="HNL">
+ <displayName>Lɛmipírà Ɔ́ńdúrà</displayName>
+ </currency>
+ <currency type="HRK">
+ <displayName>Kúnà Croatian</displayName>
+ </currency>
+ <currency type="HTG">
+ <displayName>Gɔ́dì Àítì</displayName>
+ </currency>
+ <currency type="HUF">
+ <displayName>Fɔ́ríǹtì Hɔ̀ngérí</displayName>
+ </currency>
+ <currency type="IDR">
+ <displayName>Rúpìyá Indonésíà</displayName>
+ </currency>
+ <currency type="ILS">
+ <displayName>Shékélì Tuntun Ísírɛ̀ɛ̀lì</displayName>
+ </currency>
<currency type="INR">
<displayName>Rupi ti Orílɛ́ède Indina</displayName>
</currency>
+ <currency type="IQD">
+ <displayName>Dínárì Ìráákì</displayName>
+ </currency>
+ <currency type="IRR">
+ <displayName>Rial Iranian</displayName>
+ </currency>
+ <currency type="ISK">
+ <displayName>Kòrónà Icelandic</displayName>
+ </currency>
+ <currency type="JMD">
+ <displayName>Dɔ́là Jàmáíkà</displayName>
+ </currency>
+ <currency type="JOD">
+ <displayName>Dínárì Jɔ́dàànì</displayName>
+ </currency>
<currency type="JPY">
<displayName>Yeni ti Orílɛ́ède Japani</displayName>
</currency>
<currency type="KES">
<displayName>shiili ti Orílɛ́ède Kenya</displayName>
</currency>
+ <currency type="KGS">
+ <displayName>Sómú Kirijísítàànì</displayName>
+ </currency>
+ <currency type="KHR">
+ <displayName>Ráyò Kàm̀bɔ́díà</displayName>
+ </currency>
<currency type="KMF">
<displayName>Faransi ti Orílɛ́ède shomoriani</displayName>
</currency>
+ <currency type="KPW">
+ <displayName>Wɔ́ɔ̀nù Àríwá Kòríà</displayName>
+ </currency>
<currency type="KRW">
+ <displayName>Wɔ́ɔ̀nù Gúúsù Kòríà</displayName>
<symbol alt="narrow" draft="contributed">₩</symbol>
</currency>
+ <currency type="KWD">
+ <displayName>Dínárì Kuwaiti</displayName>
+ </currency>
+ <currency type="KYD">
+ <displayName>Dɔ́là Erékùsù Cayman</displayName>
+ </currency>
+ <currency type="KZT">
+ <displayName>Tɛngé Kasakísítàànì</displayName>
+ </currency>
+ <currency type="LAK">
+ <displayName>Kíììpù Làótì</displayName>
+ </currency>
+ <currency type="LBP">
+ <displayName>Pɔ́n-ùn Lebanese</displayName>
+ </currency>
+ <currency type="LKR">
+ <displayName>Rúpìì Siri Láńkà</displayName>
+ </currency>
<currency type="LRD">
<displayName>Dɔla ti Orílɛ́ède Liberia</displayName>
</currency>
@@ -2010,9 +2548,24 @@
<currency type="MAD">
<displayName>Dirami ti Orílɛ́ède Moroko</displayName>
</currency>
+ <currency type="MDL">
+ <displayName>Owó Léhù Moldovan</displayName>
+ </currency>
<currency type="MGA">
<displayName>Faransi ti Orílɛ́ède Malagasi</displayName>
</currency>
+ <currency type="MKD">
+ <displayName>Dɛ́nà Masidóníà</displayName>
+ </currency>
+ <currency type="MMK">
+ <displayName>Kíyàtì Myanmar</displayName>
+ </currency>
+ <currency type="MNT">
+ <displayName>Túgúrììkì Mòǹgólíà</displayName>
+ </currency>
+ <currency type="MOP">
+ <displayName>Pàtákà Màkáò</displayName>
+ </currency>
<currency type="MRO">
<displayName>Ouguiya ti Orílɛ́ède Maritania (1973–2017)</displayName>
</currency>
@@ -2022,12 +2575,24 @@
<currency type="MUR">
<displayName>Rupi ti Orílɛ́ède Maritiusi</displayName>
</currency>
+ <currency type="MVR">
+ <displayName>Rúfìyá Mɔ̀lìdífà</displayName>
+ </currency>
<currency type="MWK">
<displayName>Kasha ti Orílɛ́ède Malawi</displayName>
</currency>
+ <currency type="MXN">
+ <displayName>Pɛ́sò Mɛ́síkò</displayName>
+ </currency>
+ <currency type="MYR">
+ <displayName>Ríngìtì Màléshíà</displayName>
+ </currency>
<currency type="MZM">
<displayName>Metika ti Orílɛ́ède Mosamibiki</displayName>
</currency>
+ <currency type="MZN">
+ <displayName>Mɛ́tíkààlì Mòsáḿbíìkì</displayName>
+ </currency>
<currency type="NAD">
<displayName>Dɔla ti Orílɛ́ède Namibia</displayName>
</currency>
@@ -2036,6 +2601,51 @@
<displayName count="other">Náírà Nàìjíríà</displayName>
<symbol>₦</symbol>
</currency>
+ <currency type="NIO">
+ <displayName>Kɔ̀dóbà Naikarágúà</displayName>
+ </currency>
+ <currency type="NOK">
+ <displayName>Kírónì Nɔ́ɔ́wè</displayName>
+ </currency>
+ <currency type="NPR">
+ <displayName>Rúpìì Nɛ̵́pààlì</displayName>
+ </currency>
+ <currency type="NZD">
+ <displayName>Dɔ́là New Zealand</displayName>
+ </currency>
+ <currency type="OMR">
+ <displayName>Ráyò Omani</displayName>
+ </currency>
+ <currency type="PAB">
+ <displayName>Bálíbóà Pànámà</displayName>
+ </currency>
+ <currency type="PEN">
+ <displayName>Sólì Pèrúù</displayName>
+ </currency>
+ <currency type="PGK">
+ <displayName>Kínà Papua Guinea Tuntun</displayName>
+ </currency>
+ <currency type="PHP">
+ <displayName>Písò Fílípìnì</displayName>
+ </currency>
+ <currency type="PKR">
+ <displayName>Rúpìì Pakisitánì</displayName>
+ </currency>
+ <currency type="PLN">
+ <displayName>Sílɔ̀tì Pɔ́líshì</displayName>
+ </currency>
+ <currency type="PYG">
+ <displayName>Gúáránì Párágúwè</displayName>
+ </currency>
+ <currency type="QAR">
+ <displayName>Ráyò Kàtárì</displayName>
+ </currency>
+ <currency type="RON">
+ <displayName>Léhù Ròméníà</displayName>
+ </currency>
+ <currency type="RSD">
+ <displayName>Dínárì Sàbíà</displayName>
+ </currency>
<currency type="RUB">
<displayName>Owó ruble ti ilɛ̀ Rɔ́shíà</displayName>
<displayName count="other">Owó ruble ti ilɛ̀ Rɔ́shíà</displayName>
@@ -2047,6 +2657,9 @@
<currency type="SAR">
<displayName>Riya ti Orílɛ́ède Saudi</displayName>
</currency>
+ <currency type="SBD">
+ <displayName>Dɔ́là Erékùsù Sɔ́lómɔ́nì</displayName>
+ </currency>
<currency type="SCR">
<displayName>Rupi ti Orílɛ́ède Sayiselesi</displayName>
</currency>
@@ -2056,6 +2669,12 @@
<currency type="SDP">
<displayName>Pɔɔun ti Orílɛ́ède Sudani</displayName>
</currency>
+ <currency type="SEK">
+ <displayName>Kòrónà Súwídìn</displayName>
+ </currency>
+ <currency type="SGD">
+ <displayName>Dɔ́là Síngápɔ̀</displayName>
+ </currency>
<currency type="SHP">
<displayName>Pɔɔun ti Orílɛ́ède ̣Elena</displayName>
</currency>
@@ -2065,21 +2684,54 @@
<currency type="SOS">
<displayName>Sile ti Orílɛ́ède Somali</displayName>
</currency>
+ <currency type="SRD">
+ <displayName>Dɔ́là Súrínámì</displayName>
+ </currency>
+ <currency type="SSP">
+ <displayName>Pɔ́n-ùn Gúúsù Sùdáànì</displayName>
+ </currency>
<currency type="STD">
<displayName>Dobira ti Orílɛ́ède Sao tome Ati Pirisipe (1977–2017)</displayName>
</currency>
<currency type="STN">
<displayName>Dobira ti Orílɛ́ède Sao tome Ati Pirisipe</displayName>
</currency>
+ <currency type="SYP">
+ <displayName>Pɔ́n-ùn Sírìà</displayName>
+ </currency>
<currency type="SZL">
<displayName>Lilangeni</displayName>
</currency>
+ <currency type="THB">
+ <displayName>Báàtì Tháì</displayName>
+ </currency>
+ <currency type="TJS">
+ <displayName>Sómónì Tajikístàànì</displayName>
+ </currency>
+ <currency type="TMT">
+ <displayName>Mánààtì Tɔkimɛnístàànì</displayName>
+ </currency>
<currency type="TND">
<displayName>Dina ti Orílɛ́ède Tunisia</displayName>
</currency>
+ <currency type="TOP">
+ <displayName>Pàángà Tóńgà</displayName>
+ </currency>
+ <currency type="TRY">
+ <displayName>Lírà Tɔ́kì</displayName>
+ </currency>
+ <currency type="TTD">
+ <displayName>Dɔ́là Trinidad & Tobago</displayName>
+ </currency>
+ <currency type="TWD">
+ <displayName>Dɔ́là Tàìwánì Tuntun</displayName>
+ </currency>
<currency type="TZS">
<displayName>Sile ti Orílɛ́ède Tansania</displayName>
</currency>
+ <currency type="UAH">
+ <displayName>Ɔrifiníyà Yukiréníà</displayName>
+ </currency>
<currency type="UGX">
<displayName>Siile ti Orílɛ́ède Uganda</displayName>
</currency>
@@ -2088,16 +2740,43 @@
<displayName count="other">Dɔ́là ti Orílɛ̀-Èdè Amɛ́ríkà</displayName>
<symbol draft="contributed">$</symbol>
</currency>
+ <currency type="UYU">
+ <displayName>Pɛ́sò Úrúgúwè</displayName>
+ </currency>
+ <currency type="UZS">
+ <displayName>Sómú Usibɛkísítàànì</displayName>
+ </currency>
+ <currency type="VES">
+ <displayName>Bɔ̀lífà Fɛnɛsuɛ́là</displayName>
+ </currency>
+ <currency type="VND">
+ <displayName>Dáhùn Vietnamese</displayName>
+ </currency>
+ <currency type="VUV">
+ <displayName>Fátù Vanuatu</displayName>
+ </currency>
+ <currency type="WST">
+ <displayName>Tálà Sàmóà</displayName>
+ </currency>
<currency type="XAF">
<displayName>Faransi ti Orílɛ́ède BEKA</displayName>
</currency>
+ <currency type="XCD">
+ <displayName>Dɔ́là Ilà Oòrùn Karíbíà</displayName>
+ </currency>
<currency type="XOF">
<displayName>Faransi ti Orílɛ́ède BIKEAO</displayName>
</currency>
+ <currency type="XPF">
+ <displayName>Fírànkì CFP</displayName>
+ </currency>
<currency type="XXX">
<displayName>owóníná àìmɔ̀</displayName>
<displayName count="other">owóníná àìmɔ̀</displayName>
</currency>
+ <currency type="YER">
+ <displayName>Ráyò Yɛ́mɛ̀nì</displayName>
+ </currency>
<currency type="ZAR">
<displayName>Randi ti Orílɛ́ède Ariwa Afirika</displayName>
</currency>
diff --git a/common/main/yo_NG.xml b/common/main/yo_NG.xml
index 637fa11..54b7f2b 100644
--- a/common/main/yo_NG.xml
+++ b/common/main/yo_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yue.xml b/common/main/yue.xml
index a9795c5..6d6a2e3 100644
--- a/common/main/yue.xml
+++ b/common/main/yue.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -179,6 +179,7 @@
<language type="ewo">依汪都文</language>
<language type="ext">埃斯特雷馬杜拉文</language>
<language type="fa">波斯文</language>
+ <language type="fa_AF">達里文</language>
<language type="fan">芳族文</language>
<language type="fat">芳蒂文</language>
<language type="ff">富拉文</language>
@@ -6459,7 +6460,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>諾福克島時間</standard>
+ <generic draft="contributed">諾福克島時間</generic>
+ <standard draft="contributed">諾福克島標準時間</standard>
+ <daylight draft="contributed">諾福克島夏令時間</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8499,9 +8502,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>納{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飛{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>麼{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>澤{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>堯{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>每 {1} {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8509,7 +8580,7 @@
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米/平方秒</displayName>
<unitPattern count="other">每平方秒 {0} 米</unitPattern>
</unit>
@@ -8590,7 +8661,7 @@
<displayName>毫摩爾/公升</displayName>
<unitPattern count="other">{0} 毫摩爾/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百萬分率</displayName>
<unitPattern count="other">{0} 百萬分率</unitPattern>
</unit>
@@ -8614,7 +8685,7 @@
<displayName>公升/公里</displayName>
<unitPattern count="other">{0} 公升/公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>公升/100 公里</displayName>
<unitPattern count="other">{0} 公升/100 公里</unitPattern>
</unit>
@@ -9010,15 +9081,15 @@
<displayName>匹</displayName>
<unitPattern count="other">{0} 匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅力/平方英吋</displayName>
<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英吋汞柱</displayName>
<unitPattern count="other">{0} 英吋汞柱</unitPattern>
</unit>
@@ -9082,7 +9153,7 @@
<displayName>克耳文</displayName>
<unitPattern count="other">{0} 克耳文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>尺磅</displayName>
<unitPattern count="other">{0} 尺磅</unitPattern>
</unit>
@@ -9212,9 +9283,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>納{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飛{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>麼{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>澤{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>堯{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -9222,7 +9361,7 @@
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米/平方秒</displayName>
<unitPattern count="other">每平方秒{0}米</unitPattern>
</unit>
@@ -9303,7 +9442,7 @@
<displayName>毫摩爾/公升</displayName>
<unitPattern count="other">{0} 毫摩爾/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百萬分率</displayName>
<unitPattern count="other">{0} 百萬分率</unitPattern>
</unit>
@@ -9327,7 +9466,7 @@
<displayName>公升/公里</displayName>
<unitPattern count="other">{0} 公升/公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>公升/100 公里</displayName>
<unitPattern count="other">{0} 公升/100 公里</unitPattern>
</unit>
@@ -9723,15 +9862,15 @@
<displayName>匹</displayName>
<unitPattern count="other">{0} 匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅力/平方英吋</displayName>
<unitPattern count="other">每平方吋{0}磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英吋汞柱</displayName>
<unitPattern count="other">{0} 英吋汞柱</unitPattern>
</unit>
@@ -9795,7 +9934,7 @@
<displayName>克耳文</displayName>
<unitPattern count="other">{0} 克耳文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>尺磅</displayName>
<unitPattern count="other">{0} 尺磅</unitPattern>
</unit>
@@ -9925,16 +10064,84 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>納{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飛{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>麼{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>澤{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>堯{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
<unit type="acceleration-g-force">
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
<unit type="angle-radian">
@@ -9986,7 +10193,7 @@
<unit type="consumption-liter-per-kilometer">
<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>公升/100 公里</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -10220,13 +10427,13 @@
<unit type="power-horsepower">
<unitPattern count="other">{0}匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other" draft="contributed">{0}″ Hg</unitPattern>
</unit>
<unit type="pressure-millibar">
@@ -10355,9 +10562,16 @@
<listPatternPart type="end">{0} 或 {1}</listPatternPart>
<listPatternPart type="2">{0} 或 {1}</listPatternPart>
</listPattern>
+ <listPattern type="or-narrow">
+ <listPatternPart type="start">↑↑↑</listPatternPart>
+ <listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
+ <listPatternPart type="2">↑↑↑</listPatternPart>
+ </listPattern>
<listPattern type="or-short">
<listPatternPart type="start">↑↑↑</listPatternPart>
<listPatternPart type="middle">↑↑↑</listPatternPart>
+ <listPatternPart type="end">↑↑↑</listPatternPart>
<listPatternPart type="2">↑↑↑</listPatternPart>
</listPattern>
<listPattern type="standard-narrow">
diff --git a/common/main/yue_Hans.xml b/common/main/yue_Hans.xml
index 3ac3546..2f9e1a6 100644
--- a/common/main/yue_Hans.xml
+++ b/common/main/yue_Hans.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -170,6 +170,7 @@
<language type="ewo">依汪都文</language>
<language type="ext">埃斯特雷马杜拉文</language>
<language type="fa">波斯文</language>
+ <language type="fa_AF">达里文</language>
<language type="fan">芳族文</language>
<language type="fat">芳蒂文</language>
<language type="ff">富拉文</language>
@@ -6398,7 +6399,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>诺福克岛时间</standard>
+ <generic draft="contributed">诺福克岛时间</generic>
+ <standard draft="contributed">诺福克岛标准时间</standard>
+ <daylight draft="contributed">诺福克岛夏令时间</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8438,14 +8441,82 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>纳{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飞{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>么{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>泽{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>尧{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>每 {1} {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<unit type="acceleration-g-force">
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>每平方秒公尺</displayName>
<unitPattern count="other">每平方秒 {0} 米</unitPattern>
</unit>
@@ -8526,7 +8597,7 @@
<displayName>毫摩尔/公升</displayName>
<unitPattern count="other">{0} 毫摩尔/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百万分率</displayName>
<unitPattern count="other">{0} 百万分率</unitPattern>
</unit>
@@ -8550,7 +8621,7 @@
<displayName>每公里公升</displayName>
<unitPattern count="other">每公里 {0} 公升</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>每 100 公里公升</displayName>
<unitPattern count="other">每 100 公里 {0} 公升</unitPattern>
</unit>
@@ -8946,15 +9017,15 @@
<displayName>马力</displayName>
<unitPattern count="other">{0} 匹马力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>每平方英寸磅力</displayName>
<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0} 英寸汞柱</unitPattern>
</unit>
@@ -9018,7 +9089,7 @@
<displayName>克耳文</displayName>
<unitPattern count="other">{0} 克耳文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>尺磅</displayName>
<unitPattern count="other">{0} 尺磅</unitPattern>
</unit>
@@ -9148,14 +9219,82 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>纳{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飞{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>么{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>泽{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>尧{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<unit type="acceleration-g-force">
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>公尺/平方秒</displayName>
<unitPattern count="other">每平方秒{0}米</unitPattern>
</unit>
@@ -9236,7 +9375,7 @@
<displayName>毫摩尔/公升</displayName>
<unitPattern count="other">{0} 毫摩尔/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百万分率</displayName>
<unitPattern count="other">{0} 百万分率</unitPattern>
</unit>
@@ -9260,7 +9399,7 @@
<displayName>公升/公里</displayName>
<unitPattern count="other">每公里{0}公升</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100 公里</displayName>
<unitPattern count="other">每100公里 {0} 升</unitPattern>
</unit>
@@ -9656,15 +9795,15 @@
<displayName>匹</displayName>
<unitPattern count="other">{0} 匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅力/平方英寸</displayName>
<unitPattern count="other">每平方吋{0}磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0} 英寸汞柱</unitPattern>
</unit>
@@ -9728,7 +9867,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>尺磅</displayName>
<unitPattern count="other">{0} 尺磅</unitPattern>
</unit>
@@ -9858,13 +9997,81 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>纳{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飞{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>埃{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>么{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>泽{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>尧{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">平方{0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">立方{0}</compoundUnitPattern1>
+ </compoundUnit>
<unit type="acceleration-g-force">
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
<unit type="angle-radian">
@@ -9916,7 +10123,7 @@
<unit type="consumption-liter-per-kilometer">
<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100公里</displayName>
<unitPattern count="other">每100公里{0}升</unitPattern>
</unit>
@@ -10150,13 +10357,13 @@
<unit type="power-horsepower">
<unitPattern count="other">{0}匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<unitPattern count="other" draft="contributed">{0}″ Hg</unitPattern>
</unit>
<unit type="pressure-millibar">
diff --git a/common/main/yue_Hans_CN.xml b/common/main/yue_Hans_CN.xml
index cd0784b..f16859d 100644
--- a/common/main/yue_Hans_CN.xml
+++ b/common/main/yue_Hans_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yue_Hant.xml b/common/main/yue_Hant.xml
index 834c04f..64d16b3 100644
--- a/common/main/yue_Hant.xml
+++ b/common/main/yue_Hant.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/yue_Hant_HK.xml b/common/main/yue_Hant_HK.xml
index 3ccb7f8..876b47b 100644
--- a/common/main/yue_Hant_HK.xml
+++ b/common/main/yue_Hant_HK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zgh.xml b/common/main/zgh.xml
index f19d0a3..62f5237 100644
--- a/common/main/zgh.xml
+++ b/common/main/zgh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -185,7 +185,6 @@
<territory type="ME">ⵎⵓⵏⵜⵉⵏⵉⴳⵔⵓ</territory>
<territory type="MG">ⵎⴰⴷⴰⵖⴰⵛⵇⴰⵔ</territory>
<territory type="MH">ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⵎⴰⵔⵛⴰⵍ</territory>
- <territory type="MK">↑↑↑</territory>
<territory type="ML">ⵎⴰⵍⵉ</territory>
<territory type="MM">ⵎⵢⴰⵏⵎⴰⵔ</territory>
<territory type="MN">ⵎⵏⵖⵓⵍⵢⴰ</territory>
diff --git a/common/main/zgh_MA.xml b/common/main/zgh_MA.xml
index 15a2ff9..6e56d94 100644
--- a/common/main/zgh_MA.xml
+++ b/common/main/zgh_MA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh.xml b/common/main/zh.xml
index 2021c30..cc32148 100644
--- a/common/main/zh.xml
+++ b/common/main/zh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -44,6 +44,7 @@
<language type="arn">马普切语</language>
<language type="arp">阿拉帕霍语</language>
<language type="ars">纳吉迪阿拉伯语</language>
+ <language type="ars" alt="menu">阿拉伯语（纳吉迪）</language>
<language type="arw">阿拉瓦克语</language>
<language type="as">阿萨姆语</language>
<language type="asa">帕雷语</language>
@@ -106,6 +107,7 @@
<language type="chr">切罗基语</language>
<language type="chy">夏延语</language>
<language type="ckb">中库尔德语</language>
+ <language type="ckb" alt="menu" draft="contributed">库尔德语（索拉尼）</language>
<language type="co">科西嘉语</language>
<language type="cop">科普特语</language>
<language type="cr">克里族语</language>
@@ -161,6 +163,7 @@
<language type="eu">巴斯克语</language>
<language type="ewo">旺杜语</language>
<language type="fa">波斯语</language>
+ <language type="fa_AF">达里语</language>
<language type="fan">芳格语</language>
<language type="fat">芳蒂语</language>
<language type="ff">富拉语</language>
@@ -565,10 +568,11 @@
<scripts>
<script type="Adlm">阿德拉姆文</script>
<script type="Afak">阿法卡文</script>
- <script type="Aghb" draft="provisional">Aghb</script>
- <script type="Ahom" draft="provisional">Ahom</script>
+ <script type="Aghb">高加索阿尔巴尼亚文</script>
+ <script type="Ahom" draft="contributed">Ahom</script>
<script type="Arab">阿拉伯文</script>
<script type="Arab" alt="variant">波斯阿拉伯文</script>
+ <script type="Aran" draft="contributed">波斯体</script>
<script type="Armi">皇室亚拉姆文</script>
<script type="Armn">亚美尼亚文</script>
<script type="Avst">阿维斯陀文</script>
@@ -589,12 +593,14 @@
<script type="Cari">卡里亚文</script>
<script type="Cham">占文</script>
<script type="Cher">切罗基文</script>
+ <script type="Chrs" draft="contributed">花拉子模文</script>
<script type="Cirt">色斯文</script>
<script type="Copt">克普特文</script>
<script type="Cprt">塞浦路斯文</script>
<script type="Cyrl">西里尔文</script>
<script type="Cyrs">西里尔文字（古教会斯拉夫文的变体）</script>
<script type="Deva">天城文</script>
+ <script type="Diak" draft="contributed">迪维西阿库鲁文</script>
<script type="Dogr" draft="contributed">多格拉文</script>
<script type="Dsrt">德塞莱特文</script>
<script type="Dupl">杜普洛伊速记</script>
@@ -602,6 +608,7 @@
<script type="Egyh">古埃及僧侣书写体</script>
<script type="Egyp">古埃及象形文</script>
<script type="Elba">爱尔巴桑文</script>
+ <script type="Elym" draft="contributed">埃利迈文</script>
<script type="Ethi">埃塞俄比亚文</script>
<script type="Geok">格鲁吉亚文（教堂体）</script>
<script type="Geor">格鲁吉亚文</script>
@@ -621,7 +628,7 @@
<script type="Hans" alt="stand-alone">简体中文</script>
<script type="Hant">繁体</script>
<script type="Hant" alt="stand-alone">繁体中文</script>
- <script type="Hatr" draft="provisional">Hatr</script>
+ <script type="Hatr">哈特兰文</script>
<script type="Hebr">希伯来文</script>
<script type="Hira">平假名</script>
<script type="Hluw">安那托利亚象形文字</script>
@@ -640,6 +647,7 @@
<script type="Khar">卡罗须提文</script>
<script type="Khmr">高棉文</script>
<script type="Khoj">克吉奇文字</script>
+ <script type="Kits" draft="contributed">契丹小字</script>
<script type="Knda">卡纳达文</script>
<script type="Kore">韩文</script>
<script type="Kpel">克佩列文</script>
@@ -657,7 +665,7 @@
<script type="Loma">洛马文</script>
<script type="Lyci">利西亚文</script>
<script type="Lydi">吕底亚文</script>
- <script type="Mahj" draft="provisional">Mahj</script>
+ <script type="Mahj">默哈金文</script>
<script type="Maka" draft="contributed">望加锡文</script>
<script type="Mand">阿拉米文</script>
<script type="Mani">摩尼教文</script>
@@ -668,12 +676,12 @@
<script type="Merc">麦罗埃草书</script>
<script type="Mero">麦若提克文</script>
<script type="Mlym">马拉雅拉姆文</script>
- <script type="Modi" draft="provisional">Modi</script>
+ <script type="Modi">莫迪文</script>
<script type="Mong">蒙古文</script>
<script type="Moon">韩文语系</script>
<script type="Mroo">谬文</script>
<script type="Mtei">曼尼普尔文</script>
- <script type="Mult" draft="provisional">Mult</script>
+ <script type="Mult">穆尔坦文</script>
<script type="Mymr">缅甸文</script>
<script type="Nand" draft="contributed">楠迪梵文</script>
<script type="Narb">古北方阿拉伯文</script>
@@ -698,7 +706,7 @@
<script type="Phnx">腓尼基文</script>
<script type="Plrd">波拉德音标文字</script>
<script type="Prti">帕提亚文碑铭体</script>
- <script type="Qaag" draft="contributed">↑↑↑</script>
+ <script type="Qaag">Zawgyi</script>
<script type="Rjng">拉让文</script>
<script type="Rohg" draft="contributed">哈乃斐罗兴亚文</script>
<script type="Roro">朗格朗格文</script>
@@ -742,9 +750,11 @@
<script type="Vaii">瓦依文</script>
<script type="Visp">可见语言</script>
<script type="Wara">瓦郎奇蒂文字</script>
+ <script type="Wcho" draft="contributed">万秋文</script>
<script type="Wole">沃莱艾文</script>
<script type="Xpeo">古波斯文</script>
<script type="Xsux">苏美尔-阿卡德楔形文字</script>
+ <script type="Yezi" draft="contributed">雅兹迪文</script>
<script type="Yiii">彝文</script>
<script type="Zanb" draft="contributed">札那巴札尔方块文字</script>
<script type="Zinh">遗传学术语</script>
@@ -1077,6 +1087,7 @@
<variant type="1694ACAD">早期现代法文</variant>
<variant type="1959ACAD">学术</variant>
<variant type="ABL1943" draft="contributed">1943年正写法构想</variant>
+ <variant type="AKUAPEM" draft="contributed">阿夸佩姆方言</variant>
<variant type="ALALC97">1997 版 ALA-LC 罗马字</variant>
<variant type="ALUKU">阿鲁库方言</variant>
<variant type="AO1990" draft="contributed">1990年葡萄牙语正写法协议</variant>
@@ -1084,6 +1095,7 @@
<variant type="AREVELA">东亚美尼亚文</variant>
<variant type="AREVMDA">西亚美尼亚文</variant>
<variant type="ASANTE" draft="contributed">阿散蒂方言</variant>
+ <variant type="AUVERN" draft="contributed">自动钻机</variant>
<variant type="BAKU1926">统一土耳其拉丁字母</variant>
<variant type="BALANKA" draft="contributed">阿尼语Balanka方言</variant>
<variant type="BARLA" draft="contributed">佛得角语向风方言组</variant>
@@ -1091,30 +1103,46 @@
<variant type="BAUDDHA">佛陀梵文</variant>
<variant type="BISCAYAN">比斯开方言</variant>
<variant type="BISKE">圣乔治/比拉方言</variant>
+ <variant type="BOHORIC" draft="contributed">博霍里奇字母</variant>
<variant type="BOONT">布恩特林方言</variant>
+ <variant type="BORNHOLM" draft="contributed">博恩霍尔姆方言</variant>
+ <variant type="CISAUP" draft="contributed">西萨普方言</variant>
<variant type="COLB1945" draft="contributed">1945年葡萄牙-巴西正写法协定</variant>
<variant type="CORNU" draft="contributed">科尔尼方言</variant>
+ <variant type="CREISS" draft="contributed">克雷桑方言</variant>
<variant type="DAJNKO" draft="contributed">达金科字母</variant>
+ <variant type="EKAVSK" draft="contributed">塞尔维亚语伊卡维亚发音</variant>
<variant type="EMODENG" draft="contributed">近代英语</variant>
<variant type="FONIPA">国际音标</variant>
+ <variant type="FONKIRSH" draft="contributed">丰吉什方言</variant>
+ <variant type="FONNAPA" draft="contributed">福纳帕方言</variant>
<variant type="FONUPA">UPA 音标</variant>
<variant type="FONXSAMP">X-SAMPA 音标</variant>
<variant type="GASCON" draft="contributed">加斯科方言</variant>
+ <variant type="GRCLASS" draft="contributed">粗粒级</variant>
+ <variant type="GRITAL" draft="contributed">格里陶方言</variant>
+ <variant type="GRMISTR" draft="contributed">格米斯特方言</variant>
<variant type="HEPBURN">赫伯恩罗马字</variant>
<variant type="HOGNORSK">高地挪威文</variant>
+ <variant type="HSISTEMO" draft="contributed">赫西斯特莫方言</variant>
+ <variant type="IJEKAVSK" draft="contributed">塞尔维亚语伊吉卡维亚发音</variant>
<variant type="ITIHASA">史诗梵文</variant>
+ <variant type="IVANCHOV" draft="contributed">伊万乔夫方言</variant>
<variant type="JAUER">米施泰尔方言</variant>
<variant type="JYUTPING">粤语拼音</variant>
<variant type="KKCOR">常用拼字</variant>
+ <variant type="KOCIEWIE" draft="contributed">科奇韦方言</variant>
<variant type="KSCOR" draft="contributed">标准正写法</variant>
<variant type="LAUKIKA">传统梵文</variant>
<variant type="LEMOSIN" draft="contributed">利姆赞方言</variant>
<variant type="LENGADOC" draft="contributed">隆格多克方言</variant>
<variant type="LIPAW">雷西亚 Lipovaz 方言</variant>
<variant type="LUNA1918">俄文拼字（1918年起）</variant>
+ <variant type="METELKO" draft="contributed">梅特尔科字母</variant>
<variant type="MONOTON">单音字母</variant>
<variant type="NDYUKA">Ndyuka 方言</variant>
<variant type="NEDIS">Natisone 方言</variant>
+ <variant type="NEWFOUND" draft="contributed">纽芬兰方言</variant>
<variant type="NICARD" draft="contributed">尼斯方言</variant>
<variant type="NJIVA">Gniva/Njiva 方言</variant>
<variant type="NULIK" draft="contributed">现代沃拉普克语</variant>
@@ -1128,6 +1156,7 @@
<variant type="PINYIN">拼音罗马字</variant>
<variant type="POLYTON">多音字母</variant>
<variant type="POSIX">电脑</variant>
+ <variant type="PROVENC" draft="contributed">普罗旺斯方言</variant>
<variant type="PUTER">瑞士普特尔方言</variant>
<variant type="REVISED">修订的拼字</variant>
<variant type="RIGIK" draft="contributed">古典沃拉普克语</variant>
@@ -1151,7 +1180,9 @@
<variant type="VAIDIKA">吠陀梵文</variant>
<variant type="VALENCIA">瓦伦西亚文</variant>
<variant type="VALLADER">瑞士瓦勒德方言</variant>
+ <variant type="VIVARAUP" draft="contributed">维瓦鲁普方言</variant>
<variant type="WADEGILE">WG 威氏拼音法</variant>
+ <variant type="XSISTEMO" draft="contributed">西西斯特莫方言</variant>
</variants>
<keys>
<key type="calendar">日历</key>
@@ -1257,6 +1288,7 @@
<type key="numbers" type="cham">占文数字</type>
<type key="numbers" type="cyrl">斯拉夫数字</type>
<type key="numbers" type="deva">梵文数字</type>
+ <type key="numbers" type="diak" draft="contributed">迪维西阿库鲁数字</type>
<type key="numbers" type="ethi">埃塞俄比亚数字</type>
<type key="numbers" type="finance">金融数字</type>
<type key="numbers" type="fullwide">全角数字</type>
@@ -1299,6 +1331,7 @@
<type key="numbers" type="mtei">曼尼普尔数字</type>
<type key="numbers" type="mymr">缅甸数字</type>
<type key="numbers" type="mymrshan">缅甸掸文数字</type>
+ <type key="numbers" type="mymrtlng" draft="contributed">缅甸泰兰数字</type>
<type key="numbers" type="native" draft="contributed">当地数字</type>
<type key="numbers" type="nkoo">曼德数字</type>
<type key="numbers" type="olck">桑塔利文数字</type>
@@ -1324,6 +1357,7 @@
<type key="numbers" type="traditional" draft="contributed">传统数字</type>
<type key="numbers" type="vaii">瓦伊文数字</type>
<type key="numbers" type="wara" draft="contributed">瓦郎奇蒂数字</type>
+ <type key="numbers" type="wcho" draft="contributed">万秋数字</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">公制</measurementSystemName>
@@ -1417,6 +1451,26 @@
</dateFormatLength>
</dateFormats>
<dateTimeFormats>
+ <dateTimeFormatLength type="full">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="long">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="medium">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
+ <dateTimeFormatLength type="short">
+ <dateTimeFormat>
+ <pattern draft="contributed">↑↑↑</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength>
<availableFormats>
<dateFormatItem id="d">d日</dateFormatItem>
<dateFormatItem id="E" draft="contributed">↑↑↑</dateFormatItem>
@@ -1428,6 +1482,7 @@
<dateFormatItem id="M">M月</dateFormatItem>
<dateFormatItem id="Md">M-d</dateFormatItem>
<dateFormatItem id="MEd">M-dE</dateFormatItem>
+ <dateFormatItem id="MMM" draft="contributed">↑↑↑</dateFormatItem>
<dateFormatItem id="MMMd">M月d日</dateFormatItem>
<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
@@ -1444,6 +1499,7 @@
<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
</availableFormats>
<intervalFormats>
+ <intervalFormatFallback draft="contributed">↑↑↑</intervalFormatFallback>
<intervalFormatItem id="Bh">
<greatestDifference id="B" draft="contributed">Bh时至Bh时</greatestDifference>
<greatestDifference id="h" draft="contributed">Bh时至h时</greatestDifference>
@@ -1498,11 +1554,18 @@
<greatestDifference id="a" draft="contributed">ah时至ah时</greatestDifference>
<greatestDifference id="h" draft="contributed">ah时至h时</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="hm">
<greatestDifference id="a" draft="contributed">ah:mm至ah:mm</greatestDifference>
<greatestDifference id="h" draft="contributed">ah:mm至h:mm</greatestDifference>
<greatestDifference id="m" draft="contributed">ah:mm至h:mm</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="m" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="hmv">
<greatestDifference id="a" draft="contributed">vah:mm至ah:mm</greatestDifference>
<greatestDifference id="h" draft="contributed">vah:mm至h:mm</greatestDifference>
@@ -1516,6 +1579,9 @@
<greatestDifference id="a" draft="contributed">vah时至ah时</greatestDifference>
<greatestDifference id="h" draft="contributed">vah时至h时</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="M">
<greatestDifference id="M" draft="contributed">M–M月</greatestDifference>
</intervalFormatItem>
@@ -1743,6 +1809,65 @@
<cyclicName type="7" draft="contributed">↑↑↑</cyclicName>
<cyclicName type="8" draft="contributed">↑↑↑</cyclicName>
<cyclicName type="9" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="10" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="11" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="12" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="13" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="14" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="15" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="16" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="17" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="18" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="19" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="20" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="21" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="22" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="23" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="24" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="25" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="26" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="27" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="28" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="29" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="30" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="31" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="32" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="33" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="34" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="35" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="36" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="37" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="38" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="39" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="40" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="41" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="42" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="43" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="44" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="45" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="46" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="47" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="48" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="49" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="50" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="51" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="52" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="53" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="54" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="55" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="56" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="57" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="58" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="59" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="60" draft="contributed">↑↑↑</cyclicName>
+ </cyclicNameWidth>
+ <cyclicNameWidth type="narrow">
+ <cyclicName type="1" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="2" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="3" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="4" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="5" draft="contributed">↑↑↑</cyclicName>
+ <cyclicName type="6" draft="contributed">↑↑↑</cyclicName>
</cyclicNameWidth>
</cyclicNameContext>
</cyclicNameSet>
@@ -2766,11 +2891,18 @@
<greatestDifference id="a">ah时至ah时</greatestDifference>
<greatestDifference id="h">ah时至h时</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="H">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="hm">
<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Hm">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="m" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="hmv">
<greatestDifference id="a">vah:mm至ah:mm</greatestDifference>
<greatestDifference id="h">vah:mm至h:mm</greatestDifference>
@@ -2784,6 +2916,9 @@
<greatestDifference id="a">vah时至ah时</greatestDifference>
<greatestDifference id="h">vah时至h时</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Hv">
+ <greatestDifference id="H" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="M">
<greatestDifference id="M">M–M月</greatestDifference>
</intervalFormatItem>
@@ -7653,7 +7788,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>诺福克岛时间</standard>
+ <generic draft="contributed">诺福克岛时间</generic>
+ <standard draft="contributed">诺福克岛标准时间</standard>
+ <daylight draft="contributed">诺福克岛夏令时间</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -8588,6 +8725,7 @@
<currency type="ALK">
<displayName>阿尔巴尼亚列克(1946–1965)</displayName>
<displayName count="other">阿尔巴尼亚列克(1946–1965)</displayName>
+ <symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="ALL">
<displayName>阿尔巴尼亚列克</displayName>
@@ -10348,9 +10486,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>分{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>厘{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>毫{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>微{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>纳{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>皮{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>飞{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>阿{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>仄{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>幺{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>十{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>百{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>千{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>兆{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>吉{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>太{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>拍{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>艾{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>泽{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>尧{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>每{1}{0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>平方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>立方{0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -10358,7 +10564,7 @@
<displayName>G力</displayName>
<unitPattern count="other">{0}G力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米/秒²</displayName>
<unitPattern count="other">每平方秒{0}米</unitPattern>
</unit>
@@ -10439,7 +10645,7 @@
<displayName>毫摩尔/升</displayName>
<unitPattern count="other">每升{0}毫摩尔</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">百万分之{0}</unitPattern>
</unit>
@@ -10463,7 +10669,7 @@
<displayName>升/公里</displayName>
<unitPattern count="other">每公里{0}升</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100千米</displayName>
<unitPattern count="other">{0}升/100千米</unitPattern>
</unit>
@@ -10859,15 +11065,15 @@
<displayName>马力</displayName>
<unitPattern count="other">{0}马力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0}毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅/平方英寸</displayName>
<unitPattern count="other">每平方英寸{0}磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0}英寸汞柱</unitPattern>
</unit>
@@ -10931,7 +11137,7 @@
<displayName>开尔文</displayName>
<unitPattern count="other">{0}开尔文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>磅英尺</displayName>
<unitPattern count="other">{0}磅英尺</unitPattern>
</unit>
@@ -11061,9 +11267,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -11071,7 +11345,7 @@
<displayName>G力</displayName>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米/秒²</displayName>
<unitPattern count="other">{0}米/秒²</unitPattern>
</unit>
@@ -11152,7 +11426,7 @@
<displayName>毫摩尔/升</displayName>
<unitPattern count="other">{0}毫摩尔/升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="other">{0}ppm</unitPattern>
</unit>
@@ -11176,7 +11450,7 @@
<displayName>升/公里</displayName>
<unitPattern count="other">{0}升/公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100千米</displayName>
<unitPattern count="other">{0}升/100千米</unitPattern>
</unit>
@@ -11572,15 +11846,15 @@
<displayName>马力</displayName>
<unitPattern count="other">{0}马力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0}毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅/平方英寸</displayName>
<unitPattern count="other">每平方英寸{0}磅</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0}英寸汞柱</unitPattern>
</unit>
@@ -11644,7 +11918,7 @@
<displayName>开</displayName>
<unitPattern count="other">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>磅英尺</displayName>
<unitPattern count="other">{0}磅英尺</unitPattern>
</unit>
@@ -11774,9 +12048,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -11784,17 +12126,28 @@
<displayName draft="contributed">G力</displayName>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">米/秒²</displayName>
<unitPattern count="other" draft="contributed">{0}米/秒²</unitPattern>
</unit>
+ <unit type="angle-revolution">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="angle-degree">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}°</unitPattern>
</unit>
<unit type="angle-arc-minute">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}′</unitPattern>
</unit>
<unit type="angle-arc-second">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}″</unitPattern>
</unit>
<unit type="area-square-kilometer">
@@ -11842,10 +12195,30 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
+ <unit type="concentr-karat">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="concentr-percent">
<displayName>%</displayName>
<unitPattern count="other">{0}%</unitPattern>
</unit>
+ <unit type="concentr-permille">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="concentr-permyriad">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -11854,10 +12227,66 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-kilometer">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100千米</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="duration-century">
<displayName draft="contributed">世纪</displayName>
<unitPattern count="other" draft="contributed">{0}个世纪</unitPattern>
@@ -11913,6 +12342,22 @@
<displayName draft="contributed">纳秒</displayName>
<unitPattern count="other" draft="contributed">{0}纳秒</unitPattern>
</unit>
+ <unit type="electric-ampere">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="energy-kilocalorie">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -11957,6 +12402,22 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
+ <unit type="frequency-gigahertz">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="graphics-em">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -12018,24 +12479,24 @@
</unit>
<unit type="length-picometer">
<displayName draft="contributed">皮米</displayName>
- <unitPattern count="other" draft="contributed">{0}pm</unitPattern>
+ <unitPattern count="other">{0}pm</unitPattern>
</unit>
<unit type="length-mile">
<displayName draft="contributed">英里</displayName>
- <unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+ <unitPattern count="other">{0}mi</unitPattern>
</unit>
<unit type="length-yard">
<displayName draft="contributed">码</displayName>
- <unitPattern count="other" draft="contributed">{0}yd</unitPattern>
+ <unitPattern count="other">{0}yd</unitPattern>
</unit>
<unit type="length-foot">
<displayName draft="contributed">英尺</displayName>
- <unitPattern count="other" draft="contributed">{0}′</unitPattern>
+ <unitPattern count="other">{0}′</unitPattern>
<perUnitPattern draft="contributed">{0}/英尺</perUnitPattern>
</unit>
<unit type="length-inch">
<displayName draft="contributed">英寸</displayName>
- <unitPattern count="other" draft="contributed">{0}″</unitPattern>
+ <unitPattern count="other">{0}″</unitPattern>
<perUnitPattern draft="contributed">{0}/英寸</perUnitPattern>
</unit>
<unit type="length-parsec">
@@ -12044,7 +12505,7 @@
</unit>
<unit type="length-light-year">
<displayName draft="contributed">光年</displayName>
- <unitPattern count="other" draft="contributed">{0}ly</unitPattern>
+ <unitPattern count="other">{0}ly</unitPattern>
</unit>
<unit type="length-astronomical-unit">
<displayName draft="contributed">天文单位</displayName>
@@ -12074,6 +12535,10 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
+ <unit type="light-lux">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="light-solar-luminosity">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
@@ -12162,13 +12627,36 @@
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}hp</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-millimeter-ofhg">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}" Hg</unitPattern>
</unit>
+ <unit type="pressure-bar">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-millibar">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}mb</unitPattern>
</unit>
+ <unit type="pressure-atmosphere">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="pressure-hectopascal">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}hPa</unitPattern>
</unit>
<unit type="pressure-kilopascal">
@@ -12195,14 +12683,23 @@
<displayName draft="contributed">节</displayName>
<unitPattern count="other" draft="contributed">{0}节</unitPattern>
</unit>
+ <unit type="temperature-generic">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
<unit type="temperature-celsius">
<displayName>°C</displayName>
<unitPattern count="other">{0}°C</unitPattern>
</unit>
<unit type="temperature-fahrenheit">
+ <displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other">{0}°F</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="temperature-kelvin">
+ <displayName draft="contributed">↑↑↑</displayName>
+ <unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
<displayName draft="contributed">↑↑↑</displayName>
<unitPattern count="other" draft="contributed">↑↑↑</unitPattern>
</unit>
diff --git a/common/main/zh_Hans.xml b/common/main/zh_Hans.xml
index 1289889..e7fc12b 100644
--- a/common/main/zh_Hans.xml
+++ b/common/main/zh_Hans.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hans_CN.xml b/common/main/zh_Hans_CN.xml
index 270d8fa..c2a75de 100644
--- a/common/main/zh_Hans_CN.xml
+++ b/common/main/zh_Hans_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hans_HK.xml b/common/main/zh_Hans_HK.xml
index 23cd37d..61ef6a2 100644
--- a/common/main/zh_Hans_HK.xml
+++ b/common/main/zh_Hans_HK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hans_MO.xml b/common/main/zh_Hans_MO.xml
index 127308f..6534e39 100644
--- a/common/main/zh_Hans_MO.xml
+++ b/common/main/zh_Hans_MO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hans_SG.xml b/common/main/zh_Hans_SG.xml
index 8bcc310..ce74d09 100644
--- a/common/main/zh_Hans_SG.xml
+++ b/common/main/zh_Hans_SG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hant.xml b/common/main/zh_Hant.xml
index 2b4d191..32da5fa 100644
--- a/common/main/zh_Hant.xml
+++ b/common/main/zh_Hant.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -50,6 +50,7 @@
<language type="arp">阿拉帕霍文</language>
<language type="arq">阿爾及利亞阿拉伯文</language>
<language type="ars">納吉迪阿拉伯文</language>
+ <language type="ars" alt="menu">阿拉伯文（納吉迪）</language>
<language type="arw">阿拉瓦克文</language>
<language type="ary">摩洛哥阿拉伯文</language>
<language type="arz">埃及阿拉伯文</language>
@@ -123,6 +124,7 @@
<language type="chr">柴羅基文</language>
<language type="chy">沙伊安文</language>
<language type="ckb">中庫德文</language>
+ <language type="ckb" alt="menu" draft="contributed">庫德文（索拉尼）</language>
<language type="co">科西嘉文</language>
<language type="cop">科普特文</language>
<language type="cps">卡皮茲文</language>
@@ -183,6 +185,7 @@
<language type="ewo">依汪都文</language>
<language type="ext">埃斯特雷馬杜拉文</language>
<language type="fa">波斯文</language>
+ <language type="fa_AF">↑↑↑</language>
<language type="fan">芳族文</language>
<language type="fat">芳蒂文</language>
<language type="ff">富拉文</language>
@@ -652,6 +655,7 @@
<script type="Ahom" draft="contributed">阿洪姆文</script>
<script type="Arab">阿拉伯文</script>
<script type="Arab" alt="variant">波斯阿拉伯文字</script>
+ <script type="Aran" draft="contributed">波斯體</script>
<script type="Armi">皇室亞美尼亞文</script>
<script type="Armn">亞美尼亞文</script>
<script type="Avst" draft="contributed">阿維斯陀文</script>
@@ -775,6 +779,7 @@
<script type="Phnx">腓尼基文</script>
<script type="Plrd">柏格理拼音符</script>
<script type="Prti" draft="contributed">帕提亞文（碑銘體）</script>
+ <script type="Qaag" draft="contributed">佐基文</script>
<script type="Rjng">拉讓文</script>
<script type="Roro">朗格朗格象形文</script>
<script type="Runr">古北歐文字</script>
@@ -1399,7 +1404,7 @@
</localeDisplayNames>
<characters>
<exemplarCharacters>[一 丁 七 丈-不 丑 且 世 丘 丙 丟 並 中 串 丸 丹 主 乃 久 么 之 乎 乏 乖 乘 乙 九 也 乾 亂 了 予 事 二 于 云 互 五 井 些 亞 亡 交-亦 亨 享 京 亮 人 什 仁 仇 今 介 仍 仔 他 付 仙 代-以 仰 仲 件 任 份 企 伊 伍 伐 休 伙 伯 估 伴 伸 似 伽 但 佈 佉 位-住 佔 何 余 佛 作 你 佩 佳 使 來 例 供 依 侯 侵 便 係-俄 俊 俗 保 俠 信 修 俱 俾 個 倍 們 倒 候 倚 借 倫 值 假 偉 偏 做 停 健 側-偷 傑 備 傢 傣 傲 傳 傷 傻 傾 僅 像 僑 僧 價 儀 億 儒 儘 優 允 元-充 兇-光 克 免 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 再 冒 冠 冬 冰 冷 准 凌 凝 凡 凰 凱 出 函 刀 分 切 刊 列 初 判 別 利 刪 到 制 刷 刺 刻 則 剌 前 剛 剩 剪 副 割 創 劃 劇 劉 劍 力 功 加 助-劫 勁 勇 勉 勒 動 務 勝 勞 勢 勤 勵 勸 勿 包 匈 化 北 匹 區 十 千 升 午 半 卒-協 南 博 卜 卡 卯-危 即 卷 卻 厄 厘 厚 原 厭 厲 去 參 又 及 友 反 叔 取 受 口-另 只-叭 可 台 史 右 司 吃 各 合-吊 同-后 吐-吒 君 吝-吠 否 吧 含 吳 吵 吸 吹 吾 呀 呂 呆 告 呢 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咱 哀 品 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唉 唐 唔 唬 售 唯 唱 唷 唸 商 啊 問 啟 啡 啥 啦 啪 喀 喂 善 喇 喊 喔 喜 喝 喬 單 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 器 噴 嚇 嚴 囉 四 回 因 困 固 圈 國 圍 園 圓 圖 團 圜 土 在 圭 地 圾 址 均 坎 坐 坡 坤 坦 坪 垂 垃 型 埃 城 埔 域 執 培 基 堂 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 增 墨 墮 壁 壇 壓 壘 壞 壢 士 壬 壯 壽 夏 夕 外 多 夜 夠 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 奏 契 奔 套 奧 奪 奮 女 奴 奶 她 好 如 妙 妝 妥 妨 妮 妳 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娘 娛 婁 婆 婚 婦 媒 媽 嫌 嫩 子 孔 字 存 孝 孟 季 孤 孩 孫 學 它 宅 宇-安 宋 完 宏 宗-宜 客-室 宮 害 家 容 宿 寂 寄-密 富 寒 寞 察 寢 實-審 寫 寬 寮 寵 寶 封 射 將 專 尊 尋 對-小 少 尖 尚 尤 就 尺 尼 尾 局 屁 居 屆 屋 屏 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 嵐 嶺 川 州 巡 工-巨 巫 差 己-巴 巷 市 布 希 帕 帖 帛 帝 帥 師 席 帳 帶 常 帽 幅 幕 幣 幫 干-年 幸 幹 幻-幾 庇 床 序 底 店 庚 府 度 座 庫 庭 康 庸 廉 廖 廠 廢 廣 廳 延 廷 建 弄 式 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彝 彞 形 彥 彩 彬 彭 彰 影 役 彼 往 征 待 很 律 後 徐-徒 得 從 復 微 徵 德 徹 心 必 忌 忍 志-忙 忠 快 念 忽 怎 怒 怕 怖 思 怡 急 性 怨 怪 恆 恐 恢 恥 恨 恩 恭 息 恰 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 愁 愈 愉 意 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰 慶 慾 憂 憐 憑 憲 憶 憾 懂 應 懶 懷 懼 戀 戈 戊 戌 成-戒 或 截 戰 戲 戴 戶 房-扁 扇 手 才 扎 打 托 扣 扥 扭 扯 批 找-技 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 拍 拏 拒 拔 拖 招 拜 括 拳 拼 拾 拿 持 指 按 挑 挖 挪 振 挺 捐 捕 捨 捲 捷 掃 授 掉 掌 排 掛 採 探 接 控 推 措 描 提 插 揚 換 握 揮 援 損 搖 搜 搞 搬 搭 搶 摘 摩 摸 撐 撒 撞 撣 撥 播 撾 撿 擁 擇 擊 擋 操 擎 擔 據 擠 擦 擬 擴 擺 擾 攝 支 收 改 攻 放 政 故 效 敍 敏 救 敗-教 敝 敢 散 敦 敬 整 敵 數 文 斐 斗 料 斯 新 斷 方 於 施 旁 旅 旋 族 旗 既 日 旦 早 旭 旺 昂 昆 昇 昌 明 昏 易 星 映 春 昨 昭 是 時 晉 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暴 曆 曉 曰 曲 更 書 曼 曾-最 會 月 有 朋 服 朗 望 朝 期 木 未-札 朱 朵 杉 李 材 村 杜 束 杯-東 松 板 析 林 果 枝 架 柏 某 染 柔 查 柬 柯 柳 柴 校 核 根 格 桃 案 桌 桑 梁 梅 條 梨 梯 械 梵 棄 棉 棋 棒 棚 森 椅 植 椰 楊 楓 楚 業 極 概 榜 榮 構 槍 樂 樓 標 樞 模 樣 樹 橋 機 橫 檀 檔 檢 欄 權 次 欣 欲 欺 欽 款 歉 歌 歐 歡-武 歲 歷 歸 死 殊 殘 段 殺 殼 毀 毅 母 每 毒 比 毛 毫 氏 民 氣 水 永 求 汗 汝 江-污 汪 汶 決 汽 沃 沈 沉 沒 沖 沙 河 油 治 沿 況 泉 泊 法 泡 波 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 流 浦 浩 浪 浮 海 涇-涉 涯 液 涵 涼 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湯 源 準 溝 溪 溫 滄 滅 滋 滑 滴 滾 滿 漂 漏 演 漠 漢 漫 漲 漸 潔 潘 潛 潮 澤 澳 激 濃 濟 濤 濫 濱 瀏 灌 灣 火 灰 災 炎 炮 炸 為 烈 烏 烤 無 焦 然 煙 煞 照 煩 熊 熟 熱 燃 燈 燒 營 爆 爐 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛 牠 牧 物 牲 特 牽 犧 犯 狀 狂 狐 狗 狠 狼 猛 猜 猴 猶 獄 獅 獎 獨 獲 獸 獻 玄 率 玉 王 玩 玫 玲 玻 珊 珍 珠 珥 班 現 球 理 琉 琪 琴 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓦 瓶 甘 甚 甜 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 简 算 管 箭 箱 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融 螢 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路 跳 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻 顆 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆 鬥 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜]</exemplarCharacters>
- <exemplarCharacters type="auxiliary">[乍 乳 仂 伏 佐 侶 僳 兆 兌 兹 划 别 券 勳 匕 匙 匣 卑 卞 占 叉 叶 吻 嘟 噘 堤 墎 壤 奥 妖 孜 峇 嶼 巽 巾 帆 廁 廚 弋 弓 懸 戟 扳 捂 摔 暈 栗 框 桶 桿 楔 櫃 涅 渾 澎 煎 燦 燭 牡 狄 琳 瑚 甫 皺 盒 眨 眩 碑 礁 筒 簍 糰 紋 紗 纏 纜 羯 聳 肖 艇 芒 苗 茨 蓬 虹 蚩 蛛 蜀 蜘 蝴 蝸 蠟 裘 裙 謬 豚 躬 酋 釘 鈔 鈕 鉛 鎚 鎬 鐺 鑰 鑽 隴 霄 鞠 骰 骷 髏 鯉 鳶]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[乍 乳 仂 伏 佐 侶 僳 兆 兌 兹 划 别 券 勳 匕 匙 匣 卑 卞 占 叉 叶 吻 哺 嘟 噘 堤 墎 壤 奥 妖 嬰 孜 峇 嶼 巽 巾 帆 廁 廚 弋 弓 懸 戟 扳 捂 摔 暈 栗 框 桶 桿 楔 櫃 涅 渾 澎 煎 燕 燦 燭 牡 狄 琳 瑚 甫 疊 皺 盒 眨 眩 碑 礁 筒 簍 糰 紋 紗 纏 纜 羯 聳 肖 艇 芒 苗 茨 菱 蓬 虹 蚩 蛛 蜀 蜘 蝴 蝸 蠟 裘 裙 謬 豚 跨 躬 遞 酋 釘 鈔 鈕 鉛 鎚 鎬 鐺 鑰 鑽 隴 霄 鞠 餵 骰 骷 髏 鯉 鳶]</exemplarCharacters>
<exemplarCharacters type="index">[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]</exemplarCharacters>
<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]</exemplarCharacters>
<exemplarCharacters type="punctuation">[‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ ‑ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ " ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]</exemplarCharacters>
@@ -9876,7 +9881,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>諾福克島時間</standard>
+ <generic draft="contributed">諾福克島時間</generic>
+ <standard draft="contributed">諾福克島標準時間</standard>
+ <daylight draft="contributed">諾福克島夏令時間</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -13980,9 +13987,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 公寸</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 公分</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 公釐</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} 微米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 奈米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} 皮米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} 飛米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} 阿米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 仄米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 麼米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} 公丈</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} 公引</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} 公里</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 兆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} 吉米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} 太米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} 拍米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} 艾米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 皆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} 佑米</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>每{1} {0}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -13990,7 +14065,7 @@
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>每平方秒公尺</displayName>
<unitPattern count="other">每平方秒 {0} 公尺</unitPattern>
</unit>
@@ -14071,7 +14146,7 @@
<displayName>每公升毫莫耳</displayName>
<unitPattern count="other">每公升 {0} 毫莫耳</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百萬分率</displayName>
<unitPattern count="other">{0} 百萬分率</unitPattern>
</unit>
@@ -14095,7 +14170,7 @@
<displayName>每公里公升</displayName>
<unitPattern count="other">每公里 {0} 公升</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>每 100 公里公升</displayName>
<unitPattern count="other">每 100 公里 {0} 公升</unitPattern>
</unit>
@@ -14491,15 +14566,15 @@
<displayName>馬力</displayName>
<unitPattern count="other">{0} 匹馬力</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>每平方英寸磅力</displayName>
<unitPattern count="other">每平方英寸 {0} 磅力</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0} 英寸汞柱</unitPattern>
</unit>
@@ -14563,7 +14638,7 @@
<displayName>克耳文</displayName>
<unitPattern count="other">{0} 克耳文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>磅英尺</displayName>
<unitPattern count="other">{0} 磅英尺</unitPattern>
</unit>
@@ -14693,9 +14768,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 公寸</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 公分</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 公釐</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} 微米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 奈米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} 皮米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} 飛米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} 阿米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 仄米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 麼米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} 公丈</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} 公引</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} 公里</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 兆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} 吉米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} 太米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} 拍米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} 艾米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 皆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} 佑米</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -14703,7 +14846,7 @@
<displayName>G 力</displayName>
<unitPattern count="other">{0} G 力</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>公尺/平方秒</displayName>
<unitPattern count="other">{0} 公尺/平方秒</unitPattern>
</unit>
@@ -14784,7 +14927,7 @@
<displayName>毫莫耳/公升</displayName>
<unitPattern count="other">{0} 毫莫耳/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>百萬分率</displayName>
<unitPattern count="other">{0} 百萬分率</unitPattern>
</unit>
@@ -14808,7 +14951,7 @@
<displayName>公升/公里</displayName>
<unitPattern count="other">{0} 升/公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100 公里</displayName>
<unitPattern count="other">{0} 升/100 公里</unitPattern>
</unit>
@@ -15204,15 +15347,15 @@
<displayName>匹</displayName>
<unitPattern count="other">{0} 匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>毫米汞柱</displayName>
<unitPattern count="other">{0} 毫米汞柱</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅力/平方英寸</displayName>
<unitPattern count="other">{0} 磅力/平方英寸</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英寸汞柱</displayName>
<unitPattern count="other">{0} 英寸汞柱</unitPattern>
</unit>
@@ -15276,7 +15419,7 @@
<displayName>K</displayName>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>lbf⋅ft</displayName>
<unitPattern count="other">{0} lbf⋅ft</unitPattern>
</unit>
@@ -15406,9 +15549,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 公寸</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 公分</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 公釐</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>{0} 微米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 奈米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>{0} 皮米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>{0} 飛米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>{0} 阿米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 仄米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 麼米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>{0} 公丈</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>{0} 公引</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>{0} 公里</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 兆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>{0} 吉米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>{0} 太米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>{0} 拍米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>{0} 艾米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 皆米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>{0} 佑米</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -15416,7 +15627,7 @@
<displayName draft="contributed">G 力</displayName>
<unitPattern count="other">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="contributed">公尺/平方秒</displayName>
<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
</unit>
@@ -15488,7 +15699,7 @@
<displayName draft="contributed">毫莫耳/公升</displayName>
<unitPattern count="other" draft="contributed">{0}mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="contributed">百萬分率</displayName>
<unitPattern count="other" draft="contributed">{0}ppm</unitPattern>
</unit>
@@ -15500,7 +15711,7 @@
<displayName draft="contributed">公升/公里</displayName>
<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>升/100公里</displayName>
<unitPattern count="other">{0}升/100公里</unitPattern>
</unit>
@@ -15816,15 +16027,15 @@
<displayName draft="contributed">匹</displayName>
<unitPattern count="other">{0}匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="contributed">毫米汞柱</displayName>
<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="contributed">磅力/平方英寸</displayName>
<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="contributed">英寸汞柱</displayName>
<unitPattern count="other" draft="contributed">{0}英吋汞柱</unitPattern>
</unit>
diff --git a/common/main/zh_Hant_HK.xml b/common/main/zh_Hant_HK.xml
index 26389df..ca9d17a 100644
--- a/common/main/zh_Hant_HK.xml
+++ b/common/main/zh_Hant_HK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -20,7 +20,7 @@
</localeDisplayPattern>
<languages>
<language type="aa">阿法爾文</language>
- <language type="ab" draft="contributed">↑↑↑</language>
+ <language type="ab">↑↑↑</language>
<language type="ace">↑↑↑</language>
<language type="ach">↑↑↑</language>
<language type="ada">↑↑↑</language>
@@ -49,6 +49,7 @@
<language type="arp">↑↑↑</language>
<language type="arq">↑↑↑</language>
<language type="ars">↑↑↑</language>
+ <language type="ars" alt="menu" draft="contributed">↑↑↑</language>
<language type="arw">↑↑↑</language>
<language type="ary">↑↑↑</language>
<language type="arz">↑↑↑</language>
@@ -123,6 +124,7 @@
<language type="chr">↑↑↑</language>
<language type="chy">↑↑↑</language>
<language type="ckb">↑↑↑</language>
+ <language type="ckb" alt="menu">↑↑↑</language>
<language type="co">↑↑↑</language>
<language type="cop">↑↑↑</language>
<language type="cps">↑↑↑</language>
@@ -183,6 +185,7 @@
<language type="ewo">↑↑↑</language>
<language type="ext">↑↑↑</language>
<language type="fa">↑↑↑</language>
+ <language type="fa_AF">達利文</language>
<language type="fan">↑↑↑</language>
<language type="fat">↑↑↑</language>
<language type="ff">↑↑↑</language>
@@ -352,7 +355,7 @@
<language type="lui">↑↑↑</language>
<language type="lun">↑↑↑</language>
<language type="luo">盧歐文</language>
- <language type="lus" draft="contributed">米佐文</language>
+ <language type="lus">米佐文</language>
<language type="luy">↑↑↑</language>
<language type="lv">↑↑↑</language>
<language type="lzh">↑↑↑</language>
@@ -386,7 +389,7 @@
<language type="moh">↑↑↑</language>
<language type="mos">↑↑↑</language>
<language type="mr">↑↑↑</language>
- <language type="mrj" draft="contributed">西馬里文</language>
+ <language type="mrj">西馬里文</language>
<language type="ms">↑↑↑</language>
<language type="mt">馬耳他文</language>
<language type="mua">↑↑↑</language>
@@ -654,6 +657,7 @@
<script type="Ahom">↑↑↑</script>
<script type="Arab">↑↑↑</script>
<script type="Arab" alt="variant">↑↑↑</script>
+ <script type="Aran" draft="contributed">↑↑↑</script>
<script type="Armi">↑↑↑</script>
<script type="Armn">↑↑↑</script>
<script type="Avst">↑↑↑</script>
@@ -777,6 +781,7 @@
<script type="Phnx">↑↑↑</script>
<script type="Plrd">↑↑↑</script>
<script type="Prti">↑↑↑</script>
+ <script type="Qaag" draft="contributed">↑↑↑</script>
<script type="Rjng">↑↑↑</script>
<script type="Roro">↑↑↑</script>
<script type="Runr">↑↑↑</script>
@@ -1151,41 +1156,34 @@
<variant type="1606NICT">↑↑↑</variant>
<variant type="1694ACAD">↑↑↑</variant>
<variant type="1959ACAD">↑↑↑</variant>
- <variant type="ABL1943">ABL1943</variant>
- <variant type="AKUAPEM">↑↑↑</variant>
+ <variant type="ABL1943">↑↑↑</variant>
<variant type="ALALC97">↑↑↑</variant>
<variant type="ALUKU">↑↑↑</variant>
<variant type="AO1990">↑↑↑</variant>
<variant type="AREVELA">↑↑↑</variant>
<variant type="AREVMDA">↑↑↑</variant>
- <variant type="ASANTE">↑↑↑</variant>
<variant type="BAKU1926">↑↑↑</variant>
<variant type="BALANKA">↑↑↑</variant>
<variant type="BARLA">↑↑↑</variant>
- <variant type="BASICENG">↑↑↑</variant>
<variant type="BAUDDHA">↑↑↑</variant>
<variant type="BISCAYAN">↑↑↑</variant>
<variant type="BISKE">↑↑↑</variant>
<variant type="BOHORIC">↑↑↑</variant>
<variant type="BOONT">↑↑↑</variant>
- <variant type="CORNU">↑↑↑</variant>
+ <variant type="COLB1945" draft="contributed">↑↑↑</variant>
<variant type="DAJNKO">↑↑↑</variant>
<variant type="EKAVSK">↑↑↑</variant>
<variant type="EMODENG">↑↑↑</variant>
<variant type="FONIPA">↑↑↑</variant>
- <variant type="FONNAPA">↑↑↑</variant>
<variant type="FONUPA">↑↑↑</variant>
<variant type="FONXSAMP">↑↑↑</variant>
<variant type="HEPBURN">↑↑↑</variant>
<variant type="HOGNORSK">↑↑↑</variant>
- <variant type="HSISTEMO">↑↑↑</variant>
<variant type="IJEKAVSK">↑↑↑</variant>
<variant type="ITIHASA">↑↑↑</variant>
- <variant type="IVANCHOV">↑↑↑</variant>
<variant type="JAUER">↑↑↑</variant>
<variant type="JYUTPING">↑↑↑</variant>
<variant type="KKCOR">↑↑↑</variant>
- <variant type="KOCIEWIE">↑↑↑</variant>
<variant type="KSCOR">↑↑↑</variant>
<variant type="LAUKIKA">↑↑↑</variant>
<variant type="LIPAW">↑↑↑</variant>
@@ -1194,14 +1192,10 @@
<variant type="MONOTON">↑↑↑</variant>
<variant type="NDYUKA">↑↑↑</variant>
<variant type="NEDIS">↑↑↑</variant>
- <variant type="NEWFOUND">↑↑↑</variant>
<variant type="NJIVA">↑↑↑</variant>
<variant type="NULIK">↑↑↑</variant>
<variant type="OSOJS">↑↑↑</variant>
<variant type="OXENDICT">↑↑↑</variant>
- <variant type="PAHAWH2">↑↑↑</variant>
- <variant type="PAHAWH3">↑↑↑</variant>
- <variant type="PAHAWH4">↑↑↑</variant>
<variant type="PAMAKA">↑↑↑</variant>
<variant type="PETR1708">↑↑↑</variant>
<variant type="PINYIN">↑↑↑</variant>
@@ -1215,10 +1209,7 @@
<variant type="SAAHO">↑↑↑</variant>
<variant type="SCOTLAND" draft="contributed">蘇格蘭標準英語</variant>
<variant type="SCOUSE">↑↑↑</variant>
- <variant type="SIMPLE">↑↑↑</variant>
<variant type="SOLBA">↑↑↑</variant>
- <variant type="SOTAV">SOTAV</variant>
- <variant type="SPANGLIS">↑↑↑</variant>
<variant type="SURMIRAN">↑↑↑</variant>
<variant type="SURSILV">↑↑↑</variant>
<variant type="SUTSILV">↑↑↑</variant>
@@ -1226,12 +1217,10 @@
<variant type="UCCOR">↑↑↑</variant>
<variant type="UCRCOR">↑↑↑</variant>
<variant type="ULSTER">↑↑↑</variant>
- <variant type="UNIFON">↑↑↑</variant>
<variant type="VAIDIKA">↑↑↑</variant>
<variant type="VALENCIA">↑↑↑</variant>
<variant type="VALLADER">↑↑↑</variant>
<variant type="WADEGILE">↑↑↑</variant>
- <variant type="XSISTEMO">↑↑↑</variant>
</variants>
<keys>
<key type="calendar">↑↑↑</key>
@@ -1341,7 +1330,6 @@
<type key="numbers" type="finance">↑↑↑</type>
<type key="numbers" type="fullwide">↑↑↑</type>
<type key="numbers" type="geor">格魯吉亞數字</type>
- <type key="numbers" type="gong">↑↑↑</type>
<type key="numbers" type="gonm">↑↑↑</type>
<type key="numbers" type="grek">↑↑↑</type>
<type key="numbers" type="greklow">↑↑↑</type>
@@ -1384,7 +1372,6 @@
<type key="numbers" type="olck">↑↑↑</type>
<type key="numbers" type="orya">奧里亞數字</type>
<type key="numbers" type="osma">↑↑↑</type>
- <type key="numbers" type="rohg">↑↑↑</type>
<type key="numbers" type="roman">↑↑↑</type>
<type key="numbers" type="romanlow">↑↑↑</type>
<type key="numbers" type="saur">↑↑↑</type>
@@ -1422,7 +1409,7 @@
<exemplarCharacters type="index" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="numbers" draft="contributed">↑↑↑</exemplarCharacters>
<exemplarCharacters type="punctuation" draft="contributed">↑↑↑</exemplarCharacters>
- <ellipsis type="final" draft="contributed">{0}⋯</ellipsis>
+ <ellipsis type="final">{0}⋯</ellipsis>
<ellipsis type="initial" draft="contributed">⋯{0}</ellipsis>
<ellipsis type="medial" draft="contributed">{0}⋯{1}</ellipsis>
<ellipsis type="word-final" draft="contributed">{0}⋯</ellipsis>
@@ -2599,6 +2586,15 @@
</availableFormats>
<intervalFormats>
<intervalFormatFallback>↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="h" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="h" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="m" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="d">
<greatestDifference id="d">↑↑↑</greatestDifference>
</intervalFormatItem>
@@ -2880,9 +2876,56 @@
</availableFormats>
<intervalFormats>
<intervalFormatFallback draft="contributed">↑↑↑</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="h" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="h" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="m" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="d">
<greatestDifference id="d" draft="contributed">↑↑↑</greatestDifference>
</intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="G" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="M" draft="contributed">↑↑↑</greatestDifference>
+ <greatestDifference id="y" draft="contributed">↑↑↑</greatestDifference>
+ </intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a" draft="contributed">↑↑↑</greatestDifference>
<greatestDifference id="h" draft="contributed">↑↑↑</greatestDifference>
@@ -11197,8 +11240,6 @@
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNX">
- <displayName>↑↑↑</displayName>
- <displayName count="other">↑↑↑</displayName>
<symbol>↑↑↑</symbol>
</currency>
<currency type="CNY">
@@ -12193,7 +12234,7 @@
<symbol alt="narrow" draft="contributed">↑↑↑</symbol>
</currency>
<currency type="VES">
- <displayName>VES</displayName>
+ <displayName>↑↑↑</displayName>
<displayName count="other">↑↑↑</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
@@ -12415,9 +12456,77 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 分米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 厘米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 毫米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 納米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 介米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 攸米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 百萬米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 澤米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}每{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -12425,7 +12534,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米/平方秒</displayName>
<unitPattern count="other">{0} 米/平方秒</unitPattern>
</unit>
@@ -12506,7 +12615,7 @@
<displayName>每公升毫摩爾</displayName>
<unitPattern count="other">每公升 {0} 毫摩爾</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -12530,7 +12639,7 @@
<displayName>公升/公里</displayName>
<unitPattern count="other">{0} 公升/公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>公升/100公里</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -12926,15 +13035,15 @@
<displayName>匹</displayName>
<unitPattern count="other">{0} 匹</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅/平方吋</displayName>
<unitPattern count="other">{0} 磅/平方吋</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英吋汞柱</displayName>
<unitPattern count="other">{0} 英吋汞柱</unitPattern>
</unit>
@@ -12998,7 +13107,7 @@
<displayName>開爾文</displayName>
<unitPattern count="other">{0} 開爾文</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>磅尺</displayName>
<unitPattern count="other">{0} 磅尺</unitPattern>
</unit>
@@ -13128,9 +13237,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 分米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 厘米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 毫米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 納米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 介米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 攸米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 百萬米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 澤米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>{0}⋅{1}</compoundUnitPattern>
</compoundUnit>
@@ -13138,7 +13315,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米每平方秒</displayName>
<unitPattern count="other">{0} 米每平方秒</unitPattern>
</unit>
@@ -13219,7 +13396,7 @@
<displayName>毫摩爾/公升</displayName>
<unitPattern count="other">{0} 毫摩爾/公升</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -13243,7 +13420,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0} 升每公里</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -13639,15 +13816,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅每平方吋</displayName>
<unitPattern count="other">{0} 磅每平方吋</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英吋汞柱</displayName>
<unitPattern count="other">{0} 英吋汞柱</unitPattern>
</unit>
@@ -13711,7 +13888,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -13841,9 +14018,77 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>{0} 分米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>{0} 厘米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>{0} 毫米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>{0} 納米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>{0} 介米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>{0} 攸米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>{0} 百萬米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>{0} 澤米</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>↑↑↑</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>↑↑↑</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">↑↑↑</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -13851,7 +14096,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>米每平方秒</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
@@ -13931,7 +14176,7 @@
<displayName draft="contributed">毫摩爾/公升</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0} ppm</unitPattern>
</unit>
@@ -13947,7 +14192,7 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>↑↑↑</displayName>
<unitPattern count="other">{0}L/100km</unitPattern>
</unit>
@@ -14270,15 +14515,15 @@
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>↑↑↑</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>磅每平方吋</displayName>
<unitPattern count="other">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>英吋汞柱</displayName>
<unitPattern count="other">{0}″ Hg</unitPattern>
</unit>
diff --git a/common/main/zh_Hant_MO.xml b/common/main/zh_Hant_MO.xml
index 2879096..265610e 100644
--- a/common/main/zh_Hant_MO.xml
+++ b/common/main/zh_Hant_MO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zh_Hant_TW.xml b/common/main/zh_Hant_TW.xml
index c152a8d..79db115 100644
--- a/common/main/zh_Hant_TW.xml
+++ b/common/main/zh_Hant_TW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/main/zu.xml b/common/main/zu.xml
index 204e93b..73cc2d2 100644
--- a/common/main/zu.xml
+++ b/common/main/zu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -120,6 +120,7 @@
<language type="eu">isi-Basque</language>
<language type="ewo">isi-Ewondo</language>
<language type="fa">isi-Persian</language>
+ <language type="fa_AF">isi-Dari</language>
<language type="ff">isi-Fulah</language>
<language type="fi">isi-Finnish</language>
<language type="fil">isi-Filipino</language>
@@ -437,168 +438,49 @@
<language type="zza">isi-Zaza</language>
</languages>
<scripts>
- <script type="Adlm">↑↑↑</script>
- <script type="Aghb">↑↑↑</script>
<script type="Ahom">↑↑↑</script>
<script type="Arab">isi-Arabic</script>
<script type="Arab" alt="variant">isi-Perso-Arabic</script>
- <script type="Armi">↑↑↑</script>
<script type="Armn">isi-Armenian</script>
- <script type="Avst">↑↑↑</script>
- <script type="Bali">↑↑↑</script>
- <script type="Bamu">↑↑↑</script>
- <script type="Bass">↑↑↑</script>
- <script type="Batk">↑↑↑</script>
<script type="Beng">isi-Bangla</script>
- <script type="Bhks">↑↑↑</script>
<script type="Bopo">isi-Bopomofo</script>
- <script type="Brah">↑↑↑</script>
<script type="Brai">i-Braille</script>
- <script type="Bugi">↑↑↑</script>
- <script type="Buhd">↑↑↑</script>
- <script type="Cakm">↑↑↑</script>
- <script type="Cans">↑↑↑</script>
- <script type="Cari">↑↑↑</script>
- <script type="Cham">↑↑↑</script>
- <script type="Cher">↑↑↑</script>
- <script type="Copt">↑↑↑</script>
- <script type="Cprt">↑↑↑</script>
<script type="Cyrl">isi-Cyrillic</script>
<script type="Deva">isi-Devanagari</script>
- <script type="Dogr">↑↑↑</script>
- <script type="Dsrt">↑↑↑</script>
- <script type="Dupl">↑↑↑</script>
- <script type="Egyp">↑↑↑</script>
- <script type="Elba">↑↑↑</script>
- <script type="Elym">↑↑↑</script>
<script type="Ethi">isi-Ethiopic</script>
<script type="Geor">isi-Georgian</script>
- <script type="Glag">↑↑↑</script>
- <script type="Gong">↑↑↑</script>
- <script type="Gonm">↑↑↑</script>
- <script type="Goth">↑↑↑</script>
- <script type="Gran">↑↑↑</script>
<script type="Grek">isi-Greek</script>
<script type="Gujr">isi-Gujarati</script>
<script type="Guru">isi-Gurmukhi</script>
<script type="Hanb">isi-Hanb</script>
<script type="Hang">isi-Hangul</script>
<script type="Hani">isi-Han</script>
- <script type="Hano">↑↑↑</script>
<script type="Hans">enziwe lula</script>
<script type="Hans" alt="stand-alone">isi-Han esenziwe lula</script>
<script type="Hant">okosiko</script>
<script type="Hant" alt="stand-alone">isi-Han sosiko</script>
- <script type="Hatr">↑↑↑</script>
<script type="Hebr">isi-Hebrew</script>
<script type="Hira">isi-Hiragana</script>
- <script type="Hluw">↑↑↑</script>
- <script type="Hmng">↑↑↑</script>
- <script type="Hmnp">↑↑↑</script>
<script type="Hrkt">i-Japanese syllabaries</script>
- <script type="Hung">↑↑↑</script>
- <script type="Ital">↑↑↑</script>
<script type="Jamo">isi-Jamo</script>
- <script type="Java">↑↑↑</script>
<script type="Jpan">isi-Japanese</script>
- <script type="Kali">↑↑↑</script>
<script type="Kana">isi-Katakana</script>
- <script type="Khar">↑↑↑</script>
<script type="Khmr">isi-Khmer</script>
- <script type="Khoj">↑↑↑</script>
<script type="Knda">isi-Kannada</script>
<script type="Kore">isi-Korean</script>
- <script type="Kthi">↑↑↑</script>
- <script type="Lana">↑↑↑</script>
<script type="Laoo">isi-Lao</script>
<script type="Latn">isi-Latin</script>
- <script type="Lepc">↑↑↑</script>
- <script type="Limb">↑↑↑</script>
- <script type="Lina">↑↑↑</script>
- <script type="Linb">↑↑↑</script>
- <script type="Lisu">↑↑↑</script>
- <script type="Lyci">↑↑↑</script>
- <script type="Lydi">↑↑↑</script>
- <script type="Mahj">↑↑↑</script>
- <script type="Maka">↑↑↑</script>
- <script type="Mand">↑↑↑</script>
- <script type="Mani">↑↑↑</script>
- <script type="Marc">↑↑↑</script>
- <script type="Medf">↑↑↑</script>
- <script type="Mend">↑↑↑</script>
- <script type="Merc">↑↑↑</script>
- <script type="Mero">↑↑↑</script>
<script type="Mlym">isi-Malayalam</script>
- <script type="Modi">↑↑↑</script>
<script type="Mong">isi-Mongolian</script>
- <script type="Mroo">↑↑↑</script>
- <script type="Mtei">↑↑↑</script>
- <script type="Mult">↑↑↑</script>
<script type="Mymr">isi-Myanmar</script>
- <script type="Nand">↑↑↑</script>
- <script type="Narb">↑↑↑</script>
- <script type="Nbat">↑↑↑</script>
<script type="Newa">↑↑↑</script>
- <script type="Nkoo">↑↑↑</script>
- <script type="Nshu">↑↑↑</script>
- <script type="Ogam">↑↑↑</script>
- <script type="Olck">↑↑↑</script>
- <script type="Orkh">↑↑↑</script>
<script type="Orya">isi-Odia</script>
- <script type="Osge">↑↑↑</script>
- <script type="Osma">↑↑↑</script>
- <script type="Palm">↑↑↑</script>
- <script type="Pauc">↑↑↑</script>
- <script type="Perm">↑↑↑</script>
- <script type="Phag">↑↑↑</script>
- <script type="Phli">↑↑↑</script>
- <script type="Phlp">↑↑↑</script>
- <script type="Phnx">↑↑↑</script>
- <script type="Plrd">↑↑↑</script>
- <script type="Prti">↑↑↑</script>
- <script type="Qaag">↑↑↑</script>
- <script type="Rjng">↑↑↑</script>
- <script type="Rohg">↑↑↑</script>
- <script type="Runr">↑↑↑</script>
- <script type="Samr">↑↑↑</script>
- <script type="Sarb">↑↑↑</script>
- <script type="Saur">↑↑↑</script>
- <script type="Sgnw">↑↑↑</script>
- <script type="Shaw">↑↑↑</script>
- <script type="Shrd">↑↑↑</script>
- <script type="Sidd">↑↑↑</script>
- <script type="Sind">↑↑↑</script>
<script type="Sinh">isi-Sinhala</script>
- <script type="Sogd">↑↑↑</script>
- <script type="Sogo">↑↑↑</script>
- <script type="Sora">↑↑↑</script>
- <script type="Soyo">↑↑↑</script>
- <script type="Sund">↑↑↑</script>
- <script type="Sylo">↑↑↑</script>
- <script type="Syrc">↑↑↑</script>
- <script type="Tagb">↑↑↑</script>
- <script type="Takr">↑↑↑</script>
- <script type="Tale">↑↑↑</script>
- <script type="Talu">↑↑↑</script>
<script type="Taml">isi-Tamil</script>
- <script type="Tang">↑↑↑</script>
- <script type="Tavt">↑↑↑</script>
<script type="Telu">isi-Telugu</script>
- <script type="Tfng">↑↑↑</script>
- <script type="Tglg">↑↑↑</script>
<script type="Thaa">isi-Thaana</script>
<script type="Thai">isi-Thai</script>
<script type="Tibt">i-Tibetan</script>
- <script type="Tirh">↑↑↑</script>
- <script type="Ugar">↑↑↑</script>
- <script type="Vaii">↑↑↑</script>
- <script type="Wara">↑↑↑</script>
- <script type="Wcho">↑↑↑</script>
- <script type="Xpeo">↑↑↑</script>
- <script type="Xsux">↑↑↑</script>
- <script type="Yiii">↑↑↑</script>
- <script type="Zanb">↑↑↑</script>
- <script type="Zinh">↑↑↑</script>
<script type="Zmth">i-Mathematical Notation</script>
<script type="Zsye">i-Emoji</script>
<script type="Zsym">amasimbuli</script>
@@ -716,7 +598,6 @@
<territory type="ES">i-Spain</territory>
<territory type="ET">i-Ethiopia</territory>
<territory type="EU">i-European Union</territory>
- <territory type="EZ">EZ</territory>
<territory type="FI">i-Finland</territory>
<territory type="FJ">i-Fiji</territory>
<territory type="FK">i-Falkland Islands</territory>
@@ -920,108 +801,6 @@
<subdivision type="gbsct">I-Scotland</subdivision>
<subdivision type="gbwls">I-Wales</subdivision>
</subdivisions>
- <variants>
- <variant type="1901">↑↑↑</variant>
- <variant type="1994">↑↑↑</variant>
- <variant type="1996">↑↑↑</variant>
- <variant type="1606NICT">↑↑↑</variant>
- <variant type="1694ACAD">↑↑↑</variant>
- <variant type="1959ACAD">↑↑↑</variant>
- <variant type="ABL1943">↑↑↑</variant>
- <variant type="AKUAPEM">↑↑↑</variant>
- <variant type="ALALC97">↑↑↑</variant>
- <variant type="ALUKU">↑↑↑</variant>
- <variant type="AO1990">↑↑↑</variant>
- <variant type="ARANES">↑↑↑</variant>
- <variant type="ASANTE">↑↑↑</variant>
- <variant type="AUVERN">↑↑↑</variant>
- <variant type="BAKU1926">↑↑↑</variant>
- <variant type="BALANKA">↑↑↑</variant>
- <variant type="BARLA">↑↑↑</variant>
- <variant type="BASICENG">↑↑↑</variant>
- <variant type="BAUDDHA">↑↑↑</variant>
- <variant type="BISCAYAN">↑↑↑</variant>
- <variant type="BISKE">↑↑↑</variant>
- <variant type="BOHORIC">↑↑↑</variant>
- <variant type="BOONT">↑↑↑</variant>
- <variant type="CISAUP">↑↑↑</variant>
- <variant type="COLB1945">↑↑↑</variant>
- <variant type="CORNU">↑↑↑</variant>
- <variant type="CREISS">↑↑↑</variant>
- <variant type="DAJNKO">↑↑↑</variant>
- <variant type="EKAVSK">↑↑↑</variant>
- <variant type="EMODENG">↑↑↑</variant>
- <variant type="FONIPA">↑↑↑</variant>
- <variant type="FONKIRSH">↑↑↑</variant>
- <variant type="FONNAPA">↑↑↑</variant>
- <variant type="FONUPA">↑↑↑</variant>
- <variant type="FONXSAMP">↑↑↑</variant>
- <variant type="GASCON">↑↑↑</variant>
- <variant type="GRCLASS">↑↑↑</variant>
- <variant type="GRITAL">↑↑↑</variant>
- <variant type="GRMISTR">↑↑↑</variant>
- <variant type="HEPBURN">↑↑↑</variant>
- <variant type="HOGNORSK">↑↑↑</variant>
- <variant type="HSISTEMO">↑↑↑</variant>
- <variant type="IJEKAVSK">↑↑↑</variant>
- <variant type="ITIHASA">↑↑↑</variant>
- <variant type="IVANCHOV">↑↑↑</variant>
- <variant type="JAUER">↑↑↑</variant>
- <variant type="JYUTPING">↑↑↑</variant>
- <variant type="KKCOR">↑↑↑</variant>
- <variant type="KOCIEWIE">↑↑↑</variant>
- <variant type="KSCOR">↑↑↑</variant>
- <variant type="LAUKIKA">↑↑↑</variant>
- <variant type="LEMOSIN">↑↑↑</variant>
- <variant type="LENGADOC">↑↑↑</variant>
- <variant type="LIPAW">↑↑↑</variant>
- <variant type="LUNA1918">↑↑↑</variant>
- <variant type="METELKO">↑↑↑</variant>
- <variant type="MONOTON">↑↑↑</variant>
- <variant type="NDYUKA">↑↑↑</variant>
- <variant type="NEDIS">↑↑↑</variant>
- <variant type="NEWFOUND">↑↑↑</variant>
- <variant type="NICARD">↑↑↑</variant>
- <variant type="NJIVA">↑↑↑</variant>
- <variant type="NULIK">↑↑↑</variant>
- <variant type="OSOJS">↑↑↑</variant>
- <variant type="OXENDICT">↑↑↑</variant>
- <variant type="PAHAWH2">↑↑↑</variant>
- <variant type="PAHAWH3">↑↑↑</variant>
- <variant type="PAHAWH4">↑↑↑</variant>
- <variant type="PAMAKA">↑↑↑</variant>
- <variant type="PETR1708">↑↑↑</variant>
- <variant type="PINYIN">↑↑↑</variant>
- <variant type="POLYTON">↑↑↑</variant>
- <variant type="POSIX">↑↑↑</variant>
- <variant type="PROVENC">↑↑↑</variant>
- <variant type="PUTER">↑↑↑</variant>
- <variant type="REVISED">↑↑↑</variant>
- <variant type="RIGIK">↑↑↑</variant>
- <variant type="ROZAJ">↑↑↑</variant>
- <variant type="RUMGR">↑↑↑</variant>
- <variant type="SAAHO">↑↑↑</variant>
- <variant type="SCOTLAND">↑↑↑</variant>
- <variant type="SCOUSE">↑↑↑</variant>
- <variant type="SIMPLE">↑↑↑</variant>
- <variant type="SOLBA">↑↑↑</variant>
- <variant type="SOTAV">↑↑↑</variant>
- <variant type="SPANGLIS">↑↑↑</variant>
- <variant type="SURMIRAN">↑↑↑</variant>
- <variant type="SURSILV">↑↑↑</variant>
- <variant type="SUTSILV">↑↑↑</variant>
- <variant type="TARASK">↑↑↑</variant>
- <variant type="UCCOR">↑↑↑</variant>
- <variant type="UCRCOR">↑↑↑</variant>
- <variant type="ULSTER">↑↑↑</variant>
- <variant type="UNIFON">↑↑↑</variant>
- <variant type="VAIDIKA">↑↑↑</variant>
- <variant type="VALENCIA">↑↑↑</variant>
- <variant type="VALLADER">↑↑↑</variant>
- <variant type="VIVARAUP">↑↑↑</variant>
- <variant type="WADEGILE">↑↑↑</variant>
- <variant type="XSISTEMO">↑↑↑</variant>
- </variants>
<keys>
<key type="calendar">Ikhalenda</key>
<key type="cf">Ifomethi yemali</key>
@@ -1054,9 +833,6 @@
<type key="calendar" type="indian">i-Indian National Calender</type>
<type key="calendar" type="islamic">Ikhalenda lesi-Islamic</type>
<type key="calendar" type="islamic-civil">i-Islamic-Civil Calendar</type>
- <type key="calendar" type="islamic-rgsa">↑↑↑</type>
- <type key="calendar" type="islamic-tbla">↑↑↑</type>
- <type key="calendar" type="islamic-umalqura">↑↑↑</type>
<type key="calendar" type="iso8601">Ikhalenda le-ISO-8601</type>
<type key="calendar" type="japanese">Ikhalenda lesi-Japanese</type>
<type key="calendar" type="persian">Ikhalenda lesi-Persian</type>
@@ -1073,11 +849,8 @@
<type key="colCaseLevel" type="no">Hlela Okungancikile Ezinkinobhweni</type>
<type key="colCaseLevel" type="yes">Hlela Okuncike Ekumeni Kwezinkinobho</type>
<type key="collation" type="big5han">Ukuhlunga kwe-Traditional Chinese - Big5</type>
- <type key="collation" type="compat">↑↑↑</type>
<type key="collation" type="dictionary">Ukuhlunga kwesichazimazwi</type>
<type key="collation" type="ducet">Ukuhlunga okuzenzakalelayo kwe-Unicode</type>
- <type key="collation" type="emoji">↑↑↑</type>
- <type key="collation" type="eor">↑↑↑</type>
<type key="collation" type="gb2312han">Ukuhlunga kwe-Simplified Chinese - GB2312</type>
<type key="collation" type="phonebook">Ukuhlunga kwebhuku lefoni</type>
<type key="collation" type="phonetic">Hlela Ngokwefonetiki</type>
@@ -1089,7 +862,6 @@
<type key="collation" type="stroke">Ukuhlunga kwe-Stroke</type>
<type key="collation" type="traditional">Ukuhlunga ngokisiko</type>
<type key="collation" type="unihan">Ukuhlunga kwe-Radical-Stroke</type>
- <type key="collation" type="zhuyin">↑↑↑</type>
<type key="colNormalization" type="no">Hlela Ngaphandle Kokulinganisa</type>
<type key="colNormalization" type="yes">Ukuhlelwa Khekhodi Enye Kulinganisiwe</type>
<type key="colNumeric" type="no">Hlela Izinhlamvu Zenombolo Ngazinye</type>
@@ -1114,24 +886,16 @@
<type key="ms" type="metric">isistimu ye-Metric</type>
<type key="ms" type="uksystem">isistimu yokulinganisa ebusayo</type>
<type key="ms" type="ussystem">isistimu yokulinganisa yase-US</type>
- <type key="numbers" type="ahom">↑↑↑</type>
<type key="numbers" type="arab">amadijithi esi-Arabic-Indic</type>
<type key="numbers" type="arabext">amadijithi esi-Arabic-Indic eluliwe</type>
<type key="numbers" type="armn">izinombolo zesi-Armenian</type>
<type key="numbers" type="armnlow">izinombolo ezincane zesi-Armenian</type>
- <type key="numbers" type="bali">↑↑↑</type>
<type key="numbers" type="beng">izinombolo zesi-Bengali</type>
- <type key="numbers" type="brah">↑↑↑</type>
- <type key="numbers" type="cakm">↑↑↑</type>
- <type key="numbers" type="cham">↑↑↑</type>
- <type key="numbers" type="cyrl">↑↑↑</type>
<type key="numbers" type="deva">izinombolo zesi-Devanagari</type>
<type key="numbers" type="ethi">izinombolo zesi-Ethiopic</type>
<type key="numbers" type="finance">Izinombolo Zezomnotho</type>
<type key="numbers" type="fullwide">ububanzi obugcwele bamadijithi</type>
<type key="numbers" type="geor">izinombolo zesi-Georgian</type>
- <type key="numbers" type="gong">↑↑↑</type>
- <type key="numbers" type="gonm">↑↑↑</type>
<type key="numbers" type="grek">izinombolo zesi-Greek</type>
<type key="numbers" type="greklow">izinombolo ezincane zesi-Greek</type>
<type key="numbers" type="gujr">amadijithi esi-Gujarati</type>
@@ -1142,59 +906,26 @@
<type key="numbers" type="hant">izinombolo zosiko zesi-Chinese</type>
<type key="numbers" type="hantfin">izinombolo zosiko zezezimali zesi-Chinese</type>
<type key="numbers" type="hebr">izinombolo zesi-Hebrew</type>
- <type key="numbers" type="hmng">↑↑↑</type>
- <type key="numbers" type="hmnp">↑↑↑</type>
- <type key="numbers" type="java">↑↑↑</type>
<type key="numbers" type="jpan">izinombolo zesi-Japanese</type>
<type key="numbers" type="jpanfin">izinombolo zezezimali zesi-Japanese</type>
- <type key="numbers" type="kali">↑↑↑</type>
<type key="numbers" type="khmr">amadijithi esi-Khmer</type>
<type key="numbers" type="knda">amadijithi esi-Kannada</type>
- <type key="numbers" type="lana">↑↑↑</type>
- <type key="numbers" type="lanatham">↑↑↑</type>
<type key="numbers" type="laoo">amadijithi esi-Lao</type>
<type key="numbers" type="latn">amadijithi ase-Western</type>
- <type key="numbers" type="lepc">↑↑↑</type>
- <type key="numbers" type="limb">↑↑↑</type>
- <type key="numbers" type="mathbold">↑↑↑</type>
- <type key="numbers" type="mathdbl">↑↑↑</type>
- <type key="numbers" type="mathmono">↑↑↑</type>
- <type key="numbers" type="mathsanb">↑↑↑</type>
- <type key="numbers" type="mathsans">↑↑↑</type>
<type key="numbers" type="mlym">amadijithi esi-Malayalam</type>
- <type key="numbers" type="modi">↑↑↑</type>
<type key="numbers" type="mong">i-Mongolian Digits</type>
- <type key="numbers" type="mroo">↑↑↑</type>
- <type key="numbers" type="mtei">↑↑↑</type>
<type key="numbers" type="mymr">amadijithi esi-Maynmar</type>
- <type key="numbers" type="mymrshan">↑↑↑</type>
- <type key="numbers" type="mymrtlng">↑↑↑</type>
<type key="numbers" type="native">Izinkinobho Zasendaweni</type>
- <type key="numbers" type="nkoo">↑↑↑</type>
- <type key="numbers" type="olck">↑↑↑</type>
<type key="numbers" type="orya">Amadijithi ase-Odia</type>
- <type key="numbers" type="osma">↑↑↑</type>
- <type key="numbers" type="rohg">↑↑↑</type>
<type key="numbers" type="roman">izinombolo zesi-Roman</type>
<type key="numbers" type="romanlow">izinombolo zesi-Tamil</type>
- <type key="numbers" type="saur">↑↑↑</type>
- <type key="numbers" type="shrd">↑↑↑</type>
- <type key="numbers" type="sind">↑↑↑</type>
- <type key="numbers" type="sinh">↑↑↑</type>
- <type key="numbers" type="sora">↑↑↑</type>
- <type key="numbers" type="sund">↑↑↑</type>
- <type key="numbers" type="takr">↑↑↑</type>
- <type key="numbers" type="talu">↑↑↑</type>
<type key="numbers" type="taml">izinombolo zesi-Tamil</type>
<type key="numbers" type="tamldec">amadijithi esi-Tamil</type>
<type key="numbers" type="telu">amadijithi esi-Telegu</type>
<type key="numbers" type="thai">amadijithi esi-Thai</type>
<type key="numbers" type="tibt">amadijithi esi-Tibetan</type>
- <type key="numbers" type="tirh">↑↑↑</type>
<type key="numbers" type="traditional">Izinombolo Ezijwayelekile</type>
<type key="numbers" type="vaii">Izinhlazu Zezinombolo ze-Vai</type>
- <type key="numbers" type="wara">↑↑↑</type>
- <type key="numbers" type="wcho">↑↑↑</type>
</types>
<measurementSystemNames>
<measurementSystemName type="metric">i-Metric</measurementSystemName>
@@ -4909,7 +4640,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard>Isikhathi sase-Norfolk Islands</standard>
+ <generic draft="contributed">Isikhathi sase-Norfolk Islands</generic>
+ <standard draft="contributed">Isikhathi sase-Norfolk Islands esivamile</standard>
+ <daylight draft="contributed">Isikhathi sase-Norfolk Islands sasehlobo</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -5586,9 +5319,8 @@
<symbol alt="narrow" draft="contributed">$</symbol>
</currency>
<currency type="CNH">
- <displayName>CNH</displayName>
- <displayName count="one">CNH</displayName>
- <displayName count="other">CNH</displayName>
+ <displayName count="one">i-Chinese yuan (offshore)</displayName>
+ <displayName count="other">i-CNH</displayName>
<symbol draft="contributed">↑↑↑</symbol>
</currency>
<currency type="CNY">
@@ -6475,9 +6207,79 @@
</numbers>
<units>
<unitLength type="long">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>deci{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>centi{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>milli{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>micro{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>nano{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>i-pico{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>femto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>atto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>i-zepto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>i-yocto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>deka{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>hecto{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>kilo{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>mega{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>giga{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>tera{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>peta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>exa{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>zetta{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>yotta{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0} nge-{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">square {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">square {0}</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">cubic {0}</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">cubic {0}</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -6486,7 +6288,7 @@
<unitPattern count="one">{0} g-force</unitPattern>
<unitPattern count="other">{0} g-force</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -6586,7 +6388,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>ppm</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -6616,7 +6418,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7092,17 +6894,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -7182,7 +6984,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -7336,9 +7138,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="short">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>i-p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>i-y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -7347,7 +7219,7 @@
<unitPattern count="one">{0} G</unitPattern>
<unitPattern count="other">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName>m/s²</displayName>
<unitPattern count="one">{0} m/s²</unitPattern>
<unitPattern count="other">{0} m/s²</unitPattern>
@@ -7447,7 +7319,7 @@
<unitPattern count="one">{0} mmol/L</unitPattern>
<unitPattern count="other">{0} mmol/L</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName>izingxenye/izigidi</displayName>
<unitPattern count="one">{0} ppm</unitPattern>
<unitPattern count="other">{0} ppm</unitPattern>
@@ -7477,7 +7349,7 @@
<unitPattern count="one">{0} L/km</unitPattern>
<unitPattern count="other">{0} L/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0} L/100km</unitPattern>
<unitPattern count="other">{0} L/100km</unitPattern>
@@ -7953,17 +7825,17 @@
<unitPattern count="one">{0} hp</unitPattern>
<unitPattern count="other">{0} hp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName>mm Hg</displayName>
<unitPattern count="one">{0} mm Hg</unitPattern>
<unitPattern count="other">{0} mm Hg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName>psi</displayName>
<unitPattern count="one">{0} psi</unitPattern>
<unitPattern count="other">{0} psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName>inHg</displayName>
<unitPattern count="one">{0} inHg</unitPattern>
<unitPattern count="other">{0} inHg</unitPattern>
@@ -8043,7 +7915,7 @@
<unitPattern count="one">{0} K</unitPattern>
<unitPattern count="other">{0} K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName>↑↑↑</displayName>
<unitPattern count="one">↑↑↑</unitPattern>
<unitPattern count="other">↑↑↑</unitPattern>
@@ -8197,9 +8069,79 @@
</coordinateUnit>
</unitLength>
<unitLength type="narrow">
+ <compoundUnit type="10p-1">
+ <unitPrefixPattern>d{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-2">
+ <unitPrefixPattern>c{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-3">
+ <unitPrefixPattern>m{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-6">
+ <unitPrefixPattern>µ{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-9">
+ <unitPrefixPattern>n{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-12">
+ <unitPrefixPattern>i-p{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-15">
+ <unitPrefixPattern>f{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-18">
+ <unitPrefixPattern>a{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-21">
+ <unitPrefixPattern>i-z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p-24">
+ <unitPrefixPattern>i-y{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p1">
+ <unitPrefixPattern>da{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p2">
+ <unitPrefixPattern>h{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p3">
+ <unitPrefixPattern>k{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p6">
+ <unitPrefixPattern>M{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p9">
+ <unitPrefixPattern>G{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p12">
+ <unitPrefixPattern>T{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p15">
+ <unitPrefixPattern>P{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p18">
+ <unitPrefixPattern>E{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p21">
+ <unitPrefixPattern>Z{0}</unitPrefixPattern>
+ </compoundUnit>
+ <compoundUnit type="10p24">
+ <unitPrefixPattern>Y{0}</unitPrefixPattern>
+ </compoundUnit>
<compoundUnit type="per">
<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
</compoundUnit>
+ <compoundUnit type="power2">
+ <compoundUnitPattern1>{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}²</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}²</compoundUnitPattern1>
+ </compoundUnit>
+ <compoundUnit type="power3">
+ <compoundUnitPattern1>{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="one">{0}³</compoundUnitPattern1>
+ <compoundUnitPattern1 count="other">{0}³</compoundUnitPattern1>
+ </compoundUnit>
<compoundUnit type="times">
<compoundUnitPattern>↑↑↑</compoundUnitPattern>
</compoundUnit>
@@ -8224,7 +8166,7 @@
<unitPattern count="one">{0}%</unitPattern>
<unitPattern count="other">{0}%</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName>L/100km</displayName>
<unitPattern count="one">{0}L/100km</unitPattern>
<unitPattern count="other">{0}L/100km</unitPattern>
@@ -8520,7 +8462,7 @@
<styleName type="wdth" subtype="62.5" alt="compressed">extra-compressed</styleName>
<styleName type="wdth" subtype="62.5" alt="narrow">extra-narrow</styleName>
<styleName type="wdth" subtype="75">condensed</styleName>
- <styleName type="wdth" subtype="75" alt="compressed">compressed</styleName>
+ <styleName type="wdth" subtype="75" alt="compressed">fingqiwe</styleName>
<styleName type="wdth" subtype="75" alt="narrow">compressed</styleName>
<styleName type="wdth" subtype="87.5">semicondensed</styleName>
<styleName type="wdth" subtype="87.5" alt="compressed">semicompressed</styleName>
diff --git a/common/main/zu_ZA.xml b/common/main/zu_ZA.xml
index 8ae8d55..fd69067 100644
--- a/common/main/zu_ZA.xml
+++ b/common/main/zu_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/rbnf/de_CH.xml b/common/rbnf/de_CH.xml
index f358d43..12f4c72 100644
--- a/common/rbnf/de_CH.xml
+++ b/common/rbnf/de_CH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/rbnf/nn.xml b/common/rbnf/nn.xml
index 08d4a80..e34461f 100644
--- a/common/rbnf/nn.xml
+++ b/common/rbnf/nn.xml
@@ -63,19 +63,19 @@
<rbnfrule value="40">førti[→→];</rbnfrule>
<rbnfrule value="50">femti[→→];</rbnfrule>
<rbnfrule value="60">seksti[→→];</rbnfrule>
- <rbnfrule value="70">søtti[→→];</rbnfrule>
+ <rbnfrule value="70">sytti[→→];</rbnfrule>
<rbnfrule value="80">åtti[→→];</rbnfrule>
<rbnfrule value="90">nitti[→→];</rbnfrule>
<rbnfrule value="100">←%spellout-cardinal-neuter← hundre[ og →→];</rbnfrule>
<rbnfrule value="1000">←%spellout-cardinal-neuter← tusen[ og →→];</rbnfrule>
- <rbnfrule value="1000000">éin miljon[ →→];</rbnfrule>
- <rbnfrule value="2000000">←← miljoner[ →→];</rbnfrule>
- <rbnfrule value="1000000000">éin miljard[ →→];</rbnfrule>
- <rbnfrule value="2000000000">←← miljarder[ →→];</rbnfrule>
- <rbnfrule value="1000000000000">éin biljon[ →→];</rbnfrule>
- <rbnfrule value="2000000000000">←← biljoner[ →→];</rbnfrule>
- <rbnfrule value="1000000000000000">éin biljard[ →→];</rbnfrule>
- <rbnfrule value="2000000000000000">←← biljarder[ →→];</rbnfrule>
+ <rbnfrule value="1000000">éin million[ →→];</rbnfrule>
+ <rbnfrule value="2000000">←← millionar[ →→];</rbnfrule>
+ <rbnfrule value="1000000000">éin milliard[ →→];</rbnfrule>
+ <rbnfrule value="2000000000">←← milliardar[ →→];</rbnfrule>
+ <rbnfrule value="1000000000000">éin billion[ →→];</rbnfrule>
+ <rbnfrule value="2000000000000">←← billionar[ →→];</rbnfrule>
+ <rbnfrule value="1000000000000000">éin billiard[ →→];</rbnfrule>
+ <rbnfrule value="2000000000000000">←← biliardar[ →→];</rbnfrule>
<rbnfrule value="1000000000000000000">=#,##0=;</rbnfrule>
</ruleset>
</rulesetGrouping>
diff --git a/common/rbnf/sr_Latn.xml b/common/rbnf/sr_Latn.xml
index 14d3ea1..4c39864 100644
--- a/common/rbnf/sr_Latn.xml
+++ b/common/rbnf/sr_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/rbnf/su.xml b/common/rbnf/su.xml
similarity index 100%
rename from seed/rbnf/su.xml
rename to common/rbnf/su.xml
diff --git a/common/rbnf/yue_Hans.xml b/common/rbnf/yue_Hans.xml
index dbee7e0..64ba126 100644
--- a/common/rbnf/yue_Hans.xml
+++ b/common/rbnf/yue_Hans.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/subdivisions/af.xml b/common/subdivisions/af.xml
index e4b5549..9d0e925 100644
--- a/common/subdivisions/af.xml
+++ b/common/subdivisions/af.xml
@@ -459,7 +459,7 @@
<subdivision type="inmh" draft="contributed">Maharashtra</subdivision>
<subdivision type="inmn" draft="contributed">Manipoer</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="insk" draft="contributed">Sikkim</subdivision>
<subdivision type="intn" draft="contributed">Tamil Nadu</subdivision>
<subdivision type="intr" draft="contributed">Tripoera</subdivision>
diff --git a/common/subdivisions/az.xml b/common/subdivisions/az.xml
index b0da25d..45a8c59 100644
--- a/common/subdivisions/az.xml
+++ b/common/subdivisions/az.xml
@@ -620,7 +620,7 @@
<subdivision type="inmn" draft="contributed">Manipur</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Naqalend</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Pəncab ştatı</subdivision>
<subdivision type="inrj" draft="contributed">Racastan</subdivision>
<subdivision type="insk" draft="contributed">Sikkim</subdivision>
diff --git a/common/subdivisions/ca.xml b/common/subdivisions/ca.xml
index 6fc6649..d3c7d3d 100644
--- a/common/subdivisions/ca.xml
+++ b/common/subdivisions/ca.xml
@@ -1502,7 +1502,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Panjab</subdivision>
<subdivision type="inpy" draft="contributed">Pondicherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/cy.xml b/common/subdivisions/cy.xml
index b559fc2..af1e527 100644
--- a/common/subdivisions/cy.xml
+++ b/common/subdivisions/cy.xml
@@ -610,7 +610,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/da.xml b/common/subdivisions/da.xml
index a4b9a9a..90d4bbd 100644
--- a/common/subdivisions/da.xml
+++ b/common/subdivisions/da.xml
@@ -1584,7 +1584,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Pondicherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/en.xml b/common/subdivisions/en.xml
index 6cf4f04..524f9aa 100644
--- a/common/subdivisions/en.xml
+++ b/common/subdivisions/en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1650,6 +1650,7 @@
<subdivision type="gbeln">East Lothian</subdivision> <!-- in gbsct : Scotland -->
<subdivision type="gbels">Outer Hebrides</subdivision> <!-- in gbsct : Scotland -->
<subdivision type="gbenf">Enfield</subdivision> <!-- in gbeng : England -->
+ <subdivision type="gbeng">England</subdivision> <!-- deprecated -->
<subdivision type="gberw">East Renfrewshire</subdivision> <!-- in gbsct : Scotland -->
<subdivision type="gbery">East Riding of Yorkshire</subdivision> <!-- in gbeng : England -->
<subdivision type="gbess">Essex</subdivision> <!-- in gbeng : England -->
@@ -1759,6 +1760,7 @@
<subdivision type="gbsaw">Sandwell</subdivision> <!-- in gbeng : England -->
<subdivision type="gbsay">South Ayrshire</subdivision> <!-- in gbsct : Scotland -->
<subdivision type="gbscb">Scottish Borders</subdivision> <!-- in gbsct : Scotland -->
+ <subdivision type="gbsct">Scotland</subdivision> <!-- deprecated -->
<subdivision type="gbsfk">Suffolk</subdivision> <!-- in gbeng : England -->
<subdivision type="gbsft">Sefton</subdivision> <!-- in gbeng : England -->
<subdivision type="gbsgc">South Gloucestershire</subdivision> <!-- in gbeng : England -->
@@ -1803,6 +1805,7 @@
<subdivision type="gbwkf">Wakefield</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwll">Walsall</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwln">West Lothian</subdivision> <!-- in gbsct : Scotland -->
+ <subdivision type="gbwls">Wales</subdivision> <!-- deprecated -->
<subdivision type="gbwlv">Wolverhampton</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwnd">Wandsworth</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwnm">Windsor and Maidenhead</subdivision> <!-- in gbeng : England -->
@@ -1842,14 +1845,21 @@
GH : Ghana
-->
<subdivision type="ghaa">Greater Accra</subdivision>
+ <subdivision type="ghaf">Ahafo</subdivision>
<subdivision type="ghah">Ashanti</subdivision>
<subdivision type="ghba">Brong-Ahafo</subdivision>
+ <subdivision type="ghbe">Bono East</subdivision>
+ <subdivision type="ghbo">Bono</subdivision>
<subdivision type="ghcp">Central</subdivision>
<subdivision type="ghep">Eastern</subdivision>
+ <subdivision type="ghne">North East</subdivision>
<subdivision type="ghnp">Northern</subdivision>
+ <subdivision type="ghot">Oti</subdivision>
+ <subdivision type="ghsv">Savannah</subdivision>
<subdivision type="ghtv">Volta</subdivision>
<subdivision type="ghue">Upper East</subdivision>
<subdivision type="ghuw">Upper West</subdivision>
+ <subdivision type="ghwn">Western North</subdivision>
<subdivision type="ghwp">Western</subdivision>
<subdivision type="glav">Avannaata Kommunia</subdivision>
<!-- GI : Gibraltar : NO SUBDIVISIONS
@@ -2244,6 +2254,7 @@
<subdivision type="injk">Jammu and Kashmir</subdivision>
<subdivision type="inka">Karnataka</subdivision>
<subdivision type="inkl">Kerala</subdivision>
+ <subdivision type="inla">Ladakh</subdivision>
<subdivision type="inld">Lakshadweep</subdivision>
<subdivision type="inmh">Maharashtra</subdivision>
<subdivision type="inml">Meghalaya</subdivision>
@@ -3218,6 +3229,7 @@
<subdivision type="me21">Žabljak</subdivision>
<subdivision type="me22">Gusinje</subdivision>
<subdivision type="me23">Petnjica</subdivision>
+ <subdivision type="me24">Tuzi</subdivision>
<subdivision type="MF">St. Martin</subdivision>
<!-- MF : St. Martin : NO SUBDIVISIONS
MG : Madagascar
@@ -3341,6 +3353,86 @@
<subdivision type="mk83">Štip</subdivision>
<subdivision type="mk84">Šuto Orizari</subdivision> <!-- deprecated -->
<subdivision type="mk85">Skopje</subdivision>
+ <subdivision type="mk101">Veles</subdivision>
+ <subdivision type="mk102">Gradsko</subdivision>
+ <subdivision type="mk103">Demir Kapija</subdivision>
+ <subdivision type="mk104">Kavadarci</subdivision>
+ <subdivision type="mk105">Lozovo</subdivision>
+ <subdivision type="mk106">Negotino</subdivision>
+ <subdivision type="mk107">Rosoman</subdivision>
+ <subdivision type="mk108">Sveti Nikole</subdivision>
+ <subdivision type="mk109">Čaška</subdivision>
+ <subdivision type="mk201">Berovo</subdivision>
+ <subdivision type="mk202">Vinica</subdivision>
+ <subdivision type="mk203">Delčevo</subdivision>
+ <subdivision type="mk204">Zrnovci</subdivision>
+ <subdivision type="mk205">Karbinci</subdivision>
+ <subdivision type="mk206">Kočani</subdivision>
+ <subdivision type="mk207">Makedonska Kamenica</subdivision>
+ <subdivision type="mk208">Pehčevo</subdivision>
+ <subdivision type="mk209">Probištip</subdivision>
+ <subdivision type="mk210">Češinovo-Obleševo</subdivision>
+ <subdivision type="mk211">Štip</subdivision>
+ <subdivision type="mk301">Vevčani</subdivision>
+ <subdivision type="mk303">Debar</subdivision>
+ <subdivision type="mk304">Debrca</subdivision>
+ <subdivision type="mk307">Kičevo</subdivision>
+ <subdivision type="mk308">Makedonski Brod</subdivision>
+ <subdivision type="mk310">Ohrid</subdivision>
+ <subdivision type="mk311">Plasnica</subdivision>
+ <subdivision type="mk312">Struga</subdivision>
+ <subdivision type="mk313">Centar Župa</subdivision>
+ <subdivision type="mk401">Bogdanci</subdivision>
+ <subdivision type="mk402">Bosilovo</subdivision>
+ <subdivision type="mk403">Valandovo</subdivision>
+ <subdivision type="mk404">Vasilevo</subdivision>
+ <subdivision type="mk405">Gevgelija</subdivision>
+ <subdivision type="mk406">Dojran</subdivision>
+ <subdivision type="mk407">Konče</subdivision>
+ <subdivision type="mk408">Novo Selo</subdivision>
+ <subdivision type="mk409">Radoviš</subdivision>
+ <subdivision type="mk410">Strumica</subdivision>
+ <subdivision type="mk501">Bitola</subdivision>
+ <subdivision type="mk502">Demir Hisar</subdivision>
+ <subdivision type="mk503">Dolneni</subdivision>
+ <subdivision type="mk504">Krivogaštani</subdivision>
+ <subdivision type="mk505">Kruševo</subdivision>
+ <subdivision type="mk506">Mogila</subdivision>
+ <subdivision type="mk507">Novaci</subdivision>
+ <subdivision type="mk508">Prilep</subdivision>
+ <subdivision type="mk509">Resen</subdivision>
+ <subdivision type="mk601">Bogovinje</subdivision>
+ <subdivision type="mk602">Brvenica</subdivision>
+ <subdivision type="mk603">Vrapčište</subdivision>
+ <subdivision type="mk604">Gostivar</subdivision>
+ <subdivision type="mk605">Želino</subdivision>
+ <subdivision type="mk606">Jegunovce</subdivision>
+ <subdivision type="mk607">Mavrovo i Rostuše</subdivision>
+ <subdivision type="mk608">Tearce</subdivision>
+ <subdivision type="mk609">Tetovo</subdivision>
+ <subdivision type="mk701">Kratovo</subdivision>
+ <subdivision type="mk702">Kriva Palanka</subdivision>
+ <subdivision type="mk703">Kumanovo</subdivision>
+ <subdivision type="mk704">Lipkovo</subdivision>
+ <subdivision type="mk705">Rankovce</subdivision>
+ <subdivision type="mk706">Staro Nagoričane</subdivision>
+ <subdivision type="mk801">Aerodrom †</subdivision>
+ <subdivision type="mk802">Aračinovo</subdivision>
+ <subdivision type="mk803">Butel †</subdivision>
+ <subdivision type="mk804">Gazi Baba †</subdivision>
+ <subdivision type="mk805">Gjorče Petrov †</subdivision>
+ <subdivision type="mk806">Zelenikovo</subdivision>
+ <subdivision type="mk807">Ilinden</subdivision>
+ <subdivision type="mk808">Karpoš †</subdivision>
+ <subdivision type="mk809">Kisela Voda †</subdivision>
+ <subdivision type="mk810">Petrovec</subdivision>
+ <subdivision type="mk811">Saraj †</subdivision>
+ <subdivision type="mk812">Sopište</subdivision>
+ <subdivision type="mk813">Studeničani</subdivision>
+ <subdivision type="mk814">Centar †</subdivision>
+ <subdivision type="mk815">Čair †</subdivision>
+ <subdivision type="mk816">Čučer-Sandevo</subdivision>
+ <subdivision type="mk817">Šuto Orizari †</subdivision>
<!-- ML : Mali -->
<subdivision type="ml1">Kayes</subdivision>
<subdivision type="ml2">Koulikoro</subdivision>
@@ -5479,8 +5571,10 @@
ZA : South Africa
-->
<subdivision type="zaec">Eastern Cape</subdivision>
- <subdivision type="zafs">Free</subdivision>
+ <subdivision type="zafs">Free State</subdivision>
+ <subdivision type="zagp">Gauteng</subdivision>
<subdivision type="zagt">Gauteng</subdivision>
+ <subdivision type="zakzn">Kwazulu-Natal</subdivision>
<subdivision type="zalp">Limpopo</subdivision>
<subdivision type="zamp">Mpumalanga</subdivision>
<subdivision type="zanc">Northern Cape</subdivision>
diff --git a/common/subdivisions/es.xml b/common/subdivisions/es.xml
index 2c4f048..c4bf2d3 100644
--- a/common/subdivisions/es.xml
+++ b/common/subdivisions/es.xml
@@ -1876,7 +1876,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizorán</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punyab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajastán</subdivision>
diff --git a/common/subdivisions/et.xml b/common/subdivisions/et.xml
index 68958fb..8370a02 100644
--- a/common/subdivisions/et.xml
+++ b/common/subdivisions/et.xml
@@ -899,7 +899,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Pandžab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry liiduterritoorium</subdivision>
<subdivision type="inrj" draft="contributed">Rājasthān</subdivision>
diff --git a/common/subdivisions/eu.xml b/common/subdivisions/eu.xml
index 31d073f..d859ef2 100644
--- a/common/subdivisions/eu.xml
+++ b/common/subdivisions/eu.xml
@@ -1193,7 +1193,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/fi.xml b/common/subdivisions/fi.xml
index d022c7f..ccbc889 100644
--- a/common/subdivisions/fi.xml
+++ b/common/subdivisions/fi.xml
@@ -1641,7 +1641,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/gl.xml b/common/subdivisions/gl.xml
index e2debe3..911d184 100644
--- a/common/subdivisions/gl.xml
+++ b/common/subdivisions/gl.xml
@@ -905,7 +905,7 @@
<subdivision type="indn" draft="contributed">Dadra e Nagar Haveli</subdivision>
<subdivision type="inga" draft="contributed">Goa</subdivision>
<subdivision type="inhr" draft="contributed">Haryana</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="insk" draft="contributed">Sikkim</subdivision>
<subdivision type="intg" draft="contributed">Telangana</subdivision>
<subdivision type="intn" draft="contributed">Tamil Nadu</subdivision>
diff --git a/common/subdivisions/hr.xml b/common/subdivisions/hr.xml
index 99cf6dd..a7cda32 100644
--- a/common/subdivisions/hr.xml
+++ b/common/subdivisions/hr.xml
@@ -687,7 +687,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Pondicherry</subdivision>
<subdivision type="inrj" draft="contributed">Radžastan</subdivision>
diff --git a/common/subdivisions/id.xml b/common/subdivisions/id.xml
index 6a49d74..977431f 100644
--- a/common/subdivisions/id.xml
+++ b/common/subdivisions/id.xml
@@ -1556,7 +1556,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/it.xml b/common/subdivisions/it.xml
index 16e3d9d..784b78e 100644
--- a/common/subdivisions/it.xml
+++ b/common/subdivisions/it.xml
@@ -1887,7 +1887,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Pondicherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/ms.xml b/common/subdivisions/ms.xml
index 5bcd8d5..738ccc0 100644
--- a/common/subdivisions/ms.xml
+++ b/common/subdivisions/ms.xml
@@ -1531,7 +1531,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/nb.xml b/common/subdivisions/nb.xml
index 8acde3a..32b155d 100644
--- a/common/subdivisions/nb.xml
+++ b/common/subdivisions/nb.xml
@@ -1730,7 +1730,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/pt.xml b/common/subdivisions/pt.xml
index 4a002ec..b68bd02 100644
--- a/common/subdivisions/pt.xml
+++ b/common/subdivisions/pt.xml
@@ -1799,7 +1799,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajastão</subdivision>
diff --git a/common/subdivisions/ro.xml b/common/subdivisions/ro.xml
index 0304125..e6f6e47 100644
--- a/common/subdivisions/ro.xml
+++ b/common/subdivisions/ro.xml
@@ -1350,7 +1350,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/sq.xml b/common/subdivisions/sq.xml
index 0165d1e..7f9ad7f 100644
--- a/common/subdivisions/sq.xml
+++ b/common/subdivisions/sq.xml
@@ -505,7 +505,7 @@
<subdivision type="inkl" draft="contributed">Kerala</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="insk" draft="contributed">Sikkim</subdivision>
<subdivision type="intn" draft="contributed">Tamil Nadu</subdivision>
<subdivision type="intr" draft="contributed">Tripura</subdivision>
diff --git a/common/subdivisions/sv.xml b/common/subdivisions/sv.xml
index dad9d73..f8cc370 100644
--- a/common/subdivisions/sv.xml
+++ b/common/subdivisions/sv.xml
@@ -1876,7 +1876,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Pondicherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/sw.xml b/common/subdivisions/sw.xml
index 78bde0f..3a99c5b 100644
--- a/common/subdivisions/sw.xml
+++ b/common/subdivisions/sw.xml
@@ -641,7 +641,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/tr.xml b/common/subdivisions/tr.xml
index 2acf923..350dcce 100644
--- a/common/subdivisions/tr.xml
+++ b/common/subdivisions/tr.xml
@@ -1643,7 +1643,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Pencap</subdivision>
<subdivision type="inpy" draft="contributed">Puduçeri</subdivision>
<subdivision type="inrj" draft="contributed">Racasthan</subdivision>
diff --git a/common/subdivisions/uz.xml b/common/subdivisions/uz.xml
index bab071f..5e041e7 100644
--- a/common/subdivisions/uz.xml
+++ b/common/subdivisions/uz.xml
@@ -275,7 +275,7 @@
<subdivision type="inmn" draft="contributed">Manipur</subdivision>
<subdivision type="inmp" draft="contributed">Madhya-pradesh</subdivision>
<subdivision type="innl" draft="contributed">Nagalend</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Panjob</subdivision>
<subdivision type="inrj" draft="contributed">Rojasthon</subdivision>
<subdivision type="intn" draft="contributed">Tamilnad</subdivision>
diff --git a/common/subdivisions/vi.xml b/common/subdivisions/vi.xml
index 29fde08..c5ce5cb 100644
--- a/common/subdivisions/vi.xml
+++ b/common/subdivisions/vi.xml
@@ -1699,7 +1699,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/subdivisions/yo.xml b/common/subdivisions/yo.xml
index 4c819ca..59294e4 100644
--- a/common/subdivisions/yo.xml
+++ b/common/subdivisions/yo.xml
@@ -184,7 +184,7 @@
<subdivision type="inmp" draft="contributed">Madhya Pradesh</subdivision>
<subdivision type="inmz" draft="contributed">Mizoram</subdivision>
<subdivision type="innl" draft="contributed">Nagaland</subdivision>
- <subdivision type="inor" draft="contributed">Orissa</subdivision>
+ <subdivision type="inor" draft="contributed">Odisha</subdivision>
<subdivision type="inpb" draft="contributed">Punjab</subdivision>
<subdivision type="inpy" draft="contributed">Puducherry</subdivision>
<subdivision type="inrj" draft="contributed">Rajasthan</subdivision>
diff --git a/common/supplemental/attributeValueValidity.xml b/common/supplemental/attributeValueValidity.xml
index 09d8a67..4749727 100644
--- a/common/supplemental/attributeValueValidity.xml
+++ b/common/supplemental/attributeValueValidity.xml
@@ -22,15 +22,15 @@
ja jgo jmc jv
ka kab kam kde kea khq ki kk kkj kl kln km kn ko kok ks ksb ksf ksh ku kw ky
lag lb lg lkt ln lo lrc lt lu luo luy lv
- mas mer mfe mg mgh mgo mi mk ml mn mr ms mt mua my mzn
+ mai mas mer mfe mg mgh mgo mi mk ml mn mni mr ms mt mua my mzn
naq nb nd nds ne nl nmg nn nnh nus nyn
om or os
- pa pl prg ps pt
+ pa pcm pl prg ps pt
qu
rm rn ro rof
und
ru rw rwk
- sah saq sbp sd se seh ses sg shi si sk sl smn sn so sq sr sv sw
+ sah saq sat sbp sd se seh ses sg shi si sk sl smn sn so sq sr su sv sw
ta te teo tg th ti tk to tr tt twq tzm
ug uk ur uz
vai vi vo vun
@@ -46,7 +46,7 @@
mul
ny
root
- sa sm st su
+ sa sm st
zxx
</variable>
<variable id='$oldLanguages' type='choice'>
diff --git a/common/supplemental/coverageLevels.xml b/common/supplemental/coverageLevels.xml
index 8f14b3d..e9f1266 100644
--- a/common/supplemental/coverageLevels.xml
+++ b/common/supplemental/coverageLevels.xml
@@ -99,7 +99,7 @@
<coverageVariable key="%language60_GA" value="(fan|mye)"/>
<coverageVariable key="%language60_NG" value="(ff|ha|ibb|ig|kr|yo)"/>
<coverageVariable key="%language60_TD" value="(shu|dzg|kbl|mde|mua|sba)"/>
- <coverageVariable key="%language80" value="(a([fkmrz]|gq|s[at]?)|b([gm-os]|as|e[mz]?|rx?)|c([aosuy]|cp|eb?|gg|hr|kb)|d([ez]|av?|je|sb|ua|yo)|e([elnos-u]|bu|wo)|f([afory]|il?|ur)|g([adlv]|sw|uz?)|h([eirtuy]|aw?|mn|sb)|i[adgist]|j([av]|go|mc)|k([imnuwy]|a[bm]?|de|ea|hq|kj?|ln?|ok?|s[bfh]?)|l([bgnotv]|ag?|kt|rc|u[oy]?)|m([iklnr-ty]|as|er|fe|g[ho]?|u[al]|zn)|n([bel]|aq|ds?|mg|nh?|us|yn?)|o[mrs]|p([alst]|rg)|qu|r([mnu]|of?|wk?)|s([dgiklnoqrt-w]|a[hq]?|bp|e[hs]?|hi|mn?)|t([ag-ikort]|eo?|wq|zm)|u([gkrz]|nd)|v([io]|ai|un)|w(ae|o)|x(h|og)|y([io]|av|ue)|z([hu]|gh|xx))"/>
+ <coverageVariable key="%language80" value="(a([fkmrz]|gq|s[at]?)|b([gm-os]|as|e[mz]?|rx?)|c([aosuy]|cp|eb?|gg|hr|kb)|d([ez]|av?|je|sb|ua|yo)|e([elnos-u]|bu|wo)|f([afory]|il?|ur)|fa_AF|g([adlv]|sw|uz?)|h([eirtuy]|aw?|mn|sb)|i[adgist]|j([av]|go|mc)|k([imnuwy]|a[bm]?|de|ea|hq|kj?|ln?|ok?|s[bfh]?)|l([bgnotv]|ag?|kt|rc|u[oy]?)|m([iklr-ty]|a[is]|er|fe|g[ho]?|ni?|u[al]|zn)|n([bel]|aq|ds?|mg|nh?|us|yn?)|o[mrs]|p([alst]|cm|rg)|qu|r([mnu]|of?|wk?)|s([dgiklnoqrt-w]|a[hqt]?|bp|e[hs]?|hi|mn?)|t([ag-ikort]|eo?|wq|zm)|u([gkrz]|nd)|v([io]|ai|un)|w(ae|o)|x(h|og)|y([io]|av|ue)|z([hu]|gh|xx))"/>
<coverageVariable key="%languagecomp" value="(gan|hak|hsn|nan|wuu)"/> <!-- not currently used, just for reference: the only valid language codes that are not in modern coverage -->
<coverageVariable key="%lbTypes80" value="(strict|normal|loose)"/>
<coverageVariable key="%lwTypes" value="(normal|breakall|keepall)"/>
@@ -121,8 +121,8 @@
<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/>
<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
<coverageVariable key="%metazone60_AE_stdonly" value="Gulf"/>
- <coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
- <coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Norfolk|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis)"/>
+ <coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Norfolk|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
+ <coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis)"/>
<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
<coverageVariable key="%metazone100_stdonly" value="(Casey|Guam|Lanka|North_Mariana)"/>
<coverageVariable key="%miscPatternTypes" value="(atLeast|range)"/>
@@ -160,11 +160,11 @@
<coverageVariable key="%unitDurationTypes" value="duration-(year|month|week|day|hour|minute|second|millisecond)"/>
<coverageVariable key="%unitLengths" value="(long|short|narrow)"/>
<coverageVariable key="%unitNonNarrowLengths" value="(long|short)"/>
- <coverageVariable key="%unitsCommonMetric" value="(concentr-percent|consumption-liter-per-100kilometers|length-(centi|milli|kilo)?meter|mass-(kilo)?gram|temperature-celsius|speed-kilometer-per-hour|volume-liter)"/>
+ <coverageVariable key="%unitsCommonMetric" value="(concentr-percent|consumption-liter-per-100-kilometer|length-(centi|milli|kilo)?meter|mass-(kilo)?gram|temperature-celsius|speed-kilometer-per-hour|volume-liter)"/>
<coverageVariable key="%unitsCommonUS" value="(length-(inch|foot|yard|mile)|mass-(ounce|pound)|temperature-fahrenheit|speed-mile-per-hour)"/>
<coverageVariable key="%unitsEnglish" value="(length-fathom|length-furlong|mass-stone|volume-bushel|energy-british-thermal-unit)"/>
<coverageVariable key="%unitsNonEnglish" value="[a-z]++-(?!(furlong|fathom|stone|bushel|mile-nautical))([a-z]++([-a-z]++)?)"/>
- <coverageVariable key="%unitsOther" value="(length-(picometer|light-year)|pressure-(hectopascal|inch-hg|millibar)|acceleration-g-force|angle-(degree|minute|second)|area-(acre|hectare|square-(foot|kilometer|meter|mile))|power-(horsepower|kilowatt|watt)|speed-meter-per-second|volume-cubic-(mile|kilometer))"/>
+ <coverageVariable key="%unitsOther" value="(length-(picometer|light-year)|pressure-(hectopascal|inch-ofhg|millibar)|acceleration-g-force|angle-(degree|minute|second)|area-(acre|hectare|square-(foot|kilometer|meter|mile))|power-(horsepower|kilowatt|watt)|speed-meter-per-second|volume-cubic-(mile|kilometer))"/>
<coverageVariable key="%variantTypes" value="([A-Z0-9]++)"/>
<coverageVariable key="%wideAbbr" value="(wide|abbreviated)"/>
<coverageVariable key="%yesNo" value="(yes|no)"/>
@@ -641,7 +641,10 @@
<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/perMille"/>
<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/infinity"/>
<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/nan"/>
- <coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%compoundUnitTypes']/compoundUnitPattern"/>
+ <coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='${Target-Plurals}']"/>
+ <coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1"/>
+ <coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern"/>
+ <coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/unitPrefixPattern"/>
<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/coordinateUnit/displayName"/>
<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/coordinateUnit/coordinateUnitPattern[@type='%anyAlphaNum']"/>
<coverageLevel value="moderate" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/unitPattern[@count='${Target-Plurals}']"/>
diff --git a/common/supplemental/grammaticalFeatures.xml b/common/supplemental/grammaticalFeatures.xml
new file mode 100644
index 0000000..fef893e
--- /dev/null
+++ b/common/supplemental/grammaticalFeatures.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<!--
+Copyright © 2019 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
+-->
+
+<!--
+
+These are the grammatical features that are used in each locale to mark inflected forms of nouns.
+
+CLDR textual items may be tagged with grammatical features when these are needed to ensure that the
+correct forms are used in context.
+
+For instance, in Russian "Уменьши яркость света до 10 процентов" ("dim the light to 10 percent"),
+the 'percent' unit must be expressed in plural and in the genitive case, whereas "1%" would be
+expressed in different cases depending on the context. The case usage is implicit in short form
+"10%", but the full form requires the grammatical variant marked by case and number to be expressed
+correctly.
+
+In romance languages, nouns such as unit names have an intrinsic grammatical gender, which
+propagates by agreement to other parts of sentence. For example, in French "2 jours sont passés"
+("two days have gone by") expresses the participle "passés" in the plural masculine form, whereas
+"2 heures sont passées" requires the participle in the plural feminine form to agree with the
+grammatical gender of the unit "h", even when short forms are used.
+
+Note that plural status is not included here: CLDR handles plurals with special categories in
+plurals.xml and ordinals.xml. See those files and the LDML spec for more information.
+
+-->
+
+<supplementalData>
+ <version number="$Revision: 1 $"/>
+ <grammaticalData>
+ <grammaticalFeatures targets="nominal" locales="en fil ja ms th tl vi zh">
+ <!-- No grammatical features (number is not considered). -->
+ <!-- Note both fil and tl are included -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="es fr it pt">
+ <grammaticalGender values="masculine feminine"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="nl">
+ <grammaticalGender values="common neuter"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="te">
+ <grammaticalCase values="nominative oblique accusative dative locative instrumental"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="ta">
+ <grammaticalCase values="nominative genitive accusative dative locative instrumental ablative vocative"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="tr">
+ <grammaticalCase values="nominative genitive dative accusative instrumental ablative locative"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="id">
+ <grammaticalDefiniteness values="definite indefinite"/>
+ <!-- Indonesian nouns inflect in a possessive expression, with agreement on person. -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="de">
+ <grammaticalCase values="nominative genitive dative accusative"/>
+ <grammaticalGender values="masculine feminine neuter"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="hi pa ur">
+ <grammaticalCase values="nominative oblique"/>
+ <grammaticalGender values="masculine feminine"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="ml">
+ <grammaticalCase values="nominative genitive dative accusative instrumental locative comitative locativecopulative sociative"/>
+ <grammaticalGender values="animate inanimate feminine neuter"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="mr">
+ <grammaticalCase values="nominative oblique accusative dative ergative locative ablative genitive"/>
+ <grammaticalGender values="masculine feminine neuter"/>
+ <!-- Genitive agrees in gender, case and number with the antecedent. -->
+ <!-- Oblique can be further inflected by semantics-defining suffixes. -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="gu kn">
+ <grammaticalCase values="nominative genitive accusative dative locative instrumental vocative"/>
+ <grammaticalGender values="masculine feminine neuter"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="he">
+ <grammaticalGender values="masculine feminine"/>
+ <grammaticalDefiniteness values="definite indefinite construct"/>
+ <!-- Note that Hebrew nouns also inflect in possessives, with agreement on person, number and gender -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="ar">
+ <grammaticalCase values="nominative genitive accusative"/>
+ <grammaticalGender values="masculine feminine"/>
+ <grammaticalDefiniteness values="definite indefinite construct"/>
+ <!-- Note that Arabic nouns also inflect in possessives, with agreement on person, number and gender -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="bn">
+ <grammaticalCase values="nominative accusative genitive locative"/>
+ <grammaticalGender values="masculine feminine"/>
+ <grammaticalDefiniteness values="definite indefinite"/>
+ <!-- Gender is only used for expressing human activities/professions. -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="da">
+ <grammaticalCase values="nominative genitive"/>
+ <grammaticalGender values="common neuter"/>
+ <grammaticalDefiniteness values="definite indefinite unspecified"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="sv">
+ <grammaticalCase values="nominative genitive"/>
+ <grammaticalGender values="common neuter"/>
+ <grammaticalDefiniteness values="definite indefinite"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="nb ro">
+ <grammaticalCase values="nominative genitive"/>
+ <grammaticalGender values="masculine feminine neuter"/>
+ <grammaticalDefiniteness values="definite indefinite"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="cs sk">
+ <grammaticalCase values="nominative genitive dative accusative instrumental vocative locative"/>
+ <grammaticalGender values="animate inanimate feminine neuter"/>
+ <!-- Czech also inflects in polarity (negation is a prefix) -->
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="ru">
+ <grammaticalCase values="nominative genitive dative accusative instrumental prepositional partitive vocative locative"/>
+ <grammaticalGender values="masculine feminine neuter"/>
+ </grammaticalFeatures>
+ <grammaticalFeatures targets="nominal" locales="pl">
+ <grammaticalCase values="nominative genitive dative accusative instrumental prepositional partitive vocative locative"/>
+ <grammaticalGender values="animate inanimate personal feminine neuter"/>
+ </grammaticalFeatures>
+ </grammaticalData>
+</supplementalData>
diff --git a/common/supplemental/languageInfo.xml b/common/supplemental/languageInfo.xml
index c4afd90..ec67ec2 100644
--- a/common/supplemental/languageInfo.xml
+++ b/common/supplemental/languageInfo.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.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 -->
+<!--
+Copyright © 1991-2020 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
+-->
<supplementalData>
<version number="$Revision$"/>
<languageMatching>
@@ -202,110 +205,122 @@
<languageMatch desired="lb" supported="de" distance="4" oneway="true"/> <!-- lb ⇒ de -->
<languageMatch desired="da" supported="no" distance="8"/> <!-- da ⇒ no -->
<languageMatch desired="da" supported="nb" distance="8"/> <!-- da ⇒ nb -->
- <languageMatch desired="ab" supported="ru" distance="10" oneway="true"/> <!-- ab ⇒ ru -->
- <languageMatch desired="ach" supported="en" distance="10" oneway="true"/> <!-- ach ⇒ en -->
- <languageMatch desired="af" supported="nl" distance="10" oneway="true"/> <!-- af ⇒ nl -->
- <languageMatch desired="ak" supported="en" distance="10" oneway="true"/> <!-- ak ⇒ en -->
- <languageMatch desired="ay" supported="es" distance="10" oneway="true"/> <!-- ay ⇒ es -->
- <languageMatch desired="az" supported="ru" distance="10" oneway="true"/> <!-- az ⇒ ru -->
- <languageMatch desired="be" supported="ru" distance="10" oneway="true"/> <!-- be ⇒ ru -->
- <languageMatch desired="bem" supported="en" distance="10" oneway="true"/> <!-- bem ⇒ en -->
- <languageMatch desired="bh" supported="hi" distance="10" oneway="true"/> <!-- bh ⇒ hi -->
- <languageMatch desired="bn" supported="en" distance="10" oneway="true"/> <!-- bn ⇒ en -->
- <languageMatch desired="br" supported="fr" distance="10" oneway="true"/> <!-- br ⇒ fr -->
- <languageMatch desired="ceb" supported="fil" distance="10" oneway="true"/> <!-- ceb ⇒ fil -->
- <languageMatch desired="chr" supported="en" distance="10" oneway="true"/> <!-- chr ⇒ en -->
- <languageMatch desired="ckb" supported="ar" distance="10" oneway="true"/> <!-- ckb ⇒ ar -->
- <languageMatch desired="co" supported="fr" distance="10" oneway="true"/> <!-- co ⇒ fr -->
- <languageMatch desired="crs" supported="fr" distance="10" oneway="true"/> <!-- crs ⇒ fr -->
- <languageMatch desired="cy" supported="en" distance="10" oneway="true"/> <!-- cy ⇒ en -->
- <languageMatch desired="ee" supported="en" distance="10" oneway="true"/> <!-- ee ⇒ en -->
- <languageMatch desired="eo" supported="en" distance="10" oneway="true"/> <!-- eo ⇒ en -->
- <languageMatch desired="et" supported="fi" distance="10" oneway="true"/> <!-- et ⇒ fi -->
- <languageMatch desired="eu" supported="es" distance="10" oneway="true"/> <!-- eu ⇒ es -->
- <languageMatch desired="fo" supported="da" distance="10" oneway="true"/> <!-- fo ⇒ da -->
- <languageMatch desired="fy" supported="nl" distance="10" oneway="true"/> <!-- fy ⇒ nl -->
- <languageMatch desired="ga" supported="en" distance="10" oneway="true"/> <!-- ga ⇒ en -->
- <languageMatch desired="gaa" supported="en" distance="10" oneway="true"/> <!-- gaa ⇒ en -->
- <languageMatch desired="gd" supported="en" distance="10" oneway="true"/> <!-- gd ⇒ en -->
- <languageMatch desired="gl" supported="es" distance="10" oneway="true"/> <!-- gl ⇒ es -->
- <languageMatch desired="gn" supported="es" distance="10" oneway="true"/> <!-- gn ⇒ es -->
- <languageMatch desired="gu" supported="hi" distance="10" oneway="true"/> <!-- gu ⇒ hi -->
- <languageMatch desired="ha" supported="en" distance="10" oneway="true"/> <!-- ha ⇒ en -->
- <languageMatch desired="haw" supported="en" distance="10" oneway="true"/> <!-- haw ⇒ en -->
- <languageMatch desired="ht" supported="fr" distance="10" oneway="true"/> <!-- ht ⇒ fr -->
- <languageMatch desired="hy" supported="ru" distance="10" oneway="true"/> <!-- hy ⇒ ru -->
- <languageMatch desired="ia" supported="en" distance="10" oneway="true"/> <!-- ia ⇒ en -->
- <languageMatch desired="ig" supported="en" distance="10" oneway="true"/> <!-- ig ⇒ en -->
- <languageMatch desired="is" supported="en" distance="10" oneway="true"/> <!-- is ⇒ en -->
- <languageMatch desired="jv" supported="id" distance="10" oneway="true"/> <!-- jv ⇒ id -->
- <languageMatch desired="ka" supported="en" distance="10" oneway="true"/> <!-- ka ⇒ en -->
- <languageMatch desired="kg" supported="fr" distance="10" oneway="true"/> <!-- kg ⇒ fr -->
- <languageMatch desired="kk" supported="ru" distance="10" oneway="true"/> <!-- kk ⇒ ru -->
- <languageMatch desired="km" supported="en" distance="10" oneway="true"/> <!-- km ⇒ en -->
- <languageMatch desired="kn" supported="en" distance="10" oneway="true"/> <!-- kn ⇒ en -->
- <languageMatch desired="kri" supported="en" distance="10" oneway="true"/> <!-- kri ⇒ en -->
- <languageMatch desired="ku" supported="tr" distance="10" oneway="true"/> <!-- ku ⇒ tr -->
- <languageMatch desired="ky" supported="ru" distance="10" oneway="true"/> <!-- ky ⇒ ru -->
- <languageMatch desired="la" supported="it" distance="10" oneway="true"/> <!-- la ⇒ it -->
- <languageMatch desired="lg" supported="en" distance="10" oneway="true"/> <!-- lg ⇒ en -->
- <languageMatch desired="ln" supported="fr" distance="10" oneway="true"/> <!-- ln ⇒ fr -->
- <languageMatch desired="lo" supported="en" distance="10" oneway="true"/> <!-- lo ⇒ en -->
- <languageMatch desired="loz" supported="en" distance="10" oneway="true"/> <!-- loz ⇒ en -->
- <languageMatch desired="lua" supported="fr" distance="10" oneway="true"/> <!-- lua ⇒ fr -->
- <languageMatch desired="mfe" supported="en" distance="10" oneway="true"/> <!-- mfe ⇒ en -->
- <languageMatch desired="mg" supported="fr" distance="10" oneway="true"/> <!-- mg ⇒ fr -->
- <languageMatch desired="mi" supported="en" distance="10" oneway="true"/> <!-- mi ⇒ en -->
- <languageMatch desired="mk" supported="bg" distance="10" oneway="true"/> <!-- mk ⇒ bg -->
- <languageMatch desired="ml" supported="en" distance="10" oneway="true"/> <!-- ml ⇒ en -->
- <languageMatch desired="mn" supported="ru" distance="10" oneway="true"/> <!-- mn ⇒ ru -->
- <languageMatch desired="mr" supported="hi" distance="10" oneway="true"/> <!-- mr ⇒ hi -->
- <languageMatch desired="ms" supported="id" distance="10" oneway="true"/> <!-- ms ⇒ id -->
- <languageMatch desired="mt" supported="en" distance="10" oneway="true"/> <!-- mt ⇒ en -->
- <languageMatch desired="my" supported="en" distance="10" oneway="true"/> <!-- my ⇒ en -->
- <languageMatch desired="ne" supported="en" distance="10" oneway="true"/> <!-- ne ⇒ en -->
- <languageMatch desired="nn" supported="nb" distance="10"/> <!-- nn ⇒ nb -->
- <languageMatch desired="nn" supported="no" distance="10" oneway="true"/> <!-- nn ⇒ no -->
- <languageMatch desired="nso" supported="en" distance="10" oneway="true"/> <!-- nso ⇒ en -->
- <languageMatch desired="ny" supported="en" distance="10" oneway="true"/> <!-- ny ⇒ en -->
- <languageMatch desired="nyn" supported="en" distance="10" oneway="true"/> <!-- nyn ⇒ en -->
- <languageMatch desired="oc" supported="fr" distance="10" oneway="true"/> <!-- oc ⇒ fr -->
- <languageMatch desired="om" supported="en" distance="10" oneway="true"/> <!-- om ⇒ en -->
- <languageMatch desired="or" supported="en" distance="10" oneway="true"/> <!-- or ⇒ en -->
- <languageMatch desired="pa" supported="en" distance="10" oneway="true"/> <!-- pa ⇒ en -->
- <languageMatch desired="pcm" supported="en" distance="10" oneway="true"/> <!-- pcm ⇒ en -->
- <languageMatch desired="ps" supported="en" distance="10" oneway="true"/> <!-- ps ⇒ en -->
- <languageMatch desired="qu" supported="es" distance="10" oneway="true"/> <!-- qu ⇒ es -->
- <languageMatch desired="rm" supported="de" distance="10" oneway="true"/> <!-- rm ⇒ de -->
- <languageMatch desired="rn" supported="en" distance="10" oneway="true"/> <!-- rn ⇒ en -->
- <languageMatch desired="rw" supported="fr" distance="10" oneway="true"/> <!-- rw ⇒ fr -->
- <languageMatch desired="sa" supported="hi" distance="10" oneway="true"/> <!-- sa ⇒ hi -->
- <languageMatch desired="sd" supported="en" distance="10" oneway="true"/> <!-- sd ⇒ en -->
- <languageMatch desired="si" supported="en" distance="10" oneway="true"/> <!-- si ⇒ en -->
- <languageMatch desired="sn" supported="en" distance="10" oneway="true"/> <!-- sn ⇒ en -->
- <languageMatch desired="so" supported="en" distance="10" oneway="true"/> <!-- so ⇒ en -->
- <languageMatch desired="sq" supported="en" distance="10" oneway="true"/> <!-- sq ⇒ en -->
- <languageMatch desired="st" supported="en" distance="10" oneway="true"/> <!-- st ⇒ en -->
- <languageMatch desired="su" supported="id" distance="10" oneway="true"/> <!-- su ⇒ id -->
- <languageMatch desired="sw" supported="en" distance="10" oneway="true"/> <!-- sw ⇒ en -->
- <languageMatch desired="ta" supported="en" distance="10" oneway="true"/> <!-- ta ⇒ en -->
- <languageMatch desired="te" supported="en" distance="10" oneway="true"/> <!-- te ⇒ en -->
- <languageMatch desired="tg" supported="ru" distance="10" oneway="true"/> <!-- tg ⇒ ru -->
- <languageMatch desired="ti" supported="en" distance="10" oneway="true"/> <!-- ti ⇒ en -->
- <languageMatch desired="tk" supported="ru" distance="10" oneway="true"/> <!-- tk ⇒ ru -->
- <languageMatch desired="tlh" supported="en" distance="10" oneway="true"/> <!-- tlh ⇒ en -->
- <languageMatch desired="tn" supported="en" distance="10" oneway="true"/> <!-- tn ⇒ en -->
- <languageMatch desired="to" supported="en" distance="10" oneway="true"/> <!-- to ⇒ en -->
- <languageMatch desired="tt" supported="ru" distance="10" oneway="true"/> <!-- tt ⇒ ru -->
- <languageMatch desired="tum" supported="en" distance="10" oneway="true"/> <!-- tum ⇒ en -->
- <languageMatch desired="ug" supported="zh" distance="10" oneway="true"/> <!-- ug ⇒ zh -->
- <languageMatch desired="ur" supported="en" distance="10" oneway="true"/> <!-- ur ⇒ en -->
- <languageMatch desired="uz" supported="ru" distance="10" oneway="true"/> <!-- uz ⇒ ru -->
- <languageMatch desired="wo" supported="fr" distance="10" oneway="true"/> <!-- wo ⇒ fr -->
- <languageMatch desired="xh" supported="en" distance="10" oneway="true"/> <!-- xh ⇒ en -->
- <languageMatch desired="yi" supported="en" distance="10" oneway="true"/> <!-- yi ⇒ en -->
- <languageMatch desired="yo" supported="en" distance="10" oneway="true"/> <!-- yo ⇒ en -->
- <languageMatch desired="zu" supported="en" distance="10" oneway="true"/> <!-- zu ⇒ en -->
+ <!-- various fallbacks for more or less loosely related languages -->
+ <!-- CLDR-13528:
+ Distance 20 for some linguistic relation (e.g., Creoles to French)
+ or a local language in the area of another (e.g., Breton to French).
+ Distance 30 for fallbacks to prevalent second languages,
+ and in the absence of better information. -->
+ <languageMatch desired="ab" supported="ru" distance="30" oneway="true"/> <!-- Abkhazian: ab ⇒ ru -->
+ <languageMatch desired="ach" supported="en" distance="30" oneway="true"/> <!-- Acoli (Southern Luo dialect in Uganda): ach ⇒ en -->
+ <languageMatch desired="af" supported="nl" distance="20" oneway="true"/> <!-- Afrikaans: af ⇒ nl -->
+ <languageMatch desired="ak" supported="en" distance="30" oneway="true"/> <!-- Akan: ak ⇒ en -->
+ <languageMatch desired="ay" supported="es" distance="20" oneway="true"/> <!-- Aymara: ay ⇒ es -->
+ <languageMatch desired="az" supported="ru" distance="30" oneway="true"/> <!-- Azerbaijani: az ⇒ ru -->
+ <languageMatch desired="be" supported="ru" distance="20" oneway="true"/> <!-- Belarusian: be ⇒ ru -->
+ <languageMatch desired="bem" supported="en" distance="30" oneway="true"/> <!-- Bemba (Zambia): bem ⇒ en -->
+ <languageMatch desired="bh" supported="hi" distance="30" oneway="true"/> <!-- Bihari languages (gets canonicalized to bho): bh ⇒ hi -->
+ <languageMatch desired="bn" supported="en" distance="30" oneway="true"/> <!-- Bangla: bn ⇒ en -->
+ <languageMatch desired="br" supported="fr" distance="20" oneway="true"/> <!-- Breton: br ⇒ fr -->
+ <languageMatch desired="ceb" supported="fil" distance="30" oneway="true"/> <!-- Cebuano: ceb ⇒ fil -->
+ <languageMatch desired="chr" supported="en" distance="20" oneway="true"/> <!-- Cherokee: chr ⇒ en -->
+ <languageMatch desired="ckb" supported="ar" distance="30" oneway="true"/> <!-- Sorani Kurdish: ckb ⇒ ar -->
+ <languageMatch desired="co" supported="fr" distance="20" oneway="true"/> <!-- Corsican: co ⇒ fr -->
+ <languageMatch desired="crs" supported="fr" distance="20" oneway="true"/> <!-- Seselwa Creole French: crs ⇒ fr -->
+ <languageMatch desired="cy" supported="en" distance="20" oneway="true"/> <!-- Welsh: cy ⇒ en -->
+ <languageMatch desired="ee" supported="en" distance="30" oneway="true"/> <!-- Ewe: ee ⇒ en -->
+ <languageMatch desired="eo" supported="en" distance="30" oneway="true"/> <!-- Esperanto: eo ⇒ en -->
+
+ <!-- CLDR-13650: No fallback for Estonian -->
+ <!-- languageMatch desired="et" supported="fi" distance="30" oneway="true"/--> <!-- Estonian: et ⇒ fi -->
+
+ <languageMatch desired="eu" supported="es" distance="20" oneway="true"/> <!-- Basque: eu ⇒ es -->
+ <languageMatch desired="fo" supported="da" distance="20" oneway="true"/> <!-- Faroese: fo ⇒ da -->
+ <languageMatch desired="fy" supported="nl" distance="20" oneway="true"/> <!-- Western Frisian: fy ⇒ nl -->
+ <languageMatch desired="ga" supported="en" distance="20" oneway="true"/> <!-- Irish: ga ⇒ en -->
+ <languageMatch desired="gaa" supported="en" distance="30" oneway="true"/> <!-- Ga: gaa ⇒ en -->
+ <languageMatch desired="gd" supported="en" distance="20" oneway="true"/> <!-- Scottish Gaelic: gd ⇒ en -->
+ <languageMatch desired="gl" supported="es" distance="20" oneway="true"/> <!-- Galician: gl ⇒ es -->
+ <languageMatch desired="gn" supported="es" distance="20" oneway="true"/> <!-- Guarani: gn ⇒ es -->
+ <languageMatch desired="gu" supported="hi" distance="30" oneway="true"/> <!-- Gujarati: gu ⇒ hi -->
+ <languageMatch desired="ha" supported="en" distance="30" oneway="true"/> <!-- Hausa: ha ⇒ en -->
+ <languageMatch desired="haw" supported="en" distance="20" oneway="true"/> <!-- Hawaiian: haw ⇒ en -->
+ <languageMatch desired="ht" supported="fr" distance="20" oneway="true"/> <!-- Haitian Creole: ht ⇒ fr -->
+ <languageMatch desired="hy" supported="ru" distance="30" oneway="true"/> <!-- Armenian: hy ⇒ ru -->
+ <languageMatch desired="ia" supported="en" distance="30" oneway="true"/> <!-- Interlingua: ia ⇒ en -->
+ <languageMatch desired="ig" supported="en" distance="30" oneway="true"/> <!-- Igbo: ig ⇒ en -->
+ <languageMatch desired="is" supported="en" distance="20" oneway="true"/> <!-- Icelandic: is ⇒ en -->
+ <languageMatch desired="jv" supported="id" distance="20" oneway="true"/> <!-- Javanese: jv ⇒ id -->
+ <languageMatch desired="ka" supported="en" distance="30" oneway="true"/> <!-- Georgian: ka ⇒ en -->
+ <languageMatch desired="kg" supported="fr" distance="30" oneway="true"/> <!-- Kongo: kg ⇒ fr -->
+ <languageMatch desired="kk" supported="ru" distance="30" oneway="true"/> <!-- Kazakh: kk ⇒ ru -->
+ <languageMatch desired="km" supported="en" distance="30" oneway="true"/> <!-- Khmer: km ⇒ en -->
+ <languageMatch desired="kn" supported="en" distance="30" oneway="true"/> <!-- Kannada: kn ⇒ en -->
+ <languageMatch desired="kri" supported="en" distance="30" oneway="true"/> <!-- Krio: kri ⇒ en -->
+ <languageMatch desired="ku" supported="tr" distance="30" oneway="true"/> <!-- Kurdish: ku ⇒ tr -->
+ <languageMatch desired="ky" supported="ru" distance="30" oneway="true"/> <!-- Kirghiz: ky ⇒ ru -->
+ <languageMatch desired="la" supported="it" distance="20" oneway="true"/> <!-- Latin: la ⇒ it -->
+ <languageMatch desired="lg" supported="en" distance="30" oneway="true"/> <!-- Luganda: lg ⇒ en -->
+ <languageMatch desired="ln" supported="fr" distance="30" oneway="true"/> <!-- Lingala: ln ⇒ fr -->
+ <languageMatch desired="lo" supported="en" distance="30" oneway="true"/> <!-- Lao: lo ⇒ en -->
+ <languageMatch desired="loz" supported="en" distance="30" oneway="true"/> <!-- Lozi: loz ⇒ en -->
+ <languageMatch desired="lua" supported="fr" distance="30" oneway="true"/> <!-- Luba-Lulua: lua ⇒ fr -->
+ <languageMatch desired="mfe" supported="en" distance="30" oneway="true"/> <!-- Morisyen: mfe ⇒ en -->
+ <languageMatch desired="mg" supported="fr" distance="30" oneway="true"/> <!-- Malagasy: mg ⇒ fr -->
+ <languageMatch desired="mi" supported="en" distance="20" oneway="true"/> <!-- Maori: mi ⇒ en -->
+
+ <!-- CLDR-13625: Macedonian should not fall back to Bulgarian -->
+ <!-- languageMatch desired="mk" supported="bg" distance="30" oneway="true"/--> <!-- Macedonian: mk ⇒ bg -->
+
+ <languageMatch desired="ml" supported="en" distance="30" oneway="true"/> <!-- Malayalam: ml ⇒ en -->
+ <languageMatch desired="mn" supported="ru" distance="30" oneway="true"/> <!-- Mongolian: mn ⇒ ru -->
+ <languageMatch desired="mr" supported="hi" distance="30" oneway="true"/> <!-- Marathi: mr ⇒ hi -->
+ <languageMatch desired="ms" supported="id" distance="30" oneway="true"/> <!-- Malay: ms ⇒ id -->
+ <languageMatch desired="mt" supported="en" distance="30" oneway="true"/> <!-- Maltese: mt ⇒ en -->
+ <languageMatch desired="my" supported="en" distance="30" oneway="true"/> <!-- Myanmar: my ⇒ en -->
+ <languageMatch desired="ne" supported="en" distance="30" oneway="true"/> <!-- Nepali: ne ⇒ en -->
+ <languageMatch desired="nn" supported="nb" distance="20"/> <!-- Nynorsk: nn ⟺ nb -->
+ <languageMatch desired="nn" supported="no" distance="20"/> <!-- Nynorsk: nn ⟺ no; CLDR-13679 -->
+ <languageMatch desired="nso" supported="en" distance="30" oneway="true"/> <!-- Northern Sotho: nso ⇒ en -->
+ <languageMatch desired="ny" supported="en" distance="30" oneway="true"/> <!-- Nyanja: ny ⇒ en -->
+ <languageMatch desired="nyn" supported="en" distance="30" oneway="true"/> <!-- Nyankole: nyn ⇒ en -->
+ <languageMatch desired="oc" supported="fr" distance="20" oneway="true"/> <!-- Occitan: oc ⇒ fr -->
+ <languageMatch desired="om" supported="en" distance="30" oneway="true"/> <!-- Oromo: om ⇒ en -->
+ <languageMatch desired="or" supported="en" distance="30" oneway="true"/> <!-- Odia: or ⇒ en -->
+ <languageMatch desired="pa" supported="en" distance="30" oneway="true"/> <!-- Punjabi: pa ⇒ en -->
+ <languageMatch desired="pcm" supported="en" distance="20" oneway="true"/> <!-- Nigerian Pidgin: pcm ⇒ en -->
+ <languageMatch desired="ps" supported="en" distance="30" oneway="true"/> <!-- Pashto: ps ⇒ en -->
+ <languageMatch desired="qu" supported="es" distance="30" oneway="true"/> <!-- Quechua: qu ⇒ es -->
+ <languageMatch desired="rm" supported="de" distance="20" oneway="true"/> <!-- Romansh: rm ⇒ de -->
+ <languageMatch desired="rn" supported="en" distance="30" oneway="true"/> <!-- Rundi: rn ⇒ en -->
+ <languageMatch desired="rw" supported="fr" distance="30" oneway="true"/> <!-- Kinyarwanda: rw ⇒ fr -->
+ <languageMatch desired="sa" supported="hi" distance="30" oneway="true"/> <!-- Sanskrit: sa ⇒ hi -->
+ <languageMatch desired="sd" supported="en" distance="30" oneway="true"/> <!-- Sindhi: sd ⇒ en -->
+ <languageMatch desired="si" supported="en" distance="30" oneway="true"/> <!-- Sinhalese: si ⇒ en -->
+ <languageMatch desired="sn" supported="en" distance="30" oneway="true"/> <!-- Shona: sn ⇒ en -->
+ <languageMatch desired="so" supported="en" distance="30" oneway="true"/> <!-- Somali: so ⇒ en -->
+ <languageMatch desired="sq" supported="en" distance="30" oneway="true"/> <!-- Albanian: sq ⇒ en -->
+ <languageMatch desired="st" supported="en" distance="30" oneway="true"/> <!-- Southern Sotho: st ⇒ en -->
+ <languageMatch desired="su" supported="id" distance="20" oneway="true"/> <!-- Sundanese: su ⇒ id -->
+ <languageMatch desired="sw" supported="en" distance="30" oneway="true"/> <!-- Swahili: sw ⇒ en -->
+ <languageMatch desired="ta" supported="en" distance="30" oneway="true"/> <!-- Tamil: ta ⇒ en -->
+ <languageMatch desired="te" supported="en" distance="30" oneway="true"/> <!-- Telugu: te ⇒ en -->
+ <languageMatch desired="tg" supported="ru" distance="30" oneway="true"/> <!-- Tajik: tg ⇒ ru -->
+ <languageMatch desired="ti" supported="en" distance="30" oneway="true"/> <!-- Tigrinya: ti ⇒ en -->
+ <languageMatch desired="tk" supported="ru" distance="30" oneway="true"/> <!-- Turkmen: tk ⇒ ru -->
+ <languageMatch desired="tlh" supported="en" distance="30" oneway="true"/> <!-- Klingon: tlh ⇒ en -->
+ <languageMatch desired="tn" supported="en" distance="30" oneway="true"/> <!-- Tswana: tn ⇒ en -->
+ <languageMatch desired="to" supported="en" distance="30" oneway="true"/> <!-- Tonga: to ⇒ en -->
+ <languageMatch desired="tt" supported="ru" distance="30" oneway="true"/> <!-- Tatar: tt ⇒ ru -->
+ <languageMatch desired="tum" supported="en" distance="30" oneway="true"/> <!-- Tumbuka: tum ⇒ en -->
+ <languageMatch desired="ug" supported="zh" distance="20" oneway="true"/> <!-- Uighur: ug ⇒ zh -->
+ <languageMatch desired="ur" supported="en" distance="30" oneway="true"/> <!-- Urdu: ur ⇒ en -->
+ <languageMatch desired="uz" supported="ru" distance="30" oneway="true"/> <!-- Uzbek: uz ⇒ ru -->
+ <languageMatch desired="wo" supported="fr" distance="30" oneway="true"/> <!-- Wolof: wo ⇒ fr -->
+ <languageMatch desired="xh" supported="en" distance="30" oneway="true"/> <!-- Xhosa: xh ⇒ en -->
+ <languageMatch desired="yi" supported="en" distance="30" oneway="true"/> <!-- Yiddish: yi ⇒ en -->
+ <languageMatch desired="yo" supported="en" distance="30" oneway="true"/> <!-- Yoruba: yo ⇒ en -->
+ <languageMatch desired="zu" supported="en" distance="30" oneway="true"/> <!-- Zulu: zu ⇒ en -->
<!-- START generated by GenerateLanguageMatches.java: don't manually change -->
<!-- Encompassed by Arabic -->
@@ -546,7 +561,42 @@
<languageMatch desired="sr_Latn" supported="sr_Cyrl" distance="5"/> <!-- sr; Latn ⇒ sr; Cyrl -->
<languageMatch desired="zh_Hans" supported="zh_Hant" distance="15" oneway="true"/> <!-- zh; Hans ⇒ zh; Hant -->
<languageMatch desired="zh_Hant" supported="zh_Hans" distance="19" oneway="true"/> <!-- zh; Hant ⇒ zh; Hans -->
+ <!-- zh_Hani: Slightly bigger distance than zh_Hant->zh_Hans -->
+ <languageMatch desired="zh_Hani" supported="zh_Hans" distance="20" oneway="true"/>
+ <languageMatch desired="zh_Hani" supported="zh_Hant" distance="20" oneway="true"/>
+ <!-- Latin transliterations of some languages, initially from CLDR-13577 -->
+ <languageMatch desired="ar_Latn" supported="ar_Arab" distance="20" oneway="true"/>
+ <languageMatch desired="bn_Latn" supported="bn_Beng" distance="20" oneway="true"/>
+ <languageMatch desired="gu_Latn" supported="gu_Gujr" distance="20" oneway="true"/>
+ <languageMatch desired="hi_Latn" supported="hi_Deva" distance="20" oneway="true"/>
+ <languageMatch desired="kn_Latn" supported="kn_Knda" distance="20" oneway="true"/>
+ <languageMatch desired="ml_Latn" supported="ml_Mlym" distance="20" oneway="true"/>
+ <languageMatch desired="mr_Latn" supported="mr_Deva" distance="20" oneway="true"/>
+ <languageMatch desired="ta_Latn" supported="ta_Taml" distance="20" oneway="true"/>
+ <languageMatch desired="te_Latn" supported="te_Telu" distance="20" oneway="true"/>
+ <languageMatch desired="zh_Latn" supported="zh_Hans" distance="20" oneway="true"/> <!-- Pinyin -->
+ <!-- start fallbacks for group script codes, initially from CLDR-13526
+ Look for plus signs on https://www.unicode.org/iso15924/iso15924-codes.html -->
+ <languageMatch desired="ja_Latn" supported="ja_Jpan" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Hani" supported="ja_Jpan" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Hira" supported="ja_Jpan" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Kana" supported="ja_Jpan" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Hrkt" supported="ja_Jpan" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Hira" supported="ja_Hrkt" distance="5" oneway="true"/>
+ <languageMatch desired="ja_Kana" supported="ja_Hrkt" distance="5" oneway="true"/>
+ <languageMatch desired="ko_Hani" supported="ko_Kore" distance="5" oneway="true"/>
+ <languageMatch desired="ko_Hang" supported="ko_Kore" distance="5" oneway="true"/>
+ <languageMatch desired="ko_Jamo" supported="ko_Kore" distance="5" oneway="true"/>
+ <languageMatch desired="ko_Jamo" supported="ko_Hang" distance="5" oneway="true"/>
+ <!-- No special mappings for zh Bopo/Hanb
+ because Bopomofo is used only in TW, and unsure how widely.
+ No special mappings for styled scripts like Latf or Aran
+ because those would apply to many languages;
+ if desired, those would be better handled as matcher-specific script aliases. -->
+ <!-- end fallbacks for group script codes -->
+ <!-- default script mismatch distance -->
<languageMatch desired="*_*" supported="*_*" distance="50"/> <!-- *; * ⇒ *; * -->
+
<languageMatch desired="ar_*_$maghreb" supported="ar_*_$maghreb" distance="4"/> <!-- ar; *; $maghreb ⇒ ar; *; $maghreb -->
<languageMatch desired="ar_*_$!maghreb" supported="ar_*_$!maghreb" distance="4"/> <!-- ar; *; $!maghreb ⇒ ar; *; $!maghreb -->
<languageMatch desired="ar_*_*" supported="ar_*_*" distance="5"/> <!-- ar; *; * ⇒ ar; *; * -->
diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 97d6612..835f223 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -454,6 +454,8 @@
<!--{ Basa (Nigeria); ?; ? } => { Basa (Nigeria); Latin; Unknown Region }-->
<likelySubtag from="ca" to="ca_Latn_ES"/>
<!--{ Catalan; ?; ? } => { Catalan; Latin; Spain }-->
+ <likelySubtag from="cad" to="cad_Latn_US"/>
+ <!--{ Caddo; ?; ? } => { Caddo; Latin; United States }-->
<likelySubtag from="can" to="can_Latn_ZZ"/>
<!--{ Chambri; ?; ? } => { Chambri; Latin; Unknown Region }-->
<likelySubtag from="cbj" to="cbj_Latn_ZZ"/>
@@ -934,6 +936,8 @@
<!--{ Hoyahoya; ?; ? } => { Hoyahoya; Latin; Unknown Region }-->
<likelySubtag from="hi" to="hi_Deva_IN"/>
<!--{ Hindi; ?; ? } => { Hindi; Devanagari; India }-->
+ <likelySubtag from="hi_Latn" to="hi_Latn_IN"/>
+ <!--{ Hindi; Latin; ? } => { Hindi; Latin; India }-->
<likelySubtag from="hia" to="hia_Latn_ZZ"/>
<!--{ Lamang; ?; ? } => { Lamang; Latin; Unknown Region }-->
<likelySubtag from="hif" to="hif_Latn_FJ"/>
@@ -1288,6 +1292,8 @@
<!--{ Kurukh; ?; ? } => { Kurukh; Devanagari; India }-->
<likelySubtag from="ks" to="ks_Arab_IN"/>
<!--{ Kashmiri; ?; ? } => { Kashmiri; Arabic; India }-->
+ <likelySubtag from="ks_Deva" to="ks_Deva_IN"/>
+ <!--{ Kashmiri; Devanagari; ? } => { Kashmiri; Devanagari; India }-->
<likelySubtag from="ksb" to="ksb_Latn_TZ"/>
<!--{ Shambala; ?; ? } => { Shambala; Latin; Tanzania }-->
<likelySubtag from="ksd" to="ksd_Latn_ZZ"/>
@@ -1692,8 +1698,8 @@
<!--{ Malay; ?; ? } => { Malay; Latin; Malaysia }-->
<likelySubtag from="ms_CC" to="ms_Arab_CC"/>
<!--{ Malay; ?; Cocos (Keeling) Islands } => { Malay; Arabic; Cocos (Keeling) Islands }-->
- <likelySubtag from="ms_ID" to="ms_Arab_ID"/>
- <!--{ Malay; ?; Indonesia } => { Malay; Arabic; Indonesia }-->
+ <likelySubtag from="ms_ID" to="ms_Latn_ID"/>
+ <!--{ Malay; ?; Indonesia } => { Malay; Latin; Indonesia }-->
<likelySubtag from="mt" to="mt_Latn_MT"/>
<!--{ Maltese; ?; ? } => { Maltese; Latin; Malta }-->
<likelySubtag from="mtc" to="mtc_Latn_ZZ"/>
@@ -2112,8 +2118,8 @@
<!--{ Samburu; ?; ? } => { Samburu; Latin; Kenya }-->
<likelySubtag from="sas" to="sas_Latn_ID"/>
<!--{ Sasak; ?; ? } => { Sasak; Latin; Indonesia }-->
- <likelySubtag from="sat" to="sat_Latn_IN"/>
- <!--{ Santali; ?; ? } => { Santali; Latin; India }-->
+ <likelySubtag from="sat" to="sat_Olck_IN"/>
+ <!--{ Santali; ?; ? } => { Santali; Ol Chiki; India }-->
<likelySubtag from="sav" to="sav_Latn_SN"/>
<!--{ Saafi-Saafi; ?; ? } => { Saafi-Saafi; Latin; Senegal }-->
<likelySubtag from="saz" to="saz_Saur_IN"/>
diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml
index cbb9c02..9d73568 100644
--- a/common/supplemental/metaZones.xml
+++ b/common/supplemental/metaZones.xml
@@ -240,7 +240,8 @@
<usesMetazone to="2004-05-31 03:00" from="2000-03-03 03:00" mzone="Argentina"/>
<usesMetazone to="2004-07-25 04:00" from="2004-05-31 03:00" mzone="Argentina_Western"/>
<usesMetazone to="2008-01-21 02:00" from="2004-07-25 04:00" mzone="Argentina"/>
- <usesMetazone from="2008-01-21 02:00" mzone="Argentina_Western"/>
+ <usesMetazone to="2009-10-11 04:00" from="2008-01-21 02:00" mzone="Argentina_Western"/>
+ <usesMetazone from="2009-10-11 04:00" mzone="Argentina"/>
</timezone>
<timezone type="America/Argentina/Tucuman">
<usesMetazone to="1991-03-03 02:00" mzone="Argentina"/>
@@ -831,7 +832,7 @@
<timezone type="Asia/Aqtobe">
<usesMetazone to="1991-12-15 19:00" mzone="Aktyubinsk"/>
<usesMetazone to="2004-10-30 21:00" from="1991-12-15 19:00" mzone="Aqtobe"/>
- <usesMetazone from="2005-10-30 21:00" mzone="Kazakhstan_Western"/>
+ <usesMetazone from="2004-10-30 21:00" mzone="Kazakhstan_Western"/>
</timezone>
<timezone type="Asia/Ashgabat">
<usesMetazone to="1991-10-26 20:00" mzone="Ashkhabad"/>
@@ -878,7 +879,8 @@
</timezone>
<timezone type="Asia/Choibalsan">
<usesMetazone to="1983-03-31 16:00" mzone="Mongolia"/>
- <usesMetazone from="1983-03-31 16:00" mzone="Choibalsan"/>
+ <usesMetazone to="2008-03-30 15:00" from="1983-03-31 16:00" mzone="Choibalsan"/>
+ <usesMetazone from="2008-03-30 15:00" mzone="Mongolia"/>
</timezone>
<timezone type="Asia/Colombo">
<usesMetazone to="1996-05-24 18:30" mzone="India"/>
@@ -1732,6 +1734,7 @@
<mapZone other="Europe_Central" territory="RS" type="Europe/Belgrade"/>
<mapZone other="Europe_Central" territory="SE" type="Europe/Stockholm"/>
<mapZone other="Europe_Central" territory="SI" type="Europe/Ljubljana"/>
+ <mapZone other="Europe_Central" territory="SJ" type="Arctic/Longyearbyen"/>
<mapZone other="Europe_Central" territory="SK" type="Europe/Bratislava"/>
<mapZone other="Europe_Central" territory="SM" type="Europe/San_Marino"/>
<mapZone other="Europe_Central" territory="TN" type="Africa/Tunis"/>
diff --git a/common/supplemental/pluralRanges.xml b/common/supplemental/pluralRanges.xml
index 07332ab..ab3ea93 100644
--- a/common/supplemental/pluralRanges.xml
+++ b/common/supplemental/pluralRanges.xml
@@ -1,10 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.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 -->
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
+<!--
+ © 1991-2017 Unicode, Inc.
+ Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+ For terms of use, see http://www.unicode.org/copyright.html.
+ CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/).
+
+ GENERATED DATA — do not manually update!
+ Generated by tool: GeneratePluralRanges
+ -->
<supplementalData>
<version number="$Revision$" />
- <plurals> <!-- Format with GeneratePluralRanges.java -->
+ <plurals>
<!-- other -->
<pluralRanges locales="id ja km ko lo ms my th vi yue zh">
@@ -27,7 +34,7 @@
<pluralRange start="other" end="one" result="one"/>
<pluralRange start="other" end="other" result="other"/>
</pluralRanges>
- <pluralRanges locales="af an bg ca en es et eu fi ia io nb sv ur">
+ <pluralRanges locales="af an bg ca en es et eu fi ia io nb pcm sv ur">
<pluralRange start="one" end="other" result="other"/>
<pluralRange start="other" end="one" result="other"/>
<pluralRange start="other" end="other" result="other"/>
@@ -232,6 +239,5 @@
<pluralRange start="other" end="many" result="many"/>
<pluralRange start="other" end="other" result="other"/>
</pluralRanges>
-
</plurals>
</supplementalData>
diff --git a/common/supplemental/plurals.xml b/common/supplemental/plurals.xml
index 7e58130..606c874 100644
--- a/common/supplemental/plurals.xml
+++ b/common/supplemental/plurals.xml
@@ -18,7 +18,7 @@
<!-- 2: one,other -->
- <pluralRules locales="am as bn fa gu hi kn zu">
+ <pluralRules locales="am as bn fa gu hi kn pcm zu">
<pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal 0.0~1.0, 0.00~0.04</pluralRule>
<pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 1.1~2.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
@@ -87,7 +87,7 @@
<!-- 3: one,two,other -->
- <pluralRules locales="iu naq se sma smi smj smn sms">
+ <pluralRules locales="iu naq sat se sma smi smj smn sms">
<pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000</pluralRule>
<pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000</pluralRule>
<pluralRule count="other"> @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
diff --git a/common/supplemental/subdivisions.xml b/common/supplemental/subdivisions.xml
index dad6a53..729fa08 100644
--- a/common/supplemental/subdivisions.xml
+++ b/common/supplemental/subdivisions.xml
@@ -159,14 +159,10 @@
<subgroup type="frpac" contains="fr04 fr05 fr06 fr13 fr83 fr84"/>
<subgroup type="frpdl" contains="fr44 fr49 fr53 fr72 fr85"/>
<subgroup type="GA" contains="ga1 ga2 ga3 ga4 ga5 ga6 ga7 ga8 ga9"/>
- <subgroup type="GB" contains="gbeaw gbeng gbgbn gbnir gbsct gbukm gbwls"/>
- <subgroup type="gbeng" contains="gbbas gbbbd gbbdf gbbdg gbben gbbex gbbir gbbkm gbbmh gbbne gbbnh gbbns gbbol gbbpl gbbrc gbbrd gbbry gbbst gbbur gbcam gbcbf gbche gbchw gbcld gbcma gbcmd gbcon gbcov gbcry gbdal gbdby gbder gbdev gbdnc gbdor gbdud gbdur gbeal gbenf gbery gbess gbesx gbgat gbgls gbgre gbhal gbham gbhav gbhck gbhef gbhil gbhmf gbhns gbhpl gbhrt gbhrw gbhry gbios gbiow gbisl gbkec gbken gbkhl gbkir gbktt gbkwl gblan gblbh gblce gblds gblec gblew gblin gbliv gblnd gblut gbman gbmdb gbmdw gbmik gbmrt gbnbl gbnel gbnet gbnfk gbngm gbnln gbnsm gbnth gbntt gbnty gbnwm gbnyk gbold gboxf gbply gbpol gbpor gbpte gbrcc gbrch gbrdb gbrdg gbric gbrot gbrut gbsaw gbsfk gbsft gbsgc gbshf gbshn gbshr gbskp gbslf gbslg gbsnd gbsol gbsom gbsos gbsry gbste gbsth gbstn gbsts gbstt gbsty gbswd gbswk gbtam gbtfw gbthr gbtob gbtrf gbtwh gbwar gbwbk gbwft gbwgn gbwil gbwkf gbwll gbwlv gbwnd gbwnm gbwok gbwor gbwrl gbwrt gbwsm gbwsx gbyor"/>
- <subgroup type="gbnir" contains="gbabc gband gbann gbbfs gbccg gbdrs gbfmo gblbc gbmea gbmul gbnmd"/>
- <subgroup type="gbsct" contains="gbabd gbabe gbagb gbans gbclk gbdgy gbdnd gbeay gbedh gbedu gbeln gbels gberw gbfal gbfif gbglg gbhld gbivc gbmln gbmry gbnay gbnlk gbork gbpkn gbrfw gbsay gbscb gbslk gbstg gbwdu gbwln gbzet"/>
- <subgroup type="gbwls" contains="gbagy gbbge gbbgw gbcay gbcgn gbcmn gbcrf gbcwy gbden gbfln gbgwn gbmon gbmty gbntl gbnwp gbpem gbpow gbrct gbswa gbtof gbvgl gbwrx"/>
+ <subgroup type="GB" contains="gbabc gbabd gbabe gbagb gbagy gband gbann gbans gbbas gbbbd gbbdf gbbdg gbben gbbex gbbfs gbbge gbbgw gbbir gbbkm gbbmh gbbne gbbnh gbbns gbbol gbbpl gbbrc gbbrd gbbry gbbst gbbur gbcam gbcay gbcbf gbccg gbcgn gbche gbchw gbcld gbclk gbcma gbcmd gbcmn gbcon gbcov gbcrf gbcry gbcwy gbdal gbdby gbden gbder gbdev gbdgy gbdnc gbdnd gbdor gbdrs gbdud gbdur gbeal gbeay gbedh gbedu gbeln gbels gbenf gberw gbery gbess gbesx gbfal gbfif gbfln gbfmo gbgat gbglg gbgls gbgre gbgwn gbhal gbham gbhav gbhck gbhef gbhil gbhld gbhmf gbhns gbhpl gbhrt gbhrw gbhry gbios gbiow gbisl gbivc gbkec gbken gbkhl gbkir gbktt gbkwl gblan gblbc gblbh gblce gblds gblec gblew gblin gbliv gblnd gblut gbman gbmdb gbmdw gbmea gbmik gbmln gbmon gbmrt gbmry gbmty gbmul gbnay gbnbl gbnel gbnet gbnfk gbngm gbnlk gbnln gbnmd gbnsm gbnth gbntl gbntt gbnty gbnwm gbnwp gbnyk gbold gbork gboxf gbpem gbpkn gbply gbpol gbpor gbpow gbpte gbrcc gbrch gbrct gbrdb gbrdg gbrfw gbric gbrot gbrut gbsaw gbsay gbscb gbsfk gbsft gbsgc gbshf gbshn gbshr gbskp gbslf gbslg gbslk gbsnd gbsol gbsom gbsos gbsry gbste gbstg gbsth gbstn gbsts gbstt gbsty gbswa gbswd gbswk gbtam gbtfw gbthr gbtob gbtof gbtrf gbtwh gbvgl gbwar gbwbk gbwdu gbwft gbwgn gbwil gbwkf gbwll gbwln gbwlv gbwnd gbwnm gbwok gbwor gbwrl gbwrt gbwrx gbwsm gbwsx gbyor gbzet"/>
<subgroup type="GD" contains="gd01 gd02 gd03 gd04 gd05 gd06 gd10"/>
<subgroup type="GE" contains="geab geaj gegu geim geka gekk gemm gerl gesj gesk gesz getb"/>
- <subgroup type="GH" contains="ghaa ghah ghba ghcp ghep ghnp ghtv ghue ghuw ghwp"/>
+ <subgroup type="GH" contains="ghaa ghaf ghah ghbe ghbo ghcp ghep ghne ghnp ghot ghsv ghtv ghue ghuw ghwn ghwp"/>
<subgroup type="GL" contains="glav glku glqe glqt glsm"/>
<subgroup type="GM" contains="gmb gml gmm gmn gmu gmw"/>
<subgroup type="GN" contains="gnb gnc gnd gnf gnk gnl gnm gnn"/>
@@ -205,13 +201,12 @@
<subgroup type="iem" contains="iece ieco ieky ielk ieta iewd"/>
<subgroup type="ieu" contains="iecn iedl iemn"/>
<subgroup type="IL" contains="ild ilha iljm ilm ilta ilz"/>
- <subgroup type="IN" contains="inan inap inar inas inbr inch inct indd indl indn inga ingj inhp inhr injh injk inka inkl inld inmh inml inmn inmp inmz innl inor inpb inpy inrj insk intg intn intr inup inut inwb"/>
+ <subgroup type="IN" contains="inan inap inar inas inbr inch inct indd indl indn inga ingj inhp inhr injh injk inka inkl inla inld inmh inml inmn inmp inmz innl inor inpb inpy inrj insk intg intn intr inup inut inwb"/>
<subgroup type="IQ" contains="iqan iqar iqba iqbb iqbg iqda iqdi iqdq iqka iqki iqma iqmu iqna iqni iqqa iqsd iqsu iqwa"/>
<subgroup type="IR" contains="ir01 ir02 ir03 ir04 ir05 ir06 ir07 ir08 ir10 ir11 ir12 ir13 ir14 ir15 ir16 ir17 ir18 ir19 ir20 ir21 ir22 ir23 ir24 ir25 ir26 ir27 ir28 ir29 ir30 ir31 ir32"/>
<subgroup type="IS" contains="is1 is2 is3 is4 is5 is6 is7 is8"/>
<subgroup type="IT" contains="it21 it23 it25 it32 it34 it36 it42 it45 it52 it55 it57 it62 it65 it67 it72 it75 it77 it78 it82 it88"/>
<subgroup type="it21" contains="ital itat itbi itcn itno itto itvb itvc"/>
- <subgroup type="it23" contains="itao"/>
<subgroup type="it25" contains="itbg itbs itco itcr itlc itlo itmb itmi itmn itpv itso itva"/>
<subgroup type="it32" contains="itbz ittn"/>
<subgroup type="it34" contains="itbl itpd itro ittv itve itvi itvr"/>
@@ -249,15 +244,15 @@
<subgroup type="LC" contains="lc01 lc02 lc03 lc05 lc06 lc07 lc08 lc10 lc11 lc12"/>
<subgroup type="LI" contains="li01 li02 li03 li04 li05 li06 li07 li08 li09 li10 li11"/>
<subgroup type="LK" contains="lk1 lk2 lk3 lk4 lk5 lk6 lk7 lk8 lk9"/>
- <subgroup type="lk1" contains="lk52 lk71 lk81"/>
- <subgroup type="lk2" contains="lk11 lk31 lk51"/>
- <subgroup type="lk3" contains="lk12 lk33 lk41"/>
- <subgroup type="lk4" contains="lk13 lk21 lk42 lk61 lk92"/>
- <subgroup type="lk5" contains="lk22 lk32 lk43"/>
- <subgroup type="lk6" contains="lk45 lk82"/>
- <subgroup type="lk7" contains="lk23 lk72"/>
- <subgroup type="lk8" contains="lk62 lk91"/>
- <subgroup type="lk9" contains="lk44 lk53"/>
+ <subgroup type="lk1" contains="lk11 lk12 lk13"/>
+ <subgroup type="lk2" contains="lk21 lk22 lk23"/>
+ <subgroup type="lk3" contains="lk31 lk32 lk33"/>
+ <subgroup type="lk4" contains="lk41 lk42 lk43 lk44 lk45"/>
+ <subgroup type="lk5" contains="lk51 lk52 lk53"/>
+ <subgroup type="lk6" contains="lk61 lk62"/>
+ <subgroup type="lk7" contains="lk71 lk72"/>
+ <subgroup type="lk8" contains="lk81 lk82"/>
+ <subgroup type="lk9" contains="lk91 lk92"/>
<subgroup type="LR" contains="lrbg lrbm lrcm lrgb lrgg lrgk lrgp lrlo lrmg lrmo lrmy lrni lrrg lrri lrsi"/>
<subgroup type="LS" contains="lsa lsb lsc lsd lse lsf lsg lsh lsj lsk"/>
<subgroup type="LT" contains="lt01 lt02 lt03 lt04 lt05 lt06 lt07 lt08 lt09 lt10 lt11 lt12 lt13 lt14 lt15 lt16 lt17 lt18 lt19 lt20 lt21 lt22 lt23 lt24 lt25 lt26 lt27 lt28 lt29 lt30 lt31 lt32 lt33 lt34 lt35 lt36 lt37 lt38 lt39 lt40 lt41 lt42 lt43 lt44 lt45 lt46 lt47 lt48 lt49 lt50 lt51 lt52 lt53 lt54 lt55 lt56 lt57 lt58 lt59 lt60 ltal ltkl ltku ltmr ltpn ltsa ltta ltte ltut ltvl"/>
@@ -279,12 +274,12 @@
<subgroup type="ma12" contains="maaou maoud"/>
<subgroup type="MC" contains="mccl mcco mcfo mcga mcje mcla mcma mcmc mcmg mcmo mcmu mcph mcsd mcso mcsp mcsr mcvr"/>
<subgroup type="MD" contains="mdan mdba mdbd mdbr mdbs mdca mdcl mdcm mdcr mdcs mdct mdcu mddo mddr mddu mded mdfa mdfl mdga mdgl mdhi mdia mdle mdni mdoc mdor mdre mdri mdsd mdsi mdsn mdso mdst mdsv mdta mdte mdun"/>
- <subgroup type="ME" contains="me01 me02 me03 me04 me05 me06 me07 me08 me09 me10 me11 me12 me13 me14 me15 me16 me17 me18 me19 me20 me21 me22 me23"/>
+ <subgroup type="ME" contains="me01 me02 me03 me04 me05 me06 me07 me08 me09 me10 me11 me12 me13 me14 me15 me16 me17 me18 me19 me20 me21 me22 me23 me24"/>
<subgroup type="MG" contains="mga mgd mgf mgm mgt mgu"/>
<subgroup type="MH" contains="mhl mht"/>
<subgroup type="mhl" contains="mhall mhebo mheni mhjab mhjal mhkil mhkwa mhlae mhlib mhnmk mhnmu mhron mhuja mhwth"/>
<subgroup type="mht" contains="mhalk mharn mhaur mhlik mhmaj mhmal mhmej mhmil mhuti mhwtj"/>
- <subgroup type="MK" contains="mk02 mk03 mk04 mk05 mk06 mk07 mk08 mk10 mk11 mk12 mk13 mk14 mk16 mk18 mk19 mk20 mk21 mk22 mk23 mk24 mk25 mk26 mk27 mk30 mk32 mk33 mk34 mk35 mk36 mk37 mk40 mk41 mk42 mk43 mk44 mk45 mk46 mk47 mk48 mk49 mk50 mk51 mk52 mk53 mk54 mk55 mk56 mk58 mk59 mk60 mk61 mk62 mk63 mk64 mk65 mk66 mk67 mk69 mk70 mk71 mk72 mk73 mk74 mk75 mk76 mk78 mk80 mk81 mk82 mk83 mk85"/>
+ <subgroup type="MK" contains="mk101 mk102 mk103 mk104 mk105 mk106 mk107 mk108 mk109 mk201 mk202 mk203 mk204 mk205 mk206 mk207 mk208 mk209 mk210 mk211 mk301 mk303 mk304 mk307 mk308 mk310 mk311 mk312 mk313 mk401 mk402 mk403 mk404 mk405 mk406 mk407 mk408 mk409 mk410 mk501 mk502 mk503 mk504 mk505 mk506 mk507 mk508 mk509 mk601 mk602 mk603 mk604 mk605 mk606 mk607 mk608 mk609 mk701 mk702 mk703 mk704 mk705 mk706 mk801 mk802 mk803 mk804 mk805 mk806 mk807 mk808 mk809 mk810 mk811 mk812 mk813 mk814 mk815 mk816 mk817"/>
<subgroup type="ML" contains="ml1 ml2 ml3 ml4 ml5 ml6 ml7 ml8 ml9 ml10 mlbko"/>
<subgroup type="MM" contains="mm01 mm02 mm03 mm04 mm05 mm06 mm07 mm11 mm12 mm13 mm14 mm15 mm16 mm17 mm18"/>
<subgroup type="MN" contains="mn1 mn035 mn037 mn039 mn041 mn043 mn046 mn047 mn049 mn051 mn053 mn055 mn057 mn059 mn061 mn063 mn064 mn065 mn067 mn069 mn071 mn073"/>
@@ -334,7 +329,7 @@
<subgroup type="ph15" contains="phabr phapa phben phifu phkal phmou"/>
<subgroup type="ph40" contains="phbtg phcav phlag phque phriz"/>
<subgroup type="ph41" contains="phmad phmdc phmdr phplw phrom"/>
- <subgroup type="PK" contains="pkba pkgb pkis pkjk pkkp pkpb pksd pkta"/>
+ <subgroup type="PK" contains="pkba pkgb pkis pkjk pkkp pkpb pksd"/>
<subgroup type="PL" contains="pl02 pl04 pl06 pl08 pl10 pl12 pl14 pl16 pl18 pl20 pl22 pl24 pl26 pl28 pl30 pl32"/>
<subgroup type="PS" contains="psbth psdeb psgza pshbn psjem psjen psjrh pskys psnbs psngz psqqa psrbh psrfh psslt pstbs pstkm"/>
<subgroup type="PT" contains="pt01 pt02 pt03 pt04 pt05 pt06 pt07 pt08 pt09 pt10 pt11 pt12 pt13 pt14 pt15 pt16 pt17 pt18 pt20 pt30"/>
@@ -396,7 +391,7 @@
<subgroup type="WF" contains="wfal wfsg wfuv"/>
<subgroup type="WS" contains="wsaa wsal wsat wsfa wsge wsgi wspa wssa wstu wsvf wsvs"/>
<subgroup type="YE" contains="yeab yead yeam yeba yeda yedh yehd yehj yehu yeib yeja yela yema yemr yemw yera yesa yesd yesh yesn yesu yeta"/>
- <subgroup type="ZA" contains="zaec zafs zagt zalp zamp zanc zanl zanw zawc"/>
+ <subgroup type="ZA" contains="zaec zafs zagp zakzn zalp zamp zanc zanw zawc"/>
<subgroup type="ZM" contains="zm01 zm02 zm03 zm04 zm05 zm06 zm07 zm08 zm09 zm10"/>
<subgroup type="ZW" contains="zwbu zwha zwma zwmc zwme zwmi zwmn zwms zwmv zwmw"/>
</subdivisionContainment>
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index fa80a38..dcefa0d 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -1263,7 +1263,7 @@
<group type="034" contains="AF BD BT IN IR LK MV NP PK"/> <!--Southern Asia -->
<group type="009" contains="053 054 057 061 QO"/> <!--Oceania -->
<group type="QO" contains="AQ AC CP DG TA"/> <!--Outlying Oceania -->
- <group type="EU" contains="AT BE CY CZ DE DK EE ES FI FR GB GR HR HU IE IT LT LU LV MT NL PL PT SE SI SK BG RO" grouping="true"/> <!-- European Union, see http://europa.eu/abc/european_countries/index_en.htm -->
+ <group type="EU" contains="AT BE CY CZ DE DK EE ES FI FR GR HR HU IE IT LT LU LV MT NL PL PT SE SI SK BG RO" grouping="true"/> <!-- European Union, see http://europa.eu/abc/european_countries/index_en.htm -->
<group type="EZ" contains="AT BE CY DE EE ES FI FR GR IE IT LT LU LV MT NL PT SI SK" grouping="true"/> <!-- Eurozone, see https://en.wikipedia.org/wiki/Eurozone -->
<group type="UN" contains="AD AE AF AG AL AM AO AR AT AU AZ BA BB BD BE BF BG BH BI BJ BN BO BR BS BT BW BY BZ CA CD CF CG CH CI CL CM CN CO CR CU CV CY CZ DE DJ DK DM DO DZ EC EE EG ER ES ET FI FJ FM FR GA GB GD GE GH GM GN GQ GR GT GW GY HN HR HT HU ID IE IL IN IQ IR IS IT JM JO JP KE KG KH KI KM KN KP KR KW KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MG MH MK ML MM MN MR MT MU MV MX MW MY MZ NA NE NG NI NL NO NR NP NZ OM PA PE PG PH PK PL PT PW PY QA RO RS RU RW SA SB SC SD SE SG SI SK SL SM SN SO SR SS ST SV SY SZ TD TG TH TJ TL TM TN TO TR TT TV TZ UA UG US UY UZ VC VE VN VU WS YE ZA ZM ZW" grouping="true"/> <!-- United Nations, see https://en.wikipedia.org/wiki/Member_states_of_the_United_Nations -->
</territoryContainment>
@@ -1637,7 +1637,7 @@
<language type="haz" territories="AF" alt="secondary"/>
<language type="he" scripts="Hebr" territories="IL"/>
<language type="hi" scripts="Deva" territories="IN"/>
- <language type="hi" scripts="Mahj" territories="FJ ZA" alt="secondary"/>
+ <language type="hi" scripts="Latn Mahj" territories="FJ ZA" alt="secondary"/>
<language type="hif" scripts="Deva Latn" territories="FJ"/>
<language type="hil" scripts="Latn"/>
<language type="hil" territories="PH" alt="secondary"/>
@@ -2098,8 +2098,8 @@
<language type="saq" scripts="Latn"/>
<language type="sas" scripts="Latn"/>
<language type="sas" territories="ID" alt="secondary"/>
- <language type="sat" scripts="Latn"/>
- <language type="sat" scripts="Beng Deva Olck Orya" territories="IN" alt="secondary"/>
+ <language type="sat" scripts="Olck"/>
+ <language type="sat" scripts="Beng Deva Latn Orya" territories="IN" alt="secondary"/>
<language type="sav" territories="SN" alt="secondary"/>
<language type="saz" scripts="Saur"/>
<language type="sbp" scripts="Latn"/>
@@ -3091,13 +3091,14 @@
<languagePopulation type="jv" literacyPercent="10" populationPercent="34" references="R1294"/> <!--Javanese-->
<languagePopulation type="su" populationPercent="12" references="R1269"/> <!--Sundanese-->
<languagePopulation type="mad" literacyPercent="40" populationPercent="6.3"/> <!--Madurese-->
- <languagePopulation type="ms_Arab" populationPercent="4.6"/> <!--Malay (Arabic)-->
+ <languagePopulation type="ms" populationPercent="3.4"/> <!--Malay-->
<languagePopulation type="min" literacyPercent="10" populationPercent="3"/> <!--Minangkabau-->
<languagePopulation type="bew" populationPercent="2.1"/> <!--Betawi-->
<languagePopulation type="ban" literacyPercent="10" populationPercent="1.8" references="R1144"/> <!--Balinese-->
<languagePopulation type="bug" literacyPercent="10" populationPercent="1.6" references="R1145"/> <!--Buginese-->
<languagePopulation type="bjn" literacyPercent="10" populationPercent="1.5"/> <!--Banjar-->
<languagePopulation type="ace" populationPercent="1.4"/> <!--Achinese-->
+ <languagePopulation type="ms_Arab" populationPercent="1.2"/> <!--Malay (Arabic)-->
<languagePopulation type="sas" populationPercent="0.97"/> <!--Sasak-->
<languagePopulation type="bbc" populationPercent="0.92"/> <!--Batak Toba-->
<languagePopulation type="zh_Hant" populationPercent="0.92"/> <!--Chinese (Traditional)-->
@@ -4191,6 +4192,7 @@
<languagePopulation type="ik" writingPercent="5" populationPercent="0.0024" references="R1017"/> <!--Inupiaq-->
<languagePopulation type="mus" populationPercent="0.0012"/> <!--Muscogee-->
<languagePopulation type="cic" populationPercent="0"/> <!--Chickasaw-->
+ <languagePopulation type="cad" populationPercent="0"/> <!--Caddo-->
<languagePopulation type="osa" populationPercent="0" references="R1326"/> <!--Osage-->
</territory>
<territory type="UY" gdp="78160000000" literacyPercent="98.1" population="3369300"> <!--Uruguay-->
@@ -4784,7 +4786,8 @@
<hours preferred="h" allowed="hB hb h H" regions="CN HK MO TW ET gu_IN mr_IN pa_IN"/>
</timeData>
- <measurementData>
+ <measurementData>
+ <!-- measurementSystem will be deprecated in next release; replaced by enhanced preferences -->
<measurementSystem type="metric" territories="001"/>
<measurementSystem type="US" territories="LR MM US"/>
<measurementSystem type="metric" category="temperature" territories="LR MM"/>
@@ -4794,130 +4797,7 @@
<paperSize type="US-Letter" territories="BZ CA CL CO CR GT MX NI PA PH PR SV US VE"/>
</measurementData>
- <unitPreferenceData>
- <unitPreferences category="area" usage="land-agricult">
- <unitPreference regions="001">hectare</unitPreference>
- <unitPreference regions="GB US">acre</unitPreference>
- </unitPreferences>
- <unitPreferences category="area" usage="land-commercl">
- <unitPreference regions="001">hectare</unitPreference>
- <unitPreference regions="GB US">acre</unitPreference>
- </unitPreferences>
- <unitPreferences category="area" usage="land-residntl">
- <unitPreference regions="001">hectare</unitPreference>
- <unitPreference regions="GB US">acre</unitPreference>
- </unitPreferences>
- <unitPreferences category="concentr" usage="blood-glucose">
- <!-- About 60% of regions use mg/dL, the rest mmol/L, some show both; does not follow metric vs imperial -->
- <unitPreference regions="001">milligram-per-deciliter</unitPreference>
- <unitPreference regions="AG AI AO AU BA BG BH BM BN BW BY CA CH CM CN CZ DK DM EE FI FJ GB GD HK HR HU IE IM IS KE KN KW KZ LC LI LT LU LV ME MG MK MO MS MT MU MY MZ NA NL NO NZ OM PG RS RU SE SG SI SK TC TO UA UG VC VG VN VU ZA">millimole-per-liter</unitPreference>
- </unitPreferences>
- <unitPreferences category="consumption" usage="vehicle-fuel">
- <unitPreference regions="001">liter-per-100kilometers</unitPreference>
- <unitPreference regions="BR IT JP KR MX MY TH TR">liter-per-kilometer</unitPreference>
- <unitPreference regions="CA GB" alt="informal">mile-per-gallon-imperial</unitPreference>
- <unitPreference regions="NL" alt="informal">liter-per-kilometer</unitPreference>
- <!--<unitPreference regions="NO SE" alt="informal">liter-per-mile-scandinavian</unitPreference>-->
- <unitPreference regions="US">mile-per-gallon</unitPreference>
- </unitPreferences>
- <unitPreferences category="duration" usage="music-track">
- <unitPreference regions="001">minute second</unitPreference>
- </unitPreferences>
- <unitPreferences category="duration" usage="person-age">
- <unitPreference regions="001">year-person month-person</unitPreference>
- </unitPreferences>
- <unitPreferences category="duration" usage="tv-program">
- <unitPreference regions="001">minute second</unitPreference>
- </unitPreferences>
- <unitPreferences category="energy" usage="food">
- <unitPreference regions="001">foodcalorie</unitPreference>
- </unitPreferences>
- <unitPreferences category="energy" usage="person-usage">
- <unitPreference regions="001">kilocalorie</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="person">
- <unitPreference regions="001">centimeter</unitPreference>
- <unitPreference regions="BR CN DE DK MX NL NO PL PT RU" alt="informal">meter centimeter</unitPreference>
- <unitPreference regions="AT BE DZ EG ES FR HK ID IL IT JO MY SA SE TR VN">meter centimeter</unitPreference>
- <unitPreference regions="CA GB IN US" alt="informal">foot inch</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="person" scope="small">
- <unitPreference regions="001">centimeter</unitPreference>
- <unitPreference regions="CA GB IN" alt="informal">inch</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="rainfall">
- <unitPreference regions="001">millimeter</unitPreference>
- <unitPreference regions="BR">centimeter</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="road">
- <unitPreference regions="001">kilometer</unitPreference>
- <unitPreference regions="GB US">mile</unitPreference>
- <unitPreference regions="SE" alt="informal">mile-scandinavian</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="road" scope="small">
- <unitPreference regions="001">meter</unitPreference>
- <unitPreference regions="GB">yard</unitPreference>
- <unitPreference regions="US">foot</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="snowfall">
- <unitPreference regions="001">centimeter</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="vehicle">
- <unitPreference regions="001">meter</unitPreference>
- <unitPreference regions="GB US">foot inch</unitPreference>
- <unitPreference regions="MX">meter centimeter</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="visiblty">
- <unitPreference regions="001">kilometer</unitPreference>
- <unitPreference regions="DE NL">meter</unitPreference>
- <unitPreference regions="GB US">mile</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="visiblty" scope="small">
- <unitPreference regions="001">meter</unitPreference>
- <unitPreference regions="GB US">foot</unitPreference>
- </unitPreferences>
- <unitPreferences category="mass" usage="person">
- <unitPreference regions="001">kilogram</unitPreference>
- <unitPreference regions="GB">stone pound</unitPreference>
- <unitPreference regions="US">pound</unitPreference>
- </unitPreferences>
- <unitPreferences category="mass" usage="person" scope="small">
- <unitPreference regions="001">gram</unitPreference>
- <unitPreference regions="DZ EG ES JO SA">kilogram gram</unitPreference>
- <unitPreference regions="GB HK US">pound ounce</unitPreference>
- </unitPreferences>
- <unitPreferences category="pressure" usage="baromtrc">
- <unitPreference regions="001">hectopascal</unitPreference>
- <unitPreference regions="BR EG GB IL TH">millibar</unitPreference>
- <unitPreference regions="MX RU">millimeter-of-mercury</unitPreference>
- <unitPreference regions="IN US">inch-hg</unitPreference>
- </unitPreferences>
- <unitPreferences category="speed" usage="road-travel">
- <unitPreference regions="001">kilometer-per-hour</unitPreference>
- <unitPreference regions="GB US">mile-per-hour</unitPreference>
- </unitPreferences>
- <unitPreferences category="speed" usage="wind">
- <unitPreference regions="001">kilometer-per-hour</unitPreference>
- <unitPreference regions="FI KR NO PL RU SE">meter-per-second</unitPreference>
- <unitPreference regions="US">mile-per-hour</unitPreference>
- </unitPreferences>
- <unitPreferences category="temperature" usage="person">
- <unitPreference regions="001">celsius</unitPreference>
- <unitPreference regions="US">fahrenheit</unitPreference>
- </unitPreferences>
- <unitPreferences category="temperature" usage="weather">
- <unitPreference regions="001">celsius</unitPreference>
- <unitPreference regions="BS BZ KY PR PW US">fahrenheit</unitPreference>
- </unitPreferences>
- <unitPreferences category="volume" usage="vehicle-fuel">
- <unitPreference regions="001">liter</unitPreference>
- <unitPreference regions="US">gallon</unitPreference>
- </unitPreferences>
- </unitPreferenceData>
+ <!-- <unitPreferenceData> moved to units.txt -->
<!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
<codeMappings>
@@ -5417,7 +5297,7 @@
</codeMappings>
<parentLocales>
- <parentLocale parent="root" locales="az_Arab az_Cyrl blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kk_Arab ku_Arab ky_Arab ky_Latn ml_Arab mn_Mong ms_Arab pa_Arab sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
+ <parentLocale parent="root" locales="az_Arab az_Cyrl blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab hi_Latn iu_Latn kk_Arab ks_Deva ku_Arab ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CA en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PH en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
<parentLocale parent="es_419" locales="es_AR es_BO es_BR es_BZ es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
diff --git a/common/supplemental/supplementalMetadata.xml b/common/supplemental/supplementalMetadata.xml
index 5950926..0aa69fb 100644
--- a/common/supplemental/supplementalMetadata.xml
+++ b/common/supplemental/supplementalMetadata.xml
@@ -1134,14 +1134,6 @@
<subdivisionAlias type="uspr" replacement="PR" reason="overlong"/> <!-- Puerto Rico => Puerto Rico -->
<subdivisionAlias type="usum" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands => U.S. Outlying Islands -->
<subdivisionAlias type="usvi" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands => U.S. Virgin Islands -->
- <subdivisionAlias type="escn" replacement="IC" reason="overlong"/> <!-- Canary Islands -->
-
- <subdivisionAlias type="cn71" replacement="TW" reason="overlong"/> <!-- Taiwan => Taiwan -->
- <subdivisionAlias type="cn91" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China => Hong Kong SAR China -->
- <subdivisionAlias type="cn92" replacement="MO" reason="overlong"/> <!-- Macao SAR China => Macao SAR China -->
-
- <subdivisionAlias type="no23" replacement="no50" reason="deprecated"/> <!-- Trøndelag => ?? -->
-
<!-- <subdivisionAlias type="albr" replacement="al?" reason="deprecated"/> <!- - Berat => ?? -->
<!-- <subdivisionAlias type="albu" replacement="al?" reason="deprecated"/> <!- - Bulqizë => ?? -->
<!-- <subdivisionAlias type="aldi" replacement="al?" reason="deprecated"/> <!- - Dibër => ?? -->
@@ -1243,6 +1235,9 @@
<subdivisionAlias type="cn63" replacement="cnqh" reason="deprecated"/> <!-- ??? => Qinghai -->
<subdivisionAlias type="cn64" replacement="cnnx" reason="deprecated"/> <!-- ??? => Ningxia -->
<subdivisionAlias type="cn65" replacement="cnxj" reason="deprecated"/> <!-- ??? => Xinjiang -->
+ <subdivisionAlias type="cn71" replacement="TW" reason="overlong"/> <!-- Taiwan => Taiwan -->
+ <subdivisionAlias type="cn91" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China => Hong Kong SAR China -->
+ <subdivisionAlias type="cn92" replacement="MO" reason="overlong"/> <!-- Macao SAR China => Macao SAR China -->
<subdivisionAlias type="cz10a" replacement="cz110" reason="deprecated"/> <!-- ??? => Prague 10 -->
<subdivisionAlias type="cz10b" replacement="cz111" reason="deprecated"/> <!-- ??? => Prague 11 -->
<subdivisionAlias type="cz10c" replacement="cz112" reason="deprecated"/> <!-- ??? => Prague 12 -->
@@ -1333,17 +1328,25 @@
<!-- <subdivisionAlias type="gbdgn" replacement="gb?" reason="deprecated"/> <!- - Dungannon and South Tyrone => ?? -->
<!-- <subdivisionAlias type="gbdow" replacement="gb?" reason="deprecated"/> <!- - Down => ?? -->
<!-- <subdivisionAlias type="gbdry" replacement="gb?" reason="deprecated"/> <!- - Derry => ?? -->
+ <!-- <subdivisionAlias type="gbeaw" replacement="gb?" reason="deprecated"/> <!- - England and Wales => ?? -->
+ <!-- <subdivisionAlias type="gbeng" replacement="gb?" reason="deprecated"/> <!- - England => ?? -->
<!-- <subdivisionAlias type="gbfer" replacement="gb?" reason="deprecated"/> <!- - Fermanagh => ?? -->
+ <!-- <subdivisionAlias type="gbgbn" replacement="gb?" reason="deprecated"/> <!- - Great Britain => ?? -->
<!-- <subdivisionAlias type="gblmv" replacement="gb?" reason="deprecated"/> <!- - Limavady => ?? -->
<!-- <subdivisionAlias type="gblrn" replacement="gb?" reason="deprecated"/> <!- - Larne => ?? -->
<!-- <subdivisionAlias type="gblsb" replacement="gb?" reason="deprecated"/> <!- - Lisburn => ?? -->
<!-- <subdivisionAlias type="gbmft" replacement="gb?" reason="deprecated"/> <!- - Magherafelt => ?? -->
<!-- <subdivisionAlias type="gbmyl" replacement="gb?" reason="deprecated"/> <!- - Moyle => ?? -->
<!-- <subdivisionAlias type="gbndn" replacement="gb?" reason="deprecated"/> <!- - North Down => ?? -->
+ <!-- <subdivisionAlias type="gbnir" replacement="gb?" reason="deprecated"/> <!- - Northern Ireland => ?? -->
<!-- <subdivisionAlias type="gbnta" replacement="gb?" reason="deprecated"/> <!- - Newtownabbey => ?? -->
<!-- <subdivisionAlias type="gbnym" replacement="gb?" reason="deprecated"/> <!- - Newry and Mourne => ?? -->
<!-- <subdivisionAlias type="gbomh" replacement="gb?" reason="deprecated"/> <!- - Omagh => ?? -->
+ <!-- <subdivisionAlias type="gbsct" replacement="gb?" reason="deprecated"/> <!- - Scotland => ?? -->
<!-- <subdivisionAlias type="gbstb" replacement="gb?" reason="deprecated"/> <!- - Strabane => ?? -->
+ <!-- <subdivisionAlias type="gbukm" replacement="gb?" reason="deprecated"/> <!- - United Kingdom => ?? -->
+ <!-- <subdivisionAlias type="gbwls" replacement="gb?" reason="deprecated"/> <!- - Wales => ?? -->
+ <!-- <subdivisionAlias type="ghba" replacement="gh?" reason="deprecated"/> <!- - Brong-Ahafo => ?? -->
<!-- <subdivisionAlias type="glqa" replacement="gl?" reason="deprecated"/> <!- - Qaasuitsup => ?? -->
<!-- <subdivisionAlias type="gr01" replacement="gr?" reason="deprecated"/> <!- - Aetolia-Acarnania => ?? -->
<!-- <subdivisionAlias type="gr03" replacement="gr?" reason="deprecated"/> <!- - Boeotia => ?? -->
@@ -1397,10 +1400,19 @@
<!-- <subdivisionAlias type="gr94" replacement="gr?" reason="deprecated"/> <!- - Chania => ?? -->
<!-- <subdivisionAlias type="gra1" replacement="gr?" reason="deprecated"/> <!- - Attica Department => ?? -->
<!-- <subdivisionAlias type="is0" replacement="is?" reason="deprecated"/> <!- - Reykjavík => ?? -->
+ <!-- <subdivisionAlias type="itao" replacement="it?" reason="deprecated"/> <!- - Aosta => ?? -->
+ <!-- <subdivisionAlias type="itci" replacement="it?" reason="deprecated"/> <!- - Carbonia-Iglesias => ?? -->
+ <!-- <subdivisionAlias type="itgo" replacement="it?" reason="deprecated"/> <!- - Gorizia => ?? -->
+ <!-- <subdivisionAlias type="itog" replacement="it?" reason="deprecated"/> <!- - Ogliastra => ?? -->
+ <!-- <subdivisionAlias type="itot" replacement="it?" reason="deprecated"/> <!- - Olbia-Tempio => ?? -->
+ <!-- <subdivisionAlias type="itpn" replacement="it?" reason="deprecated"/> <!- - Pordenone => ?? -->
+ <!-- <subdivisionAlias type="itts" replacement="it?" reason="deprecated"/> <!- - Trieste => ?? -->
+ <!-- <subdivisionAlias type="itud" replacement="it?" reason="deprecated"/> <!- - Udine => ?? -->
+ <!-- <subdivisionAlias type="itvs" replacement="it?" reason="deprecated"/> <!- - Medio Campidano => ?? -->
<subdivisionAlias type="laxn" replacement="laxs" reason="deprecated"/> <!-- ??? => Xaisomboun -->
- <subdivisionAlias type="lud" replacement="lucl ludi lurd luvd luwi" reason="deprecated"/> <!-- ??? => ??? -->
- <subdivisionAlias type="lug" replacement="luec lugr lurm" reason="deprecated"/> <!-- ??? => ??? -->
- <subdivisionAlias type="lul" replacement="luca lues lulu lume" reason="deprecated"/> <!-- ??? => ??? -->
+ <subdivisionAlias type="lud" replacement="lucl ludi lurd luvd luwi" reason="deprecated"/> <!-- ??? => Clervaux, Diekirch, Redange, Vianden, Wiltz -->
+ <subdivisionAlias type="lug" replacement="luec lugr lurm" reason="deprecated"/> <!-- ??? => Echternach, Grevenmacher, Remich -->
+ <subdivisionAlias type="lul" replacement="luca lues lulu lume" reason="deprecated"/> <!-- ??? => Capellen, Esch-sur-Alzette, Luxembourg, Mersch -->
<!-- <subdivisionAlias type="ma13" replacement="ma?" reason="deprecated"/> <!- - Souss-Massa-Drâa => ?? -->
<!-- <subdivisionAlias type="ma14" replacement="ma?" reason="deprecated"/> <!- - Guelmim-Es Semara => ?? -->
<!-- <subdivisionAlias type="ma15" replacement="ma?" reason="deprecated"/> <!- - Laâyoune-Boujdour-Sakia El Hamra => ?? -->
@@ -1409,20 +1421,91 @@
<!-- <subdivisionAlias type="mammn" replacement="ma?" reason="deprecated"/> <!- - Marrakech-Menara => ?? -->
<!-- <subdivisionAlias type="masyb" replacement="ma?" reason="deprecated"/> <!- - Sidi Youssef Ben Ali => ?? -->
<!-- <subdivisionAlias type="mk01" replacement="mk?" reason="deprecated"/> <!- - Aerodrom => ?? -->
+ <!-- <subdivisionAlias type="mk02" replacement="mk?" reason="deprecated"/> <!- - Aračinovo => ?? -->
+ <!-- <subdivisionAlias type="mk03" replacement="mk?" reason="deprecated"/> <!- - Berovo => ?? -->
+ <!-- <subdivisionAlias type="mk04" replacement="mk?" reason="deprecated"/> <!- - Bitola => ?? -->
+ <!-- <subdivisionAlias type="mk05" replacement="mk?" reason="deprecated"/> <!- - Bogdanci => ?? -->
+ <!-- <subdivisionAlias type="mk06" replacement="mk?" reason="deprecated"/> <!- - Bogovinje => ?? -->
+ <!-- <subdivisionAlias type="mk07" replacement="mk?" reason="deprecated"/> <!- - Bosilovo => ?? -->
+ <!-- <subdivisionAlias type="mk08" replacement="mk?" reason="deprecated"/> <!- - Brvenica => ?? -->
<!-- <subdivisionAlias type="mk09" replacement="mk?" reason="deprecated"/> <!- - Butel => ?? -->
+ <!-- <subdivisionAlias type="mk10" replacement="mk?" reason="deprecated"/> <!- - Valandovo => ?? -->
+ <!-- <subdivisionAlias type="mk11" replacement="mk?" reason="deprecated"/> <!- - Vasilevo => ?? -->
+ <!-- <subdivisionAlias type="mk12" replacement="mk?" reason="deprecated"/> <!- - Vevčani => ?? -->
+ <!-- <subdivisionAlias type="mk13" replacement="mk?" reason="deprecated"/> <!- - Veles => ?? -->
+ <!-- <subdivisionAlias type="mk14" replacement="mk?" reason="deprecated"/> <!- - Vinica => ?? -->
<!-- <subdivisionAlias type="mk15" replacement="mk?" reason="deprecated"/> <!- - Vraneštica => ?? -->
+ <!-- <subdivisionAlias type="mk16" replacement="mk?" reason="deprecated"/> <!- - Vrapčište => ?? -->
<!-- <subdivisionAlias type="mk17" replacement="mk?" reason="deprecated"/> <!- - Gazi Baba => ?? -->
+ <!-- <subdivisionAlias type="mk18" replacement="mk?" reason="deprecated"/> <!- - Gevgelija => ?? -->
+ <!-- <subdivisionAlias type="mk19" replacement="mk?" reason="deprecated"/> <!- - Gostivar => ?? -->
+ <!-- <subdivisionAlias type="mk20" replacement="mk?" reason="deprecated"/> <!- - Gradsko => ?? -->
+ <!-- <subdivisionAlias type="mk21" replacement="mk?" reason="deprecated"/> <!- - Debar => ?? -->
+ <!-- <subdivisionAlias type="mk22" replacement="mk?" reason="deprecated"/> <!- - Debarca => ?? -->
+ <!-- <subdivisionAlias type="mk23" replacement="mk?" reason="deprecated"/> <!- - Delčevo => ?? -->
+ <!-- <subdivisionAlias type="mk24" replacement="mk?" reason="deprecated"/> <!- - Demir Kapija => ?? -->
+ <!-- <subdivisionAlias type="mk25" replacement="mk?" reason="deprecated"/> <!- - Demir Hisar => ?? -->
+ <!-- <subdivisionAlias type="mk26" replacement="mk?" reason="deprecated"/> <!- - Dojran => ?? -->
+ <!-- <subdivisionAlias type="mk27" replacement="mk?" reason="deprecated"/> <!- - Dolneni => ?? -->
<!-- <subdivisionAlias type="mk28" replacement="mk?" reason="deprecated"/> <!- - Drugovo => ?? -->
<!-- <subdivisionAlias type="mk29" replacement="mk?" reason="deprecated"/> <!- - Gjorče Petrov => ?? -->
+ <!-- <subdivisionAlias type="mk30" replacement="mk?" reason="deprecated"/> <!- - Želino => ?? -->
<!-- <subdivisionAlias type="mk31" replacement="mk?" reason="deprecated"/> <!- - Zajas => ?? -->
+ <!-- <subdivisionAlias type="mk32" replacement="mk?" reason="deprecated"/> <!- - Zelenikovo => ?? -->
+ <!-- <subdivisionAlias type="mk33" replacement="mk?" reason="deprecated"/> <!- - Zrnovci => ?? -->
+ <!-- <subdivisionAlias type="mk34" replacement="mk?" reason="deprecated"/> <!- - Ilinden => ?? -->
+ <!-- <subdivisionAlias type="mk35" replacement="mk?" reason="deprecated"/> <!- - Jegunovce => ?? -->
+ <!-- <subdivisionAlias type="mk36" replacement="mk?" reason="deprecated"/> <!- - Kavadarci => ?? -->
+ <!-- <subdivisionAlias type="mk37" replacement="mk?" reason="deprecated"/> <!- - Karbinci => ?? -->
<!-- <subdivisionAlias type="mk38" replacement="mk?" reason="deprecated"/> <!- - Karpoš => ?? -->
<!-- <subdivisionAlias type="mk39" replacement="mk?" reason="deprecated"/> <!- - Kisela Voda => ?? -->
+ <!-- <subdivisionAlias type="mk40" replacement="mk?" reason="deprecated"/> <!- - Kičevo => ?? -->
+ <!-- <subdivisionAlias type="mk41" replacement="mk?" reason="deprecated"/> <!- - Konče => ?? -->
+ <!-- <subdivisionAlias type="mk42" replacement="mk?" reason="deprecated"/> <!- - Kočani => ?? -->
+ <!-- <subdivisionAlias type="mk43" replacement="mk?" reason="deprecated"/> <!- - Kratovo => ?? -->
+ <!-- <subdivisionAlias type="mk44" replacement="mk?" reason="deprecated"/> <!- - Kriva Palanka => ?? -->
+ <!-- <subdivisionAlias type="mk45" replacement="mk?" reason="deprecated"/> <!- - Krivogaštani => ?? -->
+ <!-- <subdivisionAlias type="mk46" replacement="mk?" reason="deprecated"/> <!- - Kruševo => ?? -->
+ <!-- <subdivisionAlias type="mk47" replacement="mk?" reason="deprecated"/> <!- - Kumanovo => ?? -->
+ <!-- <subdivisionAlias type="mk48" replacement="mk?" reason="deprecated"/> <!- - Lipkovo => ?? -->
+ <!-- <subdivisionAlias type="mk49" replacement="mk?" reason="deprecated"/> <!- - Lozovo => ?? -->
+ <!-- <subdivisionAlias type="mk50" replacement="mk?" reason="deprecated"/> <!- - Mavrovo and Rostuša => ?? -->
+ <!-- <subdivisionAlias type="mk51" replacement="mk?" reason="deprecated"/> <!- - Makedonska Kamenica => ?? -->
+ <!-- <subdivisionAlias type="mk52" replacement="mk?" reason="deprecated"/> <!- - Makedonski Brod => ?? -->
+ <!-- <subdivisionAlias type="mk53" replacement="mk?" reason="deprecated"/> <!- - Mogila => ?? -->
+ <!-- <subdivisionAlias type="mk54" replacement="mk?" reason="deprecated"/> <!- - Negotino => ?? -->
+ <!-- <subdivisionAlias type="mk55" replacement="mk?" reason="deprecated"/> <!- - Novaci => ?? -->
+ <!-- <subdivisionAlias type="mk56" replacement="mk?" reason="deprecated"/> <!- - Novo Selo => ?? -->
<!-- <subdivisionAlias type="mk57" replacement="mk?" reason="deprecated"/> <!- - Oslomej => ?? -->
+ <!-- <subdivisionAlias type="mk58" replacement="mk?" reason="deprecated"/> <!- - Ohrid => ?? -->
+ <!-- <subdivisionAlias type="mk59" replacement="mk?" reason="deprecated"/> <!- - Petrovec => ?? -->
+ <!-- <subdivisionAlias type="mk60" replacement="mk?" reason="deprecated"/> <!- - Pehčevo => ?? -->
+ <!-- <subdivisionAlias type="mk61" replacement="mk?" reason="deprecated"/> <!- - Plasnica => ?? -->
+ <!-- <subdivisionAlias type="mk62" replacement="mk?" reason="deprecated"/> <!- - Prilep => ?? -->
+ <!-- <subdivisionAlias type="mk63" replacement="mk?" reason="deprecated"/> <!- - Probištip => ?? -->
+ <!-- <subdivisionAlias type="mk64" replacement="mk?" reason="deprecated"/> <!- - Radoviš => ?? -->
+ <!-- <subdivisionAlias type="mk65" replacement="mk?" reason="deprecated"/> <!- - Rankovce => ?? -->
+ <!-- <subdivisionAlias type="mk66" replacement="mk?" reason="deprecated"/> <!- - Resen => ?? -->
+ <!-- <subdivisionAlias type="mk67" replacement="mk?" reason="deprecated"/> <!- - Rosoman => ?? -->
<!-- <subdivisionAlias type="mk68" replacement="mk?" reason="deprecated"/> <!- - Saraj => ?? -->
+ <!-- <subdivisionAlias type="mk69" replacement="mk?" reason="deprecated"/> <!- - Sveti Nikole => ?? -->
+ <!-- <subdivisionAlias type="mk70" replacement="mk?" reason="deprecated"/> <!- - Sopište => ?? -->
+ <!-- <subdivisionAlias type="mk71" replacement="mk?" reason="deprecated"/> <!- - Staro Nagoričane => ?? -->
+ <!-- <subdivisionAlias type="mk72" replacement="mk?" reason="deprecated"/> <!- - Struga => ?? -->
+ <!-- <subdivisionAlias type="mk73" replacement="mk?" reason="deprecated"/> <!- - Strumica => ?? -->
+ <!-- <subdivisionAlias type="mk74" replacement="mk?" reason="deprecated"/> <!- - Studeničani => ?? -->
+ <!-- <subdivisionAlias type="mk75" replacement="mk?" reason="deprecated"/> <!- - Tearce => ?? -->
+ <!-- <subdivisionAlias type="mk76" replacement="mk?" reason="deprecated"/> <!- - Tetovo => ?? -->
<!-- <subdivisionAlias type="mk77" replacement="mk?" reason="deprecated"/> <!- - Centar => ?? -->
+ <!-- <subdivisionAlias type="mk78" replacement="mk?" reason="deprecated"/> <!- - Centar Župa => ?? -->
<!-- <subdivisionAlias type="mk79" replacement="mk?" reason="deprecated"/> <!- - Čair => ?? -->
+ <!-- <subdivisionAlias type="mk80" replacement="mk?" reason="deprecated"/> <!- - Čaška => ?? -->
+ <!-- <subdivisionAlias type="mk81" replacement="mk?" reason="deprecated"/> <!- - Češinovo-Obleševo => ?? -->
+ <!-- <subdivisionAlias type="mk82" replacement="mk?" reason="deprecated"/> <!- - Čučer-Sandevo => ?? -->
+ <!-- <subdivisionAlias type="mk83" replacement="mk?" reason="deprecated"/> <!- - Štip => ?? -->
<!-- <subdivisionAlias type="mk84" replacement="mk?" reason="deprecated"/> <!- - Šuto Orizari => ?? -->
- <subdivisionAlias type="mrnkc" replacement="mr13 mr14 mr15" reason="deprecated"/> <!-- ??? => ??? -->
+ <!-- <subdivisionAlias type="mk85" replacement="mk?" reason="deprecated"/> <!- - Skopje => ?? -->
+ <subdivisionAlias type="mrnkc" replacement="mr13 mr14 mr15" reason="deprecated"/> <!-- ??? => Nouakchott Ouest, Nouakchott Nord, Nouakchott Sud -->
<!-- <subdivisionAlias type="mvce" replacement="mv?" reason="deprecated"/> <!- - Central Province => ?? -->
<!-- <subdivisionAlias type="mvnc" replacement="mv?" reason="deprecated"/> <!- - North Central Province => ?? -->
<!-- <subdivisionAlias type="mvno" replacement="mv?" reason="deprecated"/> <!- - North Province => ?? -->
@@ -1433,10 +1516,28 @@
<!-- <subdivisionAlias type="mxdif" replacement="mx?" reason="deprecated"/> <!- - Mexico City => ?? -->
<!-- <subdivisionAlias type="no16" replacement="no?" reason="deprecated"/> <!- - Sør-Trøndelag => ?? -->
<!-- <subdivisionAlias type="no17" replacement="no?" reason="deprecated"/> <!- - Nord-Trøndelag => ?? -->
- <subdivisionAlias type="nzn" replacement="nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko" reason="deprecated"/> <!-- ??? => ??? -->
- <subdivisionAlias type="nzs" replacement="nzcan nzmbh nznsn nzota nzstl nztas nzwtc" reason="deprecated"/> <!-- ??? => ??? -->
- <subdivisionAlias type="omba" replacement="ombj ombs" reason="deprecated"/> <!-- ??? => ??? -->
- <subdivisionAlias type="omsh" replacement="omsj omss" reason="deprecated"/> <!-- ??? => ??? -->
+ <subdivisionAlias type="no23" replacement="no50" reason="deprecated"/> <!-- Trøndelag => Trøndelag -->
+ <subdivisionAlias type="nzn" replacement="nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko" reason="deprecated"/> <!-- ??? => Auckland, Bay of Plenty, Gisborne, Hawke’s Bay, Manawatu-Wanganui, Northland, Taranaki, Wellington, Waikato -->
+ <subdivisionAlias type="nzs" replacement="nzcan nzmbh nznsn nzota nzstl nztas nzwtc" reason="deprecated"/> <!-- ??? => Canterbury, Marl, Nelson, Otago, Southland, Tasman, West Coast -->
+ <subdivisionAlias type="omba" replacement="ombj ombs" reason="deprecated"/> <!-- ??? => Janub al Batinah, Shamal al Batinah -->
+ <subdivisionAlias type="omsh" replacement="omsj omss" reason="deprecated"/> <!-- ??? => Janub ash Sharqiyah, Shamal ash Sharqiyah -->
+ <!-- <subdivisionAlias type="pkta" replacement="pk?" reason="deprecated"/> <!- - Federally Administered Tribal Areas => ?? -->
+ <subdivisionAlias type="plds" replacement="pl02" reason="deprecated"/> <!-- ??? => Lower Silesia -->
+ <subdivisionAlias type="plkp" replacement="pl04" reason="deprecated"/> <!-- ??? => Kuyavia-Pomerania -->
+ <subdivisionAlias type="pllb" replacement="pl08" reason="deprecated"/> <!-- ??? => Lubusz -->
+ <subdivisionAlias type="plld" replacement="pl10" reason="deprecated"/> <!-- ??? => Łódź -->
+ <subdivisionAlias type="pllu" replacement="pl06" reason="deprecated"/> <!-- ??? => Lublin -->
+ <subdivisionAlias type="plma" replacement="pl12" reason="deprecated"/> <!-- ??? => Lesser Poland -->
+ <subdivisionAlias type="plmz" replacement="pl14" reason="deprecated"/> <!-- ??? => Mazovia -->
+ <subdivisionAlias type="plop" replacement="pl16" reason="deprecated"/> <!-- ??? => Opole -->
+ <subdivisionAlias type="plpd" replacement="pl20" reason="deprecated"/> <!-- ??? => Podlachia -->
+ <subdivisionAlias type="plpk" replacement="pl18" reason="deprecated"/> <!-- ??? => Subcarpathia -->
+ <subdivisionAlias type="plpm" replacement="pl22" reason="deprecated"/> <!-- ??? => Pomerania -->
+ <subdivisionAlias type="plsk" replacement="pl26" reason="deprecated"/> <!-- ??? => Holy Cross -->
+ <subdivisionAlias type="plsl" replacement="pl24" reason="deprecated"/> <!-- ??? => Silesia -->
+ <subdivisionAlias type="plwn" replacement="pl28" reason="deprecated"/> <!-- ??? => Warmia-Masuria -->
+ <subdivisionAlias type="plwp" replacement="pl30" reason="deprecated"/> <!-- ??? => Greater Poland -->
+ <subdivisionAlias type="plzp" replacement="pl32" reason="deprecated"/> <!-- ??? => West Pomerania -->
<subdivisionAlias type="tteto" replacement="tttob" reason="deprecated"/> <!-- ??? => Tobago -->
<subdivisionAlias type="ttrcm" replacement="ttmrc" reason="deprecated"/> <!-- ??? => Mayaro-Rio Claro -->
<subdivisionAlias type="ttwto" replacement="tttob" reason="deprecated"/> <!-- ??? => Tobago -->
@@ -1444,25 +1545,12 @@
<subdivisionAlias type="twtnq" replacement="twtnn" reason="deprecated"/> <!-- ??? => Tainan -->
<subdivisionAlias type="twtpq" replacement="twnwt" reason="deprecated"/> <!-- ??? => New Taipei -->
<subdivisionAlias type="twtxq" replacement="twtxg" reason="deprecated"/> <!-- ??? => Taichung -->
+ <!-- <subdivisionAlias type="zagt" replacement="za?" reason="deprecated"/> <!- - Gauteng => ?? -->
+ <!-- <subdivisionAlias type="zanl" replacement="za?" reason="deprecated"/> <!- - KwaZulu-Natal => ?? -->
<!-- end of data generated with GenerateSubdivisions -->
- <!-- Curated subdivision data -->
+
+ <!-- Curated subdivision data, if any -->
- <subdivisionAlias type="plds" replacement="pl02" reason="deprecated"/>
- <subdivisionAlias type="plkp" replacement="pl04" reason="deprecated"/>
- <subdivisionAlias type="pllb" replacement="pl08" reason="deprecated"/>
- <subdivisionAlias type="plld" replacement="pl10" reason="deprecated"/>
- <subdivisionAlias type="pllu" replacement="pl06" reason="deprecated"/>
- <subdivisionAlias type="plma" replacement="pl12" reason="deprecated"/>
- <subdivisionAlias type="plmz" replacement="pl14" reason="deprecated"/>
- <subdivisionAlias type="plop" replacement="pl16" reason="deprecated"/>
- <subdivisionAlias type="plpd" replacement="pl20" reason="deprecated"/>
- <subdivisionAlias type="plpk" replacement="pl18" reason="deprecated"/>
- <subdivisionAlias type="plpm" replacement="pl22" reason="deprecated"/>
- <subdivisionAlias type="plsk" replacement="pl26" reason="deprecated"/>
- <subdivisionAlias type="plsl" replacement="pl24" reason="deprecated"/>
- <subdivisionAlias type="plwn" replacement="pl28" reason="deprecated"/>
- <subdivisionAlias type="plwp" replacement="pl30" reason="deprecated"/>
- <subdivisionAlias type="plzp" replacement="pl32" reason="deprecated"/>
<!-- variants -->
<variantAlias type="AALAND" replacement="AX" reason="deprecated"/>
@@ -1503,28 +1591,29 @@
az_Arab_IR az_Cyrl_AZ az_Latn az_Latn_AZ
ba_RU bas_CM be_BY bem_ZM bez_TZ bg_BG bgn_PK blt_VN bm_ML bm_Nkoo_ML bn_BD
bo_CN br_FR brx_IN bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
- ca_ES cch_NG ccp_BD ce_RU ceb_PH cgg_UG chr_US cic_US ckb_IQ co_FR cs_CZ cu_RU
+ ca_ES cad_US cch_NG ccp_BD ce_RU ceb_PH cgg_UG chr_US cic_US ckb_IQ co_FR cs_CZ cu_RU
cv_RU cy_GB
da_DK dav_KE de_DE dje_NE dsb_DE dua_CM dv_MV dyo_SN dz_BT
ebu_KE ee_GH el_GR en_Dsrt_US en_US eo_001 es_ES et_EE eu_ES ewo_CM
fa_IR ff_Adlm_GN ff_Latn ff_Latn_SN fi_FI fil_PH fo_FO fr_FR fur_IT fy_NL
ga_IE gaa_GH gd_GB gez_ET gl_ES gn_PY gsw_CH gu_IN guz_KE gv_IM
- ha_Arab_NG ha_NG haw_US he_IL hi_IN hr_HR hsb_DE hu_HU hy_AM
+ ha_Arab_NG ha_NG haw_US he_IL hi_IN hi_Latn_IN hr_HR hsb_DE hu_HU hy_AM
ia_001 id_ID ife_TG ig_NG ii_CN io_001 is_IS it_IT iu_CA iu_Latn_CA
ja_JP jbo_001 jgo_CM jmc_TZ jv_ID
ka_GE kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM khq_ML ki_KE kk_KZ
- kkj_CM kl_GL kln_KE km_KH kn_IN ko_KR kok_IN kpe_LR ks_IN ksb_TZ ksf_CM ksh_DE
+ kkj_CM kl_GL kln_KE km_KH kn_IN ko_KR kok_IN kpe_LR ks_Arab ks_Arab_IN ks_Deva_IN ksb_TZ ksf_CM ksh_DE
ku_TR kw_GB ky_KG
lag_TZ lb_LU lg_UG lkt_US ln_CD lo_LA lrc_IR lt_LT lu_CD luo_KE luy_KE lv_LV
- mas_KE mer_KE mfe_MU mg_MG mgh_MZ mgo_CM mi_NZ mk_MK ml_IN mn_MN mn_Mong_CN
- mni_IN moh_CA mr_IN ms_Arab_MY ms_MY mt_MT mua_CM mus_US my_MM myv_RU mzn_IR
+ mai_IN mas_KE mer_KE mfe_MU mg_MG mgh_MZ mgo_CM mi_NZ mk_MK ml_IN mn_MN mn_Mong_CN
+ mni_Beng mni_Beng_IN mni_Mtei_IN moh_CA mr_IN ms_Arab_MY ms_MY mt_MT mua_CM mus_US my_MM myv_RU mzn_IR
naq_NA nb_NO nd_ZW nds_DE ne_NP nl_NL nmg_CM nn_NO nnh_CM nqo_GN nr_ZA nso_ZA
nus_SS ny_MW nyn_UG
oc_FR om_ET or_IN os_GE osa_US
- pa_Arab_PK pa_Guru pa_Guru_IN pl_PL prg_001 ps_AF pt_BR
+ pa_Arab_PK pa_Guru pa_Guru_IN pcm_NG pl_PL prg_001 ps_AF pt_BR
qu_PE quc_GT
rm_CH rn_BI ro_RO rof_TZ ru_RU rw_RW rwk_TZ
- sa_IN sah_RU saq_KE sbp_TZ sc_IT scn_IT sd_PK sdh_IR se_NO seh_MZ ses_ML sg_CF
+ sa_IN sah_RU saq_KE sat_Deva_IN sat_Olck sat_Olck_IN sbp_TZ sc_IT scn_IT
+ sd_Arab sd_Arab_PK sd_Deva_IN sdh_IR se_NO seh_MZ ses_ML sg_CF
shi_Latn_MA shi_Tfng shi_Tfng_MA si_LK sid_ET sk_SK sl_SI sma_SE smj_SE smn_FI
sms_FI sn_ZW so_SO sq_AL sr_Cyrl sr_Cyrl_RS sr_Latn_RS ss_ZA ssy_ER st_ZA
su_Latn su_Latn_ID sv_SE sw_TZ syr_IQ szl_PL
diff --git a/common/supplemental/units.xml b/common/supplemental/units.xml
new file mode 100644
index 0000000..82ecef1
--- /dev/null
+++ b/common/supplemental/units.xml
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.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
+-->
+
+<supplementalData>
+ <version number="$Revision$"/>
+ <unitConstants>
+ <unitConstant constant="lb_to_kg" value="0.45359237"/>
+ <unitConstant constant="ft_to_m" value="0.3048"/>
+ <unitConstant constant="ft2_to_m2" value="ft_to_m*ft_to_m"/>
+ <unitConstant constant="ft3_to_m3" value="ft_to_m*ft_to_m*ft_to_m"/>
+ <unitConstant constant="in3_to_m3" value="ft3_to_m3/12*12*12"/>
+ <unitConstant constant="gal_to_m3" value="231*in3_to_m3"/>
+ <unitConstant constant="gal_imp_to_m3" value="0.00454609"/>
+
+ <unitConstant constant="gravity" value="9.80665"/>
+ <unitConstant constant="PI" value="411557987 / 131002976" status='approximate'/>
+ <unitConstant constant="G" value="6.67408E-11" status='approximate'/> <!-- https://arxiv.org/pdf/1510.07674.pdf see 2014 CODATA -->
+ </unitConstants>
+ <unitQuantities>
+ <!-- NB: quantity ordering is used in canonical order of derived units. -->
+ <!-- SI Base Units -->
+ <unitQuantity baseUnit='candela' quantity='luminous-intensity' status='simple'/>
+ <unitQuantity baseUnit='kilogram' quantity='mass' status='simple'/>
+ <unitQuantity baseUnit='meter' quantity='length' status='simple'/>
+ <unitQuantity baseUnit='second' quantity='duration' status='simple'/> <!-- use duration because 'time' can mean absolute time -->
+ <unitQuantity baseUnit='year' quantity='year-duration' status='simple'/> <!-- non-SI but here for ordering -->
+ <unitQuantity baseUnit='ampere' quantity='electric-current' status='simple'/>
+ <unitQuantity baseUnit='kelvin' quantity='temperature' status='simple'/>
+
+ <!-- Additional base units -->
+
+ <unitQuantity baseUnit='revolution' quantity='angle' status='simple'/> <!-- = circle, cycle for base -->
+ <unitQuantity baseUnit='item' quantity='substance-amount' status='simple'/> <!-- use instead of mole -->
+ <unitQuantity baseUnit='portion' quantity='portion' status='simple'/>
+ <unitQuantity baseUnit='bit' quantity='digital' status='simple'/>
+ <unitQuantity baseUnit='pixel' quantity='graphics' status='simple'/>
+ <unitQuantity baseUnit='em' quantity='typewidth' status='simple'/>
+
+ <!-- SI Derived Units -->
+
+ <unitQuantity baseUnit='revolution-per-second' quantity='frequency'/>
+ <unitQuantity baseUnit='square-revolution' quantity='solid-angle'/>
+ <unitQuantity baseUnit='kilogram-meter-per-square-second' quantity='force'/>
+ <unitQuantity baseUnit='kilogram-per-meter-square-second' quantity='pressure'/>
+ <unitQuantity baseUnit='kilogram-per-square-meter-square-second' quantity='pressure-per-length'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-square-second' quantity='energy'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-cubic-second' quantity='power'/>
+ <unitQuantity baseUnit='second-ampere' quantity='electric-charge'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-cubic-second-ampere' quantity='voltage'/>
+ <unitQuantity baseUnit='pow4-second-square-ampere-per-kilogram-square-meter' quantity='electric-capacitance'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-cubic-second-square-ampere' quantity='electric-resistance'/>
+ <unitQuantity baseUnit='cubic-second-square-ampere-per-kilogram-square-meter' quantity='electric-conductance'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-square-second-ampere' quantity='magnetic-flux'/>
+ <unitQuantity baseUnit='kilogram-per-square-second-ampere' quantity='magnetic-induction'/>
+ <unitQuantity baseUnit='kilogram-square-meter-per-square-second-square-ampere' quantity='electric-inductance'/>
+ <unitQuantity baseUnit='square-meter-per-square-second' quantity='dose'/>
+ <unitQuantity baseUnit='square-meter' quantity='area'/>
+ <unitQuantity baseUnit='cubic-meter' quantity='volume'/>
+ <unitQuantity baseUnit='meter-per-second' quantity='speed'/>
+ <unitQuantity baseUnit='meter-per-square-second' quantity='acceleration'/>
+ <unitQuantity baseUnit='revolution-per-meter' quantity='wave-number'/>
+ <unitQuantity baseUnit='kilogram-per-cubic-meter' quantity='mass-density'/>
+ <unitQuantity baseUnit='cubic-meter-per-kilogram' quantity='specific-volume'/>
+ <unitQuantity baseUnit='ampere-per-square-meter' quantity='current-density'/>
+ <unitQuantity baseUnit='ampere-per-meter' quantity='magnetic-field-strength'/>
+ <unitQuantity baseUnit='item-per-cubic-meter' quantity='concentration'/>
+ <unitQuantity baseUnit='candela-per-square-meter' quantity='luminance'/>
+ <unitQuantity baseUnit='candela-square-meter-per-square-meter' quantity='luminous-flux'/>
+ <unitQuantity baseUnit='kilogram-per-kilogram' quantity='mass-fraction'/>
+
+ <!-- Additional derived units -->
+ <unitQuantity baseUnit='kilogram-meter-per-meter-square-second' quantity='torque'/>
+ <unitQuantity baseUnit='cubic-meter-per-meter' quantity='consumption'/>
+ <unitQuantity baseUnit='pixel-per-meter' quantity='resolution'/>
+ </unitQuantities>
+ <convertUnits>
+ <!-- Values where possible from:
+ a) NIST Special Publication 1038
+ https://www.govinfo.gov/content/pkg/GOVPUB-C13-f10c2ff9e7af2091314396a2d53213e4/pdf/GOVPUB-C13-f10c2ff9e7af2091314396a2d53213e4.pdf
+ b) https://arxiv.org/pdf/1510.07674.pdf
+ -->
+
+ <!-- luminous-intensity -->
+ <convertUnit source='candela' baseUnit='candela'/>
+
+ <!-- mass -->
+ <convertUnit source='carat' baseUnit='kilogram' factor='0.0002'/>
+ <convertUnit source='gram' baseUnit='kilogram' factor='0.001'/>
+ <convertUnit source='ounce' baseUnit='kilogram' factor='lb_to_kg/16' systems="ussystem uksystem"/>
+ <convertUnit source='ounce-troy' baseUnit='kilogram' factor='0.03110348' systems="ussystem uksystem"/>
+ <convertUnit source='pound' baseUnit='kilogram' factor='lb_to_kg' systems="ussystem uksystem"/>
+ <convertUnit source='kilogram' baseUnit='kilogram'/>
+ <convertUnit source='stone' baseUnit='kilogram' factor='lb_to_kg*14' systems="uksystem"/>
+ <convertUnit source='ton' baseUnit='kilogram' factor='lb_to_kg*2000' systems="ussystem uksystem"/>
+ <convertUnit source='metric-ton' baseUnit='kilogram' factor='1000'/>
+ <convertUnit source='earth-mass' baseUnit='kilogram' factor='5.9722E+24'/>
+ <convertUnit source='solar-mass' baseUnit='kilogram' factor='1.98847E+30'/>
+
+ <!-- length -->
+ <convertUnit source='point' baseUnit='meter' factor='ft_to_m/864' systems="ussystem uksystem"/>
+ <convertUnit source='inch' baseUnit='meter' factor='ft_to_m/12' systems="ussystem uksystem"/>
+ <convertUnit source='foot' baseUnit='meter' factor='ft_to_m' systems="ussystem uksystem"/>
+ <convertUnit source='yard' baseUnit='meter' factor='ft_to_m*3' systems="ussystem uksystem"/>
+ <convertUnit source='meter' baseUnit='meter'/>
+ <convertUnit source='fathom' baseUnit='meter' factor='ft_to_m * 6' systems="ussystem uksystem"/>
+ <convertUnit source='furlong' baseUnit='meter' factor='ft_to_m*660' systems="ussystem uksystem"/>
+ <convertUnit source='mile' baseUnit='meter' factor='ft_to_m*5280' systems="ussystem uksystem"/>
+ <convertUnit source='nautical-mile' baseUnit='meter' factor='1852' systems="ussystem uksystem"/>
+ <convertUnit source='mile-scandinavian' baseUnit='meter' factor='10000'/>
+ <convertUnit source='100-kilometer' baseUnit='meter' factor='100000'/>
+ <convertUnit source='earth-radius' baseUnit='meter' factor='6.3781E6'/>
+ <convertUnit source='solar-radius' baseUnit='meter' factor='695700000'/>
+ <convertUnit source='astronomical-unit' baseUnit='meter' factor='149597900000'/>
+ <convertUnit source='light-year' baseUnit='meter' factor='9460730000000000'/>
+ <convertUnit source='parsec' baseUnit='meter' factor='30856780000000000'/>
+
+ <!-- time -->
+ <convertUnit source='second' baseUnit='second'/>
+ <convertUnit source='minute' baseUnit='second' factor='60'/>
+ <convertUnit source='hour' baseUnit='second' factor='3600'/>
+ <convertUnit source='day' baseUnit='second' factor='86400'/>
+ <convertUnit source='day-person' baseUnit='second' factor='86400'/>
+ <convertUnit source='week' baseUnit='second' factor='604800'/>
+ <convertUnit source='week-person' baseUnit='second' factor='604800'/>
+
+ <!-- year-duration -->
+ <convertUnit source='month' baseUnit='year' factor='1/12'/>
+ <convertUnit source='month-person' baseUnit='year' factor='1/12'/>
+ <convertUnit source='year' baseUnit='year'/>
+ <convertUnit source='year-person' baseUnit='year'/>
+ <convertUnit source='decade' baseUnit='year' factor='10'/>
+ <convertUnit source='century' baseUnit='year' factor='100'/>
+
+ <!-- electric-current -->
+ <convertUnit source='ampere' baseUnit='ampere'/>
+
+ <!-- temperature -->
+ <convertUnit source='fahrenheit' baseUnit='kelvin' factor='5/9' offset='2298.35/9' systems="ussystem uksystem"/>
+ <convertUnit source='kelvin' baseUnit='kelvin'/>
+ <convertUnit source='celsius' baseUnit='kelvin' offset='273.15'/>
+
+ <!-- angle -->
+ <convertUnit source='arc-second' baseUnit='revolution' factor='1/360*60*60'/>
+ <convertUnit source='arc-minute' baseUnit='revolution' factor='1/360*60'/>
+ <convertUnit source='degree' baseUnit='revolution' factor='1/360'/>
+ <convertUnit source='radian' baseUnit='revolution' factor='1/2*PI'/>
+ <convertUnit source='revolution' baseUnit='revolution'/>
+
+ <!-- substance-amount -->
+ <convertUnit source='item' baseUnit='item'/>
+ <convertUnit source='mole' baseUnit='item' factor='6.02214076E+23'/>
+
+ <!-- portion -->
+ <convertUnit source='permillion' baseUnit='portion' factor='1/1000000'/>
+ <convertUnit source='permyriad' baseUnit='portion' factor='1/10000'/>
+ <convertUnit source='permille' baseUnit='portion' factor='1/1000'/>
+ <convertUnit source='percent' baseUnit='portion' factor='1/100'/>
+ <convertUnit source='karat' baseUnit='portion' factor='1/24'/>
+ <convertUnit source='portion' baseUnit='portion'/>
+
+ <!-- digital -->
+ <convertUnit source='bit' baseUnit='bit'/>
+ <convertUnit source='byte' baseUnit='bit' factor='8'/>
+
+ <!-- graphics -->
+ <convertUnit source='dot' baseUnit='pixel'/>
+ <convertUnit source='pixel' baseUnit='pixel'/>
+
+ <!-- typewidth -->
+ <convertUnit source='em' baseUnit='em'/>
+
+ <!-- frequency -->
+ <convertUnit source='hertz' baseUnit='revolution-per-second'/>
+
+ <!-- force -->
+ <convertUnit source='newton' baseUnit='kilogram-meter-per-square-second'/>
+ <convertUnit source='pound-force' baseUnit='kilogram-meter-per-square-second' factor='lb_to_kg * gravity' systems="ussystem uksystem"/>
+
+ <!-- pressure -->
+ <convertUnit source='pascal' baseUnit='kilogram-per-meter-square-second'/>
+ <convertUnit source='bar' baseUnit='kilogram-per-meter-square-second' factor='100000'/>
+ <convertUnit source='atmosphere' baseUnit='kilogram-per-meter-square-second' factor='101325'/>
+
+ <!-- pressure-per-length -->
+ <convertUnit source='ofhg' baseUnit='kilogram-per-square-meter-square-second' factor='13595.1*gravity'/>
+
+ <!-- energy -->
+ <convertUnit source='electronvolt' baseUnit='kilogram-square-meter-per-square-second' factor='1.602177E-19'/>
+ <convertUnit source='dalton' baseUnit='kilogram-square-meter-per-square-second' factor='1.49241808560E-10'/>
+ <convertUnit source='joule' baseUnit='kilogram-square-meter-per-square-second'/>
+ <convertUnit source='calorie' baseUnit='kilogram-square-meter-per-square-second' factor='4.184'/> <!-- th -->
+ <convertUnit source='british-thermal-unit' baseUnit='kilogram-square-meter-per-square-second' factor='4.184*2267.96185/9' systems="ussystem uksystem"/> <!-- th -->
+ <convertUnit source='foodcalorie' baseUnit='kilogram-square-meter-per-square-second' factor='4184' systems="ussystem uksystem"/> <!-- th -->
+ <convertUnit source='therm-us' baseUnit='kilogram-square-meter-per-square-second' factor='105480400' systems="ussystem"/>
+
+ <!-- power -->
+ <convertUnit source='watt' baseUnit='kilogram-square-meter-per-cubic-second'/>
+ <convertUnit source='horsepower' baseUnit='kilogram-square-meter-per-cubic-second' factor='ft_to_m * lb_to_kg * gravity * 550' systems="ussystem uksystem"/>
+ <convertUnit source='solar-luminosity' baseUnit='kilogram-square-meter-per-cubic-second' factor='3.828E+26'/>
+
+ <!-- voltage -->
+ <convertUnit source='volt' baseUnit='kilogram-square-meter-per-cubic-second-ampere'/>
+
+ <!-- electric-resistance -->
+ <convertUnit source='ohm' baseUnit='kilogram-square-meter-per-cubic-second-square-ampere'/>
+
+ <!-- area -->
+ <convertUnit source='dunam' baseUnit='square-meter' factor='1000'/>
+ <convertUnit source='acre' baseUnit='square-meter' factor='ft2_to_m2 * 43560' systems="ussystem uksystem"/>
+ <convertUnit source='hectare' baseUnit='square-meter' factor='10000'/>
+
+ <!-- volume -->
+ <convertUnit source='teaspoon' baseUnit='cubic-meter' factor='gal_to_m3/16*48' systems="ussystem"/>
+ <convertUnit source='tablespoon' baseUnit='cubic-meter' factor='gal_to_m3/256' systems="ussystem"/>
+ <convertUnit source='fluid-ounce-imperial' baseUnit='cubic-meter' factor='gal_imp_to_m3/160' systems="uksystem"/>
+ <convertUnit source='fluid-ounce' baseUnit='cubic-meter' factor='gal_to_m3/128' systems="ussystem"/>
+ <convertUnit source='cup' baseUnit='cubic-meter' factor='gal_to_m3/16' systems="ussystem"/>
+ <convertUnit source='cup-metric' baseUnit='cubic-meter' factor='0.00025'/>
+ <convertUnit source='pint' baseUnit='cubic-meter' factor='gal_to_m3/8' systems="ussystem"/>
+ <convertUnit source='pint-metric' baseUnit='cubic-meter' factor='0.0005'/>
+ <convertUnit source='quart' baseUnit='cubic-meter' factor='gal_to_m3/4' systems="ussystem"/>
+ <convertUnit source='liter' baseUnit='cubic-meter' factor='0.001'/>
+ <convertUnit source='gallon' baseUnit='cubic-meter' factor='gal_to_m3' systems="ussystem"/>
+ <convertUnit source='gallon-imperial' baseUnit='cubic-meter' factor='gal_imp_to_m3' systems="uksystem"/>
+ <convertUnit source='bushel' baseUnit='cubic-meter' factor='2150.42*in3_to_m3' systems="ussystem"/>
+ <convertUnit source='barrel' baseUnit='cubic-meter' factor='42*gal_to_m3' systems="ussystem"/> <!-- oil -->
+
+ <!-- speed -->
+ <convertUnit source='knot' baseUnit='meter-per-second' factor='1852/3600' systems="ussystem uksystem"/>
+
+ <!-- acceleration -->
+ <convertUnit source='g-force' baseUnit='meter-per-square-second' factor='gravity'/>
+
+ <!-- luminous-flux -->
+ <convertUnit source='lux' baseUnit='candela-square-meter-per-square-meter'/>
+ </convertUnits>
+ <unitPreferenceData draft="contributed">
+ <unitPreferences category="area" usage="default">
+ <unitPreference regions="001">square-kilometer</unitPreference>
+ <unitPreference regions="001">hectare</unitPreference>
+ <unitPreference regions="001">square-meter</unitPreference>
+ <unitPreference regions="001">square-centimeter</unitPreference>
+ <unitPreference regions="US GB">square-mile</unitPreference>
+ <unitPreference regions="US GB">acre</unitPreference>
+ <unitPreference regions="US GB">square-foot</unitPreference>
+ <unitPreference regions="US GB">square-inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="area" usage="geograph">
+ <unitPreference regions="001">square-kilometer</unitPreference>
+ <unitPreference regions="US GB">square-mile</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="area" usage="land">
+ <unitPreference regions="001">hectare</unitPreference>
+ <unitPreference regions="US GB">acre</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="concentration" usage="blood-glucose">
+ <unitPreference regions="AG AI AO AU BA BG BH BM BN BW BY CA CH CM CN CZ DK DM EE FI FJ GB GD HK HR HU IE IM IS KE KN KW KZ LC LI LT LU LV ME MG MK MO MS MT MU MY MZ NA NL NO NZ OM PG RS RU SE SG SI SK TC TO UA UG VC VG VN VU ZA">millimole-per-liter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="concentration" usage="default">
+ <unitPreference regions="001">item-per-cubic-meter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="consumption" usage="default">
+ <unitPreference regions="001">liter-per-100-kilometer</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="consumption" usage="vehicle-fuel">
+ <unitPreference regions="001">liter-per-100-kilometer</unitPreference>
+ <unitPreference regions="BR IT JP KR MX MY NL TH TR">liter-per-kilometer</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="consumption-inverse" usage="default">
+ <unitPreference regions="001">kilometer-per-centiliter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="consumption-inverse" usage="vehicle-fuel">
+ <unitPreference regions="001">kilometer-per-centiliter</unitPreference>
+ <unitPreference regions="US">mile-per-gallon</unitPreference>
+ <unitPreference regions="CA GB">mile-per-gallon-imperial</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="duration" usage="default">
+ <unitPreference regions="001">day</unitPreference>
+ <unitPreference regions="001">hour</unitPreference>
+ <unitPreference regions="001">minute</unitPreference>
+ <unitPreference regions="001">second</unitPreference>
+ <unitPreference regions="001">millisecond</unitPreference>
+ <unitPreference regions="001">microsecond</unitPreference>
+ <unitPreference regions="001">nanosecond</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="duration" usage="media">
+ <unitPreference regions="001">minute-and-second</unitPreference>
+ <unitPreference regions="001">second</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="energy" usage="default">
+ <unitPreference regions="001">kilowatt-hour</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="energy" usage="food">
+ <unitPreference regions="US">foodcalorie</unitPreference>
+ <unitPreference regions="001">kilocalorie</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="default">
+ <unitPreference regions="001">kilometer</unitPreference>
+ <unitPreference regions="001">meter</unitPreference>
+ <unitPreference regions="001">centimeter</unitPreference>
+ <unitPreference regions="US GB">mile</unitPreference>
+ <unitPreference regions="US GB">foot</unitPreference>
+ <unitPreference regions="US GB">inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="person">
+ <unitPreference regions="001">centimeter</unitPreference>
+ <unitPreference regions="CA GB IN US">inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="person-height">
+ <unitPreference regions="001">centimeter</unitPreference>
+ <unitPreference regions="CA GB IN US" geq="3.0">foot-and-inch</unitPreference>
+ <unitPreference regions="CA GB IN US">inch</unitPreference>
+ <unitPreference regions="AT BE BR CN DE DK DZ EG ES FR HK ID IL IT JO MX MY NL NO PL PT RU SA SE TR VN">meter-and-centimeter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="rainfall">
+ <unitPreference regions="BR">centimeter</unitPreference>
+ <unitPreference regions="US">inch</unitPreference>
+ <unitPreference regions="001">millimeter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="road">
+ <unitPreference regions="001" geq="0.9">kilometer</unitPreference>
+ <unitPreference regions="001" geq="300.0" skeleton="precision-increment/50">meter</unitPreference>
+ <unitPreference regions="001" skeleton="precision-increment/10">meter</unitPreference>
+ <unitPreference regions="001">meter</unitPreference>
+ <unitPreference regions="US" geq="0.5">mile</unitPreference>
+ <unitPreference regions="US" geq="100.0" skeleton="precision-increment/50">foot</unitPreference>
+ <unitPreference regions="US" skeleton="precision-increment/10">foot</unitPreference>
+ <unitPreference regions="GB" geq="0.5">mile</unitPreference>
+ <unitPreference regions="GB" geq="100.0" skeleton="precision-increment/50">yard</unitPreference>
+ <unitPreference regions="GB">yard</unitPreference>
+ <unitPreference regions="SE">mile-scandinavian</unitPreference>
+ <unitPreference regions="SE">kilometer</unitPreference>
+ <unitPreference regions="SE" geq="300.0" skeleton="precision-increment/50">meter</unitPreference>
+ <unitPreference regions="SE" skeleton="precision-increment/10">meter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="snowfall">
+ <unitPreference regions="001">centimeter</unitPreference>
+ <unitPreference regions="US">inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="vehicle">
+ <unitPreference regions="GB US">foot-and-inch</unitPreference>
+ <unitPreference regions="001">meter</unitPreference>
+ <unitPreference regions="MX">meter-and-centimeter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="length" usage="visiblty">
+ <unitPreference regions="001" geq="0.1">kilometer</unitPreference>
+ <unitPreference regions="001">meter</unitPreference>
+ <unitPreference regions="DE NL">meter</unitPreference>
+ <unitPreference regions="GB US">mile</unitPreference>
+ <unitPreference regions="GB US">foot</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="mass" usage="default">
+ <unitPreference regions="001">metric-ton</unitPreference>
+ <unitPreference regions="001">kilogram</unitPreference>
+ <unitPreference regions="001">gram</unitPreference>
+ <unitPreference regions="001">milligram</unitPreference>
+ <unitPreference regions="001">microgram</unitPreference>
+ <unitPreference regions="US GB">ton</unitPreference>
+ <unitPreference regions="US GB">pound</unitPreference>
+ <unitPreference regions="US GB">ounce</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="mass" usage="person">
+ <unitPreference regions="001">kilogram</unitPreference>
+ <unitPreference regions="001">gram</unitPreference>
+ <unitPreference regions="DZ EG ES JO SA">kilogram-and-gram</unitPreference>
+ <unitPreference regions="US">pound</unitPreference>
+ <unitPreference regions="US">pound-and-ounce</unitPreference>
+ <unitPreference regions="GB">stone-and-pound</unitPreference>
+ <unitPreference regions="GB">pound-and-ounce</unitPreference>
+ <unitPreference regions="HK">pound-and-ounce</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="mass-density" usage="blood-glucose">
+ <unitPreference regions="001">milligram-per-deciliter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="mass-density" usage="default">
+ <unitPreference regions="001">kilogram-per-cubic-meter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="power" usage="default">
+ <unitPreference regions="001">gigawatt</unitPreference>
+ <unitPreference regions="001">megawatt</unitPreference>
+ <unitPreference regions="001">kilowatt</unitPreference>
+ <unitPreference regions="001">watt</unitPreference>
+ <unitPreference regions="001">milliwatt</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="power" usage="engine">
+ <unitPreference regions="001">kilowatt</unitPreference>
+ <unitPreference regions="US GB">horsepower</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="pressure" usage="baromtrc">
+ <unitPreference regions="001">hectopascal</unitPreference>
+ <unitPreference regions="IN US">inch-ofhg</unitPreference>
+ <unitPreference regions="BR EG GB IL TH">millibar</unitPreference>
+ <unitPreference regions="MX RU">millimeter-ofhg</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="pressure" usage="default">
+ <unitPreference regions="001">megapascal</unitPreference>
+ <unitPreference regions="001">pascal</unitPreference>
+ <unitPreference regions="US GB">pound-force-per-square-inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="speed" usage="default">
+ <unitPreference regions="001">kilometer-per-hour</unitPreference>
+ <unitPreference regions="GB US">mile-per-hour</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="speed" usage="wind">
+ <unitPreference regions="001">kilometer-per-hour</unitPreference>
+ <unitPreference regions="FI KR NO PL RU SE">meter-per-second</unitPreference>
+ <unitPreference regions="US">mile-per-hour</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="temperature" usage="default">
+ <unitPreference regions="001">celsius</unitPreference>
+ <unitPreference regions="US">fahrenheit</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="temperature" usage="weather">
+ <unitPreference regions="001">celsius</unitPreference>
+ <unitPreference regions="BS BZ KY PR PW US">fahrenheit</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="volume" usage="default">
+ <unitPreference regions="001">cubic-meter</unitPreference>
+ <unitPreference regions="001">cubic-centimeter</unitPreference>
+ <unitPreference regions="US GB">cubic-foot</unitPreference>
+ <unitPreference regions="US GB">cubic-inch</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="volume" usage="fluid">
+ <unitPreference regions="001">liter</unitPreference>
+ <unitPreference regions="001">milliliter</unitPreference>
+ <unitPreference regions="US">gallon</unitPreference>
+ <unitPreference regions="US">quart</unitPreference>
+ <unitPreference regions="US">pint</unitPreference>
+ <unitPreference regions="US">cup</unitPreference>
+ <unitPreference regions="US">fluid-ounce</unitPreference>
+ <unitPreference regions="US">tablespoon</unitPreference>
+ <unitPreference regions="US">teaspoon</unitPreference>
+ <unitPreference regions="GB">gallon-imperial</unitPreference>
+ <unitPreference regions="GB">fluid-ounce-imperial</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="volume" usage="oil">
+ <unitPreference regions="001">barrel</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="volume" usage="vehicle">
+ <unitPreference regions="US">gallon</unitPreference>
+ <unitPreference regions="001">liter</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="year-duration" usage="default">
+ <unitPreference regions="001">year</unitPreference>
+ <unitPreference regions="001">month</unitPreference>
+ </unitPreferences>
+ <unitPreferences category="year-duration" usage="person-age">
+ <unitPreference regions="001" geq="2.5">year-person</unitPreference>
+ <unitPreference regions="001">year-person-and-month-person</unitPreference>
+ <unitPreference regions="001">month-person</unitPreference>
+ </unitPreferences>
+ </unitPreferenceData>
+ <metadata>
+ <alias>
+ <unitAlias type="inch-hg" replacement="inch-ofhg" reason="deprecated"/>
+ <unitAlias type="liter-per-100kilometers" replacement="liter-per-100-kilometer" reason="deprecated"/>
+ <unitAlias type="meter-per-second-squared" replacement="meter-per-square-second" reason="deprecated"/>
+ <unitAlias type="millimeter-of-mercury" replacement="millimeter-ofhg" reason="deprecated"/>
+ <unitAlias type="part-per-million" replacement="permillion" reason="deprecated"/>
+ <unitAlias type="pound-foot" replacement="pound-force-foot" reason="deprecated"/>
+ <unitAlias type="pound-per-square-inch" replacement="pound-force-per-square-inch" reason="deprecated"/>
+ <usageAlias type="music-track" replacement="media" reason="deprecated"/>
+ <usageAlias type="tv-program" replacement="media" reason="deprecated"/>
+ </alias>
+ </metadata>
+</supplementalData>
diff --git a/common/testData/_readme.txt b/common/testData/_readme.txt
index 57a648a..ba825e8 100644
--- a/common/testData/_readme.txt
+++ b/common/testData/_readme.txt
@@ -1,2 +1,6 @@
# Data for testing expected behavior of CLDR operations
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
# The format may vary between folders or files.
\ No newline at end of file
diff --git a/common/testData/localeIdentifiers/_readme.txt b/common/testData/localeIdentifiers/_readme.txt
index aed13b3..fbbef7a 100644
--- a/common/testData/localeIdentifiers/_readme.txt
+++ b/common/testData/localeIdentifiers/_readme.txt
@@ -1,4 +1,9 @@
# Test data for grapheme locale validity, canonicalization, and name generation
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+# The format may vary between folders or files.
# Format:
# Generally has the following structure, but the values depend on the file.
# @<parameter>=<parameter value>
diff --git a/common/testData/localeIdentifiers/localeDisplayName.txt b/common/testData/localeIdentifiers/localeDisplayName.txt
index 72be667..a2871a2 100644
--- a/common/testData/localeIdentifiers/localeDisplayName.txt
+++ b/common/testData/localeIdentifiers/localeDisplayName.txt
@@ -1,4 +1,8 @@
# Test data for locale display name generation
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
# Format:
# @locale=<locale to display in>
# @compound=<whether to form compounds like "Flemish" for nl_BE>
diff --git a/common/testData/segmentation/graphemeCluster/_readme.txt b/common/testData/segmentation/graphemeCluster/_readme.txt
index 12bb740..ea82010 100644
--- a/common/testData/segmentation/graphemeCluster/_readme.txt
+++ b/common/testData/segmentation/graphemeCluster/_readme.txt
@@ -1,3 +1,7 @@
# Test data for grapheme cluster testing generation
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
# Format:
# <source string> ; <copy of source string with ÷ inserted at boundaries>
diff --git a/common/testData/transforms/_readme.txt b/common/testData/transforms/_readme.txt
index 39e1857..5abaa47 100644
--- a/common/testData/transforms/_readme.txt
+++ b/common/testData/transforms/_readme.txt
@@ -1,3 +1,7 @@
# Data for testing transforms
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
# Format: uses tab delimiters to make it easier to read into spreadsheets
# <source text><TAB><expected result text>
\ No newline at end of file
diff --git a/common/testData/transforms/my-Latn-t-my.txt b/common/testData/transforms/my-Latn-t-my.txt
new file mode 100644
index 0000000..795594e
--- /dev/null
+++ b/common/testData/transforms/my-Latn-t-my.txt
@@ -0,0 +1,634 @@
+ကို ko
+စေ hcay
+များ myarr
+သည် sai
+ခွင့် hkwng
+နှင့် nhang
+ရ r
+ရှိ shi
+ဖြစ် hpyit
+ခြင်း hkyinn
+နိုင် nine
+သော saw
+ည့် eet
+လူ luu
+မ m
+တွင် twin
+သ s
+လည်းကောင်း laeekaungg
+စွာ hcwar
+တိုင်း tine
+အခွင့်အရေး aahkwngaarayy
+ရန် raan
+လွတ်လပ် lwatlaut
+တို့ thoet
+အပိုဒ် aapod
+သော်လည်းကောင်း sawlaeekaungg
+မိမိ mimi
+မှု mhu
+မည် mai
+နိုင်ငံ ninengan
+ရေး rayy
+က k
+ခံ hkan
+ဖြင့် hpyang
+မှ mha
+ပြု pyu
+ဥပဒေ upaday
+တစ် tait
+ထို hto
+အတွက် aatwat
+ခံစား hkanhcarr
+တူညီ tuunye
+အဖွဲ့ aahpwal
+ဆိုင်ရာ sinerar
+လူ့ lhu
+အားဖြင့် aarrhpyang
+ကုလသမဂ္ဂ kulasamagg
+သို့တည်းမဟုတ် shoettaeemahote
+အခြား aahkyarr
+ကြ kya
+ဆောင်ရွက် saungrwat
+ထား htarr
+န့် ant
+ပါဝင် parwain
+ပိုင် pine
+ပြည် pyi
+ဝင် wain
+အခြေခံ aahkyayhkan
+အပြင် aapyin
+ကြေညာစာတမ်း kyaynyarhcartam
+ပေး payy
+အခါ aahkar
+အရ aar
+ခပ်သိမ်း hkautsaim
+ပြစ်မှု pyitmhu
+ပြီး pyee
+မျှ myaha
+လည်း laee
+လွတ်လပ်ခွင့် lwatlauthkwng
+သူ suu
+ကာ kar
+ကြီး kyee
+နယ်မြေ naalmyay
+နေထိုင် nayhtine
+ပညာ panyar
+ဘဲ bhell
+မည်သူ maisuu
+ရယူ rayuu
+သောကြောင့် sawkyawwng
+ဟု hu
+အ a
+အဆိုပါ aasopar
+ကိုးကွယ် koekwal
+ကြေညာ kyaynyar
+ကွယ် kwal
+ခု hku
+ခွဲခြား hkwalhkyarr
+ဂုဏ်သိက္ခာ gunsikhkar
+တ t
+တကွ takw
+တို့သည် thoetsai
+ထို့ပြင် hthoetpyin
+မိသားစု misarrhcu
+ရရှိ rashi
+ရာ rar
+ရောက် rout
+လိုက် lite
+အခွင့် aahkwng
+အဆင့်အတန်း aasangaataann
+အလုပ် aalote
+ဦး u
+ကျင့်သုံး kyangsone
+ကြောင့် kyawwng
+တိုင်းပြည် tinepyi
+တိုးတက် toetaat
+နည်း naee
+နိုင်ငံရေး ninenganrayy
+ပြ pya
+ဘာသာ bharsar
+ဘာ့ bhar
+မဟုတ် mahote
+မ္ m
+မျှတ myahat
+လာ lar
+လူမှု luumhu
+လေးစား layyhcarr
+လျှင် shin
+အပြည် aapyi
+အမှု aamhu
+အရေး aarayy
+အားလုံး aarrlone
+အေးချမ်း aayyhkyam
+ဤ i
+ခံယူ hkanyuu
+ချက် hkyet
+ငှာ nghar
+စောင့်ရှောက် hcawngshout
+ဆက်ဆံ saatsan
+ဆန္ဒ sand
+တရား tararr
+ထိုက် htite
+နိုင်ငံသားအဖြစ် ninengansarraahpyit
+နေ nay
+ပါ par
+ဖော်ပြ hpawpya
+ဖြစ်သည် hpyitsai
+ယုံကြည် yonekyi
+ယောက် yout
+ရိုသေ rosay
+ရှေ့မှောက် shaemhaout
+လိုအပ် loaaut
+လုပ် lote
+လုံး lone
+လူအ luua
+သက်ဝင် saatwain
+သုံးစွဲ sonehcwal
+သူများ suumyarr
+အကြောင်း aakyaungg
+အချင်းချင်း aahkyinnhkyinn
+အစည်း aahcaee
+အဖြစ် aahpyit
+အား aarr
+အောင် aaung
+ကလေး kalayy
+ကိုယ်တိုင် kotine
+ကြား kyarr
+ခဲ့ hkae
+ချိုး hkyoe
+ဂုဏ် gun
+စစ်ဆေး hcaitsayy
+စရိုက် hcarite
+စိတ် hcate
+စိတ်ချ hcatehkya
+စီရင် hcerain
+ညီလာခံ nyelarhkan
+ညှဉ်းပန်း nyhainpaann
+ထိမ်းမြား htaimmyarr
+ထိုသို့ htoshoet
+ဒေသ days
+ပညာသင် panyarsain
+ပိုင်းခြား pinehkyarr
+ပိုမို pomo
+မိန်းမ meinm
+မူလ muul
+မဲ mell
+ယူဆ yuus
+ရည်ရွယ် rairwal
+ရာတွင် rartwin
+ရွေးချယ် rwayhkyaal
+လက္ခဏာ lakhkanar
+လို့ lhoet
+လုံခြုံ lonehkyuan
+လူမှုရေး luumhurayy
+လူ့အဖွဲ့အစည်း lhuaahpwalaahcaee
+သင့် sang
+သင်ကြား sainkyarr
+သတ် saat
+သဘောတရား sabhawtararr
+သာ sar
+အကာအကွယ် aakaraakwal
+အကျိုး aakyoe
+အချိန် aahkyane
+အခြေအနေ aahkyayaanay
+အတိုင်း aatine
+အတွင်း aatwin
+အပြစ်ဒဏ် aapyitdan
+အရာ aarar
+အသက်မွေး aasaatmway
+အာဏာပိုင် aarnarpine
+အားပေး aarrpayy
+အုပ်ချုပ် aotehkyaote
+ကင်းလွတ် kainnlwat
+ကာလ karl
+ကိုယ်ပိုင် kopine
+ကျယ် kyaal
+ကြမ်းကြုတ် kyamkyuat
+ကြားနာ kyarrnar
+ချင်း hkyinn
+ချုပ်ချယ် hkyaotehkyaal
+ငံ ngan
+ငြိမ်းချမ်း ngyaaimhkyam
+စဉ် hcain
+စနစ် hcanait
+စာတမ်း hcartam
+စာသား hcarsarr
+စား hcarr
+စေခိုင်း hcayhkine
+စောင့်စည်း hcawnghcaee
+စွ hcw
+စွက်ဖက် hcwathpaat
+ဆိုင် sine
+ဆောင် saung
+ဉာဏ် nyarn
+ညီ nye
+တင် tain
+တစ်နိုင် taitnine
+တတ် taat
+တန်း taann
+တရားစွဲဆိုခြင်း tararrhcwalsohkyinn
+တရားရုံး tararrrone
+တာဝန် tarwaan
+တော် taw
+ထင်မြင် htainmyin
+ထင်ရှား htainsharr
+ထပ်မံ htautman
+ထိ hti
+ထိန်းသိမ်း hteinsaim
+နယ်နိမိတ် naalnimate
+နေအိမ် nayaain
+နောက် nout
+နှစ် nhait
+နှိပ်စက် nhaiuthcaat
+ပစ္စည်းဥစ္စာ pahchcaeeuhchcar
+ပိုင်ဆိုင် pinesine
+ပုတ်ခတ် potehkaat
+ပေါင်းသင်း paunggsainn
+ပေါ်ပေါက် pawpout
+ပျက်စီး pyethcee
+ပျော် pyaw
+ပြင် pyin
+ပြုလုပ် pyulote
+ပြောင်းလဲ pyaungglell
+ဖီဆန် hpesaan
+ဖောက် hpout
+ဖျက်ဆီး hpyetsee
+ဖြ hpya
+ဖြစ်ထွန်း hpyithtwann
+ဖွင့် hpwng
+ဖွား hpwarr
+ဖွဲ့စည်း hpwalhcaee
+ဖွဲ့စည်းပုံ hpwalhcaeepone
+ဖွံ့ဖြိုး hpwanhpyaoe
+ဘက် bhaat
+များသည် myarrsai
+မျိုးရိုး myoeroe
+မွေး mway
+ယဉ်ကျေးမှု yainkyaayymhu
+ယူ yuu
+ယူဆချက် yuusahkyet
+ယောကျာ်း yawkyaar
+ရက် raat
+ရက်စက် raathcaat
+ရင်းနှီး rainnnhaee
+ရွက် rwat
+ရွေးကောက်ပွဲ rwaykoutpwal
+လစာ lahcar
+လုပ်ကိုင် lotekine
+လုပ်ငန်း lotengaann
+လူမျိုး luumyoe
+လောက lawk
+လောက် lout
+လျက် lyet
+လွှတ် lwhaat
+ဝ w
+ဝေငှ wayngha
+ဝှမ်း wham
+သန် saan
+သဘော sabhaw
+သိပ္ပံ sippan
+သို့ shoet
+သုခုမပညာ suhkumapanyar
+သူ့ shu
+သောက် sout
+ဟ h
+အကူအညီ aakuuaanye
+အစည်းအဝေး aahcaeeaawayy
+အစုံ aahcone
+အညီအမျှ aanyeaamyaha
+အတည်ပြု aataipyu
+အထက်ပါ aahtaatpar
+အထောက် aahtout
+အဓိပ္ပာယ် aadhipparal
+အပံ့ aapan
+အများ aamyarr
+အလုပ်လက်မဲ့ aalotelaatmae
+အသိအမှတ်ပြု aasiaamhaatpyu
+အသိုက်အဝန်း aasiteaawaann
+အာဏာ aarnar
+အားထုတ် aarrhtote
+အားလပ် aarrlaut
+ကတိ kati
+ကမ္ဘာ kambhar
+ကိစ္စ kihchc
+ကိုယ် ko
+ကိုယ်ကျင့်တရား kokyangtararr
+ကိုယ်စားလှယ် kohcarrlhaal
+ကိုယ်အင်္ဂါ koaaingar
+ကောက်ယူ koutyuu
+ကောင်းမွန်သော kaunggmwansaw
+ကဲ့သို့ kaeshoet
+ကျင့် kyang
+ကျင့်ဝတ် kyangwaat
+ကျင် kyin
+ကျင်းပ kyinnp
+ကျန်း kyann
+ကျန်းမာရေး kyannmarrayy
+ကျား kyarr
+ကျူးလွန် kyauulwan
+ကျူးလွန်သည် kyauulwansai
+ကျေးကျွန် kyaayykyawan
+ကျေးကျွန်အဖြစ် kyaayykyawanaahpyit
+ကြားသိ kyarrsi
+ကြိုးပမ်း kyaoepam
+ကြီးပွား kyeepwarr
+ကြီးလေးသော kyeelayysaw
+ကြေညာချက် kyaynyarhkyet
+ကြောက်ရွံ့ kyawwatrwan
+ကြောင်း kyaungg
+ကြေးငွေ kyayngway
+ကြံစည် kyaanhcai
+ကြံဆ kyaans
+ကြံဆောင် kyaansaung
+ကြွေးကြော် kyawaykyaw
+ကွာရှင်း kwarshinn
+ခင်မင် hkainmain
+ခိုလှုံ hkolhuan
+ခုခံ hkuhkan
+ချစ်ခင် hkyithkain
+ချိ hkyai
+ချိန် hkyane
+ချို့ငဲ့ hkyahoetngae
+ချီ hkyae
+ချုပ် hkyaote
+ချေပ hkyaayp
+ခြား hkyarr
+ခွာ hkwar
+ငယ် ngaal
+ငြင်းပယ် ngyinnpaal
+ငွေကြေး ngwaykyay
+စ hc
+စကားချီး hcakarrhkyaee
+စက်မှု hcaatmhu
+စစ် hcait
+စပ်လျဉ်း hcautlyain
+စာပေ hcarpay
+စာပေးစာယူ hcarpayyhcaryuu
+စာမျက်နှာ hcarmyetnhar
+စာသင်ကျောင်း hcarsainkyaungg
+စိ hci
+စီ hce
+စီးပွား hceepwarr
+စီးပွားရေး hceepwarrrayy
+စုပေါင်း hcupaungg
+စုဝေး hcuwayy
+စေသော hcaysaw
+စွပ်စွဲ hcwuthcwal
+စွမ်း hcwm
+စွဲကိုင် hcwalkine
+ဆ s
+ဆင့်ဆို sangso
+ဆည်းပူး saeepuu
+ဆန် saan
+ဆို so
+ဆီး see
+ဆုံး sone
+ဆုံးဖြတ် sonehpyat
+ဆုံးမ sonem
+ဆောက်တည် souttai
+ဆော် saw
+ဆေးဝါး sayywarr
+ဆွဲ swal
+ဇစ်မြစ် jaitmyit
+ဇာတိ jarti
+တစ်ခုခု taithkuhku
+တစ်စု taithcu
+တစ်ဆင့် taitsang
+တစ်ရပ် taitraut
+တည်တံ့ taitan
+တည်း taee
+တရားစွဲဆို tararrhcwalso
+တရားလက်လွတ် tararrlaatlwat
+တားမြစ် tarrmyit
+တိုင်းသူပြည်သား tinesuupyisarr
+တိုးတက်မှု toetaatmhu
+တွေးခေါ် twayhkaw
+ထက် htaat
+ထို့ hthoet
+ထုတ် htote
+ထူထောင် htuuhtaung
+ထောက်ထား htouthtarr
+ထွက် htwat
+ထွန်းကား htwannkarr
+ဒီ de
+ဒီဇင်ဘာလ dejainbharl
+နစ်နာချက် naitnarhkyet
+နယ်ပယ် naalpaal
+နား narr
+နားလည်မှု narrlaimhu
+နိုင်ငံတကာ ninengantakar
+နိုင်ထက်စီးနင်း ninehtaathceenainn
+နောက်ဆုံး noutsone
+နေ့ nae
+နွယ် nwal
+နှင် nhain
+နှစ်သက် nhaitsaat
+နှစ်ဦးနှစ် nhaitunhait
+နှလုံးသွင်း nhaloneswin
+နှိပ်စက်ကလူ nhaiuthcaatkaluu
+နှောင် nhaawin
+ပင် pain
+ပစ္စည်း pahchcaee
+ပညာရေး panyarrayy
+ပညာသည် panyarsai
+ပတ် paat
+ပတ်သက် paatsaat
+ပါရှိ parshi
+ပါသည် parsai
+ပိတ် pate
+ပိုင့် pong
+ပိုင်ဆိုင်ခွင့် pinesinehkwng
+ပုဂ္ဂိုလ် puggol
+ပုန်ကန် ponekaan
+ပူ puu
+ပူးပေါင်း puupaungg
+ပေါင်း paungg
+ပေါ် paw
+ပေါ်လာ pawlar
+ပျက်ကွက် pyetkwat
+ပြစ် pyit
+ပြည်တွင်း pyitwin
+ပြည်ပ pyip
+ပြည်သူပြည်သား pyisuupyisarr
+ပြဌာန်း pyahtarann
+ပြန် pyan
+ပြန်လာ pyanlar
+ပြသ pyas
+ပြောဆို pyawwso
+ပြေး pyay
+ပွဲ pwal
+ဖက်စပ် hpaathcaut
+ဖတ် hpaat
+ဖန်တီး hpaantee
+ဖမ်းဆီး hpamsee
+ဖိစီး hpihcee
+ဖောက်ဖျက် hpouthpyet
+ဖျက်သိမ်း hpyetsaim
+ဖြစ်မြောက် hpyitmyawwat
+ဖြာ hpyaar
+ဘဝ bhaw
+ဘာသာစကား bharsarhcakarr
+မတတ် mataat
+မထီလေးစား mahtelayyhcarr
+မလွှဲသာ malwhaellsar
+မာ mar
+မား marr
+မိခင် mihkain
+မိဘ mibh
+မို mo
+မုဆိုးမ musoem
+မူ muu
+မေတ္တာ mayttar
+မဲ့ mae
+မ့် m
+မြင့် myang
+မြင်သာ myinsar
+မြောက် myawwat
+မြှင့် myahang
+မွေ့လျော် mwaelyaw
+မှန်သော mhaansaw
+ယခု yahku
+ယင်းသို့ yainnshoet
+ယေဘူယျ yaybhuuyya
+ယောက်ျား youtyarr
+ရည် rai
+ရည်ရွယ်ချက် rairwalhkyet
+ရပိုင်ခွင့် rapinehkwng
+ရပ် raut
+ရပ်တည် rauttai
+ရပ်ရွာ rautrwar
+ရာဇဝင် rarjawain
+ရေ ray
+ရွေးကောက် rwaykout
+ရွှေ့ပြောင်း shwaepyaungg
+ရှင် shin
+ရှင်သန် shinsaan
+ရှင်းလင်း shinnlainn
+ရှာ shar
+ရှာမှီး sharmhaee
+ရှောင် shawin
+လက်ခံ laathkan
+လက်ထပ် laathtaut
+လက်နက် laatnaat
+လက်မှုပညာ laatmhupanyar
+လက်ဦး laatu
+လင်မယား lainmayarr
+လမ်း lam
+လမ်းများ lammyarr
+လို lo
+လိုက်စား litehcarr
+လိုလားချက် lolarrhkyet
+လုပ်ရပ် loteraut
+လူမျိုးစု luumyoehcu
+လူမှုဆက်ဆံရေး luumhusaatsanrayy
+လူသား luusarr
+လူအား luuaarr
+လျော်ကန် lyawkaan
+လျှို့ဝှက် shhoetwhaat
+လျှောက် shout
+လွတ်ကင်း lwatkainn
+လှန် lhaan
+လှုံ lhuan
+ဝတ္တရား wattararr
+ဝတ်ပြု waatpyu
+ဝန်ထမ်း waanhtam
+ဝမ်းစာ wamhcar
+ဝယ် waal
+ဝေဖန် wayhpaan
+သက်ဆိုင်ရာ saatsinerar
+သက်ရောက် saatrout
+သက်သာ saatsar
+သင့်တော် sangtaw
+သင့်မြတ် sangmyat
+သင် sain
+သင်ပြ sainpya
+သင်ယူ sainyuu
+သည်းခံ saeehkan
+သတင်း satainn
+သတို့သမီး sathoetsamee
+သတို့သား sathoetsarr
+သတ်မှတ် saatmhaat
+သန္နိဋ္ဌာန်ချ sannithtaranhkya
+သဖြင့် sahpyang
+သဖွယ် sahpwal
+သဘာ sabhar
+သဘာဝကျ sabharwakya
+သဘောဆန္ဒ sabhawsand
+သယံဇာတ sayanjart
+သာယာ saryar
+သာလျှင် sarshin
+သား sarr
+သိတတ် sitaat
+သိမှတ် simhaat
+သို့မဟုတ် shoetmahote
+သွန်သင် swansain
+သွား swarr
+သွားလာ swarrlar
+ဟာ har
+ဟူ huu
+ဟူသမျှ huusamyaha
+ဟူသော huusaw
+အကိုင် aakine
+အကျင့်သိက္ခာ aakyangsikhkar
+အကျိုးကျေးဇူး aakyoekyaayyjuu
+အကျိုးအမြတ် aakyoeaamyat
+အကြောင်းပြု aakyaunggpyu
+အကြောင်းအရာ aakyaunggaarar
+အခကြေးငွေ aahkakyayngway
+အခင်း aahkainn
+အခမဲ့ aahkamae
+အချုပ်အခြာ aahkyaoteaahkyaar
+အခြေပြု aahkyaypyu
+အင်အား aainaarr
+အစဉ် aahcain
+အစည်းအရုံး aahcaeeaarone
+အစာ aahcar
+အစား aahcarr
+အစိုးရ aahcoer
+အစေအပါး aahcayaaparr
+အဆင့် aasang
+အဆုံးအဖြတ် aasoneaahpyat
+အတင်းအကျပ် aatainnaakyaut
+အတန်း aataann
+အထက် aahtaat
+အထက်တန်း aahtaattaann
+အထိ aahti
+အထူး aahtuu
+အထောက်အထား aahtoutaahtarr
+အထွေထွေ aahtwayhtway
+အဓမ္မ aadhamm
+အဓိက aadhik
+အနည်းဆုံး aanaeesone
+အနားယူ aanarryuu
+အနေ aanay
+အနှောင့် aanhaawng
+အပြစ် aapyit
+အပြု aapyu
+အမျိုး aamyoe
+အမှတ် aamhaat
+အမှန် aamhaan
+အယှက် aayhaat
+အရည်အချင်း aaraiaahkyinn
+အရောင် aaraung
+အရောင်းအဝယ် aaraunggaawaal
+အရွယ်ရောက် aarwalrout
+အလားတူ aalarrtuu
+အလုပ်ခွင် aalotehkwin
+အလုပ်သမား aalotesamarr
+အဝ aaw
+အဝတ်အထည် aawaataahtai
+အသက် aasaat
+အသက်အရွယ် aasaataarwal
+အသင်းအဖွဲ့ aasainnaahpwal
+အသား aasarr
+အသိ aasi
+အသီးသီး aaseesee
+အသုံး aasone
+အာနိသင် aarnisain
+အားလျော်စွာ aarrlyawhcwar
+အိမ်ထောင် aainhtaung
+အိမ်ထောင်ပြု aainhtaungpyu
+အိုမင်း aomainn
+အုတ်မြစ် aotemyit
+အုပ်စိုး aotehcoe
+ဥစ္စာ uhchcar
diff --git a/common/testData/units/_readme.txt b/common/testData/units/_readme.txt
new file mode 100644
index 0000000..323c53f
--- /dev/null
+++ b/common/testData/units/_readme.txt
@@ -0,0 +1,6 @@
+# Test data for units: conversions and preferences
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+# The format may vary between folders or files.
diff --git a/common/testData/units/unitPreferencesTest.txt b/common/testData/units/unitPreferencesTest.txt
new file mode 100644
index 0000000..16da6ab
--- /dev/null
+++ b/common/testData/units/unitPreferencesTest.txt
@@ -0,0 +1,450 @@
+# Test data for unit preferences
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+#
+# Format:
+# Quantity; Usage; Region; Input (r); Input (d); Input Unit; Output (r); Output (d); Output Unit
+#
+# Use: Convert the Input amount & unit according to the Usage and Region.
+# The result should match the Output amount and unit.
+# Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations
+# have two options for testing based on the precision in their implementations. For example:
+# 3429 / 12500; 0.27432; meter;
+# The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have
+# both a rational and decimal amount; the others will have a single integer value, such as:
+# length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch
+# The input and output units are unit identifers; in particular, the output does not have further processing:
+# • no localization
+# • no adjustment for pluralization
+# • no formatted with the skeleton
+# • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
+#
+# Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestUnitPreferences results.
+
+area; default; 001; 1100000; 1100000.0; square-meter; 11 / 10; 1.1; square-kilometer
+area; default; 001; 1000000; 1000000.0; square-meter; 1; 1.0; square-kilometer
+area; default; 001; 900000; 900000.0; square-meter; 90; 90.0; hectare
+area; default; 001; 10000; 10000.0; square-meter; 1; 1.0; hectare
+area; default; 001; 9000; 9000.0; square-meter; 9000; 9000.0; square-meter
+area; default; 001; 1; 1.0; square-meter; 1; 1.0; square-meter
+area; default; 001; 9 / 10; 0.9; square-meter; 9000; 9000.0; square-centimeter
+area; default; 001; 1 / 10000; 1.0E-4; square-meter; 1; 1.0; square-centimeter
+area; default; 001; 9 / 100000; 9.0E-5; square-meter; 9 / 10; 0.9; square-centimeter
+
+area; default; GB; 222577103232 / 78125; 2848986.9213696; square-meter; 11 / 10; 1.1; square-mile
+area; default; GB; 40468564224 / 15625; 2589988.110336; square-meter; 1; 1.0; square-mile
+area; default; GB; 182108539008 / 78125; 2330989.2993024; square-meter; 576; 576.0; acre
+area; default; GB; 316160658 / 78125; 4046.8564224; square-meter; 1; 1.0; acre
+area; default; GB; 1422722961 / 390625; 3642.17078016; square-meter; 39204; 39204.0; square-foot
+area; default; GB; 145161 / 1562500; 0.09290304; square-meter; 1; 1.0; square-foot
+area; default; GB; 1306449 / 15625000; 0.083612736; square-meter; 648 / 5; 129.6; square-inch
+area; default; GB; 16129 / 25000000; 6.4516E-4; square-meter; 1; 1.0; square-inch
+area; default; GB; 145161 / 250000000; 5.80644E-4; square-meter; 9 / 10; 0.9; square-inch
+
+area; geograph; 001; 1100000; 1100000.0; square-meter; 11 / 10; 1.1; square-kilometer
+area; geograph; 001; 1000000; 1000000.0; square-meter; 1; 1.0; square-kilometer
+area; geograph; 001; 900000; 900000.0; square-meter; 9 / 10; 0.9; square-kilometer
+
+area; geograph; GB; 222577103232 / 78125; 2848986.9213696; square-meter; 11 / 10; 1.1; square-mile
+area; geograph; GB; 40468564224 / 15625; 2589988.110336; square-meter; 1; 1.0; square-mile
+area; geograph; GB; 182108539008 / 78125; 2330989.2993024; square-meter; 9 / 10; 0.9; square-mile
+
+area; land; 001; 11000; 11000.0; square-meter; 11 / 10; 1.1; hectare
+area; land; 001; 10000; 10000.0; square-meter; 1; 1.0; hectare
+area; land; 001; 9000; 9000.0; square-meter; 9 / 10; 0.9; hectare
+
+area; land; GB; 1738883619 / 390625; 4451.54206464; square-meter; 11 / 10; 1.1; acre
+area; land; GB; 316160658 / 78125; 4046.8564224; square-meter; 1; 1.0; acre
+area; land; GB; 1422722961 / 390625; 3642.17078016; square-meter; 9 / 10; 0.9; acre
+
+concentration; blood-glucose; AG; 662435483600000000000000; 6.624354836E23; item-per-cubic-meter; 11 / 10; 1.1; millimole-per-liter
+concentration; blood-glucose; AG; 602214076000000000000000; 6.02214076E23; item-per-cubic-meter; 1; 1.0; millimole-per-liter
+concentration; blood-glucose; AG; 541992668400000000000000; 5.419926684E23; item-per-cubic-meter; 9 / 10; 0.9; millimole-per-liter
+
+concentration; default; 001; 11 / 10; 1.1; item-per-cubic-meter; 11 / 10; 1.1; item-per-cubic-meter
+concentration; default; 001; 1; 1.0; item-per-cubic-meter; 1; 1.0; item-per-cubic-meter
+concentration; default; 001; 9 / 10; 0.9; item-per-cubic-meter; 9 / 10; 0.9; item-per-cubic-meter
+
+consumption; default; 001; 11 / 1000000000; 1.1E-8; cubic-meter-per-meter; 11 / 10; 1.1; liter-per-100-kilometer
+consumption; default; 001; 1 / 100000000; 1.0E-8; cubic-meter-per-meter; 1; 1.0; liter-per-100-kilometer
+consumption; default; 001; 9 / 1000000000; 9.0E-9; cubic-meter-per-meter; 9 / 10; 0.9; liter-per-100-kilometer
+
+consumption; vehicle-fuel; 001; 11 / 1000000000; 1.1E-8; cubic-meter-per-meter; 11 / 10; 1.1; liter-per-100-kilometer
+consumption; vehicle-fuel; 001; 1 / 100000000; 1.0E-8; cubic-meter-per-meter; 1; 1.0; liter-per-100-kilometer
+consumption; vehicle-fuel; 001; 9 / 1000000000; 9.0E-9; cubic-meter-per-meter; 9 / 10; 0.9; liter-per-100-kilometer
+
+consumption; vehicle-fuel; BR; 11 / 10000000; 1.1E-6; cubic-meter-per-meter; 11 / 10; 1.1; liter-per-kilometer
+consumption; vehicle-fuel; BR; 1 / 1000000; 1.0E-6; cubic-meter-per-meter; 1; 1.0; liter-per-kilometer
+consumption; vehicle-fuel; BR; 9 / 10000000; 9.0E-7; cubic-meter-per-meter; 9 / 10; 0.9; liter-per-kilometer
+
+consumption-inverse; default; 001; 110000000; 1.1E8; meter-per-cubic-meter; 11 / 10; 1.1; kilometer-per-centiliter
+consumption-inverse; default; 001; 100000000; 1.0E8; meter-per-cubic-meter; 1; 1.0; kilometer-per-centiliter
+consumption-inverse; default; 001; 90000000; 9.0E7; meter-per-cubic-meter; 9 / 10; 0.9; kilometer-per-centiliter
+
+consumption-inverse; vehicle-fuel; 001; 110000000; 1.1E8; meter-per-cubic-meter; 11 / 10; 1.1; kilometer-per-centiliter
+consumption-inverse; vehicle-fuel; 001; 100000000; 1.0E8; meter-per-cubic-meter; 1; 1.0; kilometer-per-centiliter
+consumption-inverse; vehicle-fuel; 001; 90000000; 9.0E7; meter-per-cubic-meter; 9 / 10; 0.9; kilometer-per-centiliter
+
+consumption-inverse; vehicle-fuel; US; 52800000000 / 112903; 467658.0781732992; meter-per-cubic-meter; 11 / 10; 1.1; mile-per-gallon
+consumption-inverse; vehicle-fuel; US; 48000000000 / 112903; 425143.707430272; meter-per-cubic-meter; 1; 1.0; mile-per-gallon
+consumption-inverse; vehicle-fuel; US; 43200000000 / 112903; 382629.3366872448; meter-per-cubic-meter; 9 / 10; 0.9; mile-per-gallon
+
+consumption-inverse; vehicle-fuel; CA; 177027840000 / 454609; 389406.8089281118; meter-per-cubic-meter; 11 / 10; 1.1; mile-per-gallon-imperial
+consumption-inverse; vehicle-fuel; CA; 160934400000 / 454609; 354006.1899346471; meter-per-cubic-meter; 1; 1.0; mile-per-gallon-imperial
+consumption-inverse; vehicle-fuel; CA; 144840960000 / 454609; 318605.5709411824; meter-per-cubic-meter; 9 / 10; 0.9; mile-per-gallon-imperial
+
+duration; default; 001; 95040; 95040.0; second; 11 / 10; 1.1; day
+duration; default; 001; 86400; 86400.0; second; 1; 1.0; day
+duration; default; 001; 77760; 77760.0; second; 108 / 5; 21.6; hour
+duration; default; 001; 3600; 3600.0; second; 1; 1.0; hour
+duration; default; 001; 3240; 3240.0; second; 54; 54.0; minute
+duration; default; 001; 60; 60.0; second; 1; 1.0; minute
+duration; default; 001; 54; 54.0; second; 54; 54.0; second
+duration; default; 001; 1; 1.0; second; 1; 1.0; second
+duration; default; 001; 9 / 10; 0.9; second; 900; 900.0; millisecond
+duration; default; 001; 1 / 1000; 0.001; second; 1; 1.0; millisecond
+duration; default; 001; 9 / 10000; 9.0E-4; second; 900; 900.0; microsecond
+duration; default; 001; 1 / 1000000; 1.0E-6; second; 1; 1.0; microsecond
+duration; default; 001; 9 / 10000000; 9.0E-7; second; 900; 900.0; nanosecond
+duration; default; 001; 1 / 1000000000; 1.0E-9; second; 1; 1.0; nanosecond
+duration; default; 001; 9 / 10000000000; 9.0E-10; second; 9 / 10; 0.9; nanosecond
+
+duration; media; 001; 66; 66.0; second; 1; minute; 6; 6.0; second
+duration; media; 001; 60; 60.0; second; 1; minute; 0; 0.0; second
+duration; media; 001; 54; 54.0; second; 54; 54.0; second
+duration; media; 001; 1; 1.0; second; 1; 1.0; second
+duration; media; 001; 9 / 10; 0.9; second; 9 / 10; 0.9; second
+
+energy; default; 001; 3960000; 3960000.0; kilogram-square-meter-per-square-second; 11 / 10; 1.1; kilowatt-hour
+energy; default; 001; 3600000; 3600000.0; kilogram-square-meter-per-square-second; 1; 1.0; kilowatt-hour
+energy; default; 001; 3240000; 3240000.0; kilogram-square-meter-per-square-second; 9 / 10; 0.9; kilowatt-hour
+
+energy; food; US; 23012 / 5; 4602.4; kilogram-square-meter-per-square-second; 11 / 10; 1.1; foodcalorie
+energy; food; US; 4184; 4184.0; kilogram-square-meter-per-square-second; 1; 1.0; foodcalorie
+energy; food; US; 18828 / 5; 3765.6; kilogram-square-meter-per-square-second; 9 / 10; 0.9; foodcalorie
+
+energy; food; 001; 23012 / 5; 4602.4; kilogram-square-meter-per-square-second; 11 / 10; 1.1; kilocalorie
+energy; food; 001; 4184; 4184.0; kilogram-square-meter-per-square-second; 1; 1.0; kilocalorie
+energy; food; 001; 18828 / 5; 3765.6; kilogram-square-meter-per-square-second; 9 / 10; 0.9; kilocalorie
+
+length; default; 001; 1100; 1100.0; meter; 11 / 10; 1.1; kilometer
+length; default; 001; 1000; 1000.0; meter; 1; 1.0; kilometer
+length; default; 001; 900; 900.0; meter; 900; 900.0; meter
+length; default; 001; 1; 1.0; meter; 1; 1.0; meter
+length; default; 001; 9 / 10; 0.9; meter; 90; 90.0; centimeter
+length; default; 001; 1 / 100; 0.01; meter; 1; 1.0; centimeter
+length; default; 001; 9 / 1000; 0.009; meter; 9 / 10; 0.9; centimeter
+
+length; default; GB; 1106424 / 625; 1770.2784; meter; 11 / 10; 1.1; mile
+length; default; GB; 201168 / 125; 1609.344; meter; 1; 1.0; mile
+length; default; GB; 905256 / 625; 1448.4096; meter; 4752; 4752.0; foot
+length; default; GB; 381 / 1250; 0.3048; meter; 1; 1.0; foot
+length; default; GB; 3429 / 12500; 0.27432; meter; 54 / 5; 10.8; inch
+length; default; GB; 127 / 5000; 0.0254; meter; 1; 1.0; inch
+length; default; GB; 1143 / 50000; 0.02286; meter; 9 / 10; 0.9; inch
+
+length; person; 001; 11 / 1000; 0.011; meter; 11 / 10; 1.1; centimeter
+length; person; 001; 1 / 100; 0.01; meter; 1; 1.0; centimeter
+length; person; 001; 9 / 1000; 0.009; meter; 9 / 10; 0.9; centimeter
+
+length; person; CA; 1397 / 50000; 0.02794; meter; 11 / 10; 1.1; inch
+length; person; CA; 127 / 5000; 0.0254; meter; 1; 1.0; inch
+length; person; CA; 1143 / 50000; 0.02286; meter; 9 / 10; 0.9; inch
+
+length; person-height; 001; 11 / 1000; 0.011; meter; 11 / 10; 1.1; centimeter
+length; person-height; 001; 1 / 100; 0.01; meter; 1; 1.0; centimeter
+length; person-height; 001; 9 / 1000; 0.009; meter; 9 / 10; 0.9; centimeter
+
+length; person-height; CA; 11811 / 12500; 0.94488; meter; 3; foot; 6 / 5; 1.2; inch
+length; person-height; CA; 1143 / 1250; 0.9144; meter; 3; foot; 0; 0.0; inch
+length; person-height; CA; 11049 / 12500; 0.88392; meter; 174 / 5; 34.8; inch
+length; person-height; CA; 127 / 5000; 0.0254; meter; 1; 1.0; inch
+length; person-height; CA; 1143 / 50000; 0.02286; meter; 9 / 10; 0.9; inch
+
+length; person-height; AT; 11 / 10; 1.1; meter; 1; meter; 10; 10.0; centimeter
+length; person-height; AT; 1; 1.0; meter; 1; meter; 0; 0.0; centimeter
+length; person-height; AT; 9 / 10; 0.9; meter; 0; meter; 90; 90.0; centimeter
+
+length; rainfall; BR; 11 / 1000; 0.011; meter; 11 / 10; 1.1; centimeter
+length; rainfall; BR; 1 / 100; 0.01; meter; 1; 1.0; centimeter
+length; rainfall; BR; 9 / 1000; 0.009; meter; 9 / 10; 0.9; centimeter
+
+length; rainfall; US; 1397 / 50000; 0.02794; meter; 11 / 10; 1.1; inch
+length; rainfall; US; 127 / 5000; 0.0254; meter; 1; 1.0; inch
+length; rainfall; US; 1143 / 50000; 0.02286; meter; 9 / 10; 0.9; inch
+
+length; rainfall; 001; 11 / 10000; 0.0011; meter; 11 / 10; 1.1; millimeter
+length; rainfall; 001; 1 / 1000; 0.001; meter; 1; 1.0; millimeter
+length; rainfall; 001; 9 / 10000; 9.0E-4; meter; 9 / 10; 0.9; millimeter
+
+length; road; 001; 1000; 1000.0; meter; 1; 1.0; kilometer
+length; road; 001; 900; 900.0; meter; 9 / 10; 0.9; kilometer
+length; road; 001; 800; 800.0; meter; 800; 800.0; meter
+length; road; 001; 300; 300.0; meter; 300; 300.0; meter
+length; road; 001; 2999 / 10; 299.9; meter; 2999 / 10; 299.9; meter
+length; road; 001; 1; 1.0; meter; 1; 1.0; meter
+length; road; 001; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
+
+length; road; US; 603504 / 625; 965.6064; meter; 3 / 5; 0.6; mile
+length; road; US; 100584 / 125; 804.672; meter; 1 / 2; 0.5; mile
+length; road; US; 402336 / 625; 643.7376; meter; 2112; 2112.0; foot
+length; road; US; 762 / 25; 30.48; meter; 100; 100.0; foot
+length; road; US; 380619 / 12500; 30.44952; meter; 999 / 10; 99.9; foot
+length; road; US; 381 / 1250; 0.3048; meter; 1; 1.0; foot
+length; road; US; 3429 / 12500; 0.27432; meter; 9 / 10; 0.9; foot
+
+length; road; GB; 603504 / 625; 965.6064; meter; 3 / 5; 0.6; mile
+length; road; GB; 100584 / 125; 804.672; meter; 1 / 2; 0.5; mile
+length; road; GB; 402336 / 625; 643.7376; meter; 704; 704.0; yard
+length; road; GB; 2286 / 25; 91.44; meter; 100; 100.0; yard
+length; road; GB; 1141857 / 12500; 91.34856; meter; 999 / 10; 99.9; yard
+length; road; GB; 1143 / 1250; 0.9144; meter; 1; 1.0; yard
+length; road; GB; 10287 / 12500; 0.82296; meter; 9 / 10; 0.9; yard
+
+length; road; SE; 11000; 11000.0; meter; 11 / 10; 1.1; mile-scandinavian
+length; road; SE; 10000; 10000.0; meter; 1; 1.0; mile-scandinavian
+length; road; SE; 9000; 9000.0; meter; 9; 9.0; kilometer
+length; road; SE; 1000; 1000.0; meter; 1; 1.0; kilometer
+length; road; SE; 900; 900.0; meter; 900; 900.0; meter
+length; road; SE; 300; 300.0; meter; 300; 300.0; meter
+length; road; SE; 2999 / 10; 299.9; meter; 2999 / 10; 299.9; meter
+length; road; SE; 1; 1.0; meter; 1; 1.0; meter
+length; road; SE; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
+
+length; snowfall; 001; 11 / 1000; 0.011; meter; 11 / 10; 1.1; centimeter
+length; snowfall; 001; 1 / 100; 0.01; meter; 1; 1.0; centimeter
+length; snowfall; 001; 9 / 1000; 0.009; meter; 9 / 10; 0.9; centimeter
+
+length; snowfall; US; 1397 / 50000; 0.02794; meter; 11 / 10; 1.1; inch
+length; snowfall; US; 127 / 5000; 0.0254; meter; 1; 1.0; inch
+length; snowfall; US; 1143 / 50000; 0.02286; meter; 9 / 10; 0.9; inch
+
+length; vehicle; GB; 4191 / 12500; 0.33528; meter; 1; foot; 6 / 5; 1.2; inch
+length; vehicle; GB; 381 / 1250; 0.3048; meter; 1; foot; 0; 0.0; inch
+length; vehicle; GB; 3429 / 12500; 0.27432; meter; 0; foot; 54 / 5; 10.8; inch
+
+length; vehicle; 001; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
+length; vehicle; 001; 1; 1.0; meter; 1; 1.0; meter
+length; vehicle; 001; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
+
+length; vehicle; MX; 11 / 10; 1.1; meter; 1; meter; 10; 10.0; centimeter
+length; vehicle; MX; 1; 1.0; meter; 1; meter; 0; 0.0; centimeter
+length; vehicle; MX; 9 / 10; 0.9; meter; 0; meter; 90; 90.0; centimeter
+
+length; visiblty; 001; 200; 200.0; meter; 1 / 5; 0.2; kilometer
+length; visiblty; 001; 100; 100.0; meter; 1 / 10; 0.1; kilometer
+length; visiblty; 001; 1; 1.0; meter; 1; 1.0; meter
+length; visiblty; 001; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
+length; visiblty; 001; 0; 0.0; meter; 0; 0.0; meter
+
+length; visiblty; DE; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
+length; visiblty; DE; 1; 1.0; meter; 1; 1.0; meter
+length; visiblty; DE; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
+
+length; visiblty; GB; 1106424 / 625; 1770.2784; meter; 11 / 10; 1.1; mile
+length; visiblty; GB; 201168 / 125; 1609.344; meter; 1; 1.0; mile
+length; visiblty; GB; 905256 / 625; 1448.4096; meter; 4752; 4752.0; foot
+length; visiblty; GB; 381 / 1250; 0.3048; meter; 1; 1.0; foot
+length; visiblty; GB; 3429 / 12500; 0.27432; meter; 9 / 10; 0.9; foot
+
+mass; default; 001; 1100; 1100.0; kilogram; 11 / 10; 1.1; metric-ton
+mass; default; 001; 1000; 1000.0; kilogram; 1; 1.0; metric-ton
+mass; default; 001; 900; 900.0; kilogram; 900; 900.0; kilogram
+mass; default; 001; 1; 1.0; kilogram; 1; 1.0; kilogram
+mass; default; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram
+mass; default; 001; 1 / 1000; 0.001; kilogram; 1; 1.0; gram
+mass; default; 001; 9 / 10000; 9.0E-4; kilogram; 900; 900.0; milligram
+mass; default; 001; 1 / 1000000; 1.0E-6; kilogram; 1; 1.0; milligram
+mass; default; 001; 9 / 10000000; 9.0E-7; kilogram; 900; 900.0; microgram
+mass; default; 001; 1 / 1000000000; 1.0E-9; kilogram; 1; 1.0; microgram
+mass; default; 001; 9 / 10000000000; 9.0E-10; kilogram; 9 / 10; 0.9; microgram
+
+mass; default; GB; 498951607 / 500000; 997.903214; kilogram; 11 / 10; 1.1; ton
+mass; default; GB; 45359237 / 50000; 907.18474; kilogram; 1; 1.0; ton
+mass; default; GB; 408233133 / 500000; 816.466266; kilogram; 1800; 1800.0; pound
+mass; default; GB; 45359237 / 100000000; 0.45359237; kilogram; 1; 1.0; pound
+mass; default; GB; 408233133 / 1000000000; 0.408233133; kilogram; 72 / 5; 14.4; ounce
+mass; default; GB; 45359237 / 1600000000; 0.028349523125; kilogram; 1; 1.0; ounce
+mass; default; GB; 408233133 / 16000000000; 0.0255145708125; kilogram; 9 / 10; 0.9; ounce
+
+mass; person; 001; 11 / 10; 1.1; kilogram; 11 / 10; 1.1; kilogram
+mass; person; 001; 1; 1.0; kilogram; 1; 1.0; kilogram
+mass; person; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram
+mass; person; 001; 1 / 1000; 0.001; kilogram; 1; 1.0; gram
+mass; person; 001; 9 / 10000; 9.0E-4; kilogram; 9 / 10; 0.9; gram
+
+mass; person; DZ; 11 / 10; 1.1; kilogram; 1; kilogram; 100; 100.0; gram
+mass; person; DZ; 1; 1.0; kilogram; 1; kilogram; 0; 0.0; gram
+mass; person; DZ; 9 / 10; 0.9; kilogram; 0; kilogram; 900; 900.0; gram
+
+mass; person; US; 498951607 / 1000000000; 0.498951607; kilogram; 11 / 10; 1.1; pound
+mass; person; US; 45359237 / 100000000; 0.45359237; kilogram; 1; 1.0; pound
+mass; person; US; 408233133 / 1000000000; 0.408233133; kilogram; 0; pound; 72 / 5; 14.4; ounce
+
+mass; person; GB; 3492661249 / 500000000; 6.985322498; kilogram; 1; stone; 7 / 5; 1.4; pound
+mass; person; GB; 317514659 / 50000000; 6.35029318; kilogram; 1; stone; 0; 0.0; pound
+mass; person; GB; 2857631931 / 500000000; 5.715263862; kilogram; 12; pound; 48 / 5; 9.6; ounce
+mass; person; GB; 45359237 / 100000000; 0.45359237; kilogram; 1; pound; 0; 0.0; ounce
+mass; person; GB; 408233133 / 1000000000; 0.408233133; kilogram; 0; pound; 72 / 5; 14.4; ounce
+
+mass; person; HK; 498951607 / 1000000000; 0.498951607; kilogram; 1; pound; 8 / 5; 1.6; ounce
+mass; person; HK; 45359237 / 100000000; 0.45359237; kilogram; 1; pound; 0; 0.0; ounce
+mass; person; HK; 408233133 / 1000000000; 0.408233133; kilogram; 0; pound; 72 / 5; 14.4; ounce
+
+mass-density; blood-glucose; 001; 11 / 1000; 0.011; kilogram-per-cubic-meter; 11 / 10; 1.1; milligram-per-deciliter
+mass-density; blood-glucose; 001; 1 / 100; 0.01; kilogram-per-cubic-meter; 1; 1.0; milligram-per-deciliter
+mass-density; blood-glucose; 001; 9 / 1000; 0.009; kilogram-per-cubic-meter; 9 / 10; 0.9; milligram-per-deciliter
+
+mass-density; default; 001; 11 / 10; 1.1; kilogram-per-cubic-meter; 11 / 10; 1.1; kilogram-per-cubic-meter
+mass-density; default; 001; 1; 1.0; kilogram-per-cubic-meter; 1; 1.0; kilogram-per-cubic-meter
+mass-density; default; 001; 9 / 10; 0.9; kilogram-per-cubic-meter; 9 / 10; 0.9; kilogram-per-cubic-meter
+
+power; default; 001; 1100000000; 1.1E9; kilogram-square-meter-per-cubic-second; 11 / 10; 1.1; gigawatt
+power; default; 001; 1000000000; 1.0E9; kilogram-square-meter-per-cubic-second; 1; 1.0; gigawatt
+power; default; 001; 900000000; 9.0E8; kilogram-square-meter-per-cubic-second; 900; 900.0; megawatt
+power; default; 001; 1000000; 1000000.0; kilogram-square-meter-per-cubic-second; 1; 1.0; megawatt
+power; default; 001; 900000; 900000.0; kilogram-square-meter-per-cubic-second; 900; 900.0; kilowatt
+power; default; 001; 1000; 1000.0; kilogram-square-meter-per-cubic-second; 1; 1.0; kilowatt
+power; default; 001; 900; 900.0; kilogram-square-meter-per-cubic-second; 900; 900.0; watt
+power; default; 001; 1; 1.0; kilogram-square-meter-per-cubic-second; 1; 1.0; watt
+power; default; 001; 9 / 10; 0.9; kilogram-square-meter-per-cubic-second; 900; 900.0; milliwatt
+power; default; 001; 1 / 1000; 0.001; kilogram-square-meter-per-cubic-second; 1; 1.0; milliwatt
+power; default; 001; 9 / 10000; 9.0E-4; kilogram-square-meter-per-cubic-second; 9 / 10; 0.9; milliwatt
+
+power; engine; 001; 1100; 1100.0; kilogram-square-meter-per-cubic-second; 11 / 10; 1.1; kilowatt
+power; engine; 001; 1000; 1000.0; kilogram-square-meter-per-cubic-second; 1; 1.0; kilowatt
+power; engine; 001; 900; 900.0; kilogram-square-meter-per-cubic-second; 9 / 10; 0.9; kilowatt
+
+power; engine; GB; 410134929370248621 / 500000000000000; 820.2698587404972; kilogram-square-meter-per-cubic-second; 11 / 10; 1.1; horsepower
+power; engine; GB; 37284993579113511 / 50000000000000; 745.6998715822702; kilogram-square-meter-per-cubic-second; 1; 1.0; horsepower
+power; engine; GB; 335564942212021599 / 500000000000000; 671.1298844240432; kilogram-square-meter-per-cubic-second; 9 / 10; 0.9; horsepower
+
+pressure; baromtrc; 001; 110; 110.0; kilogram-per-meter-square-second; 11 / 10; 1.1; hectopascal
+pressure; baromtrc; 001; 100; 100.0; kilogram-per-meter-square-second; 1; 1.0; hectopascal
+pressure; baromtrc; 001; 90; 90.0; kilogram-per-meter-square-second; 9 / 10; 0.9; hectopascal
+
+pressure; baromtrc; IN; 37250275043751 / 10000000000; 3725.0275043751; kilogram-per-meter-square-second; 11 / 10; 1.1; inch-ofhg
+pressure; baromtrc; IN; 3386388640341 / 1000000000; 3386.388640341; kilogram-per-meter-square-second; 1; 1.0; inch-ofhg
+pressure; baromtrc; IN; 30477497763069 / 10000000000; 3047.7497763069; kilogram-per-meter-square-second; 9 / 10; 0.9; inch-ofhg
+
+pressure; baromtrc; BR; 110; 110.0; kilogram-per-meter-square-second; 11 / 10; 1.1; millibar
+pressure; baromtrc; BR; 100; 100.0; kilogram-per-meter-square-second; 1; 1.0; millibar
+pressure; baromtrc; BR; 90; 90.0; kilogram-per-meter-square-second; 9 / 10; 0.9; millibar
+
+pressure; baromtrc; MX; 293309252313 / 2000000000; 146.6546261565; kilogram-per-meter-square-second; 11 / 10; 1.1; millimeter-ofhg
+pressure; baromtrc; MX; 26664477483 / 200000000; 133.322387415; kilogram-per-meter-square-second; 1; 1.0; millimeter-ofhg
+pressure; baromtrc; MX; 239980297347 / 2000000000; 119.9901486735; kilogram-per-meter-square-second; 9 / 10; 0.9; millimeter-ofhg
+
+pressure; default; 001; 1100000; 1100000.0; kilogram-per-meter-square-second; 11 / 10; 1.1; megapascal
+pressure; default; 001; 1000000; 1000000.0; kilogram-per-meter-square-second; 1; 1.0; megapascal
+pressure; default; 001; 900000; 900000.0; kilogram-per-meter-square-second; 900000; 900000.0; pascal
+pressure; default; 001; 1; 1.0; kilogram-per-meter-square-second; 1; 1.0; pascal
+pressure; default; 001; 9 / 10; 0.9; kilogram-per-meter-square-second; 9 / 10; 0.9; pascal
+
+pressure; default; GB; 97860875535731 / 12903200000; 7584.233022485197; kilogram-per-meter-square-second; 11 / 10; 1.1; pound-force-per-square-inch
+pressure; default; GB; 8896443230521 / 1290320000; 6894.757293168361; kilogram-per-meter-square-second; 1; 1.0; pound-force-per-square-inch
+pressure; default; GB; 80067989074689 / 12903200000; 6205.281563851525; kilogram-per-meter-square-second; 9 / 10; 0.9; pound-force-per-square-inch
+
+speed; default; 001; 11 / 36; 0.3055555555555556; meter-per-second; 11 / 10; 1.1; kilometer-per-hour
+speed; default; 001; 5 / 18; 0.2777777777777778; meter-per-second; 1; 1.0; kilometer-per-hour
+speed; default; 001; 1 / 4; 0.25; meter-per-second; 9 / 10; 0.9; kilometer-per-hour
+
+speed; default; GB; 15367 / 31250; 0.491744; meter-per-second; 11 / 10; 1.1; mile-per-hour
+speed; default; GB; 1397 / 3125; 0.44704; meter-per-second; 1; 1.0; mile-per-hour
+speed; default; GB; 12573 / 31250; 0.402336; meter-per-second; 9 / 10; 0.9; mile-per-hour
+
+speed; wind; 001; 11 / 36; 0.3055555555555556; meter-per-second; 11 / 10; 1.1; kilometer-per-hour
+speed; wind; 001; 5 / 18; 0.2777777777777778; meter-per-second; 1; 1.0; kilometer-per-hour
+speed; wind; 001; 1 / 4; 0.25; meter-per-second; 9 / 10; 0.9; kilometer-per-hour
+
+speed; wind; FI; 11 / 10; 1.1; meter-per-second; 11 / 10; 1.1; meter-per-second
+speed; wind; FI; 1; 1.0; meter-per-second; 1; 1.0; meter-per-second
+speed; wind; FI; 9 / 10; 0.9; meter-per-second; 9 / 10; 0.9; meter-per-second
+
+speed; wind; US; 15367 / 31250; 0.491744; meter-per-second; 11 / 10; 1.1; mile-per-hour
+speed; wind; US; 1397 / 3125; 0.44704; meter-per-second; 1; 1.0; mile-per-hour
+speed; wind; US; 12573 / 31250; 0.402336; meter-per-second; 9 / 10; 0.9; mile-per-hour
+
+temperature; default; 001; 1097 / 4; 274.25; kelvin; 11 / 10; 1.1; celsius
+temperature; default; 001; 5483 / 20; 274.15; kelvin; 1; 1.0; celsius
+temperature; default; 001; 5481 / 20; 274.05; kelvin; 9 / 10; 0.9; celsius
+
+temperature; default; US; 15359 / 60; 255.9833333333333; kelvin; 11 / 10; 1.1; fahrenheit
+temperature; default; US; 46067 / 180; 255.9277777777778; kelvin; 1; 1.0; fahrenheit
+temperature; default; US; 46057 / 180; 255.8722222222222; kelvin; 9 / 10; 0.9; fahrenheit
+
+temperature; weather; 001; 1097 / 4; 274.25; kelvin; 11 / 10; 1.1; celsius
+temperature; weather; 001; 5483 / 20; 274.15; kelvin; 1; 1.0; celsius
+temperature; weather; 001; 5481 / 20; 274.05; kelvin; 9 / 10; 0.9; celsius
+
+temperature; weather; BS; 15359 / 60; 255.9833333333333; kelvin; 11 / 10; 1.1; fahrenheit
+temperature; weather; BS; 46067 / 180; 255.9277777777778; kelvin; 1; 1.0; fahrenheit
+temperature; weather; BS; 46057 / 180; 255.8722222222222; kelvin; 9 / 10; 0.9; fahrenheit
+
+volume; default; 001; 11 / 10; 1.1; cubic-meter; 11 / 10; 1.1; cubic-meter
+volume; default; 001; 1; 1.0; cubic-meter; 1; 1.0; cubic-meter
+volume; default; 001; 9 / 10; 0.9; cubic-meter; 900000; 900000.0; cubic-centimeter
+volume; default; 001; 1 / 1000000; 1.0E-6; cubic-meter; 1; 1.0; cubic-centimeter
+volume; default; 001; 9 / 10000000; 9.0E-7; cubic-meter; 9 / 10; 0.9; cubic-centimeter
+
+volume; default; GB; 608369751 / 19531250000; 0.0311485312512; cubic-meter; 11 / 10; 1.1; cubic-foot
+volume; default; GB; 55306341 / 1953125000; 0.028316846592; cubic-meter; 1; 1.0; cubic-foot
+volume; default; GB; 497757069 / 19531250000; 0.0254851619328; cubic-meter; 7776 / 5; 1555.2; cubic-inch
+volume; default; GB; 2048383 / 125000000000; 1.6387064E-5; cubic-meter; 1; 1.0; cubic-inch
+volume; default; GB; 18435447 / 1250000000000; 1.47483576E-5; cubic-meter; 9 / 10; 0.9; cubic-inch
+
+volume; fluid; 001; 11 / 10000; 0.0011; cubic-meter; 11 / 10; 1.1; liter
+volume; fluid; 001; 1 / 1000; 0.001; cubic-meter; 1; 1.0; liter
+volume; fluid; 001; 9 / 10000; 9.0E-4; cubic-meter; 900; 900.0; milliliter
+volume; fluid; 001; 1 / 1000000; 1.0E-6; cubic-meter; 1; 1.0; milliliter
+volume; fluid; 001; 9 / 10000000; 9.0E-7; cubic-meter; 9 / 10; 0.9; milliliter
+
+volume; fluid; US; 5204941203 / 1250000000000; 0.0041639529624; cubic-meter; 11 / 10; 1.1; gallon
+volume; fluid; US; 473176473 / 125000000000; 0.003785411784; cubic-meter; 1; 1.0; gallon
+volume; fluid; US; 4258588257 / 1250000000000; 0.0034068706056; cubic-meter; 18 / 5; 3.6; quart
+volume; fluid; US; 473176473 / 500000000000; 9.46352946E-4; cubic-meter; 1; 1.0; quart
+volume; fluid; US; 4258588257 / 5000000000000; 8.517176514E-4; cubic-meter; 9 / 5; 1.8; pint
+volume; fluid; US; 473176473 / 1000000000000; 4.73176473E-4; cubic-meter; 1; 1.0; pint
+volume; fluid; US; 4258588257 / 10000000000000; 4.258588257E-4; cubic-meter; 9 / 5; 1.8; cup
+volume; fluid; US; 473176473 / 2000000000000; 2.365882365E-4; cubic-meter; 1; 1.0; cup
+volume; fluid; US; 4258588257 / 20000000000000; 2.1292941285E-4; cubic-meter; 36 / 5; 7.2; fluid-ounce
+volume; fluid; US; 473176473 / 16000000000000; 2.95735295625E-5; cubic-meter; 1; 1.0; fluid-ounce
+volume; fluid; US; 4258588257 / 160000000000000; 2.661617660625E-5; cubic-meter; 9 / 5; 1.8; tablespoon
+volume; fluid; US; 473176473 / 32000000000000; 1.478676478125E-5; cubic-meter; 1; 1.0; tablespoon
+volume; fluid; US; 4258588257 / 320000000000000; 1.3308088303125E-5; cubic-meter; 27 / 10; 2.7; teaspoon
+volume; fluid; US; 157725491 / 32000000000000; 4.92892159375E-6; cubic-meter; 1; 1.0; teaspoon
+volume; fluid; US; 1419529419 / 320000000000000; 4.436029434375E-6; cubic-meter; 9 / 10; 0.9; teaspoon
+
+volume; fluid; GB; 5000699 / 1000000000; 0.005000699; cubic-meter; 11 / 10; 1.1; gallon-imperial
+volume; fluid; GB; 454609 / 100000000; 0.00454609; cubic-meter; 1; 1.0; gallon-imperial
+volume; fluid; GB; 4091481 / 1000000000; 0.004091481; cubic-meter; 144; 144.0; fluid-ounce-imperial
+volume; fluid; GB; 454609 / 16000000000; 2.84130625E-5; cubic-meter; 1; 1.0; fluid-ounce-imperial
+volume; fluid; GB; 4091481 / 160000000000; 2.557175625E-5; cubic-meter; 9 / 10; 0.9; fluid-ounce-imperial
+
+volume; oil; 001; 109303765263 / 625000000000; 0.1748860244208; cubic-meter; 11 / 10; 1.1; barrel
+volume; oil; 001; 9936705933 / 62500000000; 0.158987294928; cubic-meter; 1; 1.0; barrel
+volume; oil; 001; 89430353397 / 625000000000; 0.1430885654352; cubic-meter; 9 / 10; 0.9; barrel
+
+volume; vehicle; US; 5204941203 / 1250000000000; 0.0041639529624; cubic-meter; 11 / 10; 1.1; gallon
+volume; vehicle; US; 473176473 / 125000000000; 0.003785411784; cubic-meter; 1; 1.0; gallon
+volume; vehicle; US; 4258588257 / 1250000000000; 0.0034068706056; cubic-meter; 9 / 10; 0.9; gallon
+
+volume; vehicle; 001; 11 / 10000; 0.0011; cubic-meter; 11 / 10; 1.1; liter
+volume; vehicle; 001; 1 / 1000; 0.001; cubic-meter; 1; 1.0; liter
+volume; vehicle; 001; 9 / 10000; 9.0E-4; cubic-meter; 9 / 10; 0.9; liter
+
+year-duration; default; 001; 11 / 10; 1.1; year; 11 / 10; 1.1; year
+year-duration; default; 001; 1; 1.0; year; 1; 1.0; year
+year-duration; default; 001; 9 / 10; 0.9; year; 54 / 5; 10.8; month
+year-duration; default; 001; 1 / 12; 0.08333333333333333; year; 1; 1.0; month
+year-duration; default; 001; 3 / 40; 0.075; year; 9 / 10; 0.9; month
+
+year-duration; person-age; 001; 13 / 5; 2.6; year; 13 / 5; 2.6; year-person
+year-duration; person-age; 001; 5 / 2; 2.5; year; 5 / 2; 2.5; year-person
+year-duration; person-age; 001; 12 / 5; 2.4; year; 2; year-person; 24 / 5; 4.8; month-person
+year-duration; person-age; 001; 1; 1.0; year; 1; year-person; 0; 0.0; month-person
+year-duration; person-age; 001; 9 / 10; 0.9; year; 54 / 5; 10.8; month-person
+year-duration; person-age; 001; 1 / 12; 0.08333333333333333; year; 1; 1.0; month-person
+year-duration; person-age; 001; 3 / 40; 0.075; year; 9 / 10; 0.9; month-person
diff --git a/common/testData/units/unitsTest.txt b/common/testData/units/unitsTest.txt
new file mode 100644
index 0000000..82b7f3a
--- /dev/null
+++ b/common/testData/units/unitsTest.txt
@@ -0,0 +1,194 @@
+# Test data for unit conversions
+# Copyright © 1991-2020 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/copyright.html
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+#
+# Format:
+# Quantity ; x ; y ; conversion to y (rational) ; test: 1000 x ⟹ y
+#
+# Use: convert 1000 x units to the y unit; the result should match the final column,
+# at the given precision. For example, when the last column is 159.1549,
+# round to 4 decimal digits before comparing.
+# Note that certain conversions are approximate, such as degrees to radians
+#
+# Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestParseUnit results.
+
+acceleration ; meter-per-square-second ; meter-per-square-second ; 1 * x ; 1,000.00
+acceleration ; g-force ; meter-per-square-second ; 9.80665 * x ; 9806.65
+angle ; arc-second ; revolution ; 0.0000625/81 * x ; 7.716049E-4
+angle ; arc-minute ; revolution ; 0.00125/27 * x ; 0.0462963
+angle ; degree ; revolution ; 0.025/9 * x ; 2.777778
+angle ; radian ; revolution ; 65,501,488/411,557,987 * x ; 159.1549
+angle ; revolution ; revolution ; 1 * x ; 1,000.00
+area ; square-centimeter ; square-meter ; 0.0001 * x ; 0.1
+area ; square-inch ; square-meter ; 0.00064516 * x ; 0.64516
+area ; square-foot ; square-meter ; 0.09290304 * x ; 92.90304
+area ; square-yard ; square-meter ; 0.83612736 * x ; 836.1274
+area ; square-meter ; square-meter ; 1 * x ; 1,000.00
+area ; dunam ; square-meter ; 1,000 * x ; 1000000.0
+area ; acre ; square-meter ; 4,046.8564224 * x ; 4046856.0
+area ; hectare ; square-meter ; 10,000 * x ; 1.0E7
+area ; square-kilometer ; square-meter ; 1,000,000 * x ; 1.0E9
+area ; square-mile ; square-meter ; 2,589,988.110336 * x ; 2.589988E9
+concentration ; millimole-per-liter ; item-per-cubic-meter ; 602,214,076,000,000,000,000,000 * x ; 6.022141E26
+consumption ; liter-per-100-kilometer ; cubic-meter-per-meter ; 0.00000001 * x ; 1.0E-5
+consumption ; liter-per-kilometer ; cubic-meter-per-meter ; 0.000001 * x ; 0.001
+consumption-inverse ; mile-per-gallon-imperial ; meter-per-cubic-meter ; 160,934,400,000/454,609 * x ; 3.540062E8
+consumption-inverse ; mile-per-gallon ; meter-per-cubic-meter ; 48,000,000,000/112,903 * x ; 4.251437E8
+digital ; bit ; bit ; 1 * x ; 1,000.00
+digital ; byte ; bit ; 8 * x ; 8000.0
+digital ; kilobit ; bit ; 1,000 * x ; 1000000.0
+digital ; kilobyte ; bit ; 8,000 * x ; 8000000.0
+digital ; megabit ; bit ; 1,000,000 * x ; 1.0E9
+digital ; megabyte ; bit ; 8,000,000 * x ; 8.0E9
+digital ; gigabit ; bit ; 1,000,000,000 * x ; 1.0E12
+digital ; gigabyte ; bit ; 8,000,000,000 * x ; 8.0E12
+digital ; terabit ; bit ; 1,000,000,000,000 * x ; 1.0E15
+digital ; terabyte ; bit ; 8,000,000,000,000 * x ; 8.0E15
+digital ; petabyte ; bit ; 8,000,000,000,000,000 * x ; 8.0E18
+duration ; nanosecond ; second ; 0.000000001 * x ; 1.0E-6
+duration ; microsecond ; second ; 0.000001 * x ; 0.001
+duration ; millisecond ; second ; 0.001 * x ; 1.0
+duration ; second ; second ; 1 * x ; 1,000.00
+duration ; minute ; second ; 60 * x ; 60000.0
+duration ; hour ; second ; 3,600 * x ; 3600000.0
+duration ; day ; second ; 86,400 * x ; 8.64E7
+duration ; day-person ; second ; 86,400 * x ; 8.64E7
+duration ; week ; second ; 604,800 * x ; 6.048E8
+duration ; week-person ; second ; 604,800 * x ; 6.048E8
+electric-current ; milliampere ; ampere ; 0.001 * x ; 1.0
+electric-current ; ampere ; ampere ; 1 * x ; 1,000.00
+electric-resistance ; ohm ; kilogram-square-meter-per-cubic-second-square-ampere ; 1 * x ; 1000.0
+energy ; electronvolt ; kilogram-square-meter-per-square-second ; 0.0000000000000000001602177 * x ; 1.602177E-16
+energy ; dalton ; kilogram-square-meter-per-square-second ; 0.00000000014924180856 * x ; 1.492418E-7
+energy ; joule ; kilogram-square-meter-per-square-second ; 1 * x ; 1000.0
+energy ; newton-meter ; kilogram-square-meter-per-square-second ; 1 * x ; 1000.0
+energy ; pound-force-foot ; kilogram-square-meter-per-square-second ; 1.3558179483314004 * x ; 1355.818
+energy ; calorie ; kilogram-square-meter-per-square-second ; 4.184 * x ; 4184.0
+energy ; kilojoule ; kilogram-square-meter-per-square-second ; 1,000 * x ; 1000000.0
+energy ; british-thermal-unit ; kilogram-square-meter-per-square-second ; 9,489.1523804/9 * x ; 1054350.0
+energy ; foodcalorie ; kilogram-square-meter-per-square-second ; 4,184 * x ; 4184000.0
+energy ; kilocalorie ; kilogram-square-meter-per-square-second ; 4,184 * x ; 4184000.0
+energy ; kilowatt-hour ; kilogram-square-meter-second-per-cubic-second ; 3,600,000 * x ; 3.6E9
+energy ; therm-us ; kilogram-square-meter-per-square-second ; 105,480,400 * x ; 1.054804E11
+force ; newton ; kilogram-meter-per-square-second ; 1 * x ; 1000.0
+force ; pound-force ; kilogram-meter-per-square-second ; 4.4482216152605 * x ; 4448.222
+frequency ; hertz ; revolution-per-second ; 1 * x ; 1000.0
+frequency ; kilohertz ; revolution-per-second ; 1,000 * x ; 1000000.0
+frequency ; megahertz ; revolution-per-second ; 1,000,000 * x ; 1.0E9
+frequency ; gigahertz ; revolution-per-second ; 1,000,000,000 * x ; 1.0E12
+graphics ; dot ; pixel ; 1 * x ; 1000.0
+graphics ; pixel ; pixel ; 1 * x ; 1,000.00
+graphics ; megapixel ; pixel ; 1,000,000 * x ; 1.0E9
+length ; picometer ; meter ; 0.000000000001 * x ; 1.0E-9
+length ; nanometer ; meter ; 0.000000001 * x ; 1.0E-6
+length ; micrometer ; meter ; 0.000001 * x ; 0.001
+length ; point ; meter ; 0.003175/9 * x ; 0.3527778
+length ; millimeter ; meter ; 0.001 * x ; 1.0
+length ; centimeter ; meter ; 0.01 * x ; 10.0
+length ; inch ; meter ; 0.0254 * x ; 25.4
+length ; decimeter ; meter ; 0.1 * x ; 100.0
+length ; foot ; meter ; 0.3048 * x ; 304.8
+length ; yard ; meter ; 0.9144 * x ; 914.4
+length ; meter ; meter ; 1 * x ; 1,000.00
+length ; fathom ; meter ; 1.8288 * x ; 1828.8
+length ; furlong ; meter ; 201.168 * x ; 201168.0
+length ; kilometer ; meter ; 1,000 * x ; 1000000.0
+length ; mile ; meter ; 1,609.344 * x ; 1609344.0
+length ; nautical-mile ; meter ; 1,852 * x ; 1852000.0
+length ; mile-scandinavian ; meter ; 10,000 * x ; 1.0E7
+length ; 100-kilometer ; meter ; 100,000 * x ; 1.0E8
+length ; earth-radius ; meter ; 6,378,100 * x ; 6.3781E9
+length ; solar-radius ; meter ; 695,700,000 * x ; 6.957E11
+length ; astronomical-unit ; meter ; 149,597,900,000 * x ; 1.495979E14
+length ; light-year ; meter ; 9,460,730,000,000,000 * x ; 9.46073E18
+length ; parsec ; meter ; 30,856,780,000,000,000 * x ; 3.085678E19
+luminous-flux ; lux ; candela-square-meter-per-square-meter ; 1 * x ; 1000.0
+luminous-intensity ; candela ; candela ; 1 * x ; 1,000.00
+mass ; microgram ; kilogram ; 0.000000001 * x ; 1.0E-6
+mass ; milligram ; kilogram ; 0.000001 * x ; 0.001
+mass ; carat ; kilogram ; 0.0002 * x ; 0.2
+mass ; gram ; kilogram ; 0.001 * x ; 1.0
+mass ; ounce ; kilogram ; 0.028349523125 * x ; 28.34952
+mass ; ounce-troy ; kilogram ; 0.03110348 * x ; 31.10348
+mass ; pound ; kilogram ; 0.45359237 * x ; 453.5924
+mass ; kilogram ; kilogram ; 1 * x ; 1,000.00
+mass ; stone ; kilogram ; 6.35029318 * x ; 6350.293
+mass ; ton ; kilogram ; 907.18474 * x ; 907184.7
+mass ; metric-ton ; kilogram ; 1,000 * x ; 1000000.0
+mass ; earth-mass ; kilogram ; 5,972,200,000,000,000,000,000,000 * x ; 5.9722E27
+mass ; solar-mass ; kilogram ; 1,988,470,000,000,000,000,000,000,000,000 * x ; 1.98847E33
+mass-density ; milligram-per-deciliter ; kilogram-per-cubic-meter ; 0.01 * x ; 10.0
+portion ; permillion ; portion ; 0.000001 * x ; 0.001
+portion ; permyriad ; portion ; 0.0001 * x ; 0.1
+portion ; permille ; portion ; 0.001 * x ; 1.0
+portion ; percent ; portion ; 0.01 * x ; 10.0
+portion ; karat ; portion ; 0.125/3 * x ; 41.66667
+portion ; portion ; portion ; 1 * x ; 1,000.00
+power ; milliwatt ; kilogram-square-meter-per-cubic-second ; 0.001 * x ; 1.0
+power ; watt ; kilogram-square-meter-per-cubic-second ; 1 * x ; 1000.0
+power ; horsepower ; kilogram-square-meter-per-cubic-second ; 745.69987158227022 * x ; 745699.9
+power ; kilowatt ; kilogram-square-meter-per-cubic-second ; 1,000 * x ; 1000000.0
+power ; megawatt ; kilogram-square-meter-per-cubic-second ; 1,000,000 * x ; 1.0E9
+power ; gigawatt ; kilogram-square-meter-per-cubic-second ; 1,000,000,000 * x ; 1.0E12
+power ; solar-luminosity ; kilogram-square-meter-per-cubic-second ; 382,800,000,000,000,000,000,000,000 * x ; 3.828E29
+pressure ; pascal ; kilogram-per-meter-square-second ; 1 * x ; 1000.0
+pressure ; hectopascal ; kilogram-per-meter-square-second ; 100 * x ; 100000.0
+pressure ; millibar ; kilogram-per-meter-square-second ; 100 * x ; 100000.0
+pressure ; millimeter-ofhg ; kilogram-meter-per-square-meter-square-second ; 133.322387415 * x ; 133322.4
+pressure ; kilopascal ; kilogram-per-meter-square-second ; 1,000 * x ; 1000000.0
+pressure ; inch-ofhg ; kilogram-meter-per-square-meter-square-second ; 3,386.388640341 * x ; 3386389.0
+pressure ; pound-force-per-square-inch ; kilogram-meter-per-square-meter-square-second ; 111,205,540.3815125/16,129 * x ; 6894757.0
+pressure ; bar ; kilogram-per-meter-square-second ; 100,000 * x ; 1.0E8
+pressure ; atmosphere ; kilogram-per-meter-square-second ; 101,325 * x ; 1.01325E8
+pressure ; megapascal ; kilogram-per-meter-square-second ; 1,000,000 * x ; 1.0E9
+pressure-per-length ; ofhg ; kilogram-per-square-meter-square-second ; 133,322.387415 * x ; 1.333224E8
+resolution ; dot-per-inch ; pixel-per-meter ; 5,000/127 * x ; 39370.08
+resolution ; pixel-per-inch ; pixel-per-meter ; 5,000/127 * x ; 39370.08
+resolution ; dot-per-centimeter ; pixel-per-meter ; 100 * x ; 100000.0
+resolution ; pixel-per-centimeter ; pixel-per-meter ; 100 * x ; 100000.0
+speed ; kilometer-per-hour ; meter-per-second ; 2.5/9 * x ; 277.7778
+speed ; mile-per-hour ; meter-per-second ; 0.44704 * x ; 447.04
+speed ; knot ; meter-per-second ; 4.63/9 * x ; 514.4444
+speed ; meter-per-second ; meter-per-second ; 1 * x ; 1,000.00
+substance-amount ; item ; item ; 1 * x ; 1,000.00
+substance-amount ; mole ; item ; 602,214,076,000,000,000,000,000 * x ; 6.022141E26
+temperature ; fahrenheit ; kelvin ; 5/9 * x - 2,298.35/9 ; 810.9278
+temperature ; kelvin ; kelvin ; 1 * x ; 1,000.00
+temperature ; celsius ; kelvin ; 1 * x - 273.15 ; 1273.15
+typewidth ; em ; em ; 1 * x ; 1,000.00
+voltage ; volt ; kilogram-square-meter-per-cubic-second-ampere ; 1 * x ; 1000.0
+volume ; cubic-centimeter ; cubic-meter ; 0.000001 * x ; 0.001
+volume ; milliliter ; cubic-meter ; 0.000001 * x ; 0.001
+volume ; teaspoon ; cubic-meter ; 0.00000492892159375 * x ; 0.004928922
+volume ; centiliter ; cubic-meter ; 0.00001 * x ; 0.01
+volume ; tablespoon ; cubic-meter ; 0.00001478676478125 * x ; 0.01478676
+volume ; cubic-inch ; cubic-meter ; 0.000016387064 * x ; 0.01638706
+volume ; fluid-ounce-imperial ; cubic-meter ; 0.0000284130625 * x ; 0.02841306
+volume ; fluid-ounce ; cubic-meter ; 0.0000295735295625 * x ; 0.02957353
+volume ; deciliter ; cubic-meter ; 0.0001 * x ; 0.1
+volume ; cup ; cubic-meter ; 0.0002365882365 * x ; 0.2365882
+volume ; cup-metric ; cubic-meter ; 0.00025 * x ; 0.25
+volume ; pint ; cubic-meter ; 0.000473176473 * x ; 0.4731765
+volume ; pint-metric ; cubic-meter ; 0.0005 * x ; 0.5
+volume ; quart ; cubic-meter ; 0.000946352946 * x ; 0.9463529
+volume ; liter ; cubic-meter ; 0.001 * x ; 1.0
+volume ; gallon ; cubic-meter ; 0.003785411784 * x ; 3.785412
+volume ; gallon-imperial ; cubic-meter ; 0.00454609 * x ; 4.54609
+volume ; cubic-foot ; cubic-meter ; 0.028316846592 * x ; 28.31685
+volume ; bushel ; cubic-meter ; 0.03523907016688 * x ; 35.23907
+volume ; hectoliter ; cubic-meter ; 0.1 * x ; 100.0
+volume ; barrel ; cubic-meter ; 0.158987294928 * x ; 158.9873
+volume ; cubic-yard ; cubic-meter ; 0.764554857984 * x ; 764.5549
+volume ; cubic-meter ; cubic-meter ; 1 * x ; 1,000.00
+volume ; megaliter ; cubic-meter ; 1,000 * x ; 1000000.0
+volume ; acre-foot ; cubic-meter ; 1,233.48183754752 * x ; 1233482.0
+volume ; cubic-kilometer ; cubic-meter ; 1,000,000,000 * x ; 1.0E12
+volume ; cubic-mile ; cubic-meter ; 4,168,181,825.440579584 * x ; 4.168182E12
+year-duration ; month ; year ; 0.25/3 * x ; 83.33333
+year-duration ; month-person ; year ; 0.25/3 * x ; 83.33333
+year-duration ; year ; year ; 1 * x ; 1,000.00
+year-duration ; year-person ; year ; 1 * x ; 1000.0
+year-duration ; decade ; year ; 10 * x ; 10000.0
+year-duration ; century ; year ; 100 * x ; 100000.0
diff --git a/common/transforms/Myanmar-Latin.xml b/common/transforms/Myanmar-Latin.xml
new file mode 100644
index 0000000..27b8a0e
--- /dev/null
+++ b/common/transforms/Myanmar-Latin.xml
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<!-- Copyright © 2020 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 -->
+<supplementalData>
+ <version number="$Revision$" />
+ <transforms>
+ <transform source="my" target="my_Latn" direction="forward" draft="contributed" alias="Burmese-Latin Myanmar-Latin my-Latn-t-my">
+ <tRule><![CDATA[
+# Author: Arne Mauser, Moe Aung Naing
+# Description: Myanmar Romanization
+
+$consonants = [\u1000-\u1021];
+
+# Character combinations: "1 consonant 5 vowels"
+# ($consonants) ြောင့် > | $1 yount;
+($consonants) \u103C\u1031\u102C\u1004\u103A\u1037 > | $1 yount;
+
+# ($consonants) ျောင့် > | $1 yount;
+($consonants) \u103B\u1031\u102C\u1004\u103A\u1037 > | $1 yount;
+
+# ($consonants) ြောင်း > | $1 yaungg;
+($consonants) \u103C\u1031\u102C\u1004\u103A\u1038 > | $1 yaungg;
+
+# ($consonants) ျောင်း > | $1 yaungg;
+($consonants) \u103B\u1031\u102C\u1004\u103A\u1038 > | $1 yaungg;
+
+
+
+# Character combinations: "1 consonant 4 vowels"
+# ိုင်း > ine;
+ \u102D\u102F\u1004\u103A\u1038 > ine;
+
+# ($consonants) ြောင် > | $1 yaung;
+($consonants) \u103C\u1031\u102C\u1004\u103A > | $1 yaung;
+
+# ($consonants) ျောင် > | $1 yaung;
+($consonants) \u103B\u1031\u102C\u1004\u103A > | $1 yaung;
+
+
+
+# Character combinations: "1 consonant 3 vowels"
+# ောက် > out; # 1c3v
+\u1031\u102C\u1000\u103A > out;
+
+# ေါက် > out; # 1c3v
+\u1031\u102B\u1000\u103A > out;
+
+# ိုက် > ite; # 1c3v
+\u102D\u102F\u1000\u103A > ite;
+
+# ိုင် > ine; # 1c3v
+\u102D\u102F\u1004\u103A > ine;
+
+# ိုယ် > o; # 1c3v
+\u102D\u102F\u101A\u103A > o;
+
+# ျင်း > yinn;
+\u103B\u1004\u103A\u1038 > yinn;
+
+# ျိန် > yane;
+\u103B\u102D\u1014\u103A > yane;
+
+# ($consonants) ောင်း > | $1 aungg;
+($consonants) \u1031\u102C\u1004\u103A\u1038 > | $1 aungg;
+
+# ($consonants) ေါင်း > | $1 aungg;
+($consonants) \u1031\u102B\u1004\u103A\u1038 > | $1 aungg;
+
+# ($consonants) ောင် > | $1 aung;
+($consonants) \u1031\u102C\u1004\u103A > | $1 aung;
+
+# ($consonants) ေါင် > | $1 aung;
+($consonants) \u1031\u102B\u1004\u103A > | $1 aung;
+
+# ($consonants) ြင့် > | $1 yint;
+($consonants) \u103C\u1004\u103A\u1037 > | $1 yint;
+
+# ($consonants) ြင်း > | $1 yinn;
+($consonants) \u103C\u1004\u103A\u1038 > | $1 yinn;
+
+# ($consonants) ြင် > | $1 yin;
+($consonants) \u103C\u1004\u103A > | $1 yin;
+
+# ($consonants) ျင့် > | $1 yint;
+($consonants) \u103B\u1004\u103A\u1037 > | $1 yint;
+
+# ($consonants) ျင်း > | $1 yinn;
+($consonants) \u103B\u1004\u103A\u1038 > | $1 yinn;
+
+# ($consonants) ျင် > | $1 yin;
+($consonants) \u103B\u1004\u103A > | $1 yin;
+
+# ($consonants) ြစ် > | $1 yit;
+($consonants) \u103C\u1005\u103A > | $1 yit;
+
+# ($consonants) ျစ် > | $1 yit;
+($consonants) \u103B\u1005\u103A > | $1 yit;
+
+# ($consonants) ြည် > | $1 yi;
+($consonants) \u103C\u100A\u103A > | $1 yi;
+
+# ($consonants) ြန် > | $1 yan;
+($consonants) \u103C\u1014\u103A > | $1 yan;
+
+# ($consonants) ြန်း > | $1 yann;
+($consonants) \u103C\u1014\u103A\u1038 > | $1 yann;
+
+# ($consonants) ျန်း > | $1 yann;
+($consonants) \u103B\u1014\u103A\u1038 > | $1 yann;
+
+# ိမ်း > aim;
+\u102D\u1019\u103A\u1038 > aim;
+
+# ိန်း > ein;
+\u102D\u1014\u103A\u1038 > ein;
+
+
+
+# Character combinations: "4 vowels"
+# ျိုး > yoe;
+\u103B\u102D\u102F\u1038 > yoe;
+
+# ($consonants) ြော် > | $1 yaw;
+($consonants) \u103C\u1031\u102C\u103A > | $1 yaw;
+
+# ($consonants) ျော် > | $1 yaw;
+($consonants) \u103B\u1031\u102C\u103A > | $1 yaw;
+
+
+
+# Character combinations: "1 consonant 2 vowels"
+# ဦး > u;
+\u1025\u102E\u1038 > u; # this is a misspelling of \u1026
+
+# ွက် > wat;
+\u103D\u1000\u103A > wat;
+
+# ွင် > win;
+\u103D\u1004\u103A > win;
+
+# န်း > ann;
+\u1014\u103A\u1038 > ann;
+
+# န့် > ant;
+\u1014\u103A\u1037 > ant;
+
+# င်း > inn;
+\u1004\u103A\u1038 > inn;
+
+# င့် > int;
+\u1004\u103A\u1037 > int;
+
+# ည်း > ee;
+\u100A\u103A\u1038 > ee;
+
+# ည့် > eet; # 1c2v
+\u100A\u103A\u1037 > eet;
+
+# ိတ် > ate; # 1c2v
+\u102D\u1010\u103A > ate;
+
+# ုတ် > ote; # 1c2v
+\u102F\u1010\u103A > ote;
+
+# ုန် > one; # 1c2v
+\u102F\u1014\u103A > one;
+
+# ုပ် > ote; # 1c2v
+\u102F\u1015\u103A > ote;
+
+# ိမ် > aim; # 1c2v
+\u102D\u1019\u103A > ain;
+
+# ိန် > ein;
+\u102D\u1014\u103A > ein;
+
+# ယ့် > ae; # 1c2v
+\u101A\u103A\u1037 > ae;
+
+# သျှ > sh; # 1c2v
+\u101E\u103B\u103E > sh;
+
+# လျှ > sh; # 1c2v
+\u101C\u103B\u103E > sh;
+
+# ရွှ > shw; # 1c2v
+\u101B\u103D\u103E > shw;
+
+# ြတ် > yat;
+\u103C\u1010\u103A > yat;
+
+# ျတ် > yat;
+\u103B\u1010\u103A > yat;
+
+# ြက် > yet;
+\u103C\u1000\103A > yet;
+
+# ျက် > yet;
+\u103B\u1000\u103A > yet;
+
+# ျင် > yin;
+\u103B\u1004\u103A > yin;
+
+# ြင် > yin;
+\u103C\u1004\u103A > yin;
+
+
+
+
+# Character combinations: "3 vowels"
+# ော့ > ot;
+\u1031\u102C\u1037 > ot;
+
+# ေါ့ > ot;
+\u1031\u102B\u1037 > ot;
+
+# ော် > aw;
+\u1031\u102C\u103A > aw;
+
+# ေါ် > aw;
+\u1031\u102B\u103A > aw;
+
+# ို့ > hoet; # 3v
+\u102D\u102F\u1037 > hoet;
+
+# ိုး > oe;
+\u102D\u102F\u1038 > oe;
+
+# ုံး > one; # 3v
+\u102F\u1036\u1038 > one;
+
+# ျား > yarr;
+\u103B\u102C\u1038 > yarr;
+
+# ြား > yarr;
+\u103C\u102C\u1038 > yarr;
+
+# ြီး > yee;
+\u103C\u102E\u1038 > yee;
+
+# ($consonants) ြော > | $1 yaww;
+($consonants) \u103C\u1031\u102C > | $1 yaww;
+
+# ($consonants) ျော > | $1 yaww;
+($consonants) \u103B\u1031\u102C > | $1 yaww;
+
+# ွား > warr;
+\u103D\u102C\u1038 > warr;
+
+# ွေ့ > wae;
+\u103D\u1031\u1037 > wae;
+
+
+
+
+# Character combinations: "1 consonant 1 vowel"
+#က် > at;
+\u1000\u103A > at;
+
+# င် > in;
+\u1004\u103A > in;
+
+# စ် > it;
+\u1005\u103A > it;
+
+# ဥ် > in;
+\u1009\u103A > in;
+\u1025\u103A > in; # \u1025 is a misspelling of \u1009
+
+# ည် > i;
+\u100A\u103A > i;
+
+# ပ် > ut;
+\u1015\u103A > ut;
+
+# ယ် > al;
+\u101A\u103A > al;
+
+# တ် > at;
+\u1010\u103A > at;
+
+# န် > an;
+\u1014\u103A > an;
+
+# ရှ > sh; # 1c1v
+\u101B\u103E > sh;
+
+# Character combinations: "2 vowel"
+# ြီ > ye;
+\u103C\u102E > ye;
+
+# ြု > yu;
+\u103C\u102F > yu;
+
+# ြေ > yay;
+\u103C\u1031 > yay;
+
+# ွေ > way;
+\u103D\u1031 > way;
+
+# ွဲ > wal;
+\u103D\u1032 > wal;
+
+# ှု > hu;
+\u103E\u102F > hu;
+
+# ူ့ > hu;
+\u1030\u1037 > hu;
+
+# ူး > uu;
+\u1030\u1038 > uu;
+
+# ါး > arr;
+\u102B\u1038 > arr;
+
+# ား > arr;
+\u102C\u1038 > arr;
+
+# ီး > ee;
+\u102E\u1038 > ee;
+
+# ေး > ayy;
+\u1031\u1038 > ayy;
+
+# ေ့ > ae;
+\u1031\u1037 > ae;
+
+# ဲ့ > ae;
+\u1032\u1037 > ae;
+
+# ော > aw;
+\u1031\u102C > aw;
+
+# ေါ > aw;
+\u1031\u102B > aw;
+
+# ို > o;
+\u102D\u102F > o;
+
+# ုံ > one;
+\u102F\u1036 > one;
+
+# ှာ > har;
+\u103E\u102C > har;
+
+
+
+
+
+# Character combinations: "1 vowel"
+
+# ါ > ar;
+\u102B > ar;
+
+# ာ > ar;
+\u102C > ar;
+
+# ိ > i;
+\u102D > i;
+
+# ီ > e;
+\u102E > e;
+
+# ု > u;
+\u102F > u;
+
+# ူ > uu;
+\u1030 > uu;
+
+# ေ > ay;
+\u1031 > ay;
+
+# ဲ > ell;
+\u1032 > ell;
+
+# ံ > an;
+\u1036 > an;
+
+# ျ > ya;
+\u103B > ya;
+
+# ြ > ya;
+\u103C > ya;
+
+# ှ > ha;
+\u103E > ha;
+
+
+# Modern Myanmar digits
+\u1040 > 0 ;
+\u1041 > 1 ;
+\u1042 > 2 ;
+\u1043 > 3 ;
+\u1044 > 4 ;
+\u1045 > 5 ;
+\u1046 > 6 ;
+\u1047 > 7 ;
+\u1048 > 8 ;
+\u1049 > 9 ;
+
+# Myanmar Punctuation
+
+\u104A > \, ; # MYANMAR SIGN LITTLE SECTION
+\u104B > \. ; # MYANMAR SIGN SECTION
+\u104C > ; # MYANMAR SYMBOL LOCATIVE
+\u104D > ; # MYANMAR SYMBOL COMPLETED
+
+# Inserting 'a' in between to consonants.
+
+($consonants) ($consonants) > | $1 a $2 ;
+
+# Consonant clusters
+# က္က > kk ;
+# က္ခ > khk ;
+# ဂ္ဂ > gg ;
+# ဂ္ဃ > ggh ;
+# င်္ဂ > ngg ;
+
+# Fundamental Burmese Consonants:
+# က > k;
+\u1000 > k;
+
+# ခ > hk;
+\u1001 > hk;
+
+# ဂ > g;
+\u1002 > g;
+
+# ဃ > gh;
+\u1003 > gh;
+
+# င > ng;
+\u1004 > ng;
+
+# စ > hc;
+\u1005 > hc;
+
+# ဆ > s;
+\u1006 > s;
+
+# ဇ > j;
+\u1007 > j;
+
+# ဈ > jh;
+\u1008 > jh;
+
+# ဉ > ny;
+\u1009 > ny;
+
+# ည > ny;
+\u100A > ny;
+
+# ဋ > t;
+\u100B > t;
+
+# ဌ > ht;
+\u100C > ht;
+
+# ဍ > d;
+\u100D > d;
+
+# ဎ > dh;
+\u100E > dh;
+
+# ဏ > n;
+\u100F > n;
+
+# တ > t;
+\u1010 > t;
+
+# ထ > ht;
+\u1011 > ht;
+
+# ဒ > d;
+\u1012 > d;
+
+# ဓ > dh;
+\u1013 > dh;
+
+# န > n;
+\u1014 > n;
+
+# ပ > p;
+\u1015 > p;
+
+# ဖ > hp;
+\u1016 > hp;
+
+# ဗ > b;
+\u1017 > b;
+
+# ဘ > bh;
+\u1018 > bh;
+
+# မ > m;
+\u1019 > m;
+
+# ယ > y;
+\u101A > y;
+
+# ရ > r;
+\u101B > r;
+
+# လ > l;
+\u101C > l;
+
+# ဝ > w;
+\u101D > w;
+
+# သ > s;
+\u101E > s;
+
+# ဟ > h;
+\u101F > h;
+
+# ဠ > l;
+\u1020 > l;
+
+# အ > a;
+\u1021 > a;
+
+# ဣ > i;
+\u1023 > i;
+
+# ဤ > i;
+\u1024 > i;
+
+# ဥ > u;
+\u1025 > u;
+
+# ဦ > u;
+\u1026 > u;
+
+# ဧ > e;
+\u1027 > e;
+
+# ဩ > au;
+\u1029 > au;
+
+# ဪ > au;
+\u102A > au;
+
+# TODO: this character repeats the previous romanized letter
+# း > ;
+\u1038 > ;
+
+# ့ > ;
+\u1037 > ;
+
+# ် > ;
+\u103A > ;
+
+# ၏ > eat ;
+\u104F > eat;
+
+# ္ > ;
+\u1039 > ;
+
+# Leftovers
+
+\u103D > w;
+
+::NFC(NFD);
+ ]]></tRule>
+ </transform>
+ </transforms>
+</supplementalData>
diff --git a/common/validity/currency.xml b/common/validity/currency.xml
index 94f58a9..c28582e 100644
--- a/common/validity/currency.xml
+++ b/common/validity/currency.xml
@@ -41,7 +41,7 @@
YER
ZAR ZMW
</id>
- <!-- Deprecated values are those that are not legal tender in some country after 2019.
+ <!-- Deprecated values are those that are not legal tender in some country after 2020.
More detailed usage information needed for some implementations is in supplemental data. -->
<id type='currency' idStatus='deprecated'> <!-- 147 items -->
ADP AFA ALK AOK AON AOR ARA ARL~M ARP ATS AZM
diff --git a/common/validity/script.xml b/common/validity/script.xml
index 15bb8ef..b227d13 100644
--- a/common/validity/script.xml
+++ b/common/validity/script.xml
@@ -38,7 +38,8 @@
Xpeo Xsux
Yezi Yiii
</id>
- <id type='script' idStatus='special'> <!-- 8 items -->
+ <id type='script' idStatus='special'> <!-- 9 items -->
+ Aran
Qaag
Zanb Zinh Zmth Zsye Zsym Zxxx Zyyy
</id>
diff --git a/common/validity/subdivision.xml b/common/validity/subdivision.xml
index 10f0cc0..96727a2 100644
--- a/common/validity/subdivision.xml
+++ b/common/validity/subdivision.xml
@@ -13,7 +13,7 @@
<supplementalData>
<version number="$Revision$"/>
<idValidity>
- <id type='subdivision' idStatus='regular'> <!-- 4940 items -->
+ <id type='subdivision' idStatus='regular'> <!-- 4942 items -->
ad02~8
aeaj aeaz aedu aefu aerk aesh aeuq
afbal~m afbdg afbds afbgl afday affra affyb afgha afgho afhel afher afjow afkab afkan afkap afkdz afkho afknr aflag aflog afnan afnim afnur afpan afpar afpia afpka afsam afsar aftak afuru afwar afzab
@@ -68,17 +68,17 @@
ee37 ee39 ee44 ee49 ee51 ee57 ee59 ee65 ee67 ee70 ee74 ee78 ee82 ee84 ee86
egalx egasn egast egba egbh egbns egc egdk egdt egfym eggh eggz egis egjs egkb egkfs egkn eglx egmn egmnf egmt egpts egshg egshr egsin egsuz egwad
eran erdk erdu ergb erma ersk
- esa esab esal esan esar~s esav esb esba esbi esbu esc esca~c esce escl~m esco escr~u esex esga esgc esgi esgr esgu esh eshu esib esj esl esle eslo eslu esm esma esmc~d esml esmu esna esnc eso esor esp espm espo espv esri ess essa esse essg esso esss est este~f esto esv esva esvc esvi esz esza
+ esa esab esal esan esar~s esav esb esba esbi esbu esc esca~c esce escl~o escr~u esex esga esgc esgi esgr esgu esh eshu esib esj esl esle eslo eslu esm esma esmc~d esml esmu esna esnc eso esor esp espm espo espv esri ess essa esse essg esso esss est este~f esto esv esva esvc esvi esz esza
etaa etaf etam etbe etdd etga etha etor etsn~o etti
fi02~9 fi10~9
fj01~9 fj10~4 fjc fje fjn fjr fjw
fmksa fmpni fmtrk fmyap
fr01~9 fr10~9 fr21~9 fr2a~b fr30~9 fr40~9 fr50~9 fr60~9 fr70~9 fr80~9 fr90~5 frara frbfc frbre frcor frcvl frges frgua frhdf fridf frlre frmay frnaq frnor frocc frpac frpdl
ga1~9
- gbabc~e gbagb gbagy gband gbann gbans gbbas gbbbd gbbdf~g gbben gbbex gbbfs gbbge gbbgw gbbir gbbkm gbbmh gbbne gbbnh gbbns gbbol gbbpl gbbrc~d gbbry gbbst gbbur gbcam gbcay gbcbf gbccg gbcgn gbche gbchw gbcld gbclk gbcma gbcmd gbcmn gbcon gbcov gbcrf gbcry gbcwy gbdal gbdby gbden gbder gbdev gbdgy gbdnc~d gbdor gbdrs gbdud gbdur gbeal gbeaw gbeay gbedh gbedu gbeln gbels gbenf~g gberw gbery gbess gbesx gbfal gbfif gbfln gbfmo gbgat gbgbn gbglg gbgls gbgre gbgwn gbhal~m gbhav gbhck gbhef gbhil gbhld gbhmf gbhns gbhpl gbhrt gbhrw gbhry gbios gbiow gbisl gbivc gbkec gbken gbkhl gbkir gbktt gbkwl gblan gblbc gblbh gblce gblds gblec gblew gblin gbliv gblnd gblut gbman gbmdb gbmdw gbmea gbmik gbmln gbmon gbmrt gbmry gbmty gbmul gbnay gbnbl gbnel gbnet gbnfk gbngm gbnir gbnlk gbnln gbnmd gbnsm gbnth gbntl gbntt gbnty gbnwm gbnwp gbnyk gbold gbork gboxf gbpem gbpkn gbply gbpol gbpor gbpow gbpte gbrcc gbrch gbrct gbrdb gbrdg gbrfw gbric gbrot gbrut gbsaw gbsay gbscb gbsct gbsfk gbsft gbsgc gbshf gbshn gbshr gbskp gbslf~g gbslk gbsnd gbsol~m gbsos gbsry gbste gbstg~h gbstn gbsts~t gbsty gbswa gbswd gbswk gbtam gbtfw gbthr gbtob gbtof gbtrf gbtwh gbukm gbvgl gbwar gbwbk gbwdu gbwft gbwgn gbwil gbwkf gbwll gbwln gbwls gbwlv gbwnd gbwnm gbwok gbwor gbwrl gbwrt gbwrx gbwsm gbwsx gbyor gbzet
+ gbabc~e gbagb gbagy gband gbann gbans gbbas gbbbd gbbdf~g gbben gbbex gbbfs gbbge gbbgw gbbir gbbkm gbbmh gbbne gbbnh gbbns gbbol gbbpl gbbrc~d gbbry gbbst gbbur gbcam gbcay gbcbf gbccg gbcgn gbche gbchw gbcld gbclk gbcma gbcmd gbcmn gbcon gbcov gbcrf gbcry gbcwy gbdal gbdby gbden gbder gbdev gbdgy gbdnc~d gbdor gbdrs gbdud gbdur gbeal gbeay gbedh gbedu gbeln gbels gbenf gberw gbery gbess gbesx gbfal gbfif gbfln gbfmo gbgat gbglg gbgls gbgre gbgwn gbhal~m gbhav gbhck gbhef gbhil gbhld gbhmf gbhns gbhpl gbhrt gbhrw gbhry gbios gbiow gbisl gbivc gbkec gbken gbkhl gbkir gbktt gbkwl gblan gblbc gblbh gblce gblds gblec gblew gblin gbliv gblnd gblut gbman gbmdb gbmdw gbmea gbmik gbmln gbmon gbmrt gbmry gbmty gbmul gbnay gbnbl gbnel gbnet gbnfk gbngm gbnlk gbnln gbnmd gbnsm gbnth gbntl gbntt gbnty gbnwm gbnwp gbnyk gbold gbork gboxf gbpem gbpkn gbply gbpol gbpor gbpow gbpte gbrcc gbrch gbrct gbrdb gbrdg gbrfw gbric gbrot gbrut gbsaw gbsay gbscb gbsfk gbsft gbsgc gbshf gbshn gbshr gbskp gbslf~g gbslk gbsnd gbsol~m gbsos gbsry gbste gbstg~h gbstn gbsts~t gbsty gbswa gbswd gbswk gbtam gbtfw gbthr gbtob gbtof gbtrf gbtwh gbvgl gbwar gbwbk gbwdu gbwft gbwgn gbwil gbwkf gbwll gbwln gbwlv gbwnd gbwnm gbwok gbwor gbwrl gbwrt gbwrx gbwsm gbwsx gbyor gbzet
gd01~6 gd10
geab geaj gegu geim geka gekk gemm gerl gesj~k gesz getb
- ghaa ghah ghba ghcp ghep ghnp ghtv ghue ghuw ghwp
+ ghaa ghaf ghah ghbe ghbo ghcp ghep ghne ghnp ghot ghsv ghtv ghue ghuw ghwn ghwp
glav glku glqe glqt glsm
gmb gml~n gmu gmw
gnb gnbe~f gnbk gnc gnco gnd gndb gndi gndl gndu gnf gnfa gnfo gnfr gnga gngu gnk gnka~b gnkd~e gnkn~o gnks gnl gnla gnle gnlo gnm gnmc~d gnml~m gnn gnnz gnpi gnsi gnte gnto gnyo
@@ -94,11 +94,11 @@
idac idba~b idbe idbt idgo idja~b idji idjk idjt idjw idka~b idki idkr~u idla idma idml idmu idnb idnt~u idpa~b idpp idri idsa~b idsg idsl~n idsr~u idyo
iec iece iecn~o iecw ied iedl ieg ieke iekk ieky iel ield ielh ielk ielm iels iem iemh iemn~o ieoy iern ieso ieta ieu iewd iewh ieww~x
ild ilha iljm ilm ilta ilz
- inan inap inar~s inbr inch inct indd indl indn inga ingj inhp inhr injh injk inka inkl inld inmh inml inmn inmp inmz innl inor inpb inpy inrj insk intg intn intr inup inut inwb
+ inan inap inar~s inbr inch inct indd indl indn inga ingj inhp inhr injh injk inka inkl inla inld inmh inml inmn inmp inmz innl inor inpb inpy inrj insk intg intn intr inup inut inwb
iqan iqar iqba~b iqbg iqda iqdi iqdq iqka iqki iqma iqmu iqna iqni iqqa iqsd iqsu iqwa
ir01~8 ir10~9 ir20~9 ir30~2
is1~8
- it21 it23 it25 it32 it34 it36 it42 it45 it52 it55 it57 it62 it65 it67 it72 it75 it77~8 it82 it88 itag ital itan~r itat itav itba itbg itbi itbl itbn~o itbr~t itbz itca~b itce itch~i itcl itcn~o itcr~t itcz iten itfc itfe itfg itfi itfm itfr itge itgo itgr itim itis itkr itlc itle itli itlo itlt~u itmb~c itme itmi itmn~o itms~t itna itno itnu itog itor itot itpa itpc~e itpg itpi itpn~o itpr itpt~v itpz itra itrc itre itrg itri itrm~o itsa itsi itso~p itsr~s itsv itta itte ittn~p ittr~s ittv itud itva~c itve itvi itvr~t itvv
+ it21 it23 it25 it32 it34 it36 it42 it45 it52 it55 it57 it62 it65 it67 it72 it75 it77~8 it82 it88 itag ital itan itap~r itat itav itba itbg itbi itbl itbn~o itbr~t itbz itca~b itce itch itcl itcn~o itcr~t itcz iten itfc itfe itfg itfi itfm itfr itge itgr itim itis itkr itlc itle itli itlo itlt~u itmb~c itme itmi itmn~o itms~t itna itno itnu itor itpa itpc~e itpg itpi itpo itpr itpt~v itpz itra itrc itre itrg itri itrm~o itsa itsd itsi itso~p itsr~s itsv itta itte ittn~p ittr ittv itva~c itve itvi itvr itvt itvv
jm01~9 jm10~4
joaj joam joaq joat joaz joba joir joja joka joma jomd jomn
jp01~9 jp10~9 jp20~9 jp30~9 jp40~7
@@ -126,10 +126,10 @@
ma01~9 ma10~2 maagd maaou maasz maazi mabem maber~s mabod mabom mabrr macas mache machi macht madri maerr maesi maesm mafah mafes mafig mafqh mague~f mahaj mahao mahoc maifr maine majdi majra maken makes makhe makhn~o malaa malar mamar mamdf mamed mamek mamid mamoh mamou manad manou maoua maoud maouj maouz marab mareh masaf masal masef maset masib masif masik~l maskh mataf matai matao matar matat mataz matet matin matiz matng matnt mayus mazag
mccl mcco mcfo mcga mcje mcla mcma mcmc mcmg mcmo mcmu mcph mcsd mcso~p mcsr mcvr
mdan mdba mdbd mdbr~s mdca mdcl~m mdcr~u mddo mddr mddu mded mdfa mdfl mdga mdgl mdhi mdia mdle mdni mdoc mdor mdre mdri mdsd mdsi mdsn~o mdst mdsv mdta mdte mdun
- me01~9 me10~9 me20~3
+ me01~9 me10~9 me20~4
mga mgd mgf mgm mgt~u
mhalk~l mharn mhaur mhebo mheni mhjab mhjal mhkil mhkwa mhl mhlae mhlib mhlik mhmaj mhmal mhmej mhmil mhnmk mhnmu mhron mht mhuja mhuti mhwth mhwtj
- mk02~8 mk10~4 mk16 mk18~9 mk20~7 mk30 mk32~7 mk40~9 mk50~6 mk58~9 mk60~7 mk69 mk70~6 mk78 mk80~3 mk85
+ mk101~9 mk201~9 mk210~1 mk301 mk303~4 mk307~8 mk310~3 mk401~9 mk410 mk501~9 mk601~9 mk701~6 mk801~9 mk810~7
ml1 ml10 ml2~9 mlbko
mm01~7 mm11~8
mn035 mn037 mn039 mn041 mn043 mn046~7 mn049 mn051 mn053 mn055 mn057 mn059 mn061 mn063~5 mn067 mn069 mn071 mn073 mn1
@@ -146,7 +146,7 @@
ngab ngad ngak ngan ngba ngbe ngbo ngby ngcr ngde ngeb nged ngek ngen ngfc nggo ngim ngji ngkd~e ngkn~o ngkt ngkw ngla ngna ngni ngog ngon ngos ngoy ngpl ngri ngso ngta ngyo ngza
nian nias nibo nica nici nico nies nigr niji nile nimd nimn nims~t nins niri nisj
nlbq1~3 nldr nlfl nlfr nlge nlgr nlli nlnb nlnh nlov nlut nlze nlzh
- no01~9 no10~2 no14~5 no18~9 no20~3
+ no01~9 no10~2 no14~5 no18~9 no20~2 no50
np1~5 npba npbh npdh npga npja npka npko nplu npma npme npna npp1~7 npra npsa npse
nr01~9 nr10~4
nzauk nzbop nzcan nzcit nzgis nzhkb nzmbh nzmwt nznsn nzntl nzota nzstl nztas nztki nzwgn nzwko nzwtc
@@ -155,7 +155,7 @@
peama peanc peapu peare peaya pecaj pecal pecus pehuc pehuv peica pejun pelal~m pelim pelma pelor pemdd pemoq pepas pepiu pepun pesam petac petum peuca
pgcpk pgcpm pgebr pgehg pgepw pgesw pggpk pghla pgjwk pgmba pgmpl~m pgmrl pgncd pgnik pgnpp pgnsb pgsan pgshm pgwbk pgwhm pgwpd
ph00~3 ph05~9 ph10~5 ph40~1 phabr phagn phags phakl phalb phant phapa phaur phban phbas phben phbil phboh phbtg phbtn phbuk~l phcag phcam~n phcap phcas~t phcav phceb phcom phdao phdas phdav phdin phdvo pheas phgui phifu phili philn phils phisa phkal phlag phlan phlas phley phlun phmad phmag phmas phmdc phmdr phmou phmsc phmsr phnco phnec phner phnsa phnue phnuv phpam~n phplw phque phqui phriz phrom phsar phsco phsig phsle phslu phsor phsuk phsun phsur phtar phtaw phwsa phzan phzas phzmb phzsi
- pkba pkgb pkis pkjk pkkp pkpb pksd pkta
+ pkba pkgb pkis pkjk pkkp pkpb pksd
pl02 pl04 pl06 pl08 pl10 pl12 pl14 pl16 pl18 pl20 pl22 pl24 pl26 pl28 pl30 pl32
psbth psdeb psgza pshbn psjem~n psjrh pskys psnbs psngz psqqa psrbh psrfh psslt pstbs pstkm
pt01~9 pt10~8 pt20 pt30
@@ -211,28 +211,28 @@
wfal wfsg wfuv
wsaa wsal wsat wsfa wsge wsgi wspa wssa wstu wsvf wsvs
yeab yead yeam yeba yeda yedh yehd yehj yehu yeib yeja yela yema yemr yemw yera yesa yesd yesh yesn yesu yeta
- zaec zafs zagt zalp zamp zanc zanl zanw zawc
+ zaec zafs zagp zakzn zalp zamp zanc zanw zawc
zm01~9 zm10
zwbu zwha zwma zwmc zwme zwmi zwmn zwms zwmv~w
</id>
<!-- Deprecated values include those that are not formally deprecated in the country in question, but have their own region codes.
It also include codes that were previously in CLDR, for compatibility. -->
- <id type='subdivision' idStatus='deprecated'> <!-- 346 items -->
+ <id type='subdivision' idStatus='deprecated'> <!-- 437 items -->
albr albu aldi aldl aldr aldv alel aler alfr algj algr alha alka~c alko alkr alku allb alle allu almk almm almr almt alpg alpq~r alpu alsh alsk alsr alte altp altr alvl
ba01~9 ba10 bh16
cdbn cdka cdkw cdor ci01~9 ci10~9 cn11~5 cn21~3 cn31~7 cn41~6 cn50~4 cn61~5 cn71 cn91~2 cz101~9 cz10a~f cz110~9 cz120~2 cz611~5 cz621~7 czjc czjm czka czkr czli czmo czol czpa czpl czpr czst czus czvy czzl
- escn
fi01 fra~b frbl frc frcp frd~g frgf frgp frh~m frmf frmq frn frnc fro~p frpf frpm frq~r frre frs~t frtf fru~v frwf fryt
- gbant gbard gbarm gbbla gbbly gbbnb gbcgv gbckf gbckt gbclr gbcsr gbdgn gbdow gbdry gbfer gblmv gblrn gblsb gbmft gbmyl gbndn gbnta gbnym gbomh gbstb glqa gr01 gr03~7 gr11~7 gr21~4 gr31~4 gr41~4 gr51~9 gr61~4 gr71~3 gr81~5 gr91~4 gra1
- is0
+ gbant gbard gbarm gbbla gbbly gbbnb gbcgv gbckf gbckt gbclr gbcsr gbdgn gbdow gbdry gbeaw gbeng gbfer gbgbn gblmv gblrn gblsb gbmft gbmyl gbndn gbnir gbnta gbnym gbomh gbsct gbstb gbukm gbwls ghba glqa gr01 gr03~7 gr11~7 gr21~4 gr31~4 gr41~4 gr51~9 gr61~4 gr71~3 gr81~5 gr91~4 gra1
+ is0 itao itci itgo itog itot itpn itts itud itvs
laxn lud lug lul
- ma13~6 mammd mammn masyb mk01 mk09 mk15 mk17 mk28~9 mk31 mk38~9 mk57 mk68 mk77 mk79 mk84 mrnkc mvce mvnc mvno mvsc mvsu mvun mvus mxdif
- nlaw nlcw nlsx no16~7 nzn nzs
+ ma13~6 mammd mammn masyb mk01~9 mk10~9 mk20~9 mk30~9 mk40~9 mk50~9 mk60~9 mk70~9 mk80~5 mrnkc mvce mvnc mvno mvsc mvsu mvun mvus mxdif
+ nlaw nlcw nlsx no16~7 no23 nzn nzs
omba omsh
- plds plkp pllb plld pllu plma plmz plop plpd plpk plpm plsk~l plwn plwp plzp
+ pkta plds plkp pllb plld pllu plma plmz plop plpd plpk plpm plsk~l plwn plwp plzp
shta
tteto ttrcm ttwto twkhq twtnq twtpq twtxq
usas usgu usmp uspr usum usvi
+ zagt zanl
</id>
<!-- Unknown/Undetermined subdivision codes (ZZZZ) are defined for all regular region codes. -->
<id type='subdivision' idStatus='unknown'> <!-- 256 items -->
diff --git a/common/validity/unit.xml b/common/validity/unit.xml
index 99996f2..fd8cdab 100644
--- a/common/validity/unit.xml
+++ b/common/validity/unit.xml
@@ -9,7 +9,7 @@
<version number='$Revision$'/>
<idValidity>
<id type='unit' idStatus='regular'>
- acceleration-g-force acceleration-meter-per-second-squared
+ acceleration-g-force acceleration-meter-per-square-second
angle-arc-minute angle-arc-second angle-degree angle-radian angle-revolution
area-acre
area-hectare area-square-centimeter area-square-foot area-square-inch area-square-kilometer
@@ -17,9 +17,9 @@
area-dunam
concentr-karat
concentr-milligram-per-deciliter concentr-millimole-per-liter
- concentr-part-per-million concentr-percent concentr-permille concentr-permyriad
- concentr-mole
- consumption-liter-per-100kilometers consumption-liter-per-kilometer
+ concentr-percent concentr-permille concentr-permyriad concentr-permillion
+ concentr-mole concentr-item concentr-portion
+ consumption-liter-per-100-kilometer consumption-liter-per-kilometer
consumption-mile-per-gallon consumption-mile-per-gallon-imperial
digital-bit digital-byte
digital-gigabit digital-gigabyte digital-kilobit digital-kilobyte digital-megabit
@@ -41,17 +41,19 @@
force-newton
frequency-gigahertz frequency-hertz frequency-kilohertz
frequency-megahertz
- graphics-dot-per-centimeter graphics-dot-per-inch
+ graphics-dot graphics-dot-per-centimeter graphics-dot-per-inch
graphics-em graphics-megapixel graphics-pixel
graphics-pixel-per-centimeter graphics-pixel-per-inch
- length-astronomical-unit length-centimeter length-decimeter length-fathom
+ length-100-kilometer
+ length-astronomical-unit length-centimeter length-decimeter length-fathom
length-foot
length-furlong length-inch length-kilometer length-light-year length-meter
length-micrometer
length-mile length-mile-scandinavian length-millimeter
length-nanometer
length-nautical-mile length-parsec length-picometer length-point length-yard
- length-solar-radius
+ length-earth-radius length-solar-radius
+ light-candela
light-lux
light-solar-luminosity
mass-carat mass-gram mass-kilogram mass-metric-ton mass-microgram mass-milligram mass-ounce
@@ -61,15 +63,16 @@
mass-solar-mass
power-gigawatt power-horsepower power-kilowatt
power-megawatt power-milliwatt power-watt
- pressure-atmosphere pressure-hectopascal pressure-inch-hg pressure-bar pressure-millibar
- pressure-millimeter-of-mercury
- pressure-pound-per-square-inch
+ pressure-atmosphere pressure-hectopascal pressure-inch-ofhg pressure-bar pressure-millibar
+ pressure-millimeter-ofhg
+ pressure-pound-force-per-square-inch
pressure-pascal
pressure-kilopascal
pressure-megapascal
+ pressure-ofhg
speed-kilometer-per-hour speed-knot speed-meter-per-second speed-mile-per-hour
temperature-celsius temperature-fahrenheit temperature-generic temperature-kelvin
- torque-pound-foot
+ torque-pound-force-foot
torque-newton-meter
volume-acre-foot volume-bushel volume-centiliter volume-cubic-centimeter volume-cubic-foot
volume-cubic-inch
@@ -82,7 +85,14 @@
volume-barrel
</id>
<id type='unit' idStatus='deprecated'>
- proportion-karat
+ acceleration-meter-per-second-squared
+ consumption-liter-per-100kilometers
+ concentr-part-per-million
+ pressure-inch-hg
+ pressure-pound-per-square-inch
+ pressure-millimeter-of-mercury
+ proportion-karat
+ torque-pound-foot
</id>
</idValidity>
</supplementalData>
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..325a8b6
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,19 @@
+# CLDR Docs
+
+CLDR main page: [https://unicode.org/cldr](unicode.org/cldr)
+
+## TR35
+
+- [Unicode Technical Standard #35 UNICODE LOCALE DATA MARKUP LANGUAGE (LDML)](ldml/tr35.html)
+
+## RFC
+
+- draft-davis-t-langtag-ext: [html](rfc/draft-davis-t-langtag-ext.html) [txt](rfc/draft-davis-t-langtag-ext.txt)
+
+- draft-davis-u-langtag-ext-00: [html](rfc/draft-davis-u-langtag-ext-00.html) [txt](rfc/draft-davis-u-langtag-ext-00.txt)
+
+##### Copyright
+
+Copyright © 1991-2019 Unicode, Inc.
+All rights reserved.
+[Terms of use](http://www.unicode.org/copyright.html)
diff --git a/specs/ldml/images/androidKeyboard.png b/docs/ldml/images/androidKeyboard.png
similarity index 100%
rename from specs/ldml/images/androidKeyboard.png
rename to docs/ldml/images/androidKeyboard.png
Binary files differ
diff --git a/specs/ldml/images/keyPositions.png b/docs/ldml/images/keyPositions.png
similarity index 100%
rename from specs/ldml/images/keyPositions.png
rename to docs/ldml/images/keyPositions.png
Binary files differ
diff --git a/specs/ldml/images/keycapHint.png b/docs/ldml/images/keycapHint.png
similarity index 100%
rename from specs/ldml/images/keycapHint.png
rename to docs/ldml/images/keycapHint.png
Binary files differ
diff --git a/specs/ldml/tr35-collation.html b/docs/ldml/tr35-collation.html
similarity index 99%
rename from specs/ldml/tr35-collation.html
rename to docs/ldml/tr35-collation.html
index ddc2cc3..ae5e137 100644
--- a/specs/ldml/tr35-collation.html
+++ b/docs/ldml/tr35-collation.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Collation</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -113,7 +113,7 @@
above.</p>
<h3><i>Status</i></h3>
- <!-- NOT YET APPROVED
+ <!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
@@ -2989,7 +2989,7 @@
followed by 劃 (U+5283). For example, the stroke order boundary
string "\uFDD0\u2805" yields the label string "5劃".</p>
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35-dates.html b/docs/ldml/tr35-dates.html
similarity index 99%
rename from specs/ldml/tr35-dates.html
rename to docs/ldml/tr35-dates.html
index 9bd7428..0179b9d 100644
--- a/specs/ldml/tr35-dates.html
+++ b/docs/ldml/tr35-dates.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Dates</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -112,7 +112,7 @@
"tr35.html">main LDML document</a> and the links above.</p>
<h3><i>Status</i></h3>
- <!-- NOT YET APPROVED
+ <!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
@@ -449,15 +449,15 @@
width and the context.</p>
<p>The context is either <i>format</i> (the default), the form
used within a complete date format string (such as "Saturday,
- November 12", or <i>stand-alone</i>, the form for date elements
- used independently, such as in calendar headers. The most
- important distinction between format and stand-alone forms is a
- grammatical distinction, for languages that require it. For
- example, many languages require that a month name without an
- associated day number (i.e. an independent form) be in the
- basic <i>nominative</i> form, while a month name with an
- associated day number (as in a complete date format) should be
- in a different grammatical form: <i>genitive</i>,
+ November 12"), or <i>stand-alone</i>, the form for date
+ elements used independently, such as in calendar headers. The
+ most important distinction between format and stand-alone
+ forms is a grammatical distinction, for languages that require
+ it. For example, many languages require that a month name
+ without an associated day number (i.e. an independent form) be
+ in the basic <i>nominative</i> form, while a month name with
+ an associated day number (as in a complete date format) should
+ be in a different grammatical form: <i>genitive</i>,
<i>partitive</i>, etc. In past versions of CLDR, the
distinction between format and stand-alone forms was also used
to control capitalization (with stand-alone forms using
@@ -4695,7 +4695,7 @@
</li>
</ul>
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35-general.html b/docs/ldml/tr35-general.html
similarity index 85%
rename from specs/ldml/tr35-general.html
rename to docs/ldml/tr35-general.html
index f53354b..3daf35b 100644
--- a/specs/ldml/tr35-general.html
+++ b/docs/ldml/tr35-general.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: General</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -130,7 +130,7 @@
by the Unicode Consortium. This is a stable document and may be
used as reference material or cited as a normative reference by
other specifications.</i></p>
- <!-- END APPROVED -->
+ <!-- END APPROVED -->
<blockquote>
<p><i><b>A Unicode Technical Standard (UTS)</b> is an
@@ -212,13 +212,14 @@
</li>
<li>6 <a href="#Unit_Elements">Unit Elements</a>
<ul class="toc">
- <li>6.1 <a href="#perUnitPatterns">per Unit
- patterns</a></li>
- <li>6.2 <a href="#Unit_Sequences">Unit Sequences</a></li>
- <li>6.3 <a href="#durationUnit">durationUnit</a></li>
- <li>6.4 <a href="#coordinateUnit">coordinateUnit</a></li>
- <li>6.5 <a href=
- "#Territory_Based_Unit_Preferences">Territory-Based Unit
+ <li>6.1 <a href="#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a></li>
+ <li>6.2 <a href="#Unit_Identifiers">Unit Identifiers</a></li>
+ <li>6.3 <a href="#Example_Units">Example Units</a></li>
+ <li>6.4 <a href="#perUnitPatterns">per Unit patterns</a></li>
+ <li>6.5 <a href="#Unit_Sequences">Unit Sequences</a></li>
+ <li>6.6 <a href="#durationUnit">durationUnit</a></li>
+ <li>6.7 <a href="#coordinateUnit">coordinateUnit</a></li>
+ <li>6.8 <a href= "#Territory_Based_Unit_Preferences">Territory-Based Unit
Preferences</a></li>
</ul>
</li>
@@ -292,7 +293,13 @@
Names</a></li>
</ul>
</li>
- </ul><!-- END Generated TOC: CheckHtmlFiles -->
+ <li>15 <a href="#Grammatical_Features">Grammatical Features</a>
+ <ul class="toc">
+ <li>15.1<a href="#Gender" >Gender</a></li>
+<li>15.2<a href="#Case">Case</a></li>
+ </ul>
+ </li>
+ </ul>
<h2>1 <a name="Display_Name_Elements" href=
"#Display_Name_Elements" id="Display_Name_Elements">Display
Name Elements</a></h2>
@@ -412,7 +419,7 @@
<ul>
<li>If CombineLanguage is false, only choose matches with the language subtag matching.</li>
</ul>
- </li>
+ </li>
<li><strong>Script, Region, Variants.</strong> Where any of these subtags are in L, append the matching element value to LQS.</li>
<li><strong>T extensions. </strong>Get the value of the key="h0" type="hybrid" element, if there is one; otherwise the value of the <key type="t"> element. Next get the locale display name of the tlang. Join the pair using localePattern> and append to the LQS. Then format and add display names to LQS for any of the remaining tkey-tvalue pairs as described below.</li>
<li><strong>U extensions. </strong>If there is an attribute value A, process the key-value pair <"u", A> as below and append to LQS. Then format and add display names for each of the remaining key-type pairs as described below.</li>
@@ -1340,11 +1347,13 @@
west) #REQUIRED ><br>
<br>
<!ELEMENT durationUnitPattern ( #PCDATA ) ><br></p>
+
<p>These elements specify the localized way of formatting
quantities of units such as years, months, days, hours, minutes
and seconds— for example, in English, "1 day" or "3 days". The
English rules that produce this example are as follows ({0}
indicates the position of the formatted numeric value):</p>
+
<pre><unit type="duration-day">
<displayName>days</displayName>
<unitPattern count="one"><span style=
@@ -1352,17 +1361,37 @@
<unitPattern count="other"><span style=
"color: blue">{0} days</span></unitName>
</unit></pre>
+
<p>In addition to supporting language-specific plural cases
such as “one” and “other”, unitPatterns support the
language-independent explicit cases “0” and “1” for special
handling of numeric values that are exactly 0 or 1; see
<a href="tr35-numbers.html#Explicit_0_1_rules">Explicit 0 and 1
rules</a>.</p>
+
+ <p>The <unitPattern> elements may be used to format
+ quantities with decimal values; in such cases the choice of plural form will
+ depend not only on the numeric value, but also on its formatting (see
+ <a href="tr35-numbers.html#Language_Plural_Rules">Language Plural Rules</a>).
+ In addition to formatting units for stand-alone use, <unitPattern>
+ elements are increasingly being used to format units for use in running text;
+ for such usages, the developing <a href="#Grammatical_Features">Grammatical Features</a>
+ information will be very useful.</p>
+
+ <p>Note that for certain plural cases, the unit pattern may not
+ provide for inclusion of a numeric value—that is, it may not include “{0}”. This
+ is especially true for the explicit cases “0” and “1” (which may have patterns like
+ “zero seconds”). In certain languages such as Arabic and Hebrew, this may also be
+ true with certain units for the plural cases “zero”, “one”, or “two” (in these
+ languages, such plural cases are only used for the corresponding exact numeric
+ values, so there is no concern about loss of precision without the numeric value).</p>
+
<p>Units, like other values with a <strong>count</strong>
attribute, use a special inheritance. See <strong>Part 1:
Core:</strong> <em>Section 4.1 <a href=
"tr35.html#Multiple_Inheritance">Multiple Inheritance</a></em>
.</p>
+
<p>The displayName is used for labels, such as in a UI. It is
typically lowercased and as neutral a plural form as possible,
and then uses the casing context for the proper display. For
@@ -1373,50 +1402,300 @@
<td>Days</td>
<td style="color: silver">enter the vacation length</td>
</tr>
- </table>
- <p> </p>
- <p>The value of the type attribute are <em>unit
- identifiers</em> (e.g., <code>duration-day</code>).
- Syntactically, they have the following structure:</p>
- <table>
- <tr>
- <td><code>unit_identifier</code></td>
- <td><code>:= type "-" core_unit_identifier</code></td>
- </tr>
- <tr>
- <td><code>type</code></td>
- <td><code>:= [a-z]+</code></td>
- </tr>
- <tr>
- <td><code>core_unit_identifier</code></td>
- <td><code>:=
- compound_unit | simple_unit</code></td>
- </tr>
- <tr>
- <td><code>compound_unit</code></td>
- <td><code>:= simple_unit "-per-" simple_unit</code></td>
- </tr>
- <tr>
- <td><code>simple_unit</code></td>
- <td><code>:= [a-z]+([-][a-z]+)*</code> and may not contain
- <code>"-per-"</code></td>
- </tr>
- </table>
- <p>Both the unit identifier and the <em>core unit
- identifier</em> (e.g., <code>day</code>) are guaranteed to be
- unique, and clients can use either one to identify a unit. The
- associations between types and core unit identifiers are as
- prescribed in CLDR data; it is invalid for a client to create any
- additional associations. Except as specified in <em>Section 6.6
- <a href="#Private_Use_Units">Private-Use Units</a></em>, all
- values for <code>type</code> and <code>simple_unit</code> are
- reserved by CLDR. It is valid to construct a
- <code>compound_unit</code> with any two valid
- <code>simple_unit</code>s; the first
- <code>simple_unit</code> in a <code>compound_unit</code> is
- called the <em>numerator</em>, and the second
- <code>simple_unit</code> in a <code>compound_unit</code> is
- called the <em>demonimator</em>.</p>
+ </table><br>
+ <h3>6.1 <a name="Unit_Preference_and_Conversion" href="#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a> </h3>
+
+
+<p>
+Different locales have different preferences for which unit or combination of units is used for a particular usage, such as measuring a person’s height. This is more fine-grained than merely a preference for metric versus US or UK measurement systems. For example, one locale may use meters alone, while another may use centimeters alone or a combination of meters and centimeters; a third may use inches alone, or (informally) a combination of feet and inches.
+</p>
+<p>
+The unit preference and conversion data allows formatting functions to pick the right measurement units for the locale and usage, and convert input measurement into those units. For example, a program (or database) could use 1.88 meters internally, but then for person-height have that measurement convert to <em>6 foot 2 inches</em> for en-US and to <em>188 centimeters </em>for de-CH. Using the unit display names and list formats, those results can then be displayed according to the desired width (eg <em>2″</em> vs <em>2 in</em> vs 2 <em>inches</em>) and using the locale display names and number formats.
+</p>
+<p>
+The size of the measurement can also be taken into account, so that an infant can have a height as <em>18 inches</em>, and an adult the height as <em>6 foot 2 inches.</em>
+</p>
+<p>
+This data is supplied in <strong>Part 6: <a href=
+ "tr35-info.html#Contents">Supplemental</a></strong>: <a href=
+ "tr35-info.html#Unit_Conversion">Section 13 Unit Conversion</a> and <a href=
+ "tr35-info.html#Unit_Preferences">Section 13 Unit Preferences</a>.
+</p>
+<h3>6.2 <a name="Unit_Identifiers" href="#Unit_Identifiers" >Unit Identifiers</a></h3>
+<p>
+ Units are identified internally as described in this section. As with other identifiers in CLDR, the American English spelling is used for unit identifiers. These names should not be presented to end users, however. As in other cases, the translated names for different languages (or variants of English) are available in the CLDR localized data.
+</p>
+
+<table>
+ <tr>
+ <td><strong>Name</strong>
+ </td>
+ <td><strong>Example</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>long unit identifier
+ </td>
+ <td>length-meter, mass-pound, duration-day
+ </td>
+ </tr>
+ <tr>
+ <td>core unit identifier
+ </td>
+ <td>meter, pound, day
+ </td>
+ </tr>
+</table><br>
+
+
+<p>
+Both the <em>unit identifier</em> and the <em>core unit identifier</em> are guaranteed to be unique, and clients can use either one to identify a unit. The associations between types and core unit identifiers are as prescribed in CLDR data; it is invalid for a client to create any additional associations. Except as specified in <em>Section 6.6 <a href="https://www.unicode.org/reports/tr35/tr35-general.html#Private_Use_Units">Private-Use Units</a></em>, all values are reserved by CLDR.
+</p>
+
+<table>
+ <tr>
+ <td><strong>Name</strong>
+ </td>
+ <td><strong>Examples</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>simple unit ID
+ </td>
+ <td>meter, foot, inch, pound, pound-force, …
+ </td>
+ </tr>
+ <tr>
+ <td>prefixed unit ID
+ </td>
+ <td>kilometer, centigram, …
+<p>
+<em>plus simple unit IDs</em>
+ </td>
+ </tr>
+ <tr>
+ <td>single unit ID
+ </td>
+ <td>square-foot, cubic-centimeter, …<br>
+<em>plus prefixed unit IDs</em>
+ </td>
+ </tr>
+ <tr>
+ <td>core unit ID
+ </td>
+ <td>kilometer-per-hour, kilogram-meter, kilogram-meter-per-square-second, …
+<p>
+<em>plus single unit IDs</em>
+ </td>
+ </tr>
+ <tr>
+ <td>mixed unit ID
+ </td>
+ <td>foot-and-pound
+ </td>
+ </tr>
+</table><br>
+
+
+<p>
+A core unit that is not a simple unit is called a <em>complex unit</em>. It is valid to construct a complex unit identifier from multiple simple unit identifiers using multiplication (kilogram-meter) and division (kilogram-per-meter). As usual, with division the part before the (first) -per- is called the <em>numerator</em>, and the part after it is called the <em>denominator</em>.
+</p>
+<p>
+The conversion information uses the short unit identifiers, discarding the unitType. Thus “meter” is used instead of “length-meter”. The translation data currently uses the long unit identifiers, for backwards compatibility. However, that is likely to change in a future version.
+</p>
+<p>
+The identifiers and unit conversion data are built to handle arbitrary combinations of core unit IDs using division (kilometer-per-hour), multiplication (kilogram-meter), powers (square-second), and SI prefixes (kilo-). Thus they support converting generated units such as inch-pound-per-square-week into comparable units, such as newtons.
+</p><ul>
+
+<li>A power (square, cubic, pow4, etc) modifies one prefixed unit ID, and must occur immediately before it in the identifier: square-foot, not foot-square.
+<li>Multiplication binds more tightly than division, so kilogram-meter-per-second-ampere is interpreted as (kg ⋅ m) / (s ⋅ a).
+<li>Thus if -per- occurs multiple times, each occurrence after the first is equivalent to a multiplication: <ul>
+
+ <li>kilogram-meter-per-second-ampere ⩧ kilogram-meter-per-second-per-ampere.
+</ul>
+</li></ul>
+
+<h4>Nomenclature</h4>
+
+
+<p>
+For the US spelling, see the <a href="https://www.nist.gov/pml/special-publication-811">Preface of the Guide for the Use of the International System of Units (SI), NIST special publication 811</a>, which is explicit about the discrepancy with the English-language BIPM spellings:
+</p>
+<p>
+
+ In keeping with U.S. and International practice (see Sec. C.2), this Guide uses the dot on the line as the decimal marker. In addition this Guide utilizes the American spellings “meter,” “liter,” and “deka” rather than “metre,” “litre,” and “deca,” and the name “metric ton” rather than “tonne.”
+</p>
+<h4>Syntax</h4>
+
+
+<p>
+The formal syntax for identifiers is provided below.
+</p>
+
+<table>
+ <tr>
+ <td>unit_identifier
+ </td>
+ <td>:=
+ </td>
+ <td>long_unit_identifier<br>
+| mixed_unit_identifier
+<p>
+| core_unit_identifier
+ </td>
+ </tr>
+ <tr>
+ <td>long_unit_identifier
+ </td>
+ <td>:=
+ </td>
+ <td>type "-" core_unit_identifier
+ </td>
+ </tr>
+ <tr>
+ <td>core_unit_identifier
+ </td>
+ <td>:=
+ </td>
+ <td>product_unit ("-per-" product_unit)*<br>| "per-" product_unit ("-per-" product_unit)*
+ <ul>
+ <li><em>Examples:</em>
+ <ul>
+ <li>foot-per-second-per-second</li>
+ <li>per-second</li>
+ </ul>
+ </li>
+ <li><em>Note: </em>The normalized form will have only one "per"</li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>mixed_unit_identifier
+ </td>
+ <td>:=
+ </td>
+ <td>(single_unit | pu_single_unit) ("-and-" (single_unit | pu_single_unit ))*<ul>
+
+<li><em>Example: foot-and-inch</em>
+ </ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>product_unit
+ </td>
+ <td>:=
+ </td>
+ <td>single_unit ("-" single_unit)* ("-" pu_single_unit)*
+<p>
+| pu_single_unit ("-" pu_single_unit)*<ul>
+
+<li><em>Example: </em>foot-pound-force
+<li><em>Constraint:</em> No pu_single_unit may precede a single unit</li></ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>single_unit
+ </td>
+ <td>:=
+ </td>
+ <td>(dimensionality_prefix)? prefixed_unit<ul>
+
+<li><em>Example: </em>square-meter</li></ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>pu_single_unit
+ </td>
+ <td>:=
+ </td>
+ <td>“xxx-” single-unit | “x-” single-unit<ul>
+
+<li><em>Example: </em>xxx-square-knuts (a Harry Potter unit)
+<li><em>Note: </em>“x-” is only for backwards compatibility
+<li>See Section 6.6 <a href="#Private_Use_Units">Private-Use Units</a>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>dimensionality_prefix
+ </td>
+ <td>:=
+ </td>
+ <td>"square-"
+<p>
+| "cubic-"
+<p>
+| "pow" ([2-9]|1[0-5]) "-"<ul>
+
+<li><em>Note: </em>"pow2-" and "pow3-" canonicalize to "square-" and "cubic-"</li></ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>prefixed_unit
+ </td>
+ <td>
+ </td>
+ <td>(si_prefix)? simple_unit<ul>
+
+<li><em>Example: </em>kilometer</li></ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>si_prefix
+ </td>
+ <td>:=
+ </td>
+ <td>"deka" | "hecto" | "kilo", … <ul>
+
+<li><em>Note: </em>See full list at <a href="https://www.nist.gov/pml/special-publication-811">NIST special publication 811</a></li></ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>simple_unit
+ </td>
+ <td>:=
+ </td>
+ <td>unit_component ("-" unit_component)*
+<p>
+ | “em” | “g” | “us” | “hg” | “of”<ul>
+
+ <li><em>Example: </em>gallon-imperial</li>
+<li><em>Constraint: </em>At least one unit_component must not itself be a simple_unit
+<li><em>Note: </em>3 simple units are grandfathered in, where a component wouldn’t be a unit_component (eg for “<strong>g</strong>-force”)
+
+ <ul>
+
+ <li>We will likely deprecate those and add conformant aliases in the future.
+ <li>“hg” and “of” are already only in deprecated simple_units.
+ </ul>
+</li>
+ </ul>
+
+ </td>
+ </tr>
+ <tr>
+ <td>unit_component
+ </td>
+ <td>:=
+ </td>
+ <td>[a-z]{3,∞} | “1” “0”{2,3}<ul>
+
+<li><em>Constraints: </em>
+ <ul><li>Cannot be "per", "and", "square", "cubic", "xxx", or "x"; or start with an SI prefix.</li>
+<li>While the syntax allows any number of letters greater than 3, the unit_components need to be distinct if truncated to 8 letters. This allows for possible future support of units in Unicode Locale Identifiers.</li></ul>
+<li><em>Example: </em>foot</li></ul>
+
+ </td>
+ </tr>
+</table>
+
+
+ <h3>6.3 <a name="Example_Units" href="#Example_Units">Example Units</a></h3>
<p>The
following table contains examples of types and units currently
defined by CLDR. The units in CLDR are not
@@ -1445,7 +1724,7 @@
</tr>
<tr>
<td><em>acceleration</em></td>
- <td>meter-per-second-squared</td>
+ <td>meter-per-square-second</td>
<td>compound</td>
<td>{0} m/s²</td>
</tr>
@@ -1530,7 +1809,7 @@
</tr>
<tr>
<td><em>concentr</em></td>
- <td>part-per-million</td>
+ <td>permillion</td>
<td>compound</td>
<td>{0} ppm</td>
<td>dimensionless</td>
@@ -1571,7 +1850,7 @@
</tr>
<tr>
<td><em>consumption</em></td>
- <td>liter-per-100kilometers</td>
+ <td>liter-per-100-kilometer</td>
<td>compound</td>
<td>{0} L/100km</td>
</tr>
@@ -1966,19 +2245,19 @@
</tr>
<tr>
<td><em>pressure</em></td>
- <td>millimeter-of-mercury</td>
+ <td>millimeter-ofhg</td>
<td>simple</td>
<td>{0} mm Hg</td>
</tr>
<tr>
<td><em>pressure</em></td>
- <td>pound-per-square-inch</td>
+ <td>pound-force-per-square-inch</td>
<td>compound</td>
<td>{0} psi</td>
</tr>
<tr>
<td><em>pressure</em></td>
- <td>inch-hg</td>
+ <td>inch-ofhg</td>
<td>simple</td>
<td>{0} inHg</td>
</tr>
@@ -2056,7 +2335,7 @@
</tr>
<tr>
<td><em>torque</em></td>
- <td>pound-foot</td>
+ <td>pound-force-foot</td>
<td>simple</td>
<td>{0} lbf⋅ft</td>
</tr>
@@ -2138,7 +2417,7 @@
<td>simple</td>
<td>{0} bbl</td>
</tr>
- </table>
+ </table><br>
<p>There are three widths: <strong>long</strong>,
<strong>short</strong>, and <strong>narrow</strong>. As usual,
the narrow forms may not be unique: in English, 1′ could mean 1
@@ -2167,7 +2446,7 @@
example, in "zh", references to a person being 3 days old or 30
years old would use the forms “他3天大” and “他30岁”
respectively.</p>
- <h3>6.1 <a name="perUnitPatterns" href="#perUnitPatterns" id=
+ <h3>6.4 <a name="perUnitPatterns" href="#perUnitPatterns" id=
"perUnitPatterns">per Unit patterns</a><a name=
"compoundUnitPattern" href="#compoundUnitPattern" id=
"compoundUnitPattern"></a></h3>
@@ -2231,17 +2510,21 @@
<p>The patterns can have different unit lengths, so the
appropriate unit length should be used (with fallbacks if
necessary).</p>
- <h3>6.2 <a name="Unit_Sequences" href="#Unit_Sequences" id=
- "Unit_Sequences">Unit Sequences</a></h3>
- <p>Units may be used in composed sequences, such as <strong>5°
+
+ <h3>6.5 <a name="Unit_Sequences" href="#Unit_Sequences" id=
+ "Unit_Sequences">Unit Sequences (Mixed Units)</a></h3>
+ <p>Units may be used in composed sequences (aka <em>mixed units</em>), such as <strong>5°
30′</strong> for 5 degrees 30 minutes, or <strong>3 ft 2
- in.</strong>For that purpose, the appropriate width of the unit
+ in.</strong> For that purpose, the appropriate width of the unit
listPattern can be used to compose the units in a sequence.</p>
<pre><listPattern type="unit"> (for the long form)
<listPattern type="unit-narrow">
<listPattern type="unit-short">
</pre>
- <h3>6.3 <a name="durationUnit" href="#durationUnit" id=
+ <p>In such a sequence, decimal fractions are typically only displayed for
+ the last element of the sequence, if at all.</p>
+
+ <h3>6.6 <a name="durationUnit" href="#durationUnit" id=
"durationUnit">durationUnit</a></h3>
<p>The durationUnit is a special type of unit used for composed
time unit durations.</p>
@@ -2252,7 +2535,7 @@
'm' for minutes, and 's' for sections. These are the same
symbols used in availableFormats, except that there is no need
to distinguish different forms of the hour.</p>
- <h3>6.4 <a name="coordinateUnit" href="#coordinateUnit" id=
+ <h3>6.7 <a name="coordinateUnit" href="#coordinateUnit" id=
"coordinateUnit">coordinateUnit</a></h3>
<p>The <strong>coordinateUnitPattern</strong> is a special type
of pattern used for composing degrees of latitude and
@@ -2274,7 +2557,7 @@
type="south">{0}S</coordinateUnitPattern><br>
<coordinateUnitPattern
type="west">{0}W</coordinateUnitPattern></p>
- <h3>6.5 <a name="Territory_Based_Unit_Preferences" href=
+ <h3>6.8 <a name="Territory_Based_Unit_Preferences" href=
"#Territory_Based_Unit_Preferences" id=
"Territory_Based_Unit_Preferences">Territory-Based Unit
Preferences</a></h3>
@@ -2294,27 +2577,28 @@
the scale of the measurement (e.g measuring the height of an
adult versus that of an infant).</p>
- <h3>6.6 <a name="Private_Use_Units" href="#Private_Use_Units"
- id="Private_Use_Units">Private-Use Units</a></h3>
- <p>CLDR has reserved the <code>"x-"</code> prefix in the
- <code>simple_unit</code> part of the unit identifer BNF for
- private-use units. CLDR will never define a type, simple unit,
- or compound unit such that the unit identifier starts with
- <code>"x-"</code>, ends with <code>"-x"</code>, or contains
- <code>"-x-"</code>.</p>
- <p>For example, if you wanted to define your own unit "foo",
- you could use the simple unit
- <code>"x-foo"</code>.</p>
- <p>It is valid to construct compound units containing one or
- more private-use simple units. For example,
- <code>"x-foo-per-second"</code> and
- <code>"x-foo-per-x-bar"</code> are both valid core
- unit identifiers for compound units.</p>
- <p>As explained earlier, CLDR defines all associations
- between types and units. It is therefore not possible to
- construct a valid unit identifier containing a private-use
- unit; only core unit identifiers are possible.</p>
-
+ <h3>6.9 <a name="Private_Use_Units" href="#Private_Use_Units"
+ id="Private_Use_Units">Private-Use Units</a></h3>
+ <p>
+ CLDR has reserved the "xxx-" prefix in the simple_unit part of the unit identifier BNF
+ for private-use units. CLDR will never define a type, simple unit, or compound unit
+ such that the unit identifier starts with "xxx-", ends with "-xxx", or contains "-xxx-".
+ </p>
+ <p>
+ For example, if you wanted to define your own unit "foo", you could use the simple unit "xxx-foo".
+ </p>
+ <p>
+ It is valid to construct compound units containing one or more private-use simple units.
+ For example, "xxx-foo-per-second" and "xxx-foo-per-xxx-bar" are both valid core unit
+ identifiers for compound units.
+ </p>
+ <p>
+ As explained earlier, CLDR defines all associations between types and units. It is
+ therefore not possible to construct a valid long unit identifier containing a private-use
+ unit; only core unit identifiers are possible.
+ </p>
+ <p>The older syntax used “x-”, which was expanded to “xxx-” to simplify use with BCP47
+ syntax. That should be converted to “xxx-”.</p>
<h2>7 <a name="POSIX_Elements" href="#POSIX_Elements" id=
"POSIX_Elements">POSIX Elements</a></h2>
<p class="dtd"><!ELEMENT posix (alias | (messages*,
@@ -3624,7 +3908,81 @@
element.</li>
</ol>
<p>Thus a list (a,b,c,...m, n) is formatted as:
- start(a,middle(b,middle(c,middle(...end(m, n))...)))</p>
+ <code>start(a,middle(b,middle(c,middle(...end(m, n))...)))</code></p>
+ <p>More sophisticated implementations can customize the process to improve the results for languages where context is important. For example:</p>
+ <table>
+ <tr>
+ <td rowspan="3">Spanish
+ </td>
+ <td>AND
+ </td>
+ <td>Use ‘e’ instead of ‘y’ in the listPatternPart for "end" and "2" in either of the following cases:
+ <ol>
+
+ <li>The value substituted for {1} starts with ‘i’
+ <ol>
+ <li><em>fuerte <strong>e</strong> indomable, </em>not <em>fuerte <strong>y</strong> indomable</em></li>
+ </ol></li>
+ <li>The value substituted for {1} starts with ‘hi’, but not with ‘hie’ or ‘hia’
+ <ol>
+ <li><em>tos <strong>e</strong> hipo,</em> not <em>tos <strong>y</strong> hipo </em></li>
+ <li><em>gua <strong>y</strong> hielo,</em> not <em>agua <strong>e</strong> hielo </em></li>
+ </ol>
+ </li>
+ </ol></td>
+ </tr>
+ <tr>
+ <td>OR
+ </td>
+ <td>Use ‘u’ instead of ‘o’ in the listPatternPart for "end" and "2" in any of the following cases:
+ <ol>
+
+ <li>The value substituted for {1} starts with ‘o’ or ‘ho’
+ <ol>
+ <li><em>delfines <strong>u</strong> orcas,</em> not <em>deflines <strong>o</strong> orcas</em></li>
+ <li><em>mañana <strong>u</strong> hoy,</em> not <em>mañana <strong>o</strong> hoy</em></li>
+ </ol>
+ </li>
+ <li> The value substituted for {1} starts with ‘8’
+ <ol>
+ <li><em>6 <strong>u</strong> 8,</em> not <em>6 <strong>o</strong> 8</em></li>
+ </ol>
+ </li>
+ <li>The value substituted for {1} starts with ‘11’ where the numeric value is 11 x 10<sup>3×y</sup>
+ (eg 11 thousand, 11.23 million, ...)
+ <ol>
+ <li><em>10 <strong>u</strong> 11,</em> not <em>10 <strong>o</strong> 11</em></li>
+ <li><em>10 <strong>u</strong> 11.000,</em> not <em>10 <strong>o</strong> 11.000</em></li>
+ <li><em>10 <strong>o</strong> 111,</em> not <em>10 <strong>u</strong> 111</em></li>
+ </ol>
+ </li></ol>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">See <a href='https://www.rae.es/consultas/cambio-de-la-y-copulativa-en-e'>Cambio de la y copulativa en e</a><br>
+ <strong>Note: </strong>more advanced implementations may also consider the pronunciation, such as foreign words where the ‘h’ is not mute.</td>
+ </tr>
+ <tr>
+ <td rowspan="2">Hebrew
+ </td>
+ <td>AND
+ </td>
+ <td>Use ‘-ו’ instead of ‘ו’ in the listPatternPart for "end" and "2" in the following case:
+ <ol>
+ <li>if the value substituted for {1} starts with something other than a Hebrew letter, such as a digit (0-9) or a Latin-script letter
+ <ol>
+ <li><em>one hour and two minutes = "שעה ושתי דקות"</em></li>
+ <li><em>one hour and 9 minutes = "שעה ו-9 דקות” </em></li>
+ </ol></li>
+
+
+ </ol></td>
+ </tr>
+ <tr>
+ <td colspan="2">See <a href="https://hebrew-academy.org.il/topic/hahlatot/punctuation/#target-3475">https://hebrew-academy.org.il/topic/hahlatot/punctuation/#target-3475</a></td>
+ </tr>
+ </table><br>
<p>The following type attributes are in use:</p>
<table border="1" cellpadding="2" cellspacing="0" class=
'simple'>
@@ -4650,16 +5008,337 @@
alternate names for this (type, subtype), use the one
whose “alt” key is matching; otherwise, use the
default alternate (which has no “alt” atribute in
- CLDR).</li>
- </ol>
- </li>
+ CLDR).</li></ol></li>
</ol>
</li>
<li>Concatenate the strings, with a separator between
them.</li>
</ol>
+ <h2>15 <a name="Grammatical_Features" href="#Grammatical_Features"
+ id="Grammatical_Features">Grammatical Features</a></h2>
+
+
+<p>
+LDML supplies grammatical information that can be used to distinguish localized forms on a per-locale basis. The current data is part of an initial phase; the longer term plan is to add structure to permit localized forms based on these features, starting with measurement units such as the dative form in Serbian of “kilometer”. That will allow unit values to be inserted as placeholders into messages and adopt the right forms for grammatical agreement.
+</p>
+<p>
+The current data includes the following:
+</p><ul>
+
+<li>There are currently 3 grammatical features found in the <a href="https://github.com/unicode-org/cldr/blob/master/common/dtd/ldmlSupplemental.dtd#1229">DTD</a>: Gender, Case, Definiteness
+<li>There are initial mappings from locales to grammatical features they exhibit in the file <a href="https://github.com/unicode-org/cldr/blob/master/common/supplemental/grammaticalFeatures.xml">grammaticalFeatures.xml</a></li></ul>
+
+<p>
+Note that the CLDR plural categories overlap some of these features, since some languages use case and other devices to change words based on the numeric values.
+</p>
+<h2>Features</h2>
+
+
+<p class='dtd'>
+<!ATTLIST grammaticalFeatures targets NMTOKENS #REQUIRED >
+</p>
+<p class='dtd'>
+<!ATTLIST grammaticalFeatures locales NMTOKENS #REQUIRED >
+</p>
+<p> </p>
+<p class='dtd'>
+<!ELEMENT grammaticalCase EMPTY>
+</p>
+<p class='dtd'>
+<!ATTLIST grammaticalCase values NMTOKENS #REQUIRED >
+</p>
+<p> </p>
+<p class='dtd'>
+<!ELEMENT grammaticalGender EMPTY>
+</p>
+<p class='dtd'>
+<!ATTLIST grammaticalGender values NMTOKENS #REQUIRED >
+</p>
+<p> </p>
+<p class='dtd'>
+<!ELEMENT grammaticalDefiniteness EMPTY>
+</p>
+<p class='dtd'>
+<!ATTLIST grammaticalDefiniteness values NMTOKENS #REQUIRED >
+</p>
+<h3>15.1<a name="Gender" href="#Gender" >Gender</a></h3>
+<p>
+ Feature that classifies nouns in classes. This is grammatical gender, which may be assigned on the basis of sex in some languages, but may be completely separate in others. Also used to tag elements in CLDR that should agree with a particular gender of an associated noun. (adapted from: <a href="http://linguistics-ontology.org/gold/2010/GenderProperty">linguistics-ontology.org/gold/2010/GenderProperty</a>)
+</p>
+<h4>Example</h4>
+
+
+
+
+
+<pre class="prettyprint"><grammaticalFeatures targets="nominal" locales="es fr it pt">
+ <grammaticalGender values="masculine feminine"/>
+</pre>
+
+
+<h4>Values</h4>
+
+
+
+<table>
+ <tr>
+ <td>animate
+ </td>
+ <td>In an animate/inanimate gender system, gender that denotes human or animate entities
+ </td>
+ <td>description adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/AnimateGender">linguistics-ontology.org/gold/2010/AnimateGender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>inanimate
+ </td>
+ <td>In an animate/inanimate gender system, gender that denotes object or inanimate entities
+ </td>
+ <td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/InanimateGender">linguistics-ontology.org/gold/2010/InanimateGender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>personal
+ </td>
+ <td>In an animate/inanimate gender system in some languages, gender that specifies the masculine gender of animate entities
+ </td>
+ <td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/HumanGender">linguistics-ontology.org/gold/2010/HumanGender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>common
+ </td>
+ <td>In a common–neuter gender system, gender that denotes human entities.
+ </td>
+ <td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>feminine
+ </td>
+ <td>In a masculine/feminine or in a masculine/feminine/neuter gender system, gender that denotes specifically female persons (or animals) or that is assigned arbitrarily to object.
+ </td>
+ <td>adapted from: wikipedia.org/wiki/Grammatical_gender <a href="http://linguistics-ontology.org/gold/2010/FeminineGender">linguistics-ontology.org/gold/2010/FeminineGender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>masculine
+ </td>
+ <td>In a masculine/feminine or in a masculine/feminine/neuter gender system, gender that denotes specifically male persons (or animals) or that is assigned arbitrarily to object.
+ </td>
+ <td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/MasculineGender">linguistics-ontology.org/gold/2010/MasculineGender</a>
+ </td>
+ </tr>
+ <tr>
+ <td>neuter
+ </td>
+ <td>In a masculine/feminine/neuter or common-neuter gender system, gender that generally denotes an object.
+ </td>
+ <td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/NeuterGender">linguistics-ontology.org/gold/2010/NeuterGender</a>
+ </td>
+ </tr>
+</table><br>
+ <h3>15.2<a name="Case" href="#Case">Case</a></h3>
+
+<h3>Case</h3>
+
+
+<p>
+Feature that encodes the syntactic (and sometimes semantic) relationship of a noun with the other constituents of the sentence. (adapted from <a href="http://linguistics-ontology.org/gold/2010/CaseProperty">linguistics-ontology.org/gold/2010/CaseProperty</a>)
+</p>
+<h4>Example</h4>
+
+
+
+
+
+<pre class="prettyprint"><grammaticalFeatures targets="nominal" locales="es fr it pt">
+ <grammaticalGender values="masculine feminine"/>
+</pre>
+
+
+<h4>Values</h4>
+
+
+
+<table>
+ <tr>
+ <td><strong>Value</strong>
+ </td>
+ <td><strong>Definition</strong>
+ </td>
+ <td><strong>References</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>ablative
+ </td>
+ <td>Ablative case expresses that the referent of the noun it marks is the location from which another referent is moving. It has the meaning 'from'.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#AblativeCase">purl.org/olia/olia.owl#AblativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/AblativeCase">linguistics-ontology.org/gold/2010/AblativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>accusative
+ </td>
+ <td>Accusative case marks certain syntactic functions, usually direct objects.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#Accusative">purl.org/olia/olia.owl#Accusative</a> <a href="http://linguistics-ontology.org/gold/2010/AccusativeCase">linguistics-ontology.org/gold/2010/AccusativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>comitative
+ </td>
+ <td>Comitative Case expresses accompaniment. It carries the meaning 'with' or 'accompanied by'.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#ComitativeCase">purl.org/olia/olia.owl#ComitativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/ComitativeCase">linguistics-ontology.org/gold/2010/ComitativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>dative
+ </td>
+ <td>Dative case marks indirect objects (for languages in which they are held to exist), or nouns having the role of a recipient (as of things given), a beneficiary of an action, or a possessor of an item.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#DativeCase">purl.org/olia/olia.owl#DativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/DativeCase">linguistics-ontology.org/gold/2010/DativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>ergative
+ </td>
+ <td>In ergative-absolutive languages, the ergative case identifies the subject of a transitive verb.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#ErgativeCase">purl.org/olia/olia.owl#ErgativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/ErgativeCase">linguistics-ontology.org/gold/2010/ErgativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>genitive
+ </td>
+ <td>Genitive case signals that the referent of the marked noun is the possessor of the referent of another noun, e.g. "the man's foot". In some languages, genitive case may express an associative relation between the marked noun and another noun.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#GenitiveCase">purl.org/olia/olia.owl#GenitiveCase</a> <a href="http://linguistics-ontology.org/gold/2010/GenitiveCase">linguistics-ontology.org/gold/2010/GenitiveCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>instrumental
+ </td>
+ <td>InstrumentalCase indicates that the referent of the noun it marks is the means of the accomplishment of the action expressed by the clause.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#InstrumentalCase">purl.org/olia/olia.owl#InstrumentalCase</a> <a href="http://linguistics-ontology.org/gold/2010/InstrumentalCase">linguistics-ontology.org/gold/2010/InstrumentalCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>locative
+ </td>
+ <td>Case that indicates a final location of action or a time of the action.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#LocativeCase">purl.org/olia/olia.owl#LocativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/LocativeCase">linguistics-ontology.org/gold/2010/LocativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>locativecopulative
+ </td>
+ <td>Copulative Case marker that indicates a location.
+ </td>
+ <td>TBD Add reference, example
+ </td>
+ </tr>
+ <tr>
+ <td>nominative
+ </td>
+ <td>In nominative-accusative languages, nominative case marks clausal subjects and is applied to nouns in isolation
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#Nominative">purl.org/olia/olia.owl#Nominative</a> <a href="http://linguistics-ontology.org/gold/2010/NominativeCase">linguistics-ontology.org/gold/2010/NominativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>oblique
+ </td>
+ <td>Case that is used when a noun is the object of a verb or a proposition, except for nominative and vocative case.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#ObliqueCase">purl.org/olia/olia.owl#ObliqueCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>partitive
+ </td>
+ <td>The partitive case is a grammatical case which denotes "partialness", "without result", or "without specific identity".
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#PartitiveCase">purl.org/olia/olia.owl#PartitiveCase</a> <a href="http://linguistics-ontology.org/gold/2010/PartitiveCase">linguistics-ontology.org/gold/2010/PartitiveCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>prepositional
+ </td>
+ <td>Prepositional case refers to case marking that only occurs in combination with prepositions.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#PrepositionalCase">purl.org/olia/olia.owl#PrepositionalCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>sociative
+ </td>
+ <td>Case related to the person in whose company the action is carried out, or to any belongings of people which take part in the action.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#SociativeCase">purl.org/olia/olia.owl#SociativeCase</a>
+ </td>
+ </tr>
+ <tr>
+ <td>vocative
+ </td>
+ <td>Vocative case marks a noun whose referent is being addressed.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#VocativeCase">purl.org/olia/olia.owl#VocativeCase</a> <a href="http://linguistics-ontology.org/gold/2010/VocativeCase">linguistics-ontology.org/gold/2010/VocativeCase</a>
+ </td>
+ </tr>
+</table>
+
+
+<h3>Definiteness</h3>
+
+
+<p>
+Feature that encodes the fact that a noun has been already mentioned, or is familiar in the discourse. (adapted from <a href="https://glossary.sil.org/term/definiteness">https://glossary.sil.org/term/definiteness</a> )
+</p>
+<h4>Values</h4>
+
+
+
+<table>
+ <tr>
+ <td>definite
+ </td>
+ <td>Value referring to the capacity of identification of an entity.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#Definite">purl.org/olia/olia.owl#Definite</a>
+ </td>
+ </tr>
+ <tr>
+ <td>indefinite
+ </td>
+ <td>An entity is specified as indefinite when it refers to a non-particularized individual of the species denoted by the noun.
+ </td>
+ <td><a href="http://purl.org/olia/olia.owl#Indefinite">purl.org/olia/olia.owl#Indefinite</a>
+ </td>
+ </tr>
+ <tr>
+ <td>construct
+ </td>
+ <td>State of the first noun in a genitive phrase of a possessed noun followed by a possessor noun.
+ </td>
+ <td>no direct linked, but explained under: <a href="http://purl.org/olia/olia-top.owl#DefinitenessFeature">purl.org/olia/olia-top.owl#DefinitenessFeature</a>
+ </td>
+ </tr>
+ <tr>
+ <td>unspecified
+ </td>
+ <td>Noun without any definiteness marking in some specific construction (specific to Danish)
+ </td>
+ <td> </td>
+ </tr>
+</table>
+
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35-info.html b/docs/ldml/tr35-info.html
similarity index 72%
rename from specs/ldml/tr35-info.html
rename to docs/ldml/tr35-info.html
index ca68925..f47cdfa 100644
--- a/specs/ldml/tr35-info.html
+++ b/docs/ldml/tr35-info.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Supplemental</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -113,7 +113,7 @@
document</a> and the links above.</p>
<h3><i>Status</i></h3>
- <!-- NOT YET APPROVED
+ <!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
@@ -255,7 +255,10 @@
<li>11 <a href="#Version_Information">Version
Information</a></li>
<li>12 <a href="#Parent_Locales">Parent Locales</a></li>
- </ul><!-- END Generated TOC: CheckHtmlFiles -->
+ <li>13 <a href="#Unit_Conversion" >Unit Conversion</a></li>
+ <li>14 <a href="#Unit_Preferences">Unit Preferences</a></li>
+ </ul>
+ <!-- END Generated TOC: CheckHtmlFiles -->
<h2>1 Introduction <a name="Supplemental_Data" href=
"#Supplemental_Data" id="Supplemental_Data">Supplemental
Data</a></h2>
@@ -586,271 +589,7 @@
"#Preferred_Units_For_Usage" id=
"Preferred_Units_For_Usage">Preferred Units for Specific
Usages</a></h4>
- <p>This data is intended to map from a particular usage — e.g.
- measuring the height of a person or the fuel consumption of an
- automobile — to the unit or combination of units typically used
- for that usage in a given region. Considerations for such a
- mapping include:</p>
- <ul>
- <li>The list of possible usages large and open-ended. The
- intent here is to start with a small set for which there is
- an urgent need, and expand as necessary.</li>
- <li>Even for a given usage such a measuring a road distance,
- there are multiple ranges in use. For example, one set of
- units may be used for indicating the distance to the next
- city (kilometers or miles), while another may be used for
- indicating the distance to the next exit (meters, yards, or
- feet).</li>
- <li>There are also differences between more formal usage
- (official signage, medical records) and more informal usage
- (conversation, texting).</li>
- <li>For some usages, the measurement may be expressed using a
- sequence of units, such as “1 meter, 78 centimeters” or “12
- stone, 2 pounds”.</li>
- </ul>
- <p>The DTD structure is as follows:</p>
- <p class="dtd"><!ELEMENT unitPreferenceData (
- unitPreferences* ) ><br>
- <br>
- <!ELEMENT unitPreferences ( unitPreference* ) ><br>
- <!ATTLIST unitPreferences category NMTOKEN #REQUIRED
- ><br>
- <!ATTLIST unitPreferences usage NMTOKENS #REQUIRED ><br>
- <!ATTLIST unitPreferences scope (small) #IMPLIED ><br>
- <br>
- <!ELEMENT unitPreference ( #PCDATA ) ><br>
- <!ATTLIST unitPreference regions NMTOKENS #REQUIRED
- ><br></p>
- <p>An example of data using this structure is as follows:</p>
- <pre>
- <unitPreferenceData>
- ...
- <unitPreferences category="length" usage="person">
- <unitPreference regions="001">centimeter</unitPreference>
- <unitPreference regions="BR CN DE DK MX NL NO PL PT RU" alt="informal">meter centimeter</unitPreference>
- <unitPreference regions="AT BE DZ EG ES FR HK ID IL IT JO MY SA SE TR VN">meter centimeter</unitPreference>
- <unitPreference regions="CA GB IN US" alt="informal">foot inch</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- <unitPreferences category="length" usage="person" scope="small">
- <unitPreference regions="001">centimeter</unitPreference>
- <unitPreference regions="CA GB IN" alt="informal">inch</unitPreference>
- <unitPreference regions="US">inch</unitPreference>
- </unitPreferences>
- ...
- </unitPreferenceData>
-</pre>
- <p>There are several things to note:</p>
- <ul>
- <li>The <unitPreferences> <em>category</em> attribute
- values match a <unit> element <em>type</em> attribute
- value, as listed in <a href=
- "tr35-general.html#Unit_Elements">Unit Elements</a>.</li>
- <li>The <unitPreferences> <em>usage</em> attribute
- values are specific to this data; current values are listed
- in a table at the end of this section.</li>
- <li>The <unitPreferences> element may have a
- <em>scope="small"</em> attribute to indicate that it is
- intended for the smaller range of values for that usage, such
- measuring the height or weight of an infant versus that of an
- adult, or measuring the road distance to the next exit versus
- that to the next city.</li>
- <li>Each <unitPreferences> element must contain one
- <unitPreference> element with attribute
- <em>regions="001"</em>; this specifies the worldwide default
- unit or unit sequence for the usage and scope specified by
- the <unitPreferences> element. There may be additional
- <unitPreference> elements which specify a different
- unit or unit sequence for specific regions and possibly for a
- different degree of formality.</li>
- <li>The <unitPreference> element may have an
- <em>alt="informal"</em> attribute to indicate that the
- specified unit or unit sequence is preferred in more informal
- usage.</li>
- <li>The value of the <unitPreference> element is a
- sequence of one or more space-separated unit names from the a
- <unit> element <em>unit</em> attribute values for the
- relevant type, as listed in <a href=
- "tr35-general.html#Unit_Elements">Unit Elements</a>.</li>
- </ul>
- <p>For a given combination of category, usage, scope and
- formality, the intended procedure for looking up the unit or
- unit combination to use for a given region is as follows:</p>
- <ul>
- <li>Get the appropriate <unitPreferences> element for
- the desired <em>category</em> and <em>usage</em>: If
- scope=small is desired and a <unitPreferences> element
- with <em>scope="small"</em> exists for the desired
- <em>category</em> and <em>usage</em>, use it. Otherwise, use
- a <unitPreferences> element for the desired
- <em>category</em> and <em>usage</em> that has no
- <em>scope</em> attribute. In the selected
- <unitPreferences> element, pick a
- <unitPreference> element using the following
- steps.</li>
- <li>If informal usage is preferred, look for a
- <unitPreference> element with <em>alt="informal"</em>
- whose <em>regions</em> attribute includes the given region.
- If found, use the specified unit [sequence].</li>
- <li>Look for a <unitPreference> element whose
- <em>regions</em> attribute includes the given region. If
- found, use the specified unit [sequence].</li>
- <li>Look for a <unitPreference> element with
- <em>alt="informal"</em> whose <em>regions</em> attribute is
- "001". If found, use the specified unit [sequence].</li>
- <li>Look for a <unitPreference> element whose
- <em>regions</em> attribute is "001". If found, use the
- specified unit [sequence].</li>
- </ul>
- <p>CLDR 29 contains usage mapping data for the following
- combinations of category, usage, and scope:</p>
- <table border="1" cellpadding="4" cellspacing="0">
- <caption>
- <a name="Unit_Preference_Categories" href=
- "#Unit_Preference_Categories" id=
- "Unit_Preference_Categories">Unit Preference Categories</a>
- </caption>
- <tr>
- <td><strong>Category</strong></td>
- <td><strong>Usage</strong></td>
- <td><strong>Sample Value</strong></td>
- </tr>
- <tr>
- <td><em>area</em></td>
- <td>land-agricult</td>
- <td>hectare</td>
- </tr>
- <tr>
- <td><em>area</em></td>
- <td>land-commercl</td>
- <td>hectare</td>
- </tr>
- <tr>
- <td><em>area</em></td>
- <td>land-residntl</td>
- <td>hectare</td>
- </tr>
- <tr>
- <td><em>concentr</em></td>
- <td>blood-glucose</td>
- <td>milligram-per-deciliter</td>
- </tr>
- <tr>
- <td><em>consumption</em></td>
- <td>vehicle-fuel</td>
- <td>liter-per-100kilometers</td>
- </tr>
- <tr>
- <td><em>duration</em></td>
- <td>music-track</td>
- <td>minute second</td>
- </tr>
- <tr>
- <td><em>duration</em></td>
- <td>person-age</td>
- <td>year-person month-person</td>
- </tr>
- <tr>
- <td><em>duration</em></td>
- <td>tv-program</td>
- <td>minute second</td>
- </tr>
- <tr>
- <td><em>energy</em></td>
- <td>food</td>
- <td>foodcalorie</td>
- </tr>
- <tr>
- <td><em>energy</em></td>
- <td>person-usage</td>
- <td>kilocalorie</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>person</td>
- <td>centimeter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>person, scope=small</td>
- <td>centimeter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>rainfall</td>
- <td>millimeter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>road</td>
- <td>kilometer</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>road, scope=small</td>
- <td>meter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>snowfall</td>
- <td>centimeter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>vehicle</td>
- <td>meter</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>visiblty</td>
- <td>kilometer</td>
- </tr>
- <tr>
- <td><em>length</em></td>
- <td>visiblty, scope=small</td>
- <td>meter</td>
- </tr>
- <tr>
- <td><em>mass</em></td>
- <td>person</td>
- <td>kilogram</td>
- </tr>
- <tr>
- <td><em>mass</em></td>
- <td>person, scope=small</td>
- <td>gram</td>
- </tr>
- <tr>
- <td><em>pressure</em></td>
- <td>baromtrc</td>
- <td>hectopascal</td>
- </tr>
- <tr>
- <td><em>speed</em></td>
- <td>road-travel</td>
- <td>kilometer-per-hour</td>
- </tr>
- <tr>
- <td><em>speed</em></td>
- <td>wind</td>
- <td>kilometer-per-hour</td>
- </tr>
- <tr>
- <td><em>temperature</em></td>
- <td>person</td>
- <td>celsius</td>
- </tr>
- <tr>
- <td><em>temperature</em></td>
- <td>weather</td>
- <td>celsius</td>
- </tr>
- <tr>
- <td><em>volume</em></td>
- <td>vehicle-fuel</td>
- <td>liter</td>
- </tr>
- </table>
+ <p><em>For information about preferred units and unit conversion, see Section 13 <a href="#Unit_Conversion" >Unit Conversion</a> and Section 14 <a href="#Unit_Preferences" >Unit Preferences</a>.</em></p>
<h3>2.5 <a name="rgScope" href="#rgScope" id=
"rgScope"><rgScope>: Scope of the “rg” Locale
Key</a></h3>
@@ -1768,8 +1507,710 @@
described in detail in the <a href=
"tr35.html#Parent_Locales">core specification section
4.1.3.</a></p>
+ <h2>13 <a href="#Unit_Conversion" name="Unit_Conversion">Unit Conversion</a></h2>
+
+
+<p>
+The unit conversion data (<a href="https://github.com/unicode-org/cldr/blob/master/common/supplemental/units.xml">units.xml</a>) provides the data for converting all of the cldr unit identifiers to base units, and back. That allows conversion between any two convertible units, such as two units of length. For any two convertible units (such as acre and dunum) the first can be converted to the base unit (square-meter), then that base unit can be converted to the second unit.
+</p>
+<p class="dtd">
+<!ELEMENT unitConstants ( unitConstant* ) >
+</p>
+<p class="dtd">
+<!ELEMENT unitConstant EMPTY >
+</p>
+<p class="dtd">
+<!ATTLIST unitConstant constant NMTOKEN #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitConstant value CDATA #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitConstant status NMTOKEN #IMPLIED >
+</p>
+<h2>Constants</h2>
+
+
+<p>
+The data uses a small set of constants for readability, such as:
+</p>
+ <blockquote>
+<p>
+<unitConstant constant=<em>"ft_to_m"</em> value=<em>"0.3048"</em>/>
+</p>
+<p>
+<unitConstant constant=<em>"ft2_to_m2"</em> value=<em>"ft_to_m*ft_to_m"</em>/>
+</p>
+</blockquote>
+<p>
+The order of the elements in the file is significant.
+</p>
+<p>
+
+</p>
+<p>
+Each constant can have a value based on simple expressions using numbers, previous constants, plus the operators * and /. Parentheses are not allowed. The operator * binds more tightly than /, which may be unexpected. Thus a * b / c * d is interpreted as (a * b) / (c * d). A consequent of that is that a * b / c * d = a * b / c / d. In the value, the numbers represent rational values. So 0.3048 is interpreted as exactly 3048 / 10000.
+</p>
+<p>
+In the above case, ft2-to-m2 is a conversion constant for going from square feet to square meters. The expression evaluates to 0.09290304. Where the constants cannot be expressed as rationals, or where their interpretation is fluid, that is marked with a status value:
+</p>
+<blockquote>
+<unitConstant constant=<em>"PI"</em> value=<em>"411557987 / 131002976"</em> status=<em>'approximate'</em>/>
+</blockquote>
+<p>
+In such cases, software may decide to use different values for accuracy.
+</p>
+<p>
+An implementation need not use rationals directly for conversion; it could use doubles, for example, if only double accuracy is needed.
+</p>
+<h2>Conversion Data</h2>
+
+
+<p class="dtd">
+<!ELEMENT convertUnits ( convertUnit* ) >
+</p>
+<p class="dtd">
+<!ELEMENT convertUnit EMPTY >
+</p>
+<p class="dtd">
+<!ATTLIST convertUnit source NMTOKEN #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST convertUnit baseUnit NMTOKEN #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST convertUnit factor CDATA #IMPLIED >
+</p>
+<p class="dtd">
+<!ATTLIST convertUnit offset CDATA #IMPLIED >
+</p>
+<p>
+The conversion data provides the data for converting all of the cldr unit identifiers to base units, and back. That allows conversion between any two convertible units, such as two units of length. For any two convertible units (such as acre and dunum) the first can be converted to the base unit (square-meter), then that base unit can be converted to the second unit.
+</p>
+<p>
+The data is expressed as conversions to the base unit. The information can also be used for the conversion back.
+</p>
+<p>
+Examples:
+</p>
+ <blockquote>
+<p>
+<convertUnit source=<em>'carat'</em> baseUnit=<em>'kilogram'</em> factor=<em>'0.0002'</em>/>
+</p>
+<p>
+<convertUnit source=<em>'gram'</em> baseUnit=<em>'kilogram'</em> factor=<em>'0.001'</em>/>
+</p>
+<p>
+<convertUnit source=<em>'ounce'</em> baseUnit=<em>'kilogram'</em> factor=<em>'lb_to_kg/16'</em> systems=<em>"ussystem uksystem"</em>/>
+</p>
+<p>
+<convertUnit source=<em>'fahrenheit'</em> baseUnit=<em>'kelvin'</em> factor=<em>'5/9'</em> offset=<em>'2298.35/9'</em> systems=<em>"ussystem uksystem"</em>/>
+</p>
+</blockquote>
+<p>
+For example, to convert from 3 carats to kilograms, the factor 0.0002 is used, resulting in 0.0006. To convert between carats and ounces, first the carets are converted to kilograms, then the kilograms to ounces (by reversing the mapping).
+</p>
+<p>
+The factor and offset use the same structure as in the value in unitConstant ; in particular, * binds more tightly than /.
+</p>
+<p>
+The conversion may also require an offset, such as the following:
+</p>
+<blockquote>
+<convertUnit source=<em>'fahrenheit'</em> baseUnit=<em>'kelvin'</em> factor=<em>'5/9'</em> offset=<em>'2298.35/9'</em> systems=<em>"ussystem uksystem"</em>/>
+</blockquote>
+<p>
+The factor and offset can be simple expressions, just like the values in the unitConstants.
+</p>
+<p>
+Where a factor is not present, the value is 1; where an offset is not present, the value is 0. The systems attribute indicates where the value is not metric; currently the attribute values just include the <em>ussystem</em> and <em>uksystem</em> systems. The term <em>metric</em> is used in a broad sense, and includes units that are simple multiples of metric units, such as pound-metric (= ½ kilogram).
+</p>
+<p>
+For complex units, such as <em>pound-force-per-square-inch</em>, the conversions are computed by combining the conversions of each of the simple units: <em>pound-force</em> and <em>inch</em>. Because the conversions in convertUnit are reversible, the computation can go from complex source unit to complex base unit to complex target units.
+</p>
+<p>
+Here is an example:
+</p>
+ <blockquote>
+<p><strong>
+50 foot-per-minute ⟹ X mile-per-hour</strong> </p>
+<p>
+ ⟹ source: 1 foot
+</p>
+<p>
+ ⟹ factor: 381 / 1250 = 0.3048 meter
+</p>
+<p>
+ ⟹ source: 1 minute
+</p>
+<p>
+ ⟹ factor: 60 second
+</p>
+<p>
+ ⟹ intermediate: 127 / 500 = 0.254 meter-per-second
+</p>
+<p>
+ ⟹ mile-per-hour
+</p>
+<p>
+ ⟹ source: 1 mile
+</p>
+<p>
+ ⟹ factor: 201168 / 125 = 1609.344 meter
+</p>
+<p>
+ ⟹ source: 1 hour
+</p>
+<p>
+ ⟹ factor: 3600 second
+</p>
+<p>
+ ⟹ target: 25 / 44 ≅ 0.5681818 mile-per-hour
+</p>
+</blockquote>
+<p>
+<strong>Reciprocals. </strong>When you convert a complex unit to another complex unit, you typically convert the source to a complex base unit (like <em>meter-per-cubic-meter</em>), then convert the latter backwards to the desired target. However, there may not be a matching conversion from that complex base unit to the desired target unit. That is the case for converting from <em>mile-per-gallon</em> (used in the US) to <em>liter-per-100-kilometer</em> (used in Europe and elsewhere). When that happens, the reciprocal of the complex base unit is used, as in the following example:
+</p>
+ <blockquote>
+<p><strong>
+50 mile-per-gallon ⟹ X liter-per-100-kilometer
+</strong></p>
+<p>
+ ⟹ source: 1 mile
+</p>
+<p>
+ ⟹ factor: 201168 / 125 = 1609.344 meter
+</p>
+<p>
+ ⟹ source: 1 gallon
+</p>
+<p>
+ ⟹ factor: 473176473 / 125000000000 ≅ 0.003785412 cubic-meter
+</p>
+<p>
+ ⟹ intermediate: 2400000000000 / 112903 ≅ 2.125719E7 meter-per-cubic-meter
+</p>
+<p>
+ ⟹ liter-per-100-kilometer
+</p>
+<p>
+ ⟹ source: 1 liter
+</p>
+<p>
+ ⟹ factor: 1 / 1000 = 0.001 cubic-meter
+</p>
+<p>
+ ⟹ source: 1 100-kilometer
+</p>
+<p>
+ ⟹ factor: 100000 meter
+</p>
+<p>
+<strong> ⟹ 1/intermediate: 112903 / 2400000000000 ≅ 4.704292E-8 cubic-meter-per-meter</strong>
+</p>
+<p>
+ ⟹ target: 112903 / 24000 ≅ 4.704292 liter-per-100-kilometer
+</p>
+</blockquote>
+<p>
+This applies to more than just these cases: one can convert from any unit to related reciprocals as in the following example:
+</p>
+ <blockquote>
+<p><strong>
+50 foot-per-minute ⟹ X hour-per-mile</strong> </p>
+<p>
+ ⟹ source: 1 foot
+</p>
+<p>
+ ⟹ factor: 381 / 1250 = 0.3048 meter
+</p>
+<p>
+ ⟹ source: 1 minute
+</p>
+<p>
+ ⟹ factor: 60 second
+</p>
+<p>
+ ⟹ intermediate: 127 / 500 = 0.254 meter-per-second
+</p>
+<p>
+ ⟹ hour-per-mile
+</p>
+<p>
+ ⟹ source: 1 hour
+</p>
+<p>
+ ⟹ factor: 3600 second
+</p>
+<p>
+ ⟹ source: 1 mile
+</p>
+<p>
+ ⟹ factor: 201168 / 125 = 1609.344 meter
+</p>
+<p>
+<strong> ⟹ 1/intermediate: 500 / 127 ≅ 3.937008 second-per-meter</strong>
+</p>
+<p>
+ ⟹ target: 44 / 25 = 1.76 hour-per-mile
+</p>
+</blockquote>
+<h3>Exceptional Cases</h3>
+
+
+<h4>Identities</h4>
+
+
+<p>
+For completeness, identity mappings are also provided for the base units themselves, such as:
+</p>
+<blockquote>
+ <convertUnit source=<em>'meter'</em> baseUnit=<em>'meter'</em>/>
+</blockquote>
+<h4>Aliases</h4>
+
+<p>
+In a few instances the old identifiers are deprecated in favor of regular syntax. Implementations should handle both on input:
+</p>
+<blockquote>
+<p>
+<unitAlias type=<em>"meter-per-second-squared"</em> replacement=<em>"meter-per-square-second"</em> reason=<em>"deprecated"</em>/>
+</p>
+<p>
+<unitAlias type=<em>"liter-per-100kilometers"</em> replacement=<em>"liter-per-100-kilometer"</em> reason=<em>"deprecated"</em>/>
+</p>
+<p>
+<unitAlias type=<em>"pound-foot"</em> replacement=<em>"pound-force-foot"</em> reason=<em>"deprecated"</em>/>
+</p>
+<p>
+<unitAlias type=<em>"pound-per-square-inch"</em> replacement=<em>"pound-force-per-square-inch"</em> reason=<em>"deprecated"</em>/>
+</p>
+</blockquote>
+<p>
+These use the standard alias elements in XML, and are also included in the <a href="https://github.com/unicode-org/cldr/blob/master/common/supplemental/units.xml">units.xml</a> file.
+</p>
+<h4>“Duplicate” Units</h4>
+
+
+<p>
+Some CLDR units are provided simply because they have different names in some languages. For example, year and year-person, or foodcalorie and kilocalorie. One CLDR unit is not convertible (temperature-generic) it is only used for the translation (where the exact unit would be understood by context).
+</p>
+<h4>Discarding Offsets</h4>
+
+
+<p>
+The temperature units are special. When they represent a scale, they have an offset. But where they represent an amount, such as in complex units, they do not. So celsius-per-second is the same as kelvin-per-second.
+</p>
+<h3>Unresolved Units</h3>
+
+
+<p>
+Some SI units contain the same units in the numerator and denominator, so those cannot be resolved. For example, if cubic-meter-per-meter were always resolved, then <em>consumption</em> (like “liter-per-kilometer”) could not be distinguished from <em>area</em> (square-meter).
+</p>
+<p>
+However, in conversion, it may be necessary to resolve them in order to find a match. For example, kilowatt-hour maps to the base unit kilogram-square-meter-second-per-cubic-second, but that needs to be resolved to kilogram-square-meter-per-square-second in order matched against an <em>energy.</em>
+</p>
+<h2>Quantities and Base Units</h2>
+
+
+<p class="dtd">
+<!ELEMENT unitQuantities ( unitQuantity* ) >
+</p>
+<p class="dtd">
+<!ELEMENT unitQuantity EMPTY >
+</p>
+<p class="dtd">
+<!ATTLIST unitQuantity baseUnit NMTOKEN #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitQuantity quantity NMTOKENS #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitQuantity status NMTOKEN #IMPLIED >
+</p>
+<p>
+Conversion is supported between comparable units. Those can be simple units, such as length, or more complex ‘derived’ units that are built up from <em>base units</em>. The <unitQuantities> element provides information on the base units used for conversion. It also supplies information about their <em>quantity</em>: mass, length, time, etc., and whether they are simple or not. </p>
+<p>Examples: </p>
+ <blockquote>
+<p>
+<unitQuantity baseUnit=<em>'kilogram'</em> quantity=<em>'mass'</em> status=<em>'simple'</em>/>
+</p>
+<p>
+<unitQuantity baseUnit=<em>'meter-per-second'</em> quantity=<em>'speed'</em>/>
+</p>
+</blockquote>
+<p>
+The order of the elements in the file is significant, since it is used in
+
+<a href="#Unit_Identifier_Normalization" >Unit_Identifier_Normalization</a>.
+<p>
+ The quantity values themselves are informative. Therer mayreflecting that <em>force per area</em> can be referenced as either <em>pressure</em> or <em>stress</em>, for example). The quantity for a complex unit that has a reciprocal is formed by prepending “inverse-” to the quantity, such as <em>inverse-consumption.</em>
+</p>
+<p>
+The base units for the quantities and the quantities themselves are based on <a href="https://www.nist.gov/pml/special-publication-811">NIST special publication 811</a> and the earlier <a href="https://www.govinfo.gov/content/pkg/GOVPUB-C13-f10c2ff9e7af2091314396a2d53213e4/pdf/GOVPUB-C13-f10c2ff9e7af2091314396a2d53213e4.pdf">NIST Special Publication 1038</a>. In some cases, a different unit is chosen for the base. For example, a <em>revolution</em> (360°) is chosen for the base unit for angles instead of the SI <em>radian</em>, and <em>item</em> instead of the SI <em>mole</em>. Additional base units are added where necessary, such as <em>bit</em> and <em>pixel</em>.
+</p>
+<p>
+This data is not necessary for conversion, but is needed for
+
+ <a href="#Unit_Identifier_Normalization" >Unit_Identifier_Normalization</a>. Some of the unitQuantity elements are not needed to convert CLDR units, but are included for completeness. Example:
+</p>
+
+<blockquote>
+ <unitQuantity baseUnit=<em>'ampere-per-square-meter'</em> quantity=<em>'current-density'</em>/>
+</blockquote>
+<h3>UnitType vs Quantity</h3>
+
+
+<p>
+The unitType (as in “length-meter”) is not the same as the quantity. It is often broader: for example, the unitType <em>electric</em> corresponds to the quantities <em>electric-current, electric-resistance, </em>and<em> voltage</em>. The unitType itself is also informative, and can be dropped from a long unit identifier to get a still-unique short unit identifier.
+</p>
+<h3><a href="#Unit_Identifier_Normalization" name="Unit_Identifier_Normalization">Unit Identifier Normalization</a></h3>
+
+
+<p>
+There are many possible ways to construct complex units. For comparison of unit identifiers, an implementation can normalize in the following way:
+</p>
+ <ol>
+
+<li>Convert all but the first -per- to simple multiplication. The result then has the format of /numerator ( -per- denominator)?/ <ul>
+
+ <li>foot-per-second-per-second ⇒ foot-per-second-second
+</ul>
+</li>
+ <li>Within each of the numerator and denominator:</li>
+ <li>Convert multiple instances of a unit into the appropriate power.
+ <ul>
+ <li>foot-per-second-second ⇒ foot-per-square-second
+ </li>
+ <li>kilogram-meter-kilogram ⇒ meter-square-kilogram
+ </li>
+ </ul>
+ <li>For each single unit, disregarding prefixes and powers, find its base unit using <convertUnit>, then get the order of that base unit among the unitQuantity elements in the <a href="https://github.com/unicode-org/cldr/blob/master/common/supplemental/units.xml">units.xml</a>. Then sort the single units by that order.
+ <ul>
+ <li>meter-square-kilogram => square-kilogram-meter
+ </li>
+ <li>meter-square-gram ⇒ square-gram-meter
+ </li>
+ </ul>
+ </li>
+ <li>If two single units have the same simple unit but different SI prefixes, such as "kilometer-meter", sort the higher-power SI prefixes first. </li>
+ <li>Within private-use single units, sort by the simple unit alphabetically.</li>
+</ol>
+
+<p>
+ The examples in #4 are due to the following ordering of the unitQuantity elements:
+</p><ol>
+
+<li><unitQuantity baseUnit=<em>'candela'</em> quantity=<em>'luminous-intensity'</em> status=<em>'simple'</em>/>
+<li><unitQuantity baseUnit=<em>'kilogram'</em> quantity=<em>'mass'</em> status=<em>'simple'</em>/>
+<li><unitQuantity baseUnit=<em>'meter'</em> quantity=<em>'length'</em> status=<em>'simple'</em>/>
+<li>…</li></ol>
+
+<h2>Mixed Units</h2>
+
+
+<p>
+Mixed units, or unit sequences, are units with the same base unit which are listed in sequence. Common examples are feet and inches, meters and centimeters, and hours, minutes, and seconds. Mixed unit identifiers are expressed using the "-and-" infix, as in "foot-and-inch", "meter-and-centimeter", and "hour-and-minute-and-second".
+</p>
+<p>
+Scalar values for mixed units are expressed in the largest unit, according to the sort order discussed above in "Normalization". For example, numbers for "foot-and-inch" are expressed in feet.
+</p>
+<p>
+Mixed units are expected to be rendered in the order of the tokens in the identifier. For example, the value 1.25 with the identifier "foot-and-inch" should be rendered as "1 foot and 3 inches" and 1.25 inch-and-foot should be rendered as “3 inches and 1 foot". <strong>NOTE: </strong>the correct application of this may require adding locales to the regions attribute set.
+</p>
+
+<h2>Testing</h2>
+
+
+<p>
+The <a href="https://github.com/unicode-org/cldr/blob/master/common/testData/units/unitsTest.txt">unitsTest.txt</a> file supplies a list of all the CLDR units with conversions, for testing implementations. Instructions for use are supplied in the header of the file.
+</p>
+ <h2>14 <a href="#Unit_Preferences" name="Unit_Preferences">Unit Preferences</a></h2>
+
+
+<p>
+Different locales have different preferences for which unit or combination of units is used for a particular usage, such as measuring a person’s height. This is more fine-grained than merely a preference for metric versus US or UK measurement systems. For example, one locale may use meters alone, while another may use centimeters alone or a combination of meters and centimeters; a third may use inches alone, or (informally) a combination of feet and inches.
+</p>
+<p>
+The CLDR data is intended to map from a particular usage — e.g. measuring the height of a person or the fuel consumption of an automobile — to the unit or combination of units typically used for that usage in a given region. Considerations for such a mapping include:
+</p><ul>
+
+<li>The list of possible usages large and open-ended. The intent here is to start with a small set for which there is an urgent need, and expand as necessary.
+<li>Even for a given usage such a measuring a road distance, there are multiple ranges in use. For example, one set of units may be used for indicating the distance to the next city (kilometers or miles), while another may be used for indicating the distance to the next exit (meters, yards, or feet).
+<li>There are also differences between more formal usage (official signage, medical records) and more informal usage (conversation, texting).
+<li>For some usages, the measurement may be expressed using a sequence of units, such as “1 meter, 78 centimeters” or “12 stone, 2 pounds”.</li></ul>
+
+<p>
+The DTD structure is as follows:
+</p>
+<p class="dtd">
+<!ELEMENT unitPreferenceData ( unitPreferences* ) >
+</p>
+<p class="dtd">
+<!ELEMENT unitPreferences ( unitPreference* ) >
+</p>
+<p class="dtd">
+<!ATTLIST unitPreferences category NMTOKEN #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitPreferences usage NMTOKENS #REQUIRED >
+</p>
+<p class="dtd">
+<!ELEMENT unitPreference ( #PCDATA ) >
+</p>
+<p class="dtd">
+<!ATTLIST unitPreference regions NMTOKENS #REQUIRED >
+</p>
+<p class="dtd">
+<!ATTLIST unitPreference geq NMTOKEN #IMPLIED >
+</p>
+<p class="dtd">
+<!ATTLIST unitPreference skeleton CDATA #IMPLIED >
+</p>
+
+<table>
+ <tr>
+ <td>category
+ </td>
+ <td>A unit quantity, such as “area” or “length”. See Section 13 Unit Conversion
+ </td>
+ </tr>
+ <tr>
+ <td>usage
+ </td>
+ <td>A type of usage, such as person-height.
+ </td>
+ </tr>
+ <tr>
+ <td>regions
+ </td>
+ <td>One or more region identifiers (macroregions or regions), subdivision identifiers, or language identifiers, such as 001, US, usca, and de-CH.
+ </td>
+ </tr>
+ <tr>
+ <td>geq
+ </td>
+ <td>A threshold value, in a unit determined by the unitPreference element value. The unitPreference element is only used for values higher than this value (and lower than any higher value).
+<p>
+The value must be non-negative. For picking negative units (-3 meters), use the absolute value to pick the unit.
+ </td>
+ </tr>
+ <tr>
+ <td>skeleton
+ </td>
+ <td>A skeleton in the ICU number format syntax, that can be used to format unit
+ </td>
+ </tr>
+</table>
+
+<p><strong>Note:</strong> As of CLDR 37, the <unitPreference> geq attribute replaces
+the now-deprecated <unitPreferences> scope attribute.</p>
+
+<p>
+Example:
+</p>
+ <blockquote>
+<p>
+ <unitPreferences category=<em>"length"</em> usage=<em>"default"</em>>
+</p>
+ <blockquote>
+<p>
+ <unitPreference regions=<em>"001"</em>>kilometer</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"001"</em>>meter</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"001"</em>>centimeter</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US GB"</em>>mile</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US GB"</em>>foot</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US GB"</em>>inch</unitPreference>
+</p>
+ </blockquote>
+<p>
+ </unitPreferences>
+</p>
+</blockquote>
+<p>
+The above information says that for default usage, in the US people use mile, foot, and inch, where people in the rest of the world (001) use kilometer, meter, and centimeter.
+Take another example:</p>
+ <blockquote>
+<p>
+ <unitPreferences category=<em>"length"</em> usage=<em>"road"</em>>
+</p>
+ <blockquote>
+<p>
+ <unitPreference regions=<em>"001"</em> geq=<em>"0.9"</em>>kilometer</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"001"</em> geq=<em>"300.0"</em> skeleton=<em>"precision-increment/50"</em>>meter</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"001"</em> skeleton=<em>"precision-increment/10"</em>>meter</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"001"</em>>meter</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US"</em> geq=<em>"0.5"</em>>mile</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US"</em> geq=<em>"100.0"</em> skeleton=<em>"precision-increment/50"</em>>foot</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"US"</em> skeleton=<em>"precision-increment/10"</em>>foot</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"GB"</em> geq=<em>"0.5"</em>>mile</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"GB"</em> geq=<em>"100.0"</em> skeleton=<em>"precision-increment/50"</em>>yard</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"GB"</em>>yard</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"SE"</em> geq=<em>"0.1"</em>>mile-<span style="text-decoration:underline;">scandinavian</span></unitPreference>
+</p>
+ </blockquote>
+<p>
+ </unitPreferences>
+</p>
+</blockquote>
+<p>
+The intended usage is to take the measure to be formatted, and the desired category, usage, and region and find the best match as follows.
+</p>
+<ul>
+
+<li>First, see if there is an exact match, producing a list of one or more unitPreference elements. For example, length/road/GB has a match above, giving
+<blockquote>
+<p>
+ <unitPreference regions=<em>"GB"</em> geq=<em>"0.5"</em>>mile</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"GB"</em> geq=<em>"100.0"</em> skeleton=<em>"precision-increment/50"</em>>yard</unitPreference>
+</p>
+<p>
+ <unitPreference regions=<em>"GB"</em>>yard</unitPreference>
+</p>
+ </blockquote>
+</li>
+ <li>If there is no match for the category, then the data is not available.</li>
+ <li>Otherwise, given the category: <ul>
+
+ <li>If there is an exact match for the usage, but not for the region, try region=”001”.</li></ul>
+
+ <li>The specification allows for <a href="https://www.unicode.org/cldr/charts/34/supplemental/territory_containment_un_m_49.html">containment regions</a> , <a href="https://www.unicode.org/cldr/charts/34/supplemental/territory_subdivisions.html">region subdivisions</a>.
+ <li>While in version 37 only 001 is used, in the future the data may contain others.
+ <li>The fallback is: subdivision2 ⇒ subdivision1 ⇒ region/country ⇒ subcontinent ⇒ continent ⇒ world
+ <li>Example:
+<blockquote>
+<table>
+ <tr>
+ <td>
+<strong>Region/subdivision</strong>
+ </td>
+ <td><strong>Code</strong>
+ </td>
+ </tr>
+ <tr>
+ <td>Blackpool
+ </td>
+ <td>gbbpl
+ </td>
+ </tr>
+ <tr>
+ <td>England
+ </td>
+ <td>gbeng
+ </td>
+ </tr>
+ <tr>
+ <td>United Kingdom
+ </td>
+ <td>GB
+ </td>
+ </tr>
+ <tr>
+ <td>Northern Europe
+ </td>
+ <td>154
+ </td>
+ </tr>
+ <tr>
+ <td>Europe
+ </td>
+ <td>150
+ </td>
+ </tr>
+ <tr>
+ <td>World
+ </td>
+ <td>001
+ </td>
+ </tr>
+</table>
+</blockquote>
+
+ <li>If there is an exact match for the region, but not for the usage, <ul>
+
+ <li>If the usage has multiple parts (eg land-agriculture-grain) drop the last part (eg land-agriculture)
+ <li>Repeat dropping the last part and trying the result (eg land)
+ <li>If you eliminate all of them, try usage=”default”.
+ <li>If there is no exact match for either one, try usage=”default”, region=”001”. That will always match.</li> </ul>
+ </li> </ul>
+
+<p>
+Once you have a list of unitPreference elements, find the applicable unitPreference. For a given category, usage, and set of regions (eg “US GB”), the units are ordered from largest to smallest.
+</p>
+<ul>
+<li>The geq item gives the value for the unit in the element value (or for the largest unit for mixed units). For example,<ul>
+ <li>...geq=<em>"0.5"</em>>mile<... means 0.9 kilometers</li>
+ <li>...geq=<em>"100.0"</em>>foot:inch<... means 100 feet</li></ul></li>
+<li>If there is no geq attribute, then the implicit value is 1.0.</li>
+<li>Implementations will probably convert the values into the base units, so that the comparison is fast. Thus the above would be converted internally to something like: <ul>
+
+ <li>≥ 804.672 meters ⇒ mile</li>
+ <li>≥ 30.48 meters ⇒ foot:inch</li></ul></li>
+<li>Search for the first matching unitPreference for the input measure. If there is no match (eg < 100 feet in the above example), take the last unitPreference.
+That is, the last unitPreference is effectively geq="0"</li>
+</ul>
+
+<p>
+Once a matching unitPreference element is found:
+</p><ul>
+
+<li>The unit is the element value
+<li>The skeleton (if there is one) supplies formatting information for the unit. API settings may allow that to be overridden.
+<li>If the unit is mixed (eg foot:inch) the skeleton applies to the final subunit; the higher subunits are formatted as integers.
+<li>If the skeleton is missing, the default number formatting is used.</li></ul>
+
+<h3>Constraints</h3>
+
+<ul>
+
+<li>For a given category, there is always a “default” usage.
+<li>For a given category, and usage: <ul>
+
+ <li>There is always a 001 region.
+ <li>None of the sets of regions can overlap. That is, you can’t have “US” on one line and “US GB” on another. You <em>can</em> have two lines with “US”, for different sizes of units.</li></ul></li>
+<li>For a given category, usage, and region-set <ul>
+ <li>The unitPreferences are in descending order.</li>
+ </ul>
+ </li>
+</ul>
+
+<h3>Caveats</h3>
+ <p>The extended unit support is still being developed further. See the Known Issues on the release page for futher information.</p>
+
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35-keyboards.html b/docs/ldml/tr35-keyboards.html
similarity index 99%
rename from specs/ldml/tr35-keyboards.html
rename to docs/ldml/tr35-keyboards.html
index 91da444..142461d 100644
--- a/specs/ldml/tr35-keyboards.html
+++ b/docs/ldml/tr35-keyboards.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Keyboards</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -112,7 +112,7 @@
"tr35.html">main LDML document</a> and the links above.</p>
<h3><i>Status</i></h3>
- <!-- NOT YET APPROVED
+ <!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
@@ -122,14 +122,14 @@
progress.
</i>
</p>
- END NOT YET APPROVED -->
+ END NOT YET APPROVED -->
<!-- APPROVED -->
<p><i>This document has been reviewed by Unicode members and
other interested parties, and has been approved for publication
by the Unicode Consortium. This is a stable document and may be
used as reference material or cited as a normative reference by
other specifications.</i></p>
- <!-- END APPROVED -->
+ <!-- END APPROVED -->
<blockquote>
<p><i><b>A Unicode Technical Standard (UTS)</b> is an
@@ -2455,15 +2455,16 @@
<td>
<p>Generated .klc files from the Microsoft Keyboard
Layout Creator (<a href=
- "http://msdn.microsoft.com/en-us/goglobal/bb964665">http://msdn.microsoft.com/en-us/goglobal/bb964665</a>)</p>
+ "https://support.microsoft.com/en-us/help/823010/the-microsoft-keyboard-layout-creator">https://support.microsoft.com/en-us/help/823010/the-microsoft-keyboard-layout-creator</a>)</p>
</td>
<td>
- <p>For interactive layouts, see also <a href=
- "http://msdn.microsoft.com/en-us/goglobal/bb964651">http://msdn.microsoft.com/en-us/goglobal/bb964651</a></p>
+ <!--waiting for information on the new location for the following-->
+ <!--<p>For interactive layouts, see also <a href="xxxx">xxxx</a></p>-->
</td>
</tr>
</tbody>
</table>
+
<h2>9 <a name="Keyboard_IDs" href="#Keyboard_IDs" id=
"Keyboard_IDs">Keyboard IDs</a></h2>
<p>There is a set of subtags that help identify the keyboards.
@@ -2595,7 +2596,7 @@
</table>
<p> </p>
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35-numbers.html b/docs/ldml/tr35-numbers.html
similarity index 99%
rename from specs/ldml/tr35-numbers.html
rename to docs/ldml/tr35-numbers.html
index c73f16d..0b270be 100644
--- a/specs/ldml/tr35-numbers.html
+++ b/docs/ldml/tr35-numbers.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://www.unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Numbers</title>
<style type="text/css">
<!--
@@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -89,7 +89,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -113,7 +113,7 @@
"tr35.html">main LDML document</a> and the links above.</p>
<h3><i>Status</i></h3>
- <!-- NOT YET APPROVED
+ <!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
@@ -2031,14 +2031,14 @@
following.</p>
<pre><currencySpacing>
<beforeCurrency>
- <currencyMatch>[:letter:]</currencyMatch>
+ <currencyMatch>[:^S:]</currencyMatch>
<surroundingMatch>[:digit:]</surroundingMatch>
- <insertBetween>&#x00a0;</insertBetween>
+ <insertBetween> </insertBetween>
</beforeCurrency>
<afterCurrency>
- <currencyMatch>[:letter:]</currencyMatch>
+ <currencyMatch>[:^S:]</currencyMatch>
<surroundingMatch>[:digit:]</surroundingMatch>
- <insertBetween>&#x00a0;</insertBetween>
+ <insertBetween> </insertBetween>
</afterCurrency>
</currencySpacing>
</pre>
@@ -2266,10 +2266,10 @@
<li>DE+DD=>DE (Union, reuses one name // East Germany
unifies with Germany)</li>
</ol>
- <p>The <a href=
- "http://unstats.un.org/unsd/methods/m49/m49chang.htm#ftnq">UN
+ <p>The
+ <a href="https://unstats.un.org/unsd/methodology/m49/">UN
Information</a> is used to determine dates due to country
- changes.</p>
+ changes.</p><!-- Note: This moved from http://unstats.un.org/unsd/methods/m49/m49chang.htm#ftnq and the UN site now redirects to the above page. -->
<p>When a code is no longer in use, it is terminated (see #1,
#2, #4, #5)</p>
<blockquote>
@@ -3257,7 +3257,7 @@
before it is actually used for anything.</li>
</ul>
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/specs/ldml/tr35.html b/docs/ldml/tr35.html
similarity index 98%
rename from specs/ldml/tr35.html
rename to docs/ldml/tr35.html
index 365107a..3ac80d1 100644
--- a/specs/ldml/tr35.html
+++ b/docs/ldml/tr35.html
@@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
- "http://unicode.org/reports/reports.css" type="text/css">
+ "../reports.css" type="text/css">
<title>UTS #35: Unicode Locale Data Markup Language</title>
<style type="text/css">
<!--
@@ -76,7 +76,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
- "[Unicode]" src="http://unicode.org/webscripts/logo60s2.gif"
+ "[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>
<a class="bar" href=
@@ -93,7 +93,7 @@
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
- <td>36</td>
+ <td>37</td>
</tr>
<tr>
<td>Editors</td>
@@ -102,19 +102,20 @@
</tr>
<tr>
<td>Date</td>
- <td>2019-10-02</td>
+ <td>2020-04-15</td>
</tr>
<tr>
<!-- This link must be made live when posting the final version but is disabled during proposed update stage. -->
<td>This Version</td>
<td>
- <a href="http://www.unicode.org/reports/tr35/tr35-57/tr35.html">
- http://www.unicode.org/reports/tr35/tr35-57/tr35.html</a></td>
+ <a href="http://www.unicode.org/reports/tr35/tr35-59/tr35.html">
+ http://www.unicode.org/reports/tr35/tr35-59/tr35.html</a></td>
</tr>
<tr>
<td>Previous Version</td>
<td>
- <a href="http://www.unicode.org/reports/tr35/tr35-55/tr35.html">http://www.unicode.org/reports/tr35/tr35-55/tr35.html</a></td>
+ <a href="http://www.unicode.org/reports/tr35/tr35-57/tr35.html">
+ http://www.unicode.org/reports/tr35/tr35-57/tr35.html</a></td>
</tr>
<tr>
<td>Latest Version</td>
@@ -138,12 +139,12 @@
</tr>
<tr>
<td>DTDs</td>
- <td><a href="http://unicode.org/cldr/dtd/36/">
- http://unicode.org/cldr/dtd/36/</a></td>
+ <td><a href="http://unicode.org/cldr/dtd/37/">
+ http://unicode.org/cldr/dtd/37/</a></td>
</tr>
<tr>
<td>Revision</td>
- <td><a href="#Modifications">57</a></td>
+ <td><a href="#Modifications">59</a></td>
</tr>
</table>
<h3><i>Summary</i></h3>
@@ -6107,8 +6108,9 @@
<i>unconfirmed</i>: no confirmation available.</li>
</ul>
<p>For more information on precisely how these values are
- computed for any given release, see <a href=
- "http://cldr.unicode.org/index/process#TOC-Data-Submission-and-Vetting-Process">
+ computed for any given release, see
+ <a href=
+ "http://cldr.unicode.org/index/process#TOC-Data--Submission-and-Vetting">
Data Submission and Vetting Process</a> on the CLDR
website.</p>
<p>The draft attribute should only occur on "leaf" elements,
@@ -6318,7 +6320,7 @@
</tr>
<tr>
<th>prop</th>
- <td><code>= '\\' [pP] '{' propName ([≠=] s value1+)?
+ <td><code>= '\' [pP] '{' propName ([≠=] s value1+)?
'}'<br>
| '[:' '^'? propName ([≠=] s value2+)? ':]'</code></td>
<td>\p{x=y}, [:x=y:]<br></td>
@@ -6332,7 +6334,7 @@
<tr>
<th>value1</th>
<td><code>= [^\}]<br>
- | '\\' quoted</code></td>
+ | '\' quoted</code></td>
<td>Lm,<br>
\n,<br>
\}</td>
@@ -6340,7 +6342,7 @@
<tr>
<th>value2</th>
<td><code>= [^:]<br>
- | '\\' quoted</code></td>
+ | '\' quoted</code></td>
<td>Lm,<br>
\n,<br>
\:</td>
@@ -6348,7 +6350,7 @@
<tr>
<th>char</th>
<td><code>= [^\& \- \[ \[ \] \\ \} \{ [:Pat_WS:]]<br>
- | '\\' quoted</code></td>
+ | '\' quoted</code></td>
<td>a, b, c, \n</td>
</tr>
<tr>
@@ -6357,8 +6359,13 @@
| 'x' (hex{2} | bracketedHex)<br>
| 'U00' ('0' hex{5} | '10' hex{4})<br>
| 'N{' propName '}'<br>
- | [\u0000-\U00010FFFF]</code></td>
- <td> </td>
+ | [[\u0000-\U00010FFFF]-[uxUN]]</code></td>
+ <td><em><strong>error</strong> if lengths not exact</em></td>
+ </tr>
+ <tr>
+ <th>charName</th>
+ <td><code>= s [A-Za-z0-9] [-A-Za-z0-9_\x20]* s</code></td>
+ <td>TIBETAN LETTER -A</td>
</tr>
<tr>
<th>bracketedHex</th>
@@ -6385,7 +6392,10 @@
</div>
<p>Some constraints on UnicodeSet syntax are not captured by
this EBNF. Notably, property names and values are restricted to
- those supported by the implementation.</p>
+ those supported by the implementation, and have additional constraints imposed by
+ [<a href="http://unicode.org/reports/tr41/#UAX44">UAX44</a>]. In addition, quoted
+ values that resolve to more than one code point are disallowed in ranges of the form
+ <code>char '-' char</code>.</p>
<p>The syntax characters are listed in the table below:</p>
<table>
<tbody>
@@ -6501,7 +6511,7 @@
</tr>
<tr>
<td>\xhh</td>
- <td>1-2 hex digits</td>
+ <td>2 hex digits</td>
</tr>
<tr>
<td>\uhhhh</td>
@@ -7055,67 +7065,78 @@
<tbody>
<tr>
<th>Constraint</th>
- <th>Comments</th>
+ <th colspan="2">Comments</th>
</tr>
<tr>
<td>any</td>
- <td>any string value</td>
+ <td colspan="2">any string value</td>
</tr>
<tr>
<td>any/TODO</td>
- <td>placeholder for future constraints</td>
+ <td colspan="2">placeholder for future constraints</td>
</tr>
<tr>
<td>bcp47/anykey</td>
- <td>any bcp47 key or tkey</td>
+ <td colspan="2">any bcp47 key or tkey</td>
</tr>
<tr>
<td>bcp47/anyvalue</td>
- <td>any bcp47 value (type) or tvalue</td>
+ <td colspan="2">any bcp47 value (type) or tvalue</td>
</tr>
<tr>
<td>literal/{literal values}</td>
- <td>comma separated</td>
+ <td colspan="2">comma separated</td>
</tr>
<tr>
<td>regex/{regex expression}</td>
- <td>valid regex expression</td>
+ <td colspan="2">valid regex expression</td>
</tr>
<tr>
<td>bcp47/{key or tkey}</td>
- <td>matches possible values for that key or tkey</td>
+ <td colspan="2">matches possible values for that key or tkey</td>
</tr>
<tr>
<td>metazone</td>
- <td>valid metazone</td>
+ <td colspan="2">valid metazone</td>
</tr>
<tr>
<td>range/{start_number~{end_number}}</td>
- <td>number between (inclusive) start and end</td>
+ <td colspan="2">number between (inclusive) start and end</td>
</tr>
<tr>
<td>time/{time or date or date-time pattern}</td>
- <td>eg HH:mm</td>
+ <td colspan="2">eg HH:mm</td>
</tr>
<tr>
<td>unicodeset/{unicodeset pattern}</td>
- <td>valid unicodeset</td>
+ <td colspan="2">valid unicodeset</td>
</tr>
<tr>
- <td>validity/{field}</td>
- <td>currency, language, locale, region, script, subdivision, unit, variant</td>
+ <td rowspan="4">validity/{field}</td>
+ <td colspan="2">currency, language, locale, region, script, subdivision, short-unit, unit, variant</td>
+ </tr>
+ <tr>
+ <td colspan="2">The field can be qualified by particular enums, such as:</td>
+ </tr>
+ <tr>
+ <td>validity/unit/regular deprecated</td>
+ <td>matches only <em>deprecated</em> and <em>regular</em></td>
+ </tr>
+ <tr>
+ <td>validity/unit/!deprecated</td>
+ <td>matches all but <em>deprecated</em></td>
</tr>
<tr>
<td>version</td>
- <td>1 to 4 digit field version, such as 35.3.9</td>
+ <td colspan="2">1 to 4 digit field version, such as 35.3.9</td>
</tr>
<tr>
<td>set/{match}</td>
- <td>set of elements that match {match}</td>
+ <td colspan="2">set of elements that match {match}</td>
</tr>
<tr>
<td>or/{match1}XX{match2}…</td>
- <td>matches at least one of {match1}, etc</td>
+ <td colspan="2">matches at least one of {match1}, etc</td>
</tr>
</tbody>
</table><br>
@@ -8917,7 +8938,7 @@
<a href="http://tf.nist.gov/">http://tf.nist.gov/<br></a>
U.S. Naval Observatory: What is Universal Time?<br>
<a href=
- "http://aa.usno.navy.mil/faq/docs/UT.php">http://aa.usno.navy.mil/faq/docs/UT.php</a></td>
+ "https://www.usno.navy.mil/USNO/time/master-clock/systems-of-time">https://www.usno.navy.mil/USNO/time/master-clock/systems-of-time</a></td>
</tr>
<tr>
<td class="noborder" width="148">[<a name="WindowsCulture"
@@ -8993,44 +9014,40 @@
<h2><a name="Modifications" href="#Modifications" id=
"Modifications">Modifications</a></h2>
- <p><b>Revision 57</b></p>
+ <p><b>Revision 59</b></p>
<ul>
- <li><strong>Part 1: <a href="tr35.html#Contents">Core</a> (languages, locales, basic structure)</strong>
- <ul>
- <li><strong>Section 3.2 <a href="#Unicode_locale_identifier">Unicode Locale Identifier</a></strong>
- <ul>
- <li>Clarified differences between Unicode locale identifiers and RFC 6067. [<a href=
- "https://unicode-org.atlassian.net/browse/CLDR-11770">CLDR-11770</a>]</li>
- </ul>
- </li>
+ <li ><b>Proposed Update</b> for CLDR 37.</li>
+
+ <li><strong>Part 1: <a href="tr35.html#Contents">Core</a> (languages, locales, basic structure)</strong>
+ <ul>
+ <li><strong>Section 5.7.1 <a href="#match_expressions" >Attribute Value Constraints</a></strong>: added enhancements for /validity, especially for units.</li>
+ <li><strong>Section <a href="#Unicode_Sets">5.3.3 Unicode Sets</a></strong>: cleaned up syntax definitions</li>
</ul>
- </li>
+ </li>
<li><strong>Part 2: <a href=
"tr35-general.html#Contents">General</a> (display names &
transforms, etc.)</strong>
<ul>
- <li><strong>Section 11 <a href="tr35-general.html#ListPatterns">List Patterns</a></strong>
- <ul>
- <li>Add entries for standard-narrow and or-narrow patterns.
- [<a href="https://unicode-org.atlassian.net/browse/CLDR-13301">CLDR-13301</a>]</li>
- </ul>
- </li>
-
- <li><strong>Section 14.1 <a href="tr35-general.html#SynthesizingNames">Synthesizing Sequence Names</a></strong>
- <ul>
- <li>Document changes in the Emoji derived name algorithm.
- [<a href="https://unicode-org.atlassian.net/browse/CLDR-11952">CLDR-11952</a>]</li>
- </ul>
- </li>
+ <li> <strong>Section 6 <a href="tr35-general.html#Unit_Elements">Unit Elements</a></strong>:
+ <ul>
+ <li>Added information on patterns without “{0}”.</li>
+ <li>Added new subsections below, and renumbered other subsections.</li>
+ <li><strong>6.1 <a href="tr35-general.html#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a></strong></li>
+ <li><strong>6.2 <a href="tr35-general.html#Unit_Identifiers">Unit Identifiers</a></strong>: extended the syntax of unit identifiers substantially.</li>
+ <li><strong>6.9 <a href="tr35-general.html#Private_Use_Units">Private-Use Units</a></strong>: New reserved prefix for private-use units.</li>
+ </ul>
+ </li>
+ <li><strong>Section 11 <a href="tr35-general.html#ListPatterns" >List Patterns</a></strong>: added examples of customized processing for specific languages</li>
+ <li><strong>Section 15 <a href="tr35-general.html#Grammatical_Features">Grammatical Features</a></strong>: added structure and data for grammatical features</li>
</ul>
- </li>
+ </li>
<li>
<p><strong>Part 3: <a href=
"tr35-numbers.html#Contents">Numbers</a> (number & currency
formatting)</strong></p>
<ul>
- <li><em>no changes</em>
- </li>
+ <li ><strong>Section 4 <a href="tr35-numbers.html#Currencies" >Currencies</a></strong>: Updated
+ <currencySpacing> example to match current root data.</li>
</ul>
<p><strong>Part 4: <a href="tr35-dates.html#Contents">Dates</a> (date, time, time zone formatting)</strong></p>
<ul>
@@ -9044,7 +9061,11 @@
<p><strong>Part 6: <a href=
"tr35-info.html#Contents">Supplemental</a> (supplemental
data)</strong></p>
- <ul><li><em>no changes</em></li></ul>
+ <ul>
+ <li ><strong>Section 13 <a href="tr35-info.html#Unit_Conversion" >Unit Conversion</a></strong>: added new section on structure and data for unit conversions.</li>
+ <li ><strong>Section 14 <a href="tr35-info.html#Unit_Preferences">Unit Preferences</a></strong>: added new section on structure and data for unit preferences.
+ Deprecates the <unitPreferences> scope attribute.</li>
+ </ul>
<p><strong>Part 7: <a href=
"tr35-keyboards.html#Contents">Keyboards</a> (keyboard
mappings)</strong></p>
@@ -9058,7 +9079,7 @@
respective versions. Click on <strong>Previous Version</strong>
in the header until you get to the desired version.</p>
<hr>
- <p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
+ <p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
diff --git a/docs/logo60s2.gif b/docs/logo60s2.gif
new file mode 100644
index 0000000..e0abce3
--- /dev/null
+++ b/docs/logo60s2.gif
Binary files differ
diff --git a/docs/reports.css b/docs/reports.css
new file mode 100644
index 0000000..f151e9d
--- /dev/null
+++ b/docs/reports.css
@@ -0,0 +1,229 @@
+/*
+ Style sheet for web-based Unicode Standard Annexes, Technical Standards and Technical Reports
+ M.Davis and A.Freytag
+
+ Last edited: 2013-03-27 RM
+ To use, in <head>...
+ insert:<link REL="stylesheet" HREF="../reports.css" TYPE="text/css">
+ */
+/* for proofing highlight the web only sections */
+div.book-only { background-color: #00FFFF; }
+
+
+/* conditional display */
+.web-only { }
+.book-only { display: none; }
+.ref-only { display: none; } /* this material will be removed eventually */
+
+body { margin: 0; font-family: Arial, 'Lucida Sans Unicode', 'Arial Unicode MS', sans-serif;
+ color: black; background-color: white; background-repeat:repeat;
+ background-attachment: scroll; background-position: 0%; }
+div.body { margin: 3em; } /* margin for body only */
+div.book { margin:0; } /* add a margin for entire document, currently 0 */
+
+blockquote { margin: 20px; }
+blockquote.tus { font-size: 11pt; font-family: Times New Roman, serif; }
+dt { font-style: italic; }
+li {margin-top: 0.25em; margin-bottom: 0.25em; }
+.bb { page-break-before: always; }
+.copyright { font-size: 75%; }
+.codeComment { color: #0000FF; }
+
+/*use these styles for contrastive background coloring associated with specific conventions */
+.syntax { background-color: #EEEEFF; }
+.example { background-color: #EEFFEE; }
+.values { background-color: #FFFFEE; }
+
+/* use these styles for constrastive background coloring with no specific meaning */
+.lightblue { background-color: #EEEEFF; }
+.medgray {background-color: #C0C0C0; }
+.lightyellow {background-color: #FFFF80; }
+
+span.codepoint { font-family: monospace; }
+span.charSample { font-size: 200%; }
+span.name {text-transform: lowercase; font-variant: small-caps; font-size: 75%; }
+
+span.section { font-style: italic; }
+span.secno { font-style: italic; }
+
+td p.stdp { } /* book specific - ignore on web */
+
+p.caption { page-break-after: avoid; font-weight: bold; text-align: center; }
+p.rule { font-style:italic; background-color: #F8F8F8; }
+
+
+/* from UAX#29 */
+.symbol { font-size: 90%; font-family: Arial Unicode MS; }
+.example2 { background-color: #FFFF99; }
+.charlist { font-size: 90%; font-family: monospace; }
+.pairItem { text-align: Center; }
+.lbclass { text-align: Center; }
+span.transform { font-weight:bold; color:#0000FF; }
+
+/* from UAX#31 */
+.rule_head { font-style: italic; border-width: 0; }
+.rule_head { font-weight: bold; }
+.rule_body { font-style: italic; border-width: 0; }
+
+
+/* table related styles*/
+table { border-spacing: 0; border-collapse: collapse;
+ border-style: solid; border-color: black; border-width: 1px; }
+th, td { border-spacing: 0; border-collapse: collapse;
+ border-style: solid; border-color: black; border-width: 1px;
+ font-family: 'Lucida Sans Unicode', 'Arial Unicode MS', Arial, sans-serif;
+ color: black; vertical-align: top; text-align: left; }
+table.body { border-style: none; width: 100%; }
+td.body { border-style: none; padding: 20px; }
+caption { font-size: 120%; font-weight: bold; padding-bottom: 0.75em; }
+td.icon { border-style: none; border-width: 0; padding: 2px; margin: 0;
+ background-color: #990000; color: #fffffe;
+ font-size: 100%; text-align: left;
+ font-weight: bold; font-family: Arial, Geneva, sans-serif; }
+
+td.gray { border-style: none; border-width: 0; padding: 0px; margin: 0;
+ background-color: #999999; color: #FFFFFE;
+ font-size: 6pt; }
+
+table.header { border-style: none; border-width: 0; margin: 0; width: 100%; }
+.noborder { border-style: none; border-width: 0; margin: 0; }
+.nb { border-style: none; border-width: 0; margin: 0; }
+.nbwide { width: 92%; border-style: none; border-width: 0; margin: 0; }
+.wide { width: 92%; }
+.ref { width: 92%; border-style: none; border-width: 0; margin: 0; padding: .33em; }
+
+
+/* Tables should inherit from body, but do not seem to in NN */
+a:link { color: red; }
+a:active { color: blue; }
+a:visited { color: #666666; }
+a:hover { color: #ff3333; }
+
+/* HEADERS and RELATED STYLES */
+h1, h2, h3, h4, h5, h6 { font-weight: bold; margin-top: 8px; }
+h1 { font-size: x-large; text-transform: uppercase; text-align: center; }
+h2 { font-size: large; }
+h2.nonumber { font-size: large; }
+h2.uaxtitle { font-size: large; text-align:center; }
+h3 { font-size: medium; }
+h4 { font-size: medium; font-style: italic; }
+h5 { font-size: small; }
+h6 { font-size: small; font-style: italic; }
+
+/* don't red-color links on headers and captions, unless hovering */
+h2 a:link, h3 a:link, h4 a:link, h5 a:link, p.caption a:link, caption a:link,
+h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, p.caption a:visited, caption a:visited {
+ color:black;
+ text-decoration:none;
+ }
+h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, p.caption a:hover, caption a:hover {
+ color: red;
+ text-decoration:underline;
+ }
+
+/* ignored in web format */
+h1 nocap { }
+
+/* run in headers */
+span.run_in { font-style:italic; font-weight: bold; }
+span.note { font-style: italic; }
+
+
+p.bar { background-color: #990000; color: #fffffe; font-size: 100%; font-weight: bold;
+ font-family: Arial, Geneva, sans-serif; text-align: right; padding: 4px; }
+
+a.bar:link { color: #fffffe; }
+a.bar:visited { color: #fffffe; }
+a.bar:active { color: #fffffe; }
+a.bar:hover { color: #ff3333; }
+
+/* some UAXs use h3 some h4 */
+h4.summary { margin-top: 1em; }
+h3.summary { margin-top: 1em; }
+
+h4.contents {}
+h4.status {}
+
+
+/* link style for character class */
+a.charclass { font-weight:bold; text-decoration: none; color: #808080 }
+
+
+/* syntax coloring for C source code samples */
+
+.CKeyword {color: rgb(0,0,255); }
+.CComment {color: rgb(0,128,0); }
+.CCommand { font-weight:bold; color: rgb(255,0,0); }
+
+
+.changed { background-color: #FFFF00; border-style: dotted; border-width: 1px; }
+.removed { text-decoration: line-through; background-color: #FFFF00; border-style: dotted; border-width: 1px; }
+.changed2 { background-color: #00FFFF; border-style: dotted; border-width: 1px; }
+.removed2 { text-decoration: line-through; background-color: #00FFFF; border-style: dotted; border-width: 1px; }
+
+span.changedspan { background-color: #FFFF00; border-style: dotted; border-width: 1px; }
+span.removedspan { text-decoration: line-through; background-color: #FFFF00; border-style: dotted; border-width: 1px; }
+
+.reviewnote { background-color: #FFFF80; color: #CC0000; border-style: dashed;
+ border-width: 1px; }
+
+
+
+/* table w/o a grid, except for lines in first and last row like in TR#25 */
+
+table.gray { border-collapse: collapse; border-style: none; border-width: medium; }
+
+th.grayfirst, td.grayfirst { border-left-style: none; border-left-width: medium; border-right-style: none;
+ border-right-width: medium; border-top: 1.5pt solid gray;
+ border-bottom: .75pt solid gray; padding-left: 5.4pt;
+ padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in }
+td.graymiddle, td.graymiddle { border-style: none; border-width: medium; padding-left: 5.4pt;
+ padding-right:5.4pt; padding-top: 0in; padding-bottom: 0in; }
+
+td.graylast, td.graylast { border-left-style: none; border-left-width: medium; border-right-style: none;
+ border-right-width: medium; border-top-style: none;
+ border-top-width: medium; border-bottom: 1.5pt solid gray;
+ padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in;
+ padding-bottom: 0in; }
+
+
+/* list styles that work well in table of contents */
+ul.toc { list-style-position: outside; list-style-type: none; margin-left: 1em; margin-bottom: 0pt;
+ margin-top: 0pt; line-height: 90%; }
+
+ol.toc { list-style-type: decimal; margin-bottom: 0pt; }
+
+ol ul.toc { list-style-position: outside; list-style-type: none; margin-left: 0em; margin-bottom: 0pt;
+ margin-top: 0pt; line-height: 90%; }
+
+ul ul.toc { list-style-position: outside; list-style-type: none; margin-left: 1.3em; margin-bottom: 0pt;
+ margin-top: 0pt; line-height: 90%; }
+ul.toc li { margin-left: 0; }
+
+/* prevent open circles starting bullets inside numbered points */
+ol ul { list-style-type: disc; }
+ul.nobullet { list-style-type: none; }
+
+/* is the preceding needed for web ? */
+
+.right { text-align: right; }
+.left { text-align: Left; }
+.center { text-align: center; }
+
+
+/* UAX#14 specific styles, duplicated here in case they are applicable elsehwere */
+table.pair {border:1px solid; font-size:8pt; }
+table.pair th {text-align:center; font-size:8pt; }
+table.pair th.pairItem { background-color:#800080; }
+.nb-la { width:7em; border-style: none; border-width: 0; padding-left: 0.2em; background-color:#F0F0F0; }
+.nb-lb { border-style: none; border-width: 0; padding-left: 0.2em; background-color:#F8F8F8; }
+td.nb-lb p { margin-left:0em; }
+
+/* use some font styles conditionally */
+span.mathsym1 { }
+span.mathsym2 { font-family: 'Lucida Sans Unicode', 'Arial Unicode MS', Arial, sans-serif; }
+span.mathsym3 { font-family: 'Arial Unicode MS', Arial, 'Lucida Sans Unicode', sans-serif; }
+span.specials-book { display: none; }
+span.specials-web { font-size: smaller; }
+span.glyphs-book { display: none; }
+span.symbol-web { font-size: 90%; font-family: 'Arial Unicode MS'; } /* same as .symbol */
diff --git a/specs/rfc/draft-davis-t-langtag-ext.css b/docs/rfc/draft-davis-t-langtag-ext.css
similarity index 100%
rename from specs/rfc/draft-davis-t-langtag-ext.css
rename to docs/rfc/draft-davis-t-langtag-ext.css
diff --git a/specs/rfc/draft-davis-t-langtag-ext.html b/docs/rfc/draft-davis-t-langtag-ext.html
similarity index 100%
rename from specs/rfc/draft-davis-t-langtag-ext.html
rename to docs/rfc/draft-davis-t-langtag-ext.html
diff --git a/specs/rfc/draft-davis-t-langtag-ext.txt b/docs/rfc/draft-davis-t-langtag-ext.txt
similarity index 100%
rename from specs/rfc/draft-davis-t-langtag-ext.txt
rename to docs/rfc/draft-davis-t-langtag-ext.txt
diff --git a/specs/rfc/draft-davis-t-langtag-ext.xml b/docs/rfc/draft-davis-t-langtag-ext.xml
similarity index 100%
rename from specs/rfc/draft-davis-t-langtag-ext.xml
rename to docs/rfc/draft-davis-t-langtag-ext.xml
diff --git a/specs/rfc/draft-davis-u-langtag-ext-00.html b/docs/rfc/draft-davis-u-langtag-ext-00.html
similarity index 100%
rename from specs/rfc/draft-davis-u-langtag-ext-00.html
rename to docs/rfc/draft-davis-u-langtag-ext-00.html
diff --git a/specs/rfc/draft-davis-u-langtag-ext-00.txt b/docs/rfc/draft-davis-u-langtag-ext-00.txt
similarity index 100%
rename from specs/rfc/draft-davis-u-langtag-ext-00.txt
rename to docs/rfc/draft-davis-u-langtag-ext-00.txt
diff --git a/specs/rfc/draft-davis-u-langtag-ext-00.xml b/docs/rfc/draft-davis-u-langtag-ext-00.xml
similarity index 100%
rename from specs/rfc/draft-davis-u-langtag-ext-00.xml
rename to docs/rfc/draft-davis-u-langtag-ext-00.xml
diff --git a/specs/rfc/draft-davis-u-langtag-ext-04.xml b/docs/rfc/draft-davis-u-langtag-ext-04.xml
similarity index 100%
rename from specs/rfc/draft-davis-u-langtag-ext-04.xml
rename to docs/rfc/draft-davis-u-langtag-ext-04.xml
diff --git a/specs/rfc/notes.txt b/docs/rfc/notes.txt
similarity index 100%
rename from specs/rfc/notes.txt
rename to docs/rfc/notes.txt
diff --git a/specs/rfc/rfc2629-other.ent b/docs/rfc/rfc2629-other.ent
similarity index 100%
rename from specs/rfc/rfc2629-other.ent
rename to docs/rfc/rfc2629-other.ent
diff --git a/specs/rfc/rfc2629-xhtml.ent b/docs/rfc/rfc2629-xhtml.ent
similarity index 100%
rename from specs/rfc/rfc2629-xhtml.ent
rename to docs/rfc/rfc2629-xhtml.ent
diff --git a/specs/rfc/rfc2629.dtd b/docs/rfc/rfc2629.dtd
similarity index 100%
rename from specs/rfc/rfc2629.dtd
rename to docs/rfc/rfc2629.dtd
diff --git a/specs/rfc/rfc2629.xslt b/docs/rfc/rfc2629.xslt
similarity index 100%
rename from specs/rfc/rfc2629.xslt
rename to docs/rfc/rfc2629.xslt
diff --git a/exemplars/main/pcm.xml b/exemplars/main/pcm.xml
deleted file mode 100644
index b164ffd..0000000
--- a/exemplars/main/pcm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2018 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="pcm"/>
- </identity>
- <layout>
- <orientation>
- <characterOrder>left-to-right</characterOrder>
- <lineOrder>top-to-bottom</lineOrder>
- </orientation>
- </layout>
- <characters>
- <exemplarCharacters draft="unconfirmed">[a b d e f g h i j k l m n o p r s t u v w x y z]</exemplarCharacters>
- <exemplarCharacters type="auxiliary" draft="unconfirmed">[c q]</exemplarCharacters>
- </characters>
-</ldml>
diff --git a/keyboards/dtd/ldmlKeyboard.dtd b/keyboards/dtd/ldmlKeyboard.dtd
index 74879a9..d2ae994 100644
--- a/keyboards/dtd/ldmlKeyboard.dtd
+++ b/keyboards/dtd/ldmlKeyboard.dtd
@@ -12,17 +12,17 @@
<!ELEMENT keyboard ( version, generation?, names, settings?, import*, keyMap+, displayMap?, layer*, vkeys*, transforms*, reorders?, backspaces? ) >
<!ATTLIST keyboard locale CDATA #REQUIRED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ELEMENT version EMPTY >
<!ATTLIST version platform CDATA #REQUIRED >
- <!--@MATCH:version-->
+ <!--@MATCH:version-->
<!--@VALUE-->
<!ATTLIST version number CDATA #REQUIRED >
- <!--@MATCH:regex/\$Revision.*\$-->
+ <!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "36.1" >
- <!--@MATCH:version-->
+<!ATTLIST version cldrVersion CDATA #FIXED "37" >
+ <!--@MATCH:version-->
<!--@METADATA-->
<!ELEMENT generation EMPTY >
@@ -35,7 +35,7 @@
<!ELEMENT name EMPTY >
<!ATTLIST name value CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ELEMENT settings EMPTY >
@@ -49,30 +49,30 @@
<!ELEMENT import EMPTY >
<!ATTLIST import path CDATA #REQUIRED >
-
+
<!ELEMENT keyMap ( map | flicks )+ >
<!ATTLIST keyMap modifiers CDATA #IMPLIED >
- <!--@MATCH:any/TODO-->
+ <!--@MATCH:any/TODO-->
<!ELEMENT map EMPTY >
<!ATTLIST map iso CDATA #REQUIRED >
- <!--@MATCH:regex/[A-E](0[0-9]|1[0-3])-->
+ <!--@MATCH:regex/[A-E](0[0-9]|1[0-3])-->
<!ATTLIST map to CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST map longPress CDATA #IMPLIED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST map longpress-status (optional) #IMPLIED >
<!ATTLIST map transform (no) #IMPLIED >
<!--@VALUE-->
<!ATTLIST map multitap CDATA #IMPLIED >
<!--@VALUE-->
-<!ATTLIST map hint CDATA #IMPLIED >
+<!ATTLIST map hint CDATA #IMPLIED >
<!--@VALUE-->
<!ATTLIST map optional NMTOKEN #IMPLIED >
-<!ELEMENT flicks (flick+) >
+<!ELEMENT flicks ( flick+ ) >
<!ATTLIST flicks iso CDATA #REQUIRED >
<!ELEMENT flick EMPTY >
@@ -112,15 +112,15 @@
<!ELEMENT transforms ( transform+ ) >
<!ATTLIST transforms type CDATA #REQUIRED >
- <!--@MATCH:literal/simple-->
+ <!--@MATCH:literal/simple-->
<!ELEMENT transform EMPTY >
<!ATTLIST transform before CDATA #IMPLIED >
<!ATTLIST transform from CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!ATTLIST transform after CDATA #IMPLIED >
<!ATTLIST transform to CDATA #REQUIRED >
- <!--@MATCH:any-->
+ <!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST transform error (fail) #IMPLIED >
<!--@VALUE-->
diff --git a/readme.html b/readme.html
index eacdf81..b6ad336 100644
--- a/readme.html
+++ b/readme.html
@@ -4,24 +4,24 @@
<head>
<meta http-equiv="Content-Type" content= "text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
- <meta name="COPYRIGHT" content= "Copyright (c) 1991-2019 Unicode, Inc. All rights reserved.">
+ <meta name="COPYRIGHT" content= "Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.">
<meta name="DESCRIPTION" content= "Readme for Unicode CLDR with version number and other information.">
<title>ReadMe for Unicode CLDR</title>
</head>
<body>
<h2>Unicode Common Locale Data Repository (CLDR)</h2>
- <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> version 36.1</h3>
- <p>Last updated: 2020-Mar-04</p>
+ <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> version 37</h3>
+ <p>Last updated: 2020-Apr-14</p>
- <!--<p><b>Note:</b> CLDR 36.1 is in development and not recommended for use at this stage.</p>-->
- <!--<p><b>Note:</b> This is the milestone 1 version of CLDR 36.1, intended for those wishing to do pre-release testing.
+ <!--<p><b>Note:</b> CLDR 37 is in development and not recommended for use at this stage.</p>-->
+ <!--<p><b>Note:</b> This is the milestone 1 version of CLDR 37, intended for those wishing to do pre-release testing.
It is not recommended for production use.</p>-->
- <!--<p><b>Note:</b> This is a preliminary version of CLDR 36.1, intended for those wishing to do pre-release testing.
+ <!--<p><b>Note:</b> This is a preliminary version of CLDR 37, intended for those wishing to do pre-release testing.
It is not recommended for production use.</p>-->
- <!--<p><b>Note:</b> This is a pre-release candidate version of CLDR 36.1, intended for testing.
+ <!--<p><b>Note:</b> This is a pre-release candidate version of CLDR 37, intended for testing.
It is not recommended for production use.</p>-->
- <p>This is the final release version of CLDR 36.1.</p>
+ <p>This is the final release version of CLDR 37.</p>
<p><strong>Important notes for CLDR 36 and later:</strong></p>
<ul>
diff --git a/seed/annotations/bgn.xml b/seed/annotations/bgn.xml
index 57ef788..c9b3ea8 100644
--- a/seed/annotations/bgn.xml
+++ b/seed/annotations/bgn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/annotations/sc.xml b/seed/annotations/sc.xml
index a1c241f..7fd513b 100644
--- a/seed/annotations/sc.xml
+++ b/seed/annotations/sc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/aa.xml b/seed/main/aa.xml
index caee10f..70bcde3 100644
--- a/seed/main/aa.xml
+++ b/seed/main/aa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/aa_DJ.xml b/seed/main/aa_DJ.xml
index aeccd74..f97063f 100644
--- a/seed/main/aa_DJ.xml
+++ b/seed/main/aa_DJ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/aa_ER.xml b/seed/main/aa_ER.xml
index 6afb5a3..2f91fc8 100644
--- a/seed/main/aa_ER.xml
+++ b/seed/main/aa_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/aa_ET.xml b/seed/main/aa_ET.xml
index 1c2f4e6..30b177f 100644
--- a/seed/main/aa_ET.xml
+++ b/seed/main/aa_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/an.xml b/seed/main/an.xml
index 0249b43..deb2662 100644
--- a/seed/main/an.xml
+++ b/seed/main/an.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/an_ES.xml b/seed/main/an_ES.xml
index cb90096..233d770 100644
--- a/seed/main/an_ES.xml
+++ b/seed/main/an_ES.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/arn.xml b/seed/main/arn.xml
index a3275fd..f420cfc 100644
--- a/seed/main/arn.xml
+++ b/seed/main/arn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/arn_CL.xml b/seed/main/arn_CL.xml
index fa6b81b..30b79f8 100644
--- a/seed/main/arn_CL.xml
+++ b/seed/main/arn_CL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/az_Arab.xml b/seed/main/az_Arab.xml
index 6a5ec98..998c052 100644
--- a/seed/main/az_Arab.xml
+++ b/seed/main/az_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/az_Arab_IQ.xml b/seed/main/az_Arab_IQ.xml
index 8c61c2c..bf24aaa 100644
--- a/seed/main/az_Arab_IQ.xml
+++ b/seed/main/az_Arab_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/az_Arab_IR.xml b/seed/main/az_Arab_IR.xml
index 0b2b0db..2369153 100644
--- a/seed/main/az_Arab_IR.xml
+++ b/seed/main/az_Arab_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/az_Arab_TR.xml b/seed/main/az_Arab_TR.xml
index 998bd5c..5341c6c 100644
--- a/seed/main/az_Arab_TR.xml
+++ b/seed/main/az_Arab_TR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ba.xml b/seed/main/ba.xml
index 57e5022..0cf0c27 100644
--- a/seed/main/ba.xml
+++ b/seed/main/ba.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="ba"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="ba" draft="contributed">башҡорт теле</language>
+ </languages>
+ </localeDisplayNames>
<layout>
<orientation>
<characterOrder>left-to-right</characterOrder>
diff --git a/seed/main/ba_RU.xml b/seed/main/ba_RU.xml
index 9f203d8..f396c12 100644
--- a/seed/main/ba_RU.xml
+++ b/seed/main/ba_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn.xml b/seed/main/bgn.xml
index b44b856..f8a4dcf 100644
--- a/seed/main/bgn.xml
+++ b/seed/main/bgn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn_AE.xml b/seed/main/bgn_AE.xml
index f5854ac..d00c8e6 100644
--- a/seed/main/bgn_AE.xml
+++ b/seed/main/bgn_AE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn_AF.xml b/seed/main/bgn_AF.xml
index bc6be63..6585e62 100644
--- a/seed/main/bgn_AF.xml
+++ b/seed/main/bgn_AF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn_IR.xml b/seed/main/bgn_IR.xml
index 2ed32cd..fe192c7 100644
--- a/seed/main/bgn_IR.xml
+++ b/seed/main/bgn_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn_OM.xml b/seed/main/bgn_OM.xml
index c20a067..72d90f8 100644
--- a/seed/main/bgn_OM.xml
+++ b/seed/main/bgn_OM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bgn_PK.xml b/seed/main/bgn_PK.xml
index def8720..b90cdee 100644
--- a/seed/main/bgn_PK.xml
+++ b/seed/main/bgn_PK.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/blt.xml b/seed/main/blt.xml
index d086a83..722ef62 100644
--- a/seed/main/blt.xml
+++ b/seed/main/blt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/blt_VN.xml b/seed/main/blt_VN.xml
index 54e7eb1..7b0e50f 100644
--- a/seed/main/blt_VN.xml
+++ b/seed/main/blt_VN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bm_Nkoo.xml b/seed/main/bm_Nkoo.xml
index a9ccfe2..3703faf 100644
--- a/seed/main/bm_Nkoo.xml
+++ b/seed/main/bm_Nkoo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bm_Nkoo_ML.xml b/seed/main/bm_Nkoo_ML.xml
index 5d9e6e8..eb9be9d 100644
--- a/seed/main/bm_Nkoo_ML.xml
+++ b/seed/main/bm_Nkoo_ML.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bss.xml b/seed/main/bss.xml
index 33920f8..c9a7a86 100644
--- a/seed/main/bss.xml
+++ b/seed/main/bss.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/bss_CM.xml b/seed/main/bss_CM.xml
index 44e6a51..b5e58ef 100644
--- a/seed/main/bss_CM.xml
+++ b/seed/main/bss_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/byn.xml b/seed/main/byn.xml
index 0459800..5bc9d9a 100644
--- a/seed/main/byn.xml
+++ b/seed/main/byn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/byn_ER.xml b/seed/main/byn_ER.xml
index 8ef6efc..df27afc 100644
--- a/seed/main/byn_ER.xml
+++ b/seed/main/byn_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cad.xml b/seed/main/cad.xml
new file mode 100644
index 0000000..cbae1dc
--- /dev/null
+++ b/seed/main/cad.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="cad"/>
+ </identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="cad" draft="unconfirmed">Caddo</language>
+ </languages>
+ <territories>
+ <territory type="US" draft="unconfirmed">United States</territory>
+ </territories>
+ <measurementSystemNames>
+ <measurementSystemName type="US">US</measurementSystemName>
+ </measurementSystemNames>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters>[a á à {aː} {áː} {àː} b {ch} {chʼ} d e é è {eː} {éː} {èː} h i í ì {iː} {íː} {ìː} k {kʼ} m n o ó ò {oː} {óː} {òː} p s t {tsʼ} {tʼ} u ú ù {uː} {úː} {ùː} w y ˀ ʼ]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[c f g j l q r v x z]</exemplarCharacters>
+ <exemplarCharacters type="index">[A B {CH} D E H I K M N O P S {SH} T {TS} U W Y]</exemplarCharacters>
+ <exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+ <exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters>
+ </characters>
+ <dates>
+ <calendars>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern draft="unconfirmed">EEEE, MMMM d, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern draft="unconfirmed">MMMM d, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern draft="unconfirmed">MMM d, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern draft="unconfirmed">M/d/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="wide">
+ <month type="1">Cháykáhday Haˀimay</month>
+ <month type="2">Tsahkápbiˀ</month>
+ <month type="3">Wánit</month>
+ <month type="4">Háshnihtiˀtiˀ</month>
+ <month type="5">Háshnih Haˀimay</month>
+ <month type="6">Háshnihtsiˀ</month>
+ <month type="7">Násˀahˀatsus</month>
+ <month type="8">Dahósikah nish</month>
+ <month type="9">Híisikah nish</month>
+ <month type="10">Nípbaatiˀtiˀ</month>
+ <month type="11">Nípbaa Haˀimay</month>
+ <month type="12">Cháykáhdaytiˀtiˀ</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="wide">
+ <day type="sun">Inikuˀ</day>
+ <day type="mon">Wísts’i hayashuh</day>
+ <day type="tue">Bít hayashuh</day>
+ <day type="wed">Dahó hayashuh</day>
+ <day type="thu">Hiwí hayashuh</day>
+ <day type="fri">Dissik’an hayashuh</day>
+ <day type="sat">Inikuˀtiˀtiˀ</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern draft="unconfirmed">EEEE, MMMM d, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern draft="unconfirmed">MMMM d, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern draft="unconfirmed">MMM d, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern draft="unconfirmed">M/d/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <symbols numberSystem="latn">
+ <decimal draft="unconfirmed">.</decimal>
+ <group draft="unconfirmed">,</group>
+ <list draft="unconfirmed">;</list>
+ <percentSign draft="unconfirmed">%</percentSign>
+ <plusSign draft="unconfirmed">+</plusSign>
+ <minusSign draft="unconfirmed">-</minusSign>
+ <exponential draft="unconfirmed">E</exponential>
+ <perMille draft="unconfirmed">‰</perMille>
+ <infinity draft="unconfirmed">∞</infinity>
+ <nan draft="unconfirmed">NaN</nan>
+ </symbols>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength type="short">
+ <currencyFormat type="standard">
+ <pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+ <pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+ <pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+ <pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+ <pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+ <pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+ <pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+ <pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+ <pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+ <pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+ <pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+ <pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ </currencyFormats>
+ <currencies>
+ <currency type="USD">
+ <symbol>$</symbol>
+ </currency>
+ </currencies>
+ </numbers>
+ <units>
+ <unitLength type="long">
+ <unit type="duration-month">
+ <displayName draft="provisional">Nish</displayName>
+ <unitPattern count="other">Nish {0}</unitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName draft="provisional">Wísts’iˀ inikuˀ</displayName>
+ <unitPattern count="other">Wísts’iˀ inikuˀ {0}</unitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName draft="provisional">Kaˀisch’áyˀah</displayName>
+ <unitPattern count="other">{0} Kaˀisch’áyˀah</unitPattern>
+ </unit>
+ </unitLength>
+ </units>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/seed/main/cad_US.xml
similarity index 82%
copy from seed/main/mni_IN.xml
copy to seed/main/cad_US.xml
index 01c64c4..099be9e 100644
--- a/seed/main/mni_IN.xml
+++ b/seed/main/cad_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,7 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
- <territory type="IN"/>
+ <language type="cad"/>
+ <territory type="US"/>
</identity>
</ldml>
diff --git a/seed/main/cch.xml b/seed/main/cch.xml
index ef4d080..b26f7f1 100644
--- a/seed/main/cch.xml
+++ b/seed/main/cch.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cch_NG.xml b/seed/main/cch_NG.xml
index e386125..121f030 100644
--- a/seed/main/cch_NG.xml
+++ b/seed/main/cch_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cic.xml b/seed/main/cic.xml
index 1a92ef9..863a09d 100644
--- a/seed/main/cic.xml
+++ b/seed/main/cic.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cic_US.xml b/seed/main/cic_US.xml
index b9fc091..097de50 100644
--- a/seed/main/cic_US.xml
+++ b/seed/main/cic_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/co.xml b/seed/main/co.xml
index eea2c28..99e39ee 100644
--- a/seed/main/co.xml
+++ b/seed/main/co.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="co"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="co" draft="contributed">corsu</language>
+ </languages>
+ </localeDisplayNames>
<layout>
<orientation>
<characterOrder>left-to-right</characterOrder>
diff --git a/seed/main/co_FR.xml b/seed/main/co_FR.xml
index f76ffdd..79bf959 100644
--- a/seed/main/co_FR.xml
+++ b/seed/main/co_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cv.xml b/seed/main/cv.xml
index c0e6ade..38be04a 100644
--- a/seed/main/cv.xml
+++ b/seed/main/cv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/cv_RU.xml b/seed/main/cv_RU.xml
index 33ae24c..20cf7c9 100644
--- a/seed/main/cv_RU.xml
+++ b/seed/main/cv_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/dv.xml b/seed/main/dv.xml
index 9a00f43..a497549 100644
--- a/seed/main/dv.xml
+++ b/seed/main/dv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/dv_MV.xml b/seed/main/dv_MV.xml
index 05613b2..afecb1b 100644
--- a/seed/main/dv_MV.xml
+++ b/seed/main/dv_MV.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/el_POLYTON.xml b/seed/main/el_POLYTON.xml
index 5b5f068..c9a6a53 100644
--- a/seed/main/el_POLYTON.xml
+++ b/seed/main/el_POLYTON.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/en_Dsrt.xml b/seed/main/en_Dsrt.xml
index 0dbca79..a27c0e7 100644
--- a/seed/main/en_Dsrt.xml
+++ b/seed/main/en_Dsrt.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/en_Dsrt_US.xml b/seed/main/en_Dsrt_US.xml
index 2fdeef5..6faa2fa 100644
--- a/seed/main/en_Dsrt_US.xml
+++ b/seed/main/en_Dsrt_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/en_Shaw.xml b/seed/main/en_Shaw.xml
index 999dd45..58737aa 100644
--- a/seed/main/en_Shaw.xml
+++ b/seed/main/en_Shaw.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/en_ZZ.xml b/seed/main/en_ZZ.xml
index dcbe1df..5ac9da5 100644
--- a/seed/main/en_ZZ.xml
+++ b/seed/main/en_ZZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -16,6 +16,11 @@
<language type="zh">Chinese (translation hint: specifically, Mandarin Chinese.)</language>
</languages>
<scripts>
+ <script type="Aran">Nastaliq (translation hint: Special code identifies a style variant of Arabic script.)</script>
+ <script type="Hans">Simplified (translation hint: This version of the script name is used in combination with the language name for Chinese.)</script>
+ <script type="Hans" alt="stand-alone">Simplified Han (translation hint: This version of the script name is used in isolation, not combined with the language name for Chinese.)</script>
+ <script type="Hant">Traditional (translation hint: This version of the script name is used in combination with the language name for Chinese.)</script>
+ <script type="Hant" alt="stand-alone">Traditional Han (translation hint: This version of the script name is used in isolation, not combined with the language name for Chinese.)</script>
<script type="Qaag">Zawgyi (translation hint: Special code identifies non-standard Myanmar encoding for use with Zawgyi font.)</script>
</scripts>
<territories>
diff --git a/seed/main/ff_Adlm_GH.xml b/seed/main/ff_Adlm_GH.xml
deleted file mode 100644
index 2cc5813..0000000
--- a/seed/main/ff_Adlm_GH.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="ff"/>
- <script type="Adlm"/>
- <territory type="GH"/>
- </identity>
- <numbers>
- <currencies>
- <currency type="GHS">
- <symbol>GH₵</symbol>
- </currency>
- <currency type="GNF">
- <symbol>GNF</symbol>
- </currency>
- </currencies>
- </numbers>
-</ldml>
diff --git a/seed/main/ff_Adlm_GM.xml b/seed/main/ff_Adlm_GM.xml
deleted file mode 100644
index 7e43914..0000000
--- a/seed/main/ff_Adlm_GM.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="ff"/>
- <script type="Adlm"/>
- <territory type="GM"/>
- </identity>
- <numbers>
- <currencies>
- <currency type="GMD">
- <symbol>D</symbol>
- </currency>
- <currency type="GNF">
- <symbol>GNF</symbol>
- </currency>
- </currencies>
- </numbers>
-</ldml>
diff --git a/seed/main/ff_Adlm_LR.xml b/seed/main/ff_Adlm_LR.xml
deleted file mode 100644
index 31c4952..0000000
--- a/seed/main/ff_Adlm_LR.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="ff"/>
- <script type="Adlm"/>
- <territory type="LR"/>
- </identity>
- <numbers>
- <currencies>
- <currency type="GNF">
- <symbol>GNF</symbol>
- </currency>
- <currency type="LRD">
- <symbol>$</symbol>
- </currency>
- </currencies>
- </numbers>
-</ldml>
diff --git a/seed/main/ff_Adlm_MR.xml b/seed/main/ff_Adlm_MR.xml
deleted file mode 100644
index a13dc07..0000000
--- a/seed/main/ff_Adlm_MR.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="ff"/>
- <script type="Adlm"/>
- <territory type="MR"/>
- </identity>
- <numbers>
- <currencies>
- <currency type="GNF">
- <symbol>GNF</symbol>
- </currency>
- <currency type="MRU">
- <symbol>UM</symbol>
- </currency>
- </currencies>
- </numbers>
-</ldml>
diff --git a/seed/main/ff_Adlm_SL.xml b/seed/main/ff_Adlm_SL.xml
deleted file mode 100644
index 33f0a4c..0000000
--- a/seed/main/ff_Adlm_SL.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="ff"/>
- <script type="Adlm"/>
- <territory type="SL"/>
- </identity>
- <numbers>
- <currencies>
- <currency type="GNF">
- <symbol>GNF</symbol>
- </currency>
- <currency type="SLL">
- <symbol>Le</symbol>
- </currency>
- </currencies>
- </numbers>
-</ldml>
diff --git a/seed/main/gaa.xml b/seed/main/gaa.xml
index 1d8608a..00723cb 100644
--- a/seed/main/gaa.xml
+++ b/seed/main/gaa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -37,6 +37,7 @@
<language type="fr" draft="unconfirmed">Frɛntsi</language>
<language type="fr_CA" draft="unconfirmed">Kanada Frɛntsi</language>
<language type="fr_CH" draft="unconfirmed">Switzerland Frɛntsi</language>
+ <language type="gaa" draft="contributed">Gã</language>
<language type="hi" draft="unconfirmed">Hindi</language>
<language type="id" draft="unconfirmed">Indonesian</language>
<language type="it" draft="unconfirmed">Italian</language>
diff --git a/seed/main/gaa_GH.xml b/seed/main/gaa_GH.xml
index 9da0e97..6db595e 100644
--- a/seed/main/gaa_GH.xml
+++ b/seed/main/gaa_GH.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/gez.xml b/seed/main/gez.xml
index 8227aae..d57f3b4 100644
--- a/seed/main/gez.xml
+++ b/seed/main/gez.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -290,7 +290,7 @@
</localeDisplayNames>
<characters>
<exemplarCharacters>[\u135F ᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሐ ሑ ሒ ሓ ሔ ሕ ሖ መ ሙ ሚ ማ ሜ ም ሞ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ረ ሩ ሪ ራ ሬ ር ሮ ሰ ሱ ሲ ሳ ሴ ስ ሶ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ በ ቡ ቢ ባ ቤ ብ ቦ ተ ቱ ቲ ታ ቴ ት ቶ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ አ ኡ ኢ ኣ ኤ እ ኦ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፐ ፑ ፒ ፓ ፔ ፕ ፖ]</exemplarCharacters>
- <exemplarCharacters type="auxiliary" draft="unconfirmed">[ሇ ሏ ⶀ ሗ ሟ ᎀ ᎁ ᎂ ᎃ ⶁ ሧ ሯ ⶂ ሷ ⶃ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ⶄ ቇ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ ቧ ᎄ ᎅ ᎆ ᎇ ⶅ ቮ ቯ ቷ ⶆ ቿ ⶇ ኇ ኗ ⶈ ኟ ⶉ ኧ ⶊ ኯ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ዏ ዟ ⶋ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ ዷ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጧ ⶏ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ⶐ ጷ ⶑ ጿ ፇ ፏ ᎈ ᎉ ᎊ ᎋ ፗ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary" draft="unconfirmed">[ሇ ሏ ⶀ ሗ ሟ ᎀ ᎁ ᎂ ᎃ ⶁ ሧ ሯ ⶂ ሷ ⶃ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ⶄ ቇ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ ቧ ᎄ ᎅ ᎆ ᎇ ⶅ ቮ ቯ ቷ ⶆ ቿ ⶇ ኇ ኗ ⶈ ኛ ኟ ⶉ ኧ ⶊ ኯ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ዏ ዟ ⶋ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ ዷ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጧ ⶏ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ⶐ ጷ ⶑ ጿ ፇ ፏ ᎈ ᎉ ᎊ ᎋ ፗ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ]</exemplarCharacters>
<exemplarCharacters type="index" draft="unconfirmed">[ሀ ለ ሐ መ ሠ ረ ሰ ቀ ቈ በ ተ ኀ ኈ ነ አ ከ ኰ ወ ዐ ዘ የ ደ ገ ጐ ጠ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters>
</characters>
<dates>
diff --git a/seed/main/gez_ER.xml b/seed/main/gez_ER.xml
index 1c69b3f..4ee0afe 100644
--- a/seed/main/gez_ER.xml
+++ b/seed/main/gez_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/gez_ET.xml b/seed/main/gez_ET.xml
index 0b1dc4a..6a031bf 100644
--- a/seed/main/gez_ET.xml
+++ b/seed/main/gez_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/gn.xml b/seed/main/gn.xml
index c995b99..f9acb9f 100644
--- a/seed/main/gn.xml
+++ b/seed/main/gn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,45 @@
<version number="$Revision$"/>
<language type="gn"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="gn" draft="contributed">avañe’ẽ</language>
+ </languages>
+ <territories>
+ <territory type="001" draft="unconfirmed">yvóra</territory>
+ <territory type="002" draft="unconfirmed">África</territory>
+ <territory type="003" draft="unconfirmed">América del Norte</territory>
+ <territory type="005" draft="unconfirmed">América del Sur</territory>
+ <territory type="009" draft="unconfirmed">Oceanía</territory>
+ <territory type="013" draft="unconfirmed">América Central</territory>
+ <territory type="019" draft="unconfirmed">América</territory>
+ <territory type="021" draft="unconfirmed">Norteamérica</territory>
+ <territory type="029" draft="unconfirmed">Caribe</territory>
+ <territory type="142" draft="unconfirmed">Ásia</territory>
+ <territory type="150" draft="unconfirmed">Európa</territory>
+ <territory type="419" draft="unconfirmed">América Latina</territory>
+ <territory type="AR" draft="unconfirmed">Argentína</territory>
+ <territory type="BO" draft="unconfirmed">Bolívia</territory>
+ <territory type="BR" draft="unconfirmed">Brasil</territory>
+ <territory type="CL" draft="unconfirmed">Chíle</territory>
+ <territory type="CO" draft="unconfirmed">Colómbia</territory>
+ <territory type="EC" draft="unconfirmed">Ecuador</territory>
+ <territory type="EU" draft="unconfirmed">Union Européa</territory>
+ <territory type="EZ" draft="unconfirmed">Eurozóna</territory>
+ <territory type="GF" draft="unconfirmed">Guyána Francésa</territory>
+ <territory type="GL" draft="unconfirmed">Groenlandia</territory>
+ <territory type="GY" draft="unconfirmed">Guyana</territory>
+ <territory type="MX" draft="unconfirmed">México</territory>
+ <territory type="PE" draft="unconfirmed">Peru</territory>
+ <territory type="PY" draft="unconfirmed">Paraguai</territory>
+ <territory type="SR" draft="unconfirmed">Surinam</territory>
+ <territory type="UN" draft="unconfirmed">Naciónes Unídas</territory>
+ <territory type="US" draft="unconfirmed">Estados Unidos</territory>
+ <territory type="US" alt="short" draft="unconfirmed">EE. UU.</territory>
+ <territory type="UY" draft="unconfirmed">Uruguay</territory>
+ <territory type="VE" draft="unconfirmed">Venezuéla</territory>
+ </territories>
+ </localeDisplayNames>
<layout>
<orientation>
<characterOrder>left-to-right</characterOrder>
@@ -21,7 +60,100 @@
<exemplarCharacters type="auxiliary">[b c d f q w x z]</exemplarCharacters>
<exemplarCharacters type="index">[A Ã {CH} E Ẽ G {G\u0303} H I Ĩ J K L M {MB} N Ñ {ND} {NG} {NT} O Õ P R {RR} S T U Ũ V Y Ỹ ʼ]</exemplarCharacters>
</characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="wide">
+ <month type="1">Jasyteĩ</month>
+ <month type="2">Jasykõi</month>
+ <month type="3">Jasyapy</month>
+ <month type="4">Jasyrundy</month>
+ <month type="5">Jasypo</month>
+ <month type="6">Jasypoteĩ</month>
+ <month type="7">Jasypokõi</month>
+ <month type="8">Jasypoapy</month>
+ <month type="9">Jasyporundy</month>
+ <month type="10">Jasypa</month>
+ <month type="11">Jasypateĩ</month>
+ <month type="12">Jasypakõi</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="wide">
+ <day type="sun">Arateĩ</day>
+ <day type="mon">Arakõi</day>
+ <day type="tue">Araapy</day>
+ <day type="wed">Ararundy</day>
+ <day type="thu">Arapo</day>
+ <day type="fri">Arapoteĩ</day>
+ <day type="sat">Arapokõi</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="year">
+ <displayName draft="unconfirmed">ary</displayName>
+ </field>
+ <field type="month">
+ <displayName draft="unconfirmed">jasy</displayName>
+ </field>
+ <field type="day">
+ <displayName draft="unconfirmed">ára</displayName>
+ </field>
+ <field type="day-short">
+ <relative type="-1" draft="unconfirmed">kuehe</relative>
+ <relative type="0" draft="unconfirmed">ko ára</relative>
+ <relative type="1" draft="unconfirmed">koʼẽrõ</relative>
+ </field>
+ <field type="day-narrow">
+ <relative type="-1" draft="unconfirmed">kuehe</relative>
+ <relative type="0" draft="unconfirmed">ko ára</relative>
+ <relative type="1" draft="unconfirmed">koʼẽrõ</relative>
+ </field>
+ <field type="hour">
+ <displayName draft="unconfirmed">arapokõindy</displayName>
+ </field>
+ <field type="minute">
+ <displayName draft="unconfirmed">aravo’i</displayName>
+ </field>
+ <field type="second">
+ <displayName draft="unconfirmed">aravo’ive</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <metazone type="Bolivia">
+ <long>
+ <standard draft="unconfirmed">Bolivia óra</standard>
+ </long>
+ </metazone>
+ <metazone type="Ecuador">
+ <long>
+ <standard draft="unconfirmed">Ecuador óra</standard>
+ </long>
+ </metazone>
+ <metazone type="Galapagos">
+ <long>
+ <standard draft="unconfirmed">Galápagos óra</standard>
+ </long>
+ </metazone>
+ <metazone type="Venezuela">
+ <long>
+ <standard draft="unconfirmed">Venezuela óra</standard>
+ </long>
+ </metazone>
+ </timeZoneNames>
+ </dates>
<numbers>
+ <symbols numberSystem="latn">
+ <decimal draft="unconfirmed">,</decimal>
+ <group draft="unconfirmed">.</group>
+ </symbols>
<currencies>
<currency type="PYG">
<symbol>₲</symbol>
diff --git a/seed/main/gn_PY.xml b/seed/main/gn_PY.xml
index a56b9a3..ed90d7b 100644
--- a/seed/main/gn_PY.xml
+++ b/seed/main/gn_PY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ha_Arab.xml b/seed/main/ha_Arab.xml
index 05b2e2d..8530e78 100644
--- a/seed/main/ha_Arab.xml
+++ b/seed/main/ha_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ha_Arab_NG.xml b/seed/main/ha_Arab_NG.xml
index d339531..7c1875e 100644
--- a/seed/main/ha_Arab_NG.xml
+++ b/seed/main/ha_Arab_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ha_Arab_SD.xml b/seed/main/ha_Arab_SD.xml
index f8ae833..0181bd1 100644
--- a/seed/main/ha_Arab_SD.xml
+++ b/seed/main/ha_Arab_SD.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/hi_Latn.xml b/seed/main/hi_Latn.xml
new file mode 100644
index 0000000..266c4ab
--- /dev/null
+++ b/seed/main/hi_Latn.xml
@@ -0,0 +1,2892 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+
+the U.S. and other countries. CLDR data files are interpreted according to
+the LDML specification (http://unicode.org/reports/tr35/) Warnings: All cp
+values have U+FE0F characters removed. See /annotationsDerived/ for derived
+annotations.
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="hi"/>
+ <script type="Latn"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="en">English</language>
+ <language type="hi">Hindi</language>
+ </languages>
+ <scripts>
+ <script type="Arab">Arabi</script>
+ <script type="Aran">Nastaliq</script>
+ <script type="Deva">Devanagari</script>
+ <script type="Latn">Latin</script>
+ </scripts>
+ <territories>
+ <territory type="IN">Bhaarat</territory>
+ </territories>
+ <measurementSystemNames>
+ <measurementSystemName type="metric">Metric</measurementSystemName>
+ <measurementSystemName type="UK">U.K.</measurementSystemName>
+ <measurementSystemName type="US">U.S.</measurementSystemName>
+ </measurementSystemNames>
+ <codePatterns>
+ <codePattern type="language">Bhasha: {0}</codePattern>
+ <codePattern type="script">Lipi: {0}</codePattern>
+ <codePattern type="territory">Kshetra: {0}</codePattern>
+ </codePatterns>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters>[a b c d e f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary" draft="contributed">[ā ḍ ĕ ē ḥ ī ḷ {l\u0325} ṁ {m\u0310} ñ ṅ ṇ ŏ ō ṛ {r\u0325} {r\u0325\u0304} ś ṣ ṭ ū]</exemplarCharacters>
+ <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+ <exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="provisional">[\- ‐ ‑ – — , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \} @ * / \& # ′ ″]</exemplarCharacters>
+ </characters>
+ <delimiters>
+ <quotationStart>“</quotationStart>
+ <quotationEnd>”</quotationEnd>
+ <alternateQuotationStart>‘</alternateQuotationStart>
+ <alternateQuotationEnd>’</alternateQuotationEnd>
+ </delimiters>
+ <dates>
+ <calendars>
+ <calendar type="buddhist">
+ <eras>
+ <eraAbbr>
+ <era type="0">BE</era>
+ </eraAbbr>
+ </eras>
+ </calendar>
+ <calendar type="chinese">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM r(U)</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM r(U)</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM r</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/r</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <availableFormats>
+ <dateFormatItem id="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="d">d</dateFormatItem>
+ <dateFormatItem id="E">ccc</dateFormatItem>
+ <dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="Ed">E d</dateFormatItem>
+ <dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+ <dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+ <dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="Gy">r(U)</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM r(U)</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM r</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM r(U)</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">LL</dateFormatItem>
+ <dateFormatItem id="Md">dd/MM</dateFormatItem>
+ <dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
+ <dateFormatItem id="MMM">LLL</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="UM">M/U</dateFormatItem>
+ <dateFormatItem id="UMd">dd/MM/U</dateFormatItem>
+ <dateFormatItem id="UMMM">MMM U</dateFormatItem>
+ <dateFormatItem id="UMMMd">d MMM U</dateFormatItem>
+ <dateFormatItem id="y">r(U)</dateFormatItem>
+ <dateFormatItem id="yMd">dd/MM/r</dateFormatItem>
+ <dateFormatItem id="yyyy">r(U)</dateFormatItem>
+ <dateFormatItem id="yyyyM">MM/r</dateFormatItem>
+ <dateFormatItem id="yyyyMd">dd/MM/r</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">E, dd/MM/r</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">MMM r(U)</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">d MMM r</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">E, d MMM r(U)</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">MMMM r(U)</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">QQQ r(U)</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">QQQQ r(U)</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">h B – h B</greatestDifference>
+ <greatestDifference id="h">h – h B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+ <greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+ <greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+ </intervalFormatItem>
+ <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">M – M</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
+ <greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">E dd/MM – E dd/MM</greatestDifference>
+ <greatestDifference id="M">E dd/MM – E dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">MMM – MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">d – d MMM</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">E d – E d MMM</greatestDifference>
+ <greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">U – U</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">MM/y – MM/y</greatestDifference>
+ <greatestDifference id="y">MM/y – MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="M">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">MMM – MMM U</greatestDifference>
+ <greatestDifference id="y">MMM U – MMM U</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">d – d MMM U</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM U</greatestDifference>
+ <greatestDifference id="y">d MMM U – d MMM U</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">E, d – E, d MMM U</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM U</greatestDifference>
+ <greatestDifference id="y">E, d MMM U – E, d MMM U</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">MMMM – MMMM U</greatestDifference>
+ <greatestDifference id="y">MMMM U – MMMM U</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="generic">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>d MMM, y G</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>d/M/y GGGGG</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <dateTimeFormats>
+ <availableFormats>
+ <dateFormatItem id="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm.ss B</dateFormatItem>
+ <dateFormatItem id="d">d</dateFormatItem>
+ <dateFormatItem id="E">ccc</dateFormatItem>
+ <dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="Ed">E d</dateFormatItem>
+ <dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+ <dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+ <dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="Gy">y G</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
+ <dateFormatItem id="h">h a</dateFormatItem>
+ <dateFormatItem id="H">HH</dateFormatItem>
+ <dateFormatItem id="hm">h:mm a</dateFormatItem>
+ <dateFormatItem id="Hm">HH:mm</dateFormatItem>
+ <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="M">LL</dateFormatItem>
+ <dateFormatItem id="Md">d/M</dateFormatItem>
+ <dateFormatItem id="MEd">E, d/M</dateFormatItem>
+ <dateFormatItem id="MMM">LLL</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="y">y G</dateFormatItem>
+ <dateFormatItem id="yyyy">y G</dateFormatItem>
+ <dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+ <dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
+ <dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
+ <dateFormatItem id="yyyyMMM">MMM, y G</dateFormatItem>
+ <dateFormatItem id="yyyyMMMd">d MMM, y G</dateFormatItem>
+ <dateFormatItem id="yyyyMMMEd">E, d MMM, y G</dateFormatItem>
+ <dateFormatItem id="yyyyMMMM">MMMM, y G</dateFormatItem>
+ <dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+ <dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">h B – h B</greatestDifference>
+ <greatestDifference id="h">h – h B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+ <greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+ <greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">d–d</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">y G – y G</greatestDifference>
+ <greatestDifference id="y">y–y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+ <greatestDifference id="M">MMM – MMM y G</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">d–d MMM y G</greatestDifference>
+ <greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y G</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">M–M</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">d/M – d/M</greatestDifference>
+ <greatestDifference id="M">d/M – d/M</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+ <greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">MMM – MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">d–d MMM</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">y–y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">MMM – MMM y G</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">d–d MMM y G</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+ <greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">Jan</month>
+ <month type="2">Feb</month>
+ <month type="3">Mar</month>
+ <month type="4">Apr</month>
+ <month type="5">May</month>
+ <month type="6">Jun</month>
+ <month type="7">Jul</month>
+ <month type="8">Aug</month>
+ <month type="9">Sep</month>
+ <month type="10">Oct</month>
+ <month type="11">Nov</month>
+ <month type="12">Dec</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">January</month>
+ <month type="2">February</month>
+ <month type="3">March</month>
+ <month type="4">April</month>
+ <month type="5">May</month>
+ <month type="6">June</month>
+ <month type="7">July</month>
+ <month type="8">August</month>
+ <month type="9">September</month>
+ <month type="10">October</month>
+ <month type="11">November</month>
+ <month type="12">December</month>
+ </monthWidth>
+ </monthContext>
+ <monthContext type="stand-alone">
+ <monthWidth type="narrow">
+ <month type="1">J</month>
+ <month type="2">F</month>
+ <month type="3">M</month>
+ <month type="4">A</month>
+ <month type="5">M</month>
+ <month type="6">J</month>
+ <month type="7">J</month>
+ <month type="8">A</month>
+ <month type="9">S</month>
+ <month type="10">O</month>
+ <month type="11">N</month>
+ <month type="12">D</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
+ <dayWidth type="abbreviated">
+ <day type="sun">ravi</day>
+ <day type="mon">som</day>
+ <day type="tue">mangal</day>
+ <day type="wed">budh</day>
+ <day type="thu">guru</day>
+ <day type="fri">shukra</day>
+ <day type="sat">shani</day>
+ </dayWidth>
+ <dayWidth type="wide">
+ <day type="sun">ravivaar</day>
+ <day type="mon">somvaar</day>
+ <day type="tue">mangalvaar</day>
+ <day type="wed">budhvaar</day>
+ <day type="thu">guruvaar</day>
+ <day type="fri">shukravaar</day>
+ <day type="sat">shanivaar</day>
+ </dayWidth>
+ </dayContext>
+ <dayContext type="stand-alone">
+ <dayWidth type="narrow">
+ <day type="sun">ra</day>
+ <day type="mon">so</day>
+ <day type="tue">ma</day>
+ <day type="wed">bu</day>
+ <day type="thu">gu</day>
+ <day type="fri">su</day>
+ <day type="sat">sa</day>
+ </dayWidth>
+ </dayContext>
+ </days>
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="abbreviated">
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="narrow">
+ <dayPeriod type="am">a</dayPeriod>
+ <dayPeriod type="pm">p</dayPeriod>
+ </dayPeriodWidth>
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="midnight">aadhi raat</dayPeriod>
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="noon">noon</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ <dayPeriod type="morning1">subah</dayPeriod>
+ <dayPeriod type="afternoon1">dopahar</dayPeriod>
+ <dayPeriod type="evening1">shaam</dayPeriod>
+ <dayPeriod type="night1">raat</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ <dayPeriodContext type="stand-alone">
+ <dayPeriodWidth type="wide">
+ <dayPeriod type="midnight">aadhi raat</dayPeriod>
+ <dayPeriod type="am">AM</dayPeriod>
+ <dayPeriod type="noon">noon</dayPeriod>
+ <dayPeriod type="pm">PM</dayPeriod>
+ <dayPeriod type="morning1">subah</dayPeriod>
+ <dayPeriod type="afternoon1">dopahar</dayPeriod>
+ <dayPeriod type="evening1">shaam</dayPeriod>
+ <dayPeriod type="night1">raat</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+ <eras>
+ <eraAbbr>
+ <era type="0">BC</era>
+ <era type="0" alt="variant">BCE</era>
+ <era type="1">AD</era>
+ <era type="1" alt="variant">CE</era>
+ </eraAbbr>
+ <eraNarrow>
+ <era type="0">B</era>
+ <era type="1">A</era>
+ </eraNarrow>
+ </eras>
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern>EEEE, d MMMM, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern>d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern>dd-MMM-y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern>dd/MM/y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </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="Bh">h B</dateFormatItem>
+ <dateFormatItem id="Bhm">h:mm B</dateFormatItem>
+ <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="d">d</dateFormatItem>
+ <dateFormatItem id="E">ccc</dateFormatItem>
+ <dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
+ <dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
+ <dateFormatItem id="Ed">E d</dateFormatItem>
+ <dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+ <dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+ <dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="Gy">y G</dateFormatItem>
+ <dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+ <dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+ <dateFormatItem id="h">h a</dateFormatItem>
+ <dateFormatItem id="H">HH</dateFormatItem>
+ <dateFormatItem id="hm">h:mm a</dateFormatItem>
+ <dateFormatItem id="Hm">HH:mm</dateFormatItem>
+ <dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+ <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+ <dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+ <dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+ <dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+ <dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+ <dateFormatItem id="M">L</dateFormatItem>
+ <dateFormatItem id="Md">dd/MM</dateFormatItem>
+ <dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
+ <dateFormatItem id="MMM">LLL</dateFormatItem>
+ <dateFormatItem id="MMMd">d MMM</dateFormatItem>
+ <dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+ <dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+ <dateFormatItem id="ms">mm:ss</dateFormatItem>
+ <dateFormatItem id="y">y</dateFormatItem>
+ <dateFormatItem id="yM">MM/y</dateFormatItem>
+ <dateFormatItem id="yMd">d/M/y</dateFormatItem>
+ <dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+ <dateFormatItem id="yMMM">MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+ <dateFormatItem id="yMMMEd">E, d MMM, y</dateFormatItem>
+ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+ <dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+ <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+ </availableFormats>
+ <intervalFormats>
+ <intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+ <intervalFormatItem id="Bh">
+ <greatestDifference id="B">h B – h B</greatestDifference>
+ <greatestDifference id="h">h – h B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Bhm">
+ <greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+ <greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+ <greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="d">
+ <greatestDifference id="d">d–d</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Gy">
+ <greatestDifference id="G">y G – y G</greatestDifference>
+ <greatestDifference id="y">y – y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyM">
+ <greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
+ <greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+ <greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMd">
+ <greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="G">dd/MM/y GGGGG – dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="M">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="y">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMEd">
+ <greatestDifference id="d">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="G">E, dd/MM/y GGGGG – E, dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="M">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+ <greatestDifference id="y">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMM">
+ <greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+ <greatestDifference id="M">MMM – MMM y G</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMd">
+ <greatestDifference id="d">d – d MMM y G</greatestDifference>
+ <greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="GyMMMEd">
+ <greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y G</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">M–M</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="Md">
+ <greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
+ <greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MEd">
+ <greatestDifference id="d">E, dd/MM – E, dd/MM</greatestDifference>
+ <greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMM">
+ <greatestDifference id="M">MMM – MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMd">
+ <greatestDifference id="d">d–d MMM</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="MMMEd">
+ <greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="y">
+ <greatestDifference id="y">y–y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yM">
+ <greatestDifference id="M">MM/y – MM/y</greatestDifference>
+ <greatestDifference id="y">MM/y – MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMd">
+ <greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
+ <greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMEd">
+ <greatestDifference id="d">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="M">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ <greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMM">
+ <greatestDifference id="M">MMM – MMM y</greatestDifference>
+ <greatestDifference id="y">MMM y – MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMd">
+ <greatestDifference id="d">d–d MMM y</greatestDifference>
+ <greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+ <greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMEd">
+ <greatestDifference id="d">E, d – E, d MMM y</greatestDifference>
+ <greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+ <greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+ </intervalFormatItem>
+ <intervalFormatItem id="yMMMM">
+ <greatestDifference id="M">MMMM – MMMM y</greatestDifference>
+ <greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+ </intervalFormatItem>
+ </intervalFormats>
+ </dateTimeFormats>
+ </calendar>
+ <calendar type="indian">
+ <eras>
+ <eraAbbr>
+ <era type="0">Saka</era>
+ </eraAbbr>
+ </eras>
+ </calendar>
+ <calendar type="islamic">
+ <months>
+ <monthContext type="format">
+ <monthWidth type="abbreviated">
+ <month type="1">Muh</month>
+ <month type="2">Saf</month>
+ <month type="3">Rabi 1</month>
+ <month type="4">Rabi 2</month>
+ <month type="5">Jum 1</month>
+ <month type="6">Jum 2</month>
+ <month type="7">Rajab</month>
+ <month type="8">Shab</month>
+ <month type="9">Ram</month>
+ <month type="10">Shaw</month>
+ <month type="11">Zu Q</month>
+ <month type="12">Zu H</month>
+ </monthWidth>
+ <monthWidth type="wide">
+ <month type="1">Muharram</month>
+ <month type="2">Safar</month>
+ <month type="3">Rabi al-Awwal</month>
+ <month type="4">Rabi as-Saani</month>
+ <month type="5">Jumaada al-Awwal</month>
+ <month type="6">Jumaada as-Saani</month>
+ <month type="7">Rajab</month>
+ <month type="8">Shaabaan</month>
+ <month type="9">Ramzaan</month>
+ <month type="10">Shawwaal</month>
+ <month type="11">Zu’l-Qaada</month>
+ <month type="12">Zu’l-Hijja</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <eras>
+ <eraNames>
+ <era type="0">Hijri</era>
+ </eraNames>
+ <eraAbbr>
+ <era type="0">Hijri</era>
+ </eraAbbr>
+ </eras>
+ </calendar>
+ </calendars>
+ <fields>
+ <field type="year">
+ <displayName>saal</displayName>
+ <relative type="-1">pichhla saal</relative>
+ <relative type="0">is saal</relative>
+ <relative type="1">agla saal</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} saal mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} saal mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} saal pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} saal pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="month">
+ <displayName>mahina</displayName>
+ <relative type="-1">pichhla mahina</relative>
+ <relative type="0">is mahine</relative>
+ <relative type="1">agla mahina</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} mahine mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mahine mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} mahine pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} mahine pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="week">
+ <displayName>hafta</displayName>
+ <relative type="-1">pichhla hafta</relative>
+ <relative type="0">is hafte</relative>
+ <relative type="1">agla hafta</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} hafte mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} hafte mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} hafte pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} hafte pehle</relativeTimePattern>
+ </relativeTime>
+ <relativePeriod>{0} ke hafta</relativePeriod>
+ </field>
+ <field type="day">
+ <displayName>din</displayName>
+ <relative type="-2">parson</relative>
+ <relative type="-1">kal</relative>
+ <relative type="0">aaj</relative>
+ <relative type="1">aane wala kal</relative>
+ <relative type="2">aane wala parson</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} din mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} din mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} din pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} din pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="hour">
+ <displayName>ghanta</displayName>
+ <relative type="0">yeh ghanta</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} ghante mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} ghante mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} ghante pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} ghante pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="minute">
+ <displayName>minute</displayName>
+ <relative type="0">yeh minute</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} minute mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} minute mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} minute pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} minute pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="second">
+ <displayName>second</displayName>
+ <relative type="0">abhi</relative>
+ <relativeTime type="future">
+ <relativeTimePattern count="one">{0} second mein</relativeTimePattern>
+ <relativeTimePattern count="other">{0} second mein</relativeTimePattern>
+ </relativeTime>
+ <relativeTime type="past">
+ <relativeTimePattern count="one">{0} second pehle</relativeTimePattern>
+ <relativeTimePattern count="other">{0} second pehle</relativeTimePattern>
+ </relativeTime>
+ </field>
+ <field type="zone">
+ <displayName>time zone</displayName>
+ </field>
+ </fields>
+ <timeZoneNames>
+ <hourFormat>+HH:mm;-HH:mm</hourFormat>
+ <gmtFormat>GMT{0}</gmtFormat>
+ <fallbackFormat>{1} ({0})</fallbackFormat>
+ <metazone type="India">
+ <short>
+ <standard>IST</standard>
+ </short>
+ </metazone>
+ </timeZoneNames>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <minimumGroupingDigits>1</minimumGroupingDigits>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+ <list>;</list>
+ <percentSign>%</percentSign>
+ <plusSign>+</plusSign>
+ <minusSign>-</minusSign>
+ <exponential>E</exponential>
+ <superscriptingExponent>×</superscriptingExponent>
+ <perMille>‰</perMille>
+ <infinity>∞</infinity>
+ <nan>NaN</nan>
+ </symbols>
+ <decimalFormats numberSystem="latn">
+ <decimalFormatLength>
+ <decimalFormat>
+ <pattern>#,##,##0.###</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ <decimalFormatLength type="long">
+ <decimalFormat>
+ <pattern type="1000" count="one">0 hazaar</pattern>
+ <pattern type="1000" count="other">0 hazaar</pattern>
+ <pattern type="10000" count="one">00 hazaar</pattern>
+ <pattern type="10000" count="other">00 hazaar</pattern>
+ <pattern type="100000" count="one">0 laakh</pattern>
+ <pattern type="100000" count="other">0 laakh</pattern>
+ <pattern type="1000000" count="one">00 laakh</pattern>
+ <pattern type="1000000" count="other">00 laakh</pattern>
+ <pattern type="10000000" count="one">0 karod</pattern>
+ <pattern type="10000000" count="other">0 karod</pattern>
+ <pattern type="100000000" count="one">00 karod</pattern>
+ <pattern type="100000000" count="other">00 karod</pattern>
+ <pattern type="1000000000" count="one">0 arab</pattern>
+ <pattern type="1000000000" count="other">0 arab</pattern>
+ <pattern type="10000000000" count="one">00 arab</pattern>
+ <pattern type="10000000000" count="other">00 arab</pattern>
+ <pattern type="100000000000" count="one">0 kharab</pattern>
+ <pattern type="100000000000" count="other">0 kharab</pattern>
+ <pattern type="1000000000000" count="one">00 kharab</pattern>
+ <pattern type="1000000000000" count="other">00 kharab</pattern>
+ <pattern type="10000000000000" count="one">000 kharab</pattern>
+ <pattern type="10000000000000" count="other">000 kharab</pattern>
+ <pattern type="100000000000000" count="one">0000 kharab</pattern>
+ <pattern type="100000000000000" count="other">0000 kharab</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ <decimalFormatLength type="short">
+ <decimalFormat>
+ <pattern type="1000" count="one">0 hazaar</pattern>
+ <pattern type="1000" count="other">0 hazaar</pattern>
+ <pattern type="10000" count="one">00 hazaar</pattern>
+ <pattern type="10000" count="other">00 hazaar</pattern>
+ <pattern type="100000" count="one">0 laakh</pattern>
+ <pattern type="100000" count="other">0 laakh</pattern>
+ <pattern type="1000000" count="one">00 laakh</pattern>
+ <pattern type="1000000" count="other">00 laakh</pattern>
+ <pattern type="10000000" count="one">0 ka'.'</pattern>
+ <pattern type="10000000" count="other">0 ka'.'</pattern>
+ <pattern type="100000000" count="one">00 ka'.'</pattern>
+ <pattern type="100000000" count="other">00 ka'.'</pattern>
+ <pattern type="1000000000" count="one">0 a'.'</pattern>
+ <pattern type="1000000000" count="other">0 a'.'</pattern>
+ <pattern type="10000000000" count="one">00 a'.'</pattern>
+ <pattern type="10000000000" count="other">00 a'.'</pattern>
+ <pattern type="100000000000" count="one">0 kha'.'</pattern>
+ <pattern type="100000000000" count="other">0 kha'.'</pattern>
+ <pattern type="1000000000000" count="one">00 kha'.'</pattern>
+ <pattern type="1000000000000" count="other">00 kha'.'</pattern>
+ <pattern type="10000000000000" count="one">000 kha'.'</pattern>
+ <pattern type="10000000000000" count="other">000 kha'.'</pattern>
+ <pattern type="100000000000000" count="one">0000 kha'.'</pattern>
+ <pattern type="100000000000000" count="other">0000 kha'.'</pattern>
+ </decimalFormat>
+ </decimalFormatLength>
+ </decimalFormats>
+ <scientificFormats numberSystem="latn">
+ <scientificFormatLength>
+ <scientificFormat>
+ <pattern>[#E0]</pattern>
+ </scientificFormat>
+ </scientificFormatLength>
+ </scientificFormats>
+ <percentFormats numberSystem="latn">
+ <percentFormatLength>
+ <percentFormat>
+ <pattern>#,##,##0%</pattern>
+ </percentFormat>
+ </percentFormatLength>
+ </percentFormats>
+ <currencyFormats numberSystem="latn">
+ <currencyFormatLength>
+ <currencyFormat type="standard">
+ <pattern>¤#,##,##0.00</pattern>
+ </currencyFormat>
+ <currencyFormat type="accounting">
+ <pattern>¤#,##,##0.00</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <currencyFormatLength type="short">
+ <currencyFormat type="standard">
+ <pattern type="1000" count="one">¤0 hazaar</pattern>
+ <pattern type="1000" count="other">¤0 hazaar</pattern>
+ <pattern type="10000" count="one">¤00 hazaar</pattern>
+ <pattern type="10000" count="other">¤00 hazaar</pattern>
+ <pattern type="100000" count="one">¤0 laakh</pattern>
+ <pattern type="100000" count="other">¤0 laakh</pattern>
+ <pattern type="1000000" count="one">¤00 laakh</pattern>
+ <pattern type="1000000" count="other">¤00 laakh</pattern>
+ <pattern type="10000000" count="one">¤0 ka'.'</pattern>
+ <pattern type="10000000" count="other">¤0 ka'.'</pattern>
+ <pattern type="100000000" count="one">¤00 ka'.'</pattern>
+ <pattern type="100000000" count="other">¤00 ka'.'</pattern>
+ <pattern type="1000000000" count="one">¤0 a'.'</pattern>
+ <pattern type="1000000000" count="other">¤0 a'.'</pattern>
+ <pattern type="10000000000" count="one">¤00 a'.'</pattern>
+ <pattern type="10000000000" count="other">¤00 a'.'</pattern>
+ <pattern type="100000000000" count="one">¤0 kha'.'</pattern>
+ <pattern type="100000000000" count="other">¤0 kha'.'</pattern>
+ <pattern type="1000000000000" count="one">¤00 kha'.'</pattern>
+ <pattern type="1000000000000" count="other">¤00 kha'.'</pattern>
+ <pattern type="10000000000000" count="one">¤000 kha'.'</pattern>
+ <pattern type="10000000000000" count="other">¤000 kha'.'</pattern>
+ <pattern type="100000000000000" count="one">¤0000 kha'.'</pattern>
+ <pattern type="100000000000000" count="other">¤0000 kha'.'</pattern>
+ </currencyFormat>
+ </currencyFormatLength>
+ <unitPattern count="one">{0} {1}</unitPattern>
+ <unitPattern count="other">{0} {1}</unitPattern>
+ </currencyFormats>
+ </numbers>
+ <units>
+ <unitLength type="short">
+ <compoundUnit type="per">
+ <compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+ </compoundUnit>
+ <unit type="acceleration-g-force">
+ <displayName>g-force</displayName>
+ <unitPattern count="one">{0} G</unitPattern>
+ <unitPattern count="other">{0} G</unitPattern>
+ </unit>
+ <unit type="acceleration-meter-per-square-second">
+ <displayName>metres/sec²</displayName>
+ <unitPattern count="one">{0} m/s²</unitPattern>
+ <unitPattern count="other">{0} m/s²</unitPattern>
+ </unit>
+ <unit type="angle-revolution">
+ <displayName>rev</displayName>
+ <unitPattern count="one">{0} rev</unitPattern>
+ <unitPattern count="other">{0} rev</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName>radians</displayName>
+ <unitPattern count="one">{0} rad</unitPattern>
+ <unitPattern count="other">{0} rad</unitPattern>
+ </unit>
+ <unit type="angle-degree">
+ <displayName>degrees</displayName>
+ <unitPattern count="one">{0} deg</unitPattern>
+ <unitPattern count="other">{0} deg</unitPattern>
+ </unit>
+ <unit type="angle-arc-minute">
+ <displayName>arcmins</displayName>
+ <unitPattern count="one">{0} arcmin</unitPattern>
+ <unitPattern count="other">{0} arcmins</unitPattern>
+ </unit>
+ <unit type="angle-arc-second">
+ <displayName>arcsecs</displayName>
+ <unitPattern count="one">{0} arcsec</unitPattern>
+ <unitPattern count="other">{0} arcsecs</unitPattern>
+ </unit>
+ <unit type="area-square-kilometer">
+ <displayName>km²</displayName>
+ <unitPattern count="one">{0} km²</unitPattern>
+ <unitPattern count="other">{0} km²</unitPattern>
+ <perUnitPattern>{0}/km²</perUnitPattern>
+ </unit>
+ <unit type="area-hectare">
+ <displayName>hectares</displayName>
+ <unitPattern count="one">{0} ha</unitPattern>
+ <unitPattern count="other">{0} ha</unitPattern>
+ </unit>
+ <unit type="area-square-meter">
+ <displayName>metres²</displayName>
+ <unitPattern count="one">{0} m²</unitPattern>
+ <unitPattern count="other">{0} m²</unitPattern>
+ <perUnitPattern>{0}/m²</perUnitPattern>
+ </unit>
+ <unit type="area-square-centimeter">
+ <displayName>cm²</displayName>
+ <unitPattern count="one">{0} cm²</unitPattern>
+ <unitPattern count="other">{0} cm²</unitPattern>
+ <perUnitPattern>{0}/cm²</perUnitPattern>
+ </unit>
+ <unit type="area-square-mile">
+ <displayName>sq miles</displayName>
+ <unitPattern count="one">{0} sq mi</unitPattern>
+ <unitPattern count="other">{0} sq mi</unitPattern>
+ <perUnitPattern>{0}/mi²</perUnitPattern>
+ </unit>
+ <unit type="area-acre">
+ <displayName>acres</displayName>
+ <unitPattern count="one">{0} ac</unitPattern>
+ <unitPattern count="other">{0} ac</unitPattern>
+ </unit>
+ <unit type="area-square-yard">
+ <displayName>yards²</displayName>
+ <unitPattern count="one">{0} yd²</unitPattern>
+ <unitPattern count="other">{0} yd²</unitPattern>
+ </unit>
+ <unit type="area-square-foot">
+ <displayName>sq feet</displayName>
+ <unitPattern count="one">{0} sq ft</unitPattern>
+ <unitPattern count="other">{0} sq ft</unitPattern>
+ </unit>
+ <unit type="area-square-inch">
+ <displayName>inches²</displayName>
+ <unitPattern count="one">{0} in²</unitPattern>
+ <unitPattern count="other">{0} in²</unitPattern>
+ <perUnitPattern>{0}/in²</perUnitPattern>
+ </unit>
+ <unit type="area-dunam">
+ <displayName>dunams</displayName>
+ <unitPattern count="one">{0} dunam</unitPattern>
+ <unitPattern count="other">{0} dunam</unitPattern>
+ </unit>
+ <unit type="concentr-karat">
+ <displayName>carats</displayName>
+ <unitPattern count="one">{0} ct</unitPattern>
+ <unitPattern count="other">{0} ct</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName>mg/dl</displayName>
+ <unitPattern count="one">{0} mg/dl</unitPattern>
+ <unitPattern count="other">{0} mg/dl</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName>millimol/litre</displayName>
+ <unitPattern count="one">{0} mmol/l</unitPattern>
+ <unitPattern count="other">{0} mmol/l</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName>parts/million</displayName>
+ <unitPattern count="one">{0} ppm</unitPattern>
+ <unitPattern count="other">{0} ppm</unitPattern>
+ </unit>
+ <unit type="concentr-percent">
+ <displayName>per cent</displayName>
+ <unitPattern count="one">{0}%</unitPattern>
+ <unitPattern count="other">{0}%</unitPattern>
+ </unit>
+ <unit type="concentr-permille">
+ <displayName>per mille</displayName>
+ <unitPattern count="one">{0}‰</unitPattern>
+ <unitPattern count="other">{0}‰</unitPattern>
+ </unit>
+ <unit type="concentr-permyriad">
+ <displayName>permyriad</displayName>
+ <unitPattern count="one">{0}‱</unitPattern>
+ <unitPattern count="other">{0}‱</unitPattern>
+ </unit>
+ <unit type="concentr-mole">
+ <displayName>mole</displayName>
+ <unitPattern count="one">{0} mol</unitPattern>
+ <unitPattern count="other">{0} mol</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-kilometer">
+ <displayName>litres/km</displayName>
+ <unitPattern count="one">{0} l/km</unitPattern>
+ <unitPattern count="other">{0} l/km</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>l/100 km</displayName>
+ <unitPattern count="one">{0} l/100 km</unitPattern>
+ <unitPattern count="other">{0} l/100 km</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName>miles/gal US</displayName>
+ <unitPattern count="one">{0} mpg US</unitPattern>
+ <unitPattern count="other">{0} mpg US</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName>miles/gal</displayName>
+ <unitPattern count="one">{0} mpg</unitPattern>
+ <unitPattern count="other">{0} mpg</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName>PByte</displayName>
+ <unitPattern count="one">{0} PB</unitPattern>
+ <unitPattern count="other">{0} PB</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName>TByte</displayName>
+ <unitPattern count="one">{0} TB</unitPattern>
+ <unitPattern count="other">{0} TB</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName>Tbit</displayName>
+ <unitPattern count="one">{0} Tb</unitPattern>
+ <unitPattern count="other">{0} Tb</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName>GByte</displayName>
+ <unitPattern count="one">{0} GB</unitPattern>
+ <unitPattern count="other">{0} GB</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName>Gbit</displayName>
+ <unitPattern count="one">{0} Gb</unitPattern>
+ <unitPattern count="other">{0} Gb</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName>MByte</displayName>
+ <unitPattern count="one">{0} MB</unitPattern>
+ <unitPattern count="other">{0} MB</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName>Mbit</displayName>
+ <unitPattern count="one">{0} Mb</unitPattern>
+ <unitPattern count="other">{0} Mb</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName>kByte</displayName>
+ <unitPattern count="one">{0} kB</unitPattern>
+ <unitPattern count="other">{0} kB</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName>kbit</displayName>
+ <unitPattern count="one">{0} kb</unitPattern>
+ <unitPattern count="other">{0} kb</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName>byte</displayName>
+ <unitPattern count="one">{0} byte</unitPattern>
+ <unitPattern count="other">{0} byte</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName>bit</displayName>
+ <unitPattern count="one">{0} bit</unitPattern>
+ <unitPattern count="other">{0} bit</unitPattern>
+ </unit>
+ <unit type="duration-century">
+ <displayName>c</displayName>
+ <unitPattern count="one">{0} c</unitPattern>
+ <unitPattern count="other">{0} c</unitPattern>
+ </unit>
+ <unit type="duration-decade">
+ <displayName>dec</displayName>
+ <unitPattern count="one">{0} dec</unitPattern>
+ <unitPattern count="other">{0} dec</unitPattern>
+ </unit>
+ <unit type="duration-year">
+ <displayName>years</displayName>
+ <unitPattern count="one">{0} yr</unitPattern>
+ <unitPattern count="other">{0} yrs</unitPattern>
+ <perUnitPattern>{0}/y</perUnitPattern>
+ </unit>
+ <unit type="duration-month">
+ <displayName>months</displayName>
+ <unitPattern count="one">{0} mth</unitPattern>
+ <unitPattern count="other">{0} mths</unitPattern>
+ <perUnitPattern>{0}/m</perUnitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName>weeks</displayName>
+ <unitPattern count="one">{0} wk</unitPattern>
+ <unitPattern count="other">{0} wks</unitPattern>
+ <perUnitPattern>{0}/w</perUnitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName>days</displayName>
+ <unitPattern count="one">{0} day</unitPattern>
+ <unitPattern count="other">{0} days</unitPattern>
+ <perUnitPattern>{0}/d</perUnitPattern>
+ </unit>
+ <unit type="duration-hour">
+ <displayName>hours</displayName>
+ <unitPattern count="one">{0} hr</unitPattern>
+ <unitPattern count="other">{0} hrs</unitPattern>
+ <perUnitPattern>{0}/h</perUnitPattern>
+ </unit>
+ <unit type="duration-minute">
+ <displayName>mins</displayName>
+ <unitPattern count="one">{0} min</unitPattern>
+ <unitPattern count="other">{0} mins</unitPattern>
+ <perUnitPattern>{0}/min</perUnitPattern>
+ </unit>
+ <unit type="duration-second">
+ <displayName>secs</displayName>
+ <unitPattern count="one">{0} sec</unitPattern>
+ <unitPattern count="other">{0} secs</unitPattern>
+ <perUnitPattern>{0}/s</perUnitPattern>
+ </unit>
+ <unit type="duration-millisecond">
+ <displayName>millisecs</displayName>
+ <unitPattern count="one">{0} ms</unitPattern>
+ <unitPattern count="other">{0} ms</unitPattern>
+ </unit>
+ <unit type="duration-microsecond">
+ <displayName>μsecs</displayName>
+ <unitPattern count="one">{0} μs</unitPattern>
+ <unitPattern count="other">{0} μs</unitPattern>
+ </unit>
+ <unit type="duration-nanosecond">
+ <displayName>nanosecs</displayName>
+ <unitPattern count="one">{0} ns</unitPattern>
+ <unitPattern count="other">{0} ns</unitPattern>
+ </unit>
+ <unit type="electric-ampere">
+ <displayName>amps</displayName>
+ <unitPattern count="one">{0} A</unitPattern>
+ <unitPattern count="other">{0} A</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName>milliamps</displayName>
+ <unitPattern count="one">{0} mA</unitPattern>
+ <unitPattern count="other">{0} mA</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName>ohms</displayName>
+ <unitPattern count="one">{0} Ω</unitPattern>
+ <unitPattern count="other">{0} Ω</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName>volts</displayName>
+ <unitPattern count="one">{0} V</unitPattern>
+ <unitPattern count="other">{0} V</unitPattern>
+ </unit>
+ <unit type="energy-kilocalorie">
+ <displayName>kcal</displayName>
+ <unitPattern count="one">{0} kcal</unitPattern>
+ <unitPattern count="other">{0} kcal</unitPattern>
+ </unit>
+ <unit type="energy-calorie">
+ <displayName>cal</displayName>
+ <unitPattern count="one">{0} cal</unitPattern>
+ <unitPattern count="other">{0} cal</unitPattern>
+ </unit>
+ <unit type="energy-foodcalorie">
+ <displayName>Cal</displayName>
+ <unitPattern count="one">{0} Cal</unitPattern>
+ <unitPattern count="other">{0} Cal</unitPattern>
+ </unit>
+ <unit type="energy-kilojoule">
+ <displayName>kilojoule</displayName>
+ <unitPattern count="one">{0} kJ</unitPattern>
+ <unitPattern count="other">{0} kJ</unitPattern>
+ </unit>
+ <unit type="energy-joule">
+ <displayName>joules</displayName>
+ <unitPattern count="one">{0} J</unitPattern>
+ <unitPattern count="other">{0} J</unitPattern>
+ </unit>
+ <unit type="energy-kilowatt-hour">
+ <displayName>kW-hour</displayName>
+ <unitPattern count="one">{0} kWh</unitPattern>
+ <unitPattern count="other">{0} kWh</unitPattern>
+ </unit>
+ <unit type="energy-electronvolt">
+ <displayName>electronvolt</displayName>
+ <unitPattern count="one">{0} eV</unitPattern>
+ <unitPattern count="other">{0} eV</unitPattern>
+ </unit>
+ <unit type="energy-british-thermal-unit">
+ <displayName>BTU</displayName>
+ <unitPattern count="one">{0} Btu</unitPattern>
+ <unitPattern count="other">{0} Btu</unitPattern>
+ </unit>
+ <unit type="energy-therm-us">
+ <displayName>US therm</displayName>
+ <unitPattern count="one">{0} US therm</unitPattern>
+ <unitPattern count="other">{0} US therms</unitPattern>
+ </unit>
+ <unit type="force-pound-force">
+ <displayName>pound-force</displayName>
+ <unitPattern count="one">{0} lbf</unitPattern>
+ <unitPattern count="other">{0} lbf</unitPattern>
+ </unit>
+ <unit type="force-newton">
+ <displayName>newton</displayName>
+ <unitPattern count="one">{0} N</unitPattern>
+ <unitPattern count="other">{0} N</unitPattern>
+ </unit>
+ <unit type="frequency-gigahertz">
+ <displayName>GHz</displayName>
+ <unitPattern count="one">{0} GHz</unitPattern>
+ <unitPattern count="other">{0} GHz</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName>MHz</displayName>
+ <unitPattern count="one">{0} MHz</unitPattern>
+ <unitPattern count="other">{0} MHz</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName>kHz</displayName>
+ <unitPattern count="one">{0} kHz</unitPattern>
+ <unitPattern count="other">{0} kHz</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName>Hz</displayName>
+ <unitPattern count="one">{0} Hz</unitPattern>
+ <unitPattern count="other">{0} Hz</unitPattern>
+ </unit>
+ <unit type="graphics-em">
+ <displayName>em</displayName>
+ <unitPattern count="one">{0} em</unitPattern>
+ <unitPattern count="other">{0} em</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>pixels</displayName>
+ <unitPattern count="one">{0} px</unitPattern>
+ <unitPattern count="other">{0} px</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>megapixels</displayName>
+ <unitPattern count="one">{0} MP</unitPattern>
+ <unitPattern count="other">{0} MP</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>ppcm</displayName>
+ <unitPattern count="one">{0} ppcm</unitPattern>
+ <unitPattern count="other">{0} ppcm</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>ppi</displayName>
+ <unitPattern count="one">{0} ppi</unitPattern>
+ <unitPattern count="other">{0} ppi</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>dpcm</displayName>
+ <unitPattern count="one">{0} dpcm</unitPattern>
+ <unitPattern count="other">{0} dpcm</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>dpi</displayName>
+ <unitPattern count="one">{0} dpi</unitPattern>
+ <unitPattern count="other">{0} dpi</unitPattern>
+ </unit>
+ <unit type="length-kilometer">
+ <displayName>km</displayName>
+ <unitPattern count="one">{0} km</unitPattern>
+ <unitPattern count="other">{0} km</unitPattern>
+ <perUnitPattern>{0}/km</perUnitPattern>
+ </unit>
+ <unit type="length-meter">
+ <displayName>metres</displayName>
+ <unitPattern count="one">{0} m</unitPattern>
+ <unitPattern count="other">{0} m</unitPattern>
+ <perUnitPattern>{0}/m</perUnitPattern>
+ </unit>
+ <unit type="length-decimeter">
+ <displayName>dm</displayName>
+ <unitPattern count="one">{0} dm</unitPattern>
+ <unitPattern count="other">{0} dm</unitPattern>
+ </unit>
+ <unit type="length-centimeter">
+ <displayName>cm</displayName>
+ <unitPattern count="one">{0} cm</unitPattern>
+ <unitPattern count="other">{0} cm</unitPattern>
+ <perUnitPattern>{0}/cm</perUnitPattern>
+ </unit>
+ <unit type="length-millimeter">
+ <displayName>mm</displayName>
+ <unitPattern count="one">{0} mm</unitPattern>
+ <unitPattern count="other">{0} mm</unitPattern>
+ </unit>
+ <unit type="length-micrometer">
+ <displayName>µmetres</displayName>
+ <unitPattern count="one">{0} µm</unitPattern>
+ <unitPattern count="other">{0} µm</unitPattern>
+ </unit>
+ <unit type="length-nanometer">
+ <displayName>nm</displayName>
+ <unitPattern count="one">{0} nm</unitPattern>
+ <unitPattern count="other">{0} nm</unitPattern>
+ </unit>
+ <unit type="length-picometer">
+ <displayName>pm</displayName>
+ <unitPattern count="one">{0} pm</unitPattern>
+ <unitPattern count="other">{0} pm</unitPattern>
+ </unit>
+ <unit type="length-mile">
+ <displayName>miles</displayName>
+ <unitPattern count="one">{0} mi</unitPattern>
+ <unitPattern count="other">{0} mi</unitPattern>
+ </unit>
+ <unit type="length-yard">
+ <displayName>yards</displayName>
+ <unitPattern count="one">{0} yd</unitPattern>
+ <unitPattern count="other">{0} yd</unitPattern>
+ </unit>
+ <unit type="length-foot">
+ <displayName>feet</displayName>
+ <unitPattern count="one">{0} ft</unitPattern>
+ <unitPattern count="other">{0} ft</unitPattern>
+ <perUnitPattern>{0}/ft</perUnitPattern>
+ </unit>
+ <unit type="length-inch">
+ <displayName>inches</displayName>
+ <unitPattern count="one">{0} in</unitPattern>
+ <unitPattern count="other">{0} in</unitPattern>
+ <perUnitPattern>{0}/in</perUnitPattern>
+ </unit>
+ <unit type="length-parsec">
+ <displayName>parsecs</displayName>
+ <unitPattern count="one">{0} pc</unitPattern>
+ <unitPattern count="other">{0} pc</unitPattern>
+ </unit>
+ <unit type="length-light-year">
+ <displayName>light yrs</displayName>
+ <unitPattern count="one">{0} ly</unitPattern>
+ <unitPattern count="other">{0} ly</unitPattern>
+ </unit>
+ <unit type="length-astronomical-unit">
+ <displayName>au</displayName>
+ <unitPattern count="one">{0} au</unitPattern>
+ <unitPattern count="other">{0} au</unitPattern>
+ </unit>
+ <unit type="length-furlong">
+ <displayName>furlongs</displayName>
+ <unitPattern count="one">{0} fur</unitPattern>
+ <unitPattern count="other">{0} fur</unitPattern>
+ </unit>
+ <unit type="length-fathom">
+ <displayName>fathoms</displayName>
+ <unitPattern count="one">{0} fth</unitPattern>
+ <unitPattern count="other">{0} fth</unitPattern>
+ </unit>
+ <unit type="length-nautical-mile">
+ <displayName>nmi</displayName>
+ <unitPattern count="one">{0} nmi</unitPattern>
+ <unitPattern count="other">{0} nmi</unitPattern>
+ </unit>
+ <unit type="length-mile-scandinavian">
+ <displayName>smi</displayName>
+ <unitPattern count="one">{0} smi</unitPattern>
+ <unitPattern count="other">{0} smi</unitPattern>
+ </unit>
+ <unit type="length-point">
+ <displayName>points</displayName>
+ <unitPattern count="one">{0} pt</unitPattern>
+ <unitPattern count="other">{0} pt</unitPattern>
+ </unit>
+ <unit type="length-solar-radius">
+ <displayName>solar radii</displayName>
+ <unitPattern count="one">{0} R☉</unitPattern>
+ <unitPattern count="other">{0} R☉</unitPattern>
+ </unit>
+ <unit type="light-lux">
+ <displayName>lux</displayName>
+ <unitPattern count="one">{0} lx</unitPattern>
+ <unitPattern count="other">{0} lx</unitPattern>
+ </unit>
+ <unit type="light-solar-luminosity">
+ <displayName>solar luminosities</displayName>
+ <unitPattern count="one">{0} L☉</unitPattern>
+ <unitPattern count="other">{0} L☉</unitPattern>
+ </unit>
+ <unit type="mass-metric-ton">
+ <displayName>t</displayName>
+ <unitPattern count="one">{0} t</unitPattern>
+ <unitPattern count="other">{0} t</unitPattern>
+ </unit>
+ <unit type="mass-kilogram">
+ <displayName>kg</displayName>
+ <unitPattern count="one">{0} kg</unitPattern>
+ <unitPattern count="other">{0} kg</unitPattern>
+ <perUnitPattern>{0}/kg</perUnitPattern>
+ </unit>
+ <unit type="mass-gram">
+ <displayName>grams</displayName>
+ <unitPattern count="one">{0} g</unitPattern>
+ <unitPattern count="other">{0} g</unitPattern>
+ <perUnitPattern>{0}/g</perUnitPattern>
+ </unit>
+ <unit type="mass-milligram">
+ <displayName>mg</displayName>
+ <unitPattern count="one">{0} mg</unitPattern>
+ <unitPattern count="other">{0} mg</unitPattern>
+ </unit>
+ <unit type="mass-microgram">
+ <displayName>µg</displayName>
+ <unitPattern count="one">{0} µg</unitPattern>
+ <unitPattern count="other">{0} µg</unitPattern>
+ </unit>
+ <unit type="mass-ton">
+ <displayName>tons</displayName>
+ <unitPattern count="one">{0} tn</unitPattern>
+ <unitPattern count="other">{0} tn</unitPattern>
+ </unit>
+ <unit type="mass-stone">
+ <displayName>stone</displayName>
+ <unitPattern count="one">{0} st</unitPattern>
+ <unitPattern count="other">{0} st</unitPattern>
+ </unit>
+ <unit type="mass-pound">
+ <displayName>pounds</displayName>
+ <unitPattern count="one">{0} lb</unitPattern>
+ <unitPattern count="other">{0} lb</unitPattern>
+ <perUnitPattern>{0}/lb</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce">
+ <displayName>oz</displayName>
+ <unitPattern count="one">{0} oz</unitPattern>
+ <unitPattern count="other">{0} oz</unitPattern>
+ <perUnitPattern>{0}/oz</perUnitPattern>
+ </unit>
+ <unit type="mass-ounce-troy">
+ <displayName>oz troy</displayName>
+ <unitPattern count="one">{0} oz t</unitPattern>
+ <unitPattern count="other">{0} oz t</unitPattern>
+ </unit>
+ <unit type="mass-carat">
+ <displayName>carats</displayName>
+ <unitPattern count="one">{0} CD</unitPattern>
+ <unitPattern count="other">{0} CD</unitPattern>
+ </unit>
+ <unit type="mass-dalton">
+ <displayName>daltons</displayName>
+ <unitPattern count="one">{0} Da</unitPattern>
+ <unitPattern count="other">{0} Da</unitPattern>
+ </unit>
+ <unit type="mass-earth-mass">
+ <displayName>Earth masses</displayName>
+ <unitPattern count="one">{0} M⊕</unitPattern>
+ <unitPattern count="other">{0} M⊕</unitPattern>
+ </unit>
+ <unit type="mass-solar-mass">
+ <displayName>solar masses</displayName>
+ <unitPattern count="one">{0} M☉</unitPattern>
+ <unitPattern count="other">{0} M☉</unitPattern>
+ </unit>
+ <unit type="power-gigawatt">
+ <displayName>GW</displayName>
+ <unitPattern count="one">{0} GW</unitPattern>
+ <unitPattern count="other">{0} GW</unitPattern>
+ </unit>
+ <unit type="power-megawatt">
+ <displayName>MW</displayName>
+ <unitPattern count="one">{0} MW</unitPattern>
+ <unitPattern count="other">{0} MW</unitPattern>
+ </unit>
+ <unit type="power-kilowatt">
+ <displayName>kW</displayName>
+ <unitPattern count="one">{0} kW</unitPattern>
+ <unitPattern count="other">{0} kW</unitPattern>
+ </unit>
+ <unit type="power-watt">
+ <displayName>watts</displayName>
+ <unitPattern count="one">{0} W</unitPattern>
+ <unitPattern count="other">{0} W</unitPattern>
+ </unit>
+ <unit type="power-milliwatt">
+ <displayName>mW</displayName>
+ <unitPattern count="one">{0} mW</unitPattern>
+ <unitPattern count="other">{0} mW</unitPattern>
+ </unit>
+ <unit type="power-horsepower">
+ <displayName>hp</displayName>
+ <unitPattern count="one">{0} hp</unitPattern>
+ <unitPattern count="other">{0} hp</unitPattern>
+ </unit>
+ <unit type="pressure-millimeter-ofhg">
+ <displayName>mmHg</displayName>
+ <unitPattern count="one">{0} mmHg</unitPattern>
+ <unitPattern count="other">{0} mmHg</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName>psi</displayName>
+ <unitPattern count="one">{0} psi</unitPattern>
+ <unitPattern count="other">{0} psi</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName>inHg</displayName>
+ <unitPattern count="one">{0} inHg</unitPattern>
+ <unitPattern count="other">{0} inHg</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
+ <displayName>bar</displayName>
+ <unitPattern count="one">{0} bar</unitPattern>
+ <unitPattern count="other">{0} bars</unitPattern>
+ </unit>
+ <unit type="pressure-millibar">
+ <displayName>mbar</displayName>
+ <unitPattern count="one">{0} mbar</unitPattern>
+ <unitPattern count="other">{0} mbar</unitPattern>
+ </unit>
+ <unit type="pressure-atmosphere">
+ <displayName>atm</displayName>
+ <unitPattern count="one">{0} atm</unitPattern>
+ <unitPattern count="other">{0} atm</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName>Pa</displayName>
+ <unitPattern count="one">{0} Pa</unitPattern>
+ <unitPattern count="other">{0} Pa</unitPattern>
+ </unit>
+ <unit type="pressure-hectopascal">
+ <displayName>hPa</displayName>
+ <unitPattern count="one">{0} hPa</unitPattern>
+ <unitPattern count="other">{0} hPa</unitPattern>
+ </unit>
+ <unit type="pressure-kilopascal">
+ <displayName>kPa</displayName>
+ <unitPattern count="one">{0} kPa</unitPattern>
+ <unitPattern count="other">{0} kPa</unitPattern>
+ </unit>
+ <unit type="pressure-megapascal">
+ <displayName>MPa</displayName>
+ <unitPattern count="one">{0} MPa</unitPattern>
+ <unitPattern count="other">{0} MPa</unitPattern>
+ </unit>
+ <unit type="speed-kilometer-per-hour">
+ <displayName>km/hour</displayName>
+ <unitPattern count="one" draft="contributed">{0} kph</unitPattern>
+ <unitPattern count="other" draft="contributed">{0} kph</unitPattern>
+ </unit>
+ <unit type="speed-meter-per-second">
+ <displayName>metres/sec</displayName>
+ <unitPattern count="one">{0} m/s</unitPattern>
+ <unitPattern count="other">{0} m/s</unitPattern>
+ </unit>
+ <unit type="speed-mile-per-hour">
+ <displayName>miles/hour</displayName>
+ <unitPattern count="one">{0} mph</unitPattern>
+ <unitPattern count="other">{0} mph</unitPattern>
+ </unit>
+ <unit type="speed-knot">
+ <displayName>kn</displayName>
+ <unitPattern count="one">{0} kn</unitPattern>
+ <unitPattern count="other">{0} kn</unitPattern>
+ </unit>
+ <unit type="temperature-celsius">
+ <displayName>deg. C</displayName>
+ <unitPattern count="one">{0}°C</unitPattern>
+ <unitPattern count="other">{0}°C</unitPattern>
+ </unit>
+ <unit type="temperature-fahrenheit">
+ <displayName>deg. F</displayName>
+ <unitPattern count="one">{0}°F</unitPattern>
+ <unitPattern count="other">{0}°F</unitPattern>
+ </unit>
+ <unit type="temperature-kelvin">
+ <displayName>K</displayName>
+ <unitPattern count="one">{0} K</unitPattern>
+ <unitPattern count="other">{0} K</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
+ <displayName>lbf⋅ft</displayName>
+ <unitPattern count="one">{0} lbf⋅ft</unitPattern>
+ <unitPattern count="other">{0} lbf⋅ft</unitPattern>
+ </unit>
+ <unit type="torque-newton-meter">
+ <displayName>N⋅m</displayName>
+ <unitPattern count="one">{0} N⋅m</unitPattern>
+ <unitPattern count="other">{0} N⋅m</unitPattern>
+ </unit>
+ <unit type="volume-cubic-kilometer">
+ <displayName>km³</displayName>
+ <unitPattern count="one">{0} km³</unitPattern>
+ <unitPattern count="other">{0} km³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-meter">
+ <displayName>m³</displayName>
+ <unitPattern count="one">{0} m³</unitPattern>
+ <unitPattern count="other">{0} m³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-centimeter">
+ <displayName>cm³</displayName>
+ <unitPattern count="one">{0} cm³</unitPattern>
+ <unitPattern count="other">{0} cm³</unitPattern>
+ <perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-mile">
+ <displayName>mi³</displayName>
+ <unitPattern count="one">{0} mi³</unitPattern>
+ <unitPattern count="other">{0} mi³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-yard">
+ <displayName>yards³</displayName>
+ <unitPattern count="one">{0} yd³</unitPattern>
+ <unitPattern count="other">{0} yd³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-foot">
+ <displayName>feet³</displayName>
+ <unitPattern count="one">{0} ft³</unitPattern>
+ <unitPattern count="other">{0} ft³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-inch">
+ <displayName>inches³</displayName>
+ <unitPattern count="one">{0} in³</unitPattern>
+ <unitPattern count="other">{0} in³</unitPattern>
+ </unit>
+ <unit type="volume-megaliter">
+ <displayName>Ml</displayName>
+ <unitPattern count="one">{0} Ml</unitPattern>
+ <unitPattern count="other">{0} Ml</unitPattern>
+ </unit>
+ <unit type="volume-hectoliter">
+ <displayName>hl</displayName>
+ <unitPattern count="one">{0} hl</unitPattern>
+ <unitPattern count="other">{0} hl</unitPattern>
+ </unit>
+ <unit type="volume-liter">
+ <displayName>litres</displayName>
+ <unitPattern count="one">{0} l</unitPattern>
+ <unitPattern count="other">{0} l</unitPattern>
+ <perUnitPattern>{0}/l</perUnitPattern>
+ </unit>
+ <unit type="volume-deciliter">
+ <displayName>dl</displayName>
+ <unitPattern count="one">{0} dl</unitPattern>
+ <unitPattern count="other">{0} dl</unitPattern>
+ </unit>
+ <unit type="volume-centiliter">
+ <displayName>cl</displayName>
+ <unitPattern count="one">{0} cl</unitPattern>
+ <unitPattern count="other">{0} cl</unitPattern>
+ </unit>
+ <unit type="volume-milliliter">
+ <displayName>ml</displayName>
+ <unitPattern count="one">{0} ml</unitPattern>
+ <unitPattern count="other">{0} ml</unitPattern>
+ </unit>
+ <unit type="volume-pint-metric">
+ <displayName>mpt</displayName>
+ <unitPattern count="one">{0} mpt</unitPattern>
+ <unitPattern count="other">{0} mpt</unitPattern>
+ </unit>
+ <unit type="volume-cup-metric">
+ <displayName>mcup</displayName>
+ <unitPattern count="one">{0} mc</unitPattern>
+ <unitPattern count="other">{0} mc</unitPattern>
+ </unit>
+ <unit type="volume-acre-foot">
+ <displayName>acre ft</displayName>
+ <unitPattern count="one">{0} ac ft</unitPattern>
+ <unitPattern count="other">{0} ac ft</unitPattern>
+ </unit>
+ <unit type="volume-bushel">
+ <displayName>bushels</displayName>
+ <unitPattern count="one">{0} bu</unitPattern>
+ <unitPattern count="other">{0} bu</unitPattern>
+ </unit>
+ <unit type="volume-gallon">
+ <displayName>US gal</displayName>
+ <unitPattern count="one">{0} gal US</unitPattern>
+ <unitPattern count="other">{0} gal US</unitPattern>
+ </unit>
+ <unit type="volume-gallon-imperial">
+ <displayName>gal</displayName>
+ <unitPattern count="one">{0} gal</unitPattern>
+ <unitPattern count="other">{0} gal</unitPattern>
+ <perUnitPattern>{0}/gal</perUnitPattern>
+ </unit>
+ <unit type="volume-quart">
+ <displayName>qts</displayName>
+ <unitPattern count="one">{0} qt</unitPattern>
+ <unitPattern count="other">{0} qt</unitPattern>
+ </unit>
+ <unit type="volume-pint">
+ <displayName>pints</displayName>
+ <unitPattern count="one">{0} pt</unitPattern>
+ <unitPattern count="other">{0} pt</unitPattern>
+ </unit>
+ <unit type="volume-cup">
+ <displayName>cups</displayName>
+ <unitPattern count="one">{0} c</unitPattern>
+ <unitPattern count="other">{0} c</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce">
+ <displayName>US fl oz</displayName>
+ <unitPattern count="one">{0} US fl oz</unitPattern>
+ <unitPattern count="other">{0} US fl oz</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce-imperial">
+ <displayName>Imp. fl oz</displayName>
+ <unitPattern count="one">{0} fl oz Imp.</unitPattern>
+ <unitPattern count="other">{0} fl oz Imp.</unitPattern>
+ </unit>
+ <unit type="volume-tablespoon">
+ <displayName>tbsp</displayName>
+ <unitPattern count="one">{0} tbsp</unitPattern>
+ <unitPattern count="other">{0} tbsp</unitPattern>
+ </unit>
+ <unit type="volume-teaspoon">
+ <displayName>tsp</displayName>
+ <unitPattern count="one">{0} tsp</unitPattern>
+ <unitPattern count="other">{0} tsp</unitPattern>
+ </unit>
+ <unit type="volume-barrel">
+ <displayName>barrel</displayName>
+ <unitPattern count="one">{0} bbl</unitPattern>
+ <unitPattern count="other">{0} bbl</unitPattern>
+ </unit>
+ <coordinateUnit>
+ <displayName>direction</displayName>
+ <coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+ </coordinateUnit>
+ </unitLength>
+ <unitLength type="narrow">
+ <unit type="acceleration-g-force">
+ <displayName>g-force</displayName>
+ <unitPattern count="one">{0}G</unitPattern>
+ <unitPattern count="other">{0}Gs</unitPattern>
+ </unit>
+ <unit type="acceleration-meter-per-square-second">
+ <displayName>m/s²</displayName>
+ <unitPattern count="one">{0}m/s²</unitPattern>
+ <unitPattern count="other">{0}m/s²</unitPattern>
+ </unit>
+ <unit type="angle-revolution">
+ <displayName>rev</displayName>
+ <unitPattern count="one">{0}rev</unitPattern>
+ <unitPattern count="other">{0}rev</unitPattern>
+ </unit>
+ <unit type="angle-radian">
+ <displayName>rad</displayName>
+ <unitPattern count="one">{0}rad</unitPattern>
+ <unitPattern count="other">{0}rad</unitPattern>
+ </unit>
+ <unit type="angle-degree">
+ <displayName>deg</displayName>
+ <unitPattern count="one">{0}°</unitPattern>
+ <unitPattern count="other">{0}°</unitPattern>
+ </unit>
+ <unit type="angle-arc-minute">
+ <displayName>arcmin</displayName>
+ <unitPattern count="one">{0}′</unitPattern>
+ <unitPattern count="other">{0}′</unitPattern>
+ </unit>
+ <unit type="angle-arc-second">
+ <displayName>arcsec</displayName>
+ <unitPattern count="one">{0}″</unitPattern>
+ <unitPattern count="other">{0}″</unitPattern>
+ </unit>
+ <unit type="area-hectare">
+ <displayName>hectare</displayName>
+ <unitPattern count="one">{0}ha</unitPattern>
+ <unitPattern count="other">{0}ha</unitPattern>
+ </unit>
+ <unit type="area-square-meter">
+ <displayName draft="contributed">metres²</displayName>
+ </unit>
+ <unit type="area-square-centimeter">
+ <displayName>cm²</displayName>
+ <unitPattern count="one">{0}cm²</unitPattern>
+ <unitPattern count="other">{0}cm²</unitPattern>
+ </unit>
+ <unit type="area-square-mile">
+ <displayName>mi²</displayName>
+ <unitPattern count="one">{0}mi²</unitPattern>
+ <unitPattern count="other">{0}mi²</unitPattern>
+ <perUnitPattern>{0}/mi²</perUnitPattern>
+ </unit>
+ <unit type="area-acre">
+ <displayName>acre</displayName>
+ <unitPattern count="one">{0}ac</unitPattern>
+ <unitPattern count="other">{0}ac</unitPattern>
+ </unit>
+ <unit type="area-square-yard">
+ <displayName>yd²</displayName>
+ <unitPattern count="one">{0}yd²</unitPattern>
+ <unitPattern count="other">{0}yd²</unitPattern>
+ </unit>
+ <unit type="area-square-foot">
+ <displayName>ft²</displayName>
+ <unitPattern count="one">{0}ft²</unitPattern>
+ <unitPattern count="other">{0}ft²</unitPattern>
+ </unit>
+ <unit type="area-square-inch">
+ <displayName>in²</displayName>
+ <unitPattern count="one">{0}in²</unitPattern>
+ <unitPattern count="other">{0}in²</unitPattern>
+ </unit>
+ <unit type="area-dunam">
+ <displayName>dunam</displayName>
+ <unitPattern count="one">{0}dunam</unitPattern>
+ <unitPattern count="other">{0}dunam</unitPattern>
+ </unit>
+ <unit type="concentr-karat">
+ <displayName>karat</displayName>
+ <unitPattern count="one">{0}kt</unitPattern>
+ <unitPattern count="other">{0}kt</unitPattern>
+ </unit>
+ <unit type="concentr-milligram-per-deciliter">
+ <displayName>mg/dl</displayName>
+ <unitPattern count="one">{0}mg/dl</unitPattern>
+ <unitPattern count="other">{0}mg/dl</unitPattern>
+ </unit>
+ <unit type="concentr-millimole-per-liter">
+ <displayName>mmol/l</displayName>
+ <unitPattern count="one">{0}mmol/l</unitPattern>
+ <unitPattern count="other">{0}mmol/l</unitPattern>
+ </unit>
+ <unit type="concentr-permillion">
+ <displayName>ppm</displayName>
+ <unitPattern count="one">{0}ppm</unitPattern>
+ <unitPattern count="other">{0}ppm</unitPattern>
+ </unit>
+ <unit type="concentr-percent">
+ <displayName>%</displayName>
+ <unitPattern count="one">{0}%</unitPattern>
+ <unitPattern count="other">{0}%</unitPattern>
+ </unit>
+ <unit type="concentr-permille">
+ <displayName>‰</displayName>
+ <unitPattern count="one">{0}‰</unitPattern>
+ <unitPattern count="other">{0}‰</unitPattern>
+ </unit>
+ <unit type="concentr-permyriad">
+ <displayName>‱</displayName>
+ <unitPattern count="one">{0}‱</unitPattern>
+ <unitPattern count="other">{0}‱</unitPattern>
+ </unit>
+ <unit type="concentr-mole">
+ <displayName>mol</displayName>
+ <unitPattern count="one">{0}mol</unitPattern>
+ <unitPattern count="other">{0}mol</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-kilometer">
+ <displayName>l/km</displayName>
+ <unitPattern count="one">{0}l/km</unitPattern>
+ <unitPattern count="other">{0}l/km</unitPattern>
+ </unit>
+ <unit type="consumption-liter-per-100-kilometer">
+ <displayName>l/100km</displayName>
+ <unitPattern count="one">{0}l/100km</unitPattern>
+ <unitPattern count="other">{0}l/100km</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon">
+ <displayName>mpg US</displayName>
+ <unitPattern count="one">{0}mpgUS</unitPattern>
+ <unitPattern count="other">{0}mpgUS</unitPattern>
+ </unit>
+ <unit type="consumption-mile-per-gallon-imperial">
+ <displayName>mpg</displayName>
+ <unitPattern count="one">{0}mpg</unitPattern>
+ <unitPattern count="other">{0}mpg</unitPattern>
+ </unit>
+ <unit type="digital-petabyte">
+ <displayName>PByte</displayName>
+ <unitPattern count="one">{0}PB</unitPattern>
+ <unitPattern count="other">{0}PB</unitPattern>
+ </unit>
+ <unit type="digital-terabyte">
+ <displayName>TByte</displayName>
+ <unitPattern count="one">{0}TB</unitPattern>
+ <unitPattern count="other">{0}TB</unitPattern>
+ </unit>
+ <unit type="digital-terabit">
+ <displayName>Tbit</displayName>
+ <unitPattern count="one">{0}Tb</unitPattern>
+ <unitPattern count="other">{0}Tb</unitPattern>
+ </unit>
+ <unit type="digital-gigabyte">
+ <displayName>GByte</displayName>
+ <unitPattern count="one">{0}GB</unitPattern>
+ <unitPattern count="other">{0}GB</unitPattern>
+ </unit>
+ <unit type="digital-gigabit">
+ <displayName>Gbit</displayName>
+ <unitPattern count="one">{0}Gb</unitPattern>
+ <unitPattern count="other">{0}Gb</unitPattern>
+ </unit>
+ <unit type="digital-megabyte">
+ <displayName>MByte</displayName>
+ <unitPattern count="one">{0}MB</unitPattern>
+ <unitPattern count="other">{0}MB</unitPattern>
+ </unit>
+ <unit type="digital-megabit">
+ <displayName>Mbit</displayName>
+ <unitPattern count="one">{0}Mb</unitPattern>
+ <unitPattern count="other">{0}Mb</unitPattern>
+ </unit>
+ <unit type="digital-kilobyte">
+ <displayName>kByte</displayName>
+ <unitPattern count="one">{0}kB</unitPattern>
+ <unitPattern count="other">{0}kB</unitPattern>
+ </unit>
+ <unit type="digital-kilobit">
+ <displayName>kbit</displayName>
+ <unitPattern count="one">{0}kb</unitPattern>
+ <unitPattern count="other">{0}kb</unitPattern>
+ </unit>
+ <unit type="digital-byte">
+ <displayName>byte</displayName>
+ <unitPattern count="one">{0}B</unitPattern>
+ <unitPattern count="other">{0}B</unitPattern>
+ </unit>
+ <unit type="digital-bit">
+ <displayName>bit</displayName>
+ <unitPattern count="one">{0}bit</unitPattern>
+ <unitPattern count="other">{0}bit</unitPattern>
+ </unit>
+ <unit type="duration-decade">
+ <displayName>dec</displayName>
+ <unitPattern count="one">{0}dec</unitPattern>
+ <unitPattern count="other">{0}dec</unitPattern>
+ </unit>
+ <unit type="duration-year">
+ <displayName>yr</displayName>
+ <unitPattern count="one">{0}y</unitPattern>
+ <unitPattern count="other">{0}y</unitPattern>
+ </unit>
+ <unit type="duration-month">
+ <displayName>month</displayName>
+ <unitPattern count="one">{0}m</unitPattern>
+ <unitPattern count="other">{0}m</unitPattern>
+ </unit>
+ <unit type="duration-week">
+ <displayName>wk</displayName>
+ <unitPattern count="one">{0}w</unitPattern>
+ <unitPattern count="other">{0}w</unitPattern>
+ </unit>
+ <unit type="duration-day">
+ <displayName>day</displayName>
+ <unitPattern count="one">{0}d</unitPattern>
+ <unitPattern count="other">{0}d</unitPattern>
+ </unit>
+ <unit type="duration-hour">
+ <displayName>hour</displayName>
+ <unitPattern count="one">{0}h</unitPattern>
+ <unitPattern count="other">{0}h</unitPattern>
+ </unit>
+ <unit type="duration-minute">
+ <displayName>min</displayName>
+ <unitPattern count="one">{0}m</unitPattern>
+ <unitPattern count="other">{0}m</unitPattern>
+ </unit>
+ <unit type="duration-second">
+ <displayName>sec</displayName>
+ <unitPattern count="one">{0}s</unitPattern>
+ <unitPattern count="other">{0}s</unitPattern>
+ </unit>
+ <unit type="duration-millisecond">
+ <displayName>msec</displayName>
+ <unitPattern count="one">{0}ms</unitPattern>
+ <unitPattern count="other">{0}ms</unitPattern>
+ </unit>
+ <unit type="duration-microsecond">
+ <displayName>μsec</displayName>
+ <unitPattern count="one">{0}μs</unitPattern>
+ <unitPattern count="other">{0}μs</unitPattern>
+ </unit>
+ <unit type="duration-nanosecond">
+ <displayName>ns</displayName>
+ <unitPattern count="one">{0}ns</unitPattern>
+ <unitPattern count="other">{0}ns</unitPattern>
+ </unit>
+ <unit type="electric-ampere">
+ <displayName>amp</displayName>
+ <unitPattern count="one">{0}A</unitPattern>
+ <unitPattern count="other">{0}A</unitPattern>
+ </unit>
+ <unit type="electric-milliampere">
+ <displayName>mA</displayName>
+ <unitPattern count="one">{0}mA</unitPattern>
+ <unitPattern count="other">{0}mA</unitPattern>
+ </unit>
+ <unit type="electric-ohm">
+ <displayName>ohm</displayName>
+ <unitPattern count="one">{0}Ω</unitPattern>
+ <unitPattern count="other">{0}Ω</unitPattern>
+ </unit>
+ <unit type="electric-volt">
+ <displayName>volt</displayName>
+ <unitPattern count="one">{0}V</unitPattern>
+ <unitPattern count="other">{0}V</unitPattern>
+ </unit>
+ <unit type="energy-kilocalorie">
+ <displayName>kcal</displayName>
+ <unitPattern count="one">{0}kcal</unitPattern>
+ <unitPattern count="other">{0}kcal</unitPattern>
+ </unit>
+ <unit type="energy-calorie">
+ <displayName>cal</displayName>
+ <unitPattern count="one">{0}cal</unitPattern>
+ <unitPattern count="other">{0}cal</unitPattern>
+ </unit>
+ <unit type="energy-foodcalorie">
+ <displayName>Cal</displayName>
+ <unitPattern count="one">{0}Cal</unitPattern>
+ <unitPattern count="other">{0}Cal</unitPattern>
+ </unit>
+ <unit type="energy-kilojoule">
+ <displayName>kJ</displayName>
+ <unitPattern count="one">{0}kJ</unitPattern>
+ <unitPattern count="other">{0}kJ</unitPattern>
+ </unit>
+ <unit type="energy-joule">
+ <displayName>joule</displayName>
+ <unitPattern count="one">{0}J</unitPattern>
+ <unitPattern count="other">{0}J</unitPattern>
+ </unit>
+ <unit type="energy-kilowatt-hour">
+ <displayName>kWh</displayName>
+ <unitPattern count="one">{0}kWh</unitPattern>
+ <unitPattern count="other">{0}kWh</unitPattern>
+ </unit>
+ <unit type="energy-electronvolt">
+ <displayName>eV</displayName>
+ <unitPattern count="one">{0}eV</unitPattern>
+ <unitPattern count="other">{0}eV</unitPattern>
+ </unit>
+ <unit type="energy-british-thermal-unit">
+ <displayName>BTU</displayName>
+ <unitPattern count="one">{0}Btu</unitPattern>
+ <unitPattern count="other">{0}Btu</unitPattern>
+ </unit>
+ <unit type="energy-therm-us">
+ <displayName>US therm</displayName>
+ <unitPattern count="one">{0}US therm</unitPattern>
+ <unitPattern count="other">{0}US therms</unitPattern>
+ </unit>
+ <unit type="force-pound-force">
+ <displayName>lbf</displayName>
+ <unitPattern count="one">{0}lbf</unitPattern>
+ <unitPattern count="other">{0}lbf</unitPattern>
+ </unit>
+ <unit type="force-newton">
+ <displayName>N</displayName>
+ <unitPattern count="one">{0}N</unitPattern>
+ <unitPattern count="other">{0}N</unitPattern>
+ </unit>
+ <unit type="frequency-gigahertz">
+ <displayName>GHz</displayName>
+ <unitPattern count="one">{0}GHz</unitPattern>
+ <unitPattern count="other">{0}GHz</unitPattern>
+ </unit>
+ <unit type="frequency-megahertz">
+ <displayName>MHz</displayName>
+ <unitPattern count="one">{0}MHz</unitPattern>
+ <unitPattern count="other">{0}MHz</unitPattern>
+ </unit>
+ <unit type="frequency-kilohertz">
+ <displayName>kHz</displayName>
+ <unitPattern count="one">{0}kHz</unitPattern>
+ <unitPattern count="other">{0}kHz</unitPattern>
+ </unit>
+ <unit type="frequency-hertz">
+ <displayName>Hz</displayName>
+ <unitPattern count="one">{0}Hz</unitPattern>
+ <unitPattern count="other">{0}Hz</unitPattern>
+ </unit>
+ <unit type="graphics-em">
+ <displayName>em</displayName>
+ <unitPattern count="one">{0}em</unitPattern>
+ <unitPattern count="other">{0}em</unitPattern>
+ </unit>
+ <unit type="graphics-pixel">
+ <displayName>px</displayName>
+ <unitPattern count="one">{0}px</unitPattern>
+ <unitPattern count="other">{0}px</unitPattern>
+ </unit>
+ <unit type="graphics-megapixel">
+ <displayName>MP</displayName>
+ <unitPattern count="one">{0}MP</unitPattern>
+ <unitPattern count="other">{0}MP</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-centimeter">
+ <displayName>ppcm</displayName>
+ <unitPattern count="one">{0}ppcm</unitPattern>
+ <unitPattern count="other">{0}ppcm</unitPattern>
+ </unit>
+ <unit type="graphics-pixel-per-inch">
+ <displayName>ppi</displayName>
+ <unitPattern count="one">{0}ppi</unitPattern>
+ <unitPattern count="other">{0}ppi</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-centimeter">
+ <displayName>dpcm</displayName>
+ <unitPattern count="one">{0}dpcm</unitPattern>
+ <unitPattern count="other">{0}dpcm</unitPattern>
+ </unit>
+ <unit type="graphics-dot-per-inch">
+ <displayName>dpi</displayName>
+ <unitPattern count="one">{0}dpi</unitPattern>
+ <unitPattern count="other">{0}dpi</unitPattern>
+ </unit>
+ <unit type="length-kilometer">
+ <displayName>km</displayName>
+ <unitPattern count="one">{0}km</unitPattern>
+ <unitPattern count="other">{0}km</unitPattern>
+ </unit>
+ <unit type="length-meter">
+ <displayName>metre</displayName>
+ <unitPattern count="one">{0}m</unitPattern>
+ <unitPattern count="other">{0}m</unitPattern>
+ </unit>
+ <unit type="length-decimeter">
+ <displayName>dm</displayName>
+ <unitPattern count="one">{0}dm</unitPattern>
+ <unitPattern count="other">{0}dm</unitPattern>
+ </unit>
+ <unit type="length-centimeter">
+ <displayName>cm</displayName>
+ <unitPattern count="one">{0}cm</unitPattern>
+ <unitPattern count="other">{0}cm</unitPattern>
+ </unit>
+ <unit type="length-millimeter">
+ <displayName>mm</displayName>
+ <unitPattern count="one">{0}mm</unitPattern>
+ <unitPattern count="other">{0}mm</unitPattern>
+ </unit>
+ <unit type="length-micrometer">
+ <displayName>µm</displayName>
+ <unitPattern count="one">{0}µm</unitPattern>
+ <unitPattern count="other">{0}µm</unitPattern>
+ </unit>
+ <unit type="length-nanometer">
+ <displayName>nm</displayName>
+ <unitPattern count="one">{0}nm</unitPattern>
+ <unitPattern count="other">{0}nm</unitPattern>
+ </unit>
+ <unit type="length-picometer">
+ <displayName>pm</displayName>
+ <unitPattern count="one">{0}pm</unitPattern>
+ <unitPattern count="other">{0}pm</unitPattern>
+ </unit>
+ <unit type="length-mile">
+ <displayName>mi</displayName>
+ <unitPattern count="one">{0}mi</unitPattern>
+ <unitPattern count="other">{0}mi</unitPattern>
+ </unit>
+ <unit type="length-yard">
+ <displayName>yd</displayName>
+ <unitPattern count="one">{0}yd</unitPattern>
+ <unitPattern count="other">{0}yd</unitPattern>
+ </unit>
+ <unit type="length-foot">
+ <displayName>ft</displayName>
+ <unitPattern count="one">{0}′</unitPattern>
+ <unitPattern count="other">{0}′</unitPattern>
+ </unit>
+ <unit type="length-inch">
+ <displayName>in</displayName>
+ <unitPattern count="one">{0}″</unitPattern>
+ <unitPattern count="other">{0}″</unitPattern>
+ </unit>
+ <unit type="length-parsec">
+ <displayName>parsec</displayName>
+ <unitPattern count="one">{0}pc</unitPattern>
+ <unitPattern count="other">{0}pc</unitPattern>
+ </unit>
+ <unit type="length-light-year">
+ <displayName>ly</displayName>
+ <unitPattern count="one">{0}ly</unitPattern>
+ <unitPattern count="other">{0}ly</unitPattern>
+ </unit>
+ <unit type="length-astronomical-unit">
+ <displayName>au</displayName>
+ <unitPattern count="one">{0}au</unitPattern>
+ <unitPattern count="other">{0}au</unitPattern>
+ </unit>
+ <unit type="length-furlong">
+ <displayName>furlong</displayName>
+ <unitPattern count="one">{0}fur</unitPattern>
+ <unitPattern count="other">{0}fur</unitPattern>
+ </unit>
+ <unit type="length-fathom">
+ <displayName>fathom</displayName>
+ <unitPattern count="one">{0}fth</unitPattern>
+ <unitPattern count="other">{0}fth</unitPattern>
+ </unit>
+ <unit type="length-nautical-mile">
+ <displayName>nmi</displayName>
+ <unitPattern count="one">{0}nmi</unitPattern>
+ <unitPattern count="other">{0}nmi</unitPattern>
+ </unit>
+ <unit type="length-mile-scandinavian">
+ <displayName>smi</displayName>
+ <unitPattern count="one">{0}smi</unitPattern>
+ <unitPattern count="other">{0}smi</unitPattern>
+ </unit>
+ <unit type="length-point">
+ <displayName>pts</displayName>
+ <unitPattern count="one">{0}pt</unitPattern>
+ <unitPattern count="other">{0}pt</unitPattern>
+ </unit>
+ <unit type="length-solar-radius">
+ <displayName>R☉</displayName>
+ <unitPattern count="one">{0}R☉</unitPattern>
+ <unitPattern count="other">{0}R☉</unitPattern>
+ </unit>
+ <unit type="light-lux">
+ <displayName>lux</displayName>
+ <unitPattern count="one">{0}lx</unitPattern>
+ <unitPattern count="other">{0}lx</unitPattern>
+ </unit>
+ <unit type="light-solar-luminosity">
+ <displayName>L☉</displayName>
+ <unitPattern count="one">{0}L☉</unitPattern>
+ <unitPattern count="other">{0}L☉</unitPattern>
+ </unit>
+ <unit type="mass-metric-ton">
+ <displayName>t</displayName>
+ <unitPattern count="one">{0}t</unitPattern>
+ <unitPattern count="other">{0}t</unitPattern>
+ </unit>
+ <unit type="mass-kilogram">
+ <displayName>kg</displayName>
+ <unitPattern count="one">{0}kg</unitPattern>
+ <unitPattern count="other">{0}kg</unitPattern>
+ </unit>
+ <unit type="mass-gram">
+ <displayName>gram</displayName>
+ <unitPattern count="one">{0}g</unitPattern>
+ <unitPattern count="other">{0}g</unitPattern>
+ </unit>
+ <unit type="mass-milligram">
+ <displayName>mg</displayName>
+ <unitPattern count="one">{0}mg</unitPattern>
+ <unitPattern count="other">{0}mg</unitPattern>
+ </unit>
+ <unit type="mass-microgram">
+ <displayName>µg</displayName>
+ <unitPattern count="one">{0}µg</unitPattern>
+ <unitPattern count="other">{0}µg</unitPattern>
+ </unit>
+ <unit type="mass-ton">
+ <displayName>ton</displayName>
+ <unitPattern count="one">{0}tn</unitPattern>
+ <unitPattern count="other">{0}tn</unitPattern>
+ </unit>
+ <unit type="mass-stone">
+ <displayName>stone</displayName>
+ <unitPattern count="one">{0}st</unitPattern>
+ <unitPattern count="other">{0}st</unitPattern>
+ </unit>
+ <unit type="mass-pound">
+ <displayName>lb</displayName>
+ <unitPattern count="one">{0}lb</unitPattern>
+ <unitPattern count="other">{0}lb</unitPattern>
+ </unit>
+ <unit type="mass-ounce">
+ <displayName>oz</displayName>
+ <unitPattern count="one">{0}oz</unitPattern>
+ <unitPattern count="other">{0}oz</unitPattern>
+ </unit>
+ <unit type="mass-ounce-troy">
+ <displayName>oz t</displayName>
+ <unitPattern count="one">{0}oz t</unitPattern>
+ <unitPattern count="other">{0}oz t</unitPattern>
+ </unit>
+ <unit type="mass-carat">
+ <displayName>carat</displayName>
+ <unitPattern count="one">{0}CD</unitPattern>
+ <unitPattern count="other">{0}CD</unitPattern>
+ </unit>
+ <unit type="mass-dalton">
+ <displayName>Da</displayName>
+ <unitPattern count="one">{0}Da</unitPattern>
+ <unitPattern count="other">{0}Da</unitPattern>
+ </unit>
+ <unit type="mass-earth-mass">
+ <displayName>M⊕</displayName>
+ <unitPattern count="one">{0}M⊕</unitPattern>
+ <unitPattern count="other">{0}M⊕</unitPattern>
+ </unit>
+ <unit type="mass-solar-mass">
+ <displayName>M☉</displayName>
+ <unitPattern count="one">{0}M☉</unitPattern>
+ <unitPattern count="other">{0}M☉</unitPattern>
+ </unit>
+ <unit type="power-gigawatt">
+ <displayName>GW</displayName>
+ <unitPattern count="one">{0}GW</unitPattern>
+ <unitPattern count="other">{0}GW</unitPattern>
+ </unit>
+ <unit type="power-megawatt">
+ <displayName>MW</displayName>
+ <unitPattern count="one">{0}MW</unitPattern>
+ <unitPattern count="other">{0}MW</unitPattern>
+ </unit>
+ <unit type="power-kilowatt">
+ <displayName>kW</displayName>
+ <unitPattern count="one">{0}kW</unitPattern>
+ <unitPattern count="other">{0}kW</unitPattern>
+ </unit>
+ <unit type="power-watt">
+ <displayName>watt</displayName>
+ <unitPattern count="one">{0}W</unitPattern>
+ <unitPattern count="other">{0}W</unitPattern>
+ </unit>
+ <unit type="power-milliwatt">
+ <displayName>mW</displayName>
+ <unitPattern count="one">{0}mW</unitPattern>
+ <unitPattern count="other">{0}mW</unitPattern>
+ </unit>
+ <unit type="power-horsepower">
+ <displayName>hp</displayName>
+ <unitPattern count="one">{0}hp</unitPattern>
+ <unitPattern count="other">{0}hp</unitPattern>
+ </unit>
+ <unit type="pressure-millimeter-ofhg">
+ <displayName>mmHg</displayName>
+ <unitPattern count="one">{0}mmHg</unitPattern>
+ <unitPattern count="other">{0}mmHg</unitPattern>
+ </unit>
+ <unit type="pressure-pound-force-per-square-inch">
+ <displayName>psi</displayName>
+ <unitPattern count="one">{0}psi</unitPattern>
+ <unitPattern count="other">{0}psi</unitPattern>
+ </unit>
+ <unit type="pressure-inch-ofhg">
+ <displayName>″ Hg</displayName>
+ <unitPattern count="one">{0}″ Hg</unitPattern>
+ <unitPattern count="other">{0}″ Hg</unitPattern>
+ </unit>
+ <unit type="pressure-bar">
+ <displayName>bar</displayName>
+ <unitPattern count="one">{0}bar</unitPattern>
+ <unitPattern count="other">{0}bars</unitPattern>
+ </unit>
+ <unit type="pressure-millibar">
+ <displayName>mbar</displayName>
+ <unitPattern count="one">{0}mb</unitPattern>
+ <unitPattern count="other">{0}mb</unitPattern>
+ </unit>
+ <unit type="pressure-atmosphere">
+ <displayName>atm</displayName>
+ <unitPattern count="one">{0}atm</unitPattern>
+ <unitPattern count="other">{0}atm</unitPattern>
+ </unit>
+ <unit type="pressure-pascal">
+ <displayName>Pa</displayName>
+ <unitPattern count="one">{0}Pa</unitPattern>
+ <unitPattern count="other">{0}Pa</unitPattern>
+ </unit>
+ <unit type="pressure-hectopascal">
+ <displayName>hPa</displayName>
+ <unitPattern count="one">{0}hPa</unitPattern>
+ <unitPattern count="other">{0}hPa</unitPattern>
+ </unit>
+ <unit type="pressure-kilopascal">
+ <displayName>kPa</displayName>
+ <unitPattern count="one">{0}kPa</unitPattern>
+ <unitPattern count="other">{0}kPa</unitPattern>
+ </unit>
+ <unit type="pressure-megapascal">
+ <displayName>MPa</displayName>
+ <unitPattern count="one">{0}MPa</unitPattern>
+ <unitPattern count="other">{0}MPa</unitPattern>
+ </unit>
+ <unit type="speed-kilometer-per-hour">
+ <displayName>km/h</displayName>
+ <unitPattern count="one" draft="contributed">{0}kph</unitPattern>
+ <unitPattern count="other" draft="contributed">{0}kph</unitPattern>
+ </unit>
+ <unit type="speed-meter-per-second">
+ <displayName>m/s</displayName>
+ <unitPattern count="one">{0}m/s</unitPattern>
+ <unitPattern count="other">{0}m/s</unitPattern>
+ </unit>
+ <unit type="speed-mile-per-hour">
+ <displayName>mi/hr</displayName>
+ <unitPattern count="one">{0}mph</unitPattern>
+ <unitPattern count="other">{0}mph</unitPattern>
+ </unit>
+ <unit type="speed-knot">
+ <displayName>kn</displayName>
+ <unitPattern count="one">{0}kn</unitPattern>
+ <unitPattern count="other">{0}kn</unitPattern>
+ </unit>
+ <unit type="temperature-celsius">
+ <displayName>°C</displayName>
+ <unitPattern count="one">{0}°</unitPattern>
+ <unitPattern count="other">{0}°</unitPattern>
+ </unit>
+ <unit type="temperature-fahrenheit">
+ <displayName>°F</displayName>
+ <unitPattern count="one">{0}°F</unitPattern>
+ <unitPattern count="other">{0}°F</unitPattern>
+ </unit>
+ <unit type="temperature-kelvin">
+ <displayName>K</displayName>
+ <unitPattern count="one">{0}K</unitPattern>
+ <unitPattern count="other">{0}K</unitPattern>
+ </unit>
+ <unit type="torque-pound-force-foot">
+ <displayName>lbf⋅ft</displayName>
+ <unitPattern count="one">{0}lbf⋅ft</unitPattern>
+ <unitPattern count="other">{0}lbf⋅ft</unitPattern>
+ </unit>
+ <unit type="torque-newton-meter">
+ <displayName>N⋅m</displayName>
+ <unitPattern count="one">{0}N⋅m</unitPattern>
+ <unitPattern count="other">{0}N⋅m</unitPattern>
+ </unit>
+ <unit type="volume-cubic-kilometer">
+ <displayName>km³</displayName>
+ <unitPattern count="one">{0}km³</unitPattern>
+ <unitPattern count="other">{0}km³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-meter">
+ <displayName>m³</displayName>
+ <unitPattern count="one">{0}m³</unitPattern>
+ <unitPattern count="other">{0}m³</unitPattern>
+ <perUnitPattern>{0}/m³</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-centimeter">
+ <displayName>cm³</displayName>
+ <unitPattern count="one">{0}cm³</unitPattern>
+ <unitPattern count="other">{0}cm³</unitPattern>
+ <perUnitPattern>{0}/cm³</perUnitPattern>
+ </unit>
+ <unit type="volume-cubic-mile">
+ <displayName>mi³</displayName>
+ <unitPattern count="one">{0}mi³</unitPattern>
+ <unitPattern count="other">{0}mi³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-yard">
+ <displayName>yd³</displayName>
+ <unitPattern count="one">{0}yd³</unitPattern>
+ <unitPattern count="other">{0}yd³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-foot">
+ <displayName>ft³</displayName>
+ <unitPattern count="one">{0}ft³</unitPattern>
+ <unitPattern count="other">{0}ft³</unitPattern>
+ </unit>
+ <unit type="volume-cubic-inch">
+ <displayName>in³</displayName>
+ <unitPattern count="one">{0}in³</unitPattern>
+ <unitPattern count="other">{0}in³</unitPattern>
+ </unit>
+ <unit type="volume-megaliter">
+ <displayName>Ml</displayName>
+ <unitPattern count="one">{0}Ml</unitPattern>
+ <unitPattern count="other">{0}Ml</unitPattern>
+ </unit>
+ <unit type="volume-hectoliter">
+ <displayName>hl</displayName>
+ <unitPattern count="one">{0}hl</unitPattern>
+ <unitPattern count="other">{0}hl</unitPattern>
+ </unit>
+ <unit type="volume-liter">
+ <displayName>litre</displayName>
+ <unitPattern count="one">{0}l</unitPattern>
+ <unitPattern count="other">{0}l</unitPattern>
+ <perUnitPattern>{0}/l</perUnitPattern>
+ </unit>
+ <unit type="volume-deciliter">
+ <displayName>dl</displayName>
+ <unitPattern count="one">{0}dl</unitPattern>
+ <unitPattern count="other">{0}dl</unitPattern>
+ </unit>
+ <unit type="volume-centiliter">
+ <displayName>cl</displayName>
+ <unitPattern count="one">{0}cl</unitPattern>
+ <unitPattern count="other">{0}cl</unitPattern>
+ </unit>
+ <unit type="volume-milliliter">
+ <displayName>ml</displayName>
+ <unitPattern count="one">{0}ml</unitPattern>
+ <unitPattern count="other">{0}ml</unitPattern>
+ </unit>
+ <unit type="volume-pint-metric">
+ <displayName>pt</displayName>
+ <unitPattern count="one">{0}mpt</unitPattern>
+ <unitPattern count="other">{0}mpt</unitPattern>
+ </unit>
+ <unit type="volume-cup-metric">
+ <displayName>mcup</displayName>
+ <unitPattern count="one">{0}mc</unitPattern>
+ <unitPattern count="other">{0}mc</unitPattern>
+ </unit>
+ <unit type="volume-acre-foot">
+ <displayName>acre ft</displayName>
+ <unitPattern count="one">{0}ac ft</unitPattern>
+ <unitPattern count="other">{0}ac ft</unitPattern>
+ </unit>
+ <unit type="volume-bushel">
+ <displayName>bushel</displayName>
+ <unitPattern count="one">{0}bu</unitPattern>
+ <unitPattern count="other">{0}bu</unitPattern>
+ </unit>
+ <unit type="volume-gallon">
+ <displayName>US gal</displayName>
+ <unitPattern count="one">{0}galUS</unitPattern>
+ <unitPattern count="other">{0}galUS</unitPattern>
+ <perUnitPattern>{0}/galUS</perUnitPattern>
+ </unit>
+ <unit type="volume-gallon-imperial">
+ <displayName>gal</displayName>
+ <unitPattern count="one">{0}gal</unitPattern>
+ <unitPattern count="other">{0}gal</unitPattern>
+ <perUnitPattern>{0}/gal</perUnitPattern>
+ </unit>
+ <unit type="volume-quart">
+ <displayName>qt</displayName>
+ <unitPattern count="one">{0}qt</unitPattern>
+ <unitPattern count="other">{0}qt</unitPattern>
+ </unit>
+ <unit type="volume-pint">
+ <displayName>pt</displayName>
+ <unitPattern count="one">{0}pt</unitPattern>
+ <unitPattern count="other">{0}pt</unitPattern>
+ </unit>
+ <unit type="volume-cup">
+ <displayName>cup</displayName>
+ <unitPattern count="one">{0}c</unitPattern>
+ <unitPattern count="other">{0}c</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce">
+ <displayName>fl oz</displayName>
+ <unitPattern count="one">{0}fl oz</unitPattern>
+ <unitPattern count="other">{0}fl oz</unitPattern>
+ </unit>
+ <unit type="volume-fluid-ounce-imperial">
+ <displayName>Imp fl oz</displayName>
+ <unitPattern count="one">{0}fl oz Im</unitPattern>
+ <unitPattern count="other">{0}fl oz Im</unitPattern>
+ </unit>
+ <unit type="volume-tablespoon">
+ <displayName>tbsp</displayName>
+ <unitPattern count="one">{0}tbsp</unitPattern>
+ <unitPattern count="other">{0}tbsp</unitPattern>
+ </unit>
+ <unit type="volume-teaspoon">
+ <displayName>tsp</displayName>
+ <unitPattern count="one">{0}tsp</unitPattern>
+ <unitPattern count="other">{0}tsp</unitPattern>
+ </unit>
+ <unit type="volume-barrel">
+ <displayName>bbl</displayName>
+ <unitPattern count="one">{0}bbl</unitPattern>
+ <unitPattern count="other">{0}bbl</unitPattern>
+ </unit>
+ <coordinateUnit>
+ <coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+ <coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+ <coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+ <coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+ </coordinateUnit>
+ </unitLength>
+ </units>
+ <listPatterns>
+ <listPattern>
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0}, aur {1}</listPatternPart>
+ <listPatternPart type="2">{0} aur {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="or">
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0} ya {1}</listPatternPart>
+ <listPatternPart type="2">{0} ya {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="standard-narrow">
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0} aur {1}</listPatternPart>
+ <listPatternPart type="2">{0} aur {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="standard-short">
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0} aur {1}</listPatternPart>
+ <listPatternPart type="2">{0} aur {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="unit">
+ <listPatternPart type="start">{0}, {1}</listPatternPart>
+ <listPatternPart type="middle">{0}, {1}</listPatternPart>
+ <listPatternPart type="end">{0}, aur {1}</listPatternPart>
+ <listPatternPart type="2">{0} aur {1}</listPatternPart>
+ </listPattern>
+ <listPattern type="unit-narrow">
+ <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-short">
+ <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>
+ </listPatterns>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/seed/main/hi_Latn_IN.xml
similarity index 83%
copy from seed/main/mni_IN.xml
copy to seed/main/hi_Latn_IN.xml
index 01c64c4..dc6188c 100644
--- a/seed/main/mni_IN.xml
+++ b/seed/main/hi_Latn_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,8 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
+ <language type="hi"/>
+ <script type="Latn"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/seed/main/io.xml b/seed/main/io.xml
index d5a497f..a09eb29 100644
--- a/seed/main/io.xml
+++ b/seed/main/io.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="io"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="io" draft="contributed">Ido</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a b c d e f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
diff --git a/seed/main/io_001.xml b/seed/main/io_001.xml
index 1e82651..ced4082 100644
--- a/seed/main/io_001.xml
+++ b/seed/main/io_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/iu.xml b/seed/main/iu.xml
index 747328a..f85c410 100644
--- a/seed/main/iu.xml
+++ b/seed/main/iu.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -48,28 +48,6 @@
</dateFormat>
</dateFormatLength>
</dateFormats>
- <timeFormats>
- <timeFormatLength type="full">
- <timeFormat>
- <pattern>h:mm:ss a zzzz</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="long">
- <timeFormat>
- <pattern>h:mm:ss a z</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="medium">
- <timeFormat>
- <pattern>h:mm:ss a</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="short">
- <timeFormat>
- <pattern>h:mm a</pattern>
- </timeFormat>
- </timeFormatLength>
- </timeFormats>
<dateTimeFormats>
<availableFormats>
<dateFormatItem id="d">d</dateFormatItem>
diff --git a/seed/main/iu_CA.xml b/seed/main/iu_CA.xml
index eaaced7..1892117 100644
--- a/seed/main/iu_CA.xml
+++ b/seed/main/iu_CA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/iu_Latn.xml b/seed/main/iu_Latn.xml
index 574b3af..aa6f2f6 100644
--- a/seed/main/iu_Latn.xml
+++ b/seed/main/iu_Latn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/iu_Latn_CA.xml b/seed/main/iu_Latn_CA.xml
index 3b0aaf9..9cf6951 100644
--- a/seed/main/iu_Latn_CA.xml
+++ b/seed/main/iu_Latn_CA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/jbo.xml b/seed/main/jbo.xml
index c7a49a2..342a3f9 100644
--- a/seed/main/jbo.xml
+++ b/seed/main/jbo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="jbo"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="jbo" draft="contributed">la .lojban.</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a b c d e f g h i j k l m n o p r s t u v x y z]</exemplarCharacters>
<exemplarCharacters type="auxiliary">[q w]</exemplarCharacters>
diff --git a/seed/main/jbo_001.xml b/seed/main/jbo_001.xml
index ae6833d..0191be5 100644
--- a/seed/main/jbo_001.xml
+++ b/seed/main/jbo_001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/kaj.xml b/seed/main/kaj.xml
index 73cf2c7..23cbb5f 100644
--- a/seed/main/kaj.xml
+++ b/seed/main/kaj.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="kaj"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="kaj" draft="contributed">Kaje</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters draft="unconfirmed">[a b c d e f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
<exemplarCharacters type="index" draft="unconfirmed">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
diff --git a/seed/main/kaj_NG.xml b/seed/main/kaj_NG.xml
index 3985ed2..0e020a8 100644
--- a/seed/main/kaj_NG.xml
+++ b/seed/main/kaj_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/kcg.xml b/seed/main/kcg.xml
index 50a5582..cfc28fd 100644
--- a/seed/main/kcg.xml
+++ b/seed/main/kcg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="kcg"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="kcg" draft="contributed">Katab</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters draft="unconfirmed">[a {a\u0331} b {ch} {chy} d e f g {gb} {gh} {ghw} {ghy} i {i\u0331} j {jhy} k {kh} {kp} l m n {ng} {ny} o p r s {sh} {shy} t {ts} u v w y z]</exemplarCharacters>
<exemplarCharacters type="index" draft="unconfirmed">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
@@ -17,28 +22,6 @@
<dates>
<calendars>
<calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="abbreviated">
- <day type="sun" draft="unconfirmed">Lad</day>
- <day type="mon" draft="unconfirmed">Tan</day>
- <day type="tue" draft="unconfirmed">Tal</day>
- <day type="wed" draft="unconfirmed">Lar</day>
- <day type="thu" draft="unconfirmed">Lam</day>
- <day type="fri" draft="unconfirmed">Jum</day>
- <day type="sat" draft="unconfirmed">Asa</day>
- </dayWidth>
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">Ladi</day>
- <day type="mon" draft="unconfirmed">Tanii</day>
- <day type="tue" draft="unconfirmed">Talata</day>
- <day type="wed" draft="unconfirmed">Larba</day>
- <day type="thu" draft="unconfirmed">Lamit</day>
- <day type="fri" draft="unconfirmed">Juma</day>
- <day type="sat" draft="unconfirmed">Asabat</day>
- </dayWidth>
- </dayContext>
- </days>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
diff --git a/seed/main/kcg_NG.xml b/seed/main/kcg_NG.xml
index 8757a0b..035ad1d 100644
--- a/seed/main/kcg_NG.xml
+++ b/seed/main/kcg_NG.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ken.xml b/seed/main/ken.xml
index 9f48203..e72f9a8 100644
--- a/seed/main/ken.xml
+++ b/seed/main/ken.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ken_CM.xml b/seed/main/ken_CM.xml
index 0e8e917..7b1522a 100644
--- a/seed/main/ken_CM.xml
+++ b/seed/main/ken_CM.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/kpe.xml b/seed/main/kpe.xml
index 666dc1f..5fdc218 100644
--- a/seed/main/kpe.xml
+++ b/seed/main/kpe.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,10 +10,43 @@
<version number="$Revision$"/>
<language type="kpe"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="kpe" draft="contributed">Kpɛlɛɛ</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a b ɓ d e ə ɛ f g ĝ {gb} {gw} ɣ h i j k {kp} {kw} l m n {ny} ɲ ŋ {ŋw} o ɔ p t u v w y z]</exemplarCharacters>
<exemplarCharacters type="index" draft="unconfirmed">[A B Ɓ C D E Ə Ɛ F G Ɣ H I J K L M N Ɲ Ŋ O Ɔ P Q R S T U V W X Y Z]</exemplarCharacters>
</characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
<numbers>
<currencies>
<currency type="LRD">
diff --git a/seed/main/kpe_GN.xml b/seed/main/kpe_GN.xml
index f1e0da4..271a105 100644
--- a/seed/main/kpe_GN.xml
+++ b/seed/main/kpe_GN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -11,6 +11,34 @@
<language type="kpe"/>
<territory type="GN"/>
</identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>HH:mm:ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>HH:mm:ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>HH:mm:ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>HH:mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
<numbers>
<currencies>
<currency type="GNF">
diff --git a/seed/main/kpe_LR.xml b/seed/main/kpe_LR.xml
index f9a03a0..65ba613 100644
--- a/seed/main/kpe_LR.xml
+++ b/seed/main/kpe_LR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ks_Deva.xml b/seed/main/ks_Deva.xml
new file mode 100644
index 0000000..b4ef53c
--- /dev/null
+++ b/seed/main/ks_Deva.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="ks"/>
+ <script type="Deva"/>
+ </identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="ks" draft="contributed">कॉशुर</language>
+ </languages>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[\u093C \u0901 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ ड त थ द न प फ ब म य र ल व श स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]</exemplarCharacters>
+ <exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
+ </characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern draft="unconfirmed">EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern draft="unconfirmed">d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern draft="unconfirmed">d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern draft="unconfirmed">d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern draft="unconfirmed">a h:mm:ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern draft="unconfirmed">a h:mm:ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern draft="unconfirmed">a h:mm:ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern draft="unconfirmed">a h:mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+</ldml>
diff --git a/common/main/ks_IN.xml b/seed/main/ks_Deva_IN.xml
similarity index 87%
copy from common/main/ks_IN.xml
copy to seed/main/ks_Deva_IN.xml
index e3540e2..808d2f6 100644
--- a/common/main/ks_IN.xml
+++ b/seed/main/ks_Deva_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,7 @@
<identity>
<version number="$Revision$"/>
<language type="ks"/>
+ <script type="Deva"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/seed/main/mn_Mong.xml b/seed/main/mn_Mong.xml
index 4e779ed..15e64f1 100644
--- a/seed/main/mn_Mong.xml
+++ b/seed/main/mn_Mong.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/mn_Mong_CN.xml b/seed/main/mn_Mong_CN.xml
index e539982..5fbd1ff 100644
--- a/seed/main/mn_Mong_CN.xml
+++ b/seed/main/mn_Mong_CN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/mn_Mong_MN.xml b/seed/main/mn_Mong_MN.xml
index 97ffd5e..714b422 100644
--- a/seed/main/mn_Mong_MN.xml
+++ b/seed/main/mn_Mong_MN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/mni.xml b/seed/main/mni.xml
deleted file mode 100644
index a02c184..0000000
--- a/seed/main/mni.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="mni"/>
- </identity>
- <localeDisplayNames>
- <localeDisplayPattern>
- <localePattern>{0} ({1})</localePattern>
- <localeSeparator>{0}, {1}</localeSeparator>
- <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
- </localeDisplayPattern>
- <languages>
- <language type="mni" draft="provisional">মৈতৈলোন্</language>
- </languages>
- </localeDisplayNames>
- <characters>
- <exemplarCharacters draft="provisional">[\u09BC \u0981 ং ঃ অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC} ঢ {ঢ\u09BC} ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} র ল ৱ শ ষ স হ া ি ী \u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]</exemplarCharacters>
- <exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
- </characters>
- <dates>
- <calendars>
- <calendar type="gregorian">
- <months>
- <monthContext type="format">
- <monthWidth type="abbreviated">
- <month type="1">জানুয়ারী</month>
- <month type="2">ফেব্রুয়ারী</month>
- <month type="3">মার্চ</month>
- <month type="4">এপ্রিল</month>
- <month type="5">মে</month>
- <month type="6">জুন</month>
- <month type="7">জুলাই</month>
- <month type="8">আগস্ট</month>
- <month type="9">সেপ্টেম্বর</month>
- <month type="10">ওক্টোবর</month>
- <month type="11">নভেম্বর</month>
- <month type="12">ডিসেম্বর</month>
- </monthWidth>
- <monthWidth type="wide">
- <month type="1">জানুয়ারী</month>
- <month type="2">ফেব্রুয়ারী</month>
- <month type="3">মার্চ</month>
- <month type="4">এপ্রিল</month>
- <month type="5">মে</month>
- <month type="6">জুন</month>
- <month type="7">জুলাই</month>
- <month type="8">আগস্ট</month>
- <month type="9">সেপ্টেম্বর</month>
- <month type="10">ওক্টোবর</month>
- <month type="11">নভেম্বর</month>
- <month type="12">ডিসেম্বর</month>
- </monthWidth>
- </monthContext>
- </months>
- <days>
- <dayContext type="format">
- <dayWidth type="abbreviated">
- <day type="sun">নোংমাইজিং</day>
- <day type="mon">নিংথৌকাবা</day>
- <day type="tue">লৈবাকপোকপা</day>
- <day type="wed">য়ুমশকৈশা</day>
- <day type="thu">শগোলশেন</day>
- <day type="fri">ইরাই</day>
- <day type="sat">থাংজা</day>
- </dayWidth>
- <dayWidth type="wide">
- <day type="sun">নোংমাইজিং</day>
- <day type="mon">নিংথৌকাবা</day>
- <day type="tue">লৈবাকপোকপা</day>
- <day type="wed">য়ুমশকৈশা</day>
- <day type="thu">শগোলশেন</day>
- <day type="fri">ইরাই</day>
- <day type="sat">থাংজা</day>
- </dayWidth>
- </dayContext>
- </days>
- <quarters>
- <quarterContext type="format">
- <quarterWidth type="abbreviated">
- <quarter type="1">অহানবা মসুং</quarter>
- <quarter type="2">অনীশুবা মসুং</quarter>
- <quarter type="3">অহুমশুবা মসুং</quarter>
- <quarter type="4">মরীশুবা মসুং</quarter>
- </quarterWidth>
- <quarterWidth type="wide">
- <quarter type="1">অহানবা মসুং</quarter>
- <quarter type="2">অনীশুবা মসুং</quarter>
- <quarter type="3">অহুমশুবা মসুং</quarter>
- <quarter type="4">মরীশুবা মসুং</quarter>
- </quarterWidth>
- </quarterContext>
- </quarters>
- <dayPeriods>
- <dayPeriodContext type="format">
- <dayPeriodWidth type="abbreviated">
- <dayPeriod type="am">নুমাং</dayPeriod>
- <dayPeriod type="pm">নুতুং</dayPeriod>
- </dayPeriodWidth>
- </dayPeriodContext>
- </dayPeriods>
- <dateFormats>
- <dateFormatLength type="full">
- <dateFormat>
- <pattern draft="unconfirmed">EEEE, d MMMM, y</pattern>
- </dateFormat>
- </dateFormatLength>
- <dateFormatLength type="long">
- <dateFormat>
- <pattern draft="unconfirmed">d MMMM, y</pattern>
- </dateFormat>
- </dateFormatLength>
- <dateFormatLength type="medium">
- <dateFormat>
- <pattern draft="unconfirmed">dd-MM-y</pattern>
- </dateFormat>
- </dateFormatLength>
- <dateFormatLength type="short">
- <dateFormat>
- <pattern draft="unconfirmed">d-M-y</pattern>
- </dateFormat>
- </dateFormatLength>
- </dateFormats>
- <timeFormats>
- <timeFormatLength type="full">
- <timeFormat>
- <pattern draft="unconfirmed">h.mm.ss a zzzz</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="long">
- <timeFormat>
- <pattern draft="unconfirmed">h.mm.ss a z</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="medium">
- <timeFormat>
- <pattern draft="unconfirmed">h.mm.ss a</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="short">
- <timeFormat>
- <pattern draft="unconfirmed">h.mm. a</pattern>
- </timeFormat>
- </timeFormatLength>
- </timeFormats>
- </calendar>
- </calendars>
- <fields>
- <field type="era">
- <displayName>চক</displayName>
- </field>
- <field type="year">
- <displayName>চহী</displayName>
- </field>
- <field type="month">
- <displayName>থা</displayName>
- </field>
- <field type="week">
- <displayName>চয়োল</displayName>
- </field>
- <field type="day">
- <displayName>নুমিৎ</displayName>
- </field>
- <field type="hour">
- <displayName>পুং</displayName>
- </field>
- <field type="minute">
- <displayName draft="contributed">মীৎকুপ</displayName>
- </field>
- <field type="second">
- <displayName draft="contributed">সেকেণ্ড</displayName>
- </field>
- <field type="zone">
- <displayName>মতুপ</displayName>
- </field>
- </fields>
- </dates>
- <numbers>
- <defaultNumberingSystem>beng</defaultNumberingSystem>
- </numbers>
-</ldml>
diff --git a/seed/main/mni_Mtei.xml b/seed/main/mni_Mtei.xml
new file mode 100644
index 0000000..57b02f2
--- /dev/null
+++ b/seed/main/mni_Mtei.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="mni"/>
+ <script type="Mtei"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="mni" draft="contributed">ꯃꯤꯇꯩꯂꯣꯟ</language>
+ </languages>
+ <scripts>
+ <script type="Beng" draft="contributed">ꯕꯪꯂꯥ</script>
+ <script type="Mtei" draft="contributed">ꯃꯤꯇꯩ ꯃꯌꯦꯛ</script>
+ </scripts>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[꯬ ꯀ ꯁ ꯂ ꯃ ꯄ ꯅ ꯆ ꯇ ꯈ ꯉ ꯊ ꯋ ꯌ ꯍ ꯎ ꯏ ꯐ ꯑ ꯒ ꯓ ꯔ ꯕ ꯖ ꯗ ꯘ ꯙ ꯚ ꯣ ꯤ \uABE5 ꯦ ꯧ \uABE8 ꯩ ꯪ ꯛ ꯜ ꯝ ꯞ ꯟ ꯠ ꯡ ꯢ \uABED]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % + 0꯰ 1꯱ 2꯲ 3꯳ 4꯴ 5꯵ 6꯶ 7꯷ 8꯸ 9꯹]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="provisional">[\- ‑ , ; \: ! ? . … ꯫ ' " ( ) \[ \] @ * / \& #]</exemplarCharacters>
+ </characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern draft="unconfirmed">EEEE, d MMMM, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern draft="unconfirmed">d MMMM, y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern draft="unconfirmed">dd-MM-y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern draft="unconfirmed">d-M-y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern draft="unconfirmed">h.mm.ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern draft="unconfirmed">h.mm.ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern draft="unconfirmed">h.mm.ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern draft="unconfirmed">h.mm. a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem>mtei</defaultNumberingSystem>
+ </numbers>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/seed/main/mni_Mtei_IN.xml
similarity index 87%
copy from seed/main/mni_IN.xml
copy to seed/main/mni_Mtei_IN.xml
index 01c64c4..ccdcfc0 100644
--- a/seed/main/mni_IN.xml
+++ b/seed/main/mni_Mtei_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -9,6 +9,7 @@
<identity>
<version number="$Revision$"/>
<language type="mni"/>
+ <script type="Mtei"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/seed/main/moh.xml b/seed/main/moh.xml
index 01d6e35..7fd5233 100644
--- a/seed/main/moh.xml
+++ b/seed/main/moh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -26,4 +26,32 @@
<exemplarCharacters type="auxiliary">[b c d f g j l m p q u v x z]</exemplarCharacters>
<exemplarCharacters type="index">[A E H I K N O R S T W Y]</exemplarCharacters>
</characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
</ldml>
diff --git a/seed/main/moh_CA.xml b/seed/main/moh_CA.xml
index bc06b03..a449770 100644
--- a/seed/main/moh_CA.xml
+++ b/seed/main/moh_CA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ms_Arab.xml b/seed/main/ms_Arab.xml
index 5639f19..c977a45 100644
--- a/seed/main/ms_Arab.xml
+++ b/seed/main/ms_Arab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -208,49 +208,6 @@
</dateFormats>
</calendar>
<calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">احد</day>
- <day type="mon" draft="unconfirmed">اثنين</day>
- <day type="tue" draft="unconfirmed">ثلاث</day>
- <day type="wed" draft="unconfirmed">رابو</day>
- <day type="thu" draft="unconfirmed">خميس</day>
- <day type="fri" draft="unconfirmed">جمعة</day>
- <day type="sat" draft="unconfirmed">سبتو</day>
- </dayWidth>
- </dayContext>
- </days>
- <quarters>
- <quarterContext type="format">
- <quarterWidth type="abbreviated">
- <quarter type="1" draft="unconfirmed">سوکو 1</quarter>
- <quarter type="2" draft="unconfirmed">سوکو ک-2</quarter>
- <quarter type="3" draft="unconfirmed">سوکو ک-3</quarter>
- <quarter type="4" draft="unconfirmed">سوکو ک-4</quarter>
- </quarterWidth>
- <quarterWidth type="wide">
- <quarter type="1" draft="unconfirmed">سوکو ڤرتام</quarter>
- <quarter type="2" draft="unconfirmed">سوکو ک-2</quarter>
- <quarter type="3" draft="unconfirmed">سوکو ک-3</quarter>
- <quarter type="4" draft="unconfirmed">سوکو ک-4</quarter>
- </quarterWidth>
- </quarterContext>
- <quarterContext type="stand-alone">
- <quarterWidth type="abbreviated">
- <quarter type="1" draft="unconfirmed">سوکو 1</quarter>
- <quarter type="2" draft="unconfirmed">سوکو ک-2</quarter>
- <quarter type="3" draft="unconfirmed">سوکو ک-3</quarter>
- <quarter type="4" draft="unconfirmed">سوکو ک-4</quarter>
- </quarterWidth>
- <quarterWidth type="wide">
- <quarter type="1" draft="unconfirmed">سوکو ڤرتام</quarter>
- <quarter type="2" draft="unconfirmed">سوکو ک-2</quarter>
- <quarter type="3" draft="unconfirmed">سوکو ک-3</quarter>
- <quarter type="4" draft="unconfirmed">سوکو ک-4</quarter>
- </quarterWidth>
- </quarterContext>
- </quarters>
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
@@ -273,28 +230,6 @@
</dateFormat>
</dateFormatLength>
</dateFormats>
- <timeFormats>
- <timeFormatLength type="full">
- <timeFormat>
- <pattern>h:mm:ss a zzzz</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="long">
- <timeFormat>
- <pattern>h:mm:ss a z</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="medium">
- <timeFormat>
- <pattern>h:mm:ss a</pattern>
- </timeFormat>
- </timeFormatLength>
- <timeFormatLength type="short">
- <timeFormat>
- <pattern>h:mm a</pattern>
- </timeFormat>
- </timeFormatLength>
- </timeFormats>
<dateTimeFormats>
<dateTimeFormatLength type="full">
<dateTimeFormat>
diff --git a/seed/main/ms_Arab_BN.xml b/seed/main/ms_Arab_BN.xml
index 02b3fff..6d45566 100644
--- a/seed/main/ms_Arab_BN.xml
+++ b/seed/main/ms_Arab_BN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ms_Arab_MY.xml b/seed/main/ms_Arab_MY.xml
index e926f1f..9e14dc3 100644
--- a/seed/main/ms_Arab_MY.xml
+++ b/seed/main/ms_Arab_MY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/mus.xml b/seed/main/mus.xml
index 3d9207c..1f340a9 100644
--- a/seed/main/mus.xml
+++ b/seed/main/mus.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/mus_US.xml b/seed/main/mus_US.xml
index 474f59c..f4d1145 100644
--- a/seed/main/mus_US.xml
+++ b/seed/main/mus_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/myv.xml b/seed/main/myv.xml
index 1c77407..6423a3a 100644
--- a/seed/main/myv.xml
+++ b/seed/main/myv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -32,7 +32,6 @@
<language type="fr" draft="unconfirmed">французонь кель</language>
<language type="fr_CA" draft="unconfirmed">Канадань французонь кель</language>
<language type="fr_CH" draft="unconfirmed">Швецариянь французонь кель</language>
- <language type="hi" draft="unconfirmed">↑↑↑</language>
<language type="ja" draft="unconfirmed">япононь кель</language>
<language type="ko" draft="unconfirmed">Кореань кель</language>
<language type="myv">эрзянь кель</language>
diff --git a/seed/main/myv_RU.xml b/seed/main/myv_RU.xml
index 218a335..12f6c60 100644
--- a/seed/main/myv_RU.xml
+++ b/seed/main/myv_RU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/nqo.xml b/seed/main/nqo.xml
index a0be95c..48cba15 100644
--- a/seed/main/nqo.xml
+++ b/seed/main/nqo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="nqo"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="nqo" draft="contributed">ߒߞߏ</language>
+ </languages>
+ </localeDisplayNames>
<layout>
<orientation>
<characterOrder>right-to-left</characterOrder>
diff --git a/seed/main/nqo_GN.xml b/seed/main/nqo_GN.xml
index e7f4bef..2b26a98 100644
--- a/seed/main/nqo_GN.xml
+++ b/seed/main/nqo_GN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/nr.xml b/seed/main/nr.xml
index 6f3da02..db9fad9 100644
--- a/seed/main/nr.xml
+++ b/seed/main/nr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/nr_ZA.xml b/seed/main/nr_ZA.xml
index 8d7b34f..7370994 100644
--- a/seed/main/nr_ZA.xml
+++ b/seed/main/nr_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/nso.xml b/seed/main/nso.xml
index 4986378..8cbc148 100644
--- a/seed/main/nso.xml
+++ b/seed/main/nso.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/nso_ZA.xml b/seed/main/nso_ZA.xml
index f3df806..73905c2 100644
--- a/seed/main/nso_ZA.xml
+++ b/seed/main/nso_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ny.xml b/seed/main/ny.xml
index 6500337..49b6f47 100644
--- a/seed/main/ny.xml
+++ b/seed/main/ny.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="ny"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="ny" draft="contributed">Nyanja</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a b c d e f g h i j k l m n o p r s t u w ŵ y z]</exemplarCharacters>
<exemplarCharacters type="auxiliary">[q v x]</exemplarCharacters>
@@ -17,30 +22,6 @@
</characters>
<dates>
<calendars>
- <calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="abbreviated">
- <day type="sun" draft="unconfirmed">Mul</day>
- <day type="mon" draft="unconfirmed">Lem</day>
- <day type="tue" draft="unconfirmed">Wir</day>
- <day type="wed" draft="unconfirmed">Tat</day>
- <day type="thu" draft="unconfirmed">Nai</day>
- <day type="fri" draft="unconfirmed">San</day>
- <day type="sat" draft="unconfirmed">Wer</day>
- </dayWidth>
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">Lamulungu</day>
- <day type="mon" draft="unconfirmed">Lolemba</day>
- <day type="tue" draft="unconfirmed">Lachiwiri</day>
- <day type="wed" draft="unconfirmed">Lachitatu</day>
- <day type="thu" draft="unconfirmed">Lachinayi</day>
- <day type="fri" draft="unconfirmed">Lachisanu</day>
- <day type="sat" draft="unconfirmed">Loweruka</day>
- </dayWidth>
- </dayContext>
- </days>
- </calendar>
<calendar type="gregorian">
<months>
<monthContext type="format">
@@ -96,6 +77,28 @@
</dayWidth>
</dayContext>
</days>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
</calendar>
</calendars>
</dates>
diff --git a/seed/main/ny_MW.xml b/seed/main/ny_MW.xml
index 212e651..9864baa 100644
--- a/seed/main/ny_MW.xml
+++ b/seed/main/ny_MW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/oc.xml b/seed/main/oc.xml
index 201f29a..94b8327 100644
--- a/seed/main/oc.xml
+++ b/seed/main/oc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -326,21 +326,6 @@
</characters>
<dates>
<calendars>
- <calendar type="generic">
- <days>
- <dayContext type="format">
- <dayWidth type="wide">
- <day type="sun" draft="unconfirmed">dimenge</day>
- <day type="mon" draft="unconfirmed">diluns</day>
- <day type="tue" draft="unconfirmed">dimarç</day>
- <day type="wed" draft="unconfirmed">dimècres</day>
- <day type="thu" draft="unconfirmed">dijòus</day>
- <day type="fri" draft="unconfirmed">divendres</day>
- <day type="sat" draft="unconfirmed">dissabte</day>
- </dayWidth>
- </dayContext>
- </days>
- </calendar>
<calendar type="gregorian">
<months>
<monthContext type="format">
diff --git a/seed/main/oc_FR.xml b/seed/main/oc_FR.xml
index d47049c..7d74d70 100644
--- a/seed/main/oc_FR.xml
+++ b/seed/main/oc_FR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/osa.xml b/seed/main/osa.xml
index 8150b82..19991ed 100644
--- a/seed/main/osa.xml
+++ b/seed/main/osa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/osa_US.xml b/seed/main/osa_US.xml
index 8c59663..f067fb2 100644
--- a/seed/main/osa_US.xml
+++ b/seed/main/osa_US.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/quc.xml b/seed/main/quc.xml
index b4a96c7..ddaff33 100644
--- a/seed/main/quc.xml
+++ b/seed/main/quc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/quc_GT.xml b/seed/main/quc_GT.xml
index 1566ea8..5ac95a6 100644
--- a/seed/main/quc_GT.xml
+++ b/seed/main/quc_GT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sa.xml b/seed/main/sa.xml
index 2838f7b..3ce9596 100644
--- a/seed/main/sa.xml
+++ b/seed/main/sa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -47,7 +47,7 @@
</territories>
</localeDisplayNames>
<characters>
- <exemplarCharacters>[\u0951\u0952 \u093C \u0901 \u0902 ः ॐ अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0962 \u0963 \u0947 \u0948 ो ौ \u094D]</exemplarCharacters>
+ <exemplarCharacters>[\u0951\u0952 \u093C \u0901 \u0902 ः ॐ अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0962 \u0963 \u0947 \u0948 ो ौ \u094D]</exemplarCharacters>
<exemplarCharacters type="auxiliary">[\u200C\u200D ऍ ऑ \u0945 ॉ]</exemplarCharacters>
<exemplarCharacters type="index" draft="contributed">[अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह]</exemplarCharacters>
</characters>
diff --git a/seed/main/sa_IN.xml b/seed/main/sa_IN.xml
index 60e4ace..7bdef77 100644
--- a/seed/main/sa_IN.xml
+++ b/seed/main/sa_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sat_Deva.xml b/seed/main/sat_Deva.xml
new file mode 100644
index 0000000..aa4a811
--- /dev/null
+++ b/seed/main/sat_Deva.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2020 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+ <identity>
+ <version number="$Revision$"/>
+ <language type="sat"/>
+ <script type="Deva"/>
+ </identity>
+ <localeDisplayNames>
+ <localeDisplayPattern>
+ <localePattern>{0} ({1})</localePattern>
+ <localeSeparator>{0}, {1}</localeSeparator>
+ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+ </localeDisplayPattern>
+ <languages>
+ <language type="sat" draft="contributed">सानताड़ी</language>
+ </languages>
+ <scripts>
+ <script type="Deva" draft="contributed">देवानागारी</script>
+ <script type="Olck" draft="contributed">अल चीकी</script>
+ </scripts>
+ </localeDisplayNames>
+ <characters>
+ <exemplarCharacters draft="contributed">[\u093C \u0902 अ आ ई उ ए ओ क ग च ज ञ ट ड ण त द न प ब म य र ल व स ह ा ी \u0941 \u0947 ो]</exemplarCharacters>
+ <exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]</exemplarCharacters>
+ <exemplarCharacters type="punctuation" draft="provisional">[\- ‑ , ; \: ! ? . ‘ ’ “ ” ( ) \[ \] \{ \} ॰]</exemplarCharacters>
+ </characters>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <dateFormats>
+ <dateFormatLength type="full">
+ <dateFormat>
+ <pattern draft="unconfirmed">EEEE, d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="long">
+ <dateFormat>
+ <pattern draft="unconfirmed">d MMMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="medium">
+ <dateFormat>
+ <pattern draft="unconfirmed">d MMM y</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ <dateFormatLength type="short">
+ <dateFormat>
+ <pattern draft="unconfirmed">d/M/yy</pattern>
+ </dateFormat>
+ </dateFormatLength>
+ </dateFormats>
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern draft="unconfirmed">h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
+ <numbers>
+ <defaultNumberingSystem>deva</defaultNumberingSystem>
+ </numbers>
+</ldml>
diff --git a/seed/main/mni_IN.xml b/seed/main/sat_Deva_IN.xml
similarity index 83%
copy from seed/main/mni_IN.xml
copy to seed/main/sat_Deva_IN.xml
index 01c64c4..9cf3cf1 100644
--- a/seed/main/mni_IN.xml
+++ b/seed/main/sat_Deva_IN.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,7 +8,8 @@
<ldml>
<identity>
<version number="$Revision$"/>
- <language type="mni"/>
+ <language type="sat"/>
+ <script type="Deva"/>
<territory type="IN"/>
</identity>
</ldml>
diff --git a/seed/main/sc.xml b/seed/main/sc.xml
index 309b221..3859e81 100644
--- a/seed/main/sc.xml
+++ b/seed/main/sc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -71,7 +71,7 @@
<language type="en_US" draft="unconfirmed">inglesu americanu</language>
<language type="en_US" alt="short" draft="unconfirmed">inglesu (USA)</language>
<language type="eo" draft="unconfirmed">esperanto</language>
- <language type="es" draft="unconfirmed">↑↑↑</language>
+ <language type="es" draft="unconfirmed">ispagnolu</language>
<language type="es_419" draft="unconfirmed">↑↑↑</language>
<language type="es_ES" draft="unconfirmed">↑↑↑</language>
<language type="es_MX" draft="unconfirmed">↑↑↑</language>
@@ -187,10 +187,10 @@
<language type="or" draft="unconfirmed">odia</language>
<language type="os" draft="unconfirmed">ossèticu</language>
<language type="pa" draft="unconfirmed">punjabi</language>
- <language type="pl" draft="unconfirmed">↑↑↑</language>
+ <language type="pl" draft="unconfirmed">polacu</language>
<language type="prg" draft="unconfirmed">prussianu</language>
<language type="ps" draft="unconfirmed">pashto</language>
- <language type="pt" draft="unconfirmed">↑↑↑</language>
+ <language type="pt" draft="unconfirmed">portoghesu</language>
<language type="pt_BR" draft="unconfirmed">↑↑↑</language>
<language type="pt_PT" draft="unconfirmed">↑↑↑</language>
<language type="qu" draft="unconfirmed">quechua</language>
@@ -199,8 +199,7 @@
<language type="ro" draft="unconfirmed">rumenu</language>
<language type="ro_MD" draft="unconfirmed">moldavu</language>
<language type="rof" draft="unconfirmed">rombo</language>
- <language type="root" draft="unconfirmed">root</language>
- <language type="ru" draft="unconfirmed">↑↑↑</language>
+ <language type="ru" draft="unconfirmed">russu</language>
<language type="rw" draft="unconfirmed">kinyarwanda</language>
<language type="rwk" draft="unconfirmed">rwa</language>
<language type="sa" draft="unconfirmed">sànscritu</language>
@@ -387,7 +386,7 @@
<script type="Phnx" draft="unconfirmed">fenìtziu</script>
<script type="Plrd" draft="unconfirmed">pollard miao</script>
<script type="Prti" draft="unconfirmed">pàrticu de sas iscritziones</script>
- <script type="Qaag" draft="unconfirmed">qaag</script>
+ <script type="Qaag" draft="unconfirmed">zawgyi</script>
<script type="Rjng" draft="unconfirmed">rejang</script>
<script type="Rohg" draft="unconfirmed">hanifi rohingya</script>
<script type="Runr" draft="unconfirmed">rùnicu</script>
@@ -9814,7 +9813,9 @@
</metazone>
<metazone type="Norfolk">
<long>
- <standard draft="unconfirmed">Ora de s’Ìsula Norfolk</standard>
+ <generic draft="unconfirmed">Ora de s’Ìsula Norfolk</generic>
+ <standard draft="unconfirmed">Ora istandard de s’Ìsula Norfolk</standard>
+ <daylight draft="unconfirmed">Ora legale de s’Ìsula Norfolk</daylight>
</long>
</metazone>
<metazone type="Noronha">
@@ -12153,7 +12154,7 @@
<unitPattern count="one" draft="unconfirmed">{0} fortza g</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} fortza g</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">metros a su segundu cuadradu</displayName>
<unitPattern count="one" draft="unconfirmed">{0} metru a su segundu cuadradu</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} metros a su segundu cuadradu</unitPattern>
@@ -12253,7 +12254,7 @@
<unitPattern count="one" draft="unconfirmed">{0} millimole pro litru</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} millimoles pro litru</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">partes pro millione</displayName>
<unitPattern count="one" draft="unconfirmed">{0} parte pro millione</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} partes pro millione</unitPattern>
@@ -12283,7 +12284,7 @@
<unitPattern count="one" draft="unconfirmed">{0} litru pro chilòmetru</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} litros pro chilòmetru</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">litros pro 100 chilòmetros</displayName>
<unitPattern count="one" draft="unconfirmed">{0} litru pro 100 chilòmetros</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} litros pro 100 chilòmetros</unitPattern>
@@ -12774,17 +12775,17 @@
<unitPattern count="one" draft="unconfirmed">{0} caddu-papore</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} caddos-papore</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="unconfirmed">millìmetros de mercùriu</displayName>
<unitPattern count="one" draft="unconfirmed">{0} millìmetru de mercùriu</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} millìmetros de mercùriu</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="unconfirmed">libbras pro pòddighe cuadradu</displayName>
<unitPattern count="one" draft="unconfirmed">{0} libbra pro pòddighe cuadradu</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} libbras pro pòddighe cuadradu</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="unconfirmed">pòddighes de mercùriu</displayName>
<unitPattern count="one" draft="unconfirmed">{0} pòddighe de mercùriu</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} pòddighes de mercùriu</unitPattern>
@@ -12864,7 +12865,7 @@
<unitPattern count="one" draft="unconfirmed">{0} kelvin</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} kelvins</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">libbras-pedes</displayName>
<unitPattern count="one" draft="unconfirmed">{0} libbra-pede</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} libbras-pedes</unitPattern>
@@ -13034,7 +13035,7 @@
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
@@ -13134,7 +13135,7 @@
<unitPattern count="one" draft="unconfirmed">{0} mmol/l</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
@@ -13164,7 +13165,7 @@
<unitPattern count="one" draft="unconfirmed">{0} l/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">l/100km</displayName>
<unitPattern count="one" draft="unconfirmed">{0} l/100km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} l/100km</unitPattern>
@@ -13655,17 +13656,17 @@
<unitPattern count="one" draft="unconfirmed">{0} cp</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} cp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="unconfirmed">mmHg</displayName>
<unitPattern count="one" draft="unconfirmed">{0} mmHg</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0} mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
@@ -13745,7 +13746,7 @@
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">↑↑↑</unitPattern>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
@@ -13915,7 +13916,7 @@
<unitPattern count="one" draft="unconfirmed">{0}G</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
@@ -14015,7 +14016,7 @@
<unitPattern count="one" draft="unconfirmed">{0}mmol/l</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
@@ -14045,7 +14046,7 @@
<unitPattern count="one" draft="unconfirmed">{0}l/km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">l/100km</displayName>
<unitPattern count="one" draft="unconfirmed">{0}l/100km</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}l/100km</unitPattern>
@@ -14536,17 +14537,17 @@
<unitPattern count="one" draft="unconfirmed">{0}cp</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}cp</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="unconfirmed">mmHg</displayName>
<unitPattern count="one" draft="unconfirmed">{0}mmHg</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}mmHg</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">{0}psi</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}psi</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">{0}inHg</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}inHg</unitPattern>
@@ -14626,7 +14627,7 @@
<unitPattern count="one" draft="unconfirmed">{0}K</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}K</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="one" draft="unconfirmed">{0}lbf⋅ft</unitPattern>
<unitPattern count="other" draft="unconfirmed">{0}lbf⋅ft</unitPattern>
diff --git a/seed/main/sc_IT.xml b/seed/main/sc_IT.xml
index 3427100..e8b1bd9 100644
--- a/seed/main/sc_IT.xml
+++ b/seed/main/sc_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/scn.xml b/seed/main/scn.xml
index 9fc0814..247b307 100644
--- a/seed/main/scn.xml
+++ b/seed/main/scn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="scn"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="scn" draft="contributed">sicilianu</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a à â b c d ḍ e è ê f g h i í î j l m n o ò ô p q r s t u ú û v z]</exemplarCharacters>
<exemplarCharacters type="auxiliary">[ç đ é ë ə ḥ ì k š ù w x y]</exemplarCharacters>
diff --git a/seed/main/scn_IT.xml b/seed/main/scn_IT.xml
index ca054f7..226ef40 100644
--- a/seed/main/scn_IT.xml
+++ b/seed/main/scn_IT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sdh.xml b/seed/main/sdh.xml
index 4d4c359..f1b3e94 100644
--- a/seed/main/sdh.xml
+++ b/seed/main/sdh.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sdh_IQ.xml b/seed/main/sdh_IQ.xml
index 7ac0a36..a2c43e7 100644
--- a/seed/main/sdh_IQ.xml
+++ b/seed/main/sdh_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sdh_IR.xml b/seed/main/sdh_IR.xml
index 4e220ca..3333340 100644
--- a/seed/main/sdh_IR.xml
+++ b/seed/main/sdh_IR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sid.xml b/seed/main/sid.xml
index fc73a4a..c40c9c5 100644
--- a/seed/main/sid.xml
+++ b/seed/main/sid.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sid_ET.xml b/seed/main/sid_ET.xml
index 988ee10..640e7cc 100644
--- a/seed/main/sid_ET.xml
+++ b/seed/main/sid_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sma.xml b/seed/main/sma.xml
index 2d24578..52f8c20 100644
--- a/seed/main/sma.xml
+++ b/seed/main/sma.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sma_NO.xml b/seed/main/sma_NO.xml
index 6880d88..6aec105 100644
--- a/seed/main/sma_NO.xml
+++ b/seed/main/sma_NO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sma_SE.xml b/seed/main/sma_SE.xml
index 9fc376a..9f33670 100644
--- a/seed/main/sma_SE.xml
+++ b/seed/main/sma_SE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/smj.xml b/seed/main/smj.xml
index 0029263..d357065 100644
--- a/seed/main/smj.xml
+++ b/seed/main/smj.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/smj_NO.xml b/seed/main/smj_NO.xml
index c9ab702..01f9166 100644
--- a/seed/main/smj_NO.xml
+++ b/seed/main/smj_NO.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/smj_SE.xml b/seed/main/smj_SE.xml
index 14d75a2..1332480 100644
--- a/seed/main/smj_SE.xml
+++ b/seed/main/smj_SE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sms.xml b/seed/main/sms.xml
index 6ac995c..a80aaf6 100644
--- a/seed/main/sms.xml
+++ b/seed/main/sms.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/sms_FI.xml b/seed/main/sms_FI.xml
index 0ca624c..bce755d 100644
--- a/seed/main/sms_FI.xml
+++ b/seed/main/sms_FI.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ss.xml b/seed/main/ss.xml
index a0e0c1f..bd2b486 100644
--- a/seed/main/ss.xml
+++ b/seed/main/ss.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ss_SZ.xml b/seed/main/ss_SZ.xml
index de25215..4b2dff4 100644
--- a/seed/main/ss_SZ.xml
+++ b/seed/main/ss_SZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -11,4 +11,32 @@
<language type="ss"/>
<territory type="SZ"/>
</identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
</ldml>
diff --git a/seed/main/ss_ZA.xml b/seed/main/ss_ZA.xml
index e0962e9..3603249 100644
--- a/seed/main/ss_ZA.xml
+++ b/seed/main/ss_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ssy.xml b/seed/main/ssy.xml
index 37bdc3c..dc539ba 100644
--- a/seed/main/ssy.xml
+++ b/seed/main/ssy.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ssy_ER.xml b/seed/main/ssy_ER.xml
index 7899ae9..816b449 100644
--- a/seed/main/ssy_ER.xml
+++ b/seed/main/ssy_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/st.xml b/seed/main/st.xml
index 53b1ee9..6f50e00 100644
--- a/seed/main/st.xml
+++ b/seed/main/st.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/st_LS.xml b/seed/main/st_LS.xml
index 57b64d6..1d07093 100644
--- a/seed/main/st_LS.xml
+++ b/seed/main/st_LS.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -11,6 +11,34 @@
<language type="st"/>
<territory type="LS"/>
</identity>
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+ <pattern>h:mm:ss a zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+ <pattern>h:mm:ss a z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+ <pattern>h:mm:ss a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+ <pattern>h:mm a</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+ </calendar>
+ </calendars>
+ </dates>
<numbers>
<currencies>
<currency type="LSL">
diff --git a/seed/main/st_ZA.xml b/seed/main/st_ZA.xml
index 202e339..1d333a5 100644
--- a/seed/main/st_ZA.xml
+++ b/seed/main/st_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/su.xml b/seed/main/su.xml
deleted file mode 100644
index 0e79c10..0000000
--- a/seed/main/su.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
- <identity>
- <version number="$Revision$"/>
- <language type="su"/>
- </identity>
- <localeDisplayNames>
- <languages>
- <language type="su" draft="unconfirmed">Basa Sunda</language>
- </languages>
- </localeDisplayNames>
- <characters>
- <exemplarCharacters draft="unconfirmed">[a b c d e é f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
- <exemplarCharacters type="auxiliary" draft="unconfirmed">[á à ă â å ä ã ā æ ç è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]</exemplarCharacters>
- <exemplarCharacters type="index" draft="unconfirmed">[A B C D E É F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
- <exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ “ ” ( ) \[ \] /]</exemplarCharacters>
- </characters>
- <dates>
- <timeZoneNames>
- <zone type="Asia/Macau">
- <exemplarCity draft="unconfirmed">Makau</exemplarCity>
- </zone>
- </timeZoneNames>
- </dates>
- <listPatterns>
- <listPattern type="standard-short">
- <listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
- <listPatternPart type="2" draft="unconfirmed">{0} & {1}</listPatternPart>
- </listPattern>
- </listPatterns>
-</ldml>
diff --git a/seed/main/syr.xml b/seed/main/syr.xml
index 10dd9e0..89d4a91 100644
--- a/seed/main/syr.xml
+++ b/seed/main/syr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/syr_IQ.xml b/seed/main/syr_IQ.xml
index 2fff4e6..6298c8d 100644
--- a/seed/main/syr_IQ.xml
+++ b/seed/main/syr_IQ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/syr_SY.xml b/seed/main/syr_SY.xml
index 15392c9..02e4b51 100644
--- a/seed/main/syr_SY.xml
+++ b/seed/main/syr_SY.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/szl.xml b/seed/main/szl.xml
index 29cc1d3..c16044a 100644
--- a/seed/main/szl.xml
+++ b/seed/main/szl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2850,9 +2850,6 @@
<zone type="Europe/Malta">
<exemplarCity draft="unconfirmed">Malta</exemplarCity>
</zone>
- <zone type="Indian/Mauritius">
- <exemplarCity draft="unconfirmed">Mauritius</exemplarCity>
- </zone>
<zone type="Indian/Maldives">
<exemplarCity draft="unconfirmed">Malediwy</exemplarCity>
</zone>
@@ -3393,13 +3390,6 @@
<daylight draft="unconfirmed">czas zachodnioafrykański latowy</daylight>
</long>
</metazone>
- <metazone type="Alaska">
- <long>
- <generic draft="unconfirmed">Alaska</generic>
- <standard draft="unconfirmed">Alaska (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Alaska (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Almaty">
<long>
<generic draft="unconfirmed">czas ałmacki</generic>
@@ -3449,13 +3439,6 @@
<daylight draft="unconfirmed">latowy czas Anadyr</daylight>
</long>
</metazone>
- <metazone type="Apia">
- <long>
- <generic draft="unconfirmed">Apia</generic>
- <standard draft="unconfirmed">Apia (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Apia (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Aqtau">
<long>
<generic draft="unconfirmed">czas auktaucki</generic>
@@ -3554,11 +3537,6 @@
<daylight draft="unconfirmed">Bangladesz (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Bhutan">
- <long>
- <standard draft="unconfirmed">Bhutan</standard>
- </long>
- </metazone>
<metazone type="Bolivia">
<long>
<standard draft="unconfirmed">Boliwia</standard>
@@ -3571,11 +3549,6 @@
<daylight draft="unconfirmed">Brasília (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Brunei">
- <long>
- <standard draft="unconfirmed">Brunei</standard>
- </long>
- </metazone>
<metazone type="Cape_Verde">
<long>
<generic draft="unconfirmed">Wyspy Zielōnego Przilōndka</generic>
@@ -3588,20 +3561,6 @@
<standard draft="unconfirmed">Czamorro</standard>
</long>
</metazone>
- <metazone type="Chatham">
- <long>
- <generic draft="unconfirmed">Chatham</generic>
- <standard draft="unconfirmed">Chatham (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Chatham (latowy czas)</daylight>
- </long>
- </metazone>
- <metazone type="Chile">
- <long>
- <generic draft="unconfirmed">Chile</generic>
- <standard draft="unconfirmed">Chile (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Chile (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="China">
<long>
<generic draft="unconfirmed">Chiny</generic>
@@ -3647,11 +3606,6 @@
<daylight draft="unconfirmed">Kuba (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Davis">
- <long>
- <standard draft="unconfirmed">Davis</standard>
- </long>
- </metazone>
<metazone type="DumontDUrville">
<long>
<standard draft="unconfirmed">Dumont-d’Urville</standard>
@@ -3739,11 +3693,6 @@
<standard draft="unconfirmed">Francuske Terytoria Połedniowe i Antarktyczne</standard>
</long>
</metazone>
- <metazone type="Galapagos">
- <long>
- <standard draft="unconfirmed">Galapagos</standard>
- </long>
- </metazone>
<metazone type="Gambier">
<long>
<standard draft="unconfirmed">Wyspy Gambiera</standard>
@@ -3841,13 +3790,6 @@
<standard draft="unconfirmed">Indōnezyjo Zachodnio</standard>
</long>
</metazone>
- <metazone type="Iran">
- <long>
- <generic draft="unconfirmed">Iran</generic>
- <standard draft="unconfirmed">Iran (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Iran (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Irkutsk">
<long>
<generic draft="unconfirmed">Irkuck</generic>
@@ -3886,18 +3828,6 @@
<standard draft="unconfirmed">Kazachstan Zachodni</standard>
</long>
</metazone>
- <metazone type="Korea">
- <long>
- <generic draft="unconfirmed">Korea</generic>
- <standard draft="unconfirmed">Korea (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Korea (latowy czas)</daylight>
- </long>
- </metazone>
- <metazone type="Kosrae">
- <long>
- <standard draft="unconfirmed">Kosrae</standard>
- </long>
- </metazone>
<metazone type="Krasnoyarsk">
<long>
<generic draft="unconfirmed">Krasnojarsk</generic>
@@ -3922,18 +3852,6 @@
<daylight draft="unconfirmed">Lord Howe (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Macquarie">
- <long>
- <standard draft="unconfirmed">Macquarie</standard>
- </long>
- </metazone>
- <metazone type="Magadan">
- <long>
- <generic draft="unconfirmed">Magadan</generic>
- <standard draft="unconfirmed">Magadan (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Magadan (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Malaysia">
<long>
<standard draft="unconfirmed">Malezyjo</standard>
@@ -3954,18 +3872,6 @@
<standard draft="unconfirmed">Wyspy Marshalla</standard>
</long>
</metazone>
- <metazone type="Mauritius">
- <long>
- <generic draft="unconfirmed">Mauritius</generic>
- <standard draft="unconfirmed">Mauritius (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Mauritius (latowy czas)</daylight>
- </long>
- </metazone>
- <metazone type="Mawson">
- <long>
- <standard draft="unconfirmed">Mawson</standard>
- </long>
- </metazone>
<metazone type="Mexico_Northwest">
<long>
<generic draft="unconfirmed">Meksyk Pōłnocno-Zachodni</generic>
@@ -3999,16 +3905,6 @@
<standard draft="unconfirmed">Mjanma</standard>
</long>
</metazone>
- <metazone type="Nauru">
- <long>
- <standard draft="unconfirmed">Nauru</standard>
- </long>
- </metazone>
- <metazone type="Nepal">
- <long>
- <standard draft="unconfirmed">Nepal</standard>
- </long>
- </metazone>
<metazone type="New_Caledonia">
<long>
<generic draft="unconfirmed">Nowo Kaledōnijo</generic>
@@ -4030,16 +3926,6 @@
<daylight draft="unconfirmed">Nowo Fundlandyjo (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Niue">
- <long>
- <standard draft="unconfirmed">Niue</standard>
- </long>
- </metazone>
- <metazone type="Norfolk">
- <long>
- <standard draft="unconfirmed">Norfolk</standard>
- </long>
- </metazone>
<metazone type="Noronha">
<long>
<generic draft="unconfirmed">Fernando de Noronha</generic>
@@ -4061,18 +3947,6 @@
<daylight draft="unconfirmed">Ômsk (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Pakistan">
- <long>
- <generic draft="unconfirmed">Pakistan</generic>
- <standard draft="unconfirmed">Pakistan (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Pakistan (latowy czas)</daylight>
- </long>
- </metazone>
- <metazone type="Palau">
- <long>
- <standard draft="unconfirmed">Palau</standard>
- </long>
- </metazone>
<metazone type="Papua_New_Guinea">
<long>
<standard draft="unconfirmed">Papua-Nowo Gwinea</standard>
@@ -4085,13 +3959,6 @@
<daylight draft="unconfirmed">Paragwaj (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Peru">
- <long>
- <generic draft="unconfirmed">Peru</generic>
- <standard draft="unconfirmed">Peru (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Peru (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Philippines">
<long>
<generic draft="unconfirmed">Filipiny</generic>
@@ -4111,11 +3978,6 @@
<daylight draft="unconfirmed">Saint-Pierre i Miquelon (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Pitcairn">
- <long>
- <standard draft="unconfirmed">Pitcairn</standard>
- </long>
- </metazone>
<metazone type="Ponape">
<long>
<standard draft="unconfirmed">Pohnpei</standard>
@@ -4133,16 +3995,6 @@
<daylight draft="unconfirmed">czas kyzyłordzki latowy</daylight>
</long>
</metazone>
- <metazone type="Reunion">
- <long>
- <standard draft="unconfirmed">Reunion</standard>
- </long>
- </metazone>
- <metazone type="Rothera">
- <long>
- <standard draft="unconfirmed">Rothera</standard>
- </long>
- </metazone>
<metazone type="Sakhalin">
<long>
<generic draft="unconfirmed">Sachalin</generic>
@@ -4157,13 +4009,6 @@
<daylight draft="unconfirmed">czas Samara latowy</daylight>
</long>
</metazone>
- <metazone type="Samoa">
- <long>
- <generic draft="unconfirmed">Samoa</generic>
- <standard draft="unconfirmed">Samoa (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Samoa (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Seychelles">
<long>
<standard draft="unconfirmed">Seszele</standard>
@@ -4189,16 +4034,6 @@
<standard draft="unconfirmed">Surinam</standard>
</long>
</metazone>
- <metazone type="Syowa">
- <long>
- <standard draft="unconfirmed">Syowa</standard>
- </long>
- </metazone>
- <metazone type="Tahiti">
- <long>
- <standard draft="unconfirmed">Tahiti</standard>
- </long>
- </metazone>
<metazone type="Taipei">
<long>
<generic draft="unconfirmed">Tajpej</generic>
@@ -4211,11 +4046,6 @@
<standard draft="unconfirmed">Tadżykistan</standard>
</long>
</metazone>
- <metazone type="Tokelau">
- <long>
- <standard draft="unconfirmed">Tokelau</standard>
- </long>
- </metazone>
<metazone type="Tonga">
<long>
<generic draft="unconfirmed">Tōnga</generic>
@@ -4235,11 +4065,6 @@
<daylight draft="unconfirmed">Turkmynistan (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Tuvalu">
- <long>
- <standard draft="unconfirmed">Tuvalu</standard>
- </long>
- </metazone>
<metazone type="Uruguay">
<long>
<generic draft="unconfirmed">Urugwaj</generic>
@@ -4247,20 +4072,6 @@
<daylight draft="unconfirmed">Urugwaj (latowy czas)</daylight>
</long>
</metazone>
- <metazone type="Uzbekistan">
- <long>
- <generic draft="unconfirmed">Uzbekistan</generic>
- <standard draft="unconfirmed">Uzbekistan (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Uzbekistan (latowy czas)</daylight>
- </long>
- </metazone>
- <metazone type="Vanuatu">
- <long>
- <generic draft="unconfirmed">Vanuatu</generic>
- <standard draft="unconfirmed">Vanuatu (sztandardowy czas)</standard>
- <daylight draft="unconfirmed">Vanuatu (latowy czas)</daylight>
- </long>
- </metazone>
<metazone type="Venezuela">
<long>
<standard draft="unconfirmed">Wynezuela</standard>
@@ -4285,11 +4096,6 @@
<standard draft="unconfirmed">Wostok</standard>
</long>
</metazone>
- <metazone type="Wake">
- <long>
- <standard draft="unconfirmed">Wake</standard>
- </long>
- </metazone>
<metazone type="Wallis">
<long>
<standard draft="unconfirmed">Wallis i Futuna</standard>
@@ -4389,7 +4195,7 @@
<displayName draft="unconfirmed">stało grawitacyje</displayName>
<unitPattern count="other" draft="unconfirmed">{0} stałyj grawitacyje</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">metry na sekunda do kwadratu</displayName>
<unitPattern count="other" draft="unconfirmed">{0} metra na sekunda do kwadratu</unitPattern>
</unit>
@@ -4470,7 +4276,7 @@
<displayName draft="unconfirmed">milimole na liter</displayName>
<unitPattern count="other" draft="unconfirmed">{0} milimola na liter</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">czyńści na milijōn</displayName>
<unitPattern count="other" draft="unconfirmed">{0} czyńści na milijōn</unitPattern>
</unit>
@@ -4494,7 +4300,7 @@
<displayName draft="unconfirmed">litry na kilōmeter</displayName>
<unitPattern count="other" draft="unconfirmed">{0} litra na kilōmeter</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">litry na 100 kilōmetrōw</displayName>
<unitPattern count="other" draft="unconfirmed">{0} litra na 100 kilōmetrōw</unitPattern>
</unit>
@@ -4878,15 +4684,15 @@
<displayName draft="unconfirmed">kōnie mechaniczne</displayName>
<unitPattern count="other" draft="unconfirmed">{0} kōnia mechanicznego</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="unconfirmed">milimetry supa rtyńci</displayName>
<unitPattern count="other" draft="unconfirmed">{0} milimetra supa rtyńci</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="unconfirmed">fōnty na col kwadratowy</displayName>
<unitPattern count="other" draft="unconfirmed">{0} fōnta na col kwadratowy</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="unconfirmed">cole supa rtyńci</displayName>
<unitPattern count="other" draft="unconfirmed">{0} cola supa rtyńci</unitPattern>
</unit>
@@ -4950,7 +4756,7 @@
<displayName draft="unconfirmed">kelwiny</displayName>
<unitPattern count="other" draft="unconfirmed">{0} kelwina</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">stopofunty</displayName>
<unitPattern count="other" draft="unconfirmed">{0} stopofunt</unitPattern>
</unit>
@@ -5086,7 +4892,7 @@
<displayName draft="unconfirmed">G</displayName>
<unitPattern count="other" draft="unconfirmed">{0} G</unitPattern>
</unit>
- <unit type="acceleration-meter-per-second-squared">
+ <unit type="acceleration-meter-per-square-second">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
@@ -5167,7 +4973,7 @@
<displayName draft="unconfirmed">milimole/liter</displayName>
<unitPattern count="other" draft="unconfirmed">{0} mmol/l</unitPattern>
</unit>
- <unit type="concentr-part-per-million">
+ <unit type="concentr-permillion">
<displayName draft="unconfirmed">czyńści/miliōn</displayName>
<unitPattern count="other" draft="unconfirmed">{0} cz/mln</unitPattern>
</unit>
@@ -5191,7 +4997,7 @@
<displayName draft="unconfirmed">l/km</displayName>
<unitPattern count="other" draft="unconfirmed">{0} l/km</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">l/100 km</displayName>
<unitPattern count="other" draft="unconfirmed">{0} l/100 km</unitPattern>
</unit>
@@ -5575,15 +5381,15 @@
<displayName draft="unconfirmed">KM</displayName>
<unitPattern count="other" draft="unconfirmed">{0} KM</unitPattern>
</unit>
- <unit type="pressure-millimeter-of-mercury">
+ <unit type="pressure-millimeter-ofhg">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-pound-per-square-inch">
+ <unit type="pressure-pound-force-per-square-inch">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="pressure-inch-hg">
+ <unit type="pressure-inch-ofhg">
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
@@ -5647,7 +5453,7 @@
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="torque-pound-foot">
+ <unit type="torque-pound-force-foot">
<displayName draft="unconfirmed">lbf⋅ft</displayName>
<unitPattern count="other" draft="unconfirmed">{0} lbf⋅ft</unitPattern>
</unit>
@@ -5792,7 +5598,7 @@
<displayName draft="unconfirmed">↑↑↑</displayName>
<unitPattern count="other" draft="unconfirmed">↑↑↑</unitPattern>
</unit>
- <unit type="consumption-liter-per-100kilometers">
+ <unit type="consumption-liter-per-100-kilometer">
<displayName draft="unconfirmed">l/100 km</displayName>
<unitPattern count="other" draft="unconfirmed">{0} l/100 km</unitPattern>
</unit>
diff --git a/seed/main/szl_PL.xml b/seed/main/szl_PL.xml
index 00bee85..77cb274 100644
--- a/seed/main/szl_PL.xml
+++ b/seed/main/szl_PL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/tig.xml b/seed/main/tig.xml
index a35cc0b..4aad5f2 100644
--- a/seed/main/tig.xml
+++ b/seed/main/tig.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/tig_ER.xml b/seed/main/tig_ER.xml
index 0fcdbe6..76f8fb7 100644
--- a/seed/main/tig_ER.xml
+++ b/seed/main/tig_ER.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/tn.xml b/seed/main/tn.xml
index 8d4f6d1..7b74758 100644
--- a/seed/main/tn.xml
+++ b/seed/main/tn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/tn_BW.xml b/seed/main/tn_BW.xml
index 5c58294..6ca7ab0 100644
--- a/seed/main/tn_BW.xml
+++ b/seed/main/tn_BW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/tn_ZA.xml b/seed/main/tn_ZA.xml
index c9debf5..b1d8af8 100644
--- a/seed/main/tn_ZA.xml
+++ b/seed/main/tn_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/trv.xml b/seed/main/trv.xml
index 6806813..1f42894 100644
--- a/seed/main/trv.xml
+++ b/seed/main/trv.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -24,6 +24,7 @@
<language type="pt_BR" draft="provisional">patas Pajey</language>
<language type="ru" draft="provisional">patas Ruski</language>
<language type="sr" draft="provisional">patas Srpian</language>
+ <language type="trv" draft="contributed">patas Taroko</language>
<language type="und" draft="provisional">Ini klayna patas ni</language>
<language type="ur" draft="provisional">patas Yurtu</language>
<language type="zh" draft="provisional">patas Ipaw</language>
diff --git a/seed/main/trv_TW.xml b/seed/main/trv_TW.xml
index 2973343..afe07db 100644
--- a/seed/main/trv_TW.xml
+++ b/seed/main/trv_TW.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ts.xml b/seed/main/ts.xml
index 6ac744b..3541f59 100644
--- a/seed/main/ts.xml
+++ b/seed/main/ts.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ts_ZA.xml b/seed/main/ts_ZA.xml
index 71b3a3c..6d4dfad 100644
--- a/seed/main/ts_ZA.xml
+++ b/seed/main/ts_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/und.xml b/seed/main/und.xml
index 24e5285..1fc695c 100644
--- a/seed/main/und.xml
+++ b/seed/main/und.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/und_ZZ.xml b/seed/main/und_ZZ.xml
index 635ecdf..1fe3136 100644
--- a/seed/main/und_ZZ.xml
+++ b/seed/main/und_ZZ.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ve.xml b/seed/main/ve.xml
index c0bc18c..081f88d 100644
--- a/seed/main/ve.xml
+++ b/seed/main/ve.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/ve_ZA.xml b/seed/main/ve_ZA.xml
index f49b8d0..82f9a3f 100644
--- a/seed/main/ve_ZA.xml
+++ b/seed/main/ve_ZA.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/wa.xml b/seed/main/wa.xml
index 2dfcef8..e851f14 100644
--- a/seed/main/wa.xml
+++ b/seed/main/wa.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -10,6 +10,11 @@
<version number="$Revision$"/>
<language type="wa"/>
</identity>
+ <localeDisplayNames>
+ <languages>
+ <language type="wa" draft="contributed">walon</language>
+ </languages>
+ </localeDisplayNames>
<characters>
<exemplarCharacters>[a à â å æ b c ç d e é è ê ë f g h i î ï j k l m n o ô œ p q r s t u ù û ü v w x y ÿ z]</exemplarCharacters>
<exemplarCharacters type="auxiliary">[á ä ã ā ē í ì ī ñ ó ò ö ø ú ǔ]</exemplarCharacters>
diff --git a/seed/main/wa_BE.xml b/seed/main/wa_BE.xml
index 3f1fc5f..415bee5 100644
--- a/seed/main/wa_BE.xml
+++ b/seed/main/wa_BE.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/wal.xml b/seed/main/wal.xml
index ecaa893..ac5349b 100644
--- a/seed/main/wal.xml
+++ b/seed/main/wal.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/wal_ET.xml b/seed/main/wal_ET.xml
index 2600bec..967fd22 100644
--- a/seed/main/wal_ET.xml
+++ b/seed/main/wal_ET.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/wbp.xml b/seed/main/wbp.xml
index 813fd5a..cbec2ab 100644
--- a/seed/main/wbp.xml
+++ b/seed/main/wbp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/seed/main/wbp_AU.xml b/seed/main/wbp_AU.xml
index dd8eb53..71833af 100644
--- a/seed/main/wbp_AU.xml
+++ b/seed/main/wbp_AU.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2019 Unicode, Inc.
+<!-- Copyright © 1991-2020 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/specs/README.md b/specs/README.md
new file mode 100644
index 0000000..46ca132
--- /dev/null
+++ b/specs/README.md
@@ -0,0 +1,8 @@
+We have renamed the `specs` directory to `docs`
+so that the files may be served directly from GitHub.
+
+##### Copyright
+
+Copyright © 1991-2019 Unicode, Inc.
+All rights reserved.
+[Terms of use](http://www.unicode.org/copyright.html)
diff --git a/specs/ldml/big_red_switch.html b/specs/ldml/big_red_switch.html
deleted file mode 100644
index 9d4b597..0000000
--- a/specs/ldml/big_red_switch.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-<title>Unicode CLDR Big Red Switch</title>
-<base target="_blank">
-</head>
-
-<frameset rows="48,*">
- <frame name="main1" src="header.html" noresize scrolling="no" frameborder="0" marginwidth="0" marginheight="0" target="_top">
- <frame name="main" src="http://docs.google.com/Doc?id=dfqr8rd5_20hbnkb6" noresize frameborder="0" marginheight="0">
- <noframes>
- <body>
- <p>This page uses frames, but your browser doesn't support them. Please see <a target="_top" href="http://docs.google.com/Doc?id=dfqr8rd5_15f624ws">body-source</a>.</p>
- </body>
- </noframes>
-</frameset>
-
-</html>
diff --git a/specs/ldml/charts.html b/specs/ldml/charts.html
deleted file mode 100644
index 9e54c40..0000000
--- a/specs/ldml/charts.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
- <meta http-equiv="Content-Language" content="en-us">
-
- <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
- <meta http-equiv="Refresh" content="0; URL=comparison_charts.html">
- <title>Charts</title>
-
-
-</head>
-
-
-<body>
-
-<p>You should be redirected to:
-<a href="http://cldr.unicode.org/index/charts">http://cldr.unicode.org/index/charts</a>.
-</p>
-
-</body>
-</html>
diff --git a/specs/ldml/cldr.css b/specs/ldml/cldr.css
deleted file mode 100644
index 8cb6223..0000000
--- a/specs/ldml/cldr.css
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/* @group index */
-
-.major {font-size:95%; font-family: Arial, Geneva, sans-serif; color: #808080; font-weight:bold; }
-.minor {font-size:85%; font-family: Arial, Geneva, sans-serif; color: #808080; font-weight:400; }
-.table2 { margin-top: 1.5em; margin-bottom: 0.5em }
-
-
-/* @end */
-
-
-/* @group repository access */
-
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
-
-table.downloads tr.latest, table.downloads tr.latest td {
- font-weight: bold;
- border-bottom: 2px solid black;
-}
-
-/* @end */
-
diff --git a/specs/ldml/comparison_charts.html b/specs/ldml/comparison_charts.html
deleted file mode 100644
index d0e8bf7..0000000
--- a/specs/ldml/comparison_charts.html
+++ /dev/null
@@ -1,680 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-
-
-
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-
-
-
- <meta http-equiv="Content-Language" content="en-us">
-
-
-
-
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
-
-
-
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
-
-
-
-
- <meta name="keywords" content="Unicode, common locale data repository">
-
-
-
-
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-
-
-
-
-
-
- <title>Unicode CLDR Charts</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-
-
-
-
-
- <style type="text/css">
-<!--
-.border { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; border: 1px solid black }
-
-.borderad989d { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; background-color: #ad989d; border: 1px solid black }
-
-.border98fb98 { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; background-color: #98fb98; border: 1px solid black }
-
-.borderff6633 { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; background-color: #ff6633; border: 1px solid black }
-
-.bordercc9966 { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; background-color: #cc9966; border: 1px solid black }
-
-.borderffff33 { border-spacing: 0; border-collapse: collapse; color: black; vertical-align:
-
- top; background-color: #ffff33; border: 1px solid black }
-
--->
- </style>
-</head>
-
-
-<body text="#330000">
-
-
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td colspan="2">
-
-
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td class="icon"><a href="http://www.unicode.org/">
- <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="http://www.unicode.org/cldr/"><font size="3">Common Locale Data Repository</font></a></td>
-
-
-
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td colspan="2" class="gray"> </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navCol" valign="top" width="25%">
-
-
-
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td class="navColTitle" height="27">Contents</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#Summary_Charts">Summary Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#By-Type_Charts">By-Type Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#Survey_Tool_Charts">Survey Tool Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#Supplemental_Data_Charts">Supplemental Data Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#Transform_Charts">Transform Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="#Platform_Comparison_Charts">Platform Comparison Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> <a href="#Collation">Collation</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> <a href="#Data_Collection_Process">Data Collection Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle">Unicode CLDR</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="index.html">CLDR Project</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="survey_tool.html">CLDR Survey Tool</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="comparison_charts.html">CLDR Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="process.html">CLDR Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle">Related Links</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and Maintenance Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle">Other Publications</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- <!-- BEGIN CONTENTS --></td>
-
-
-
- <td>
-
-
-
- <div class="body">
-
-
-
- <h1 align="center">Unicode CLDR Charts</h1>
-
-
-
-
-
-
- <p>The Unicode CLDR Charts provide different ways to view the
-Common Locale Data Repository data. There are currently the following
-types of charts:</p>
-
-
-
-
-
-
- <blockquote>
-
-
-
- <p><b><a name="Survey_Tool_Charts" href="http://unicode.org/cldr/survey_tool.html">Survey Tool Charts</a></b>
-provide a view of the CLDR data designed for collecting and vetting
-data during certain periods. Most proposed data (new or corrections) is
-entered via this tool. For the schedule for the next release, see <a href="index.html">CLDR Project</a>.</p>
-
-
-
-
-
-
- <p><b><a name="Supplemental_Data_Charts" href="http://www.unicode.org/cldr/data/charts/supplemental/index.html">Supplemental Data Charts</a></b>
- show the supplemental data, data that is not part of the locale hierarchy but is still part of CLDR.</p>
-
-
-
-
-
-
- <p><b><a href="http://www.unicode.org/cldr/data/charts/summary/root.html" name="Summary_Charts">Summary Charts</a></b>
-provide a summary view of the main locale data. Language locales (those
-with no territory or variant) are presented with fully resolved data;
-the inherited or aliased data can be hidden if desired. Other locales
-do not show inherited or aliased data, just the differences from the
-respective language locale. The English value is provided for
-comparison (shown as "=" if it is equal to the localized value, and <i>n/a</i> if not available).</p>
-
-
-
-
-
-
- <p><b><a href="http://www.unicode.org/cldr/data/charts/by_type/number.pattern.html" name="By-Type_Charts">By-Type Charts</a></b>
-provide a side-by-side comparison of data from different locales for
-each field. For example, one can see all the locales that are
-left-to-right, or all the different translations of the Arabic script
-across languages. Data that is unconfirmed or provisional is marked by
-a red-italic locale ID, such as <font color="#ff6633"><i>·bn_BD·</i></font>.</p>
-
-
-
-
-
-
- <p><b><a href="http://www.unicode.org/cldr/data/charts/transforms/index.html" name="Transform_Charts">Transform Charts</a></b> show some of the
- transforms in CLDR: the transliterations between different scripts. For more on transliterations, see <a href="http://www.unicode.org/cldr/transliteration_guidelines.html">Transliteration Guidelines.</a></p>
-
- <span style="text-decoration: underline;"></span>
- <p><i>Note that some CLDR data is not yet included in the
-charts. For example, collation data does not appear.</i></p>
-
-
-
- </blockquote>
-
-
-
-
-
-
-
-
-
-
-
- <p>The format of most of the fields in the charts will be clear
-from the Name and ID, such as the months of the year. The format for
-others, such as the date or time formats, is structured and requires
-more interpretation. For more information, see <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a><a href="filing_bug_reports.html"></a>.</p>
- <p>For more details on the locale data collection process, please see the <a href="process.html">CLDR process</a>. For filing or viewing bug reports, see <a href="filing_bug_reports.html">CLDR Bug Reports</a>.</p>
-
-
-
- </div>
-
-
-
-
-
-
- <hr width="50%">
-
-
-
- <div align="center">
-
-
-
- <center>
-
-
-
- <table border="0" cellpadding="0" cellspacing="0">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
-
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js"></script>
- </center>
-
-
- </div>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-</table>
-
-
-
-
-</body>
-</html>
diff --git a/specs/ldml/corrigenda.html b/specs/ldml/corrigenda.html
deleted file mode 100644
index fbde8e5..0000000
--- a/specs/ldml/corrigenda.html
+++ /dev/null
@@ -1,509 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>CLDR - Corrigenda</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style>
-<!--
-span.changed {order-style: dotted; border-width: 1; background-color: #FFFF00}
-.e{margin-left:1em;text-indent:-1em;margin-right:1em}
-.tx{font-weight:bold}
-.c{cursor:hand}
-.b{color:red;font-family:'Courier New';font-weight:bold;text-decoration:none}
-.m{color:blue}
-.t{color:#990000}
-td, th { vertical-align: top; text-align: left}
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="http://www.unicode.org/cldr/"><font size="3">Common Locale Data
- Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">Unicode CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="survey_tool.html">CLDR Survey Tool</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="comparison_charts.html">CLDR Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="process.html">CLDR Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <h1 align="center">CLDR Corrigenda</h1>
- <blockquote>
- <p>This page lists corrigenda to versions of CLDR. Each release of CLDR is a stable
- release and may be used as reference material or cited as a normative reference by other
- specifications. Each version, once published, is absolutely stable and will never change.
- However, implementations may<font face="Arial"> —</font> and are encouraged to
- <font face="Arial">— </font>apply these corrigenda to their use of an appropriate version.
- For example, an implementation may claim conformance to <font face="Arial">“</font>CLDR
- 1.3, as amended by Corrigendum 1<font face="Arial">”</font>. </p>
- <h2>Corrigendum 1: Time zone and Date Format Pattern Correction</h2>
- <p>In CLDR version 1.3, the policy was that for a given (resolved) locale, uniqueness is
- required for time zone display names. That is, two different time zone IDs could not have
- the same display name. This policy turns out to be overly strict, and did not allow for
- customary names in cases where it does not cause a problem. The committee has relaxed this
- policy so that where the parsing results would give the same GMT offset, the standard and
- daylight display names can be the same across different time zone IDs.</p>
- <p>The short and long time zone names for Europe/London and Europe/Dublin in the <b><code>
- en.xml</code></b> locale data file had been changed because of the old policy. In
- accordance with this new policy, they are corrected by this corrigendum as follows:</p>
- <table border="1" cellpadding="0" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111" id="AutoNumber1">
- <tr>
- <th width="50%">CLDR 1.3</th>
- <th width="50%">Corrected</th>
- </tr>
- <tr>
- <td width="50%"><code><font size="2"><zone type="Europe/London"><br>
- <long><br>
- <generic>British Time</generic> <br>
- <standard>British Standard Time</standard> <br>
- <daylight>British Daylight Time</daylight> <br>
- </long><br>
- <short><br>
- <generic>BT</generic> <br>
- <standard>BST</standard> <br>
- <daylight>BDT</daylight> <br>
- </short><br>
- </zone></font></code></td>
- <td width="50%"><code><zone type="Europe/London"><br>
- <long><br>
- <standard><span class="changed">Greenwich Mean</span> Time</standard> <br>
- <daylight>British <span class="changed">Summer</span> Time</daylight> <br>
- </long><br>
- <short><br>
- <standard><span class="changed">GM</span>T</standard> <br>
- <daylight>B<span class="changed">S</span>T</daylight> <br>
- </short><br>
- </zone></code></td>
- </tr>
- <tr>
- <td width="50%">
- <p style="text-align: center"><i><font size="2">{omitted}</font></i></td>
- <td width="50%"><span class="changed"><code><zone type="Europe/Dublin"><br>
- <long><br>
- <standard>Greenwich Mean Time</standard> <br>
- <daylight>Irish Summer Time</daylight> <br>
- </long><br>
- <short><br>
- <standard>GMT</standard> <br>
- <daylight>IST</daylight> <br>
- </short><br>
- </zone></code></span></td>
- </tr>
- </table>
- <p>The data reflecting the above correction is checked into CVS under the tag <b><code>
- release-1-3-C1</code></b>. For information on the usage of this, see
- <a href="repository_access.html">CLDR Releases (Downloads)</a>.</p>
- <p>The following are corrections to the date format pattern in
- <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a>.
- The Stand-Alone months and days, and the long era names, although approved by the
- technical committee, had been omitted from the specification. The use of specific
- sequences of 'z', 'Z', and 'E' is changed to preserve backwards compatibility with Java.</p>
- <table border="1" cellpadding="0" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111" id="AutoNumber2">
- <tr>
- <th width="50%" style="vertical-align: top; text-align: left">CLDR 1.3</th>
- <th width="50%" style="vertical-align: top; text-align: left">Corrected</th>
- </tr>
- <tr>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th><font size="2">era</font></th>
- <td style="text-align: center"><font size="2">G</font></td>
- <td style="text-align: center"><font size="2">1</font><span><font size="2">..3</font></span></td>
- <td><font size="2">AD</font></td>
- <td><span><font size="2">Era - Replaced with the Era string for the current date.</font></span></td>
- </tr>
- </table>
- </th>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="2"><font size="2">era</font></th>
- <td style="text-align: center" rowspan="2"><font size="2">G</font></td>
- <td style="text-align: center"><font size="2">1</font><span><font size="2">..3</font></span></td>
- <td><font size="2">AD</font></td>
- <td rowspan="2"><span><font size="2">Era - Replaced with the Era string for the
- current date. </font><span class="changed"><font size="2">One to three letters for
- the abbreviated form, four letters for the long form.</font></span></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><font size="2">4</font></span></td>
- <td><span class="changed"><font size="2">Anno Domini</font></span></td>
- </tr>
- </table>
- </th>
- </tr>
- <tr>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="4"><font size="2">month</font></th>
- <td rowspan="4" style="text-align: center"><font size="2">M</font></td>
- <td style="text-align: center"><font size="2">1..2</font></td>
- <td><font size="2">09</font></td>
- <td rowspan="4"><span><font size="2">Month - Use one or two for the numerical
- month, three for the abbreviation, or four for the full name, or 5 for the narrow
- name.</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">3</font></td>
- <td><font size="2">Sept</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">4</font></td>
- <td><font size="2">September</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">5</font></td>
- <td><font size="2">S</font></td>
- </tr>
- </table>
- </th>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="8"><font size="2">month</font></th>
- <td rowspan="4" style="text-align: center"><font size="2">M</font></td>
- <td style="text-align: center"><font size="2">1..2</font></td>
- <td><font size="2">09</font></td>
- <td rowspan="4"><span><font size="2">Month - Use one or two for the numerical
- month, three for the abbreviation, or four for the full name, or five for the
- narrow name.</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">3</font></td>
- <td><font size="2">Sept</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">4</font></td>
- <td><font size="2">September</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">5</font></td>
- <td><font size="2">S</font></td>
- </tr>
- <tr>
- <td rowspan="4" style="text-align: center"><span class="changed"><font size="2">L</font></span></td>
- <td style="text-align: center"><span class="changed"><font size="2">1..2</font></span></td>
- <td><span class="changed"><font size="2">09</font></span></td>
- <td rowspan="4"><span class="changed"><span><b><font size="2">Stand-Alone</font></b><font size="2">
- Month - Use one or two for the numerical month, three for the abbreviation, or
- four for the full name, or 5 for the narrow name.</font></span></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><font size="2">3</font></span></td>
- <td><span class="changed"><font size="2">Sept</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><font size="2">4</font></span></td>
- <td><span class="changed"><font size="2">September</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><font size="2">5</font></span></td>
- <td><span class="changed"><font size="2">S</font></span></td>
- </tr>
- </table>
- </th>
- </tr>
- <tr>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="8"><font size="2">week<br>
- day</font></th>
- <td rowspan="4" style="text-align: center"><font size="2">E</font></td>
- <td style="text-align: center"><span><font size="2">1..2</font></span></td>
- <td><font size="2">3</font></td>
- <td rowspan="4"><span><font size="2">Day of week - Use three for the short day, or
- four for the full name, or 5 for the narrow name. Sunday is always day 1</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">3</font></span></td>
- <td><span><font size="2">Tues</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">4</font></span></td>
- <td><span><font size="2">Tuesday</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">5</font></span></td>
- <td><span><font size="2">T</font></span></td>
- </tr>
- <tr>
- <td rowspan="4" style="text-align: center"><font size="2">e</font></td>
- <td style="text-align: center"><span><font size="2">1..2</font></span></td>
- <td><font size="2">2</font></td>
- <td rowspan="4"><font size="2">Local day of week. Same as E except numeric value
- will depend on the local starting day of the week. For this example, Monday is the
- first day of the week.</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">3</font></span></td>
- <td><span><font size="2">Tues</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">4</font></span></td>
- <td><span><font size="2">Tuesday</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">5</font></span></td>
- <td><span><font size="2">T</font></span></td>
- </tr>
- </table>
- </th>
- <th width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="11"><font size="2">week<br>
- day</font></th>
- <td rowspan="3" style="text-align: center"><font size="2">E</font></td>
- <td style="text-align: center"><span><font size="2"><span class="changed">1..</span>3</font></span></td>
- <td><span><font size="2">Tues</font></span></td>
- <td rowspan="3"><span><font size="2">Day of week - Use one through three letters
- for the short day, or four for the full name, or five for the narrow name.</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">4</font></span></td>
- <td><span><font size="2">Tuesday</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">5</font></span></td>
- <td><span><font size="2">T</font></span></td>
- </tr>
- <tr>
- <td rowspan="4" style="text-align: center"><font size="2">e</font></td>
- <td style="text-align: center"><span><font size="2">1..2</font></span></td>
- <td><font size="2">2</font></td>
- <td rowspan="4"><font size="2">Local day of week. Same as E except
- <span class="changed">adds a</span> numeric value that will depend on the local
- starting day of the week, using one or two letters. For this example, Monday is
- the first day of the week.</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">3</font></span></td>
- <td><span><font size="2">Tues</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">4</font></span></td>
- <td><span><font size="2">Tuesday</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span><font size="2">5</font></span></td>
- <td><span><font size="2">T</font></span></td>
- </tr>
- <tr>
- <td rowspan="4" style="text-align: center"><span class="changed"><font size="2">c</font></span></td>
- <td style="text-align: center"><span class="changed"><span><font size="2">1</font></span></span></td>
- <td><span class="changed"><font size="2">2</font></span></td>
- <td rowspan="4"><span class="changed"><span><b><font size="2">Stand-Alone</font></b><font size="2">
- local day of week - Use one letter for the local numeric value (same as 'e'),
- three for the short day, or four for the full name, or five for the narrow name.
- </font></span></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><span><font size="2">3</font></span></span></td>
- <td><span class="changed"><span><font size="2">Tues</font></span></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><span><font size="2">4</font></span></span></td>
- <td><span class="changed"><span><font size="2">Tuesday</font></span></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><span class="changed"><span><font size="2">5</font></span></span></td>
- <td><span class="changed"><span><font size="2">T</font></span></span></td>
- </tr>
- </table>
- </th>
- </tr>
- <tr>
- <td>
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="6"><font size="2">zone</font></th>
- <td rowspan="4" style="text-align: center"><font size="2">z</font></td>
- <td style="text-align: center"><font size="2">1</font></td>
- <td><font size="2">PT</font></td>
- <td rowspan="4"><span><font size="2">Time zone. Use 1 for short wall (generic)
- time, 2 for long wall time, 3 for the short time zone (i.e. PST) or 4 for the full
- name (Pacific Standard Time). If there's no name for the zone, fallbacks may be
- used, depending on available data.</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">2</font></td>
- <td><font size="2">Pacific Time</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">3</font></td>
- <td><font size="2">PDT</font></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">4</font></td>
- <td><font size="2">Pacific Daylight Time</font></td>
- </tr>
- <tr>
- <td rowspan="2" style="text-align: center"><font size="2">Z</font></td>
- <td style="text-align: center"><font size="2">1</font></td>
- <td><font size="2">GMT-08:00</font></td>
- <td rowspan="2"><span><font size="2">Use 1 for GMT format, 2 for RFC 822</font></span></td>
- </tr>
- <tr>
- <td style="text-align: center"><font size="2">2</font></td>
- <td><font size="2">-0800</font></td>
- </tr>
- </table>
- </td>
- <td width="50%">
- <table cellSpacing="0" cellPadding="2" border="1">
- <tr>
- <th rowspan="6"><font size="2">zone</font></th>
- <td rowspan="2"><font size="2">z</font></td>
- <td><span class="changed"><font size="2">1..</font></span><font size="2">3</font></td>
- <td><span class="changed"><font size="2">PDT</font></span></td>
- <td rowspan="2"><span class="changed"><span><font size="2">Time zone - Use one to
- three letters for the short time zone or four for the full name. For more
- information, see </font></span><font size="2">Appendix J: </font>
- <a href="#Time_Zone_Fallback"><span><font size="2">Time Zone Fallback</font></span></a></span></td>
- </tr>
- <tr>
- <td><font size="2">4</font></td>
- <td><font size="2">Pacific Daylight Time</font></td>
- </tr>
- <tr>
- <td rowspan="2"><font size="2">Z</font></td>
- <td><span class="changed"><font size="2">1..3</font></span></td>
- <td><font size="2">-0800</font></td>
- <td rowspan="2"><span><font size="2">Use <span class="changed">one to three
- letters</span> for RFC 822, <span class="changed">four letters</span> for GMT
- format.</font></span></td>
- </tr>
- <tr>
- <td><span class="changed"><font size="2">4</font></span></td>
- <td><font size="2">GMT-08:00</font></td>
- </tr>
- <tr>
- <td rowspan="2"><span class="changed"><font size="2">v</font></span></td>
- <td><span class="changed"><font size="2">1</font></span></td>
- <td><span class="changed"><font size="2">PT</font></span></td>
- <td rowspan="2"><span class="changed"><span><font size="2">Use one letter for
- short wall (generic) time, four for long wall time. For more information, see
- </font></span><font size="2">Appendix J: </font><a href="#Time_Zone_Fallback">
- <span><font size="2">Time Zone Fallback</font></span></a></span></td>
- </tr>
- <tr>
- <td><span class="changed"><font size="2">4</font></span></td>
- <td><span class="changed"><font size="2">Pacific Time</font></span></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </blockquote>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/data_formats.html b/specs/ldml/data_formats.html
deleted file mode 100644
index 8dec093..0000000
--- a/specs/ldml/data_formats.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="VI60_defaultClientScript" content="JavaScript" />
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
-<meta name="keywords" content="Unicode, common locale data repository" />
-<meta name="ProgId" content="FrontPage.Editor.Document" />
-<title>CLDR - Data Formats</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css" />
-<style type="text/css">
-<!--
-span.changed {order-style: dotted; border-width: 1; background-color: #FFFF00}
-.e{margin-left:1em;text-indent:-1em;margin-right:1em}
-.tx{font-weight:bold}
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33" /></a>
- <a class="bar" href="http://www.unicode.org/cldr/"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">Unicode CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="survey_tool.html">CLDR Survey Tool</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="comparison_charts.html">CLDR Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="process.html">CLDR Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table width="666">
- <tr>
- <td class="contents" valign="top" width="660">
- <blockquote>
- <h1 align="center">CLDR Data Formats</h1>
- <p>This page has been superseded; for more information, see <a href="http://cldr.unicode.org/index/survey-tool">CLDR Survey Tool</a>.</p>
- </blockquote>
- </td>
- </tr>
- </table>
- <hr width="50%" />
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50" /></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center></div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/draft.html b/specs/ldml/draft.html
deleted file mode 100644
index b647b57..0000000
--- a/specs/ldml/draft.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>TR35 Draft Documents</title>
-</head>
-
-<body>
-
-<h2>TR35 Draft Documents</h2>
-<blockquote>
- <p>The latest working drafts are currently hosted in CVS on the ICU project, and can be found at
- the following locations.</p>
- <p><a href="http://www.unicode.org/cldr/data/docs/tr35.html">
- http://www.unicode.org/cldr/data/docs/tr35.html</a><br>
- <a href="http://www.unicode.org/cldr/data/dtd/ldml.dtd">
- http://www.unicode.org/cldr/data/dtd/ldml.dtd</a> <br>
- <a href="http://www.unicode.org/cldr/data/dtd/ldmlSupplemental.dtd">
- http://www.unicode.org/cldr/data/dtd/ldmlSupplemental.dtd</a></p>
- <p>Alpha or Beta files, if available, are found at the <a href="http://www.unicode.org/cldr/">main
- cldr page</a>.</p>
-</blockquote>
-<p> </p>
-
-</body>
-
-</html>
diff --git a/specs/ldml/errata.html b/specs/ldml/errata.html
deleted file mode 100644
index 31a21d6..0000000
--- a/specs/ldml/errata.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-<title>Unicode CLDR Errata</title>
-<base target="_blank">
-</head>
-
-<frameset rows="48,*">
- <frame name="main1" src="header.html" noresize scrolling="no" frameborder="0" marginwidth="0" marginheight="0" target="_top">
- <frame name="main" src="http://cldr.unicode.org/errata" noresize frameborder="0" marginheight="0">
- <noframes>
- <body>
- <p>This page uses frames, but your browser doesn't support them. Please see <a target="_top" href="http://cldr.unicode.org/errata">body-source</a>.</p>
- </body>
- </noframes>
-</frameset>
-
-</html>
diff --git a/specs/ldml/filing_bug_reports.html b/specs/ldml/filing_bug_reports.html
deleted file mode 100644
index a405a2e..0000000
--- a/specs/ldml/filing_bug_reports.html
+++ /dev/null
@@ -1,783 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <meta http-equiv="Content-Language" content="en-us">
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
- <meta name="keywords" content="Unicode, common locale data repository">
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
- <title>Unicode CLDR Bug Reports</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-
- <style type="text/css">
-<!--
-.e{margin-left:1em;text-indent:-1em;margin-right:1em}
-.tx{font-weight:bold}
--->
- </style>
-</head>
-
-
-
-<body text="#330000">
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
- <tbody>
- <tr>
-
- <td colspan="2">
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
- <tbody>
- <tr>
-
- <td class="icon"><a href="http://www.unicode.org/">
- <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
-
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-
- </tr>
-
-
- </tbody>
- </table>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td colspan="2" class="gray"> </td>
-
- </tr>
-
- <tr>
-
- <td class="navCol" valign="top" width="25%">
-
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-
- <tbody>
- <tr>
-
- <td class="navColTitle">Contents</td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="#Collation_Bugs">Collation Bugs</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="#Possible_Comparison_Sources">Sources</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColTitle">Unicode CLDR</td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="index.html">CLDR Project</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="survey_tool.html">CLDR Survey Tool</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="comparison_charts.html">CLDR Charts</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="process.html">CLDR Process</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColTitle">Related Links</td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and Maintenance Process</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColTitle">Other Publications</td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
-
- </tr>
-
- <tr>
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
-
- </tr>
-
-
- </tbody>
- </table>
-
- <!-- BEGIN CONTENTS --></td>
-
- <td>
-
- <table>
-
- <tbody>
- <tr>
-
- <td class="contents" valign="top">
-
- <div class="body">
-
- <h1>Unicode CLDR Bug Reports</h1>
-
-
- <p><span class="changed">Most proposed data (new or corrections) should be entered via the </span><a href="survey_tool.html">CLDR Survey Tool</a><span class="changed">.
- </span></p>
-
-
- <p>Bugs may be filed for defects in the survey tool, for
-adding or changing non-language data (such as currency usage), for
-additions or changes to data that is not yet handled by the survey tool
-(collation, segmentation, and transliteration), and for feature
-requests in CLDR or <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a>.</p>
-
-
- <p>To file such a bug, go to <a href="http://www.unicode.org/cldr/bugs/locale-bugs">Locale Bugs</a>.
-Try to give as much information as possible to help address the issue,
-and please group related bugs (such as a list of problems with the LDML
-specification) into a single bug report. Some specific cases are
-covered below.</p>
-
-
- <h2><a name="Collation_Bugs">Collation Bugs</a></h2>
-
-
- <p>The exact collation sequence for a given language may be
-difficult to determine. The base ordering of characters can be fairly
-straightforward, but there are quite a few other complications
-involved. </p>
-
-
- <p><span>Most standards that specify collation, such as DIN
-or CS, are not targeted at algorithmic sorting, and are not complete
-algorithmic specifications. For example, CSN 97 6030 requires
-transliteration of foreign scripts, but there are many choices as to
-how to transliterate, and the exact mechanism is not specified. It also
-specifies that geometric shapes are sorted by the number of vertices
-and edges, which is, at a minimum, difficult to determine; and are
-subject to variation in glyphs. </span>T<span>he CLDR goals are to match the sorting of exemplar letters
- and common punctuation and
- leave everything else to the standard UCA ordering. </span>For more information, see
- <a href="http://www.unicode.org/reports/tr10/#Introduction">UTS #10: Unicode Collation Algorithm</a> (UCA).</p>
-
-
- <p>For readability, the rules are presented here in
-Java/ICU rule format, rather than XML; for the same reason, we prefer
-the bug reports to also use that format, even though the end result
-will be in XML. For more information, see <a href="http://icu.sourceforge.net/userguide/Collate_Customization.html">ICU Collation Customization</a>.</p>
-
-
- <p>Please supply some short test cases that illustrate the
-correct sorting behavior as a list of lines in sorted order. Try to
-include cases that show the boundary behavior by including high
-suffixes, such as the following:</p>
-
-
- <ul>
-
- <li><i>Rules:</i>
-
- <ul>
-
- <li><i>& c < cs</i></li>
-
- <li>& cs <<< ccs / cs</li>
-
-
- </ul>
-
- </li>
-
- <li><i>Test Data:</i>
-
- <ul>
-
- <li><i>c<br>
-
- cy<br>
-
- cs<br>
-
- cscs<br>
-
- ccs<br>
-
- cscsy<br>
-
- ccsy<br>
-
- csy<br>
-
- d</i></li>
-
-
- </ul>
-
- </li>
-
-
- </ul>
-
-
- <p>Please test out any suggested rules before filing a bug, using Locale Explorer:</p>
-
-
- <ol>
-
- <li>Go to the <a href="http://ibm.com/software/globalization/icu/demo/locales">ICU Locale Explorer</a></li>
-
- <li>Pick the appropriate locale</li>
-
- <li>Follow the instructions at the bottom to use your suggested rules on your suggested test data.</li>
-
- <li>Verify that the proper order results.</li>
-
-
- </ol>
-
-
- <h3>Pitfalls</h3>
-
-
- <p>There are a number of pitfalls with collation, so be
-careful. In some cases, such as Hungarian or Japanese, the rules can be
-fairly complicated (of course, reflecting that the sorting sequence for
-those languages is complicated).</p>
-
-
- <ol>
-
- <li><b>Only tailor expected data. </b>We focus on the required collation sequence for a given language with normal data. So we don't include
- full-width characters for a European collation sequence, such as
-
- <ul>
-
- <li>... CSCS <<< ＣＳＣＳ ...</li>
-
- <li>... CSCS <<< \uFF23\uFF33\uFF23\uFF33 ... (equivalently)</li>
-
-
- </ul>
-
- </li>
-
- <li><b>Tailor trailing contractions. </b>If a sequence of characters is treated as a unit for collation, it should be entered as a contraction.
-
- <p>& c < ch</p>
-
-
- <p>One might think that sequence like "dz" doesn't
-require that, since it would always come after "d" followed by any
-other letter; it is a "trailing contraction". But in unusual cases,
-that wouldn't be true; if "dz" is a unit sorted as if it were a
-distinct letter after "d", one should get the ordering "d<font size="3">α" < "dz". This will only happen if "dz" is a contraction, such as</font></p>
-
-
- <p><font size="3">& d < dz</font></p>
-
- </li>
-
- <li><b>Watch out for Expansions.</b> If you have a rule like &cs < d, and "cs" has not occurred in a previous rule as a contraction, then
- this is automatically considered to be the same as &c < d / s; that is, the d <i>expands</i> as if it were a "cs" (actually, primary greater
- than a "cs", since we wrote "<"). This expansion takes effect until the next primary difference.
-
- <p>So suppose that "ccs" is to behave as if it were
-"cscs", and take case differences into account. You might try to do
-this with the rules on the left:</p>
-
-
- <table id="table3" border="1" cellpadding="4" cellspacing="0">
-
- <tbody>
- <tr>
-
- <th align="left" width="50%">Rules (Wrong)</th>
-
- <th align="left" width="50%">Actual Effect</th>
-
- </tr>
-
- <tr>
-
- <td width="50%">& C < cs <<< Cs <<< CS<br>
-
- & cscs <<< ccs<br>
-
- <<< Cscs <<< Ccs<br>
-
- <<< CSCS <<< CCS</td>
-
- <td width="50%">& C < cs <<< Cs <<< CS<br>
-
- & cs <<< ccs / cs<br>
-
- <<< Cscs / cs <<< Ccs / cs<br>
-
- <<< CSCS / cs <<< CCS / cs</td>
-
- </tr>
-
-
- </tbody>
- </table>
-
-
- <p>But since the <u>CSCS</u> has not been made a contraction in previous rules, this produces an automatic expansion, one that continues
- through the entire sequence of non-primary differences, as shown on the right. This is <i>not</i> what is wanted: each item acts like it
- expands compared to the previous item. So CCS, for example, will act like it expands to CSCScs!</p>
-
-
- <p>What you actually want is the following:</p>
-
-
- <table id="table4" border="1" cellpadding="4" cellspacing="0">
-
- <tbody>
- <tr>
-
- <th align="left" width="50%">Rules (Right)</th>
-
- <th align="left" width="50%">Actual Effect</th>
-
- </tr>
-
- <tr>
-
- <td width="50%">& C < cs <<< Cs <<< CS<br>
-
- & cscs <<< ccs<br>
-
- & Cscs <<< Ccs<br>
-
- & CSCS <<< CCS</td>
-
- <td width="50%">& C < cs <<< Cs <<< CS<br>
-
- & cs <<< ccs / cs<br>
-
- & Cs <<< Ccs / cs<br>
-
- & CS <<< CCS / CS</td>
-
- </tr>
-
-
- </tbody>
- </table>
-
-
- <p>In short, when you have expansions, it is always
-safer and clearer to express them with separate resets. There are only
-a few exceptions to this, notably when CJK characters are interleaved
-with Hangul Syllables.</p>
-
- </li>
-
- <li><b>Don't tailor what you don't have to. </b>Example: Maltese was sorting character sequences <i>before</i> a base character using the
- following style:
-
- <p>& B<br>
-
- < ċ<br>
-
- <<<Ċ<br>
-
- < c<br>
-
- <<<C</p>
-
-
- <p>This works, but is sub-optimal for two reasons. </p>
-
-
- <ol>
-
- <li>it tailors c/C when it doesn't need to be; any extra tailoring generally makes for longer sort keys.</li>
-
- <li>by tailoring c/C, it puts other those things that are after b/B after c/C instead. See
- <a href="http://www.unicode.org/charts/collation/">http://www.unicode.org/charts/collation/</a> for examples.</li>
-
-
- </ol>
-
-
- <p>The correct rules should be:</p>
-
-
- <p>& [before 1] c < ċ <<< Ċ</p>
-
-
- <p>This finds the highest primary (that's what the 1 is
-for) character less than c, and uses that as the reset point. For
-Maltese, the same technique needs to be used for ġ and ż.</p>
-
- </li>
-
- <li>Contractions can be blocked with CGJ, as described in the Unicode Standard and in the
- <a href="http://www.unicode.org/faq/char_combmark.html">Characters and Combining Marks FAQ</a>.</li>
-
- <li>Normally all combinations of case need to be supplied for contractions. That is, if <i>ch</i>
-is a contraction, then you would have the rules ... ch < cH < Ch
-< CH. The reason for this is so that all case variants sort at the
-same primary level: thus lowercasing a string will not affect its
-primary order. Cases such as <i>McHugh</i> are handled like other instances where contractions should be blocked.</li>
-
-
- </ol>
-
-
- <h2><a name="Possible_Comparison_Sources">Possible Comparison Sources</a></h2>
-
-
- <p>Sources and references may be standards or can also be dictionaries, journal style guides (such as <i>The Economist Style Guide for English</i>),
-and other available sources that provide guidance as to common
-practice. Online sources are preferred where available, since they can
-be more easily checked.</p>
-
-
- <p>The goal is to follow common, customary practice. For
-example, language or territory display names should use the most
-recognizable name in common usage. This is generally not the official
-name. For example, one would use "Switzerland" not "Swiss
-Confederation".</p>
-
-
- <p>Here are some possible resources for comparison of locale data. <i>This is <b>not</b> an endorsement of the sources, merely a collation of
- possibly-useful links. </i><font color="black" face="Arial" size="3"><span style="font-size: 12pt;">To suggest additions, </span></font>
- file a <a href="filing_bug_reports.html">Bug Report</a>.</p>
-
-
- <h3>Territory names; Language names; Gregorian/non-Gregorian month names; Day names; Exemplar characters, and Collation</h3>
-
-
- <ul>
-
- <li><a href="http://www.geonames.de/">http://www.geonames.de/</a></li>
-
-
- </ul>
-
-
- <h3><i>The Economist Style Guide</i> (unfortunately only hard copy): Currencies, Display Names, Formatting for English:</h3>
-
-
- <ul>
-
- <li><a href="http://www.amazon.com/exec/obidos/tg/detail/-/186197535X">http://www.amazon.com/exec/obidos/tg/detail/-/186197535X</a> </li>
-
-
- </ul>
-
-
- <h3><a name="Exemplar_Characters">Exemplar Characters</a></h3>
-
-
- <ul>
-
- <li><a href="http://www.eki.ee/letter/">http://www.eki.ee/letter/</a> </li>
-
- <li><a href="http://europa.eu.int/comm/eurostat/research/index.htm?http://europa.eu.int/en/comm/eurostat/research/isi/special/&1">http://europa.eu.int/comm/eurostat/research/index.htm</a></li>
-
- <li><a href="http://en.wikipedia.org/wiki/Alphabets_derived_from_the_Latin"><span>http://en.wikipedia.org/wiki/Alphabets_derived_from_the_Latin</span></a><span>
- </span></li>
-
- <li><a href="http://www.omniglot.com/writing/alphabets.htm">
- http://www.omniglot.com/writing/alphabets.htm</a> </li>
-
- <li><a href="http://www.geonames.de/">http://www.geonames.de/</a></li>
-
-
- </ul>
-
-
- <h3>Territory Names</h3>
-
-
- <ul>
-
- <li><a href="http://www.world-gazetteer.com/pronun.htm">http://www.world-gazetteer.com/pronun.htm</a></li>
-
- <li><a href="http://www.eki.ee/knn/lingid2.htm#WRLD">http://www.eki.ee/knn/lingid2.htm#WRLD</a> </li>
-
- <li><a href="http://www.p.lodz.pl/I35/personal/jw37/EUROPE/europe.html">http://www.p.lodz.pl/I35/personal/jw37/EUROPE/europe.html</a>
- </li>
-
-
- </ul>
-
-
- <h3>Currency names; Territory names (Replace es with desired language code) </h3>
-
-
- <ul>
-
- <li><a href="http://publications.eu.int/code/es/es-5000500.htm">http://publications.eu.int/code/es/es-5000500.htm</a> <br>
-
- <a href="http://publications.eu.int/code/es/es-5000700.htm">http://publications.eu.int/code/es/es-5000700.htm</a> <br>
-
- <a href="http://publications.eu.int/">http://publications.eu.int/</a> </li>
-
-
- </ul>
-
-
- <h3>Territory & Region names (Use the links at the top switch languages); </h3>
-
-
- <ul>
-
- <li><a href="http://www.worldlanguage.com/Arabic/Countries/">http://www.worldlanguage.com/Arabic/Countries/</a> </li>
-
-
- </ul>
-
-
- <h3>Exemplar/collation information</h3>
-
-
- <ul>
-
- <li><a href="http://www.omniglot.com/writing/">http://www.omniglot.com/writing/</a><br>
-
- <a href="http://www.alphabets-world.com/">http://www.alphabets-world.com/</a> <br>
-
- <a href="http://developer.mimer.com/collations/charts/">http://developer.mimer.com/collations/charts/</a> </li>
-
-
- </ul>
-
-
- <h3>Simple Translations</h3>
-
-
- <ul>
-
- <li><a href="http://world.altavista.com/">http://world.altavista.com/</a></li>
-
- <li><a href="http://www.google.com/language_tools">http://www.google.com/language_tools</a> </li>
-
-
- </ul>
-
-
- <h3>List of date/time formatting for Windows</h3>
-
-
- <ul>
-
- <li><a href="http://www.microsoft.com/globaldev/nlsweb/">http://www.microsoft.com/globaldev/nlsweb/</a> </li>
-
-
- </ul>
-
-
- <h3>Exemplar Characters; Transliteration</h3>
-
-
- <ul>
-
- <li><a href="http://www.eki.ee/wgrs/">UNGEGN: Working Group on Romanization Systems</a> </li>
-
- <li><a href="http://ee.www.ee/transliteration/">Transliteration of Non-Roman Alphabets and Scripts (Søren Binks)</a> </li>
-
- <li><a href="http://www.archivists.org/catalog/stds99/chapter8.html">Standards for Archival Description: Romanization</a> </li>
-
- <li><a href="http://ee.www.ee/transliteration/pdf/Hindi-Marathi-Nepali.pdf">ISO-15915 (Hindi)</a> </li>
-
- <li><a href="http://ee.www.ee/transliteration/pdf/Gujarati.pdf">ISO-15915 (Gujarati) </a></li>
-
- <li><a href="http://ee.www.ee/transliteration/pdf/Kannada.pdf">ISO-15915 (Kannada) </a></li>
-
- <li><a href="http://www.cdacindia.com/html/gist/down/iscii_d.asp">ISCII-91</a> </li>
-
-
- </ul>
-
-
- <h3>Geographical Names</h3>
-
-
- <ul>
-
- <li><a href="http://unstats.un.org/unsd/geoinfo/">http://unstats.un.org/unsd/geoinfo/</a> </li>
-
-
- </ul>
-
-
- <h3><span>Currencies</span></h3>
-
-
- <ul>
-
- <li><a href="http://www.globalfindata.com/gh/index.html"><span>http://www.globalfindata.com/gh/index.html</span></a><span> </span></li>
-
-
- </ul>
-
-
- <h3>General</h3>
-
-
- <ul>
-
- <li><a href="http://www.cia.gov/cia/publications/factbook/">http://www.cia.gov/cia/publications/factbook/</a> </li>
-
- <li><a href="http://www.microsoft.com/mspress/books/5717.asp">http://www.microsoft.com/mspress/books/5717.asp</a> very complete set of information,
- like postal information, currency symbols, date/time formats, calendars,...</li>
-
-
- </ul>
-
-
- <p> </p>
-
-
- <blockquote>
- </blockquote>
-
- </div>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td class="contents" valign="top"> </td>
-
- </tr>
-
-
- </tbody>
- </table>
-
-
- <hr width="50%">
-
- <div align="center">
-
- <center>
-
- <table border="0" cellpadding="0" cellspacing="0">
-
- <tbody>
- <tr>
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
- </tr>
-
-
- </tbody>
- </table>
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-
-</body>
-</html>
diff --git a/specs/ldml/header.html b/specs/ldml/header.html
deleted file mode 100644
index 292c79d..0000000
--- a/specs/ldml/header.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="VI60_defaultClientScript" content="JavaScript" />
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
-<meta name="keywords" content="Unicode, common locale data repository" />
-<meta name="ProgId" content="FrontPage.Editor.Document" />
-<title>CLDR - Process</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css" />
-<base target="_top">
-</head>
-
-<body text="#330000">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33" /></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- <tr>
- <td style="background-color: gray" colspan="2"> </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/index.html b/specs/ldml/index.html
deleted file mode 100644
index a049074..0000000
--- a/specs/ldml/index.html
+++ /dev/null
@@ -1,559 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta http-equiv="Content-Language" content="en-us">
- <meta name="VI60_defaultClientScript" content="JavaScript">
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
- <meta name="keywords" content="Unicode, common locale data repository">
- <meta name="ProgId" content="FrontPage.Editor.Document">
- <title>Unicode CLDR Project</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
- <link rel="stylesheet" type="text/css" href="./cldr.css">
- <style type="text/css">
-<!--
--->
- </style>
- <meta content="Unicode Common Locale Data Repository Project" name="description">
-</head>
-<body text="#330000">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td colspan="2">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data
- Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a>
- | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a>
- | <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td class="navCol" valign="top" width="25%">
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
- <tbody>
- <tr>
- <td class="navColTitle">Contents</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="#Introduction">Introduction</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="#Acknowledgments">Acknowledgments</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Unicode CLDR</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="survey_tool.html">CLDR
- Survey Tool</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="comparison_charts.html">CLDR Charts</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="process.html">CLDR
- Process</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data
- Markup Language (LDML)</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode
- Consortium</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical
- Reports Development and Maintenance Process</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/consortium/utc.html">Unicode Technical
- Committee</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/versions/">Versions of the Unicode
- Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/standard/standard.html">The Unicode
- Standard</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">
- <a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
- </tr>
- </tbody>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tbody>
- <tr>
- <td class="contents" valign="top">
- <div class="body">
- <h1>Unicode CLDR Project:</h1>
- <h1 align="center">Common Locale Data Repository</h1>
- <h2><a name="Introduction">Introduction</a></h2>
- <table class="sidebar" id="table2" align="right">
- <tbody>
- <tr>
- <td class="sidebarTitle" style="" colspan="3">
- <span style="font-size: 133%;">Latest Release:<br>CLDR 1.6.1</span></td>
- </tr>
- <tr>
- <td class="sidebar" colspan="3">
- <a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td class="sidebarTitle" colspan="3" style="">CLDR 1.7
- <i>Tentative</i> Schedule: <b>2008-09</b></td>
- </tr>
- <tr>
- <td class="sidebar" nowrap="nowrap"><b>Start</b></td>
- <td class="sidebar"><b>Phase </b></td>
- <td class="sidebar" align="right" nowrap="nowrap"><b>Done</b></td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">10-01</td>
- <td class="sidebar">DTD/spec/tool additions</td>
- <td class="sidebar" align="center" nowrap="nowrap">11-01</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">12-17</td>
- <td class="sidebar">Survey Tool public β</td>
- <td class="sidebar" align="center" nowrap="nowrap">01-06</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">01-07</td>
- <td class="sidebar">Data submission</td>
- <td class="sidebar" align="center" nowrap="nowrap">02-24</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">02-25</td>
- <td class="sidebar">Data vetting</td>
- <td class="sidebar" align="center" nowrap="nowrap">03-10</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">03-11</td>
- <td class="sidebar"><a href="http://www.unicode.org/cldr/process.html#resolution_procedure">Data resolution</a>, data/structure verification and correction</td>
- <td class="sidebar" align="center" nowrap="nowrap">03-31</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap">04-01</td>
- <td class="sidebar">Final Candidate available</td>
- <td class="sidebar" align="center" nowrap="nowrap">05-01</td>
- </tr>
- <tr>
- <td class="sidebar" align="center" nowrap="nowrap"><b>05-01</b></td>
- <td class="sidebar"><b><i>Target release date</i></b></td>
- <td class="sidebar" align="center" nowrap="nowrap">-</td>
- </tr>
- <tr>
- <td class="sidebar" colspan="3"><b>For details, see <a href="process.html#release_schedule">Release Schedule</a>. For notification of changes on this
- page or others, see
- <a href="http://www.unicode.org/consortium/distlist.html#monitoring">
- Notification Services</a>.</b></td>
- </tr>
- </tbody>
- </table>
- <p>The Unicode CLDR provides key building blocks for software to support
- the world's languages. CLDR is by far the largest and most extensive
- standard repository of locale data. This data is used by a wide
- spectrum of companies for their software internationalization
- and localization: adapting software to the conventions of different
- languages for such common software tasks as formatting of dates,
- times, time zones, numbers, and currency values; sorting text;
- choosing languages or countries by name; and many others.</p>
- <ul>
- <li><span>For a set of slides with an overview of CLDR,
- see </span>
- <a href="http://unicode.org/cldr/data/docs/presentations/cldr_overview.ppt">
- <span>CLDR Overview</span></a><span>.</span></li>
- <li>For charts showing different aspects of the CLDR data,
- see <a href="comparison_charts.html">CLDR Charts</a>.
- </li>
- <li>For access to released data or data under development, see
- <a href="repository_access.html">CLDR Releases (Downloads)</a>.</li>
- <li>For access to data under development, see
- <a href="survey_tool.html">CLDR Survey Tool</a>.</li>
- <li>For filing other bugs or enhancement requests, see
- <a href="filing_bug_reports.html">CLDR Bug Reports</a>.</li>
- <li>For a description of the process of collecting and resolving
- data, and how the technical committee operates, see
- <a href="process.html">CLDR Process</a>.</li>
- <li>For announcements about CLDR, see <a href="http://www.unicode.org/press/releases.html">Unicode Press Releases</a>.</li>
- <li>To get on the CLDR user mailing list, see <a href="http://www.unicode.org/consortium/distlist.html#cldr_list">Unicode CLDR Mailing List</a>.</li>
- <li>For information on transliteration, see
- <a href="transliteration_guidelines.html">Transliteration Guidelines</a>.</li>
- </ul>
- <p><span class="q">CLDR uses the XML format provided by
- </span><i><a href="http://www.unicode.org/reports/tr35/">UTS
- #35: Locale Data Markup Language (LDML)</a></i><span class="q">. LDML is a format used not only for CLDR, but also for general interchange
- of locale data, such as in Microsoft's .NET. </span></p>
- <p>For information about joining the Unicode Consortium, see
- <a href="http://www.unicode.org/consortium/consort.html">Unicode
- Consortium</a>.</p>
- <h2><a name="Acknowledgments"></a><a name="History">Acknowledgments</a></h2>
- <p>Acknowledgments for special contributions to successive versions of CLDR and
- LDML
- are in the
- <a href="http://www.unicode.org/reports/tr35/#Acknowledgments">
- Acknowledgments</a> section of <i>
- <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale
- Data Markup Language (LDML)</a></i>.</p>
- <p>Many other people have
- made significant contributions to CLDR and LDML, including the
- following:</p>
- <table class="table2" id="table1" border="0" cellpadding="4" cellspacing="0">
- <tbody>
- <tr>
- <td class="noborder" valign="top" width="33%">
- <p>
- A S Alam (ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ),<br>
- Abdullah Hassaan Al-Anssary (عبدالله حسان الأنصاري),<br>
- Ahmad Farrag (أحمد فرّاج),<br>
- Åke Persson,<br>
- Akio Kido,<br>
- Alan Liu,<br>
- Alberto Barbati,<br>
- Alberto Escudero-Pascual,<br>
- Alejandra Canoura Pérez,<br>
- Alexander Buloichik (Аляксандар Булойчык),<br>
- Alexander Kachur (Александр Качур),<br>
- Alexey Proskuryakov (Алексей Проскуряков),<br>
- Alexis Cheng (鄭宗堯),<br>
- Anastasia Golikova (Анастасия Голикова),<br>
- Andrea Decorte,<br>
- André Stryger,<br>
- Andy Heninger,<br>
- Angelo Dalli,<br>
- Anna Taranova (Анна Таранова),<br>
- Anthony Deign (അന്തോണി ഡെയ്ന്),<br>
- Antoine Leca,<br>
- Artur Klauser,<br>
- Ashraf-ul-Kabir (اشرف الکبير),<br>
- Atso Puronen,<br>
- Audun Lona,<br>
- Avery Chan,<br>
- Ayka Agayeva,<br>
- <p>
- Baldev Soor,<br>
- Behdad Esfahbod (بهداد اسفهبد),<br>
- Behdad Pournader (بهداد پورنادر),<br>
- Boris Matveev (Борис Матвеев),<br>
- <p>
- Calvin Lee (李灝),<br>
- Catherine Christaki (Κατερίνα Χρηστάκη),<br>
- Charles Pau (鲍景超),<br>
- Charles Riley,<br>
- Chris Hansten,<br>
- Christopher Fynn (ཀརྨ་སྒྲུབ་བརྒྱུད་བསྟན་འཛིན།),<br>
- Cibu C. J. (സിബു സി.ജെ.),<br>
- Claire Ho (賀靜蘭),<br>
- Cristina Gonçalves<br>
- <p>
- Dacijus Turauskas,<br>
- Dale Schultz,<br>
- Dan Dascalescu,<br>
- Daniel Yacob,<br>
- Dary Mihova (Дари Михова),<br>
- David Luo (罗凌),<br>
- Deborah Goldsmith,<br>
- Delyth Prys,<br>
- Denis Jacquerye,<br>
- Dewi Bryn Jones,<br>
- Dick Veerhar,<br>
- Dmitry Molodyk,<br>
- Đoàn Anh Đức,<br>
- Dominic Hung (洪淦輝),<br>
- Doug Ewell,<br>
- Doug Felt,<br>
- Dr. Adebisi Aromolaran,<br>
- Dr. Frans Wijma,<br>
- Dr. Rajesh Kumar (डॉ. राजेश कुमार),<br>
- Dr. Sarmad Hussain [CRULP (مرکز تحقیقات اردو)],<br>
- Dwayne Bailey,<br>
- <p>
- Eddy Petrișor,<br>
- Eike Rathke,<br>
- Elisabete Ferreira,<br>
- Elsebeth Flarup,<br>
- Erdal Ronahi,<br>
- Eric Mader,<br>
- Eric Muller,<br>
- Erkki Kolehmainen,<br>
- Ernest v.d. Boogaard,<br>
- Eva Albertsdotter Enblom,<br>
- <p>
- Fayeq Oweis (فائق عويس ),<br>
- Firoj Alam (ফিরোজ আলম),<br>
- Flora Gu,<br>
- Focko Dijksterhuis,<br>
- Fredrik Stenshamn,<br>
- Friedel Wolff,<br>
- <p>
- George Rhoten,<br>
- Ghasem Kiani (قاسم کیانی مقدم),<br>
- Gruff Prys,<br>
- <p>
- Han Keuper,<br>
- Helena Shih Chapman (施尙吟),<br>
- Hideki Hiura,<br>
- Håvard Hjulstad,<br>
- Hélène Guillerme,<br>
- <p>
- Ihar Mahaniok (Ігар Маханёк),<br>
- Irina Chausova,<br>
- Irina Parshina,<br>
- Iroro Orife,<br>
- Ivailo Djilianov (Ивайло Джилянов),<br>
- Ivana Jelisavcic (Ивана Јелисавчић),<br>
- <p>
- Jacobo Tarrío Barreiro,<br>
- Jaganadh.G (ജഗന്നാഥ്.ജി),<br>
- Jama Musse Jama,<br>
- James Ballentine,<br>
- Janny Chen (陈敏敏),<br>
- Jarkko Hietaniemi,<br>
- Jarosław Włodarczyk,<br>
- Javier Sola,<br>
- Jean-Jacques Enser,<br>
- Jelena Oertel,<br>
- Jelena Pjesivac-Grbovic (Јелена Пјешивац-Грбовић),<br>
- Jeno Demeczky,<br>
- Jeroen Ruigrok van der Werven,<br>
- John Emmons,<br>
- Jolanta Szczerba,<br>
- Jonathan Rosenne (יונתן רוזן),<br>
- Jung Hyoun Yi (이정현),<br>
- Jungshik Shin (신정식, 申政湜),<br>
- Jørgen Christian Wind Nielsen,<br>
- <p>
- Keith Stribley,<br>
- Kent Karlsson,<br>
- Kentaroh Noji (野地 健太郎),<br>
- Khaled Hosny (خالد حسني),<br>
- Kik Velt,<br>
- Klaas Ruppel,<br>
- Klean Xhelilaj,<br>
- <p>
- Laurențiu Iancu,<br>
- Lee Collins,<br>
- Livia Soardi,<br>
- Lynn Lin (林蓓蓓),<br>
- </td>
- <td class="noborder" valign="top" width="33%">
- <p>
- Maiko Nagae Tasaki (田崎 麻衣子),<br>
- Manfred Kiefer,<br>
- Marc Liyanage,<br>
- Maria Luna,<br>
- Mark Davis,<br>
- Mark Garrett,<br>
- Markus Scherer,<br>
- Mati Allouche (מתתיהו אלוש),<br>
- Michael Everson,<br>
- Michael Twomey,<br>
- Miguel A. Jimenez,<br>
- Miguel Sousa,<br>
- Mihai Niță,<br>
- Mike Tardif,<br>
- Milind Wanjari,<br>
- Mine Halıcı,<br>
- Mirela Škarica,<br>
- Mitra Fathollahpour (میترا فتح اله پور),<br>
- Myron Nechypor,<br>
- Márcio Ferreira,<br>
- <p>
- Natalie Davitashvili (ნატალია დავითაშვილი),<br>
- Nattapong Sirilappanich (ณัฐพงษ์ ศิริลาภพานิช),<br>
- Neda Armanfar (ندا آرمانفر),<br>
- Neel Kamal Thakur (नील कमल ठाकुर),<br>
- Nicha Kumchokpattaraporn (ณิชชา กำโชคภัทรพร),<br>
- Nicholas Shanks,<br>
- Ole Kristian Julseth,<br>
- Omi Azad (অমি আজাদ),<br>
- Oscar D.P. Triscon,<br>
- <p>
- Pantelis Assimakopoulos,<br>
- Patrick Andries,<br>
- Paulo José,<br>
- Peter Edberg,<br>
- Peter Linsley,<br>
- Peter Nugent,<br>
- Philippe Verdy,<br>
- Philips Benjamin,<br>
- Puri Rodríguez Díaz,<br>
- <p>
- Radek Podolski,<br>
- Radi Pipev (Ради Пипев),<br>
- Radosław Moszczyński,<br>
- Raghuram Viswanadha (రఘురామ్ విశ్వనాథ),<br>
- Raj Neettiyath (രാജ് നീട്ടിയത്ത്),<br>
- Rajesh Ranjan (राजेश रंजन),<br>
- Ramon Casha,<br>
- Reiko Saito (斎藤 玲子),<br>
- Riad Khaled Hallab (رياض خالد حلاب),<br>
- Rici Lake,<br>
- Rick McGowan,<br>
- Rob Kiely,<br>
- Roey Saban (רועי סבן),<br>
- Roozbeh Pournader (روزبه پورنادر),<br>
- Rossi Ignatova (Роси Игнатова),<br>
- Ruben Zakharov (Рубен Захаров),<br>
- <p>
- S. M. Murtoza Habib (এস. এম. মুর্তজা হাবিব),<br>
- Sajith VK,<br>
- Samphan Raruenrom (สัมพันธ์ ระรื่ืนรมย์),<br>
- Sandra O'Donnell,<br>
- Saniye Boran,<br>
- Sara Santa Clara,<br>
- Saravanan (ശരവണന്),<br>
- Sasha Maric (Саша Марић),<br>
- Saurabh Kudesia (सौरभ कुदेशिया),<br>
- Serena Xiao (肖顺敏),<br>
- Serpil Zengin Akkaya,<br>
- Shankar Prasad M V,<br>
- Shu Bei (舒蓓),<br>
- Siddaarth Shanmugam (சித்தார்த் சண்முகம்),<br>
- Simon Dean,<br>
- Simone Nicolo,<br>
- Simos Xenitellis (Σίμος Ξενιτέλλης),<br>
- Sivaraj Doddannan,<br>
- Soe Min Mark,<br>
- Sonia Mokrani,<br>
- Steingrímur Árnason,<br>
- Steven R. Loomis,<br>
- Sumesh Chandran V.R (സുമേഷ് ചന്ദ്രന്.വി.ആര്),<br>
- Suresh Chandrasekharan (സുരേഷ് ചന്ദ്രശേഖരന്),<br>
- Susan Maria Howard,<br>
- Susanna Laaksonen,<br>
- Suwit Srivilairith (สุวิทย์ ศรีวิไลฤทธิ์),<br>
- Sverrir Á. Berg,<br>
- Séamus Ó Ciardhuáin,<br>
- Søren Thing Pedersen,<br>
- <p>
- Tarek Abou Aly (طارق أبو على),<br>
- Tatsuo Sekine(関根 達夫),<br>
- Teppo Turtiainen,<br>
- Theresa Hieatt-Smith,<br>
- Thomas Dujardin,<br>
- Thrine Bjerknes,<br>
- Tim Brandall,<br>
- Tom Garland,<br>
- Troy Korjuslommi,<br>
- <p>
- Valeriy Perunov,<br>
- Vasyl Shumskyi,<br>
- Viswa Prabha (വിശ്വപ്രഭ),<br>
- Vitaliy Shipitsyn (Виталий Шипицын),<br>
- Vladimir Weinstein (Владимир Вајнштајн),<br>
- Vladislav Zavyalov (Владислав Завьялов),<br>
- Vytautas Rekus,<br>
- <p>
- Walter Keutgen,<br>
- Waris Abdukerim Janbaz (ۋارىس ئابدۇكېرىم جانباز),<br>
- Weilin Zhang (张卫琳).<br>
- William Gan (甘玮亚),<br>
- William J. Sullivan,<br>
- Witold Jarnicki,<br>
- <p>
- Yajie Ma (马亚杰),<br>
- Yannis Haralambous (Γιάννης Χαραλάμπους),<br>
- Yasuyuki Kagawa (香川 康之),<br>
- Yoshito Umaoka (馬岡 由人),<br>
- Yun Fang Ge (葛云芳),<br>
- Yuri Kirghisov,<br>
- Yury Tarasievich (Юры Тарасевіч),<br>
- <p>
- Zsolt Mattburger<br>
- </td>
- </tr>
- </tbody>
- </table>
- <p>The first CLDR version under the sponsorship of the Unicode
- Consortium was version 1.1. The CLDR project was originally
- developed under the sponsorship of the Linux Application Development
- Environment (aka LADE) Workgroup of the
- <a href="http://www.freestandards.org/">Free Standards Group</a>'s
- <a href="http://www.openi18n.org/">OpenI18N</a> (formerly known
- as Linux Internationalization Initiative or Li18nux) team. CLDR
- 1.0 was approved on 2004.01.16 by the OpenI18N steering committee.
- The founding members of the workgroup were
- <a href="http://www.ibm.com/">IBM</a>,
- <a href="http://www.sun.com/">Sun</a> and
- <a href="http://www.openoffice.org/">OpenOffice.org</a>.</p>
- <p>Thanks to the following people for their contributions to
- the CLDR 1.0 and LDML 1.0: Helena Shih Chapman, Mark Davis,
- Simon Dean, Deborah Goldsmith, Steven R Loomis, Kentaroh Noji,
- George Rhoten, Baldev Soor, Michael Twomey, Ram Viswanadha and
- Vladimir Weinstein. Special thanks to Akio Kido, Hideki Hiura,
- Tom Garland, and the OpenI18N organization for the sponsorship
- of this activity, and to the ICU team for hosting the CVS repository
- and collecting and managing the data for the project. </p>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
- </tr>
- </tbody>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-</body>
-</html>
diff --git a/specs/ldml/locale_faq.html b/specs/ldml/locale_faq.html
deleted file mode 100644
index b2d2ecb..0000000
--- a/specs/ldml/locale_faq.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="2;url=http://cldr.unicode.org/locale_faq-html" />
-<title>Page has moved</title>
-</head>
-<body>
-This page has moved permanently to: http://cldr.unicode.org/locale_faq-html
-</body>
-</html>
diff --git a/specs/ldml/olson_ids.txt b/specs/ldml/olson_ids.txt
deleted file mode 100644
index d412a2d..0000000
--- a/specs/ldml/olson_ids.txt
+++ /dev/null
@@ -1 +0,0 @@
-See http://www.unicode.org/cldr/data/common/supplemental/supplementalData.xml
diff --git a/specs/ldml/press.html b/specs/ldml/press.html
deleted file mode 100644
index 3608296..0000000
--- a/specs/ldml/press.html
+++ /dev/null
@@ -1,395 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-
-
-
-
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-
-
-
-
- <meta http-equiv="Content-Language" content="en-us">
-
-
-
-
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
-
-
-
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
-
-
-
-
- <meta name="keywords" content="Page Content">
-
-
-
-
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-
-
-
-
-
-
- <title>Press Release CLDR</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-</head>
-
-
-<body text="#330000">
-
-
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td colspan="2">
-
-
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td class="icon"><a href="http://www.unicode.org/">
- <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a> <a class="bar" href="http://www.unicode.org/press/"><font size="3">Press</font></a></td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td colspan="2" class="gray"> </td>
-
-
-
- </tr>
-
-
-
- <!-- BEGIN CONTENTS -->
- <tr>
-
-
-
- <td>
-
-
-
- <table>
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td class="contents" valign="top">
-
-
-
- <blockquote>
-
-
-
- <div>
-
-
-
- <h1>Unicode Releases<br>
-
-
-
- Common Locale Data Repository, Version 1.6</h1>
-
-
-
-
-
-
- <p><span style="font-weight: bold;">
- Mountain View, CA, July 2,
- 2008</span> - The Unicode® Consortium announced today the release of
- the new version of the <span style="font-weight: bold;">Unicode
- Common Locale Data Repository</span><b> (Unicode CLDR 1.6)</b>, providing key
- building blocks for software to support the world's languages. Unicode CLDR
- is by far the largest and most extensive standard repository of
- locale data. This data is used by a wide spectrum of companies for
- their software internationalization and localization: adapting
- software to the conventions of different languages for such common
- software tasks as formatting of dates, times, time zones, numbers,
- and currency values; sorting text; choosing languages or countries
- by name; transliterating different alphabets; and many others.</p>
-
-
-
-
- <p>CLDR 1.6 contains data for 137 languages and 140
-territories: 374 locales in all.
-Version 1.6 of the repository contains
-over 32% more locale data than the previous release, with nearly
-24,000 new or modified data items entered by over 220 different
-contributors. <span class="q"></span></p>
-
-
-
-
-
-
- <p><span class="q"></span>Major contributors to CLDR 1.6
-include Adobe, Apple, Google, IBM, and Sun, plus official
-representatives from a number of countries. Many other organizations
-and volunteers around the globe, including Gnome, Kotoistus, LISA,
-OpenOffice, and Utilika, have also made important
-contributions. The data for CLDR is gathered through the CLDR<i> survey tool</i>, which allows organizations and volunteers
-to contribute, compare, and vet locale data. For web pages with different views of CLDR data, see <a href="http://unicode.org/cldr/charts.html">http://unicode.org/cldr/charts.html</a>.</p>
-
-
-
-
-
-
-
- <p><span class="q">Unicode CLDR 1.6 is
-part of the Unicode locale data project, together with the <span style="font-weight: 700;">Unicode L</span><span style="font-weight: bold;">ocale Data Markup Language</span>
-(LDML: <a href="http://unicode.org/reports/tr35/">http://unicode.org/reports/tr35/</a>). LDML is an XML format used for general
-interchange of locale data, such as in Microsoft's .NET. Major new features
-of Unicode LDML 1.6 include:</span></p>
-
-
-
-
-
-
- <ul>
-
-
- <li><span class="q">Plural rules (such as the 4 forms for Russian).</span></li>
-
-
- <li><span class="q">Plural forms of currencies and date/time durations ("1 hour" vs "2 hours")</span></li>
-
-
- <li><span class="q">Interval formats for a concise representation of a range of two dates or times ("Jan 10-12, 2008").</span></li>
-
-
- <li><span class="q">Telephone codes for different countries.</span></li>
-
-
- <li><span class="q">Clarified fallback process for resource bundle lookup and resource item lookup.</span></li>
-
-
- <li><span class="q">Explicit definition of Unicode locale and language identifiers.</span></li>
-
-
- <li><span class="q">Many other clarifications and corrections.</span></li>
-
-
-
-
- </ul>
-
-
-
-
- <p><span class="q">For more information about the Unicode CLDR project (including
- charts)
- see
- <a title="http://www.unicode.org/cldr/" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)" href="http://www.unicode.org/cldr/">
- http://unicode.org/cldr/</a>. </span>
- <wbr>The latest features of CLDR will also be showcased at the 32st <b>
- Internationalization and Unicode Conference</b> (IUC) on September 8-10, 2008 in San
- Jose, CA
- <font face="Arial">—</font><wbr> see <a href="http://www.unicodeconference.org/">
- http://unicodeconference.org/</a>.</p>
-
-
-
-
-
-
- <p><span style="font-weight: bold;">About the Unicode Consortium</span></p>
-
-
-
-
-
-
- <p>The Unicode Consortium is a non-profit organization
-founded to develop, extend and promote use of the Unicode Standard and
-related globalization standards. The membership of the consortium
-represents a broad spectrum of corporations and organizations in the
-computer and information processing industry: Adobe Systems, Apple,
-Basis Technology, Denic eG, Google, Government of India, Government of
-Pakistan, Government of Tamil Nadu, HP, IBM, Justsystem, Microsoft,
-Monotype Imaging, Oracle, SAP, Sun Microsystems, Sybase, UC Berkeley,
-Yahoo!, plus well over a hundred Associate, Liaison, and Individual
-members.</p>
-
-
- </div>
-
-
-
-
-
-
- <p>For more information, please contact the Unicode Consortium (<a href="http://www.unicode.org/">http://unicode.org/</a>).
- </p>
-
-
-
-
-
-
- <hr width="50%">
-
-
-
- <div align="center">
-
-
-
- <center>
-
-
-
- <table border="0" cellpadding="0" cellspacing="0">
-
-
-
- <tbody>
-
-
- <tr>
-
-
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
-
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
-
-
-
- </div>
-
-
-
- </blockquote>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-</table>
-
-
-
-
-</body>
-</html>
diff --git a/specs/ldml/procedures.html b/specs/ldml/procedures.html
deleted file mode 100644
index ef16430..0000000
--- a/specs/ldml/procedures.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="VI60_defaultClientScript" content="JavaScript" />
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
-<meta name="keywords" content="Unicode, common locale data repository" />
-<meta name="ProgId" content="FrontPage.Editor.Document" />
-<title>CLDR - TC Procedures</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css" />
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33" /></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">Unicode CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="survey_tool.html">CLDR Survey Tool</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="comparison_charts.html">CLDR Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="process.html">CLDR Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <blockquote>
- <p>This page has been superseded. For more information on the formal procedures for the CLDR Technical Committee, see the
- <a href="http://www.unicode.org/consortium/tc-procedures.html">Technical Committee Procedures for the Unicode Consortium</a>.</p>
- </blockquote>
- </td>
- </tr>
- </table>
- <hr width="50%" />
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50" /></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center></div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/process.html b/specs/ldml/process.html
deleted file mode 100644
index d06cc1c..0000000
--- a/specs/ldml/process.html
+++ /dev/null
@@ -1,2180 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-
-
-
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-
-
-
- <meta http-equiv="Content-Language" content="en-us">
-
-
-
-
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
-
-
-
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
-
-
-
-
- <meta name="keywords" content="Unicode, common locale data repository">
-
-
-
-
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-
-
-
-
-
-
- <title>Unicode CLDR Process</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-</head>
-
-
-<body style="color: rgb(51, 0, 0);">
-
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td colspan="2">
-
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td class="icon"><a href="http://www.unicode.org/"> <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
-
-
-
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a>
-| <a href="http://www.unicode.org/sitemap/" class="bar">Site
-Map</a> | <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td colspan="2" class="gray"> </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navCol" valign="top" width="25%">
-
-
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle" colspan="2">Contents</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#introduction">Introduction</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#specification_changes">Specification
-Changes</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#data_vetting_process">Data
-Submission and Vetting Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top" width="1em"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#resolution_procedure">Resolution Procedure</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#Voting_Process">Voting Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#prioritization">Prioritization</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#Dot-Dot_Releases">Dot-Dot Releases</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#public_feedback">Public
-Feedback</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#data_release_process">Data
-Release Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#version_numbering">Version Numbering</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" valign="top"> </td>
-
-
-
- <td class="navColCell" valign="top"><a href="#release_schedule">Release Schedule</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#meetings">Meetings and
-Communication</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#officers">Officers</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle" colspan="2">Unicode
-CLDR</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="index.html">CLDR Project</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="repository_access.html">CLDR
-Releases (Downloads)</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="survey_tool.html">CLDR
-Survey Tool</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="filing_bug_reports.html">CLDR
-Bug Reports</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="comparison_charts.html">CLDR
-Charts</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="process.html">CLDR Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale
-Data Markup Language (LDML)</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle" colspan="2">Related
-Links</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode
-Consortium</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/reports/">Unicode
-Technical Reports</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/faq/reports_process.html">Technical
-Reports Development and Maintenance Process</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/consortium/utc.html">Unicode
-Technical Committee</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/versions/">Versions
-of the Unicode Standard</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColTitle" colspan="2">Other
-Publications</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/standard/standard.html">The
-Unicode Standard</a></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/notes/">Unicode
-Technical Notes</a></td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
-<!-- BEGIN CONTENTS --></td>
-
-
-
- <td>
-
-
- <table>
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td class="contents" valign="top">
-
-
- <div class="body">
-
-
- <h1>Unicode CLDR Technical Committee Process</h1>
-
-
-
-
-
- <h2><a name="introduction"></a>1.
-Introduction</h2>
-
-
-
-
-
- <p>This document describes the Unicode CLDR Technical
-Committee, and its process for data collection, resolution, public
-feedback and release. The process is designed to be light-weight: in
-particular, the meetings are frequent, short, and informal. Most of the
-work is by email or phone, with a database recording requested changes
-in data.</p>
-
-
-
-
-
- <p>When gathering data for a region and language, it
-is important to have multiple sources for that data to produce the most
-widely acceptable data. Initial versions of data were based on the best
-available sources, but CLDR data will be modified and improved, in
-successive versions, by more input from the contributors inside and
-outside of the Unicode Consortium.</p>
-
-
-
-
-
- <p>It is important to note that CLDR is a Repository,
-not a Registration. That is, contributors should not expect that their
-contributions will simply be adopted into the repository; instead, it
-will be vetted against the best available information.</p>
-
-
-
-
-
- <p>All inputs are open, and gathered via the <a href="survey_tool.html">CLDR Survey Tool</a> or
-recorded in a bug/feature request database (<a href="filing_bug_reports.html">CLDR Bug Reports</a>).
-Changes in response to requests in the database may be entered into the
-repository snapshot over time by the maintainers of the repository, but
-the final approval of the release of any version of CLDR is up to the
-decision of the CLDR Technical Committee.</p>
-
-
-
-
-
- <p>For more information on the formal procedures for
-the Unicode CLDR Technical Committee, see the <a href="http://www.unicode.org/consortium/tc-procedures.html">Technical
-Committee Procedures for the Unicode Consortium</a>.</p>
-
-
-
-
-
- <h2><a name="specification_changes"></a>2.
-Specification Changes</h2>
-
-
-
-
-
- <p>The <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale
-Data Markup Language (LDML)</a> specification may be changed to
-add structure for new kinds of data or other features. Requests for
-changes are entered in the bug/feature request database (<a href="filing_bug_reports.html">CLDR Bug Reports</a>).</p>
-
-
-
-
-
- <p>Structural changes are always
-backwards-compatible. That is, previous files will continue to work.
-Deprecated elements remain and can be used, although their usage is
-strongly discouraged.</p>
-
-
-
-
-
- <p>There is a standing policy for structural changes
-that require non-trivial code for proper implementation, such as time
-zone fallback or alias mechanisms. These require the existence of at
-least a prototype implementation that demonstrates correct function
-according to the proposed specification.</p>
-
-
-
-
-
- <h2><a name="data_vetting_process"></a>3.
-Data Submission and Vetting Process</h2>
-
-
-
-
-
- <p>Once data for a country and language has been
-received, the data from the different sources will be compared to show
-agreements and differences. Initial data contributions are normally
-marked as draft; this may be changed once the data is
-vetted.</p>
-
-
-
-
-
- <p>Note that there are two types of data in the
-repository:</p>
-
-
-
-
-
- <ol>
-
- <li><b>Common Data: </b>The contents
-is decided upon by the CLDR Technical Committee, following its
-procedures and this process.</li>
-
- <li><b>Comparison data: </b>The
-contributor can be an individual or an organization. Data is normally
-gathered by calling public APIs, to ensure that the data matches what
-is actually in use. The data is only for comparison, and will not be
-changed except where necessary to update the data to match the external
-source. The only requirement is that all changed data be versioned, and
-the Version Numbering Scheme be used.</li>
-
-
- </ol>
-
-
-
-
-
- <p>Contributors are encouraged to use local language
-and country contacts, inside and outside their organization, to help
-vet current common data and any new proposals for addition or amendment
-of common data. In particular, national standards organizations are
-encouraged to be involved in the data vetting process.</p>
-
-
-
-
-
- <p>For CLDR to add a new language just requires that
-the proposer to commit to providing at least the minimal localization
-(exemplar characters, months, days, date/time formats, translations for
-a few countries, languages, currencies, etc.). <span style="font-style: italic;">The exemplar characters,
-however, are required before the new locale can be added: see also <a href="filing_bug_reports.html#Exemplar_Characters">Exemplar
-Character Sources</a>. </span>The new locale then becomes
-available for additional translations and vetting during the next
-review cycle.</p>
-
-
-
-
-
- <h3>3.1 <a name="resolution_procedure">Resolution
-Procedure</a></h3>
-
-
-
-
-
- <p>The following procedure is used when resolving
-differences in submitted data. At the end, for each field a single
-value will be chosen as optimal, while the others will have an <i>alt=proposed</i>
-attribute. The <i>draft</i> attribute on all the values
-will be set to one of 4 states:</p>
-
-
-
-
-
- <ul>
-
-
-
- <li><i><span style="font-weight: 700;">unconfirmed</span></i></li>
-
-
-
- <li><b><i>provisional</i></b></li>
-
-
-
- <li><b><i>contributed (= minimally approved)</i></b></li>
-
-
-
- <li><i><b>approved</b>
-(equivalent to an absent draft attribute)</i></li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <p>Implementations may choose the level at which they
-wish to accept data. They may choose to accept even <b>unconfirmed</b>
-data, especially if there is no translated alternative. Approved data
-is approved by the Technical Committee, as described by the resolution
-process below. This does not mean that the data is guaranteed to be
-error-free -- this is simply the best judgment of the committee
-according to the process.</p>
-
-
-
-
-
- <h4>User Levels</h4>
-
-
-
-
-
- <p>There are multiple levels of access and control:</p>
-
-
- <table style="text-align: left;" border="1" cellpadding="1" cellspacing="0">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <th style="font-weight: bold;">Vetter Level</th>
-
-
-
- <td style="font-weight: bold; text-align: center;">Vote</td>
-
- <th style="text-align: left; font-weight: bold;">Description</th>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;"><i>Committee Vetters</i></td>
-
-
-
- <td style="text-align: center;">8</td>
-
- <td style="text-align: left;">
-
- <ul>
-
- <li>Can vet and submit data for all locales </li>
-
- <li>Can manage users in their organization</li>
-
- <li>Can see the email addresses for all vetters</li>
-
- <li><i>Technical Committee
-(TC) members</i></li>
-
-
- </ul>
-
- </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;"><i>Expert Vetters</i></td>
-
-
-
- <td style="text-align: center;">8</td>
-
- <td style="text-align: left;">
-
- <ul>
-
- <li>Can vet and submit data for a particular set of
-locales</li>
-
- <li>Cannot manage other users.</li>
-
- <li>Can see the email addresses for submitted data
-in their locales.</li>
-
-
- </ul>
-
- </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
- <td><i>Regular Vetters </i></td>
-
- <td style="text-align: center;">4</td>
-
- <td>
-
- <ul>
-
- <li>Can vet and submit data for a particular set of
-locales</li>
-
- <li>Cannot manage other users.</li>
-
- <li>Can see the email addresses for submitted data
-in their locales.</li>
-
-
- </ul>
-
- </td>
-
- </tr>
-
- <tr>
-
-
-
- <td style="font-style: italic;"><i>Guest Vetters</i></td>
-
-
-
- <td style="text-align: center;">1</td>
-
- <td style="text-align: left;">
-
- <ul>
-
- <li>Can vet and submit data for a particular set of
-locales</li>
-
- <li>Cannot manage other users. </li>
-
- <li>Cannot see email addresses.</li>
-
-
- </ul>
-
- </td>
-
-
-
- </tr>
-
- <tr>
-
- <td><span style="font-style: italic;">Locked Vetters</span></td>
-
- <td style="text-align: center;">0</td>
-
- <td>
-
- <ul>
-
- <li>If a user is locked or removed, then his/er
-vote is zero.</li>
-
-
- </ul>
-
- </td>
-
- </tr>
-
-
-
-
-
-
-
- </tbody>
-
-
- </table>
-
- <i> </i>
-
-
-
- <ul>
-
-
- </ul>
-
-
-
-
-
-
-
- <ul>
-
-
- </ul>
-
-
-
-
-
-
-
- <ul>
-
-
- </ul>
-
-
-
-
-
- <p>These levels are decided by the technical committee and the TC representative
-for the respective organizations. </p>
-
-
-
-
-
- <ul>
-
-
-
- <li>Unicode TC members (full/institutional/supporting)
-can assign its users to Regular or Guest level, and with approval of the TC, users at the Expert level. </li>
-
-
-
- <li>Liaison or associate members can assign to Guest, or to other levels with approval of the TC.
-
-
- <ul>
-
-
-
- <li>The liaison/associate member him/erself
-gets TC status in order to manage users, but gets a Guest status in
-terms of voting, unless the committee approves a higher level.</li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>Users assigned to "<a href="http://unicode.org">unicode.org</a>" are
-normally assigned as Guest, but the committee can assign a different
-level.</li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <h4><a name="Voting_Process"></a>Voting Process</h4>
-
-
-
-
-
- <ul>
-
-
-
- <li>Each user gets one vote on each value, but the <i>strength</i>
-of the vote varies according to the user level according to the table above.
-
-
- </li>
-
-
-
- <li>All values with survey tool errors get <span style="font-style: italic;">zero</span> votes
-
-
- <ul>
-
-
-
- <li>For example, a date pattern of "14.
-september" instead of "dd MMM".</li>
-
-
-
- <li>They cannot be voted for, and show a
-visible error.</li>
-
-
-
- <li>Collision errors are an exception. They get normal votes, but are handled below.</li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>For each value, each organization gets a vote
-based on the <i>maximum</i> (not cumulative) strength of
-the votes of its users who voted on that item.
-
-
- <ul>
-
-
-
- <li>That is, even if an organization has 10
-Vetters voting for an value, if the highest level is regular vetter, then the vote count attributed to the
-organization as a whole is 4.</li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>If there is a dispute (votes for different
-values) within an organization, then the majority vote for that
-organization is chosen. If there is a tie, then no vote is counted for
-the organization.</li>
-
-
-
- <li>Batch data (marked with x999, for example) gets
-a status based on committee decision.</li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <p style="font-style: italic;">All fields are then assessed as follows:</p>
-
-
-
-
-
- <h4><span style="font-weight: bold;">Optimal
-Field Value</span></h4>
-
-
-
-
-
- <p>For each release, there is one optimal field value
-determined by the following:</p>
-
-
-
-
-
- <ul>
-
-
-
- <li>Add up the votes for each value from each
-organization.</li>
-
-
-
- <li>Out of all the possible alternative values for
-a given field, pick the one with the most votes, the <span style="font-style: italic;">optimal value</span>.</li>
-
-
-
- <li>If there was a tie, pick the least one (in UCA
-order).</li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <h4><span style="font-weight: bold;">Draft
-Status of Optimal Field Value</span></h4>
-
-
-
-
-
- <ul>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <ol>
-
-
-
- <li>Let <span style="font-weight: bold;">O</span>
-be the optimal value's vote<span style="font-weight: bold;"></span>,
- <span style="font-weight: bold;">N</span>
-be the vote of the next best value, and <font size="3"><span style="font-weight: bold;">G</span> be the number of
-organizations that voted for the optimal value</font>.</li>
-
-
-
- <li>Assign the draft status according to the first
-of the conditions below that applies:<font size="3"><br>
-
-
-
- </font>
-
-
- <table style="text-align: left;" border="1" cellpadding="1" cellspacing="0">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <th>Resulting Draft Status</th>
-
-
-
- <th style="text-align: center;">Condition</th>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;"><span style="font-weight: 400;"></span>approved</td>
-
-
-
- <td style="text-align: center;"><span style="font-weight: 400;">O <font face="Times New Roman">≥</font>
-8 and </span><span style="font-weight: 400;">O
- <font face="Times New Roman">≥</font>
-2<font face="Arial">×</font>N </span></td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;">contributed</td>
-
-
-
- <td style="text-align: center;"><span style="color: black;">O ≥
-4 and O > N</span><br style="color: black;">
-
-
-
- <span style="font-weight: bold; font-style: italic; color: black;">OR</span><br>
-
-
-
-O ≥ 2 and O > N and G ≥ 2</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;">provisional</td>
-
-
-
- <td style="text-align: center;">O <font face="Times New Roman">≥</font> 2 and O <span style="font-weight: 400;"> <font face="Times New Roman">≥</font></span>
-N </td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="font-style: italic;">unconfirmed</td>
-
-
-
- <td style="text-align: center;"><span style="font-style: italic;">otherwise</span></td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
- </li>
-
-
-
- <li style="color: black;">If the draft status of the previously released
-value is better than the new draft status, then no change is made.
-Otherwise, the optimal value and its draft status are made part of the
-new release.</li>
-
-
-
-
-
- <ul>
-
-
-
- <li>For example, if the new optimal value does
-not have the status of <b>approved</b>, and the previous
-release had an <span style="font-weight: bold;">approved </span>value
-(one that does not have an error and is not a fallback), then that
-previously-released value stays <b>approved</b> and
-replaces the optimal value in the following steps.</li>
-
-
-
-
-
- </ul>
-
-
-
- <li>If there was an <i>alt=proposed</i>
-on the optimal value, the <i>alt=proposed</i> is removed.</li>
-
-
-
-
-
- </ol>
-
-
-
-
-
- <ul>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <h4>Further Processing</h4>
-
- <br>
-
-
- <p>After the optimal value is chosen:</p>
-
-
-
-
-
- <ul>
-
-
-
- <li>Collisions errors are resolved by retaining one of the values and
-removing the other(s).</li>
-
-
- <ul>
-
- <li>The choice is based
-on the judgment of the committee, typically according to which field is most commonly used.
-When an item is removed, an alternate may then become the new optimal
-value.</li>
-
-
- </ul>
-
- <li>All other values with errors are removed.</li>
-
-
-
- <li>Non-optimal values are handled as follows:</li>
-
-
- <ul>
-
- <li>Those with no votes are removed.</li>
-
- <li>Those with votes are marked with <i>alt=proposed
- </i>and given the draft status:<span style="font-weight: bold;"> unconfirmed</span></li>
-
-
- </ul>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <p>If a locale does not have minimal data (at least
-at a provisional level), then it may be excluded from the release.
-Where this is done, it may be restored to the repository for the next
-submission cycle.</p>
-
-
- <p><span style="font-weight: bold;">Note: </span>Starting
-with CLDR 1.7, we are planning to save votes across releases, for any
-active (unlocked) voters. However, where there are English changes, old
-votes will be discarded.</p>
-
-
-
-
-
- <p>This process can be fine-tuned by the Technical
-Committee as needed, to resolve any problems that turn up. A committee
-decision can also override any of the above process for any specific
-values.</p>
-
-
-
-
-
-
-
-
-
- <p>For
-more information see the key links in <a href="survey_tool.html">CLDR Survey Tool</a> (especially the Vetting Phase).<br>
-
- <span style="font-weight: 700;"></span></p>
-
-
- <p><span style="font-weight: 700;">Notes:</span></p>
-
-
-
-
-
- <ul>
-
-
-
- <li>If data has a formal problem, it can be fixed
-directly (in CVS) without going through the above process. Examples
-include:
-
-
- <ul>
-
-
-
- <li>syntactic problems in pattern, extra
-trailing spaces, inconsistent decimals, mechanical sweeps to change
-attributes, translatable characters not quoted in patterns, changing '
-(punctuation mark) to curly apostrophe or s-cedilla to s-comma-below,
-removing disallowed exemplar characters (non-letter, number, mark,
-uppercase when there is a lowercase).</li>
-
-
-
- <li>These are changed in-place, without
-changing the draft status.</li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>Linguistically-sensitive data should always go
-through the survey tool. Examples include:
-
-
- <ul>
-
-
-
- <li>names of months, territories, number
-formats, changing ASCII apostrophe to U+02BC modifier letter apostrophe
-or U+02BB modifier letter turned comma, or U+02BD modifier letter
-reversed comma, adding/removing normal exemplar characters.</li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>The TC committee can authorize bulk submissions
-of new data directly (CVS), with all new data marked
-draft="unconfirmed" (or other status decided by the committee), but
-only where the data passes the CheckCLDR console tests.</li>
-
-
-
- <li>The survey tool does not currently handle all
-CLDR data. For data it doesn't cover, the regular bug system is used to
-submit new data or ask for revisions of this data. In particular:
-
-
- <ul>
-
-
-
- <li>Collation, transforms, or text
-segmentation, which are more complex.
-
-
- <ul>
-
-
-
- <li>For collation data, see the comparison
-charts at <a href="http://www.unicode.org/cldr/comparison_charts.html">http://www.unicode.org/cldr/comparison_charts.html</a>
-or the XML data at <a href="http://unicode.org/cldr/data/common/collation/">http://unicode.org/cldr/data/common/collation/</a>
- </li>
-
-
-
- <li>For transforms, see the XML data at <a href="http://unicode.org/cldr/data/common/transforms/">http://unicode.org/cldr/data/common/transforms/</a>
- </li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
- <li>Non-linguistic locale data:
-
-
- <ul>
-
-
-
- <li>XML data: <a href="http://unicode.org/cldr/data/common/supplemental/">http://unicode.org/cldr/data/common/supplemental/</a>
- </li>
-
-
-
- <li>HTML view: <a href="http://www.unicode.org/cldr/data/diff/supplemental/supplemental.html">http://www.unicode.org/cldr/data/diff/supplemental/supplemental.html</a>
- </li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
-
-
- </ul>
-
-
-
- </li>
-
-
-
-
-
- </ul>
-
-
- <h3>3.3 <a name="prioritization">Prioritization</a></h3>
-
-
-
-
-
- <p>There may be conflicting common practices or
-standards for a given country and language. Thus LDML provides keyword
-variants to reflect the different practices. For example, for German it
-allows the distinction between PHONEBOOK and DICTIONARY collation.</p>
-
-
-
-
-
- <p>When there is an existing national standard for a
-country that is widely accepted in practice, the goal is to follow that
-standard as much as possible. Where the common practice in the country
-deviates from the national standard, or if there are multiple
-conflicting common practices, or options in conforming to the national
-standard, or conflicting national standards, multiple variants may be
-entered into the CLDR, distinguished by keyword variants or variant
-locale identifiers.</p>
-
-
-
-
-
- <p>Where a data value is identified as following a
-particular national standard (or other reference), the goal is to keep
-that data aligned with that standard. There is, however, no guarantee
-that data will be tagged with any or all of the national standards that
-it follows.</p>
-
-
-
-
-
- <h3>3.4 <a name="Dot-Dot_Releases">Dot-Dot
-Releases</a></h3>
-
-
-
-
-
- <p>Dot-dot releases, such as 1.4.1, are issued
-whenever the standard identifiers change (that is, BCP 47 identifiers,
-Time zone identifiers, or ISO 4217 Currency identifiers).
-Updates to identifiers will also mean updating the English names for
-those identifiers.</p>
-
-
-
-
-
- <p>Corrigenda may also be included in dot-dot
-releases. Dot-dot releases may also be issued if there are substantive
-changes to supplemental (non-language) data. An example of supplemental
-data additions would be adding more transforms, or adding more
-script-language info.<br>
-
-
-
- <br>
-
-
-
-Normally there are no dot-dot releases for language data, but the
-committee may decide to issue one if the situation warrants. Normally
-there are no major changes in the specification. </p>
-
-
-
-
-
- <p>The structure and DTD may change, but except for
-additions or for small bug fixes, data will not be changed in a way
-that would affect the content of resolved data.</p>
-
-
-
-
-
- <h2>4. <a name="public_feedback">Public
-Feedback Process</a></h2>
-
-
-
-
-
- <p>The public can supply formal feedback into CLDR
-via the <a href="http://unicode.org/cldr/apps/survey/">Survey
-Tool</a> or by filing a <a href="filing_bug_reports.html">Bug
-Report or Feature Request</a>. There is also a public forum for
-questions at <a href="http://www.unicode.org/consortium/distlist.html#cldr_list">CLDR
-Mailing List</a> (details on archives are found there).</p>
-
-
-
-
-
- <p>Anyone can also asked to be added to a list that
-will receive notification of new CLDR bugs, so they can track issues if
-they want. Anyone can also to reply to any bug report to add comments
-or questions.</p>
-
-
-
-
-
- <ul>
-
-
-
- <li>To subscribe, send a note to
-"ecartis+unicode.org" (use an <i>at sign</i> instead of
-the +) and put "subscribe cldr-bugrfe" in the subject line.</li>
-
-
-
- <li>To unsubscribe, put "unsubscribe cldr-bugrfe"
-in the subject line instead.</li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <p>There is also a members-only <a href="http://www.unicode.org/members/index.html#cldr"> CLDR
-mailing list</a> for members of the CLDR Technical Committee.</p>
-
-
-
-
-
- <p><a href="http://www.unicode.org/review/">Public
-Review Issues</a> may be posted in cases where broader public
-feedback is desired on a particular issue.</p>
-
-
-
-
-
- <p>Be aware that changes and updates to CLDR will
-only be taken in response to information entered in the <a href="http://unicode.org/cldr/apps/survey/">Survey Tool</a>
-or by filing a <a href="filing_bug_reports.html">Bug
-Report or Feature Request</a>. Discussion on public mailing lists
-is <i>not</i> monitored; no actions will be taken in
-response to such discussion -- only in response to filed bugs. The
-process of checking and entering data takes time and effort; so even
-when bugs/feature requests are accepted, it may take some time before
-they are in a release of CLDR.</p>
-
-
-
-
-
- <h2><a name="data_release_process"></a>5.
-Data Release Process</h2>
-
-
-
-
-
- <h3>5.1 <a name="version_numbering">Version
-Numbering</a></h3>
-
-
-
-
-
- <p>The locale data is frozen per version. Once a
-version is released, it is never modified. Any changes, however minor,
-will mean a newer version of the locale data being released. The
-versioning scheme is x.y.z, where z is incremented for bug fixes, y is
-incremented for any additions (such as new locale data or LDML
-elements), and x is incremented for any major changes in format.</p>
-
-
-
-
-
- <h3>5.2 <a name="release_schedule">Release
-Schedule</a></h3>
-
-
-
-
-
- <p>Early releases of a version of the common locale
-data will be issued as either alpha or beta releases, available for
-public feedback. The dates for the next scheduled release will be on <a href="index.html">CLDR Project</a>.</p>
-
-
-
-
-
- <p>The schedule milestones are:</p>
-
-
-
-
-
- <table style="border-collapse: collapse;" id="AutoNumber1" border="1" bordercolor="#111111" cellpadding="2" cellspacing="0">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td><b>Design (p1)</b></td>
-
-
-
- <td>All the proposed design changes have been
-accepted in place for changes in structure, and tools. All the DTD and specification changes are
-made according to proposed design. The tools are updated to support the
-new structure, including the survey tool for displaying, collecting,
-and vetting data.</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td style="white-space: nowrap;"><b>Survey Tool Beta (p2)</b></td>
-
-
-
- <td>Users can try out the survey tool and supply feedback</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
- <td><span style="font-weight: bold;">Data Submission</span></td>
-
- <td>Users can add data and vet (vote for) for data</td>
-
- </tr>
-
- <tr>
-
-
-
- <td><b>Data Vetting</b></td>
-
-
-
- <td>Users can vet (vote for) data, and can add in certain disputed cases</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
-
-
- <td><span style="font-weight: bold;">Data Resolution</span></td>
-
-
-
- <td>Data resolution, data/structure verification and correction by the committee.</td>
-
-
-
- </tr>
-
-
-
- <tr>
-
- <td><span style="font-weight: bold;">Final Candidate</span></td>
-
- <td>Final Candidate available for testing. Only showstoppers fixed.</td>
-
- </tr>
-
- <tr>
-
-
-
- <td><b>Release</b></td>
-
-
-
- <td>Released, stable, referenceable version.</td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
- <p>Each phase ends at 24:00 (midnight) on the day in question.</p>
-
-
-
-
-
- <h2><a name="meetings"></a>6.
-Meetings and Communication</h2>
-
-
-
-
-
- <p>The currently-scheduled meetings are listed on the
- <a href="http://www.unicode.org/timesens/calendar.html">Unicode
-Calendar</a>. Meetings are held by phone, every week at 8:00
-Pacific Time (-08:00 GMT in winter, -07:00 GMT in summer). Some
-meetings may be skipped if they conflict with holidays or other Unicode
-meetings.</p>
-
-
-
-
-
- <p>There is an internal email list for the Unicode
-CLDR Technical Committee, open to Unicode members and invited experts.
-All national standards bodies who are interested in locale data are
-also invited to become involved by establishing a <a href="http://www.unicode.org/consortium/join.html">Liaison
-membership</a> in the Unicode Consortium, to gain access to this
-list.</p>
-
-
-
-
-
- <p>Notification of the telephone numbers and
-passcode, and agenda, and any change in schedule are sent out on the
-this email list.</p>
-
-
-
-
-
- <h2><a name="officers"></a>7.
-Officers</h2>
-
-
-
-
-
- <p>The current Technical Committee Officers are:</p>
-
-
-
-
-
- <ul>
-
-
-
- <li>Chair: Mark Davis (Google)</li>
-
-
-
- <li>Vice-Chair: John Emmons (IBM)</li>
-
-
-
-
-
- </ul>
-
-
-
-
-
- <blockquote> </blockquote>
-
-
-
- </div>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
-
-
- <hr width="50%">
-
-
- <div align="center">
-
-
- <center>
-
-
- <table border="0" cellpadding="0" cellspacing="0">
-
-
-
- <tbody>
-
-
-
- <tr>
-
-
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-
-
- </table>
-
-
-
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
-
-
-
- </div>
-
-
-
- </td>
-
-
-
- </tr>
-
-
-
-
-
- </tbody>
-</table>
-
-
-
-</body>
-</html>
diff --git a/specs/ldml/readme.txt b/specs/ldml/readme.txt
deleted file mode 100644
index fca1f34..0000000
--- a/specs/ldml/readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-The 1.3 version of CLDR is now at at beta status, and available via
-<http://unicode.org/cldr/version/1.3.html>.
-
-The new features include addition of data for timezones, UN M.49 regions,
-POSIX-format data, LDML metadata, language/script/territory mappings,
-new tests, and various other fixes and additions of data, and many extensions
-to the specification. A new survey tool is being used to vet the additions of data.
-
-We encourage people to look at the data and provide feedback, especially
-on the new POSIX-format data and the changes in the specification. For details
-on accessing CLDR data, see <http://unicode.org/cldr/repository_access.html>.
-
-NOTE: Feedback should *not* be provided via the online Unicode forms; instead,
-use http://unicode.org/cldr/filing_bug_reports.html
\ No newline at end of file
diff --git a/specs/ldml/repository_access.html b/specs/ldml/repository_access.html
deleted file mode 100644
index 6687951..0000000
--- a/specs/ldml/repository_access.html
+++ /dev/null
@@ -1,1164 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-
- <meta http-equiv="Content-Language" content="en-us">
-
-
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
-
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
-
-
- <meta name="keywords" content="Unicode, common locale data repository">
-
-
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-
-
-
- <title>Unicode CLDR Releases</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-
-
-
- <style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
- </style>
-</head>
-
-
-<body text="#330000">
-
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
- <tbody>
-
- <tr>
-
-
- <td colspan="2">
-
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
- <tbody>
-
- <tr>
-
-
- <td class="icon"><a href="http://www.unicode.org/">
- <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
-
-
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> | <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
- </td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td colspan="2" class="gray"> </td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navCol" valign="top" width="25%">
-
-
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-
-
- <tbody>
-
- <tr>
-
-
- <td class="navColTitle" colspan="2">Contents</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#Downloads">Downloads</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#latest_draft_version">Latest Draft Version</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"> </td>
-
-
- <td class="navColCell" valign="top"><span class="GramE"><a href="#Repository_Organization">Repository Organization</a></span></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="#CLDR_1.0_Release">CLDR 1.0 Release</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColTitle" colspan="2">Unicode CLDR</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="index.html">CLDR Project</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="survey_tool.html">CLDR Survey Tool</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="comparison_charts.html">CLDR Charts</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="process.html">CLDR Process</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language (LDML)</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColTitle" colspan="2">Related Links</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top">Join the <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and Maintenance
- Process</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColTitle" colspan="2">Other Publications</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" colspan="2" valign="top"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
- <!-- BEGIN CONTENTS --></td>
-
-
- <td>
-
-
- <table>
-
-
- <tbody>
-
- <tr>
-
-
- <td class="contents" valign="top">
-
-
- <div class="body">
-
-
- <h1 style="margin-bottom: 1em;">Unicode CLDR Releases</h1>
-
-
-
-
- <blockquote>
-
-
- <p><i>Each release of the Unicode CLDR is a stable
-release and may be used as reference material or cited as a normative
-reference by other specifications. Each version, once published, is
-absolutely stable and will never change. Implementations may also apply
- <a href="corrigenda.html">CLDR Corrigenda</a> to a release. Bug reports and feature requests for subsequent versions may be filed at
- <a href="filing_bug_reports.html">Bug Reports</a>.</i></p>
-
-
- </blockquote>
-
-
-
-
- <h2 style="margin-bottom: 1em;"><a name="Downloads">Downloads</a></h2>
-
-
-
-
- <p style="margin-bottom: 1em;">The following table lists the files for each
- released version. For license information, see the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a>; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>.</p>
-
-
-
-
- <div align="center">
-
-
- <center>
-
-
- <table style="border-collapse: collapse;" border="1" cellpadding="2" cellspacing="0">
-
-
- <tbody>
-
- <tr>
-
-
- <th bgcolor="#dddddd">Release</th>
-
-
- <th bgcolor="#dddddd">No.</th>
-
-
- <th bgcolor="#dddddd">Date</th>
-
-
- <th bgcolor="#dddddd">Rel. Note</th>
-
-
- <th bgcolor="#dddddd">Data</th>
-
-
- <th bgcolor="#dddddd">Spec</th>
-
-
- <th bgcolor="#dddddd">Delta</th>
-
-
- <th bgcolor="#dddddd">CVS Tag</th>
-
-
- </tr>
-
-
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.6.1</b></td>
- <td><b>2008-07-23</b></td>
- <td align="center"><b><a href="version/1.6.1.html">Version1.6.1</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.6.1/">CLDR1.6.1</a></b></td>
- <td><b> <a href="http://www.unicode.org/reports/tr35/tr35-11.html">LDML1.6.1</a>
- </b> </td>
- <td style="text-align: left;"><b> <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1%5C.6%5C.1">Changes1.6.1</a></b></td>
- <td><b><code>release-1-6-1</code></b></td>
- </tr>
- <tr>
-
-
- <th colspan="1" rowspan="10" align="left">Previous: </th>
-
- <td>1.6</td>
- <td>2008-07-02</td>
- <td align="center"><a href="version/1.6.html">Version1.6</a></td>
- <td><a href="http://unicode.org/Public/cldr/1.6.0/">CLDR1.6</a></td>
- <td><a href="http://www.unicode.org/reports/tr35/tr35-10.html">LDML1.6</a></td>
- <td style="text-align: left;"><a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.6">Changes1.6</a></td>
- <td><code>release-1-6</code></td>
- </tr>
- <tr>
- <td>1.5.1</td>
-
-
- <td>2007-12-21</td>
-
-
- <td align="center"><a href="version/1.5.1.html">Version1.5.1</a></td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.5.1/">CLDR1.5.1</a></td>
-
-
- <td>
- <a href="http://www.unicode.org/reports/tr35/tr35-9.html">LDML1.5.1</a>
- </td>
-
-
- <td style="text-align: left;">
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1%5C.5%5C.1">Changes1.5.1</a></td>
-
-
- <td><code>release-1-5-1</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
-
-
- <td>1.5</td>
-
-
- <td>2007-07-31</td>
-
-
- <td align="center"><a href="version/1.5.html">Version1.5</a></td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.5.0/">CLDR1.5</a></td>
-
-
- <td>
- <a href="http://www.unicode.org/reports/tr35/tr35-8.html">LDML1.5</a>
- </td>
-
-
- <td style="text-align: left;">
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.5">Changes1.5</a></td>
-
-
- <td><code>release-1-5</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.4.1</td>
-
-
- <td>2006-11-03</td>
-
-
- <td align="center"><a href="version/1.4.1.html">Version1.4.1</a></td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.4.1/">CLDR1.4.1</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-7.html">LDML1.4.1</a></td>
-
-
- <td style="text-align: left;"><a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.4.1">Changes1.4.1</a></td>
-
-
- <td><code>release-1-4-1</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.4</td>
-
-
- <td>2006-07-17</td>
-
-
- <td align="center"><a href="version/1.4.html">Version1.4</a></td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.4.0/">CLDR1.4</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-6.html">LDML1.4</a> </td>
-
-
- <td style="text-align: left;"><a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.4">Changes1.4</a></td>
-
-
- <td><code>release-1-4</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.3</td>
-
-
- <td>2005-06-02</td>
-
-
- <td align="center"><a href="version/1.3.html">Version1.3</a></td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.3.0/">CLDR1.3</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-5.html">LDML1.3</a> </td>
-
-
- <td style="text-align: left;"><a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.3">Changes1.3</a></td>
-
-
- <td><code>release-1-3</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.2</td>
-
-
- <td>2004-11-04</td>
-
-
- <td>
-
-
- <p align="center"><a href="version/1.2.html">Version1.2</a></p>
-
-
- </td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.2.0/">CLDR1.2</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-4.html">LDML1.2</a></td>
-
-
- <td style="text-align: left;"><a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.2">Changes1.2</a></td>
-
-
- <td><code>release-1-2</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.1.1</td>
-
-
- <td>2004-07-29</td>
-
-
- <td align="center">n/a</td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.1.1/">CLDR1.1.1</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-2.html">LDML1.1</a></td>
-
-
- <td align="center">n/a</td>
-
-
- <td><code>release-1-1-1</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.1</td>
-
-
- <td>2004-06-08</td>
-
-
- <td align="center">n/a</td>
-
-
- <td><a href="http://unicode.org/Public/cldr/1.1.0/">CLDR1.1</a></td>
-
-
- <td><a href="http://www.unicode.org/reports/tr35/tr35-2.html">LDML1.1</a></td>
-
-
- <td align="center">n/a</td>
-
-
- <td><code>release-1-1</code></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td>1.0</td>
-
-
- <td>2003-12-19</td>
-
-
- <td colspan="4" align="center">See <a href="#CLDR_1.0_Release">CLDR 1.0 Release</a></td>
-
-
- <td><code>release-1-0</code></td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
- </center>
-
- </div>
-
-
-
-
- <ul>
-
-
- <li>The Release Note contains a general description of the contents of the release,
- and any relevant notes about the release.</li>
-
-
- <li>The Data link points to a set of zip files containing the
-contents of the release (the files are complete in themselves, and do
-not require files from earlier releases -- for the structure of the zip
-file, see <span class="GramE"><a href="#Repository_Organization">Repository Organization</a></span>).</li>
-
-
- <li>The Spec is the version of
- <a href="http://www.unicode.org/reports/tr35/">UTS #35: LDML</a> that corresponds to the release.</li>
-
-
- <li>The Delta document points to a list of all
- the bug fixes and features in the release, which be used to get the precise corresponding file changes using
- <a href="http://unicode.org/cgi-bin/bugdiffs.pl">BugDiffs</a>.)</li>
-
-
- <li>The CVS Tag can be used to get the files in CVS.</li>
-
-
-
-
- </ul>
-
-
-
-
- <p>Access to the latest working snapshot of CLDR, and access to data collected for other platforms
- is available through the web. The CVS Tag can be used to get the contents of the release, as described below. </p>
-
-
-
-
- <h2><a name="latest_draft_version">CVS Access</a></h2>
-
-
-
-
- <p class="first"><b>Simple CVS Access. </b>For simple access to particular files, use <a href="http://unicode.org/cldr/data/">http://unicode.org/cldr/data/</a>.
- For example:</p>
-
-
-
-
- <ul>
-
-
- <li>
-
-
- <p class="first">go to the French LDML files at<br>
-
-
- <a href="http://unicode.org/cldr/data/common/main/fr.xml">http://unicode.org/cldr/data/common/main/fr.xml</a>.</p>
-
-
- </li>
-
-
-
-
- </ul>
-
-
-
-
- <p class="first"><b>Advanced CVS Access. </b>For more access to the source repository, you can use the following URL:
- <a href="http://unicode.org/cldr/repository/">http://unicode.org/cldr/repository/</a>.
-It provides access to older versions of files, and to a way to get
-diff's of the files. For example, you can pick which version of the
-file to view, or compare, say, version 1.37 against the released 1.2
-version:</p>
-
-
-
-
- <ul>
-
-
- <li>
-
-
- <p class="first">go to the French LDML files at <a href="http://unicode.org/cldr/repository/common/main/fr.xml">http://unicode.org/cldr/repository/common/main/fr.xml</a></p>
-
-
- </li>
-
-
- <li>
-
-
- <p class="first">find "<u><b><code>release-1-2-final</code></b></u>"</p>
-
-
- </li>
-
-
- <li>
-
-
- <p class="first">go up a couple of lines, and click on "<u><code>[select for diffs]</code></u>"</p>
-
-
- </li>
-
-
- <li>
-
-
- <p class="first">scroll up and find the 1.37 version</p>
-
-
- </li>
-
-
- <li>
-
-
- <p class="first">click on the second link in "<code>Diff to <u>previous 1.37</u> to </code><u><code>selected 1.34</code></u>"</p>
-
-
- </li>
-
-
-
-
- </ul>
-
-
-
-
- <p class="first"><b>CVS Snapshots. </b>For those familiar with CVS, a daily snapshot of the data is placed in
- <a href="ftp://ftp.unicode.org/Public/cldr/cldr-repository-daily.tgz">ftp://ftp.unicode.org/Public/cldr/cldr-repository-daily.tgz</a> </p>
-
-
-
-
- <ul>
-
-
- <li>
-
-
- <p class="first">Download and unpack the gzipped tar archive into an empty directory, for example, “cldrcvs”. It will contain a directory
- CVSROOT and cldr</p>
-
-
- </li>
-
-
- <li>
-
-
- <p class="first">Pass the “cldrcvs” directory as the repository path to your CVS client.<br>
-
-
- <i>Example:</i> <code>cd </code><i><code>somewhere</code></i><code> ; cvs -d/tmp/cldrcvs co.</code></p>
-
-
- </li>
-
-
-
-
- </ul>
-
-
-
-
- <h3><a name="Repository_Organization">Repository Organization</a></h3>
-
-
-
-
- <p>At the top level of CVS there are a number of special
-folders, plus a number of platform folders. The special folders are
-listed below. The <i>common</i>, <i>dtd</i>, <i>tools, </i>and<i> test</i> folders are in each release.</p>
-
-
-
-
- <ul>
-
-
- <li><i>common</i> — CLDR data corresponding to the release
-
- <ul>
-
-
- <li><i>collation</i> — collation LDML files</li>
-
-
- <li><i>main</i> — main LDML files</li>
-
-
- <li><i>posix</i> — generated POSIX files</li>
-
-
- <li><i>segments</i> — files for segmenting text</li>
-
-
- <li><i>supplemental</i> — additional files with non-linguistic data</li>
-
-
- <li><i>test</i> — conformance test files for CLDR data. The format of the tests is explained in a readMe.html.</li>
-
-
- <li><i>transforms</i> — data for transliteration and other text
- transforms</li>
-
-
-
-
- </ul>
-
-
- </li>
-
-
- <li><i>diff</i> — chart for CLDR data</li>
-
-
- <li><i>docs</i> — source files for the CLDR site, design docs, presentations, etc.</li>
-
-
- <li><i>dropbox</i> — temporary files</li>
-
-
- <li><i>dtd</i> — the latest dtd files for the release</li>
-
-
- <li><i>tools</i> — source for internal tools for processing CLDR data</li>
-
-
-
-
- </ul>
-
-
-
-
- <p>The other folders contain generated platform data in LDML format. Currently, that is:</p>
-
-
-
-
- <ul>
-
-
- <li>aix</li>
-
-
- <li>hp</li>
-
-
- <li>ibm</li>
-
-
- <li>ibmjdk</li>
-
-
- <li>linux</li>
-
-
- <li>open office</li>
-
-
- <li>solaris</li>
-
-
- <li>sunjdk</li>
-
-
- <li>windows</li>
-
-
-
-
- </ul>
-
-
-
-
- <p align="left"><b><i>Note: the data in the platform folders is provided for comparison only, and is <u>not</u> to be viewed as authoritative
- or referenceable.</i></b></p>
-
-
-
-
- <h2 align="left"><a name="POSIX_Data">POSIX Data</a></h2>
-
-
-
-
- <p align="left">CLDR includes reference versions of
-POSIX-format locale source files that are generated using the default
-options for each supported locale. The reference versions of POSIX
-source information contain those data fields that are included in the
-POSIX specification.</p>
-
-
-
-
- <p align="left">Many operating system platforms provide
-additional extensions to the minimal POSIX required field set.
-Individual implementations may require addition of the
-platform-specific fields or a non-default character repertoire in order
-to provide full functionality on a given POSIX compliant operating
-system. As of the current release, the POSIX locale generation tools do
-not generate such platform-specific extensions, but they can be
-modified to support this.</p>
-
-
-
-
- <h2 align="left"><b><i><a name="CLDR_1.0_Release">CLDR 1.0 Release</a></i></b></h2>
-
-
-
-
- <p><i>The 1.0 version of CLDR is described here for
-historical interest only. It was hosted on the OpenI18N site before the
-CLDR project moved to the Unicode Consortium.</i></p>
-
-
-
-
- <table style="border-collapse: collapse;" border="1" cellpadding="2" cellspacing="0" width="95%">
-
-
- <tbody>
-
- <tr>
-
-
- <td><i>1.0 Version:</i></td>
-
-
- <td><a href="http://www.openi18n.org/spec/ldml/1.0/ldml-spec.htm">http://www.openi18n.org/spec/ldml/1.0/ldml-spec.htm</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td><i>1.0 Namespace:</i></td>
-
-
- <td><a href="http://www.openi18n.org/spec/ldml">http://www.openi18n.org/spec/ldml</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td><i>1.0 DTDs:</i></td>
-
-
- <td><a href="http://www.openi18n.org/spec/ldml/1.0/ldml.dtd">http://www.openi18n.org/spec/ldml/1.0/ldml.dtd</a><br>
-
-
- <a href="http://www.openi18n.org/spec/ldml/1.0/ldmlSupplemental.dtd">http://www.openi18n.org/spec/ldml/1.0/ldmlSupplemental.dtd</a></td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
-
-
- <blockquote>
- </blockquote>
-
-
- </div>
-
-
- </td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
-
-
- <hr width="50%">
-
-
- <div align="center">
-
-
- <center>
-
-
- <table border="0" cellpadding="0" cellspacing="0">
-
-
- <tbody>
-
- <tr>
-
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
-
- </tr>
-
-
-
-
- </tbody>
-
- </table>
-
-
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
-
- </div>
-
-
- </td>
-
-
- </tr>
-
-
-
- </tbody>
-</table>
-
-
-
-</body>
-</html>
diff --git a/specs/ldml/survey_tool.html b/specs/ldml/survey_tool.html
deleted file mode 100644
index 122f89c..0000000
--- a/specs/ldml/survey_tool.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-<title>Unicode CLDR Survey Tool</title><link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css"></head>
-<body style="color: rgb(51, 0, 0);">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td colspan="2">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td class="icon"><a href="http://www.unicode.org/"> <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
-<a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
-<td class="bar"><a href="http://www.unicode.org" class="bar">Home</a>
-| <a href="http://www.unicode.org/sitemap/" class="bar">Site
-Map</a> | <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-<tr>
-<td colspan="2" class="gray"> </td>
-</tr>
-<tr>
-<td class="navCol" valign="top" width="25%">
-<table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-<tbody>
-<tr>
-<td class="navColTitle">Unicode CLDR</td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="index.html">CLDR Project</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="repository_access.html">CLDR Releases (Downloads)</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="survey_tool.html">CLDR Survey Tool</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="comparison_charts.html">CLDR Charts</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="process.html">CLDR Process</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale
-Data Markup Language (LDML)</a></td>
-</tr>
-<tr>
-<td class="navColTitle">Related Links</td>
-</tr>
-<tr>
-<td class="navColCell" valign="top">Join
-the <a href="http://www.unicode.org/consortium/consort.html">Unicode
-Consortium</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/">Unicode Technical
-Reports</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/faq/reports_process.html">Technical
-Reports Development and Maintenance Process</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/consortium/utc.html">Unicode
-Technical Committee</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/versions/">Versions of the
-Unicode Standard</a></td>
-</tr>
-<tr>
-<td class="navColTitle">Other Publications</td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/standard/standard.html">The
-Unicode Standard</a></td>
-</tr>
-<tr>
-<td class="navColCell" valign="top"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
-</tr>
-</tbody>
-</table>
-<!-- BEGIN CONTENTS --></td>
-<td>
-<table>
-<tbody>
-<tr>
-<td class="contents" valign="top">
-<div class="body">
-<h1>Unicode CLDR Survey Tool</h1><br>
-<table class="sidebar" id="table2" align="right">
-<tbody>
- <tr>
- <td class="sidebarTitle" style="" colspan="3">
- <span style="font-size: 133%;">Key Links</span></td>
- </tr>
-<tr><td class="sidebar"><a href="http://unicode.org/cldr/apps/survey">Survey Tool</a></td></tr>
-<tr><td class="sidebar"><a href="http://unicode.org/cldr/data/docs/survey/windows.html">Survey
- Tool Windows</a></td></tr>
-<tr><td class="sidebar"><a href="http://unicode.org/cldr/survey_tool_known_bugs.html">Known
- Bugs</a></td></tr>
-<tr><td class="sidebar"><a href="http://unicode.org/cldr/data/docs/survey/walkthrough.html">Walkthrough</a></td></tr><tr><td class="sidebar"><a href="http://unicode.org/cldr/data/docs/survey/managing_users.html">Managing Users</a></td></tr><tr><td class="sidebar"><a href="http://unicode.org/cldr/data/docs/survey/vetting.html">Vetting Phase</a></td></tr><tr><td class="sidebar"><a href="http://www.unicode.org/consortium/distlist.html#cldr_list">Unicode
- CLDR Mailing List</a></td></tr>
-<tr><td class="sidebar"><a href="http://unicode.org/cldr/survey_tool.html">Survey Tool Overview</a> (this page)</td></tr>
-</tbody>
-</table>
-<p>Most data in the
-Unicode Common Locale Data Repository is gathered and processed via
-what is called the Survey Tool, an online tool that can be used to view
-data for different languages and propose additions or changes. <span>This tool provides a way to propose new
-localized data, see what others have proposed, and communicate with
-them to resolve differences</span>.</p>
-During <span>each</span>
-submission period, contributors from Unicode Consortium members, other
-organizations and the public at large are invited to review the data
-for their languages and countries, and propose new translations of
-terms or modifications, including language translations entirely new to
-the repository. For the release schedule, see <a href="index.html">CLDR
-Project</a>.<p>
-In this release, new structure has been added to provide for <span>plurals,
-simple duration formats, more
-control over the formatting of locale names. There are a
-number of changes in the tool for usability: for example, only the
-timezone names that are important to translate are shown. There are
-also new items for translation, such as new territory codes. We would
-also
-like people to focus on getting enough votes for the unapproved items
-to
-make them
-approved.</span></p><p>
-<span>The following
-provides a brief description of the process.</span>
-</p><h2>Accounts</h2>
-<p>You don’t need an account to view data for a
-particular language. If you wish to propose changes or additions, you
-will need an account: see <a class="wikipagelink" href="http://www.unicode.org/cldr/wiki?SurveyToolAccounts">Survey
-Tool Accounts</a>.</p>
-<h2>Locale List</h2>
-The main screen of the survey tool is located at <a href="http://unicode.org/cldr/apps/survey">http://unicode.org/cldr/apps/survey</a>.
-It displays a list of languages currently available. Languages will
-vary by script (Arabic vs. Latin, or Simplified vs. Traditional
-Chinese), and occasionally by country. For historic reasons, this
-combination of language with script or country is known as a <i>locale</i>.
-<p>For each language, the content is what is
-appropriate for the most populous country, thus the content for <i>English</i>
-[en] is whatever is appropriate for the United States. Any variation by
-country for that language will be represented in a country locale: thus
-content appropriate for the Australia that differs from what is in <i>English</i>
-[en] will be in a the sublocale <i>English (Australia) </i>[en_AU].</p>
-<p>Click on the languages (optionally countries) that
-you would like to view. You can always get back to this page by
-clicking on <em>Locales</em> at the top left of the page. </p>
-<ul>
-<li>If you have permission to modify a locale,
-after the locale you will see the <img alt="The image “http://unicode.org/cldr/apps/hand.png” cannot be displayed, because it contains errors." src="http://unicode.org/cldr/apps/hand.png"> symbol. </li>
-<li>If you would like to add data for a <em>new</em>
-locale, please notify your CLDR contact (see <a class="wikipagelink" href="http://www.unicode.org/cldr/wiki?SurveyToolAccounts">Survey
-Tool Accounts</a>). He or she can add an empty locale which can
-then have data added into it.</li>
-</ul>
-<h2>Reviewing and Submitting Data</h2>
-There is a key explaining the way the windows are laid out at <a href="http://unicode.org/cldr/data/docs/survey/windows.html">Survey
-Tool Windows</a>. You should review this before starting. You
-will then start going through each section: <i>languages</i>,
-<i>scripts</i>, <i>territories</i>,
-... all the way to <i>supplemental</i>.
-<ul>
-<li>As you go through the sections, you will
-generally review the Priority items (if any), and fix or add
-translations.
-<ul>
-<li>Click on the right option, if it is there. </li>
-<li>Otherwise click on "<i>change to</i>",
-then type in the fixed or new text.</li>
-<li><em><b>Important</b>:</em>
-before you leave any page, click on the <b>Save</b> button
-to save your changes. It's also a good idea to do this if you are
-spending a lot of time on a page, just in case there is a problem.</li>
-<li>Control-F to find something on the page is
-really useful in moving around on these pages, as are Page up and Page
-down keys. You can also switch between ordering items by <b>Priority</b>
-vs <b>Code</b>.</li>
-</ul>
-</li>
-<li>More information is in the "Zoomed" view, so be
-sure to look at that if you have any questions. It's also a good idea
-to zoom in on at least one item in each section, to review any
-information for that section.</li>
-</ul>
-<p>The locale data should be in the customary form
-for the target language, in the form that is in most common usage. For
-example, for the territory name in English one would use "Switzerland"
-instead of "Swiss Confederation", and use "United Kingdom" instead of
-"The United Kingdom of Great Britain and Northern Ireland".</p>
-<h2><strong>Coverage</strong></h2>
-<p>The warnings about missing items are based on your
-<i>coverage level.</i> This level can be from <i>comprehensive</i>
-(all possible items) down to <i>basic</i> (a very minimal
-set of items). Locales that don't meet at least <i>basic</i>
-level may not be complete enough to be in the official release
-(although the data will be kept in the working repository).</p>
-<ul>
-<li>You can go to <strong>My Options</strong>
-(in the top-left corner of each page), and set your coverage level
-explicitly.</li>
-<li>If you are from a Unicode member organization,
-your default coverage level will be set for you. However, you may want
-to increase your coverage (on <strong>My Options</strong>)
-in order to get more warnings about the next-priority items.</li>
-</ul>
-<p><b>Caution: </b>these warnings are
-mechanically generated, and do not substitute for your judgment: you
-may want to translate more items based on your knowledge. For example,
-a Ukrainian speaker may want to translate the names of the neighboring
-countries, even if those are not warnings at the current coverage level.</p>
-<h2><strong>Country-Specific Information</strong></h2>
-<p>The language locale should contain the most
-broadly used data for that language, and should be appropriate for the
-most populous region; other specific region locales should only contain
-data where they need to override individual items, when the "inherited"
-language locale data would not be customary in that region.</p>
-<p>Once you've looked over all the sections in your
-language, you should go back to the <a href="http://unicode.org/cldr/apps/survey">Locale</a>
-window, and scroll back to your language. You'll see different
-countries there on the right side of your language. If there are locale
-variations in the use of your language, according to country, then you
-can change them now. You <em>only</em> need to do this for
-cases where the usage in the countries differ from the main language.</p>
-<p><span>Each
-language has the </span><span style="font-style: italic;">default content</span><span> for one of the countries using the
-language. You won't be able to edit that country locale; instead, any
-modifications should go in the main language locale.</span> </p>
-<h2>Resolving Differences among Translators</h2>
-<p>After the data submission phase, any differences
-in the submitted data will be resolved according to the <a href="process.html#resolution_procedure">data resolution
-process</a>. <span>However,
-even during the submission phase, you should collaborate with the other
-translators where you have questions, via email and the forums.</span></p>
-<h2>Problems?</h2>
-The tool has undergone substantial revisions based on feedback we
-received during the last release. There are still some rough edges and
-we ask for your patience with problems that occur. In particular, the
-tool is not designed to handle a large number of people working at the
-same time, so if it appears unresponsive, please try again later on
-(and save your work as you go).
-<p>If you find a problem, you may want to review <a class="wikipagelink" href="http://unicode.org/cldr/survey_tool_known_bugs.html">Known
-Bugs</a>
-to see whether it has already been reported (and whether there is a
-work-around). If not, or if you have suggestions for improvements,
-please file a bug using the Feedback link at the bottom of each window.
-If there are other issues, you can raise them on the <a href="http://www.unicode.org/consortium/distlist.html#cldr_list">Unicode
-CLDR Mailing List</a>.</p>
-<h2><a name="Special_Considerations">Special
-Considerations</a></h2>
-<h3><span><a name="Character_Repertoire">Character
-Repertoire</a></span></h3>
-<p><span>The data in the locale repository
-should contain the most appropriate choice of characters for the
-representation of the text. It may thus include Unicode characters that
-are not included in a given legacy character set. In particular, the
-data may contain curly quotes and apostrophes (such as in “can’t”), and
-similar characters such as the letter modifiers in ʻōlelo Hawaiʻi.</span></p>
-<p><span>These characters provide more
-distinctions than are available with the generic ASCII repertoire. They
-may be “downcast” to the best available characters when the data is
-imported into systems with a more limited repertoire of supported
-characters. (Downcasting information is provided with <a href="http://www.unicode.org/cldr/data/charts/supplemental/character_fallback_substitutions.html">character
-fallback substitutions</a>.)</span></p>
-<h3><span>Hong Kong, Macau</span></h3>
-<p><span>The territory codes HK and MO are to
-be translated with the native equivalent of “Hong Kong SAR China” and
-“Macao SAR China”, respectively. SAR stands for “Special Administrative
-Region” and can be represented with acronym in the target language.
-There are alternative, short versions of these that should also be
-translated; those omit the "SAR China".</span></p>
-<blockquote> </blockquote>
-</div>
-<wbr> </td>
-</tr>
-</tbody>
-</table>
-<hr width="50%">
-<div align="center">
-<center>
-<table border="0" cellpadding="0" cellspacing="0">
-<tbody>
-<tr>
-<td><a href="http://www.unicode.org/copyright.html">
-<img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-</tr>
-</tbody>
-</table>
-<script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
-</script>
-</center>
-</div>
-</td>
-</tr>
-</tbody>
-</table>
-</body></html>
\ No newline at end of file
diff --git a/specs/ldml/survey_tool_known_bugs.html b/specs/ldml/survey_tool_known_bugs.html
deleted file mode 100644
index c9d3ca6..0000000
--- a/specs/ldml/survey_tool_known_bugs.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<meta HTTP-EQUIV="Refresh" CONTENT="0; URL=http://unicode.org/cldr/data/docs/survey/known_bugs.html">
-</head>
-
-<body>
-
-<p>This page has moved to:
-<a href="http://unicode.org/cldr/data/docs/survey/known_bugs.html">
-http://unicode.org/cldr/data/docs/survey/known_bugs.html</a>. </p>
-
-</body>
-
-</html>
diff --git a/specs/ldml/timezone_ids.html b/specs/ldml/timezone_ids.html
deleted file mode 100644
index 4091ce1..0000000
--- a/specs/ldml/timezone_ids.html
+++ /dev/null
@@ -1,2056 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<style><!--body { font-family: serif; background-color: #FFFFFF; color: #000000 }
-th, td { vertical-align: top; border: 1px solid blue; padding: 2 }
-table { border-collapse: collapse }
-.sam { color: #00FF00 }
-.maj { color: #0000FF }
---></style>
-<title>Timezone IDs</title>
-</head>
-
-<body>
-
-<table border="1" cellpadding="0" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111" width="100%" id="AutoNumber1">
- <tr>
- <td width="100%"><i><b><font color="#FF0000">The material in this file is outdated, and has been
- incorporated into the main specification and data repository (see </font>
- <a href="http://www.unicode.org/cldr/"><font color="#FF0000">http://www.unicode.org/cldr/</font></a><font color="#FF0000">).
- The file is being maintained solely for those with old links.</font></b></i></td>
- </tr>
-</table>
-<h1>Olson IDs</h1>
-<p>The following provides a list of the Olson IDs available for translation in CLDR, organized by
-ISO country code. Note that there is <a href="http://www.jtcsv.com/cgibin/locale-bugs?findid=144">
-current discussion</a> in the CLDR committee of ways to simplify this list for translation. Where
-IDs are separated by commas, they have the same modern timezone behavior.</p>
-<p>See also <a href="http://www.twinsun.com/tz/tz-link.htm">http://www.twinsun.com/tz/tz-link.htm</a>
-and <a href="ftp://elsie.nci.nih.gov/pub/">ftp://elsie.nci.nih.gov/pub/</a>.</p>
-<table>
- <tr>
- <td><b>N°</b></td>
- <td><b>Reg</b></td>
- <td><b>Region Name</b></td>
- <td><b>Olson ID</b></td>
- <td><b>U</b></td>
- <td><b>T</b></td>
- </tr>
- <tr>
- <td>1</td>
- <td>AD</td>
- <td>Andorra</td>
- <td>Europe/Andorra</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>2</td>
- <td>AE</td>
- <td>United Arab Emirates</td>
- <td>Asia/Dubai</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>3</td>
- <td>AF</td>
- <td>Afghanistan</td>
- <td>Asia/Kabul</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>4</td>
- <td>AG</td>
- <td>Antigua and Barbuda</td>
- <td>America/Antigua</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>5</td>
- <td>AI</td>
- <td>Anguilla</td>
- <td>America/Anguilla</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>6</td>
- <td>AL</td>
- <td>Albania</td>
- <td>Europe/Tirane</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>7</td>
- <td>AM</td>
- <td>Armenia</td>
- <td>Asia/Yerevan</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>8</td>
- <td>AN</td>
- <td>Netherlands Antilles</td>
- <td>America/Curacao</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>9</td>
- <td>AO</td>
- <td>Angola</td>
- <td>Africa/Luanda</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>10</td>
- <td>AQ</td>
- <td>Antarctica</td>
- <td>Antarctica/Palmer;<br>
- Antarctica/Rothera;<br>
- Antarctica/Syowa;<br>
- Antarctica/Vostok, Antarctica/Mawson;<br>
- Antarctica/Davis;<br>
- Antarctica/Casey;<br>
- Antarctica/DumontDUrville;<br>
- Antarctica/McMurdo</td>
- <td>8</td>
- <td>9</td>
- </tr>
- <tr>
- <td>11</td>
- <td>AR</td>
- <td>Argentina</td>
- <td>America/Mendoza, America/Cordoba, America/Catamarca, America/Buenos_Aires, America/Jujuy</td>
- <td>1</td>
- <td>5</td>
- </tr>
- <tr>
- <td>12</td>
- <td>AS</td>
- <td>American Samoa</td>
- <td>Pacific/Pago_Pago</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>13</td>
- <td>AT</td>
- <td>Austria</td>
- <td>Europe/Vienna</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>14</td>
- <td>AU</td>
- <td>Australia</td>
- <td>Australia/Perth;<br>
- Australia/Darwin;<br>
- Australia/Brisbane, Australia/Lindeman;<br>
- Australia/Broken_Hill, Australia/Adelaide;<br>
- Australia/Sydney, Australia/Melbourne;<br>
- Australia/Lord_Howe;<br>
- Australia/Hobart</td>
- <td>7</td>
- <td>10</td>
- </tr>
- <tr>
- <td>15</td>
- <td>AW</td>
- <td>Aruba</td>
- <td>America/Aruba</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>16</td>
- <td>AZ</td>
- <td>Azerbaijan</td>
- <td>Asia/Baku</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>17</td>
- <td>BA</td>
- <td>Bosnia and Herzegovina</td>
- <td>Europe/Sarajevo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>18</td>
- <td>BB</td>
- <td>Barbados</td>
- <td>America/Barbados</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>19</td>
- <td>BD</td>
- <td>Bangladesh</td>
- <td>Asia/Dhaka</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>20</td>
- <td>BE</td>
- <td>Belgium</td>
- <td>Europe/Brussels</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>21</td>
- <td>BF</td>
- <td>Burkina Faso</td>
- <td>Africa/Ouagadougou</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>22</td>
- <td>BG</td>
- <td>Bulgaria</td>
- <td>Europe/Sofia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>23</td>
- <td>BH</td>
- <td>Bahrain</td>
- <td>Asia/Bahrain</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>24</td>
- <td>BI</td>
- <td>Burundi</td>
- <td>Africa/Bujumbura</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>25</td>
- <td>BJ</td>
- <td>Benin</td>
- <td>Africa/Porto-Novo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>26</td>
- <td>BM</td>
- <td>Bermuda</td>
- <td>Atlantic/Bermuda</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>27</td>
- <td>BN</td>
- <td>Brunei</td>
- <td>Asia/Brunei</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>28</td>
- <td>BO</td>
- <td>Bolivia</td>
- <td>America/La_Paz</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>29</td>
- <td>BR</td>
- <td>Brazil</td>
- <td>America/Rio_Branco, America/Eirunepe;<br>
- America/Porto_Velho, America/Manaus, America/Boa_Vista;<br>
- America/Cuiaba;<br>
- America/Belem, America/Recife, America/Fortaleza, America/Maceio;<br>
- America/Araguaina, America/Sao_Paulo;<br>
- America/Noronha</td>
- <td>6</td>
- <td>13</td>
- </tr>
- <tr>
- <td>30</td>
- <td>BS</td>
- <td>Bahamas</td>
- <td>America/Nassau</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>31</td>
- <td>BT</td>
- <td>Bhutan</td>
- <td>Asia/Thimphu</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>32</td>
- <td>BV</td>
- <td>Bouvet Island</td>
- <td></td>
- <td>1</td>
- <td>0</td>
- </tr>
- <tr>
- <td>33</td>
- <td>BW</td>
- <td>Botswana</td>
- <td>Africa/Gaborone</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>34</td>
- <td>BY</td>
- <td>Belarus</td>
- <td>Europe/Minsk</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>35</td>
- <td>BZ</td>
- <td>Belize</td>
- <td>America/Belize</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>36</td>
- <td>CA</td>
- <td>Canada</td>
- <td>America/Dawson, America/Whitehorse, America/Vancouver;<br>
- America/Dawson_Creek;<br>
- America/Inuvik, America/Yellowknife, America/Edmonton, America/Cambridge_Bay;<br>
- America/Swift_Current, America/Regina;<br>
- America/Rainy_River, America/Rankin_Inlet;<br>
- America/Winnipeg;<br>
- America/Iqaluit, America/Pangnirtung, America/Nipigon, America/Thunder_Bay;<br>
- America/Goose_Bay;<br>
- America/Glace_Bay, America/Halifax;<br>
- America/St_Johns</td>
- <td>10</td>
- <td>22</td>
- </tr>
- <tr>
- <td>37</td>
- <td>CC</td>
- <td>Cocos (Keeling) Islands</td>
- <td>Indian/Cocos</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>38</td>
- <td>CD</td>
- <td>Democratic Republic of the Congo</td>
- <td>Africa/Kinshasa;<br>
- Africa/Lubumbashi</td>
- <td>2</td>
- <td>2</td>
- </tr>
- <tr>
- <td>39</td>
- <td>CF</td>
- <td>Central African Republic</td>
- <td>Africa/Bangui</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>40</td>
- <td>CG</td>
- <td>Congo</td>
- <td>Africa/Brazzaville</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>41</td>
- <td>CH</td>
- <td>Switzerland</td>
- <td>Europe/Zurich</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>42</td>
- <td>CI</td>
- <td>Côte d’Ivoire</td>
- <td>Africa/Abidjan</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>43</td>
- <td>CK</td>
- <td>Cook Islands</td>
- <td>Pacific/Rarotonga</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>44</td>
- <td>CL</td>
- <td>Chile</td>
- <td>Pacific/Easter;<br>
- America/Santiago</td>
- <td>2</td>
- <td>2</td>
- </tr>
- <tr>
- <td>45</td>
- <td>CM</td>
- <td>Cameroon</td>
- <td>Africa/Douala</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>46</td>
- <td>CN</td>
- <td>China</td>
- <td>Asia/Kashgar, Asia/Urumqi, Asia/Chongqing, Asia/Shanghai, Asia/Harbin</td>
- <td>1</td>
- <td>5</td>
- </tr>
- <tr>
- <td>47</td>
- <td>CO</td>
- <td>Colombia</td>
- <td>America/Bogota</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>48</td>
- <td>CR</td>
- <td>Costa Rica</td>
- <td>America/Costa_Rica</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>49</td>
- <td>CU</td>
- <td>Cuba</td>
- <td>America/Havana</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>50</td>
- <td>CV</td>
- <td>Cape Verde</td>
- <td>Atlantic/Cape_Verde</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>51</td>
- <td>CX</td>
- <td>Christmas Island</td>
- <td>Indian/Christmas</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>52</td>
- <td>CY</td>
- <td>Cyprus</td>
- <td>Asia/Nicosia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>53</td>
- <td>CZ</td>
- <td>Czech Republic</td>
- <td>Europe/Prague</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>54</td>
- <td>DE</td>
- <td>Germany</td>
- <td>Europe/Berlin</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>55</td>
- <td>DJ</td>
- <td>Djibouti</td>
- <td>Africa/Djibouti</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>56</td>
- <td>DK</td>
- <td>Denmark</td>
- <td>Europe/Copenhagen</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>57</td>
- <td>DM</td>
- <td>Dominica</td>
- <td>America/Dominica</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>58</td>
- <td>DO</td>
- <td>Dominican Republic</td>
- <td>America/Santo_Domingo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>59</td>
- <td>DZ</td>
- <td>Algeria</td>
- <td>Africa/Algiers</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>60</td>
- <td>EC</td>
- <td>Ecuador</td>
- <td>Pacific/Galapagos;<br>
- America/Guayaquil</td>
- <td>2</td>
- <td>2</td>
- </tr>
- <tr>
- <td>61</td>
- <td>EE</td>
- <td>Estonia</td>
- <td>Europe/Tallinn</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>62</td>
- <td>EG</td>
- <td>Egypt</td>
- <td>Africa/Cairo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>63</td>
- <td>EH</td>
- <td>Western Sahara</td>
- <td>Africa/El_Aaiun</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>64</td>
- <td>ER</td>
- <td>Eritrea</td>
- <td>Africa/Asmera</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>65</td>
- <td>ES</td>
- <td>Spain</td>
- <td>Atlantic/Canary;<br>
- Africa/Ceuta, Europe/Madrid</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>66</td>
- <td>ET</td>
- <td>Ethiopia</td>
- <td>Africa/Addis_Ababa</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>67</td>
- <td>FI</td>
- <td>Finland</td>
- <td>Europe/Helsinki</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>68</td>
- <td>FJ</td>
- <td>Fiji</td>
- <td>Pacific/Fiji</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>69</td>
- <td>FK</td>
- <td>Falkland Islands</td>
- <td>Atlantic/Stanley</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>70</td>
- <td>FM</td>
- <td>Micronesia</td>
- <td>Pacific/Yap, Pacific/Truk;<br>
- Pacific/Ponape, Pacific/Kosrae</td>
- <td>2</td>
- <td>4</td>
- </tr>
- <tr>
- <td>71</td>
- <td>FO</td>
- <td>Faroe Islands</td>
- <td>Atlantic/Faeroe</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>72</td>
- <td>FR</td>
- <td>France</td>
- <td>Europe/Paris</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>73</td>
- <td>GA</td>
- <td>Gabon</td>
- <td>Africa/Libreville</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>74</td>
- <td>GB</td>
- <td>United Kingdom</td>
- <td>Europe/London, Europe/Belfast</td>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>75</td>
- <td>GD</td>
- <td>Grenada</td>
- <td>America/Grenada</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>76</td>
- <td>GE</td>
- <td>Georgia</td>
- <td>Asia/Tbilisi</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>77</td>
- <td>GF</td>
- <td>French Guiana</td>
- <td>America/Cayenne</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>78</td>
- <td>GH</td>
- <td>Ghana</td>
- <td>Africa/Accra</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>79</td>
- <td>GI</td>
- <td>Gibraltar</td>
- <td>Europe/Gibraltar</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>80</td>
- <td>GL</td>
- <td>Greenland</td>
- <td>America/Thule;<br>
- America/Godthab;<br>
- America/Scoresbysund;<br>
- America/Danmarkshavn</td>
- <td>4</td>
- <td>4</td>
- </tr>
- <tr>
- <td>81</td>
- <td>GM</td>
- <td>Gambia</td>
- <td>Africa/Banjul</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>82</td>
- <td>GN</td>
- <td>Guinea</td>
- <td>Africa/Conakry</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>83</td>
- <td>GP</td>
- <td>Guadeloupe</td>
- <td>America/Guadeloupe</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>84</td>
- <td>GQ</td>
- <td>Equatorial Guinea</td>
- <td>Africa/Malabo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>85</td>
- <td>GR</td>
- <td>Greece</td>
- <td>Europe/Athens</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>86</td>
- <td>GS</td>
- <td>South Georgia and the South Sandwich Islands</td>
- <td>Atlantic/South_Georgia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>87</td>
- <td>GT</td>
- <td>Guatemala</td>
- <td>America/Guatemala</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>88</td>
- <td>GU</td>
- <td>Guam</td>
- <td>Pacific/Guam</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>89</td>
- <td>GW</td>
- <td>Guinea-Bissau</td>
- <td>Africa/Bissau</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>90</td>
- <td>GY</td>
- <td>Guyana</td>
- <td>America/Guyana</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>91</td>
- <td>HK</td>
- <td>Hong Kong S.A.R., China</td>
- <td>Asia/Hong_Kong</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>92</td>
- <td>HM</td>
- <td>Heard Island and McDonald Islands</td>
- <td></td>
- <td>1</td>
- <td>0</td>
- </tr>
- <tr>
- <td>93</td>
- <td>HN</td>
- <td>Honduras</td>
- <td>America/Tegucigalpa</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>94</td>
- <td>HR</td>
- <td>Croatia</td>
- <td>Europe/Zagreb</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>95</td>
- <td>HT</td>
- <td>Haiti</td>
- <td>America/Port-au-Prince</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>96</td>
- <td>HU</td>
- <td>Hungary</td>
- <td>Europe/Budapest</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>97</td>
- <td>ID</td>
- <td>Indonesia</td>
- <td>Asia/Jakarta, Asia/Pontianak;<br>
- Asia/Makassar;<br>
- Asia/Jayapura</td>
- <td>3</td>
- <td>4</td>
- </tr>
- <tr>
- <td>98</td>
- <td>IE</td>
- <td>Ireland</td>
- <td>Europe/Dublin</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>99</td>
- <td>IL</td>
- <td>Israel</td>
- <td>Asia/Jerusalem</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>100</td>
- <td>IN</td>
- <td>India</td>
- <td>Asia/Calcutta</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>101</td>
- <td>IO</td>
- <td>British Indian Ocean Territory</td>
- <td>Indian/Chagos</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>102</td>
- <td>IQ</td>
- <td>Iraq</td>
- <td>Asia/Baghdad</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>103</td>
- <td>IR</td>
- <td>Iran</td>
- <td>Asia/Tehran</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>104</td>
- <td>IS</td>
- <td>Iceland</td>
- <td>Atlantic/Reykjavik</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>105</td>
- <td>IT</td>
- <td>Italy</td>
- <td>Europe/Rome</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>106</td>
- <td>JM</td>
- <td>Jamaica</td>
- <td>America/Jamaica</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>107</td>
- <td>JO</td>
- <td>Jordan</td>
- <td>Asia/Amman</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>108</td>
- <td>JP</td>
- <td>Japan</td>
- <td>Asia/Tokyo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>109</td>
- <td>KE</td>
- <td>Kenya</td>
- <td>Africa/Nairobi</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>110</td>
- <td>KG</td>
- <td>Kyrgyzstan</td>
- <td>Asia/Bishkek</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>111</td>
- <td>KH</td>
- <td>Cambodia</td>
- <td>Asia/Phnom_Penh</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>112</td>
- <td>KI</td>
- <td>Kiribati</td>
- <td>Pacific/Tarawa;<br>
- Pacific/Enderbury;<br>
- Pacific/Kiritimati</td>
- <td>3</td>
- <td>3</td>
- </tr>
- <tr>
- <td>113</td>
- <td>KM</td>
- <td>Comoros</td>
- <td>Indian/Comoro</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>114</td>
- <td>KN</td>
- <td>Saint Kitts and Nevis</td>
- <td>America/St_Kitts</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>115</td>
- <td>KP</td>
- <td>North Korea</td>
- <td>Asia/Pyongyang</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>116</td>
- <td>KR</td>
- <td>South Korea</td>
- <td>Asia/Seoul</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>117</td>
- <td>KW</td>
- <td>Kuwait</td>
- <td>Asia/Kuwait</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>118</td>
- <td>KY</td>
- <td>Cayman Islands</td>
- <td>America/Cayman</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>119</td>
- <td>KZ</td>
- <td>Kazakhstan</td>
- <td>Asia/Aqtau, Asia/Oral;<br>
- Asia/Aqtobe;<br>
- Asia/Qyzylorda, Asia/Almaty</td>
- <td>3</td>
- <td>5</td>
- </tr>
- <tr>
- <td>120</td>
- <td>LA</td>
- <td>Laos</td>
- <td>Asia/Vientiane</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>121</td>
- <td>LB</td>
- <td>Lebanon</td>
- <td>Asia/Beirut</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>122</td>
- <td>LC</td>
- <td>Saint Lucia</td>
- <td>America/St_Lucia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>123</td>
- <td>LI</td>
- <td>Liechtenstein</td>
- <td>Europe/Vaduz</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>124</td>
- <td>LK</td>
- <td>Sri Lanka</td>
- <td>Asia/Colombo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>125</td>
- <td>LR</td>
- <td>Liberia</td>
- <td>Africa/Monrovia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>126</td>
- <td>LS</td>
- <td>Lesotho</td>
- <td>Africa/Maseru</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>127</td>
- <td>LT</td>
- <td>Lithuania</td>
- <td>Europe/Vilnius</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>128</td>
- <td>LU</td>
- <td>Luxembourg</td>
- <td>Europe/Luxembourg</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>129</td>
- <td>LV</td>
- <td>Latvia</td>
- <td>Europe/Riga</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>130</td>
- <td>LY</td>
- <td>Libya</td>
- <td>Africa/Tripoli</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>131</td>
- <td>MA</td>
- <td>Morocco</td>
- <td>Africa/Casablanca</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>132</td>
- <td>MC</td>
- <td>Monaco</td>
- <td>Europe/Monaco</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>133</td>
- <td>MD</td>
- <td>Moldova</td>
- <td>Europe/Chisinau</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>134</td>
- <td>MG</td>
- <td>Madagascar</td>
- <td>Indian/Antananarivo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>135</td>
- <td>MH</td>
- <td>Marshall Islands</td>
- <td>Pacific/Kwajalein, Pacific/Majuro</td>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>136</td>
- <td>MK</td>
- <td>Macedonia</td>
- <td>Europe/Skopje</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>137</td>
- <td>ML</td>
- <td>Mali</td>
- <td>Africa/Bamako, Africa/Timbuktu</td>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>138</td>
- <td>MM</td>
- <td>Myanmar</td>
- <td>Asia/Rangoon</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>139</td>
- <td>MN</td>
- <td>Mongolia</td>
- <td>Asia/Hovd;<br>
- Asia/Ulaanbaatar;<br>
- Asia/Choibalsan</td>
- <td>3</td>
- <td>3</td>
- </tr>
- <tr>
- <td>140</td>
- <td>MO</td>
- <td>Macao S.A.R., China</td>
- <td>Asia/Macau</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>141</td>
- <td>MP</td>
- <td>Northern Mariana Islands</td>
- <td>Pacific/Saipan</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>142</td>
- <td>MQ</td>
- <td>Martinique</td>
- <td>America/Martinique</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>143</td>
- <td>MR</td>
- <td>Mauritania</td>
- <td>Africa/Nouakchott</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>144</td>
- <td>MS</td>
- <td>Montserrat</td>
- <td>America/Montserrat</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>145</td>
- <td>MT</td>
- <td>Malta</td>
- <td>Europe/Malta</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>146</td>
- <td>MU</td>
- <td>Mauritius</td>
- <td>Indian/Mauritius</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>147</td>
- <td>MV</td>
- <td>Maldives</td>
- <td>Indian/Maldives</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>148</td>
- <td>MW</td>
- <td>Malawi</td>
- <td>Africa/Blantyre</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>149</td>
- <td>MX</td>
- <td>Mexico</td>
- <td>America/Tijuana;<br>
- America/Hermosillo;<br>
- America/Mazatlan, America/Chihuahua;<br>
- America/Mexico_City, America/Merida, America/Monterrey, America/Cancun</td>
- <td>4</td>
- <td>8</td>
- </tr>
- <tr>
- <td>150</td>
- <td>MY</td>
- <td>Malaysia</td>
- <td>Asia/Kuala_Lumpur, Asia/Kuching</td>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>151</td>
- <td>MZ</td>
- <td>Mozambique</td>
- <td>Africa/Maputo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>152</td>
- <td>NA</td>
- <td>Namibia</td>
- <td>Africa/Windhoek</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>153</td>
- <td>NC</td>
- <td>New Caledonia</td>
- <td>Pacific/Noumea</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>154</td>
- <td>NE</td>
- <td>Niger</td>
- <td>Africa/Niamey</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>155</td>
- <td>NF</td>
- <td>Norfolk Island</td>
- <td>Pacific/Norfolk</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>156</td>
- <td>NG</td>
- <td>Nigeria</td>
- <td>Africa/Lagos</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>157</td>
- <td>NI</td>
- <td>Nicaragua</td>
- <td>America/Managua</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>158</td>
- <td>NL</td>
- <td>Netherlands</td>
- <td>Europe/Amsterdam</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>159</td>
- <td>NO</td>
- <td>Norway</td>
- <td>Europe/Oslo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>160</td>
- <td>NP</td>
- <td>Nepal</td>
- <td>Asia/Katmandu</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>161</td>
- <td>NR</td>
- <td>Nauru</td>
- <td>Pacific/Nauru</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>162</td>
- <td>NU</td>
- <td>Niue</td>
- <td>Pacific/Niue</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>163</td>
- <td>NZ</td>
- <td>New Zealand</td>
- <td>Pacific/Auckland;<br>
- Pacific/Chatham</td>
- <td>2</td>
- <td>2</td>
- </tr>
- <tr>
- <td>164</td>
- <td>OM</td>
- <td>Oman</td>
- <td>Asia/Muscat</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>165</td>
- <td>PA</td>
- <td>Panama</td>
- <td>America/Panama</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>166</td>
- <td>PE</td>
- <td>Peru</td>
- <td>America/Lima</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>167</td>
- <td>PF</td>
- <td>French Polynesia</td>
- <td>Pacific/Tahiti;<br>
- Pacific/Marquesas;<br>
- Pacific/Gambier</td>
- <td>3</td>
- <td>3</td>
- </tr>
- <tr>
- <td>168</td>
- <td>PG</td>
- <td>Papua New Guinea</td>
- <td>Pacific/Port_Moresby</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>169</td>
- <td>PH</td>
- <td>Philippines</td>
- <td>Asia/Manila</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>170</td>
- <td>PK</td>
- <td>Pakistan</td>
- <td>Asia/Karachi</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>171</td>
- <td>PL</td>
- <td>Poland</td>
- <td>Europe/Warsaw</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>172</td>
- <td>PM</td>
- <td>Saint Pierre and Miquelon</td>
- <td>America/Miquelon</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>173</td>
- <td>PN</td>
- <td>Pitcairn</td>
- <td>Pacific/Pitcairn</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>174</td>
- <td>PR</td>
- <td>Puerto Rico</td>
- <td>America/Puerto_Rico</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>175</td>
- <td>PS</td>
- <td>Palestinian Territory</td>
- <td>Asia/Gaza</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>176</td>
- <td>PT</td>
- <td>Portugal</td>
- <td>Atlantic/Azores;<br>
- Atlantic/Madeira, Europe/Lisbon</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>177</td>
- <td>PW</td>
- <td>Palau</td>
- <td>Pacific/Palau</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>178</td>
- <td>PY</td>
- <td>Paraguay</td>
- <td>America/Asuncion</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>179</td>
- <td>QA</td>
- <td>Qatar</td>
- <td>Asia/Qatar</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>180</td>
- <td>RE</td>
- <td>Réunion</td>
- <td>Indian/Reunion</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>181</td>
- <td>RO</td>
- <td>Romania</td>
- <td>Europe/Bucharest</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>182</td>
- <td>RU</td>
- <td>Russia</td>
- <td>Europe/Kaliningrad;<br>
- Europe/Moscow;<br>
- Europe/Samara;<br>
- Asia/Yekaterinburg;<br>
- Asia/Omsk, Asia/Novosibirsk;<br>
- Asia/Krasnoyarsk;<br>
- Asia/Irkutsk;<br>
- Asia/Yakutsk;<br>
- Asia/Vladivostok, Asia/Sakhalin;<br>
- Asia/Magadan;<br>
- Asia/Kamchatka, Asia/Anadyr</td>
- <td>11</td>
- <td>14</td>
- </tr>
- <tr>
- <td>183</td>
- <td>RW</td>
- <td>Rwanda</td>
- <td>Africa/Kigali</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>184</td>
- <td>SA</td>
- <td>Saudi Arabia</td>
- <td>Asia/Riyadh</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>185</td>
- <td>SB</td>
- <td>Solomon Islands</td>
- <td>Pacific/Guadalcanal</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>186</td>
- <td>SC</td>
- <td>Seychelles</td>
- <td>Indian/Mahe</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>187</td>
- <td>SD</td>
- <td>Sudan</td>
- <td>Africa/Khartoum</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>188</td>
- <td>SE</td>
- <td>Sweden</td>
- <td>Europe/Stockholm</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>189</td>
- <td>SG</td>
- <td>Singapore</td>
- <td>Asia/Singapore</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>190</td>
- <td>SH</td>
- <td>Saint Helena</td>
- <td>Atlantic/St_Helena</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>191</td>
- <td>SI</td>
- <td>Slovenia</td>
- <td>Europe/Ljubljana</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>192</td>
- <td>SJ</td>
- <td>Svalbard and Jan Mayen</td>
- <td>Atlantic/Jan_Mayen</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>193</td>
- <td>SK</td>
- <td>Slovakia</td>
- <td>Europe/Bratislava</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>194</td>
- <td>SL</td>
- <td>Sierra Leone</td>
- <td>Africa/Freetown</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>195</td>
- <td>SM</td>
- <td>San Marino</td>
- <td>Europe/San_Marino</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>196</td>
- <td>SN</td>
- <td>Senegal</td>
- <td>Africa/Dakar</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>197</td>
- <td>SO</td>
- <td>Somalia</td>
- <td>Africa/Mogadishu</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>198</td>
- <td>SR</td>
- <td>Suriname</td>
- <td>America/Paramaribo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>199</td>
- <td>ST</td>
- <td>Sao Tome and Principe</td>
- <td>Africa/Sao_Tome</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>200</td>
- <td>SV</td>
- <td>El Salvador</td>
- <td>America/El_Salvador</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>201</td>
- <td>SY</td>
- <td>Syria</td>
- <td>Asia/Damascus</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>202</td>
- <td>SZ</td>
- <td>Swaziland</td>
- <td>Africa/Mbabane</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>203</td>
- <td>TC</td>
- <td>Turks and Caicos Islands</td>
- <td>America/Grand_Turk</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>204</td>
- <td>TD</td>
- <td>Chad</td>
- <td>Africa/Ndjamena</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>205</td>
- <td>TF</td>
- <td>French Southern Territories</td>
- <td>Indian/Kerguelen</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>206</td>
- <td>TG</td>
- <td>Togo</td>
- <td>Africa/Lome</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>207</td>
- <td>TH</td>
- <td>Thailand</td>
- <td>Asia/Bangkok</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>208</td>
- <td>TJ</td>
- <td>Tajikistan</td>
- <td>Asia/Dushanbe</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>209</td>
- <td>TK</td>
- <td>Tokelau</td>
- <td>Pacific/Fakaofo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>210</td>
- <td>TL</td>
- <td>Timor-Leste</td>
- <td>Asia/Dili</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>211</td>
- <td>TM</td>
- <td>Turkmenistan</td>
- <td>Asia/Ashgabat</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>212</td>
- <td>TN</td>
- <td>Tunisia</td>
- <td>Africa/Tunis</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>213</td>
- <td>TO</td>
- <td>Tonga</td>
- <td>Pacific/Tongatapu</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>214</td>
- <td>TR</td>
- <td>Turkey</td>
- <td>Europe/Istanbul</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>215</td>
- <td>TT</td>
- <td>Trinidad and Tobago</td>
- <td>America/Port_of_Spain</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>216</td>
- <td>TV</td>
- <td>Tuvalu</td>
- <td>Pacific/Funafuti</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>217</td>
- <td>TW</td>
- <td>Taiwan</td>
- <td>Asia/Taipei</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>218</td>
- <td>TZ</td>
- <td>Tanzania</td>
- <td>Africa/Dar_es_Salaam</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>219</td>
- <td>UA</td>
- <td>Ukraine</td>
- <td>Europe/Uzhgorod, Europe/Kiev, Europe/Zaporozhye, Europe/Simferopol</td>
- <td>1</td>
- <td>4</td>
- </tr>
- <tr>
- <td>220</td>
- <td>UG</td>
- <td>Uganda</td>
- <td>Africa/Kampala</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>221</td>
- <td>UM</td>
- <td>United States Minor Outlying Islands</td>
- <td>Pacific/Midway;<br>
- Pacific/Johnston;<br>
- Pacific/Wake</td>
- <td>3</td>
- <td>3</td>
- </tr>
- <tr>
- <td>222</td>
- <td>US</td>
- <td>United States</td>
- <td>Pacific/Honolulu;<br>
- America/Adak;<br>
- America/Nome, America/Anchorage, America/Juneau, America/Yakutat;<br>
- America/Los_Angeles;<br>
- America/Phoenix;<br>
- America/Boise, America/Denver;<br>
- America/North_Dakota/Center, America/Chicago, America/Menominee;<br>
- America/Indiana/Knox, America/Indianapolis, America/Indiana/Vevay, America/Indiana/Marengo;<br>
- America/Kentucky/Monticello, America/Detroit, America/Louisville, America/New_York</td>
- <td>9</td>
- <td>21</td>
- </tr>
- <tr>
- <td>223</td>
- <td>UY</td>
- <td>Uruguay</td>
- <td>America/Montevideo</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>224</td>
- <td>UZ</td>
- <td>Uzbekistan</td>
- <td>Asia/Samarkand, Asia/Tashkent</td>
- <td>1</td>
- <td>2</td>
- </tr>
- <tr>
- <td>225</td>
- <td>VA</td>
- <td>Vatican</td>
- <td>Europe/Vatican</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>226</td>
- <td>VC</td>
- <td>Saint Vincent and the Grenadines</td>
- <td>America/St_Vincent</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>227</td>
- <td>VE</td>
- <td>Venezuela</td>
- <td>America/Caracas</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>228</td>
- <td>VG</td>
- <td>British Virgin Islands</td>
- <td>America/Tortola</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>229</td>
- <td>VI</td>
- <td>U.S. Virgin Islands</td>
- <td>America/St_Thomas</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>230</td>
- <td>VN</td>
- <td>Vietnam</td>
- <td>Asia/Saigon</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>231</td>
- <td>VU</td>
- <td>Vanuatu</td>
- <td>Pacific/Efate</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>232</td>
- <td>WF</td>
- <td>Wallis and Futuna</td>
- <td>Pacific/Wallis</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>233</td>
- <td>WS</td>
- <td>Samoa</td>
- <td>Pacific/Apia</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>234</td>
- <td>YE</td>
- <td>Yemen</td>
- <td>Asia/Aden</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>235</td>
- <td>YT</td>
- <td>Mayotte</td>
- <td>Indian/Mayotte</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>236</td>
- <td>YU</td>
- <td>Yugoslavia</td>
- <td>Europe/Belgrade</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>237</td>
- <td>ZA</td>
- <td>South Africa</td>
- <td>Africa/Johannesburg</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>238</td>
- <td>ZM</td>
- <td>Zambia</td>
- <td>Africa/Lusaka</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>239</td>
- <td>ZW</td>
- <td>Zimbabwe</td>
- <td>Africa/Harare</td>
- <td>1</td>
- <td>1</td>
- </tr>
- <tr>
- <td>240</td>
- <td></td>
- <td><i>no country</i></td>
- <td>Etc/GMT+12; Etc/GMT+11; Etc/GMT+10; Etc/GMT+9; Etc/GMT+8; Etc/GMT+7; Etc/GMT+6; Etc/GMT+5;
- Etc/GMT+4; Etc/GMT+3; Etc/GMT+2; Etc/GMT+1; Etc/GMT; Etc/GMT-1; Etc/GMT-2; Etc/GMT-3; Etc/GMT-4;
- Etc/GMT-5; Etc/GMT-6; Etc/GMT-7; Etc/GMT-8; Etc/GMT-9; Etc/GMT-10; Etc/GMT-11; Etc/GMT-12;
- Etc/GMT-13; Etc/GMT-14</td>
- <td>27</td>
- <td>27</td>
- </tr>
- <tr>
- <td>241</td>
- <td>BV</td>
- <td>Bouvet Island</td>
- <td><i>no zone</i></td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>242</td>
- <td>HM</td>
- <td>Heard Island and McDonald Islands</td>
- <td><i>no zone</i></td>
- <td>0</td>
- <td>0</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/transliteration_guidelines.html b/specs/ldml/transliteration_guidelines.html
deleted file mode 100644
index 9e064c8..0000000
--- a/specs/ldml/transliteration_guidelines.html
+++ /dev/null
@@ -1,1170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="VI60_defaultClientScript" content="JavaScript" />
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
-<meta name="keywords" content="Unicode, common locale data repository" />
-<meta name="ProgId" content="FrontPage.Editor.Document" />
-<title>Common Locale Data Repository</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css" />
-<style type="text/css">
-<!--
-.major {font-size:95%; font-family: Arial, Geneva, sans-serif; color: #808080; font-weight:bold; }
-.minor {font-size:85%; font-family: Arial, Geneva, sans-serif; color: #808080; font-weight:400; }
-.table2 { margin-top: 1.5em; margin-bottom: 0.5em }
-td,th {border-color:#EEEEEE; vertical-align:top; padding:2px}
-th { background-color: #CCCCCC }
-table {border-collapse: collapse}
-caption { font-weight: bold }
--->
-</style>
-</head>
-
-<body>
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2" style="padding:0; margin:0">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon" style="padding:2px; margin:0"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33" /></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar" style="padding:2px; margin:0">
- <a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td style="padding:2px; margin:0" class="navColTitle" colspan="2">Contents</td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#Introduction">Introduction</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#Variants">Variants</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#Guidelines">Guidelines</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" width="1%">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- <a href="#Ambiguity">Ambiguity</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- <a href="#Pronunciation">Pronunciation</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- <a href="#Cautions">Cautions</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#Available_Transliterations">Available Transliterations</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- <a href="#Korean">Korean</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell"><a href="#Japanese">Japanese</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell"><a href="#Greek">Greek</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell"><a href="#Cyrillic">Cyrillic</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell"><a href="#Indic">Indic</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell">
- </td>
- <td style="padding:2px; margin:0" valign="top" class="navColCell"><a href="#Others">Others</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#Submitting_Transliterations">Submitting Transliterations</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="#More_Information">More Information</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" class="navColTitle" colspan="2">Unicode CLDR</td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="survey_tool.html">CLDR Survey Tool</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="filing_bug_reports.html">CLDR Bug Reports</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="comparison_charts.html">CLDR Charts</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="process.html">CLDR Process</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup Language
- (LDML)</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" class="navColTitle" colspan="2">Related Links</td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development
- and Maintenance Process</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/consortium/utc.html">Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/versions/">Versions of the Unicode Standard</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" class="navColTitle" colspan="2">Other Publications</td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/standard/standard.html">The Unicode Standard</a></td>
- </tr>
- <tr>
- <td style="padding:2px; margin:0" valign="top" class="navColCell" colspan="2">
- <a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div class="body">
- <h1 align="center">Unicode Transliteration Guidelines</h1><br />
- <blockquote>
- <p><i>This document describes guidelines for the creation and use of CLDR
- transliterations. Preliminary
- <a href="http://www.unicode.org/cldr/data/charts/transforms/index.html">charts</a>
- are available for the available transliterations -- be sure to read the known issues
- there. Please file any feedback
- on this document or those charts at
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs">Locale Bugs</a>.</i></p>
- </blockquote>
- <h2><a name="Introduction">Introduction</a></h2>
- <table border="1" width="33%" id="table21" cellspacing="0" cellpadding="2" style="border-collapse: collapse; float: right; margin:1em; border-color:#BB0000">
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- <font size="2"><i><b>Display. </b></i>Some of the characters in this
- document may not be visible in your browser, and with some fonts the diacritics
- will not be correctly placed on the base letters. See
- <a href="http://www.unicode.org/help/display_problems.html">Display Problems</a>.</font></td>
- </tr>
- </table>
- <p>Transliteration is the general process of converting characters from one script
- to another, where the result is roughly phonetic for languages in the target script.
- For example, "Phobos" and "Deimos" are transliterations of Greek mythological "Φόβος"
- and "Δεῖμος" into Latin letters, used to name the moons of Mars.</p>
- <p>Transliteration is <i>not</i> translation. Rather, transliteration is the conversion
- of letters from one script to another without translating the underlying words.
- The following shows a sample of transliteration systems:</p>
- <table id="table20" style="border-collapse: collapse" border="1" cellspacing="0" cellpadding="2">
- <caption>Sample Transliteration Systems</caption>
- <tr>
- <th width="25%" style="vertical-align: top">Source</th>
- <th width="25%" style="vertical-align: top">Translation</th>
- <th style="vertical-align: top" width="25%">Transliteration</th>
- <th width="25%" style="vertical-align: top">System</th>
- </tr>
- <tr>
- <td bgcolor="#cccccc" style="vertical-align: top" rowspan="2">Αλφαβητικός</td>
- <td bgcolor="#cccccc" style="vertical-align: top"><i>Alphabetic</i></td>
- <td bgcolor="#cccccc" style="vertical-align: top">Alphabētikós</td>
- <td bgcolor="#cccccc" style="vertical-align: top">Classic</td>
- </tr>
- <tr>
- <td bgcolor="#cccccc" style="vertical-align: top"> </td>
- <td bgcolor="#cccccc" style="vertical-align: top">Alfavi̱tikós</td>
- <td bgcolor="#cccccc" style="vertical-align: top">UNGEGN</td>
- </tr>
- <tr>
- <td style="vertical-align: top" rowspan="2">しんばし</td>
- <td style="vertical-align: top" rowspan="2"><i>new bridge<br />(district in Tokyo)</i></td>
- <td style="vertical-align: top">shimbashi</td>
- <td style="vertical-align: top">Hepburn</td>
- </tr>
- <tr>
- <td style="vertical-align: top">sinbasi</td>
- <td style="vertical-align: top">Kunrei</td>
- </tr>
- <tr>
- <td style="vertical-align: top" rowspan="3">яйца Фаберже</td>
- <td style="vertical-align: top" rowspan="3"><i>Fabergé eggs</i></td>
- <td style="vertical-align: top">yaytsa Faberzhe</td>
- <td style="vertical-align: top">BGN/PCGN</td>
- </tr>
- <tr>
- <td style="vertical-align: top">jajca Faberže</td>
- <td style="vertical-align: top">Scholarly</td>
- </tr>
- <tr>
- <td style="vertical-align: top">âjca Faberže</td>
- <td style="vertical-align: top">ISO</td>
- </tr>
- </table>
- <p>While an English speaker may
- not recognize that the Japanese word <i>kyanpasu</i> is equivalent
- to the English word <i>campus</i>, the word <i>kyanpasu</i> is still far easier
- to recognize and interpret than if the letters were left in the original script.
- There are several situations where this transliteration is especially useful,
- such as the following. See the sidebar for examples.</p>
- <table id="table22" cellpadding="2" style="margin:1em; border-collapse: collapse" border="1" align="right">
- <caption><b>Sample Transliterations</b></caption>
- <tr>
- <th style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Source</th>
- <th style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Transliteration</th>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">김,
- 국삼</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Gim,
- Gugsam </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">김,
- 명희</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Gim,
- Myeonghyi </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">정,
- 병호</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Jeong, Byeongho
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">...</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">...</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">たけだ, まさゆき</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Takeda, Masayuki
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">ますだ, よしひこ</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Masuda, Yoshihiko
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">やまもと, のぼる
- </td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Yamamoto, Noboru
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">...</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">...</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Ρούτση, Άννα</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Roútsē, Ánna</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Καλούδης, Χρήστος</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Kaloúdēs, Chrḗstos</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Θεοδωράτου, Ελένη</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">Theodōrátou, Elénē</td>
- </tr>
- </table>
- <ul>
- <li>When a user views names that are entered in a world-wide database, it is
- extremely helpful to view and refer to the names in the user's native script.</li>
- <li>When the user performs searching and indexing tasks, transliteration can
- retrieve information in a different script.</li>
- <li>When a service engineer is sent a program dump that is filled with characters
- from foreign scripts, it is much easier to diagnose the problem when the text
- is transliterated and the service engineer can recognize the characters.
- </li>
- </ul>
- <p>The term <i>transliteration</i>
- is sometimes given a narrow meaning, implying that the transformation is <i>reversible</i> (sometimes called
- <i>lossless</i>). In CLDR this is not the case;
- the term <i>transliteration</i>
- is interpreted broadly to mean both reversible and non-reversible transforms of
- text. (Note that even if theoretically a <span class="nfakPe">transliteration</span>
- system is supposed to be reversible, in source standards it is often not
- specified in sufficient detail in the edge cases to actually be reversible.) A
- non-reversible transliteration is often called a <i>transcription</i>, or called
- a <i>lossy </i>or<i> ambiguous</i> transcription.</p>
- <p>Note that reversibility is generally
- only in one direction, so for native to Latin a transliteration may be reversible, but not the
- contrary. For example, Hangul is reversible, in that any Hangul to Latin to
- Hangul should provide the same Hangul as the input. Thus we have the following:</p>
- <blockquote>
- <p>갗
- <font face="Times New Roman">→</font>
- gach <font face="Times New Roman">→</font>
- 갗</p>
- </blockquote>
- <p>However, for completeness, many Latin
- characters have fallbacks. This means that more than one Latin character may map to the same
- Hangul. Thus <i>from</i> Latin we don't have reversibility, because two
- different Latin source strings round-trip back to the same Latin string.</p>
- <blockquote>
- <p>gach
- <font face="Times New Roman">→</font>
- 갗 <font face="Times New Roman">→</font>
- gach<br>gac
- <font face="Times New Roman">→</font>
- 갗 <font face="Times New Roman">→</font>
- gach</p>
- </blockquote>
- <p>Transliteration can also be used to convert unfamiliar letters within the same
- script, such as converting Icelandic THORN (þ) to th. These are not typically reversible.</p>
- <blockquote>
- <p><i>There is an online demo using released CLDR data
- at <a href="http://demo.icu-project.org/icu-bin/translit">ICU Transform Demo</a>.</i></p>
- </blockquote>
- <h2><a name="Variants">Variants</a></h2>
- <p>There are many systems for transliteration between languages: the same text can
- be transliterated in many different ways. For example, for the Greek example above,
- the transliteration is classical, while the <a href="http://www.eki.ee/wgrs/">UNGEGN</a>
- alternate has different correspondences, such as φ → <i>f</i> instead of φ → <i>ph</i>.</p>
- <p>CLDR provides for generic mappings from script to script (such as Cyrillic-Latin),
- and also language-specific variants (Russian-French, or Serbian-German). There can
- also be semi-generic mappings, such as Russian-Latin or Cyrillic-French. These can
- be referred to, respectively, as script transliterations, language-specific transliterations, or
- script-language transliterations. Transliterations from other scripts to Latin are also called
- <i>Romanizations</i>.</p>
- <p>Even within particular languages, there can be variant systems according to different
- authorities, or even varying across time (if the authority for a system changes its recommendation).
- The canonical identifier that CLDR uses for these has the form:</p>
- <blockquote>
- <p><i>source-target/variant</i></p>
- </blockquote>
- <p>The source (and target) can be a language or script, either using the English
- name or a locale code. The variant should specify the authority for the system, and if necessary
- for disambiguation,
- the year. For example, the identifier for the Russian to Latin transliteration according
- to the UNGEGN system would be:</p>
- <ul>
- <li>ru-und_Latn/UNGEGN, or</li>
- <li>Russian-Latin/UNGEGN</li>
- </ul>
- <p>If there were multiple versions of these over time, the variant would be, say,
- UNGEGN2006.</p>
- <p>The assumption is that implementations will allow the use of fallbacks, if the
- exact transliteration specified is unavailable. For example, the following would
- be the fallback chain for the identifier Russian-English/UNGEGN. This is similar
- to the <i>Lookup Fallback Pattern</i> used in
- <a href="http://tools.ietf.org/html/bcp47">BCP 47 Tags for Identifying Languages</a>,
- except that it uses a "stepladder approach" to progressively handle the fallback
- among source, target, and variant, with priorities being the target, source, and
- variant, in that order.</p>
- <ul>
- <li>Russian-English/UNGEGN</li>
- <li>Russian-English</li>
- <li>Cyrillic-English/UNGEGN</li>
- <li>Cyrillic-English</li>
- <li>Russian-Latin/UNGEGN</li>
- <li>Russian-Latin</li>
- <li>Cyrillic-Latin/UNGEGN</li>
- <li>Cyrillic-Latin</li>
- </ul>
- <h2><a name="Guidelines">Guidelines</a></h2>
- <p>There are a number of generally desirable guidelines for script transliterations.
- These guidelines are rarely satisfied simultaneously, so constructing a reasonable
- transliteration is always a process of balancing different requirements. These requirements
- are most important for people who are building transliterations, but are also useful
- as background information for users.</p>
- <p>The following lists the general guidelines
- for Unicode CLDR transliterations: </p>
- <ul>
- <li><i>standard:</i> follow established systems (standards, authorities, or
- <i>de facto</i> practice) where possible, deviating sometimes where necessary for reversibility.
- In CLDR, the systems are generally described in the comments in the XML data files found in
- the in the
- <a target="_blank" href="http://www.unicode.org/cldr/data/common/transforms/">transforms</a>
- folder online. For example, the system for Arabic transliteration in CLDR are
- found in the comments in
- <a target="_blank" href="http://www.unicode.org/cldr/data/common/transforms/Arabic-Latin.xml">Arabic<wbr>-Latin.xml</a>;
- there is a reference to the
- <a target="_blank" href="http://www.eki.ee/wgrs/rom1_ar.pdf">UNGEGN Arabic Tables</a>.
- Similarly for Hebrew, which also follows the
- <a href="http://www.eki.ee/wgrs/rom1_he.pdf">Hebrew UNGEGN Tables</a>.</li>
- <li><i>complete</i>: every well-formed sequence of characters in the source
- script should transliterate to a sequence of characters from the target script,
- and vice versa.</li>
- <li><i>predictable</i>: the letters themselves (without any knowledge of the
- languages written in that script) should be sufficient for the transliteration,
- based on a relatively small number of rules. This allows the transliteration
- to be performed mechanically. </li>
- <li><i>pronounceable</i>: the resulting characters have reasonable
- pronunciations in the target script. Transliteration is not as useful if the process simply
- maps the characters without any regard to their pronunciation. Simply mapping
- by alphabetic order ("αβγδεζηθ..." to "abcdefgh...") could yield strings that
- might be complete and unambiguous, but the pronunciation would be completely
- unexpected.</li>
- <li><i>reversible</i>: it is possible to recover the text in the source script
- from the transliteration in the target script. That is, someone that knows the transliteration
- rules would be able to recover the precise spelling of the original source text.
- For example, it is possible to go from <i>Elláda</i> back to the original Ελλάδα,
- while if the transliteration were <i>Ellada</i> (with no accent), it would
- not be possible.</li>
- </ul>
- <p>Some of these principles may not be achievable simultaneously; in particular,
- adherence to a standard system <i>and</i> reversibility. Often small changes in
- existing systems can be made to accommodate reversibility. However, where a particular
- system specifies a fundamentally non-reversible transliterations, those transliterations
- as represented in CLDR may not be reversible.</p>
- <h3><a name="Ambiguity">Ambiguity</a></h3>
- <p>In transliteration, multiple characters may produce ambiguities
- (non-reversible mappings) unless the rules
- are carefully designed. For example, the Greek character PSI (ψ) maps to <i>ps</i>,
- but <i>ps</i> could also result from the sequence PI, SIGMA (πσ) since PI (π) maps
- to p and SIGMA (σ) maps to s. </p>
- <p>The Japanese transliteration standards provide a good mechanism for handling
- these kinds of ambiguities. Using the Japanese transliteration standards, whenever
- an ambiguous sequence in the target script does not result from a single letter,
- the transform uses an apostrophe to disambiguate it. For example, it uses that procedure
- to distinguish between <i>man'ichi</i> and <i>manichi</i>. Using this procedure,
- the Greek character PI SIGMA (πσ) maps to <i>p's</i>. This method is recommended
- for all script transliteration methods, although sometimes the character may vary:
- for example, "-" is used in Korean. </p>
- <blockquote>
- <p><b>Note:</b> We've had a recent proposal to consistently use the hyphenation dot
- for this code, thus we'd have πσ → p‧s.</p>
- </blockquote>
- <p>A second problem is that some characters in a target script are not normally
- found outside of certain contexts. For example, the small Japanese "ya" character,
- as in "kya" (キャ), is not normally found in isolation. To handle such characters,
- the Unicode transliterations currently use different conventions.</p>
- <ul>
- <li>Tilde: "ャ" in isolation is represented as "~ya"</li>
- <li>Diacritics: Greek "ς" in isolation is represented as s̱</li>
- </ul>
- <blockquote>
- <p><b>Note:</b> The CLDR committee is considering converging on a common representation for
- this. The advantage of a common representation is that it allows for easy filtering.</p>
- </blockquote>
- <p>For the default script transforms, the goal is to have unambiguous mappings,
- with variants for any common use mappings that are ambiguous (non-reversible). In
- some cases, however, case may not be preserved. For example, </p>
- <table id="table16" cellspacing="1" cellpadding="2" border="1" style="border-collapse: collapse">
- <tr>
- <th>Latin</th>
- <th>Greek</th>
- <th>Latin</th>
- </tr>
- <tr>
- <td>ps PS</td>
- <td>ψ Ψ</td>
- <td>ps PS</td>
- </tr>
- <tr>
- <td>psa Psa <b>PsA</b></td>
- <td>ψα Ψα <b>ΨΑ</b></td>
- <td>psa Psa <b>PSA</b></td>
- </tr>
- <tr>
- <td>psA PSA <b>PSa</b></td>
- <td>ψΑ ΨΑ <b>Ψα</b></td>
- <td>psA PSA <b>Psa</b></td>
- </tr>
- </table>
- <p>The following shows Greek text that is mapped to fully reversible Latin: </p>
- <table id="table5" border="1">
- <tr>
- <th>Greek-Latin</th>
- <th> </th>
- </tr>
- <tr>
- <td>τί φῄς; γραφὴν σέ τις, ὡς ἔοικε, γέγραπται: οὐ γὰρ ἐκεῖνό γε καταγνώσομαι,
- ὡς σὺ ἕτερον.</td>
- <td>tí phḗis; graphḕn sé tis, hōs éoike, gégraptai: ou gàr ekeînó ge katagnṓsomai,
- hōs sỳ héteron.</td>
- </tr>
- </table>
- <p>If the user wants a version without certain accents, then CLDR's <i>chaining
- rules </i>can be
- used to remove the accents. For example, the following transliterates to Latin but
- removes the macron accents on the long vowels. </p>
- <table id="table6" border="1">
- <tr>
- <th>Greek-Latin; nfd; [\u0304] remove; nfc</th>
- <th> </th>
- </tr>
- <tr>
- <td>τί φῄς; γραφὴν σέ τις, ὡς ἔοικε, γέγραπται: οὐ γὰρ ἐκεῖνό γε καταγνώσομαι,
- ὡς σὺ ἕτερον.</td>
- <td>tí phéis; graphèn sé tis, hos éoike, gégraptai: ou gàr ekeînó ge katagnósomai,
- hos sỳ héteron.</td>
- </tr>
- </table>
- <p>The above chaining rules, separated by semi-colons, perform the following
- commands in order:</p>
- <table id="table23" border="1">
- <tr>
- <th style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- Rule</th>
- <th style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- Description</th>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px" nowrap>Greek-Latin</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- transliterate Greek to Latin</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px" nowrap>nfd
- </td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- convert to Unicode NFD format (separating accents from base characters)</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px" nowrap>[\u0304] remove</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- remove accents, but <i>filter</i> the command to only apply to a single
- character: <code>
- <a target="c" href="http://unicode.org/cldr/utility/character.jsp?a=0304">
- U+0304</a></code> ( ̄ ) COMBINING MACRON</td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px" nowrap>nfc</td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- convert to Unicode NFC format (rejoining accents to base characters)</td>
- </tr>
- </table>
- <p>The following transliterates to Latin but removes <i>all</i> accents. Note
- that the only change is to expand the filter for the <i>remove</i> command.</p>
- <table id="table7" border="1">
- <tr>
- <th>Greek-Latin; nfd; [:nonspacing marks:] remove; nfc</th>
- <th> </th>
- </tr>
- <tr>
- <td>τί φῄς; γραφὴν σέ τις, ὡς ἔοικε, γέγραπται: οὐ γὰρ ἐκεῖνό γε καταγνώσομαι,
- ὡς σὺ ἕτερον.</td>
- <td>ti pheis; graphen se tis, hos eoike, gegraptai: ou gar ekeino ge katagnosomai,
- hos sy heteron.</td>
- </tr>
- </table>
- <h3><a name="Pronunciation">Pronunciation</a></h3>
- <p>Standard transliteration methods often do not follow the pronunciation rules
- of any particular language in the target script. For example, the Japanese Hepburn
- system uses a "j" that has the English phonetic value (as opposed to French, German,
- or Spanish), but uses vowels that do not have the standard English sounds. A transliteration
- method might also require some special knowledge to have the correct pronunciation.
- For example, in the Japanese kunrei-siki system, "ti" is pronounced as English "chee".</p>
- <p>This is similar to situations where there are different languages within the same
- script. For example, knowing that the word <i>Gewalt</i> comes from German allows
- a knowledgeable reader to pronounce the "w" as a "v".
- When encountering a
- foreign word like <i>jawa</i>, there is little assurance how it is to be
- pronounced even when it is not a <span class="nfakPe">transliteration (it is just from /span>another Latin-script language). The <i>j</i> could be
- pronounced (for an English speaker) as in <i>jump</i>,
- or <i>Junker</i>,
- or <i>jour</i>;
- and so on. Transcriptions are only roughly phonetic, and only so when the
- specific pronunciation rules are understood.</p>
- <p>The pronunciation of the characters
- in the original script may also be influenced by context, which may be
- particularly misleading in transliteration. For, in the Bengali নিঃশব,
- transliterated as niḥśaba, the <i>visarga</i> <i>ḥ</i>
- is not pronounced itself (whereas elsewhere it may be) but lengthens the
- <i>ś</i>
- sound, and the final inherent <i>a</i> is pronounced (whereas it
- commonly is not), and the two inherent a's are pronounced as <i>ɔ</i>
- and <i>ô</i>,
- respectively.</p>
- <p>In some cases, transliteration may be heavily influenced by tradition. For example,
- the modern Greek letter beta (β) sounds like a "v", but a
- transliteration may use a <i>b</i> (as in <i>biology</i>). In that case, the user would need to know
- that a "b" in the transliterated word corresponded to beta (β) and is to be pronounced
- as a <i>v</i> in modern Greek.</p>
- <p>Letters may also be transliterated differently according
- to their context to make the pronunciation more predictable. For example, since
- the Greek sequence GAMMA GAMMA (γγ) is pronounced as <i>ng</i>, the first GAMMA
- can be transcribed as an "n" in that context.
- Similarly, the transliteration can give other guidance to the pronunciation in the
- source language, for example, using "n" or "m" for the same Japanese character
- (ん) depending on context, even though there is no distinction in the source
- script.</p>
- <p>In general, predictability means that when transliterating Latin script to other
- scripts using reversible transliterations, English text will not produce phonetic
- results. This is because the pronunciation of English cannot be predicted easily
- from the letters in a word: e.g. <i>grove</i>, <i>move</i>, and <i>love</i> all end with "ove", but are
- pronounced very differently. </p>
- <h3><a name="Cautions">Cautions</a></h3>
- <p>Reversibility may require modifications of traditional transcription methods.
- For example, there are two standard methods for transliterating Japanese katakana
- and hiragana into Latin letters. The <i>kunrei-siki</i> method is unambiguous. The Hepburn
- method can be more easily pronounced by foreigners but is ambiguous. In the Hepburn
- method, both ZI (ジ) and DI (ヂ) are represented by "ji" and both ZU (ズ) and DU (ヅ)
- are represented by "zu". A slightly amended version of Hepburn, that uses "dji"
- for DI and "dzu" for DU, is unambiguous. </p>
- <p>When a sequence of two letters map to one, case mappings (uppercase and lowercase)
- must be handled carefully to ensure reversibility. For cased scripts, the two letters
- may need to have different cases, depending on the next letter. For example, the
- Greek letter PHI (Φ) maps to PH in Latin, but Φο maps to Pho, and not to PHo.
- </p>
- <p>Some scripts have characters that take on different shapes depending on their
- context. Usually, this is done at the display level (such as with Arabic) and does
- not require special transliteration support. However, in a few cases this is represented
- with different character codes, such as in Greek and Hebrew. For example, a Greek
- SIGMA is written in a final form (ς) at the end of words, and a non-final form (σ)
- in other locations. This also requires the transform to map different characters based
- on the context.</p>
- <p>Another thing to look out for when
- dealing with cased scripts is that some of the characters in the target script may
- not be able to represent case distinctions, such as some of the IPA characters
- in the Latin script.</p>
- <p>It is useful for the reverse mapping to be complete so that arbitrary strings
- in the target script can be reasonably mapped back to the source script. Complete
- reverse mapping makes it much easier to do mechanical quality checks and so on.
- For example, even though the letter "q" might not be necessary in a transliteration
- of Greek, it can be mapped to a KAPPA (κ). Such reverse mappings will not, in general,
- be unambiguous. </p>
- <h2><a name="Available_Transliterations">Available Transliterations</a></h2>
- <p>Currently Unicode CLDR offers Romanizations for certain scripts, plus transliterations
- between the Indic scripts (excluding Urdu). Additional script transliterations will
- be added in the future.</p>
- <wbr>
- <p>Except where otherwise noted, all of these systems are designed to be reversible.
- For bicameral scripts (those with uppercase and lowercase), however, case may not
- be completely preserved.</p>
- <p>The transliterations are also designed to be complete for any sequence of the
- Latin letters <i>a-z</i>. A fallback is used for a letter that is not covered by
- the transliteration, and default letters may be inserted as required. For example,
- in the Hangul transliteration, <i>rink</i> → 린크 → <i>linkeu</i>. That is, "r" is
- mapped to the closest other letter, and a default vowel is inserted at the end (since
- "nk" cannot end a syllable).</p>
- <p><i>Preliminary
- <a href="http://www.unicode.org/cldr/data/charts/transforms/index.html">charts</a>
- are available for the available transliterations. Be sure to read the known issues
- described there.</i></p>
- <h3><a name="Korean">Korean</a></h3>
- <p>There are many Romanizations of Korean. The default transliteration in Unicode
- CLDR follows the <a href="http://www.korean.go.kr/06_new/rule/rule06.jsp">Korean
- Ministry of Culture & Tourism Transliteration</a> regulations (see also
- <a href="http://www.korea.net/korea/kor_loca.asp?code=A020303">English summary</a>).
- There is an optional clause 8 variant for reversibility:</p>
- <blockquote>
- <p>"제 8 항 학술 연구 논문 등 특수 분야에서 한글 복원을 전제로 표기할 경우에는 한글 표기를 대상으로 적는다. 이때 글자 대응은
- 제2장을 따르되 'ㄱ, ㄷ, ㅂ, ㄹ'은 'g, d, b, l'로만 적는다. 음가 없는 'ㅇ'은 붙임표(-)로 표기하되 어두에서는 생략하는
- 것을 원칙으로 한다. 기타 분절의 필요가 있을 때에도 붙임표(-)를 쓴다."</p>
- <p><i>translation: </i>"Clause 8: When it is required to recover the original
- Hangul representation faithfully as in scholarly articles, ' ㄱ, ㄷ, ㅂ, ㄹ' must
- be always romanized as 'g, d, b, l' while the mapping for the rest of the letters
- remains the same as specified in clause 2. The placeholder 'ㅇ' at the beginning
- of a syllable should be represented with '-', but should be omitted at the beginning
- of a word. In addition, '-' should be used in other cases where a syllable boundary
- needs to be explicitly marked (be disambiguated."</p>
- </blockquote>
- <p>There are a number of cases where this Romanization may be ambiguous, because
- sometimes multiple Latin letters map to a single entity (jamo) in Hangul. This happens
- with vowels and consonants, the latter being slightly more complicated because there
- are both initial and final consonants:</p>
- <table border="1" id="table18" style="border-collapse: collapse">
- <tr>
- <th>Type</th>
- <th>Multi-Character Consonants</th>
- </tr>
- <tr>
- <td>Initial-Only</td>
- <td>tt pp jj</td>
- </tr>
- <tr>
- <td>Initial-or-Final</td>
- <td>kk ch ss</td>
- </tr>
- <tr>
- <td>Final-Only</td>
- <td>gs nj nh lg lm lb ls lt lp lh bs ng</td>
- </tr>
- </table>
- <p>CLDR uses the following rules for disambiguation of the possible boundaries
- between letters, in order. The first rule comes from Clause 8.</p>
- <ol>
- <li>Don't break so as to require an implicit vowel or null consonant (if possible)</li>
- <li>Don't break within Initial-Only or Initial-Or-Final sequences (if possible)</li>
- <li>Favor longest match first.</li>
- </ol>
- <p>If there is a single consonant between vowels, then Rule #1 will group it with
- the following vowel if there is one (this is the same as the first part of Clause
- 8). If there is a sequence of four consonants between vowels, then there is only
- one possible break (with well-formed text). So the only ambiguities lie with two
- or three consonants between vowels, where there are possible multi-character consonants
- involved. Even there, in most cases the resolution is simple, because there isn't
- a possible multi-character consonant in the case of two, or two possible multi-character
- consonants in the case of 3. For example, in the following cases, the left side
- is unambiguous:</p>
- <blockquote>
- <p>angda = ang-da → 앙다<br />apda = ap-da → 앞다</p>
- </blockquote>
- <p>There are a relatively small number of possible ambiguities, listed below using
- "a" as a sample vowel.</p>
- <table border="1" id="table17" style="border-collapse: collapse" cellspacing="0" cellpadding="2">
- <tr>
- <th align="left">No. of<br />Cons. </th>
- <th align="left">Latin</th>
- <th align="left">CLDR<br />Disambiguation</th>
- <th align="left">Hangul</th>
- <th colspan="2" align="left">Comments</th>
- </tr>
- <tr>
- <td rowspan="18">2</td>
- <td><code>atta</code></td>
- <td><code>= a-tta</code></td>
- <td>아따</td>
- <td colspan="2" rowspan="3">Rule 1, then 2</td>
- </tr>
- <tr>
- <td><code>appa</code></td>
- <td><code>= a-ppa</code></td>
- <td>아빠</td>
- </tr>
- <tr>
- <td><code>ajja</code></td>
- <td><code>= a-jja</code></td>
- <td>아짜</td>
- </tr>
- <tr>
- <td><code>akka</code></td>
- <td><code>= a-kka</code></td>
- <td>아까</td>
- <td colspan="2" rowspan="3">Rule 1, then 2</td>
- </tr>
- <tr>
- <td><code>assa</code></td>
- <td><code>= a-ssa</code></td>
- <td>아싸</td>
- </tr>
- <tr>
- <td><code>acha</code></td>
- <td><code>= a-cha</code></td>
- <td>아차</td>
- </tr>
- <tr>
- <td><code>agsa </code></td>
- <td><code>= ag-sa</code></td>
- <td>악사</td>
- <td colspan="2" rowspan="12">Rule 1</td>
- </tr>
- <tr>
- <td><code>anja </code></td>
- <td><code>= an-ja</code></td>
- <td>안자</td>
- </tr>
- <tr>
- <td><code>anha </code></td>
- <td><code>= an-ha</code></td>
- <td>안하</td>
- </tr>
- <tr>
- <td><code>alga </code></td>
- <td><code>= al-ga</code></td>
- <td>알가</td>
- </tr>
- <tr>
- <td><code>alma </code></td>
- <td><code>= al-ma</code></td>
- <td>알마</td>
- </tr>
- <tr>
- <td><code>alba </code></td>
- <td><code>= al-ba</code></td>
- <td>알바</td>
- </tr>
- <tr>
- <td><code>alsa </code></td>
- <td><code>= al-sa</code></td>
- <td>알사</td>
- </tr>
- <tr>
- <td><code>alta </code></td>
- <td><code>= al-ta</code></td>
- <td>알타</td>
- </tr>
- <tr>
- <td><code>alpa </code></td>
- <td><code>= al-pa</code></td>
- <td>알파</td>
- </tr>
- <tr>
- <td><code>alha </code></td>
- <td><code>= al-ha</code></td>
- <td>알하</td>
- </tr>
- <tr>
- <td><code>absa </code></td>
- <td><code>= ab-sa</code></td>
- <td>압사</td>
- </tr>
- <tr>
- <td><code>anga </code></td>
- <td><code>= an-ga</code></td>
- <td>안가</td>
- </tr>
- <tr>
- <td rowspan="9">3</td>
- <td><code>agssa </code></td>
- <td><code>= ag-ssa</code></td>
- <td>악싸</td>
- <td colspan="2" rowspan="4">Rule 1, then 2</td>
- </tr>
- <tr>
- <td><code>anjja </code></td>
- <td><code>= an-jja</code></td>
- <td>안짜</td>
- </tr>
- <tr>
- <td><code>alssa </code></td>
- <td><code>= al-ssa</code></td>
- <td>알싸</td>
- </tr>
- <tr>
- <td><code>abssa </code></td>
- <td><code>= ab-ssa</code></td>
- <td>압싸</td>
- </tr>
- <tr>
- <td><code>akkka </code></td>
- <td><code>= akk-ka</code></td>
- <td>앆카</td>
- <td colspan="2" rowspan="2">Rule 1, then 2, then 3</td>
- </tr>
- <tr>
- <td><code>asssa </code></td>
- <td><code>= ass-sa</code></td>
- <td>았사</td>
- </tr>
- <tr>
- <td colspan="3"><i>Known bugs*</i></td>
- <td colspan="2"><i>Should be Rule 1, then 2</i></td>
- </tr>
- <tr>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- <code>altta </code></td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">
- <code>= alt-ta</code></td>
- <td style="vertical-align: top; border-color: #EEEEEE; padding: 2px">앑타</td>
- <td><code>= al-tta</code></td>
- <td>알따</td>
- </tr>
- <tr>
- <td><code>alppa </code></td>
- <td><code>= alp-pa</code></td>
- <td>앒파</td>
- <td><code>= al-ppa</code></td>
- <td>알빠</td>
- </tr>
- </table>
- <p><font size="2">* There is one other known bug in CLDR 1.5.1, where "ch"
- transliterates incorrectly in the degenerate case<font face="Arial"> — </font>when not followed by a vowel.</font></p>
- <p>For vowel sequences, the situation is simpler. Only Rule #3 applies, so aeo =
- ae-o → 애오.</p>
- <h3><a name="Japanese">Japanese</a></h3>
- <p>The default transliteration for Japanese uses the a slight variant of the Hepburn
- system. With Hepburn system, both ZI (ジ) and DI (ヂ) are represented by "ji" and
- both ZU (ズ) and DU (ヅ) are represented by "zu". This is amended slightly for reversibility
- by using "dji" for DI and "dzu" for DU.</p>
- <h3><a name="Greek">Greek</a></h3>
- <p>The default transliteration uses a standard transcription for Greek which is
- aimed at preserving etymology. The ISO 843 variant includes following differences:
- </p>
- <table id="table10" border="1">
- <tr>
- <th>Greek</th>
- <th>Default</th>
- <th>ISO 843</th>
- </tr>
- <tr>
- <td>β</td>
- <td>b</td>
- <td>v</td>
- </tr>
- <tr>
- <td>γ*</td>
- <td>n</td>
- <td>g</td>
- </tr>
- <tr>
- <td>η</td>
- <td>ē</td>
- <td>ī</td>
- </tr>
- <tr>
- <td>̔</td>
- <td>h</td>
- <td>(omitted)</td>
- </tr>
- <tr>
- <td>̀</td>
- <td>̀</td>
- <td>(omitted)</td>
- </tr>
- <tr>
- <td>~</td>
- <td>~</td>
- <td>(omitted)</td>
- </tr>
- </table>
- <p>* before γ, κ, ξ, χ </p>
- <h3><a name="Cyrillic">Cyrillic</a></h3>
- <p>Cyrillic generally follows ISO 9 for the base Cyrillic set. There are tentative
- plans to add extended Cyrillic characters in the future, plus variants for GOST
- and other national standards.</p>
- <h3><a name="Indic">Indic</a></h3>
- <p>Transliteration of Indic scripts follows the ISO 15919<i>
- <strong style="font-weight: 400">Transliteration of Devanagari and related Indic
- scripts into Latin characters</strong></i>. Internally, all Indic scripts are transliterated
- by converting first to an internal form, called Inter-Indic, then from Inter-Indic
- to the target script. Inter-Indic thus provides a pivot between the different
- scripts, and contains a superset of correspondences for all of them.</p>
- <p>ISO 15919 differs from ISCII 91 in application of diacritics
- for certain characters. These differences are shown in the following example (illustrated
- with Devanagari, although the same principles apply to the other Indic scripts):
- </p>
- <table id="table11" border="1">
- <tr>
- <th>Devanagari</th>
- <th>ISCII 91</th>
- <th>ISO 15919</th>
- </tr>
- <tr>
- <td>ऋ</td>
- <td>ṛ</td>
- <td>r̥</td>
- </tr>
- <tr>
- <td>ऌ</td>
- <td>ḻ</td>
- <td>l̥</td>
- </tr>
- <tr>
- <td>ॠ</td>
- <td>ṝ</td>
- <td>r̥̄</td>
- </tr>
- <tr>
- <td>ॡ</td>
- <td>ḻ̄</td>
- <td>l̥̄</td>
- </tr>
- <tr>
- <td>ढ़</td>
- <td>d̂ha</td>
- <td>ṛha</td>
- </tr>
- <tr>
- <td>ड़</td>
- <td>d̂a</td>
- <td>ṛa</td>
- </tr>
- </table>
- <p>Transliteration rules from Indic to Latin are reversible with the exception of
- the ZWJ and ZWNJ used to request explicit rendering effects. For example:</p>
- <table id="table13" border="1">
- <tr>
- <th>Devanagari</th>
- <th>Romanization</th>
- <th>Note</th>
- </tr>
- <tr>
- <td>क्ष</td>
- <td>kṣa</td>
- <td>normal</td>
- </tr>
- <tr>
- <td>क्ष</td>
- <td>kṣa</td>
- <td>explicit halant requested</td>
- </tr>
- <tr>
- <td>क्ष</td>
- <td>kṣa</td>
- <td>half-consonant requested</td>
- </tr>
- </table>
- <p>Transliteration between Indic scripts are roundtrip where there are corresponding
- letters. Otherwise, there may be fallbacks.</p>
- <p>There are two particular instances where transliterations may produce unexpected
- results: (1) where the final vowel is suppressed in speech, and (2) with the transliteration
- of 'c'. </p>
- <p>For example:</p>
- <table id="table14" border="1">
- <tr>
- <th>Devanagari</th>
- <th style="vertical-align: top">Romanization</th>
- <th>Notes</th>
- </tr>
- <tr>
- <td>सेन्गुप्त</td>
- <td style="vertical-align: top">Sēngupta</td>
- <td style="vertical-align: top"> </td>
- </tr>
- <tr>
- <td>सेनगुप्त</td>
- <td style="vertical-align: top">Sēnagupta</td>
- <td style="vertical-align: top">The final 'a' is not pronounced</td>
- </tr>
- <tr>
- <td style="vertical-align: top">मोनिक</td>
- <td style="vertical-align: top">Monika</td>
- <td style="vertical-align: top"> </td>
- </tr>
- <tr>
- <td>मोनिच</td>
- <td style="vertical-align: top">Monica</td>
- <td style="vertical-align: top">The 'c' is pronounced "ch"</td>
- </tr>
- </table>
- <h3><a name="Others">Others</a></h3>
- <p>Unicode CLDR provides other transliterations based on the
- <a href="http://geonames.usgs.gov/">U.S. Board on Geographic Names</a> (BGN) transliterations.
- These are currently unidirectional <font face="Arial">—</font> to Latin only. The goal is to make them bidirectional
- in future versions of CLDR.</p>
- <p>Other transliterations are generally based on the
- <a href="http://www.eki.ee/wgrs/">UNGEGN: Working Group on Romanization Systems</a>
- transliterations. These systems are in
- wider actual implementation than most ISO standardized transliterations, and are
- published freely available on the web (<a target="_blank" href="http://www.eki.ee/wgrs/">http://www.eki.ee/wgrs/</a>)
- and thus easily accessible to all.
- The UNGEGN also has good documentation. For example, the
- <a href="http://www.eki.ee/wgrs/rom1_ar.pdf">UNGEGN Arabic Tables</a>
- not only presents the UN system, but compares it with the BGN/PCGN 1956 system,
- the I.G.N. System 1973, ISO 233:1984, the royal Jordanian Geographic Centre
- System, and the Survey of Egypt System.</p>
- <h2><a name="Submitting_Transliterations">Submitting Transliterations</a></h2>
- <p>If you are interested in providing transliterations for one or
- more scripts, file an initial bug report at <i>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs">Locale Bugs</a></i>. The initial bug should contain the scripts and or languages
- involved, and the system being followed (with a link to a full description of
- the proposed transliteration system), and a brief example. The proposed data can
- also be in that bug, or be added in a Reply to that bug.</p>
- <p>You can also file a bug in <i>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs">Locale Bugs</a></i> if
- you find a problem in an existing transliteration.</p>
- <p>For submission to CLDR, the data
- needs to supplied in the correct XML format, and should follow an accepted
- standard. It is best if the results are
- tested using the <i><a href="http://demo.icu-project.org/icu-bin/translit">ICU
- Transform Demo</a></i> first, since if the data doesn't validate it would
- not be accepted into CLDR. As mentioned above, even if a transliteration is only used
- in certain countries or contexts CLDR can provide for them with different
- variant tags.</p>
- <p>The format for rules is specified in
- <a target="_blank" href="http://www.unicode.org/reports/tr35/#Transform_Rules">Transform_Rules</a>.
- The XML format is just a series of rules and comments. For comparison, you can see what is
- currently in CLDR in the
- <a target="_blank" href="http://www.unicode.org/cldr/data/common/transforms/">transforms</a>
- folder online. For example, see
- <a target="_blank" href="http://www.unicode.org/cldr/data/common/transforms/Hebrew-Latin.xml">Hebrew-Latin.xml</a>.</p>
- <h2><a name="More_Information">More Information</a></h2>
- <p>For more information, see:</p>
- <ul>
- <li>BGN: <a href="http://geonames.usgs.gov/">U.S. Board on Geographic Names</a></li>
- <li>UNGEGN: <a href="http://www.eki.ee/wgrs/">UNITED NATIONS GROUP OF
- EXPERTS ON GEOGRAPHICAL NAMES: Working Group on Romanization
- Systems</a></li>
- <li><a href="http://transliteration.eki.ee/">Transliteration of Non-Roman Alphabets
- and Scripts (Søren Binks)</a> </li>
- <li><a href="http://www.archivists.org/catalog/stds99/chapter8.html">Standards
- for Archival Description: Romanization</a> </li>
- <li><a href="http://transliteration.eki.ee/pdf/Hindi-Marathi-Nepali.pdf">ISO-15915
- (Hindi)</a> </li>
- <li><a href="http://transliteration.eki.ee/pdf/Gujarati.pdf">ISO-15915 (Gujarati)</a>
- </li>
- <li><a href="http://transliteration.eki.ee/pdf/Kannada.pdf">ISO-15915 (Kannada)</a>
- </li>
- <li><a href="http://www.cdacindia.com/html/gist/down/iscii_d.asp">ISCII-91</a>
- </li>
- <li><a href="http://www.unicode.org/reports/tr35/">UTS #35: Locale Data Markup
- Language (LDML)</a></li>
- </ul></div></td>
- </tr>
- </table>
- <hr width="50%" />
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50" /></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
-
-
-
-
- </script>
- </center></div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/specs/ldml/version/1.2.html b/specs/ldml/version/1.2.html
deleted file mode 100644
index ecdbcd5..0000000
--- a/specs/ldml/version/1.2.html
+++ /dev/null
@@ -1,329 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style>
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.2 Release Note</h1>
- <div align="center">
- <center>
- <table border="1" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" id="AutoNumber1">
- <tr>
- <th>Note</th>
- <th>Data</th>
- <th>Spec</th>
- <th>Delta</th>
- <th>CVS Tag</th>
- </tr>
- <tr>
- <td align="center"><a href="Version1.2.html">Version1.2</a></td>
- <td align="center"><a href="http://www.unicode.org/Public/cldr/cldr1.2.zip">CLDR1.2</a></td>
- <td align="center"><a href="http://www.unicode.org/reports/tr35/tr35-4.html">LDML1.2</a></td>
- <td align="center">
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.2">
- Changes1.2</a></td>
- <td><code>release-1-2</code></td>
- </tr>
- </table>
- </center>
- </div>
- <p>CLDR Version 1.2 contains data for 232 locales, <a href="#Languages_and_Territories">
- covering</a> 72 languages and 108 territories. There are also 63 draft locales in the
- process of being developed, covering an additional 27 languages and 28 territories.</p>
- <blockquote>
- <p><i>This is a stable release and may be used as reference material or cited as a
- normative reference by other specifications. Although the data in this release will not
- be changed, bug reports and feature requests for future versions filed at
- <a href="../filing_bug_reports.html">Bug Reports</a>.</i></p>
- </blockquote>
- <p>In this release, the major additions to CLDR are: </p>
- <ul>
- <li><font color="#330000"><b>Data</b>: Many names for languages, territories, and
- scripts have been added, as well as for time zones, calendars, and other named items
- such as collation</font>; the data has been compacted by removal of inherited or aliased
- data; plus other fixes and additions.</li>
- <li><b>Structure</b>: The LDML specification has been enhanced substantially. It now has
- self-contained descriptions of date / number / choice format patterns, inheritance and
- validity, time zone fallbacks, and provides lists of all valid attribute values. The XML
- format adds structure to assist in vetting, to allow for multiple sets of exemplar
- characters (indicating characters in use in particular locales), to represent relative
- dates and times, to provide better support for time zone names, and to strengthen the
- alias mechanism.</li>
- <li><b>Implementation</b>: The new collation tests allow implementations to verify
- correct use of locale data. For comparison of data, by-type charts and vetting charts
- were added. The CLDR source now does not require ICU for generation.</li>
- </ul>
- <p>For information on the organization of CLDR data and the meaning of the links in the
- table above, see <a href="../repository_access.html">CLDR Releases</a>.</p>
- <h3><a name="Languages_and_Territories">Languages and Territories</a></h3>
- <p><b>Languages:</b> <span title="af">Afrikaans</span>, <span title="sq">Albanian (sq,
- Shqipe)</span>, <span title="am, ʿēmarīnya">Amharic (am, አማርኛ)</span>,
- <span title="ar, Ạlʿrbyẗ">Arabic (ar, العربية)</span>,
- <span title="hy, Hayerēn; hy_AM_REVISED, Hayerēn">Armenian (hy, Հայերէն; hy_AM_REVISED,
- Հայերէն)</span>, <span title="eu">Basque (eu, Euskara)</span>, <span title="be, Belaruskí">
- Belarusian (be, Беларускі)</span>, <span title="bn, Bānlā">Bengali (bn, বাংলা)</span>,
- <span title="bg, Bʺlgarski">Bulgarian (bg, Български)</span>, <span title="ca">Catalan
- (ca, Català)</span>, <span title="zh, Zhōng Wén; zh_Hant, Zhōng Wén">Chinese (zh, 中文;
- zh_Hant, 中文)</span>, <span title="kw">Cornish (kw, Kernewek)</span>, <span title="hr">
- Croatian (hr, Hrvatski)</span>, <span title="cs">Czech (cs, Čeština)</span>,
- <span title="da">Danish (da, Dansk)</span>, <span title="nl">Dutch (nl, Nederlands)</span>,
- <span title="en; en_US_POSIX">English (en; en_US_POSIX)</span>, <span title="eo">Esperanto</span>,
- <span title="et">Estonian (et, Eesti)</span>, <span title="fo">Faroese (fo, Føroyskt)</span>,
- <span title="fi">Finnish (fi, Suomi)</span>, <span title="fr">French (fr, Français)</span>,
- <span title="gl">Gallegan (gl, Galego)</span>, <span title="de">German (de, Deutsch)</span>,
- <span title="el, Ellēniká">Greek (el, Ελληνικά)</span>, <span title="gu, Gujarātī">
- Gujarati (gu, ગુજરાતી)</span>, <span title="he, ʻbryţ">Hebrew (he, עברית)</span>,
- <span title="hi, Hindī">Hindi (hi, हिंदी)</span>, <span title="hu">Hungarian (hu, Magyar)</span>,
- <span title="is">Icelandic (is, Íslenska)</span>, <span title="id">Indonesian (id, Bahasa
- Indonesia)</span>, <span title="ga">Irish (ga, Gaeilge)</span>, <span title="it">Italian
- (it, Italiano)</span>, <span title="ja">Japanese (ja, 日本語)</span>, <span title="kl">
- Kalaallisut</span>, <span title="kn, Kannaḍa">Kannada (kn, ಕನ್ನಡ)</span>,
- <span title="kk, Kˌazakˌ">Kazakh (kk, Қазақ)</span>, <span title="kok, Kōṅkaṇī">Konkani (kok,
- कोंकणी)</span>, <span title="ko, Hangug" eo>Korean (ko, 한국어)</span>, <span title="lv">
- Latvian (lv, Latviešu)</span>, <span title="lt">Lithuanian (lt, Lietuvių)</span>,
- <span title="mk, Makedonski">Macedonian (mk, Македонски)</span>, <span title="ms">Malay
- (ms, Bahasa Melayu)</span>, <span title="mt">Maltese (mt, Malti)</span>, <span title="gv">
- Manx (gv, Gaelg)</span>, <span title="mr, Marāṭhī">Marathi (mr, मराठी)</span>,
- <span title="nb">Norwegian Bokmål (nb, Norsk Bokmål)</span>, <span title="nn">Norwegian
- Nynorsk (nn, Norsk Nynorsk)</span>, <span title="om">Oromo (om, Oromoo)</span>,
- <span title="ps, Psˌtw">Pashto (Pushto) (ps, پښتو)</span>, <span title="fa, Fạrsy̰">
- Persian (fa, فارسی)</span>, <span title="pl">Polish (pl, Polski)</span>,
- <span title="pt">Portuguese (pt, Português)</span>, <span title="pa, Pajābī">Punjabi (pa,
- ਪੰਜਾਬੀ)</span>, <span title="ro">Romanian (ro, Română)</span>, <span title="ru, Russkij">
- Russian (ru, Русский)</span>, <span title="sr, Srpski; sr_Latn">Serbian (sr, Српски;
- sr_Latn, Srpski)</span>, <span title="sk">Slovak (sk, Slovenský)</span>, <span title="sl">
- Slovenian (sl, Slovenščina)</span>, <span title="so">Somali (so, Soomaali)</span>,
- <span title="es">Spanish (es, Español)</span>, <span title="sw">Swahili (sw, Kiswahili)</span>,
- <span title="sv">Swedish (sv, Svenska)</span>, <span title="ta, Tamiḻ">Tamil (ta, தமிழ்)</span>,
- <span title="te, Telugu">Telugu (te, తెలుగు)</span>, <span title="th, Thịy">Thai (th, ไทย)</span>,
- <span title="ti, Tīgīrīnya">Tigrinya (ti, ትግርኛ)</span>, <span title="tr">Turkish (tr,
- Türkçe)</span>, <span title="uk, Ukraí̈nsʹka">Ukrainian (uk, Українська)</span>,
- <span title="vi">Vietnamese (vi, Tiếng Việt)</span>, <span title="cy">Welsh (cy, Cymraeg)</span>
- </p>
- <p><b>Countries:</b> <span title="AF, Ạfgẖạnstạn; AF, Ạfgẖạnstạn">Afghanistan (fa, افغانستان;
- ps, افغانستان)</span>, <span title="AL">Albania (sq, Shqipëria)</span>,
- <span title="DZ, Ạljzạỷr">Algeria (ar, الجزائر)</span>, <span title="AR">Argentina</span>,
- <span title="AM, Hayastani Hanrapetutʻiwn">Armenia (hy, Հայաստանի Հանրապետութիւն)</span>,
- <span title="AU">Australia</span>, <span title="AT">Austria (de, Österreich)</span>,
- <span title="BH, Ạlbḥryn">Bahrain (ar, البحرين)</span>, <span title="BY, Belarusʹ">
- Belarus (be, Беларусь)</span>, <span title="BE; BE; BE; BE">Belgium (de, Belgien; en; fr,
- Belgique; nl, België)</span>, <span title="BO">Bolivia</span>, <span title="BW">Botswana</span>,
- <span title="BR">Brazil (pt, Brasil)</span>, <span title="BN">Brunei</span>,
- <span title="BG, Bʺlgariâ">Bulgaria (bg, България)</span>, <span title="CA; CA">Canada
- (en; fr)</span>, <span title="CL">Chile</span>, <span title="CN, Zhōng Guó">China (zh, 中国)</span>,
- <span title="CO">Colombia</span>, <span title="CR">Costa Rica</span>, <span title="HR">
- Croatia (hr, Hrvatska)</span>, <span title="CZ">Czech Republic (cs, Česká Republika)</span>,
- <span title="DK">Denmark (da, Danmark)</span>, <span title="DJ">Djibouti (so, Jabuuti)</span>,
- <span title="DO">Dominican Republic (es, República Dominicana)</span>, <span title="EC">
- Ecuador</span>, <span title="EG, Mṣr">Egypt (ar, مصر)</span>, <span title="SV">El
- Salvador</span>, <span title="ER, ʿerītīra">Eritrea (ti, ኤርትራ)</span>, <span title="EE">
- Estonia (et, Eesti)</span>, <span title="ET, ʿitīyophīya; ET; ET; ET, ʿitīyophīya">
- Ethiopia (am, ኢትዮጵያ; om, Itoophiyaa; so, Itoobiya; ti, ኢትዮጵያ)</span>, <span title="FO">
- Faroe Islands (fo, Føroyar)</span>, <span title="FI; FI">Finland (fi, Suomi; sv)</span>,
- <span title="FR">France</span>, <span title="DE">Germany (de, Deutschland)</span>,
- <span title="GR, Elláda">Greece (el, Ελλάδα)</span>, <span title="GL">Greenland (kl,
- Kalaallit Nunaat)</span>, <span title="GT">Guatemala</span>, <span title="HN">Honduras</span>,
- <span title="HK; HK, Zhōng Huá Rén Mín Gòng Hé Guó Xiāng Gǎng Tè Bié Xíng Zhèng Qū">Hong
- Kong S.A.R. China (en; zh_Hant, 中華人民共和國香港特別行政區)</span>, <span title="HU">Hungary (hu,
- Magyarország)</span>, <span title="IS">Iceland (is, Ísland)</span>,
- <span title="IN, Ạlhnd; IN, Bhārata; IN; IN, Bhārata; IN, Bhārata; IN, Bhārata; IN, Bhārata; IN, Bhārata; IN, Bhārata; IN, Intiyā; IN, Bhārata Dēḷa0">
- India (ar, الهند; bn, ভারত; en; gu, ભારત; hi, भारत; kn, ಭಾರತ; kok, भारत; mr, भारत; pa,
- ਭਾਰਤ; ta, இந்தியா; te, భారత దేళ౦)</span>, <span title="ID">Indonesia</span>,
- <span title="IR, Ạy̰rạn">Iran (fa, ایران)</span>, <span title="IQ, Ạlʿrạq">Iraq (ar,
- العراق)</span>, <span title="IE; IE">Ireland (en; ga, Éire)</span>,
- <span title="IL, Yşrʼl">Israel (he, ישראל)</span>, <span title="IT">Italy (it, Italia)</span>,
- <span title="JP">Japan (ja, 日本)</span>, <span title="JO, Ạlạrdn">Jordan (ar, الاردن)</span>,
- <span title="KZ, Kˌazakˌstan">Kazakhstan (kk, Қазақстан)</span>, <span title="KE; KE; KE">
- Kenya (om, Keeniyaa; so, Kiiniya; sw)</span>, <span title="KW, Ạlkwyt">Kuwait (ar, الكويت)</span>,
- <span title="LV">Latvia (lv, Latvija)</span>, <span title="LB, Lbnạn">Lebanon (ar, لبنان)</span>,
- <span title="LY, Lybyạ">Libya (ar, ليبيا)</span>, <span title="LT">Lithuania (lt,
- Lietuva)</span>, <span title="LU; LU">Luxembourg (de, Luxemburg; fr)</span>,
- <span title="MO, Ào Mén Tè Bié Xíng Zhèng Qū">Macao S.A.R. China (zh_Hant, 澳門特別行政區)</span>,
- <span title="MK, Makedoniǰa">Macedonia (mk, Македонија)</span>, <span title="MY">Malaysia</span>,
- <span title="MT; MT">Malta (en; mt)</span>, <span title="MX">Mexico (es, México)</span>,
- <span title="MA, Ạlmgẖrb">Morocco (ar, المغرب)</span>, <span title="NL">Netherlands (nl,
- Nederland)</span>, <span title="NZ">New Zealand</span>, <span title="NI">Nicaragua</span>,
- <span title="NO; NO">Norway (nb, Norge; nn, Noreg)</span>, <span title="OM, ʿmạn">Oman (ar,
- عمان)</span>, <span title="PA">Panama (es, Panamá)</span>, <span title="PY">Paraguay</span>,
- <span title="PE">Peru (es, Perú)</span>, <span title="PH">Philippines</span>,
- <span title="PL">Poland (pl, Polska)</span>, <span title="PT">Portugal</span>,
- <span title="PR">Puerto Rico</span>, <span title="QA, Qṭr">Qatar (ar, قطر)</span>,
- <span title="RO">Romania (ro, România)</span>, <span title="RU, Rossiâ">Russia (ru, Россия)</span>,
- <span title="SA, Ạlʿrbyẗ Ạlsʿwdyẗ">Saudi Arabia (ar, العربية السعودية)</span>,
- <span title="YU; YU, Srbiǰa I Crna Gora">Serbia and Montenegro (sr_Latn, Srbija I Crna
- Gora; sr, Србија И Црна Гора)</span>, <span title="SG; SG, Xīn Jiā Pō">Singapore (en; zh,
- 新加坡)</span>, <span title="SK">Slovakia (sk, Slovenská Republika)</span>, <span title="SI">
- Slovenia (sl, Slovenija)</span>, <span title="SO">Somalia (so, Soomaaliya)</span>,
- <span title="ZA; ZA">South Africa (af, Suid-Afrika; en)</span>,
- <span title="KR, Daehanmingug">South Korea (ko, 대한민국)</span>, <span title="ES; ES; ES; ES">
- Spain (ca, Espanya; es, España; eu, Espainia; gl, España)</span>,
- <span title="SD, Ạlswdạn">Sudan (ar, السودان)</span>, <span title="SE">Sweden (sv,
- Sverige)</span>, <span title="CH; CH; CH">Switzerland (de, Schweiz; fr, Suisse; it,
- Svizzera)</span>, <span title="SY, Swryẗ">Syria (ar, سورية)</span>,
- <span title="TW, Tái Wān">Taiwan (zh_Hant, 臺灣)</span>, <span title="TZ">Tanzania</span>,
- <span title="TH, Pratheṣ̄thịy">Thailand (th, ประเทศไทย)</span>, <span title="TN, Twns">
- Tunisia (ar, تونس)</span>, <span title="TR">Turkey (tr, Türkiye)</span>,
- <span title="VI">U.S. Virgin Islands</span>, <span title="UA, Ukraina; UA, Ukraí̈na">
- Ukraine (ru, Украина; uk, Україна)</span>, <span title="AE, Ạlạmạrạt Ạlʿrbyẗ Ạlmtḥdẗ">
- United Arab Emirates (ar, الامارات العربية المتحدة)</span>, <span title="GB; GB; GB; GB">
- United Kingdom (cy, Prydain Fawr; en; gv, Rywvaneth Unys; kw, Rywvaneth Unys)</span>,
- <span title="US; US">United States (en; es, Estados Unidos)</span>, <span title="UY">
- Uruguay</span>, <span title="VE">Venezuela</span>, <span title="VN">Vietnam (vi, Việt Nam)</span>,
- <span title="YE, Ạlymn">Yemen (ar, اليمن)</span>, <span title="ZW">Zimbabwe</span> (zw)</p>
- <p><b>Draft languages:</b> <span title="aa; aa_ER_SAAHO">Afar (aa; aa_ER_SAAHO)</span>,
- <span title="as">Assamese</span>, <span title="az">Azerbaijani</span>, <span title="byn">
- Blin</span>, <span title="dv">Divehi</span>, <span title="dz">Dzongkha</span>,
- <span title="gez">Geez</span>, <span title="ka">Georgian</span>, <span title="haw">
- Hawaiian</span>, <span title="iu">Inuktitut</span>, <span title="km">Khmer</span>,
- <span title="ky">Kirghiz</span>, <span title="lo">Lao</span>, <span title="ml, Malayāḷaṁ">
- Malayalam (ml, മലയാളം)</span>, <span title="mn">Mongolian</span>, <span title="or, Ōṛi" ā>
- Oriya (or, ଓଡ଼ିଆ)</span>, <span title="sa">Sanskrit</span>, <span title="sid">Sidamo</span>,
- <span title="syr">Syriac</span>, <span title="tt">Tatar</span>, <span title="tig">Tigre</span>,
- <span title="ur">Urdu</span>, <span title="uz">Uzbek</span>, <span title="wal">Walamo</span>
- </p>
- <p><font style="font-size: 90%"><b>Notes: </b></font></p>
- <ul>
- <li><font style="font-size: 90%">Territories with multiple locales may appear more than
- once.</font></li>
- <li><font style="font-size: 90%">Tooltips will show the language/territory code, English
- name, and Latin transliteration. (To set your tooltip font, right click on the desktop,
- pick Properties>Appearance>Advanced>Item: ToolTip, then set the font to Arial Unicode MS
- or other large font.)</font></li>
- <li><font style="font-size: 90%">If the above doesn't display in your browser, see
- <a href="http://www.unicode.org/help/display_problems.html">Display Problems?</a></font></li>
- </ul>
- <blockquote>
- </blockquote>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.3.html b/specs/ldml/version/1.3.html
deleted file mode 100644
index 6c64350..0000000
--- a/specs/ldml/version/1.3.html
+++ /dev/null
@@ -1,336 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style>
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.3 Release Note</h1>
- <p style="margin-bottom: 1em">The following are the files for this release. For a
- description of their purpose and format, see <a href="../repository_access.html">CLDR
- Releases (Downloads)</a>. <i>In terms of license, the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a> apply; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>. </i></p>
- <div align="center">
- <center>
- <table border="1" cellpadding="2" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" id="AutoNumber2">
- <tr>
- <th>No.</th>
- <th>Rel. Note</th>
- <th>Data</th>
- <th>Spec</th>
- <th>Delta</th>
- <th>CVS Tag</th>
- </tr>
- <tr>
- <td><b>1.3</b></td>
- <td align="center"><b><a href="1.3.html">Version1.3</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.3.0/">CLDR1.3</a></b></td>
- <td><b><a href="http://www.unicode.org/reports/tr35/tr35-5.html">LDML1.3</a> </b>
- </td>
- <td align="center"><b>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.3">
- Changes1.3</a></b></td>
- <td><b><code>release-1-3</code></b></td>
- </tr>
- </table>
- </center>
- </div>
- <p>CLDR Version 1.3 contains contains data for 296 locales: 96 languages and 130
- territories. In this release, the major additions to CLDR are: </p>
- <ul>
- <li>A complete set of POSIX-format data generated from the XML format, plus a tool to
- generate versions for different platforms.</li>
- <li>The addition of new data to support localization of timezones</li>
- <li>The addition of data for UN M.49 regions, including continents and region.</li>
- <li>The canonicalization of the data files, including the consolidation of inherited
- data</li>
- <li>The restriction of currency codes to ISO 4217 codes (past and present)</li>
- <li>The addition of number and data tests, for verifying that implementations correctly
- implement the LDML specification using CLDR data.</li>
- <li>The addition of metadata for LDML</li>
- <li>The addition of mappings from language to script and territory</li>
- <li>Various other fixes and additions of data, and extensions to the specification.</li>
- </ul>
- <h3>List of <a name="Languages_and_Territories">Languages and Territories in this Release</a></h3>
- <p><b>Languages (96):</b> <span title="aa">Afar [Qafar]</span>; <span title="af">Afrikaans</span>;
- <span title="sq">Albanian [shqipe]</span>; <span title="am: [ʿēmarīnya]">Amharic [አማርኛ]</span>;
- <span title="ar: [ạlʿrbyẗ]">Arabic [العربية]</span>; <span title="hy: [Hayerēn]">
- Armenian [Հայերէն]</span>; <span title="as: [asamīẏā]">Assamese [অসমীয়া]</span>;
- <span title="az_Cyrl">Azerbaijani - Cyrillic [Азәрбајҹан - Cyrl]</span>;
- <span title="az_Latn">Azerbaijani - Latin [azərbaycanca - Latn]</span>; <span title="eu">
- Basque [euskara]</span>; <span title="be: [Belaruskí]">Belarusian [Беларускі]</span>;
- <span title="bn: [bānlā]">Bengali [বাংলা]</span>; <span title="byn: [bīlinī]">Blin [ብሊን]</span>;
- <span title="bs">Bosnian [Bosanski]</span>; <span title="bg: [Bʺlgarski]">Bulgarian [Български]</span>;
- <span title="ca">Catalan [català]</span>;
- <span title="zh_Hans: [zhōng wén - jiǎn tǐ hàn yǔ]">Chinese - Simplified Han [中文 - 简体汉语]</span>;
- <span title="zh_Hant: [zhōng wén - fán tǐ hàn yǔ]">Chinese - Traditional Han [中文 - 繁體漢語]</span>;
- <span title="kw">Cornish [kernewek]</span>; <span title="hr">Croatian [hrvatski]</span>;
- <span title="cs">Czech [Čeština]</span>; <span title="da">Danish [Dansk]</span>;
- <span title="dv">Divehi [ދިވެހިބަސް]</span>; <span title="nl">Dutch [Nederlands]</span>;
- <span title="dz">Dzongkha [རྫོང་ཁ]</span>; <span title="en">English</span>;
- <span title="eo">Esperanto</span>; <span title="et">Estonian [Eesti]</span>;
- <span title="fo">Faroese [føroyskt]</span>; <span title="fi">Finnish [suomi]</span>;
- <span title="fr">French [français]</span>; <span title="gl">Gallegan [galego]</span>;
- <span title="gez: [gīʾīzīnya]">Geez [ግዕዝኛ]</span>; <span title="ka: [kartuli]">Georgian [ქართული]</span>;
- <span title="de">German [Deutsch]</span>; <span title="el: [Ellēniká]">Greek [Ελληνικά]</span>;
- <span title="gu: [gujarātī]">Gujarati [ગુજરાતી]</span>; <span title="haw">Hawaiian [ʻōlelo
- Hawaiʻi]</span>; <span title="he: [ʻbryţ]">Hebrew [עברית]</span>;
- <span title="hi: [hindī]">Hindi [हिंदी]</span>; <span title="hu">Hungarian [magyar]</span>;
- <span title="is">Icelandic [Íslenska]</span>; <span title="id">Indonesian [Bahasa
- Indonesia]</span>; <span title="iu">Inuktitut [ᐃᓄᒃᑎᑐᑦ ᑎᑎᕋᐅᓯᖅ]</span>; <span title="ga">
- Irish [Gaeilge]</span>; <span title="it">Italian [italiano]</span>; <span title="ja">
- Japanese [日本語]</span>; <span title="kl">Kalaallisut</span>; <span title="kn: [kannaḍa]">
- Kannada [ಕನ್ನಡ]</span>; <span title="kk: [Kˌazakˌ]">Kazakh [Қазақ]</span>;
- <span title="km">Khmer [ភាសាខ្មែរ]</span>; <span title="ky: [Kyrgyz]">Kirghiz [Кыргыз]</span>;
- <span title="kok: [kōṅkaṇī]">Konkani [कोंकणी]</span>; <span title="ko: [hangug" eo]>Korean
- [한국어]</span>; <span title="lo">Lao [ລາວ]</span>; <span title="lv">Latvian [latviešu]</span>;
- <span title="lt">Lithuanian [Lietuvių]</span>; <span title="mk: [makedonski]">Macedonian [македонски]</span>;
- <span title="ms">Malay [Bahasa Melayu]</span>; <span title="ml: [malayāḷaṁ]">Malayalam [മലയാളം]</span>;
- <span title="mt">Maltese [Malti]</span>; <span title="gv">Manx [Gaelg]</span>;
- <span title="mr: [marāṭhī]">Marathi [मराठी]</span>; <span title="mn: [Mongol hél]">
- Mongolian [Монгол хэл]</span>; <span title="nb">Norwegian Bokmål [norsk bokmål]</span>;
- <span title="nn">Norwegian Nynorsk [norsk nynorsk]</span>; <span title="or: [ōṛi" ā]>Oriya
- [ଓଡ଼ିଆ]</span>; <span title="om">Oromo [Oromoo]</span>; <span title="ps: [psˌtw]">Pashto
- (Pushto) [پښتو]</span>; <span title="fa: [fạrsy̰]">Persian [فارسی]</span>;
- <span title="pl">Polish [polski]</span>; <span title="pt">Portuguese [português]</span>;
- <span title="pa: [pajābī]">Punjabi [ਪੰਜਾਬੀ]</span>; <span title="ro">Romanian [Română]</span>;
- <span title="ru: [russkij]">Russian [русский]</span>; <span title="sa: [sanskr̥ta]">
- Sanskrit [संस्कृत]</span>; <span title="sr_Cyrl: [Srpski - Ćirilica]">Serbian - Cyrillic [Српски
- - Ћирилица]</span>; <span title="sr_Latn">Serbian - Latin [Srpski - Latinica]</span>;
- <span title="sid">Sidamo [Sidaamu Afo]</span>; <span title="sk">Slovak [slovenský]</span>;
- <span title="sl">Slovenian [Slovenščina]</span>; <span title="so">Somali [Soomaali]</span>;
- <span title="es">Spanish [español]</span>; <span title="sw">Swahili [Kiswahili]</span>;
- <span title="sv">Swedish [svenska]</span>; <span title="syr: [swryyʾ]">Syriac [ܣܘܪܝܝܐ]</span>;
- <span title="ta: [tamiḻ]">Tamil [தமிழ்]</span>; <span title="tt: [Tatar]">Tatar [Татар]</span>;
- <span title="te: [telugu]">Telugu [తెలుగు]</span>; <span title="th: [thịy]">Thai [ไทย]</span>;
- <span title="tig: [tīgīrē]">Tigre [ትግረ]</span>; <span title="ti: [tīgīrīnya]">Tigrinya
- [ትግርኛ]</span>; <span title="tr">Turkish [Türkçe]</span>; <span title="uk: [Ukraí̈nsʹka]">
- Ukrainian [Українська]</span>; <span title="ur: [ạrdw]">Urdu [اردو]</span>;
- <span title="uz_Arab">Uzbek - Arabic [اۉزبېک - Араб]</span>;
- <span title="uz_Cyrl: [Ŭzbek - Kiril]">Uzbek - Cyrillic [Ўзбек - Кирил]</span>;
- <span title="uz_Latn">Uzbek - Latin [oʿzbek - Lotin]</span>; <span title="vi">Vietnamese [Tiếng
- Việt]</span>; <span title="wal: [wēlayītatu]">Walamo [ወላይታቱ]</span>; <span title="cy">
- Welsh [Cymraeg]</span> </p>
- <p><b>Territories (130):</b> <span title="AF: [ạfgẖạnstạn]">Afghanistan [افغانستان]</span>;
- <span title="AL">Albania [Shqipëria]</span>; <span title="DZ: [ạljzạỷr]">Algeria [الجزائر]</span>;
- <span title="AS">American Samoa</span>; <span title="AR">Argentina</span>;
- <span title=": [Hayastani Hanrapetutʻiwn]">Armenia [Հայաստանի Հանրապետութիւն]</span>;
- <span title="AU">Australia</span>; <span title="AT">Austria [Österreich]</span>;
- <span title="AZ">Azerbaijan [Azərbaycan, Азәрбајҹан]</span>; <span title="BH: [ạlbḥryn]">
- Bahrain [البحرين]</span>; <span title="BY: [Belarusʹ]">Belarus [Беларусь]</span>;
- <span title="BE">Belgium [België, Belgien, Belgique]</span>; <span title="BZ">Belize</span>;
- <span title="BT">Bhutan [འབྲུག]</span>; <span title="BO">Bolivia</span>;
- <span title="BA: [Bosna i Hercegovina]">Bosnia and Herzegovina [Bosna i Hercegovina, Босна
- и Херцеговина]</span>; <span title="BW">Botswana</span>; <span title="BR">Brazil [Brasil]</span>;
- <span title="BN">Brunei</span>; <span title="BG: [Bʺlgariâ]">Bulgaria [България]</span>;
- <span title="KH">Cambodia [កម្ពុជា]</span>; <span title="CA">Canada</span>;
- <span title="CL">Chile</span>; <span title="CN: [zhōng guó]">China [中国]</span>;
- <span title="CO">Colombia</span>; <span title="CR">Costa Rica</span>; <span title="HR">
- Croatia [Hrvatska]</span>; <span title="CY: [Kýpros]">Cyprus [Κύπρος]</span>;
- <span title="CZ">Czech Republic [Česká republika]</span>; <span title="DK">Denmark [Danmark]</span>;
- <span title="DJ">Djibouti [Jabuuti, Yabuuti]</span>; <span title="DO">Dominican Republic [República
- Dominicana]</span>; <span title="EC">Ecuador</span>; <span title="EG: [mṣr]">Egypt [مصر]</span>;
- <span title="SV">El Salvador</span>; <span title="ER: [ʿerītīra]">Eritrea [Eretria, ኤርትራ]</span>;
- <span title="EE">Estonia [Eesti]</span>; <span title="ET: [ʿitīyophīya]">Ethiopia [Itiyoophiya,
- Itoobiya, Itoophiyaa, Otobbia, ኢትዮጵያ]</span>; <span title="FO">Faroe Islands [Føroyar]</span>;
- <span title="FI">Finland [Suomi]</span>; <span title="FR">France</span>;
- <span title="GE: [sakartvelo]">Georgia [საქართველო]</span>; <span title="DE">Germany
- [Deutschland]</span>; <span title="GR: [Elláda]">Greece [Ελλάδα]</span>; <span title="GL">
- Greenland [Kalaallit Nunaat]</span>; <span title="GU">Guam</span>; <span title="GT">
- Guatemala</span>; <span title="HN">Honduras</span>;
- <span title="HK: [zhōng huá rén mín gòng hé guó xiāng gǎng tè bié xíng zhèng qū]">Hong
- Kong S.A.R. China [中華人民共和國香港特別行政區]</span>; <span title="HU">Hungary [Magyarország]</span>;
- <span title="IS">Iceland [Ísland]</span>;
- <span title="IN: [ạlhnd, bhārata, bhārata dēḷa0, bhāratam, intiyā, intya]">India [الهند,
- भारत, भारतम्, ভারত, ভাৰত, ਭਾਰਤ, ભારત, ଭାରତ, இந்தியா, భారత దేళ౦, ಭಾರತ, ഇന്ത്യ]</span>;
- <span title="ID">Indonesia</span>; <span title="IR: [ạy̰rạn]">Iran [ایران]</span>;
- <span title="IQ: [ạlʿrạq]">Iraq [العراق]</span>; <span title="IE">Ireland [Éire]</span>;
- <span title="IL: [yşrʼl]">Israel [ישראל]</span>; <span title="IT">Italy [Italia]</span>;
- <span title="JM">Jamaica</span>; <span title="JP">Japan [日本]</span>;
- <span title="JO: [ạlạrdn]">Jordan [الاردن]</span>; <span title="KZ: [Kˌazakˌstan]">
- Kazakhstan [Қазақстан]</span>; <span title="KE">Kenya [Keeniyaa, Kiiniya]</span>;
- <span title="KW: [ạlkwyt]">Kuwait [الكويت]</span>; <span title="KG: [Kyrgyzstan]">
- Kyrgyzstan [Кыргызстан]</span>; <span title="LA">Laos [ລາວ]</span>; <span title="LV">
- Latvia [Latvija]</span>; <span title="LB: [lbnạn]">Lebanon [لبنان]</span>;
- <span title="LY: [lybyạ]">Libya [ليبيا]</span>; <span title="LI">Liechtenstein</span>;
- <span title="LT">Lithuania [Lietuva]</span>; <span title="LU">Luxembourg [Luxemburg]</span>;
- <span title="MO: [ào mén tè bié xíng zhèng qū]">Macao S.A.R. China [澳門特別行政區]</span>;
- <span title="MK: [Makedoniǰa]">Macedonia [Македонија]</span>; <span title="MY">Malaysia</span>;
- <span title="MV">Maldives [ދިވެހި ރާއްޖެ]</span>; <span title="MT">Malta</span>;
- <span title="MH">Marshall Islands</span>; <span title="MX">Mexico [México]</span>;
- <span title="MC">Monaco</span>; <span title="MN: [Mongol uls]">Mongolia [Монгол улс]</span>;
- <span title="MA: [ạlmgẖrb]">Morocco [المغرب]</span>; <span title="NL">Netherlands
- [Nederland]</span>; <span title="NZ">New Zealand</span>; <span title="NI">Nicaragua</span>;
- <span title="MP">Northern Mariana Islands</span>; <span title="NO">Norway [Noreg, Norge]</span>;
- <span title="OM: [ʿmạn]">Oman [عمان]</span>; <span title="PK">Pakistan [پاکستان]</span>;
- <span title="PA">Panama [Panamá]</span>; <span title="PY">Paraguay</span>;
- <span title="PE">Peru [Perú]</span>; <span title="PH">Philippines</span>; <span title="PL">
- Poland [Polska]</span>; <span title="PT">Portugal</span>; <span title="PR">Puerto Rico</span>;
- <span title="QA: [qṭr]">Qatar [قطر]</span>; <span title="RO">Romania [România]</span>;
- <span title="RU: [Rossiâ]">Russia [Россия]</span>; <span title="SA: [ạlʿrbyẗ ạlsʿwdyẗ]">
- Saudi Arabia [العربية السعودية]</span>; <span title="CS: [Srbiǰa i Crna Gora]">Serbia
- And Montenegro [Srbija i Crna Gora, Србија и Црна Гора]</span>;
- <span title="SG: [xīn jiā pō]">Singapore [新加坡]</span>; <span title="SK">Slovakia [Slovenská
- republika]</span>; <span title="SI">Slovenia [Slovenija]</span>; <span title="SO">Somalia
- [Soomaaliya]</span>; <span title="ZA">South Africa [Suid-Afrika]</span>;
- <span title="KR: [daehanmingug]">South Korea [대한민국]</span>; <span title="ES">Spain [Espainia,
- España, Espanya]</span>; <span title="SD: [ạlswdạn]">Sudan [السودان]</span>;
- <span title="SE">Sweden [Sverige]</span>; <span title="CH">Switzerland [Schweiz, Suisse,
- Svizzera]</span>; <span title="SY: [swryẗ, swryyʾ]">Syria [سورية, ܣܘܪܝܝܐ]</span>;
- <span title="TW: [tái wān]">Taiwan [臺灣]</span>; <span title="TZ">Tanzania</span>;
- <span title="TH: [pratheṣ̄thịy]">Thailand [ประเทศไทย]</span>; <span title="TT">Trinidad
- and Tobago</span>; <span title="TN: [twns]">Tunisia [تونس]</span>; <span title="TR">
- Turkey [Türkiye]</span>; <span title="VI">U.S. Virgin Islands</span>;
- <span title="UA: [Ukraina, Ukraí̈na]">Ukraine [Украина, Україна]</span>;
- <span title="AE: [ạlạmạrạt ạlʿrbyẗ ạlmtḥdẗ]">United Arab Emirates [الامارات العربية
- المتحدة]</span>; <span title="GB">United Kingdom [Prydain Fawr, Rywvaneth Unys]</span>;
- <span title="US">United States [Estados Unidos, ʻAmelika Hui Pū ʻIa]</span>;
- <span title="UM">United States Minor Outlying Islands</span>; <span title="UY">Uruguay</span>;
- <span title="UZ: [Ŭzbekiston]">Uzbekistan [Oʿzbekiston, Ўзбекистон]</span>;
- <span title="VE">Venezuela</span>; <span title="VN">Vietnam [Việt Nam]</span>;
- <span title="YE: [ạlymn]">Yemen [اليمن]</span>; <span title="ZW">Zimbabwe</span> </p>
- <p><font style="font-size: 90%;"><b>Notes: </b></font></p>
- <ul>
- <li><span style="font-size: 90%">The amount of data per locale and the status (draft or
- vetted) varies.</span></li>
- <li><font style="font-size: 90%;">Tooltips will show the ISO code and Latin
- transliteration if available.<br>
- (To set your tooltip font in IE, right click on the desktop, pick
- Properties>Appearance>Advanced>Item: ToolTip, then set the font to Arial Unicode MS or
- other large font.)</font></li>
- <li><font style="font-size: 90%;">If the above doesn't display in your browser, see
- <a href="http://www.unicode.org/help/display_problems.html">Display Problems?</a></font></li>
- </ul>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.4.1.html b/specs/ldml/version/1.4.1.html
deleted file mode 100644
index f387222..0000000
--- a/specs/ldml/version/1.4.1.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.4 Release Note</h1>
- <p style="margin-bottom: 1em">The following are the files for this release. For a
- description of their purpose and format, see <a href="../repository_access.html">CLDR
- Releases (Downloads)</a>. <i>In terms of license, the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a> apply; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>. </i></p>
- <div align="center">
- <center>
- <table border="1" cellpadding="2" cellspacing="0" style="border-collapse: collapse">
- <tr>
- <th bgcolor="#DDDDDD">Release</th>
- <th bgcolor="#DDDDDD">No.</th>
- <th bgcolor="#DDDDDD">Date</th>
- <th bgcolor="#DDDDDD">Rel. Note</th>
- <th bgcolor="#DDDDDD">Data</th>
- <th bgcolor="#DDDDDD">Spec</th>
- <th bgcolor="#DDDDDD">Delta</th>
- <th bgcolor="#DDDDDD">CVS Tag</th>
- </tr>
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.4.1</b></td>
- <td>2006-11-03</td>
- <td align="center"><b><a href="1.4.1.html">Version1.4.1</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.4.1/">CLDR1.4.1</a></b></td>
- <td><b>
- <a href="http://www.unicode.org/reports/tr35/tr35-7.html">LDML1.4.1</a></b></td>
- <td align="center"><b>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.4.1">Changes1.4.1</a></b></td>
- <td><b><code>release-1-4-1</code></b></td>
- </tr>
- </table>
- </center>
- </div>
- <p>This release of CLDR is an update release; the main changes were </p>
- <ul>
- <li>updates for new region codes (RS and ME for Serbia and Montenegro),</li>
- <li>added new Time Zone IDs</li>
- <li>added new language tags</li>
- <li>added the list of private use language & script codes that won't be used by CLDR</li>
- </ul>
- <p>The exact changes can be seen by clicking on the Delta link above.</p>
- <p><i>Version 1.4.1 was released on 2006-11-03 as a CVS-tag release; later it was decided to make it a
- regular release with zipped data and this release page.</i></p>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.4.html b/specs/ldml/version/1.4.html
deleted file mode 100644
index f87c515..0000000
--- a/specs/ldml/version/1.4.html
+++ /dev/null
@@ -1,431 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.4 Release Note</h1>
- <p style="margin-bottom: 1em">The following are the files for this release. For a
- description of their purpose and format, see <a href="../repository_access.html">CLDR
- Releases (Downloads)</a>. <i>In terms of license, the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a> apply; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>. </i></p>
- <div align="center">
- <center>
- <table border="1" cellpadding="2" cellspacing="0" style="border-collapse: collapse">
- <tr>
- <th bgcolor="#DDDDDD">Release</th>
- <th bgcolor="#DDDDDD">No.</th>
- <th bgcolor="#DDDDDD">Date</th>
- <th bgcolor="#DDDDDD">Rel. Note</th>
- <th bgcolor="#DDDDDD">Data</th>
- <th bgcolor="#DDDDDD">Spec</th>
- <th bgcolor="#DDDDDD">Delta</th>
- <th bgcolor="#DDDDDD">CVS Tag</th>
- </tr>
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.4</b></td>
- <td>2006-07-17</td>
- <td align="center"><b><a href="1.4.html">Version1.4</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.4.0/">CLDR1.4</a></b></td>
- <td><b>
- <a href="http://www.unicode.org/reports/tr35/tr35-6.html">LDML1.4</a> </b>
- </td>
- <td align="center"><b>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.4">Changes1.4</a></b></td>
- <td><b><code>release-1-4</code></b></td>
- </tr>
- </table>
- </center>
- </div>
- <p>This release of CLDR contains data for
- 121 languages and 142 territories -- 360 locales in all. Version 1.4
- of the repository contains over 25% more locale data than the
- previous release, with over 17,000 new or modified data items
- entered by over 100 different contributors. Major contributors to
- CLDR 1.4 include Apple, Google, IBM, and Sun, plus official
- representatives from a number of countries. Many other organizations
- and individuals around the globe have also made important
- contributions.</p>
- <p><span class="q">Some of the major features of LDML 1.4 used in
- the repository include new XML structures supporting customizable
- detection of words, lines, and sentences (segmentation),
- transliteration between different alphabets, and full compatibility
- with the recently approved internet standards for language tags. It
- also supports enhanced formats for dates and times, and adds new
- guidelines for date, time, and number parsing, as well as a number
- of clarifications. Other features of the release include:</span></p>
- <ul>
- <li>Full separation of linguistic from non-linguistic data </li>
- <li>Additional distinctions among draft data (between
- provisional and unconfirmed) </li>
- <li>Translations for quarters in date formats (such as "2006
- Q1") </li>
- <li>Additional time zone formatting </li>
- <li>Metadata for validating CLDR data </li>
- <li>Data for replacing obsoleted codes for languages, scripts,
- timezones, and so on. </li>
- </ul>
- <h3>List of <a name="Languages_and_Territories">Languages and Territories in this Release</a></h3>
- <p><b>Languages (121):</b> <span title="aa">Afar [Qafar]</span>;
- <span title="af">Afrikaans</span>; <span title="ak">Akan [ak]</span>;
- <span title="sq">Albanian [shqipe]</span>; <span title="am">Amharic
- [አማርኛ]</span>; <span title="ar: [ạlʿrbyẗ]">Arabic [العربية]</span>;
- <span title="hy: [Hayerēn]">Armenian [Հայերէն]</span>;
- <span title="as: [asamīẏā]">Assamese [অসমীয়া]</span>;
- <span title="az_Cyrl">Azerbaijani - Cyrillic [Азәрбајҹан - Cyrl]</span>;
- <span title="az_Latn">Azerbaijani - Latin [azərbaycanca - Latn]</span>;
- <span title="eu">Basque [euskara]</span>;
- <span title="be: [Belaruskí]">Belarusian [Беларускі]</span>;
- <span title="bn: [bānlā]">Bengali [বাংলা]</span>; <span title="byn">
- Blin [ብሊን]</span>; <span title="bs">Bosnian [Bosanski]</span>;
- <span title="bg: [Bʺlgarski]">Bulgarian [Български]</span>;
- <span title="ca">Catalan [català]</span>;
- <span title="zh_Hans: [zhōng wén - jiǎn tǐ zhōng wén]">Chinese -
- Simplified Han [中文 - 简体中文]</span>;
- <span title="zh_Hant: [zhōng wén - fán tǐ hàn yǔ]">Chinese -
- Traditional Han [中文 - 繁體漢語]</span>; <span title="kw">Cornish [kernewek]</span>;
- <span title="hr">Croatian [hrvatski]</span>; <span title="cs">Czech
- [Čeština]</span>; <span title="da">Danish [Dansk]</span>;
- <span title="dv">Divehi [ދިވެހިބަސް]</span>; <span title="nl">
- Dutch [Nederlands]</span>; <span title="dz">Dzongkha [རྫོང་ཁ]</span>;
- <span title="en">English</span>; <span title="eo">Esperanto</span>;
- <span title="et">Estonian [Eesti]</span>; <span title="ee">Ewe [ee]</span>;
- <span title="fo">Faroese [føroyskt]</span>; <span title="fi">Finnish
- [suomi]</span>; <span title="fr">French [français]</span>;
- <span title="fur">Friulian [furlan]</span>; <span title="gaa">Ga [gaa]</span>;
- <span title="gl">Galician [galego]</span>; <span title="gez">Geez
- [ግዕዝኛ]</span>; <span title="ka: [kartuli]">Georgian [ქართული]</span>;
- <span title="de">German [Deutsch]</span>;
- <span title="el: [Ellēniká]">Greek [Ελληνικά]</span>;
- <span title="gu: [gujarātī]">Gujarati [ગુજરાતી]</span>;
- <span title="ha_Arab">Hausa - Arabic [ha - Arab]</span>;
- <span title="ha_Latn">Hausa - Latin [ha - Latn]</span>;
- <span title="haw">Hawaiian [ʻōlelo Hawaiʻi]</span>;
- <span title="he: [ʻbryţ]">Hebrew [עברית]</span>;
- <span title="hi: [hindī]">Hindi [हिंदी]</span>; <span title="hu">
- Hungarian [magyar]</span>; <span title="is">Icelandic [Íslenska]</span>;
- <span title="ig">Igbo [ig]</span>; <span title="id">Indonesian [Bahasa
- Indonesia]</span>; <span title="ia">Interlingua [ia]</span>;
- <span title="iu">Inuktitut [ᐃᓄᒃᑎᑐᑦ ᑎᑎᕋᐅᓯᖅ]</span>; <span title="ga">
- Irish [Gaeilge]</span>; <span title="it">Italian [italiano]</span>;
- <span title="ja">Japanese [日本語]</span>; <span title="kl">Kalaallisut</span>;
- <span title="kam">Kamba [kam]</span>; <span title="kn: [kannaḍa]">
- Kannada [ಕನ್ನಡ]</span>; <span title="kk: [Kˌazakˌ]">Kazakh [Қазақ]</span>;
- <span title="km">Khmer [ភាសាខ្មែរ]</span>; <span title="rw">
- Kinyarwanda [rw]</span>; <span title="ky: [Kyrgyz]">Kirghiz [Кыргыз]</span>;
- <span title="kok: [kōṅkaṇī]">Konkani [कोंकणी]</span>;
- <span title="ko: [hangug"eo]">Korean [한국어]</span>;
- <span title="ku_Arab">Kurdish - Arabic [kurdî - erebî]</span>;
- <span title="ku_Latn">Kurdish - Latin [kurdî - Latn]</span>;
- <span title="lo">Lao [ລາວ]</span>; <span title="lv">Latvian [latviešu]</span>;
- <span title="ln">Lingala [lingála]</span>; <span title="lt">
- Lithuanian [Lietuvių]</span>; <span title="mk: [makedonski]">
- Macedonian [македонски]</span>; <span title="ms">Malay [Bahasa
- Melayu]</span>; <span title="ml: [malayāḷaṁ]">Malayalam [മലയാളം]</span>;
- <span title="mt">Maltese [Malti]</span>; <span title="gv">Manx [Gaelg]</span>;
- <span title="mr: [marāṭhī]">Marathi [मराठी]</span>;
- <span title="mn: [Mongol hél]">Mongolian [Монгол хэл]</span>;
- <span title="ne">Nepali [ne]</span>; <span title="se">Northern Sami
- [se]</span>; <span title="nso">Northern Sotho [nso]</span>;
- <span title="nb">Norwegian Bokmål [bokmål]</span>; <span title="nn">
- Norwegian Nynorsk [nynorsk]</span>; <span title="ny">Nyanja;
- Chichewa; Chewa [ny]</span>; <span title="or: [ōṛi"ā]">Oriya [ଓଡ଼ିଆ]</span>;
- <span title="om">Oromo [Oromoo]</span>; <span title="ps: [psˌtw]">
- Pashto [پښتو]</span>; <span title="fa: [fạrsy̰]">Persian [فارسی]</span>;
- <span title="pl">Polish [polski]</span>; <span title="pt">Portuguese
- [português]</span>; <span title="pa_Arab: [pajābī - Arab]">Punjabi -
- Arabic [ਪੰਜਾਬੀ - Arab]</span>;
- <span title="pa_Guru: [pajābī - guramukhī]">Punjabi - Gurmukhi [ਪੰਜਾਬੀ
- - ਗੁਰਮੁਖੀ]</span>; <span title="ro">Romanian [Română]</span>;
- <span title="ru: [russkij]">Russian [русский]</span>;
- <span title="sa: [sanskr̥ta]">Sanskrit [संस्कृत]</span>;
- <span title="sr_Cyrl: [Srpski - Ćirilica]">Serbian - Cyrillic [Српски
- - Ћирилица]</span>; <span title="sr_Latn">Serbian - Latin [Srpski -
- Latinica]</span>; <span title="sid">Sidamo [Sidaamu Afo]</span>;
- <span title="sk">Slovak [slovenský]</span>; <span title="sl">
- Slovenian [Slovenščina]</span>; <span title="so">Somali [Soomaali]</span>;
- <span title="nr">South Ndebele [nr]</span>; <span title="st">
- Southern Sotho [st]</span>; <span title="es">Spanish [español]</span>;
- <span title="sw">Swahili [Kiswahili]</span>; <span title="ss">Swati
- [ss]</span>; <span title="sv">Swedish [svenska]</span>;
- <span title="syr: [swryyʾ]">Syriac [ܣܘܪܝܝܐ]</span>;
- <span title="tg">Tajik [tg]</span>; <span title="ta: [tamiḻ]">Tamil
- [தமிழ்]</span>; <span title="tt: [Tatar]">Tatar [Татар]</span>;
- <span title="te: [telugu]">Telugu [తెలుగు]</span>;
- <span title="th: [thịy]">Thai [ไทย]</span>; <span title="tig">Tigre
- [ትግረ]</span>; <span title="ti">Tigrinya [ትግርኛ]</span>;
- <span title="ts">Tsonga [ts]</span>; <span title="tn">Tswana [tn]</span>;
- <span title="tr">Turkish [Türkçe]</span>;
- <span title="uk: [Ukraí̈nsʹka]">Ukrainian [Українська]</span>;
- <span title="ur: [ạrdw]">Urdu [اردو]</span>;
- <span title="uz_Arab">Uzbek - Arabic [اۉزبېک - Араб]</span>;
- <span title="uz_Cyrl: [Ŭzbek - Kiril]">Uzbek - Cyrillic [Ўзбек -
- Кирил]</span>; <span title="uz_Latn">Uzbek - Latin [oʿzbek - Lotin]</span>;
- <span title="ve">Venda [ve]</span>; <span title="vi">Vietnamese [Tiếng
- Việt]</span>; <span title="wal">Walamo [ወላይታቱ]</span>;
- <span title="cy">Welsh [Cymraeg]</span>; <span title="xh">Xhosa [xh]</span>;
- <span title="yo">Yoruba [yo]</span>; <span title="zu">Zulu [zu]</span>
- </p>
- <p><b>Territories (142):</b> <span title="AF: [ạfgẖạnstạn]">
- Afghanistan [افغانستان]</span>; <span title="AL">Albania [Shqipëria]</span>;
- <span title="DZ: [ạljzạỷr]">Algeria [الجزائر]</span>;
- <span title="AS">American Samoa</span>; <span title="AR">Argentina</span>;
- <span title=": [Hayastani Hanrapetutʻiwn]">Armenia [Հայաստանի
- Հանրապետութիւն]</span>; <span title="AU">Australia</span>;
- <span title="AT">Austria [Österreich]</span>; <span title="AZ">
- Azerbaijan [Azərbaycan, Азәрбајҹан]</span>;
- <span title="BH: [ạlbḥryn]">Bahrain [البحرين]</span>;
- <span title="BD: [bānlādēśa]">Bangladesh [বাংলাদেশ]</span>;
- <span title="BY: [Belarusʹ]">Belarus [Беларусь]</span>;
- <span title="BE">Belgium [België, Belgien, Belgique]</span>;
- <span title="BZ">Belize</span>; <span title="BT">Bhutan [འབྲུག]</span>;
- <span title="BO">Bolivia</span>;
- <span title="BA: [Bosna i Hercegovina]">Bosnia and Herzegovina [Bosna
- i Hercegovina, Босна и Херцеговина]</span>; <span title="BW">
- Botswana</span>; <span title="BR">Brazil [Brasil]</span>;
- <span title="BN">Brunei</span>; <span title="BG: [Bʺlgariâ]">
- Bulgaria [България]</span>; <span title="KH">Cambodia [កម្ពុជា]</span>;
- <span title="CA">Canada</span>; <span title="CL">Chile</span>;
- <span title="CN: [zhōng guó]">China [中国]</span>; <span title="CO">
- Colombia</span>; <span title="CG">Congo (Brazzaville) [Kɔngɔ́
- (Brazzaville)]</span>; <span title="CD">Congo (Kinshasa) [Kɔngɔ́
- (Kinshasa)]</span>; <span title="CR">Costa Rica</span>;
- <span title="HR">Croatia [Hrvatska]</span>;
- <span title="CY: [Kýpros]">Cyprus [Κύπρος]</span>; <span title="CZ">
- Czech Republic [Česká republika]</span>; <span title="DK">Denmark [Danmark]</span>;
- <span title="DJ">Djibouti [Jabuuti, Yabuuti]</span>;
- <span title="DO">Dominican Republic [República Dominicana]</span>;
- <span title="EC">Ecuador</span>; <span title="EG: [mṣr]">Egypt [مصر]</span>;
- <span title="SV">El Salvador</span>; <span title="ER">Eritrea [Eretria,
- ኤርትራ]</span>; <span title="EE">Estonia [Eesti]</span>;
- <span title="ET">Ethiopia [Itiyoophiya, Itoobiya, Itoophiyaa,
- Otobbia, ኢትዮጵያ]</span>; <span title="FO">Faroe Islands [Føroyar]</span>;
- <span title="FI">Finland [Suomi]</span>; <span title="FR">France</span>;
- <span title="GE: [sakartvelo]">Georgia [საქართველო]</span>;
- <span title="DE">Germany [Deutschland]</span>; <span title="GH">
- Ghana [GH]</span>; <span title="GR: [Elláda]">Greece [Ελλάδα]</span>;
- <span title="GL">Greenland [Kalaallit Nunaat]</span>;
- <span title="GU">Guam</span>; <span title="GT">Guatemala</span>;
- <span title="HN">Honduras</span>;
- <span title="HK: [zhōng huá rén mín gòng hé guó xiāng gǎng tè bié xíng zhèng qū]">
- Hong Kong SAR China [中華人民共和國香港特別行政區]</span>; <span title="HU">
- Hungary [Magyarország]</span>; <span title="IS">Iceland [Ísland]</span>;
- <span title="IN: [bhārata, bhārata dēḷaṁ, bhāratam, intiyā, intya]">
- India [بھارت, भारत, भारतम्, ভারত, ভাৰত, ਭਾਰਤ, ભારત, ଭାରତ, இந்தியா,
- భారత దేళం, ಭಾರತ, ഇന്ത്യ]</span>; <span title="ID">Indonesia</span>;
- <span title="IR: [ạy̰rạn]">Iran [IR, ایران]</span>;
- <span title="IQ: [ạlʿrạq]">Iraq [IQ, العراق]</span>;
- <span title="IE">Ireland [Éire]</span>; <span title="IL: [yşrʼl]">
- Israel [ישראל]</span>; <span title="IT">Italy [Italia, Italie]</span>;
- <span title="JM">Jamaica</span>; <span title="JP">Japan [日本]</span>;
- <span title="JO: [ạlạ̉rdn]">Jordan [الأردن]</span>;
- <span title="KZ: [Kˌazakˌstan]">Kazakhstan [Қазақстан]</span>;
- <span title="KE">Kenya [KE, Keeniyaa, Kiiniya]</span>;
- <span title="KW: [ạlkwyt]">Kuwait [الكويت]</span>;
- <span title="KG: [Kyrgyzstan]">Kyrgyzstan [Кыргызстан]</span>;
- <span title="LA">Laos [ລາວ]</span>; <span title="LV">Latvia [Latvija]</span>;
- <span title="LB: [lbnạn]">Lebanon [لبنان]</span>;
- <span title="LY: [lybyạ]">Libya [ليبيا]</span>; <span title="LI">
- Liechtenstein</span>; <span title="LT">Lithuania [Lietuva]</span>;
- <span title="LU">Luxembourg [Luxemburg]</span>;
- <span title="MO: [ào mén tè bié xíng zhèng qū]">Macao SAR China
- [澳門特別行政區]</span>; <span title="MK: [Makedoniǰa]">Macedonia [Македонија]</span>;
- <span title="MW">Malawi [MW]</span>; <span title="MY">Malaysia</span>;
- <span title="MV">Maldives [ދިވެހި ރާއްޖެ]</span>; <span title="MT">
- Malta</span>; <span title="MH">Marshall Islands</span>;
- <span title="MX">Mexico [México]</span>; <span title="MC">Monaco</span>;
- <span title="MN: [Mongol uls]">Mongolia [Монгол улс]</span>;
- <span title="MA: [ạlmgẖrb]">Morocco [المغرب]</span>;
- <span title="NA">Namibia [Namibië]</span>; <span title="NP">Nepal
- [NP]</span>; <span title="NL">Netherlands [Nederland]</span>;
- <span title="NZ">New Zealand</span>; <span title="NI">Nicaragua</span>;
- <span title="NE">Niger [NE]</span>; <span title="NG">Nigeria [NG]</span>;
- <span title="MP">Northern Mariana Islands</span>; <span title="NO">
- Norway [Noreg, Norge, Norgga]</span>; <span title="OM: [ʿmạn]">
- Oman [عمان]</span>; <span title="PK">Pakistan [PK, پاکستان]</span>;
- <span title="PA">Panama [Panamá]</span>; <span title="PY">Paraguay</span>;
- <span title="PE">Peru [Perú]</span>; <span title="PH">Philippines</span>;
- <span title="PL">Poland [Polska]</span>; <span title="PT">Portugal</span>;
- <span title="PR">Puerto Rico</span>; <span title="QA: [qṭr]">Qatar
- [قطر]</span>; <span title="RO">Romania [România]</span>;
- <span title="RU: [Rossiâ]">Russia [Россия]</span>; <span title="RW">
- Rwanda [RW]</span>; <span title="SA: [ạlmmlkẗ ạlʿrbyẗ ạlsʿwdyẗ]">
- Saudi Arabia [المملكة العربية السعودية]</span>;
- <span title="CS: [Srbiǰa i Crna Gora]">Serbia And Montenegro [Srbija
- i Crna Gora, Србија и Црна Гора]</span>;
- <span title="SG: [xīn jiā pō]">Singapore [新加坡]</span>;
- <span title="SK">Slovakia [Slovenská republika]</span>;
- <span title="SI">Slovenia [Slovenija]</span>; <span title="SO">
- Somalia [Soomaaliya]</span>; <span title="ZA">South Africa [Suid-Afrika,
- ZA]</span>; <span title="KR: [daehanmingug]">South Korea [대한민국]</span>;
- <span title="ES">Spain [Espainia, España, Espanya]</span>;
- <span title="SD: [ạlswdạn]">Sudan [السودان]</span>;
- <span title="SE">Sweden [Sverige]</span>; <span title="CH">
- Switzerland [Schweiz, Suisse, Svizzera]</span>;
- <span title="SY: [swryạ, swryyʾ]">Syria [SY, سوريا, ܣܘܪܝܝܐ]</span>;
- <span title="TW: [tái wān]">Taiwan [臺灣]</span>; <span title="TJ">
- Tajikistan [TJ]</span>; <span title="TZ">Tanzania</span>;
- <span title="TH: [pratheṣ̄thịy]">Thailand [ประเทศไทย]</span>;
- <span title="TG">Togo [TG]</span>; <span title="TT">Trinidad and
- Tobago</span>; <span title="TN: [twns]">Tunisia [تونس]</span>;
- <span title="TR">Turkey [Tirkiye, Türkiye]</span>; <span title="VI">
- U.S. Virgin Islands</span>; <span title="UA: [Ukraina, Ukraí̈na]">
- Ukraine [Украина, Україна]</span>;
- <span title="AE: [ạlạmạrạt ạlʿrbyẗ ạlmtḥdẗ]">United Arab Emirates
- [الامارات العربية المتحدة]</span>; <span title="GB">United Kingdom
- [Prydain Fawr, Rywvaneth Unys]</span>; <span title="US">United
- States [Estados Unidos, ʻAmelika Hui Pū ʻIa]</span>;
- <span title="UM">United States Minor Outlying Islands</span>;
- <span title="UY">Uruguay</span>; <span title="UZ: [Ŭzbekiston]">
- Uzbekistan [Oʿzbekiston, Ўзбекистон]</span>; <span title="VE">
- Venezuela</span>; <span title="VN">Vietnam [Việt Nam]</span>;
- <span title="YE: [ạlymn]">Yemen [اليمن]</span>; <span title="ZW">
- Zimbabwe</span> </p>
- <p><font style="font-size: 90%;"><b>Notes: </b></font></p>
- <ul>
- <li><span style="font-size: 90%">The amount of data per locale and the status (unconfirmed,
- provisional, or
- approved) varies.</span></li>
- <li><font style="font-size: 90%;">Tooltips will show the ISO code and Latin
- transliteration if available.<br>
- (To set your tooltip font in IE, right click on the desktop, pick
- Properties>Appearance>Advanced>Item: ToolTip, then set the font to Arial Unicode MS or
- other large font.)</font></li>
- <li><font style="font-size: 90%;">If the above doesn't display in your browser, see
- <a href="http://www.unicode.org/help/display_problems.html">Display Problems?</a></font></li>
- </ul>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.5.1.html b/specs/ldml/version/1.5.1.html
deleted file mode 100644
index 62b62a1..0000000
--- a/specs/ldml/version/1.5.1.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.5.1 Release Note</h1>
- <p style="margin-bottom: 1em">The following are the files for this release. For a
- description of their purpose and format, see <a href="../repository_access.html">CLDR
- Releases (Downloads)</a>. <i>In terms of license, the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a> apply; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>. </i></p>
- <div align="center">
- <center>
- <table border="1" cellpadding="2" cellspacing="0" style="border-collapse: collapse" id="table1">
- <tr>
- <th bgcolor="#DDDDDD">Release</th>
- <th bgcolor="#DDDDDD">No.</th>
- <th bgcolor="#DDDDDD">Date</th>
- <th bgcolor="#DDDDDD">Rel. Note</th>
- <th bgcolor="#DDDDDD">Data</th>
- <th bgcolor="#DDDDDD">Spec</th>
- <th bgcolor="#DDDDDD">Delta</th>
- <th bgcolor="#DDDDDD">CVS Tag</th>
- </tr>
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.5.1</b></td>
- <td><b>2007-12-21</b></td>
- <td align="center"><b><a href="1.5.1.html">Version1.5.1</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.5.1/">CLDR1.5.1</a></b></td>
- <td><b>
- <a href="http://www.unicode.org/reports/tr35/tr35-9.html">LDML1.5.1</a> </b>
- </td>
- <td align="center"><b>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1\.5\.1">Changes1.5.1</a></b></td>
- <td><b><code>release-1-5-1</code></b></td>
- </tr>
- </table>
- </center>
- <p align="left">CLDR 1.5.1 is an update release, with no new translations.
- The main changes are a significant additions to the data structure and
- process for computing timezone names, and additional data for finding
- default script or country given a language, or the converse. The structure
- has also been updated for the latest version of BCP 47, and new currency
- codes.</p>
- <p align="left">The main changes in the LDML specification were:</p>
- <ul>
- <li style="margin-top: 0.5em; margin-bottom: 0.5em">
- <p align="left">Extensive rewrite of <i>Appendix J: Time Zone Display Names</i>,
- primarily due to refinements to the metazone process. This also caused some changes in Appendix F: Date Format Patterns.</li>
- <li style="margin-top: 0.5em; margin-bottom: 0.5em">
- <p align="left">Made the date
- range handling uniform, with new <i>Section 5.2.1 Dates and Date Ranges,</i>
- and related changes particularly to C.1 and C.5 in Appendix C: Supplemental Data.</li>
- <li style="margin-top: 0.5em; margin-bottom: 0.5em">
- <p align="left">Added <i>Appendix C10.
- <a href="http://www.unicode.org/reports/tr35/tr35-9.html#Likely_Subtags">Likely Subtags</a></i></li>
- </ul>
- <p align="left"> </div>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.5.html b/specs/ldml/version/1.5.html
deleted file mode 100644
index 5665dff..0000000
--- a/specs/ldml/version/1.5.html
+++ /dev/null
@@ -1,386 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="VI60_defaultClientScript" content="JavaScript">
-<meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-<meta name="keywords" content="Unicode, common locale data repository">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<title>Common Locale Data - Repository Access</title>
-<link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-<style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
-</style>
-</head>
-
-<body text="#330000">
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="icon"><a href="http://www.unicode.org/">
- <img border="0" src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a> |
- <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td valign="top" width="25%" class="navCol">
- <table class="navColTable" border="0" width="100%" cellspacing="4" cellpadding="0">
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../index.html">CLDR Project</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../repository_access.html">CLDR Releases
- (Downloads)</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/tr35/">UTS #35:
- LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">Join the
- <a href="http://www.unicode.org/consortium/consort.html">Unicode Consortium</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/reports/">Unicode
- Technical Reports</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell">
- <a href="http://www.unicode.org/faq/reports_process.html">Technical Reports Development and
- Maintenance Process</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/consortium/utc.html">
- Unicode Technical Committee</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/versions/">Versions of
- the Unicode Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/standard/standard.html">
- The Unicode Standard</a></td>
- </tr>
- <tr>
- <td valign="top" class="navColCell"><a href="http://www.unicode.org/notes/">Unicode
- Technical Notes</a></td>
- </tr>
- </table>
- <!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tr>
- <td class="contents" valign="top">
- <div style="margin:1em">
- <h1 style="margin-bottom: 1em">CLDR 1.5 Release Note</h1>
- <p style="margin-bottom: 1em">The following are the files for this release. For a
- description of their purpose and format, see <a href="../repository_access.html">CLDR
- Releases (Downloads)</a>. <i>In terms of license, the Unicode
- <a href="http://unicode.org/copyright.html">Terms of Use</a> apply; in particular,
- <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>. </i></p>
- <div align="center">
- <center>
- <table border="1" cellpadding="2" cellspacing="0" style="border-collapse: collapse">
- <tr>
- <th bgcolor="#DDDDDD">Release</th>
- <th bgcolor="#DDDDDD">No.</th>
- <th bgcolor="#DDDDDD">Date</th>
- <th bgcolor="#DDDDDD">Rel. Note</th>
- <th bgcolor="#DDDDDD">Data</th>
- <th bgcolor="#DDDDDD">Spec</th>
- <th bgcolor="#DDDDDD">Delta</th>
- <th bgcolor="#DDDDDD">CVS Tag</th>
- </tr>
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.5</b></td>
- <td><b>2007-07-31</b></td>
- <td align="center"><b><a href="1.5.html">Version1.5</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.5.0/">CLDR1.5</a></b></td>
- <td><b>
- <a href="http://www.unicode.org/reports/tr35/tr35-8.html">LDML1.5</a> </b>
- </td>
- <td align="center"><b>
- <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.5">Changes1.5</a></b></td>
- <td><b><code>release-1-5</code></b></td>
- </tr>
- </table>
- </center>
- </div>
- <p align="center"><i><b>Note: </b>the test and tools directories, and some of the charts,
- will be updated in stages. See also <a href="../errata.html">Errata</a>.</i></p>
- <p>CLDR 1.5 contains data for
- 135 languages and 149 territories: 394 locales in all. Version 1.5
- of the repository contains over 42% more locale data than the
- previous release, with over 27,000 new or modified data items
- entered by over 160 different contributors. <span class="q">New to this release are also
- BGN transliterations. </span>Major contributors to
- CLDR 1.5 include Adobe, Apple, Google, IBM, and Sun, plus official
- representatives from a number of countries. Many other organizations
- and volunteers around the globe have also made important
- contributions.</p>
- <p><span class="q">Unicode CLDR 1.5 is part of the Unicode locale data project,
- together with <span style="font-weight: 700">Unicode L</span><span style="font-weight: bold;">ocale Data
- Markup Language</span><b> (Unicode LDML 1.5)</b>. LDML is an XML format used for general interchange of locale data, such as
- in Microsoft's .NET. Major features of Unicode LDML 1.5 include
- new conformance clauses, commonly used time zone translations, revisions
- for handling bidirectional text (Arabic and Hebrew), language fallbacks, revisions for character fallbacks (used for legacy </span>
- character encodings<span class="q">),
- mappings to related language and country codes, and substantial data on language and
- script usage in different countries.</span></p>
- <p>The data for CLDR is gathered through the <i>
- CLDR survey tool</i>, which allows organizations and volunteers to
- contribute locale data. Major improvements to the tool include: enhancements of the
- appearance, layout, and operation, substantial new
- documentation, improved testing, new levels of approval and corresponding changes to the
- voting process for lesser-known languages, and translator forums (and rss).</p>
- <h3>List of <a name="Languages_and_Territories">Languages and Territories in this Release</a></h3>
- <p><b>Languages (135):</b> <span title="aa">Afar [Qafar]</span>; <span title="af">
- Afrikaans</span>; <span title="ak">Akan [ak]</span>; <span title="sq">Albanian [shqipe]</span>;
- <span title="am">Amharic [አማርኛ]</span>; <span title="ar: [ạlʿrbyẗ]">Arabic [العربية]</span>;
- <span title="hy: [Hayerēn]">Armenian [Հայերէն]</span>; <span title="as: [asamīẏā]">
- Assamese [অসমীয়া]</span>; <span title="cch">Atsam [cch]</span>; <span title="az_Cyrl">
- Azerbaijani (Cyrillic) [Азәрбајҹан (Cyrl)]</span>; <span title="az_Latn">Azerbaijani
- (Latin) [azərbaycanca (Latn)]</span>; <span title="eu">Basque [euskara]</span>;
- <span title="be: [belaruskaâ]">Belarusian [беларуская]</span>; <span title="bn: [bānlā]">
- Bengali [বাংলা]</span>; <span title="byn">Blin [ብሊን]</span>; <span title="bs">Bosnian [Bosanski]</span>;
- <span title="bg: [bʺlgarski]">Bulgarian [български]</span>; <span title="my">Burmese
- [my]</span>; <span title="ca">Catalan [català]</span>; <span title="cop_Arab">Coptic
- (Arabic) [cop (Arab)]</span>; <span title="kw">Cornish [kernewek]</span>;
- <span title="hr">Croatian [hrvatski]</span>; <span title="cs">Czech [čeština]</span>;
- <span title="da">Danish [dansk]</span>; <span title="dv">Divehi [ދިވެހިބަސް]</span>;
- <span title="nl">Dutch [Nederlands]</span>; <span title="dz">Dzongkha [རྫོང་ཁ]</span>;
- <span title="en">English</span>; <span title="eo">Esperanto</span>; <span title="et">
- Estonian [eesti]</span>; <span title="ee">Ewe [ee]</span>; <span title="fo">Faroese [føroyskt]</span>;
- <span title="fil">Filipino</span>; <span title="fi">Finnish [suomi]</span>;
- <span title="fr">French [français]</span>; <span title="fur">Friulian [furlan]</span>;
- <span title="gaa">Ga [gaa]</span>; <span title="gl">Galician [galego]</span>;
- <span title="gez">Geez [ግዕዝኛ]</span>; <span title="ka: [kartuli]">Georgian [ქართული]</span>;
- <span title="de">German [Deutsch]</span>; <span title="el: [Ellēniká]">Greek [Ελληνικά]</span>;
- <span title="gu: [gujarātī]">Gujarati [ગુજરાતી]</span>; <span title="ha_Arab">Hausa
- (Arabic) [ha (Arab)]</span>; <span title="ha_Latn">Hausa (Latin) [ha (Latn)]</span>;
- <span title="haw">Hawaiian [ʻōlelo Hawaiʻi]</span>; <span title="he: [ʻbryţ]">Hebrew
- [עברית]</span>; <span title="hi: [hindī]">Hindi [हिंदी]</span>; <span title="hu">
- Hungarian [magyar]</span>; <span title="is">Icelandic [íslenska]</span>;
- <span title="ig">Igbo [ig]</span>; <span title="id">Indonesian [Bahasa Indonesia]</span>;
- <span title="ia">Interlingua</span>; <span title="iu">Inuktitut [ᐃᓄᒃᑎᑐᑦ ᑎᑎᕋᐅᓯᖅ]</span>;
- <span title="ga">Irish [Gaeilge]</span>; <span title="it">Italian [italiano]</span>;
- <span title="ja">Japanese [日本語]</span>; <span title="kaj">Jju [kaj]</span>;
- <span title="kl">Kalaallisut</span>; <span title="kam">Kamba [kam]</span>;
- <span title="kn: [kannaḍa]">Kannada [ಕನ್ನಡ]</span>; <span title="kk: [Kˌazakˌ]">Kazakh [Қазақ]</span>;
- <span title="km">Khmer [ភាសាខ្មែរ]</span>; <span title="rw">Kinyarwanda [rw]</span>;
- <span title="ky: [Kyrgyz]">Kirghiz [Кыргыз]</span>; <span title="kok: [kōṅkaṇī]">Konkani
- [कोंकणी]</span>; <span title="ko: [hangug" eo]>Korean [한국어]</span>; <span title="kfo">
- Koro [kfo]</span>; <span title="kpe">Kpelle [kpe]</span>;
- <span title="ku_Arab: [kwrdy̰ (erebî)]">Kurdish (Arabic) [كوردی (erebî)]</span>;
- <span title="ku_Latn">Kurdish (Latin) [kurdî (Latn)]</span>; <span title="lo">Lao [ລາວ]</span>;
- <span title="lv">Latvian [latviešu]</span>; <span title="ln">Lingala [lingála]</span>;
- <span title="lt">Lithuanian [lietuvių]</span>; <span title="mk: [makedonski]">Macedonian
- [македонски]</span>; <span title="ms">Malay [Bahasa Melayu]</span>;
- <span title="ml: [malayāḷaṁ]">Malayalam [മലയാളം]</span>; <span title="mt">Maltese [Malti]</span>;
- <span title="gv">Manx [Gaelg]</span>; <span title="mr: [marāṭhī]">Marathi [मराठी]</span>;
- <span title="mn: [mongol]">Mongolian [монгол]</span>; <span title="ne: [nēpālī]">Nepali
- [नेपाली]</span>; <span title="se">Northern Sami [dávvisámegiella]</span>;
- <span title="nso">Northern Sotho [Sesotho sa Leboa]</span>; <span title="nb">Norwegian
- Bokmål [norsk bokmål]</span>; <span title="nn">Norwegian Nynorsk [nynorsk]</span>;
- <span title="ny">Nyanja [ny]</span>; <span title="or: [ōṛi" ā]>Oriya [ଓଡ଼ିଆ]</span>;
- <span title="om">Oromo [Oromoo]</span>; <span title="ps: [psˌtw]">Pashto [پښتو]</span>;
- <span title="fa: [fạrsy̰]">Persian [فارسی]</span>; <span title="pl">Polish [polski]</span>;
- <span title="pt">Portuguese [português]</span>; <span title="pa_Arab: [pnjạb (Arab)]">
- Punjabi (Arabic) [پنجاب (Arab)]</span>; <span title="pa_Guru: [pajābī (guramukhī)]">
- Punjabi (Gurmukhi) [ਪੰਜਾਬੀ (ਗੁਰਮੁਖੀ)]</span>; <span title="ro">Romanian [română]</span>;
- <span title="ru: [russkij]">Russian [русский]</span>;
- <span title="sa: [sanskr̥ta bhāṣā]">Sanskrit [संस्कृत भाषा]</span>;
- <span title="sr_Cyrl: [Srpski (Ćirilica)]">Serbian (Cyrillic) [Српски (Ћирилица)]</span>;
- <span title="sr_Latn">Serbian (Latin) [Srpski (Latinica)]</span>; <span title="ii">
- Sichuan Yi [ꆈꌠꉙ]</span>; <span title="sid">Sidamo [Sidaamu Afo]</span>;
- <span title="zh_Hans: [zhōng wén (jiǎn tǐ)]">Simplified Chinese [中文（简体）]</span>;
- <span title="sk">Slovak [slovenský]</span>; <span title="sl">Slovenian [slovenščina]</span>;
- <span title="so">Somali [Soomaali]</span>; <span title="nr">South Ndebele [isiNdebele]</span>;
- <span title="st">Southern Sotho [Sesotho]</span>; <span title="es">Spanish [español]</span>;
- <span title="sw">Swahili [Kiswahili]</span>; <span title="ss">Swati [Siswati]</span>;
- <span title="sv">Swedish [svenska]</span>; <span title="syr: [swryyʾ]">Syriac
- [ܣܘܪܝܝܐ]</span>; <span title="tg">Tajik [tg]</span>; <span title="ta: [tamiḻ]">Tamil [தமிழ்]</span>;
- <span title="tt: [Tatar]">Tatar [Татар]</span>; <span title="te: [telugu]">Telugu [తెలుగు]</span>;
- <span title="th: [thịy]">Thai [ไทย]</span>; <span title="bo">Tibetan [པོད་སྐད་]</span>;
- <span title="tig">Tigre [ትግረ]</span>; <span title="ti">Tigrinya [ትግርኛ]</span>;
- <span title="to">Tonga [lea fakatonga]</span>; <span title="zh_Hant: [fán tǐ zhōng wén]">
- Traditional Chinese [繁體中文]</span>; <span title="ts">Tsonga [Xitsonga]</span>;
- <span title="tn">Tswana [Setswana]</span>; <span title="tr">Turkish [Türkçe]</span>;
- <span title="kcg">Tyap [kcg]</span>; <span title="ug">Uighur [ug]</span>;
- <span title="uk: [ukraí̈nsʹka]">Ukrainian [українська]</span>;
- <span title="ur: [ạrdw]">Urdu [اردو]</span>;
- <span title="uz_Arab">Uzbek (Arabic) [اۉزبېک (Араб)]</span>;
- <span title="uz_Cyrl: [Ŭzbek (Kiril)]">Uzbek (Cyrillic) [Ўзбек (Кирил)]</span>;
- <span title="uz_Latn">Uzbek (Latin) [o'zbekcha (Lotin)]</span>; <span title="ve">Venda [Tshivenḓa]</span>;
- <span title="vi">Vietnamese [Tiếng Việt]</span>; <span title="wal">Walamo [ወላይታቱ]</span>;
- <span title="cy">Welsh [Cymraeg]</span>; <span title="wo_Arab">Wolof (Arabic) [wo
- (Arab)]</span>; <span title="wo_Latn">Wolof (Latin) [wo (Latn)]</span>; <span title="xh">
- Xhosa [isiXhosa]</span>; <span title="yo">Yoruba [yo]</span>; <span title="zu">Zulu [isiZulu]</span>
- </p>
- <p><b>Territories (149):</b> <span title="AF: [ạfgẖạnstạn]">Afghanistan [افغانستان]</span>;
- <span title="AL">Albania [Shqipëria]</span>; <span title="DZ: [ạljzạỷr]">Algeria [الجزائر]</span>;
- <span title="AS">American Samoa</span>; <span title="AR">Argentina</span>;
- <span title=": [Hayastani Hanrapetutʻiwn]">Armenia [Հայաստանի Հանրապետութիւն]</span>;
- <span title="AU">Australia</span>; <span title="AT">Austria [Österreich]</span>;
- <span title="AZ">Azerbaijan [Azərbaycan, Азәрбајҹан]</span>;
- <span title="BH: [ạlbḥryn]">Bahrain [البحرين]</span>; <span title="BD: [bānlādēśa]">
- Bangladesh [বাংলাদেশ]</span>; <span title="BY: [Belarusʹ]">Belarus [Беларусь]</span>;
- <span title="BE">Belgium [België, Belgien, Belgique]</span>; <span title="BZ">Belize</span>;
- <span title="BT">Bhutan [འབྲུག]</span>; <span title="BO">Bolivia</span>;
- <span title="BA: [Bosna i Hercegovina]">Bosnia and Herzegovina [Bosna i Hercegovina,
- Босна и Херцеговина]</span>; <span title="BW">Botswana</span>; <span title="BR">Brazil [Brasil]</span>;
- <span title="BN">Brunei</span>; <span title="BG: [Bʺlgariâ]">Bulgaria [България]</span>;
- <span title="KH">Cambodia [កម្ពុជា]</span>; <span title="CA">Canada</span>;
- <span title="CL">Chile</span>; <span title="CN: [zhōng guó]">China [རྒྱ་ནག, ꍏꇩ, 中国]</span>;
- <span title="CO">Colombia</span>; <span title="CG">Congo - Brazzaville [Kongó-Brazzaville]</span>;
- <span title="CD">Congo - Kinshasa [Kongó-Kinsásá]</span>; <span title="CR">Costa Rica</span>;
- <span title="HR">Croatia [Hrvatska]</span>; <span title="CY: [Kýpros]">Cyprus [Κύπρος]</span>;
- <span title="CZ">Czech Republic [Česká republika]</span>; <span title="DK">Denmark [Danmark]</span>;
- <span title="DJ">Djibouti [Jabuuti, Yabuuti]</span>; <span title="DO">Dominican Republic
- [República Dominicana]</span>; <span title="EC">Ecuador</span>;
- <span title="EG: [mṣr]">Egypt [EG, مصر]</span>; <span title="SV">El Salvador</span>;
- <span title="ER">Eritrea [Eretria, ኤርትራ]</span>; <span title="EE">Estonia [Eesti]</span>;
- <span title="ET">Ethiopia [Itiyoophiya, Itoobiya, Itoophiyaa, Otobbia, ኢትዮጵያ]</span>;
- <span title="FO">Faroe Islands [Føroyar]</span>; <span title="FI">Finland [FI, Suomi]</span>;
- <span title="FR">France</span>; <span title="GE: [sakartvelo]">Georgia [საქართველო]</span>;
- <span title="DE">Germany [Deutschland]</span>; <span title="GH">Ghana [GH]</span>;
- <span title="GR: [Elláda]">Greece [Ελλάδα]</span>; <span title="GL">Greenland [Kalaallit
- Nunaat]</span>; <span title="GU">Guam</span>; <span title="GT">Guatemala</span>;
- <span title="GN">Guinea [GN]</span>; <span title="HN">Honduras</span>;
- <span title="HK: [zhōng huá rén mín gòng hé guó xiāng gǎng tè bié xíng zhèng qū]">Hong
- Kong SAR China [中華人民共和國香港特別行政區]</span>; <span title="HU">Hungary [Magyarország]</span>;
- <span title="IS">Iceland [Ísland]</span>;
- <span title="IN: [bhārata, bhārata dēḷaṁ, bhāratam, intiyā, intya]">India [بھارت, भारत,
- भारतम्, ভারত, ভাৰত, ਭਾਰਤ, ભારત, ଭାରତ, இந்தியா, భారత దేళం, ಭಾರತ, ഇന്ത്യ, རྒྱ་གར་]</span>;
- <span title="ID">Indonesia</span>; <span title="IR: [ạy̰rạn]">Iran [IR, ایران]</span>;
- <span title="IQ: [ạlʿrạq]">Iraq [IQ, العراق]</span>; <span title="IE">Ireland [Éire]</span>;
- <span title="IL: [yşrʼl]">Israel [ישראל]</span>; <span title="IT">Italy [Italia,
- Italie]</span>; <span title="JM">Jamaica</span>; <span title="JP">Japan [日本]</span>;
- <span title="JO: [ạlạ̉rdn]">Jordan [الأردن]</span>; <span title="KZ: [Kˌazakˌstan]">
- Kazakhstan [Қазақстан]</span>; <span title="KE">Kenya [KE, Keeniyaa, Kiiniya]</span>;
- <span title="KW: [ạlkwyt]">Kuwait [الكويت]</span>; <span title="KG: [Kyrgyzstan]">
- Kyrgyzstan [Кыргызстан]</span>; <span title="LA">Laos [ລາວ]</span>; <span title="LV">
- Latvia [Latvija]</span>; <span title="LB: [lbnạn]">Lebanon [لبنان]</span>;
- <span title="LR">Liberia [LR]</span>; <span title="LY: [lybyạ]">Libya [ليبيا]</span>;
- <span title="LI">Liechtenstein</span>; <span title="LT">Lithuania [Lietuva]</span>;
- <span title="LU">Luxembourg [Luxemburg]</span>;
- <span title="MO: [zhōng huá rén mín gòng hé guó ào mén tè bié xíng zhèng qū]">Macao SAR
- China [中華人民共和國澳門特別行政區]</span>; <span title="MK: [Makedoniǰa]">Macedonia [Македонија]</span>;
- <span title="MW">Malawi [MW]</span>; <span title="MY">Malaysia</span>; <span title="MV">
- Maldives [ދިވެހި ރާއްޖެ]</span>; <span title="MT">Malta</span>; <span title="MH">
- Marshall Islands</span>; <span title="MX">Mexico [México]</span>; <span title="MC">
- Monaco</span>; <span title="MN: [Mongol uls]">Mongolia [Монгол улс]</span>;
- <span title="ME: [Crna Gora]">Montenegro [Crna Gora, Црна Гора]</span>;
- <span title="MA: [ạlmgẖrb]">Morocco [المغرب]</span>; <span title="MM">Myanmar [MM]</span>;
- <span title="NA">Namibia [Namibië]</span>; <span title="NP">Nepal [NP]</span>;
- <span title="NL">Netherlands [Nederland]</span>; <span title="NZ">New Zealand</span>;
- <span title="NI">Nicaragua</span>; <span title="NE">Niger [NE]</span>; <span title="NG">
- Nigeria [NG]</span>; <span title="MP">Northern Mariana Islands</span>; <span title="NO">
- Norway [Noreg, Norge, Norgga]</span>; <span title="OM: [ʿmạn]">Oman [عمان]</span>;
- <span title="PK">Pakistan [PK, پاکستان]</span>; <span title="PA">Panama [Panamá]</span>;
- <span title="PY">Paraguay</span>; <span title="PE">Peru [Perú]</span>; <span title="PH">
- Philippines</span>; <span title="PL">Poland [Polska]</span>; <span title="PT">Portugal</span>;
- <span title="PR">Puerto Rico</span>; <span title="QA: [qṭr]">Qatar [قطر]</span>;
- <span title="RO">Romania [România]</span>; <span title="RU: [Rossiâ]">Russia [Россия]</span>;
- <span title="RW">Rwanda [RW]</span>; <span title="SA: [ạlmmlkẗ ạlʿrbyẗ ạlsʿwdyẗ]">
- Saudi Arabia [المملكة العربية السعودية]</span>; <span title="SN">Senegal [SN]</span>;
- <span title="RS: [Srbiǰa]">Serbia [Srbija, Србија]</span>;
- <span title="SG: [xīn jiā pō]">Singapore [新加坡]</span>; <span title="SK">Slovakia [Slovenská
- republika]</span>; <span title="SI">Slovenia [Slovenija]</span>; <span title="SO">
- Somalia [Soomaaliya]</span>; <span title="ZA">South Africa [Suid-Afrika, ZA]</span>;
- <span title="KR: [daehanmingug]">South Korea [대한민국]</span>; <span title="ES">Spain [Espainia,
- España, Espanya]</span>; <span title="SD: [ạlswdạn]">Sudan [السودان]</span>;
- <span title="SE">Sweden [Sverige]</span>; <span title="CH">Switzerland [Schweiz, Suisse,
- Svizzera]</span>; <span title="SY: [swryạ, swryyʾ]">Syria [SY, سوريا, ܣܘܪܝܝܐ]</span>;
- <span title="TW: [tái wān]">Taiwan [臺灣]</span>; <span title="TJ">Tajikistan [TJ]</span>;
- <span title="TZ">Tanzania</span>; <span title="TH: [pratheṣ̄thịy]">Thailand [ประเทศไทย]</span>;
- <span title="TG">Togo [TG]</span>; <span title="TO">Tonga</span>; <span title="TT">
- Trinidad and Tobago</span>; <span title="TN: [twns]">Tunisia [تونس]</span>;
- <span title="TR">Turkey [Tirkiye, Türkiye]</span>; <span title="VI">U.S. Virgin Islands</span>;
- <span title="UA: [Ukraina, Ukraí̈na]">Ukraine [Украина, Україна]</span>;
- <span title="AE: [ạlạmạrạt ạlʿrbyẗ ạlmtḥdẗ]">United Arab Emirates [الامارات العربية
- المتحدة]</span>; <span title="GB">United Kingdom [Prydain Fawr, Rywvaneth Unys]</span>;
- <span title="US">United States [Estados Unidos, ʻAmelika Hui Pū ʻIa, US]</span>;
- <span title="UM">United States Minor Outlying Islands</span>; <span title="UY">Uruguay</span>;
- <span title="UZ: [Ŭzbekiston]">Uzbekistan [Oʿzbekiston, Ўзбекистон]</span>;
- <span title="VE">Venezuela</span>; <span title="VN">Vietnam [Việt Nam]</span>;
- <span title="YE: [ạlymn]">Yemen [اليمن]</span>; <span title="ZW">Zimbabwe</span> </p>
- <p><font style="font-size: 90%;"><b>Notes: </b></font></p>
- <ul>
- <li><span style="font-size: 90%">The amount of data per locale and the status (<i>unconfirmed</i>,
- <i>provisional</i>, <i>contributed</i>, or
- <i>approved</i>) varies.</span></li>
- <li><font style="font-size: 90%;">Tooltips will show the ISO code and Latin
- transliteration if available.<br>
- (To set your tooltip font in IE, right click on the desktop, pick
- Properties > Appearance > Advanced > Item: ToolTip, then set the font to Arial Unicode MS or
- other large font.)</font></li>
- <li><font style="font-size: 90%;">If the above doesn't display in your browser, see
- <a href="http://www.unicode.org/help/display_problems.html">Display Problems?</a></font></li>
- </ul>
- </div>
- </td>
- </tr>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" border="0" alt="Access to Copyright and terms of use" width="216" height="50"></a></td>
- </tr>
- </table>
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/specs/ldml/version/1.6.1.html b/specs/ldml/version/1.6.1.html
deleted file mode 100755
index 2cdfe2e..0000000
--- a/specs/ldml/version/1.6.1.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta http-equiv="Content-Language" content="en-us">
- <meta name="VI60_defaultClientScript" content="JavaScript">
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
- <meta name="keywords" content="Unicode, common locale data repository">
- <meta name="ProgId" content="FrontPage.Editor.Document">
- <title>Common Locale Data - Repository Access</title>
- <link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
- <style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
- </style>
-</head>
-<body text="#330000">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td colspan="2">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td class="icon"><a href="http://www.unicode.org/"> <img
- src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]"
- align="middle" border="0" height="33" width="34"></a> <a
- class="bar" href="../index.html"><font size="3">Common Locale Data
-Repository</font></a></td>
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a>
-| <a href="http://www.unicode.org/sitemap/" class="bar">Site Map</a> |
- <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="gray"> </td>
- </tr>
- <tr>
- <td class="navCol" valign="top" width="25%">
- <table class="navColTable" border="0" cellpadding="0"
- cellspacing="4" width="100%">
- <tbody>
- <tr>
- <td class="navColTitle">CLDR</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a href="../index.html">CLDR
-Project</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../repository_access.html">CLDR Releases (Downloads)</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../process.html">CLDR Technical Committee</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../procedures.html">CLDR-TC Procedures</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../data_formats.html">Data Formats</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../filing_bug_reports.html">Filing Bug Reports</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="../comparison_charts.html">Comparison Charts</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/reports/tr35/">UTS #35: LDML</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Related Links</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top">Join the <a
- href="http://www.unicode.org/consortium/consort.html">Unicode
-Consortium</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/reports/">Unicode Technical Reports</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"> <a
- href="http://www.unicode.org/faq/reports_process.html">Technical
-Reports Development and Maintenance Process</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/consortium/utc.html"> Unicode Technical
-Committee</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/versions/">Versions of the Unicode
-Standard</a></td>
- </tr>
- <tr>
- <td class="navColTitle">Other Publications</td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/standard/standard.html"> The Unicode
-Standard</a></td>
- </tr>
- <tr>
- <td class="navColCell" valign="top"><a
- href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
- </tr>
- </tbody>
- </table>
-<!-- BEGIN CONTENTS --></td>
- <td>
- <table>
- <tbody>
- <tr>
- <td class="contents" valign="top">
- <div style="margin: 1em;">
- <h1 style="margin-bottom: 1em;">CLDR 1.6.1 Release Note</h1>
- <p style="margin-bottom: 1em;">The following are the files
-for this release. For a description of their purpose and format, see <a
- href="../repository_access.html">CLDR Releases (Downloads)</a>. <i>In
-terms of license, the Unicode <a
- href="http://unicode.org/copyright.html">Terms of Use</a> apply; in
-particular, <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit
-1</a>. </i></p>
- <div align="center">
- <center>
- <table style="border-collapse: collapse;" id="table1"
- border="1" cellpadding="2" cellspacing="0">
- <tbody>
- <tr>
- <th bgcolor="#dddddd">Release</th>
- <th bgcolor="#dddddd">No.</th>
- <th bgcolor="#dddddd">Date</th>
- <th bgcolor="#dddddd">Rel. Note</th>
- <th bgcolor="#dddddd">Data</th>
- <th bgcolor="#dddddd">Spec</th>
- <th bgcolor="#dddddd">Delta</th>
- <th bgcolor="#dddddd">CVS Tag</th>
- </tr>
- <tr>
- <th align="left">Latest:</th>
- <td><b>1.6.1</b></td>
- <td><b>2008-07-23</b></td>
- <td align="center"><b><a href="1.6.1.html">Version1.6.1</a></b></td>
- <td><b><a href="http://unicode.org/Public/cldr/1.6.1/">CLDR1.6.1</a></b></td>
- <td><b> <a
- href="http://www.unicode.org/reports/tr35/tr35-11.html">LDML1.6.1</a> </b>
- </td>
- <td align="center"><b> <a
- href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1%5C.6%5C.1">Changes1.6.1</a></b></td>
- <td><b><code>release-1-6-1</code></b></td>
- </tr>
- </tbody>
- </table>
- </center>
- <p align="left">CLDR 1.6.1 is an update release, with no
-new translations. The main changes are supplemental data changes
-required to support the Olson time zone database version 2008d.<br>
- </p>
- <p align="left">The main changes in the LDML specification
-were editorial in nature. There were some clarifications made
-regarding BCP47 subtags.<br>
- </p>
- </div>
- </div>
- <div style="margin: 1em;">
- <div align="center">
- <p align="left"> </p>
- </div>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- <hr width="50%">
- <div align="center">
- <center>
- <table border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td><a href="http://www.unicode.org/copyright.html"> <img
- src="http://www.unicode.org/img/hb_notice.gif"
- alt="Access to Copyright and terms of use" border="0" height="50"
- width="216"></a></td>
- </tr>
- </tbody>
- </table>
- <script language="Javascript" type="text/javascript"
- src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-</body>
-</html>
diff --git a/specs/ldml/version/1.6.html b/specs/ldml/version/1.6.html
deleted file mode 100644
index 37054a6..0000000
--- a/specs/ldml/version/1.6.html
+++ /dev/null
@@ -1,796 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-
-
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-
-
- <meta http-equiv="Content-Language" content="en-us">
-
-
-
- <meta name="VI60_defaultClientScript" content="JavaScript">
-
-
-
- <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
-
-
-
- <meta name="keywords" content="Unicode, common locale data repository">
-
-
-
- <meta name="ProgId" content="FrontPage.Editor.Document">
-
-
-
-
-
- <title>Common Locale Data - Repository Access</title>
- <link rel="stylesheet" type="text/css" href="http://www.unicode.org/webscripts/standard_styles.css">
-
-
-
- <style type="text/css">
-<!--
-.panel { background-color:#FFFFFF; }
-table.list { border-color: #C0C0C0; border:none}
-td.item { background-color:#FFFFFF; border:none; }
--->
- </style>
-</head>
-
-
-<body style="color: rgb(51, 0, 0);">
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
- <tbody>
-
-
- <tr>
-
-
- <td colspan="2">
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
-
-
- <tbody>
-
-
- <tr>
-
-
- <td class="icon"><a href="http://www.unicode.org/"> <img src="http://www.unicode.org/webscripts/logo60s2.gif" alt="[Unicode]" align="middle" border="0" height="33" width="34"></a>
- <a class="bar" href="index.html"><font size="3">Common Locale Data Repository</font></a></td>
-
-
- <td class="bar"><a href="http://www.unicode.org" class="bar">Home</a>
-| <a href="http://www.unicode.org/sitemap/" class="bar">Site
-Map</a> | <a href="http://www.unicode.org/search/" class="bar">Search</a></td>
-
-
- </tr>
-
-
-
- </tbody>
-
- </table>
-
-
- </td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td colspan="2" class="gray"> </td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navCol" valign="top" width="25%">
-
- <table class="navColTable" border="0" cellpadding="0" cellspacing="4" width="100%">
-
-
- <tbody>
-
-
- <tr>
-
-
- <td class="navColTitle">CLDR</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../index.html">CLDR Project</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../repository_access.html">CLDR Releases (Downloads)</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../process.html">CLDR Technical Committee</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../procedures.html">CLDR-TC Procedures</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../data_formats.html">Data Formats</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../filing_bug_reports.html">Filing Bug Reports</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="../comparison_charts.html">Comparison Charts</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/tr35/">UTS #35: LDML</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColTitle">Related Links</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top">Join
-the <a href="http://www.unicode.org/consortium/consort.html">Unicode
-Consortium</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/reports/">Unicode Technical
-Reports</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"> <a href="http://www.unicode.org/faq/reports_process.html">Technical
-Reports Development and Maintenance Process</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/consortium/utc.html"> Unicode
-Technical Committee</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/versions/">Versions of the
-Unicode Standard</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColTitle">Other Publications</td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/standard/standard.html"> The
-Unicode Standard</a></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td class="navColCell" valign="top"><a href="http://www.unicode.org/notes/">Unicode Technical Notes</a></td>
-
-
- </tr>
-
-
-
- </tbody>
-
- </table>
-
-
-<!-- BEGIN CONTENTS --></td>
-
-
- <td>
-
- <table>
-
-
- <tbody>
-
-
- <tr>
-
-
- <td class="contents" valign="top">
-
- <div style="margin: 1em;">
-
- <h1 style="margin-bottom: 1em;">CLDR 1.6
-Release Note</h1>
-
-
-
- <p style="margin-bottom: 1em;">The following
-are the files for this release. For a description of their purpose and
-format, see <a href="../repository_access.html">CLDR
-Releases (Downloads)</a>. <i>In terms of license, the
-Unicode <a href="http://unicode.org/copyright.html">Terms
-of Use</a> apply; in particular, <a href="http://unicode.org/copyright.html#Exhibit1">Exhibit 1</a>.
- </i></p>
-
-
-
- <div align="center">
-
- <center>
-
- <table style="border-collapse: collapse;" border="1" cellpadding="2" cellspacing="0">
-
-
- <tbody>
-
-
- <tr>
-
-
- <th bgcolor="#dddddd">Release</th>
-
-
- <th bgcolor="#dddddd">No.</th>
-
-
- <th bgcolor="#dddddd">Date</th>
-
-
- <th bgcolor="#dddddd">Rel. Note</th>
-
-
- <th bgcolor="#dddddd">Data</th>
-
-
- <th bgcolor="#dddddd">Spec</th>
-
-
- <th bgcolor="#dddddd">Delta</th>
-
-
- <th bgcolor="#dddddd">CVS Tag</th>
-
-
- </tr>
-
-
- <tr>
-
-
- <th align="left">Latest:</th>
-
-
- <td><b>1.6</b></td>
-
-
- <td><b>2008-07-02</b></td>
-
-
- <td align="center"><b><a href="1.6.html">Version1.6</a></b></td>
-
-
- <td><b><a href="http://unicode.org/Public/cldr/1.6.0/">CLDR1.6</a></b></td>
-
-
- <td><b> <a href="http://www.unicode.org/reports/tr35/tr35-10.html">LDML1.6</a>
- </b> </td>
-
-
- <td style="text-align: left;"><b> <a href="http://www.unicode.org/cldr/bugs/locale-bugs/closed?expression=target.*1.6">Changes1.6</a></b></td>
-
-
- <td><b><code>release-1-6</code></b></td>
-
-
- </tr>
-
-
-
- </tbody>
-
- </table>
-
-
- </center>
-
-
- </div>
-
-
-
- <p align="center"><i><b>Note: </b>See
-also <a href="../errata.html">Errata</a>.</i></p>
-
-
-
- <p>CLDR 1.6 contains data for 137 languages and 140
-territories: 374 locales in all.
-Version 1.6 of the repository contains
-over 32% more locale data than the previous release, with
-nearly
-24,000 new or modified data items entered by over 220 different
-contributors. <span class="q"></span></p>
-
-
-
- <p><span class="q"></span>Major
-contributors to CLDR 1.6
-include Adobe, Apple, Google, IBM, and Sun, plus official
-representatives from a number of countries. Many other organizations
-and volunteers around the globe, including Gnome, Kotoistus, LISA, OpenOffice, and Utilika, have also made important
-contributions. The data for CLDR is gathered through the CLDR<i>
-survey tool</i>, which allows organizations and volunteers
-to contribute, compare, and vet locale data. For web pages with
-different views of CLDR data, see <a href="http://unicode.org/cldr/charts.html">http://unicode.org/cldr/charts.html</a>.</p>
-
-
-
- <p><span class="q">Unicode CLDR 1.6 is
-part of the Unicode locale data project, together with the <span style="font-weight: 700;">Unicode L</span><span style="font-weight: bold;">ocale Data Markup Language</span>
-(LDML: <a href="http://unicode.org/reports/tr35/">http://unicode.org/reports/tr35/</a>).
-LDML is an XML format used for general
-interchange of locale data, such as in Microsoft's .NET. Major new
-features
-of Unicode LDML 1.6 include:</span></p>
-
-
-
- <ul>
-
-
- <li><span class="q">Plural rules (such
-as the 4 forms for Russian).</span></li>
-
-
- <li><span class="q">Plural forms of
-currencies and date/time durations ("1 hour" vs "2 hours")</span></li>
-
-
- <li><span class="q">Interval formats
-for a concise representation of a range of two dates or times ("Jan
-10-12, 2008").</span></li>
-
-
- <li><span class="q">Telephone codes
-for different countries.</span></li>
-
-
- <li><span class="q">Clarified fallback
-process for resource bundle lookup and resource item lookup.</span></li>
-
-
- <li><span class="q">Explicit
-definition of Unicode locale and language identifiers.</span></li>
-
-
- <li><span class="q">Many other
-clarifications and corrections.</span><span style="text-decoration: underline;" class="q"></span></li>
-
-
-
- </ul>
-
-
-
- <h3>List of <a name="Languages_and_Territories">Languages
-and Territories in this Release</a></h3>
-
-
-
- <p><b>Languages (137):</b> <span title="aa">Afar [Qafar]</span>; <span title="af">Afrikaans</span>;
- <span title="ak">Akan [ak]</span>; <span title="sq">Albanian [shqipe]</span>; <span title="am">Amharic [አማርኛ]</span>; <span title="ar: [ạlʿrbyẗ]">Arabic [العربية]</span>; <span title="hy: [Hayerēn]">Armenian [Հայերէն]</span>; <span title="as: [asamīẏā]">Assamese [অসমীয়া]</span>; <span title="cch">Atsam [cch]</span>; <span title="az_Cyrl">Azerbaijani (Cyrillic) [Азәрбајҹан (kiril)]</span>;
- <span title="az_Latn">Azerbaijani (Latin)
-[azərbaycanca (latın)]</span>; <span title="eu">Basque
-[euskara]</span>; <span title="be: [belaruskaâ]">Belarusian
-[беларуская]</span>; <span title="bn: [bānlā]">Bengali
-[বাংলা]</span>; <span title="byn">Blin [ብሊን]</span>;
- <span title="bs">Bosnian [Bosanski]</span>;
- <span title="bg: [bʺlgarski]">Bulgarian
-[български]</span>; <span title="my">Burmese [ဗမာ]</span>;
- <span title="ca">Catalan [català]</span>;
- <span title="cop">Coptic [cop]</span>; <span title="kw">Cornish [kernewek]</span>; <span title="hr">Croatian [hrvatski]</span>; <span title="cs">Czech [čeština]</span>; <span title="da">Danish
-[dansk]</span>; <span title="dv">Divehi
-[ދިވެހިބަސް]</span>; <span title="nl">Dutch
-[Nederlands]</span>; <span title="dz">Dzongkha
-[རྫོང་ཁ]</span>; <span title="en_Dsrt">English
-(Deseret) [𐐀𐑍𐑊𐐮𐑇 (𐐔𐐯𐑆𐐲𐑉𐐯𐐻)]</span>; <span title="en_Shaw">English (Shavian)</span>; <span title="eo">Esperanto</span>; <span title="et">Estonian
-[eesti]</span>; <span title="ee">Ewe [ee]</span>;
- <span title="fo">Faroese [føroyskt]</span>;
- <span title="fil">Filipino</span>; <span title="fi">Finnish [suomi]</span>; <span title="fr">French
-[français]</span>; <span title="fur">Friulian
-[furlan]</span>; <span title="gaa">Ga [gaa]</span>;
- <span title="gl">Galician [galego]</span>;
- <span title="gez">Geez [ግዕዝኛ]</span>; <span title="ka: [kartuli]">Georgian [ქართული]</span>; <span title="de">German [Deutsch]</span>; <span title="el: [Ellēniká]">Greek [Ελληνικά]</span>; <span title="gu: [gujarātī]">Gujarati [ગુજરાતી]</span>; <span title="ha_Arab">Hausa (Arabic) [Haoussa (Arab)]</span>;
- <span title="ha_Latn">Hausa (Latin) [Haoussa
-(Latn)]</span>; <span title="haw">Hawaiian [ʻōlelo
-Hawaiʻi]</span>; <span title="he: [ʻbryţ]">Hebrew
-[עברית]</span>; <span title="hi: [hindī]">Hindi
-[हिन्दी]</span>; <span title="hu">Hungarian [magyar]</span>;
- <span title="is">Icelandic [íslenska]</span>;
- <span title="ig">Igbo [ig]</span>; <span title="id">Indonesian [Bahasa Indonesia]</span>; <span title="ia">Interlingua</span>; <span title="iu">Inuktitut
-[ᐃᓄᒃᑎᑐᑦ ᑎᑎᕋᐅᓯᖅ]</span>; <span title="ga">Irish
-[Gaeilge]</span>; <span title="it">Italian
-[italiano]</span>; <span title="ja">Japanese [日本語]</span>;
- <span title="kaj">Jju [kaj]</span>; <span title="kl">Kalaallisut</span>; <span title="kam">Kamba
-[kam]</span>; <span title="kn: [kannaḍa]">Kannada
-[ಕನ್ನಡ]</span>; <span title="kk_Cyrl: [Kˌazakˌ (Cyrl)]">Kazakh
-(Cyrillic) [Қазақ (Cyrl)]</span>; <span title="km">Khmer
-[ភាសាខ្មែរ]</span>; <span title="rw">Kinyarwanda
-[rw]</span>; <span title="ky: [Kyrgyz]">Kirghiz
-[Кыргыз]</span>; <span title="kok: [kōṅkaṇī]">Konkani
-[कोंकणी]</span>; <span title="ko: [hangug-eo]">Korean
-[한국어]</span>; <span title="kfo">Koro [kfo]</span>;
- <span title="kpe">Kpelle [kpe]</span>; <span title="ku_Arab: [kwrdy̰ (Arab)]">Kurdish (Arabic) [كوردی
-(Arab)]</span>; <span title="ku_Latn">Kurdish
-(Latin) [kurdî (Latn)]</span>; <span title="lo">Lao
-[ລາວ]</span>; <span title="lv">Latvian [latviešu]</span>;
- <span title="ln">Lingala [lingála]</span>;
- <span title="lt">Lithuanian [lietuvių]</span>;
- <span title="mk: [makedonski]">Macedonian
-[македонски]</span>; <span title="ms">Malay [Bahasa
-Melayu]</span>; <span title="ml: [malayāḷaṁ]">Malayalam
-[മലയാളം]</span>; <span title="mt">Maltese [Malti]</span>;
- <span title="gv">Manx [Gaelg]</span>; <span title="mr: [marāṭhī]">Marathi [मराठी]</span>; <span title="mo">Moldavian [moldovenească]</span>; <span title="mn_Cyrl: [mongol (Cyrl)]">Mongolian (Cyrillic)
-[монгол (Cyrl)]</span>; <span title="mn_Mong: [mongol (Mong)]">Mongolian
-(Mongolian) [монгол (Mong)]</span>; <span title="ne: [nēpālī]">Nepali
-[नेपाली]</span>; <span title="se">Northern Sami
-[davvisámegiella]</span>; <span title="nso">Northern
-Sotho [Sesotho sa Leboa]</span>; <span title="no">Norwegian
-[norsk]</span>; <span title="nb">Norwegian Bokmål
-[norsk bokmål]</span>; <span title="nn">Norwegian
-Nynorsk [nynorsk]</span>; <span title="ny">Nyanja
-[ny]</span>; <span title="or: [ōṛi" ā="">Oriya
-[ଓଡ଼ିଆ]</span>; <span title="om">Oromo [Oromoo]</span>;
- <span title="ps: [psˌtw]">Pashto [پښتو]</span>;
- <span title="fa: [fạrsy̰]">Persian [فارسی]</span>;
- <span title="pl">Polish [polski]</span>;
- <span title="pt">Portuguese [português]</span>;
- <span title="pa_Arab: [pnjạb (ạlʿrbyẗ)]">Punjabi
-(Arabic) [پنجاب (العربية)]</span>; <span title="pa_Guru: [pajābī (guramukhī)]">Punjabi (Gurmukhi)
-[ਪੰਜਾਬੀ (ਗੁਰਮੁਖੀ)]</span>; <span title="ro">Romanian
-[română]</span>; <span title="ru: [russkij]">Russian
-[русский]</span>; <span title="sa: [sanskr̥ta bhāṣā]">Sanskrit
-[संस्कृत भाषा]</span>; <span title="sr_Cyrl: [Srpski (Ćirilica)]">Serbian (Cyrillic)
-[Српски (Ћирилица)]</span>; <span title="sr_Latn">Serbian
-(Latin) [Srpski (Latinica)]</span>; <span title="ii">Sichuan
-Yi [ꆈꌠꉙ]</span>; <span title="sid">Sidamo [Sidaamu
-Afo]</span>; <span title="zh_Hans: [zhōng wén (jiǎn tǐ)]">Simplified
-Chinese [中文（简体）]</span>; <span title="si">Sinhala
-[සිංහල]</span>; <span title="sk">Slovak [slovenský]</span>;
- <span title="sl">Slovenian [slovenščina]</span>;
- <span title="so">Somali [Soomaali]</span>;
- <span title="nr">South Ndebele [isiNdebele]</span>;
- <span title="st">Southern Sotho [Sesotho]</span>;
- <span title="es">Spanish [español]</span>;
- <span title="sw">Swahili [Kiswahili]</span>;
- <span title="ss">Swati [Siswati]</span>;
- <span title="sv">Swedish [svenska]</span>;
- <span title="syr: [swryyʾ]">Syriac [ܣܘܪܝܝܐ]</span>;
- <span title="tl">Tagalog</span>; <span title="tg_Cyrl">Tajik (Cyrillic) [tg (Cyrl)]</span>; <span title="ta: [tamiḻ]">Tamil [தமிழ்]</span>; <span title="tt: [Tatar]">Tatar [Татар]</span>; <span title="te: [telugu]">Telugu [తెలుగు]</span>; <span title="th: [thịy]">Thai [ไทย]</span>; <span title="tig">Tigre [ትግረ]</span>; <span title="ti">Tigrinya
-[ትግርኛ]</span>; <span title="to">Tonga [lea
-fakatonga]</span>; <span title="zh_Hant: [fán tǐ zhōng wén]">Traditional
-Chinese [繁體中文]</span>; <span title="ts">Tsonga
-[Xitsonga]</span>; <span title="tn">Tswana
-[Setswana]</span>; <span title="tr">Turkish [Türkçe]</span>;
- <span title="kcg">Tyap [kcg]</span>; <span title="ug_Arab">Uighur (Arabic) [ug (Arab)]</span>; <span title="uk: [ukraí̈nsʹka]">Ukrainian [українська]</span>;
- <span title="ur: [ạrdw]">Urdu [اردو]</span>;
- <span title="uz_Arab">Uzbek (Arabic) [اۉزبېک
-(Араб)]</span>; <span title="uz_Cyrl: [Ŭzbek (Kiril)]">Uzbek
-(Cyrillic) [Ўзбек (Кирил)]</span>; <span title="uz_Latn">Uzbek
-(Latin) [o'zbekcha (Lotin)]</span>; <span title="ve">Venda
-[Tshivenḓa]</span>; <span title="vi">Vietnamese
-[Tiếng Việt]</span>; <span title="wal">Walamo
-[ወላይታቱ]</span>; <span title="cy">Welsh [Cymraeg]</span>;
- <span title="wo_Latn">Wolof (Latin) [wo (Latn)]</span>;
- <span title="xh">Xhosa [isiXhosa]</span>;
- <span title="yo">Yoruba [Yorùbá]</span>;
- <span title="zu">Zulu [isiZulu]</span> </p>
-
-
-
- <p><b>Territories (140):</b> <span title="AF: [ạfgẖạnstạn]">Afghanistan [افغانستان]</span>;
- <span title="AL">Albania [Shqipëria]</span>;
- <span title="DZ: [ạljzạỷr]">Algeria
-[الجزائر]</span>; <span title="AR">Argentina</span>;
- <span title=": [Hayastani Hanrapetutʻiwn]">Armenia
-[Հայաստանի Հանրապետութիւն]</span>; <span title="AT">Austria
-[Österreich]</span>; <span title="AZ">Azerbaijan
-[Azərbaycan, Азәрбајҹан]</span>; <span title="BH: [ạlbḥryn]">Bahrain
-[البحرين]</span>; <span title="BD: [bānlādēśa]">Bangladesh
-[বাংলাদেশ]</span>; <span title="BY: [Belarusʹ]">Belarus
-[Беларусь]</span>; <span title="BE">Belgium
-[België, Belgien, Belgique]</span>; <span title="BT">Bhutan
-[འབྲུག]</span>; <span title="BO">Bolivia</span>;
- <span title="BA: [Bosna i Hercegovina]">Bosnia
-and Herzegovina [Bosna i Hercegovina, Босна и Херцеговина]</span>;
- <span title="BR">Brazil [Brasil]</span>;
- <span title="BN">Brunei</span>; <span title="BG: [Bʺlgariâ]">Bulgaria [България]</span>; <span title="KH">Cambodia [កម្ពុជា]</span>; <span title="CA">Canada</span>; <span title="CL">Chile</span>;
- <span title="CN: [zhōng guó]">China [CN, ꍏꇩ,
-中国]</span>; <span title="CO">Colombia</span>;
- <span title="CG">Congo - Brazzaville
-[Kongó-Brazzaville]</span>; <span title="CD">Congo
-- Kinshasa [Kongó-Kinsásá]</span>; <span title="CR">Costa
-Rica</span>; <span title="HR">Croatia [Hrvatska]</span>;
- <span title="CY: [Kýpros]">Cyprus [Κύπρος]</span>;
- <span title="CZ">Czech Republic [Česká
-republika]</span>; <span title="DK">Denmark
-[Danmark]</span>; <span title="DJ">Djibouti
-[Jabuuti, Yabuuti]</span>; <span title="DO">Dominican
-Republic [República Dominicana]</span>; <span title="EC">Ecuador</span>;
- <span title="EG: [mṣr]">Egypt [مصر]</span>;
- <span title="SV">El Salvador</span>; <span title="ER">Eritrea [Eretria, ኤርትራ]</span>; <span title="EE">Estonia [Eesti]</span>; <span title="ET">Ethiopia
-[Itiyoophiya, Itoobiya, Itoophiyaa, Otobbia, ኢትዮጵያ]</span>; <span title="FO">Faroe Islands [Føroyar]</span>; <span title="FI">Finland [FI, Suomi]</span>; <span title="FR">France</span>; <span title="GE: [sakartvelo]">Georgia [საქართველო]</span>; <span title="DE">Germany [Deutschland]</span>; <span title="GH">Ghana [GH]</span>; <span title="GR: [Elláda]">Greece [Ελλάδα]</span>; <span title="GL">Greenland [Kalaallit Nunaat]</span>; <span title="GT">Guatemala</span>; <span title="GN">Guinea
-[GN]</span>; <span title="HN">Honduras</span>;
- <span title="HK: [zhōng guó xiāng gǎng tè bié xíng zhèng qū, zhōng huá rén mín gòng hé guó xiāng gǎng tè bié xíng zhèng qū]">Hong
-Kong SAR China [中国香港特别行政区, 中華人民共和國香港特別行政區]</span>; <span title="HU">Hungary [Magyarország]</span>; <span title="IS">Iceland [Ísland]</span>; <span title="IN: [bhārata, bhārata dēḷaṁ, bhāratam, intiyā, intya]">India
-[بھارت, भारत, भारतम्, ভারত, ভাৰত, ਭਾਰਤ, ભારત, ଭାରତ, இந்தியா, భారత
-దేళం, ಭಾರತ, ഇന്ത്യ]</span>; <span title="ID">Indonesia</span>;
- <span title="IR: [ạy̰rạn]">Iran [ایران]</span>;
- <span title="IQ: [ạlʿrạq]">Iraq [العراق]</span>;
- <span title="IE">Ireland [Éire]</span>; <span title="IL: [yşrʼl]">Israel [ישראל]</span>; <span title="IT">Italy [Italia, Italie]</span>; <span title="CI">Ivory Coast [CI]</span>; <span title="JP">Japan [日本]</span>; <span title="JO: [ạlạ̉rdn]">Jordan [الأردن]</span>; <span title="KZ: [Kˌazakˌstan]">Kazakhstan [Қазақстан]</span>;
- <span title="KE">Kenya [KE, Keeniyaa, Kiiniya]</span>;
- <span title="KW: [ạlkwyt]">Kuwait [الكويت]</span>;
- <span title="KG: [Kyrgyzstan]">Kyrgyzstan
-[Кыргызстан]</span>; <span title="LA">Laos [ລາວ]</span>;
- <span title="LV">Latvia [Latvija]</span>;
- <span title="LB: [lbnạn]">Lebanon [لبنان]</span>;
- <span title="LS">Lesotho [LS]</span>; <span title="LR">Liberia [LR]</span>; <span title="LY: [lybyạ]">Libya [ليبيا]</span>; <span title="LI">Liechtenstein</span>; <span title="LT">Lithuania
-[Lietuva]</span>; <span title="LU">Luxembourg
-[Luxemburg]</span>; <span title="MO: [zhōng guó ào mén tè bié xíng zhèng qū, zhōng huá rén mín gòng hé guó ào mén tè bié xíng zhèng qū]">Macau
-SAR China [中国澳门特别行政区, 中華人民共和國澳門特別行政區]</span>; <span title="MK: [Makedoniǰa]">Macedonia [Македонија]</span>;
- <span title="MW">Malawi [MW]</span>; <span title="MY">Malaysia</span>; <span title="MV">Maldives
-[ދިވެހި ރާއްޖެ]</span>; <span title="MT">Malta</span>;
- <span title="MX">Mexico [México]</span>;
- <span title="MD">Moldova [Moldova, Republica]</span>;
- <span title="MC">Monaco</span>; <span title="MN: [Mongol uls]">Mongolia [Монгол улс]</span>;
- <span title="ME: [Crna Gora]">Montenegro [Crna
-Gora, Црна Гора]</span>; <span title="MA: [ạlmgẖrb]">Morocco
-[المغرب]</span>; <span title="MM">Myanmar [မြန်မာ]</span>;
- <span title="NA">Namibia [Namibië]</span>;
- <span title="NP: [nēpāla]">Nepal [नेपाल]</span>;
- <span title="NL">Netherlands [Nederland]</span>;
- <span title="NI">Nicaragua</span>; <span title="NE">Niger [NE]</span>; <span title="NG">Nigeria
-[NG, Nijeriya]</span>; <span title="NO">Norway
-[Noreg, Norga, Norge]</span>; <span title="OM: [ʿmạn]">Oman
-[عمان]</span>; <span title="PK">Pakistan
-[پاکستان, پکستان]</span>; <span title="PA">Panama
-[Panamá]</span>; <span title="PY">Paraguay</span>;
- <span title="PE">Peru [Perú]</span>; <span title="PH">Philippines [Pilipinas]</span>; <span title="PL">Poland [Polska]</span>; <span title="PT">Portugal</span>;
- <span title="PR">Puerto Rico</span>; <span title="QA: [qṭr]">Qatar [قطر]</span>; <span title="RO">Romania [România]</span>; <span title="RU: [Rossiâ]">Russia [Россия]</span>; <span title="RW">Rwanda [RW]</span>; <span title="SA: [ạlmmlkẗ ạlʿrbyẗ ạlsʿwdyẗ]">Saudi Arabia
-[المملكة العربية السعودية]</span>; <span title="SN">Senegal
-[Sénégal, SN]</span>; <span title="RS: [Srbiǰa]">Serbia
-[Srbija, Србија]</span>; <span title="SG: [xīn jiā pō]">Singapore
-[新加坡]</span>; <span title="SK">Slovakia [Slovenská
-republika]</span>; <span title="SI">Slovenia
-[Slovenija]</span>; <span title="SO">Somalia
-[Soomaaliya]</span>; <span title="ZA">South Africa
-[Suid-Afrika, ZA]</span>; <span title="KR: [daehanmingug]">South
-Korea [대한민국]</span>; <span title="ES">Spain
-[Espainia, España, Espanya]</span>; <span title="LK">Sri
-Lanka [ශ්රී ලංකාව]</span>; <span title="SD: [ạlswdạn]">Sudan
-[SD, السودان]</span>; <span title="SZ">Swaziland
-[SZ]</span>; <span title="SE">Sweden [Sverige]</span>;
- <span title="CH">Switzerland [Schweiz, Suisse,
-Svizzera]</span>; <span title="SY: [swryạ, swryyʾ]">Syria
-[سوريا, ܣܘܪܝܝܐ]</span>; <span title="TW: [tái wān]">Taiwan
-[臺灣]</span>; <span title="TJ">Tajikistan [TJ]</span>;
- <span title="TZ">Tanzania</span>; <span title="TH: [thịy]">Thailand [ไทย]</span>; <span title="TG">Togo [TG]</span>; <span title="TO">Tonga</span>;
- <span title="TN: [twns]">Tunisia [تونس]</span>;
- <span title="TR">Turkey [Tirkiye, Türkiye]</span>;
- <span title="UA: [Ukraina, Ukraí̈na]">Ukraine
-[Украина, Україна]</span>; <span title="AE: [ạlạmạrạt ạlʿrbyẗ ạlmtḥdẗ]">United Arab
-Emirates [الامارات العربية المتحدة]</span>; <span title="GB">United
-Kingdom [Prydain Fawr, Rywvaneth Unys]</span>; <span title="US">United States [Estados Unidos, ʻAmelika Hui Pū
-ʻIa, 𐐏𐐭𐑌𐐴𐐻𐐲𐐼 𐐝𐐻𐐩𐐻𐑅]</span>; <span title="UY">Uruguay</span>;
- <span title="UZ: [Ŭzbekiston]">Uzbekistan
-[Oʿzbekiston, Ўзбекистон]</span>; <span title="VE">Venezuela</span>;
- <span title="VN">Vietnam [Việt Nam]</span>;
- <span title="YE: [ạlymn]">Yemen [اليمن]</span>
- </p>
-
-
-
- <p><font style="font-size: 90%;"><b>Notes:
- </b></font></p>
-
-
-
- <ul>
-
-
- <li><span style="font-size: 90%;">The
-amount of data per locale and the status (<i>unconfirmed</i>,
- <i>provisional</i>, <i>contributed</i>,
-or <i>approved</i>) varies.</span></li>
-
-
- <li><font style="font-size: 90%;">Tooltips
-will show the ISO code and Latin transliteration if available.<br>
-
-
-(To set your tooltip font in IE, right click on the desktop, pick
-Properties > Appearance > Advanced > Item:
-ToolTip, then set the font to Arial Unicode MS or other large font.)</font></li>
-
-
- <li><font style="font-size: 90%;">If
-the above doesn't display in your browser, see <a href="http://www.unicode.org/help/display_problems.html">Display
-Problems?</a></font></li>
-
-
-
- </ul>
-
-
- </div>
-
-
- </td>
-
-
- </tr>
-
-
-
- </tbody>
-
- </table>
-
-
-
- <hr width="50%">
-
- <div align="center">
-
- <center>
-
- <table border="0" cellpadding="0" cellspacing="0">
-
-
- <tbody>
-
-
- <tr>
-
-
- <td><a href="http://www.unicode.org/copyright.html">
- <img src="http://www.unicode.org/img/hb_notice.gif" alt="Access to Copyright and terms of use" border="0" height="50" width="216"></a></td>
-
-
- </tr>
-
-
-
- </tbody>
-
- </table>
-
-
-
- <script language="Javascript" type="text/javascript" src="http://www.unicode.org/webscripts/lastModified.js">
- </script>
- </center>
-
-
- </div>
-
-
- </td>
-
-
- </tr>
-
-
-
- </tbody>
-</table>
-
-
-</body>
-</html>
diff --git a/specs/ldml/vetting.html b/specs/ldml/vetting.html
deleted file mode 100644
index a0e3446..0000000
--- a/specs/ldml/vetting.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<meta HTTP-EQUIV="Refresh" CONTENT="0; URL=http://unicode.org/cldr/data/docs/survey/vetting.html">
-</head>
-
-<body>
-
-<p>This page has moved to:
-<a href="http://unicode.org/cldr/data/docs/survey/vetting.html">
-http://unicode.org/cldr/data/docs/survey/vetting.html</a>.</p>
-
-</body>
-
-</html>
diff --git a/specs/ldml/xmlGuide.html b/specs/ldml/xmlGuide.html
deleted file mode 100644
index 5984846..0000000
--- a/specs/ldml/xmlGuide.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-<title>Unicode CLDR XML Guidelines</title>
-<base target="_blank">
-</head>
-
-<frameset rows="48,*">
- <frame name="main1" src="header.html" noresize scrolling="no" frameborder="0" marginwidth="0" marginheight="0" target="_top">
- <frame name="main" src="http://docs.google.com/Doc?id=dfqr8rd5_19w2fkj9" noresize frameborder="0" marginheight="0">
- <noframes>
- <body>
- <p>This page uses frames, but your browser doesn't support them. Please see <a target="_top" href="http://docs.google.com/Doc?id=dfqr8rd5_15f624ws">body-source</a>.</p>
- </body>
- </noframes>
-</frameset>
-
-</html>
diff --git a/specs/site/release-30.html b/specs/site/release-30.html
deleted file mode 100644
index 8fd80c8..0000000
--- a/specs/site/release-30.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en-us">
-<title>CLDR 30 Release Note</title>
-</head>
-<body>
-<center>
-<table border="1" cellpadding="2" cellspacing="0" style="border-collapse:collapse">
-<tbody>
-<tr bgcolor="#dddddd">
-<th style="width:34px;height:16px">No.</th>
-<th style="width:67px;height:16px">Date</th>
-<th style="width:77px;height:16px">Rel. Note</th>
-<th style="width:64px;height:16px">Data</th>
-<th style="width:75px;height:16px">Charts</th>
-<th style="width:65px;height:16px">Spec</th>
-<th style="width:56px;height:16px">Delta</th>
-<th style="width:125px;height:16px">SVN Tag</th>
-<th style="width:86px;height:16px">DTD Diffs</th>
-</tr>
-<tr>
-<td style="width:34px;height:24px">30</td>
-<td style="width:67px;height:24px">2016-<span style="background-color:rgb(255,255,255)">10-05</span></td>
-<td style="width:77px;height:24px"><a href="https://sites.google.com/site/cldr/index/downloads/cldr-30">v30</a></td>
-<td style="width:64px;height:24px"><a href="http://unicode.org/Public/cldr/30/" target="_blank"><span style="background-color:rgb(255,255,255)">CLDR30</span></a></td>
-<td style="width:75px;height:24px"><a href="http://www.unicode.org/cldr/charts/30/" target="_blank">Charts30</a></td>
-<td style="width:65px;height:24px"><a href="http://www.unicode.org/reports/tr35/tr35-45/tr35.html" target="_blank">LDML30</a></td>
-<td style="width:56px;height:24px"><a href="http://unicode.org/cldr/trac/query?status=closed&status=reviewing&resolution=fixed&milestone=30&group=component&max=999&col=id&col=summary" target="_blank">Δ30</a></td>
-<td style="width:125px;height:24px"><a href="http://unicode.org/cldr/trac/browser/tags/release-30" rel="nofollow" style="font-family:monospace" target="_blank">release-30</a></td>
-<td style="width:86px;height:24px"><a href="http://unicode.org/cldr/trac/changeset?reponame=&new=HEAD@tags/release-30/common/dtd&old=HEAD@tags/release-29/common/dtd" target="_blank"><code>ΔDTD30</code></a></td>
-</tr>
-</tbody>
-</table>
-</center>
-<h2>Overview</h2>
-<img src="https://www.google.com/chart?cht=d&chdp=sites&chl=%5B%5BTable+of+contents'%3D20'f%5Cv'a%5C%3D0'10'%3D299'0'dim'%5Cbox1'b%5CF6F6F6'fC%5CF6F6F6'eC%5C0'sk'%5C%5B'%5D'a%5CV%5C%3D12'f%5C%5DV%5Cta%5C%3D10'%3D0'%3D300'%3D297'dim'%5C%3D10'%3D10'%3D300'%3D297'vdim'%5Cbox1'b%5Cva%5CF6F6F6'fC%5CC8C8C8'eC%5C'a%5C%5Do%5CLauto'f%5C" data-type="toc" data-props="align:right;maxDepth:6;width:300;wrap:true;" width="300" height="300" style="display:inline;float:right;margin:5px 0 5px 20px;" alt="">
-<p><span style="background-color:transparent;font-size:10pt">Unicode</span><span style="font-size:10pt"> CLDR 30</span><span style="font-size:10pt;background-color:transparent"> provides an update to the key building blocks for software supporting the world's languages. This data is used by all <a href="http://cldr.unicode.org/index#TOC-Who-uses-CLDR-">major software systems</a> for their software internationalization and localization, adapting software to the conventions of different languages for such common software tasks. </span><span style="font-size:10pt">The following summarizes the main improvements in the release:</span></p>
-<ul><li>New format and preference structure has been added to support week designations such as “the week of August 10” or “week 3 of March” (This structure is still being refined).</li>
-<li>New data items have been added to support relative times such as “3 Fridays ago” or ”this hour”.</li>
-<li>New <characterLabels> data can be used to generate labels for groups of related characters in character pickers.</li>
-<li>The structure for emoji annotations has been revised, and the data has been significantly updated.</li>
-<li>Unicode support is updated to 9.0, including updated Unihan readings for the pinyin collation and Han-Latin transforms, and support for new script codes and number systems. Some support is also added for region codes EZ, UN.</li>
-<li>The set of language codes for translation has been updated, with a significant increase in the total number of translated language names.</li>
-<li>Substantial new data has been added for likely subtags (e.g. to get the main script for each language)</li>
-<li>The CLDR 30 Survey Tool data collection resulted in a net increase in data items of about 9.2%, with an additional 5.9% of items changed.</li></ul>
-<h2><span style="font-size:large;background-color:transparent">Structural additions and changes</span></h2>
-<div>
-<div>
-<div>
-
-<p>The new data fields being added to the release are:</p>
-<blockquote>
-<table border="1" bordercolor="#888" cellspacing="0" style="border-collapse:collapse;border-color:rgb(136,136,136);border-width:1px">
-<tbody>
-<tr>
-<td style="width:259px;height:92px">In locale data, <br>
-new element <b><relativePeriod></b>,<br>
-new attribute <b>count</b> for <b><dateFormatItem></b>;<br>
-in supplemental data,<br>
-new element <b><weekOfPreference></b></td>
-<td style="width:623px;height:92px">For generated periods like “the week of August 10”. Data examples:<br>
-<font size="2"><font face="courier new, monospace"> <availableFormats></font><br>
-<font face="courier new, monospace"> <dateFormatItem id="MMMMW" count=...>'week' W 'of' MMM</dateFormatItem></font><br>
-<font face="courier new, monospace"> <dateFormatItem id="yw" count=...>'week' w 'of' y</dateFormatItem></font><br>
-<font face="courier new, monospace">...</font><br>
-<font face="courier new, monospace"><field type="week"></font><br>
-<font face="courier new, monospace"> <relativePeriod>the week of {0}</relativePeriod></font><br>
-<font face="arial, sans-serif"><b>Note:</b> the structure and intended usage for these items is still being refined, see <a href="https://sites.google.com/site/cldr/index/downloads/cldr-30#TOC-Warnings-and-Errata">Warnings and Errata</a>.</font></font></td>
-</tr>
-<tr>
-<td style="width:259px;height:29px">New relative data items for weekdays,<br>
-and for “this hour”, “this minute”</td>
-<td style="width:623px;height:29px">Examples:<br>
-<font face="courier new, monospace"><field type="sun"><br>
- <relativeTime type="future"><br>
- <relativeTimePattern count=...>in {0} Sundays</relativeTimePattern><br>
-...<br>
-<field type="hour"><br>
- <relative type="0">this hour</relative></font></td>
-</tr>
-<tr>
-<td>New unit patterns for<br>
-“per square kilometer”, “per square mile”</td>
-<td> </td>
-</tr>
-<tr>
-<td style="width:259px;height:44px">In locale data, new elements<br>
-<b><characterLabel></b>,<br>
-<b><characterLabelPatterns></b></td>
-<td style="width:623px;height:44px">To generate labels for groups of related characters in character pickers</td>
-</tr>
-<tr>
-<td style="width:259px;height:44px">In annotation data,<br>
-new attribute <b>type</b> for <b><annotation>,</b><br>
-deprecated attribute <b>tts</b> for <b><annotation></b></td>
-<td style="width:623px;height:44px">Restructured to make the difference clearer between short names (text-to-speech) and other keywords (for predictive typing, search, etc.). See detail below.</td>
-</tr>
-<tr>
-<td style="width:259px;height:29px">New data file<br>
-ExtendedPictographic.txt</td>
-<td style="width:623px;height:29px">Specifies property data for “future-proofing” <a href="http://unicode.org/repos/cldr/trunk/specs/ldml/tr35.html#Property_Data" target="_blank">emoji segmentation</a>.</td>
-</tr>
-</tbody>
-</table>
-</blockquote>
-<span>The s</span><font><span>tructure for annotations has changed to make processing simpler:</span></font></div>
-<div>
-<blockquote>
-<table border="1" bordercolor="#888" cellspacing="0" style="border-collapse:collapse;border-color:rgb(136,136,136);border-width:1px">
-<tbody>
-<tr>
-<td>OLD:
-</td>
-<td><span><annotation cp='[😀]' tts='grinning face'>face; grin</annotation></span></td>
-</tr>
-<tr>
-<td><span>NEW:</span></td>
-<td><span><annotation cp="😀">face | grin</annotation></span><br>
-<annotation cp="😀" type="tts">grinning face</annotation</td>
-</tr>
-</tbody>
-</table>
-</blockquote>
-<p><span style="font-size:10pt;background-color:rgb(255,255,255)">Other changes:</span></p>
-<div>
-<ul><li>The formerly-deprecated number symbols <currencyGroup> element was un-deprecated since it is needed for de_AT</li>
-<li><span style="background-color:rgb(255,255,255)">The <transformNames> element and its subelements have been deprecated. In their stead, some additional key/type names are added.</span></li></ul>
-</div>
-<div><span style="background-color:rgb(255,255,255)"><span style="font-size:10pt">For more details, see</span><span style="font-size:13.3333px"> </span><a href="http://www.unicode.org/cldr/charts/30/supplemental/dtd_deltas.html" style="font-size:13.3333px">DTD Deltas</a><span style="font-size:10pt">, </span><a href="http://unicode.org/repos/cldr/trunk/specs/ldml/tr35.html#Modifications" style="font-size:13.3333px">Modifications</a><span style="font-size:10pt">.</span></span></div>
-
-<h2>Data additions and changes</h2>
-
-<div>
-<h3><b><font size="3">Unicode 9</font></b></h3>
-<div><span style="background-color:transparent;font-size:10pt">Support was added for Unicode 9.0; this includes:</span></div>
-<div>
-<ul><li>Updating to Unicode 9.0 Unihan data (significant kMandarin reading improvements) for the pinyin collation and Han-Latin transform</li>
-<li>New script codes for Adlam, Bhaiksuki, Marchen, Newa, Osage</li>
-<li>New numbering systems adlm, bhks, newa</li></ul>
-</div>
-<h3><b><font size="3">Locale item codes and names</font></b></h3>
-<div>Other updates for locale item codes and names, in addition to those for Unicode 9:</div>
-<div>
-<ul><li>Some support for new region codes EZ, UN (though names for EZ are not available in languages other than English).</li>
-<li>Support for new timezones uasf "Europe/Astrakhan",rubax "Asia/Barnaul", rukvx "Europe/Kirov", rutof "Asia/Tomsk", ruuly "Europe/Ulyanovs</li>
-<li>Support for new Belarusian ruble code BYN</li>
-<li>Updated english names for bn/Beng “Bangla”, mic “Mi'kmaq”, or “Odia”</li>
-<li>Documented the use of script subtag “Zxxx” to indicate spoken or otherwise unwritten content.</li>
-<li>The set of language and script names for which translations are requested was revamped, leading to a substantial increase in the number of such names.</li>
-<li>Substantial new data has been added for likely subtags (e.g. to get the main script for each language).</li></ul>
-</div>
-<h3><b><font size="3">Emoji</font></b></h3>
-<div><font size="2"><b>Note:</b> The emoji data items listed below were updated to </font><span style="font-size:10pt;background-color:transparent">cover the upcoming </span><a href="http://www.unicode.org/reports/tr51/proposed.html" style="font-size:10pt" target="_blank">Emoji 4.0</a> release, <span style="font-size:10pt;background-color:transparent">based on a </span><i style="font-size:10pt">draft</i><span style="font-size:10pt;background-color:transparent"> version of the emoji 4.0 data. The </span><span style="background-color:transparent;font-size:10pt">emoji 4.0 data may be revised after CLDR 30 is released.</span></div>
-<ul><li><span style="background-color:transparent;font-size:10pt">Emoji short names and keywords were fleshed out for nearly 80 languages</span><span style="background-color:transparent;font-size:10pt">.</span></li>
-<li><span style="background-color:transparent">Added<font size="2"> data files to support improved and “future-proofed” text segmentation behavior for emoji.</font></span></li>
-<li><span style="background-color:transparent"><font size="2">Updated emoji collation.</font></span></li></ul>
-</div>
-<h3><b style="font-size:10pt"><font size="3">Other</font></b></h3>
-<div>Some other items of note:</div>
-<div>
-<ul><li>Support for IANA timezone data through 2016g</li>
-<li>The time separator for Norwegian locales (nb, nn) was changed to be ':' throughout.</li>
-<li>Number symbols (plus, minus, percent) and formats (currency, percent) were updated for ar, fa, he in an effort to produce better results. Note that depending on locale and numbering system, those number symbols and currency patterns may contain bidi controls LRM, RLM, and ALM. Use of the ALM is new in CLDR 30; CLDR clients who will be using this data on systems that do not yet support the bidi algorithm of Unicode 6.3 and later should map instances of ALM (U+061C) to RLM (U+200F).</li>
-<li>Use “lei” as narrow currency symbol for Romanian Leu (RON)</li>
-<li>Collation: Uzbek (uz) collation added, Church Slavic (cu) collation fixed, Czech (cs) search collation now uses the standard search collator.</li>
-<li>Some number spellout (RBNF) fixes for French, Portuguese, Spanish, Hebrew, Vietnamese.</li>
-<li>Transforms:
-<ul>
-<li>Adds transform from Zawgyi-encoded Myanmar (Burmese) to standard Unicode representation.</li>
-<li>Adds transliteration of 10 Indic languages to Urdu and Arabic.</li>
-<li>Adds phonetic transcription of Cherokee to IPA, as well as transliteration of 21 languages to Cherokee.</li>
-</ul>
-</li>
-</ul>
-</div>
-<h2>Growth</h2>
-
-<div>
-<div>CLDR 30 included a Survey Tool data collection phase, and collection of annotation data. The following shows the growth of locale-data over time.</div>
-<div><br>
-</div>
-</div>
-<div><img src="https://www.google.com/chart?cht=d&chdp=sites&chl=%5B%5BEmbedding_Title_Gviz_Chart'%3D20'f%5Cv'a%5C%3D0'10'%3D799'0'dim'%5Cbox1'b%5CF6F6F6'fC%5CF6F6F6'eC%5C0'sk'%5C%5B%22Chart+1%22'%5D'a%5CV%5C%3D12'f%5C%5DV%5Cta%5C%3D10'%3D0'%3D800'%3D397'dim'%5C%3D10'%3D10'%3D800'%3D397'vdim'%5Cbox1'b%5Cva%5CF6F6F6'fC%5CC8C8C8'eC%5C'a%5C%5Do%5CLauto'f%5C" data-type="gviz-chart" data-props="align:left;borderTitle:Chart 1;chartIndex:0;chartSpec:{"dataSourceUrl"#58"https#58//docs.google.com/spreadsheets/d/tYEAG-TghY75oVm3m0bRqXQ/gviz/tq?headers=1&transpose=1&merge=columns&hds=1&gid=0&range=A1#58HE19","options"#58{"hasHiddenData"#58false,"treatLabelsAsText"#58false,"vAxes"#58[{"useFormatFromData"#58true,"minValue"#580,"logScale"#58false,"maxValue"#581.1,"viewWindowMode"#58"explicit","title"#58"% Current Modern Coverage","viewWindow"#58{"min"#580,"max"#581.1}},{"useFormatFromData"#58true,"minValue"#58null,"logScale"#58false,"maxValue"#58null,"viewWindow"#58{"min"#58null,"max"#58null}}],"legend"#58"in","tooltip"#58{},"isStacked"#58false,"legacyScatterChartLabels"#58true,"title"#58"CLDR Growth","titleTextStyle"#58{"color"#58"#35000","fontSize"#5816,"bold"#58true},"animation"#58{"duration"#58500},"hAxis"#58{"useFormatFromData"#58true,"minValue"#581,"maxValue"#58200,"viewWindowMode"#58"explicit","title"#58"Number of Languages","viewWindow"#58{"min"#581,"max"#58200}},"series"#58{"0"#58{},"11"#58{"hasAnnotations"#58true}},"useFirstColumnAsDomain"#58true,"domainAxis"#58{"direction"#58-1},"width"#58"800","theme"#58"maximized","legacyContinuousAxisRemoved"#58true,"booleanRole"#58"certainty","height"#58"400"},"state"#58{},"view"#58{"columns"#58[0,1,2,3,4,5,6,7,8,9,10,11,12,{"sourceColumn"#5813,"properties"#58{"role"#58"annotation"},"label"#58""},{"sourceColumn"#5814,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5815,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5816,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5817,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5818,"properties"#58{"role"#58"annotationText"},"label"#58""}]},"isDefaultVisualization"#58false,"chartType"#58"AreaChart","chartName"#58"Chart 1"};chartSpecs:[{"dataSourceUrl"#58"https#58//docs.google.com/spreadsheets/d/tYEAG-TghY75oVm3m0bRqXQ/gviz/tq?headers=1&transpose=1&merge=columns&hds=1&gid=0&range=A1#58HE19","options"#58{"hasHiddenData"#58false,"treatLabelsAsText"#58false,"vAxes"#58[{"useFormatFromData"#58true,"minValue"#580,"logScale"#58false,"maxValue"#581.1,"viewWindowMode"#58"explicit","title"#58"% Current Modern Coverage","viewWindow"#58{"min"#580,"max"#581.1}},{"useFormatFromData"#58true,"minValue"#58null,"logScale"#58false,"maxValue"#58null,"viewWindow"#58{"min"#58null,"max"#58null}}],"legend"#58"in","tooltip"#58{},"isStacked"#58false,"legacyScatterChartLabels"#58true,"title"#58"CLDR Growth","titleTextStyle"#58{"color"#58"#35000","fontSize"#5816,"bold"#58true},"animation"#58{"duration"#58500},"hAxis"#58{"useFormatFromData"#58true,"minValue"#581,"maxValue"#58200,"viewWindowMode"#58"explicit","title"#58"Number of Languages","viewWindow"#58{"min"#581,"max"#58200}},"series"#58{"0"#58{},"11"#58{"hasAnnotations"#58true}},"useFirstColumnAsDomain"#58true,"domainAxis"#58{"direction"#58-1},"width"#58200,"theme"#58"maximized","legacyContinuousAxisRemoved"#58true,"booleanRole"#58"certainty","height"#58125},"state"#58{},"view"#58{"columns"#58[0,1,2,3,4,5,6,7,8,9,10,11,12,{"sourceColumn"#5813,"properties"#58{"role"#58"annotation"},"label"#58""},{"sourceColumn"#5814,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5815,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5816,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5817,"properties"#58{"role"#58"annotationText"},"label"#58""},{"sourceColumn"#5818,"properties"#58{"role"#58"annotationText"},"label"#58""}]},"isDefaultVisualization"#58false,"chartType"#58"AreaChart","chartName"#58"Chart 1"}];height:400;sheetUrl:https#58//docs.google.com/spreadsheets/d/1_T9w0Fv6KIZv-MLvfDsV8HGNIfF4aK7qmclC39nXVLU/edit?usp=drive_web;showBorder:false;showBorderTitle:false;spreadsheetName:CLDR v30 Growth;width:800;" width="800" height="400" style="display:block;text-align:left;margin-right:auto;" alt=""></div>
-<div><br>
-</div>
-<div>
-<div style="font-size:13.3333px">This graph does not include data outside of the main and annotations directories, such as sorting order, transliterations, validity data, and so forth. The following gives the total overview of the change in data items in CLDR.</div>
-<div style="font-size:13.3333px"><span style="background-color:rgb(255,255,0)"><br>
-</span></div>
-<blockquote style="font-size:13.3333px;margin:0px 0px 0px 40px;border:none;padding:0px">
-<div>
-<table border="1" bordercolor="#888" cellspacing="0" style="border-collapse:collapse;border-color:rgb(136,136,136);border-width:1px">
-<tbody>
-<tr>
-<td>added items</td>
-<td style="text-align:right"><span style="font-size:13.3333px;text-align:start">9.32%</span></td>
-</tr>
-<tr>
-<td>deleted items*</td>
-<td style="text-align:right">0.12%</td>
-</tr>
-<tr>
-<td>changed items</td>
-<td style="text-align:right">5.90%</td>
-</tr>
-<tr>
-<td><i>total items</i></td>
-<td>818,314</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div><br>
-</div>
-</blockquote>
-<span style="font-size:13.3333px;background-color:transparent">The measurement of the number of items is reflects the different ways that the information is represented. A single data field (element or attribute value) may result in multiple data items. For example, plural rules may be shared by multiple languages, and a single data field contains all the languages to which those rules apply. Sometimes a changed item appears as a deletion+addition, and sequences of items (such as sort order) are not counted as different even if the order changes. For more details, see the </span><span style="background-color:transparent;font-size:13.3333px"><a href="http://www.unicode.org/cldr/charts/30/delta/index.html" target="_blank">Delta Data</a> charts.</span></div>
-
-<h2>JSON data</h2>
-<p><span style="font-size:13.3333px;background-color:rgb(255,255,0);font-weight:normal">The JSON-format data and details about it are not yet available, but will be soon.</span></p>
-
-<h2>Survey Tool</h2>
-<ul><li><font size="2">Added 8-vote requirement to et, fa, en_GB, en_AU.</font></li>
-<li><font size="2">The Survey Tool now shows a link to where inherited data is aliased from. [#<a href="http://unicode.org/cldr/trac/ticket/9489" target="_blank">9489</a>]</font></li></ul>
-<h2>Specification changes</h2>
-<div>
-<ul><li>Documented the use of script subtag “Zxxx” to indicate spoken or otherwise unwritten content.</li>
-<li><font size="2">Documented the Unicode locale extension key "em" to control emoji presentation.</font></li>
-<li>Described the DTD annotations used in CLDR.</li>
-<li>Noted that number patterns may contain bidi controls.</li>
-<li>Described how to handle fractional seconds S when matching skeletons and adjusting corresponding patterns.</li></ul>
-</div>
-<div><span style="background-color:rgb(255,255,255)"><span style="font-size:13.3333px">For details, see </span><a href="http://unicode.org/repos/cldr/trunk/specs/ldml/tr35.html#Modifications" style="font-size:13.3333px">Modifications</a>.</span></div>
-
-<h2>Migration</h2>
-
-<p><span>Users of the annotation data need to move to the new structure, described above.</span></p>
-<p>There are changes to the bidirectional control characters in number symbols and number patterns for number systems 'arab' and 'arabext', and for number system 'latn' in some locales. These include use of the ALM (Arabic Letter Mark) character, which was new in Unicode 6.3.</p>
-
-<h2>Known Issues</h2>
-<h3><font size="3">“Week of” structure</font></h3>
-<p><span style="background-color:transparent"><font size="2">The structure and intended usage for the “week x of y” patterns is still being refined and may change. This applies especially to dateFormatItems such as the following:</font></span></p>
-<p><span style="font-family:courier new,monospace;font-size:small"> <dateFormatItem id="MMMMW" count=...>'week' W 'of' MMM</dateFormatItem></span><br style="font-family:courier new,monospace">
-<span style="font-family:courier new,monospace;font-size:small"> <dateFormatItem id="yw" count=...>'week' w 'of' y</dateFormatItem></span><br style="font-family:courier new,monospace">
-</p>
-<p><font size="2">Areas of discussion include the use of the count attribute and the use of ordinal vs. cardinal numbers.</font></p>
-<h3><b><font size="3">Emoji data</font></b></h3>
-<p>The emoji-related data in CLDR 30 is based on a draft version of emoji 4.0 data, which may change before it is finalized.</p>
-<h3>Emoji annotation short names</h3>
-<p>The process described in LDML 30 for synthesizing short names of emoji sequences may be updated; if so, details will be provided here.</p>
-<h2>Key</h2>
-
-<div>
-<ul><li>The Release Note contains a general description of the contents of the release, and any relevant notes about the release.</li>
-<li>The Data link points to a set of zip files containing the contents of the release (the files are complete in themselves, and do not require files from earlier releases -- for the structure of the zip file, see <a href="http://cldr.unicode.org/index/downloads#Repository_Organization" rel="nofollow">Repository Organization</a>).</li>
-<li>The Spec is the version of <a href="http://www.unicode.org/reports/tr35/" rel="nofollow">UTS #35: LDML</a> that corresponds to the release.</li>
-<li>The Delta document points to a list of all the bug fixes and features in the release, which be used to get the precise corresponding file changes using <a href="http://unicode.org/cgi-bin/bugdiffs.pl" rel="nofollow">BugDiffs</a>.</li>
-<li>The SVN Tag can be used to get the files via <a href="http://cldr.unicode.org/index/downloads#latest_draft_version" rel="nofollow">Repository Access</a>.</li>
-<li><i>For more details see <a href="https://sites.google.com/site/cldr/index/downloads" rel="nofollow">CLDR Releases (Downloads)</a>.</i></li></ul>
-
-</div>
-
-<hr>
-<div>
-<div>The Unicode <a href="http://unicode.org/copyright.html" rel="nofollow">Terms of Use</a> apply to CLDR data; in particular, see <a href="http://unicode.org/copyright.html#Exhibit1" rel="nofollow">Exhibit 1</a>.</div>
-<div><br>
-</div>
-<div>For web pages with different views of CLDR data, see <a href="http://cldr.unicode.org/index/charts" rel="nofollow">http://cldr.unicode.org/index/charts</a>.</div>
-</div>
-</div>
-</div>
-</div>
-</html>
\ No newline at end of file
diff --git a/tools/build.xml b/tools/build.xml
index 74d23c0..91cfa67 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -1,7 +1,7 @@
<project name="CLDR Distribution" default="all" basedir=".">
<target name="init">
<tstamp/>
- <property name="version" value="36.1"/>
+ <property name="version" value="37.0"/>
<property name="dist.dir" value="dist"/>
<property name="dist.conf.dir" value="dist.conf"/>
<property name="excludes.file" value="${dist.conf.dir}/distExcludes.txt"/>
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/AllTests.java b/tools/cldr-unittest/src/org/unicode/cldr/api/AllTests.java
index 6e632cc..2d7a2d6 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/api/AllTests.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/AllTests.java
@@ -1,17 +1,19 @@
package org.unicode.cldr.api;
-import com.google.common.collect.ImmutableList;
-import com.ibm.icu.dev.test.TestFmwk.TestGroup;
+import static com.google.common.collect.ImmutableList.toImmutableList;
import java.io.PrintWriter;
-import static com.google.common.collect.ImmutableList.toImmutableList;
+import com.google.common.collect.ImmutableList;
+import com.ibm.icu.dev.test.TestFmwk.TestGroup;
public class AllTests extends TestGroup {
private static final ImmutableList<Class<?>> TEST_CLASSES = ImmutableList.of(
CldrFileDataSourceTest.class,
CldrPathTest.class,
CldrValueTest.class,
+ FilteredDataTest.class,
+ PathMatcherTest.class,
PrefixVisitorTest.class,
XmlDataSourceTest.class);
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/CldrFileDataSourceTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/CldrFileDataSourceTest.java
index db639b1..c549721 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/api/CldrFileDataSourceTest.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/CldrFileDataSourceTest.java
@@ -1,9 +1,7 @@
package org.unicode.cldr.api;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-import com.ibm.icu.dev.test.TestFmwk;
-import org.unicode.cldr.util.CLDRConfig;
+import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
+import static org.unicode.cldr.api.CldrData.PathOrder.DTD;
import java.util.ArrayList;
import java.util.Comparator;
@@ -12,8 +10,11 @@
import java.util.Map;
import java.util.Set;
-import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
-import static org.unicode.cldr.api.CldrData.PathOrder.DTD;
+import org.unicode.cldr.util.CLDRConfig;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.ibm.icu.dev.test.TestFmwk;
public class CldrFileDataSourceTest extends TestFmwk {
// The config knows if it's being run as part of a test. This is NOT immutable (but this test
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/CldrPathTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/CldrPathTest.java
index 6415e0c..8841093 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/api/CldrPathTest.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/CldrPathTest.java
@@ -1,12 +1,12 @@
package org.unicode.cldr.api;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.ibm.icu.dev.test.TestFmwk;
+import static com.google.common.collect.ImmutableList.toImmutableList;
import java.util.Comparator;
-import static com.google.common.collect.ImmutableList.toImmutableList;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.ibm.icu.dev.test.TestFmwk;
/**
* Tests for the core CLDR path representation. Since this is an immutable value type, the tests
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/FilteredDataTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/FilteredDataTest.java
new file mode 100644
index 0000000..1b795c5
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/FilteredDataTest.java
@@ -0,0 +1,101 @@
+// © 2019 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+package org.unicode.cldr.api;
+
+import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
+import com.ibm.icu.dev.test.TestFmwk;
+
+public class FilteredDataTest extends TestFmwk {
+ public void TestSimple() {
+ CldrValue keep =
+ ldml("numbers/currencies/currency[@type=\"USD\"]/displayName", "US Dollar");
+ CldrValue remove =
+ ldml("numbers/currencies/currency[@type=\"USD\"]/symbol", "US$");
+ CldrValue replace =
+ ldml("units/durationUnit[@type=\"foo\"]/durationUnitPattern", "YYY");
+ CldrValue replacement =
+ ldml("units/durationUnit[@type=\"foo\"]/durationUnitPattern", "ZZZ");
+
+ CldrData src = CldrDataSupplier.forValues(ImmutableList.of(keep, remove, replace));
+ CldrData filtered = new FilteredData(src) {
+ @Override protected CldrValue filter(CldrValue value) {
+ if (value.equals(remove)) {
+ return null;
+ } else if (value.equals(replace)) {
+ return replacement;
+ } else {
+ return value;
+ }
+ }
+ };
+
+ List<CldrValue> filteredValues = new ArrayList<>();
+ filtered.accept(ARBITRARY, filteredValues::add);
+ assertEquals("filtered values", filteredValues, Arrays.asList(keep, replacement));
+
+ assertNull("removed value is null", filtered.get(remove.getPath()));
+ assertEquals("keep is unchanged", filtered.get(keep.getPath()), keep);
+ assertEquals("filtered is replaced", filtered.get(replace.getPath()), replacement);
+ }
+
+ public void TestBadReplacementPath() {
+ CldrValue replace =
+ ldml("numbers/currencies/currency[@type=\"USD\"]/displayName", "VALUE");
+ CldrValue replacement =
+ ldml("numbers/currencies/currency[@type=\"USD\"]/symbol", "VALUE");
+
+ CldrData src = CldrDataSupplier.forValues(ImmutableList.of(replace));
+ CldrData filtered = new FilteredData(src) {
+ @Override protected CldrValue filter(CldrValue value) {
+ return replacement;
+ }
+ };
+ try {
+ filtered.accept(ARBITRARY, v -> {});
+ fail("expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ assertErrorMessageContains(e, "not permitted to modify distinguishing paths");
+ assertErrorMessageContains(e, replace.toString());
+ assertErrorMessageContains(e, replacement.toString());
+ }
+ }
+
+ public void TestBadReplacementAttributes() {
+ CldrValue replace =
+ ldml("numbers/currencies/currency[@type=\"USD\"]/displayName", "XXX");
+ CldrValue replacement =
+ ldml("numbers/currencies/currency[@type=\"GBP\"]/displayName", "XXX");
+
+ CldrData src = CldrDataSupplier.forValues(ImmutableList.of(replace));
+ CldrData filtered = new FilteredData(src) {
+ @Override protected CldrValue filter(CldrValue value) {
+ return replacement;
+ }
+ };
+ try {
+ filtered.accept(ARBITRARY, v -> {});
+ fail("expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ assertErrorMessageContains(e, "not permitted to modify distinguishing paths");
+ assertErrorMessageContains(e, replace.toString());
+ assertErrorMessageContains(e, replacement.toString());
+ }
+ }
+
+ private static CldrValue ldml(String path, String value) {
+ return CldrValue.parseValue("//ldml/" + path, value);
+ }
+
+ private void assertErrorMessageContains(Throwable e, String expected) {
+ // This test "framework" is such a limited API it encourages brittle assertions.
+ assertTrue(
+ "error message \"" + e.getMessage() + "\" contains \"" + expected + "\"",
+ e.getMessage().contains(expected));
+ }
+}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/PathMatcherTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/PathMatcherTest.java
new file mode 100644
index 0000000..82cbe56
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/PathMatcherTest.java
@@ -0,0 +1,115 @@
+// © 2019 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+package org.unicode.cldr.api;
+
+import static java.util.stream.Collectors.toList;
+import static org.unicode.cldr.api.CldrPath.parseDistinguishingPath;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ibm.icu.dev.test.TestFmwk;
+
+public class PathMatcherTest extends TestFmwk {
+ public void TestMatcher() {
+ CldrPath calEra = parseDistinguishingPath(
+ "//ldml/dates/calendars/calendar[@type=\"buddhist\"]/eras/eraAbbr/era[@type=\"0\"]");
+ CldrPath chineseMon1 = monthInfo("chinese", "format", "abbreviated", 1);
+ CldrPath chineseMon2 = monthInfo("chinese", "format", "abbreviated", 2);
+ CldrPath genericMon1 = monthInfo("generic", "stand-alone", "narrow", 1);
+ CldrPath genericMon2 = monthInfo("generic", "stand-alone", "narrow", 2);
+ List<CldrPath> calPaths =
+ Arrays.asList(calEra, chineseMon1, chineseMon2, genericMon1, genericMon2);
+
+ PathMatcher calendarPrefix = PathMatcher.of("//ldml/dates/calendars/calendar[@type=*]");
+ assertTrue("is prefix match", calPaths.stream().allMatch(calendarPrefix::matchesPrefixOf));
+ assertTrue("not full match", calPaths.stream().noneMatch(calendarPrefix::matches));
+
+ PathMatcher chineseCalendars =
+ PathMatcher.of("//ldml/dates/calendars/calendar[@type=\"chinese\"]");
+ assertEquals("chinese data",
+ calPaths.stream().filter(chineseCalendars::matchesPrefixOf).collect(toList()),
+ Arrays.asList(chineseMon1, chineseMon2));
+
+ PathMatcher anyMonth = calendarPrefix
+ .withSuffix("months/monthContext[@type=*]/monthWidth[@type=*]/month[@type=*]");
+ assertEquals("any month",
+ calPaths.stream().filter(anyMonth::matches).collect(toList()),
+ Arrays.asList(chineseMon1, chineseMon2, genericMon1, genericMon2));
+
+ PathMatcher narrowMonth = calendarPrefix
+ .withSuffix("months/monthContext[@type=*]/monthWidth[@type=\"narrow\"]/month[@type=*]");
+ assertEquals("narrow month",
+ calPaths.stream().filter(narrowMonth::matches).collect(toList()),
+ Arrays.asList(genericMon1, genericMon2));
+
+ PathMatcher firstMonth = calendarPrefix
+ .withSuffix("months/monthContext[@type=*]/monthWidth[@type=*]/month[@type=\"1\"]");
+ assertEquals("narrow month",
+ calPaths.stream().filter(firstMonth::matches).collect(toList()),
+ Arrays.asList(chineseMon1, genericMon1));
+
+ PathMatcher fullMatch = PathMatcher.of("//ldml/dates"
+ + "/calendars/calendar[@type=\"generic\"]"
+ + "/months/monthContext[@type=\"stand-alone\"]"
+ + "/monthWidth[@type=\"narrow\"]"
+ + "/month[@type=\"2\"]");
+ assertEquals("full match",
+ calPaths.stream().filter(fullMatch::matches).collect(toList()),
+ Arrays.asList(genericMon2));
+ }
+
+ public void TestWildcardSegment() {
+ PathMatcher wildcard = PathMatcher.of("//ldml/dates"
+ + "/calendars/calendar[@type=\"generic\"]"
+ + "/*/*[@type=\"format\"]/*[@type=\"narrow\"]/*[@type=*]");
+
+ assertTrue("", wildcard.matches(monthInfo("generic", "format", "narrow", 1)));
+ assertTrue("", wildcard.matches(monthInfo("generic", "format", "narrow", 9)));
+ assertTrue("", wildcard.matches(dayInfo("generic", "format", "narrow", "sun")));
+
+ assertFalse("", wildcard.matches(monthInfo("chinese", "format", "narrow", 1)));
+ assertFalse("", wildcard.matches(monthInfo("generic", "stand-alone", "narrow", 1)));
+ assertFalse("", wildcard.matches(dayInfo("generic", "format", "wide", "mon")));
+ }
+
+ public void TestBadSpecifiers() {
+ assertInvalidPathSpecification("");
+ // Leading and trailing '/' are not permitted (they imply empty segments.
+ assertInvalidPathSpecification("/foo/");
+ assertInvalidPathSpecification("foo//bar");
+ assertInvalidPathSpecification("foo/bad segment name");
+ assertInvalidPathSpecification("foo/bar[type=*]");
+ assertInvalidPathSpecification("foo/bar[@type=**]");
+ assertInvalidPathSpecification("foo/bar[@type='double-quotes-only']");
+ }
+
+ private void assertInvalidPathSpecification(String spec) {
+ try {
+ PathMatcher.of(spec);
+ fail("expected IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ assertTrue("invalid spec: " + spec,
+ e.getMessage().startsWith("invalid path pattern")
+ && e.getMessage().contains(spec));
+ }
+ }
+
+ private static CldrPath monthInfo(String type, String context, String width, int number) {
+ return CldrPath.parseDistinguishingPath(String.format(
+ "//ldml/dates/calendars/calendar[@type=\"%s\"]"
+ + "/months/monthContext[@type=\"%s\"]"
+ + "/monthWidth[@type=\"%s\"]"
+ + "/month[@type=\"%d\"]",
+ type, context, width, number));
+ }
+
+ private static CldrPath dayInfo(String type, String context, String width, String id) {
+ return CldrPath.parseDistinguishingPath(String.format(
+ "//ldml/dates/calendars/calendar[@type=\"%s\"]"
+ + "/days/dayContext[@type=\"%s\"]"
+ + "/dayWidth[@type=\"%s\"]"
+ + "/day[@type=\"%s\"]",
+ type, context, width, id));
+ }
+}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/PrefixVisitorTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/PrefixVisitorTest.java
index 2c51972..73983a6 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/api/PrefixVisitorTest.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/PrefixVisitorTest.java
@@ -1,18 +1,16 @@
package org.unicode.cldr.api;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.ibm.icu.dev.test.TestFmwk;
-import org.unicode.cldr.api.CldrData.PrefixVisitor;
-
-import java.util.ArrayList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
import static org.unicode.cldr.api.CldrData.PathOrder.DTD;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.unicode.cldr.api.CldrData.PrefixVisitor;
+
+import com.google.common.collect.ImmutableList;
+import com.ibm.icu.dev.test.TestFmwk;
+
/**
* Tests for the code which converts a sequence of path/value pairs into a nested sequence of path
* prefixes (this is necessary when using prefix visitors for data obtained via CLDRFile).
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/api/XmlDataSourceTest.java b/tools/cldr-unittest/src/org/unicode/cldr/api/XmlDataSourceTest.java
index 897e87d..5e66bd6 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/api/XmlDataSourceTest.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/api/XmlDataSourceTest.java
@@ -1,17 +1,14 @@
package org.unicode.cldr.api;
-import com.google.common.base.Joiner;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ListMultimap;
-import com.ibm.icu.dev.test.TestFmwk;
+import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
+import static org.unicode.cldr.api.CldrData.PathOrder.DTD;
+import static org.unicode.cldr.api.CldrData.PathOrder.NESTED_GROUPING;
+import static org.unicode.cldr.api.CldrDataType.BCP47;
+import static org.unicode.cldr.api.CldrDataType.SUPPLEMENTAL;
+import static org.unicode.cldr.api.CldrDraftStatus.UNCONFIRMED;
-import java.io.File;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
@@ -19,12 +16,11 @@
import java.util.Map;
import java.util.function.Function;
-import static org.unicode.cldr.api.CldrData.PathOrder.ARBITRARY;
-import static org.unicode.cldr.api.CldrData.PathOrder.DTD;
-import static org.unicode.cldr.api.CldrData.PathOrder.NESTED_GROUPING;
-import static org.unicode.cldr.api.CldrDataType.BCP47;
-import static org.unicode.cldr.api.CldrDataType.SUPPLEMENTAL;
-import static org.unicode.cldr.api.CldrDraftStatus.UNCONFIRMED;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.ibm.icu.dev.test.TestFmwk;
/**
* Tests XML file parsing and path/value generation. These focus on end-to-end parsing of fake data
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/ExternalUnitConversionData.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/ExternalUnitConversionData.java
new file mode 100644
index 0000000..741106e
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/ExternalUnitConversionData.java
@@ -0,0 +1,178 @@
+package org.unicode.cldr.unittest;
+
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.unicode.cldr.util.Rational;
+import org.unicode.cldr.util.UnitConverter.ConversionInfo;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Multimap;
+
+final class ExternalUnitConversionData {
+ static final Pattern footnotes = Pattern.compile(" \\d+$");
+ static final Pattern firstPart = Pattern.compile("([^\\[(,]*)(.*)");
+ static final Pattern temperature = Pattern.compile("\\((\\d+)(?:\\.(\\d+))? °([CF])\\)");
+ static final Pattern addHyphens = Pattern.compile("[- ]+");
+
+ // first source is https://www.nist.gov/pml/special-publication-811/nist-guide-si-appendix-b-conversion-factors/nist-guide-si-appendix-b9
+ public final String quantity;
+ public final String source;
+ public final String target;
+ public final ConversionInfo info;
+ public final String line;
+
+ public ExternalUnitConversionData(String quantity, String source, String target, Rational factor, String line, Multimap<String,String> changes) {
+ super();
+ this.quantity = quantity;
+
+
+ LinkedHashSet<String> sourceChanges = new LinkedHashSet<>();
+ this.source = extractUnit(quantity, source, sourceChanges);
+ changes.putAll(source, sourceChanges);
+
+ LinkedHashSet<String> targetChanges = new LinkedHashSet<>();
+ this.target = extractUnit(quantity, target, targetChanges);
+ changes.putAll(target, targetChanges);
+
+ Rational offset = temperatureHack.get(this.source + "|" + this.target);
+ this.info = new ConversionInfo(factor, offset == null ? Rational.ZERO : offset);
+ this.line = line;
+ }
+
+ // HACK for temperature
+ /**
+ degree Celsius (°C) kelvin (K) T/K = t/°C + 273.15
+ degree centigrade 15 degree Celsius (°C) t/°C ≈ t/deg. cent.
+ degree Fahrenheit (°F) degree Celsius (°C) t/°C = (t/°F - 32)/1.8
+ degree Fahrenheit (°F) kelvin (K) T/K = (t/°F + 459.67)/1.8
+ degree Rankine (°R) kelvin (K) T/K = (T/°R)/1.8
+ kelvin (K) degree Celsius (°C) t/°C = T/K - 273.15
+ */
+ static final Map<String,Rational> temperatureHack = ImmutableMap.of(
+ "fahrenheit|celsius", Rational.of("-32/1.8"),
+ "fahrenheit|kelvin", Rational.of("459.67/1.8"),
+ "celsius|kelvin", Rational.of("273.15")
+ );
+
+
+ private String extractUnit(String quantity, String source, Set<String> changes) {
+ // drop footnotes
+ source = replace(footnotes, source, "", changes);
+
+ if (source.contains("(15 °C)")) {
+ int debug = 0;
+ }
+ source = replace(temperature, source, " $1$2$3", changes);
+
+ String oldSource = source;
+ source = source.replace("(sidereal)", "sidereal");
+ source = source.replace("(mean)", "mean");
+ source = source.replace("(printer's)", "printer");
+
+ source = source.replace("therm (U.S.)", "therm-us");
+ source = source.replace("(U.S.)", "");
+
+ source = source.replace("(long, 112 lb)", " long");
+ source = source.replace("(troy or apothecary)", "troy");
+ source = source.replace("(U.S. survey)", "survey");
+ source = source.replace("(tropical)", "tropical");
+ source = source.replace("(based on U.S. survey foot)", "survey");
+ source = source.replace("(avoirdupois)", "");
+ source = source.replace("(metric)", "metric");
+ source = source.replace("(electric)", "electric");
+ source = source.replace("(water)", "water");
+ source = source.replace("(boiler)", "boiler");
+ source = source.replace("(0.001 in)", "inch");
+ source = source.replace("(365 days)", "365");
+
+ source = source.replace("(U.K.)", "imperial");
+ source = source.replace("[Canadian and U.K. (Imperial)]", "imperial");
+ source = source.replace("[Canadian and U.K. fluid (Imperial)]", "fluid imperial");
+
+ source = source.replace("second squared", "square second");
+ source = source.replace("foot squared", "square foot");
+ source = source.replace("meter squared", "square meter");
+ source = source.replace("inch squared", "square inch");
+
+ source = source.replace("mile, nautical", "nautical-mile");
+ source = source.replace(", technical", " technical");
+ source = source.replace(", kilogram (nutrition)", " nutrition");
+ source = source.replace("(nutrition)", "nutrition");
+ source = source.replace(", metric", " metric");
+ source = source.replace(", assay", " assay");
+ source = source.replace(", long", " long");
+ source = source.replace(", register", " register");
+
+ source = source.replace("foot to the fourth power", "pow4-foot");
+ source = source.replace("inch to the fourth power", "pow4-inch");
+ source = source.replace("meter to the fourth power", "pow4-meter");
+
+ source = replaceWhole(oldSource, source, changes);
+
+ final Matcher match = firstPart.matcher(source);
+ match.matches();
+ String newSource = match.group(1).trim();
+ source = replaceWhole(source, newSource, changes);
+
+ String remainder = match.group(2);
+ if (remainder.contains("dry")) {
+ source = replaceWhole(source, source + " dry", changes);
+ } else if (remainder.contains("fluid")) {
+ source = replaceWhole(source, source + " fluid", changes);
+ }
+
+ if (source.contains("squared")) {
+ System.out.println("*FIX squared: " + source);
+ }
+
+ oldSource = source;
+
+ source = source.replace("degree ", "");
+ source = source.replace("tonne", "metric-ton");
+ source = source.replace("ton-metric", "metric-ton");
+ source = source.replace("psi", "pound-force-per-square-inch");
+ source = source.replace("ounce fluid", "fluid-ounce");
+ source = source.replace("unitthi", "unit");
+ source = source.replace("calorieth", "calorie");
+ source = source.replace("acceleration of free fall", "g-force");
+ source = source.replace("of mercury", "ofhg");
+ if (quantity.equals("ANGLE")) {
+ source = source.replace("minute", "arc-minute");
+ source = source.replace("second", "arc-second");
+ }
+ source = source.replace("British thermal unitth", "british thermal unit");
+
+ source = replaceWhole(oldSource, source, changes);
+
+ // don't record these
+ source = source.toLowerCase(Locale.ROOT);
+ source = addHyphens.matcher(source.trim()).replaceAll("-");
+
+ return source;
+ }
+
+ private String replaceWhole(String source, String newSource, Set<String> changes) {
+ if (!newSource.equals(source)) {
+ changes.add(" ⟹ " + newSource);
+ }
+ return newSource;
+ }
+
+ private String replace(Pattern pattern, String source, String replacement, Set<String> changes) {
+ String newSource = pattern.matcher(source).replaceAll(replacement);
+ if (!newSource.equals(source)) {
+ changes.add(" ⟹ " + newSource);
+ }
+ return newSource;
+ }
+
+ @Override
+ public String toString() {
+ return quantity + "\t" + source + "\t" + target + "\t" + info + "\t«" + line + "»";
+ }
+}
\ No newline at end of file
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/NistUnits.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/NistUnits.java
new file mode 100644
index 0000000..cdd3c6b
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/NistUnits.java
@@ -0,0 +1,192 @@
+package org.unicode.cldr.unittest;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.Rational;
+import org.unicode.cldr.util.UnitConverter.ConversionInfo;
+import org.unicode.cldr.util.UnitConverter.TargetInfo;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
+import com.ibm.icu.util.ICUUncheckedIOException;
+
+final class NistUnits {
+ final static Multimap<String,String> unitToQuantity;
+ final static Map<String, TargetInfo> derivedUnitToConversion;
+ final static List<ExternalUnitConversionData> externalConversionData;
+ final static Multimap<String, String> idChanges;
+ final static Set<String> skipping;
+
+ static final Splitter SPLIT_MIDDOT = Splitter.on('·').trimResults();
+ static final Pattern flatExponent = Pattern.compile("([a-zA-Z]+)(-?[0-9]+)?");
+ static final Splitter SPLIT_TABS = Splitter.on('\t').trimResults();
+ static final Splitter SPLIT_COMMAS = Splitter.on(',').trimResults();
+ static final Splitter SPLIT_PARENS = Splitter.on('(').trimResults();
+
+
+ static {
+ try {
+ Multimap<String, String> _idChanges = LinkedHashMultimap.create();
+ Set<String> _skipping = new LinkedHashSet<>();
+
+ List<ExternalUnitConversionData> _externalConversionData = new ArrayList<>();
+ try (BufferedReader in = CldrUtility.getUTF8Data("external/nistConversions.txt")) {
+ String quantity = null;
+ try (Stream<String> s = in.lines()) {
+ for (String line : (Iterable<String>) s::iterator) {
+ if (line.startsWith("#")
+ || line.equals("To convert from\tto\tMultiply by")
+ || line.startsWith("degree Fahrenheit hour square foot per British thermal unitth inch") // bad NIST data
+ ) {
+ continue;
+ }
+ List<String> parts = SPLIT_TABS.splitToList(line);
+ switch(parts.size()) {
+ case 1:
+ quantity = parts.get(0);
+ break;
+ case 4:
+ Rational factor = Rational.of((parts.get(2) + parts.get(3)).replace(" ", ""));
+ ExternalUnitConversionData data = new ExternalUnitConversionData(quantity, parts.get(0), parts.get(1), factor, line, _idChanges);
+ _externalConversionData.add(data);
+ break;
+ default:
+ _skipping.add(line);
+ }
+ }
+ }
+ }
+
+ Map<String, TargetInfo> unitToTargetInfo = new TreeMap<>();
+ Map<String,String> _symbolToUnit = new TreeMap<>();
+ Multimap<String,String> _unitToQuantity = TreeMultimap.create();
+ try (BufferedReader in = CldrUtility.getUTF8Data("external/nistBaseUnits.txt")) {
+ try (Stream<String> s = in.lines()) {
+ for (String line : (Iterable<String>) s::iterator) {
+ if (line.startsWith("#")) {
+ continue;
+ }
+ List<String> parts = SPLIT_TABS.splitToList(line);
+ //#Base quantity Name Symbol
+ String quantity2 = parts.get(0);
+ String name = parts.get(1);
+ String symbol = parts.get(2);
+ switch(parts.size()) {
+ case 3:
+ _symbolToUnit.put(symbol, name);
+ _unitToQuantity.put(name, quantity2);
+ break;
+ }
+ }
+ }
+ }
+
+ try (BufferedReader in = CldrUtility.getUTF8Data("external/nistDerivedUnits.txt")) {
+ try (Stream<String> s = in.lines()) {
+ for (String line : (Iterable<String>) s::iterator) {
+ if (line.startsWith("#")) {
+ continue;
+ }
+ List<String> parts = SPLIT_TABS.splitToList(line);
+ // #Quantity Special Name Special symbol Expression in terms of other SI units Expression in terms of SI base units
+
+ String quantity = parts.get(0);
+ List<String> quantities = SPLIT_COMMAS.splitToList(quantity).stream()
+ .map(x -> SPLIT_PARENS.split(parts.get(0)).iterator().next())
+ .collect(Collectors.toList());
+ quantity = Joiner.on(", ").join(quantities);
+
+ String name = SPLIT_PARENS.split(parts.get(1)).iterator().next();
+ if (name.equals("degree Celsius")) {
+ name = "celsius";
+ }
+
+ String symbol = parts.get(2);
+ String expressionInOtherSymbols = parts.get(4);
+ String expressionInBaseSymbols = parts.get(4);
+ _symbolToUnit.put(symbol, name);
+ _unitToQuantity.putAll(name, quantities);
+
+ final String targetUnit = getUnitFromSymbols(expressionInBaseSymbols, _symbolToUnit);
+ unitToTargetInfo.put(name, new TargetInfo(targetUnit, new ConversionInfo(Rational.ONE, Rational.ZERO), Collections.emptyMap()));
+
+ ExternalUnitConversionData data = new ExternalUnitConversionData(quantity, name, targetUnit, Rational.ONE, line, _idChanges);
+ _externalConversionData.add(data);
+
+ }
+ }
+ }
+
+ // Protect everything
+
+ skipping = ImmutableSet.copyOf(_skipping);
+ idChanges = ImmutableMultimap.copyOf(_idChanges);
+ externalConversionData = ImmutableList.copyOf(_externalConversionData);
+ unitToQuantity = ImmutableMultimap.copyOf(_unitToQuantity);
+ derivedUnitToConversion = ImmutableMap.copyOf(unitToTargetInfo);
+ } catch (IOException e) {
+ throw new ICUUncheckedIOException(e);
+ }
+ }
+
+ public static String getUnitFromSymbols(String expressionInBaseSymbols, Map<String, String> symbolToUnit) {
+ // handle the irregualar formats
+ if (expressionInBaseSymbols.equals("m/m")) {
+ return "meter-per-meter";
+ } else if (expressionInBaseSymbols.equals("m2/m2")) {
+ return "square-meter-per-square-meter";
+ }
+ // m2 · kg · s-3 · A-1
+ StringBuilder numerator = new StringBuilder();
+ StringBuilder denominator = new StringBuilder();
+ for (String part : SPLIT_MIDDOT.split(expressionInBaseSymbols)) {
+ final Matcher parts = flatExponent.matcher(part);
+ if (!parts.matches()) {
+ throw new IllegalArgumentException("bad symbol: " + part);
+ }
+ String unit = symbolToUnit.get(parts.group(1));
+ String pow = null;
+ int power = 0;
+ final String exponent = parts.group(2);
+ if (exponent != null) {
+ power = Integer.parseInt(exponent);
+ switch(Math.abs(power)) {
+ case 0: case 1: break;// skip
+ case 2: pow = "square-"; break;
+ case 3: pow = "cubic-"; break;
+ default: pow = "pow" + Math.abs(power) + "-"; break;
+ }
+ }
+ StringBuilder target = power >= 0 ? numerator : denominator;
+ if (target.length() != 0) {
+ target.append('-');
+ }
+ if (pow != null) {
+ target.append(pow);
+ }
+ target.append(unit);
+ }
+ return (numerator.length() == 0 ? "1" : numerator) + (denominator.length() == 0 ? "" : "-per-" + denominator);
+ }
+
+}
\ No newline at end of file
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAll.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAll.java
index e23e92b..476cb43 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAll.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAll.java
@@ -225,6 +225,7 @@
"org.unicode.cldr.unittest.TestDtdData",
"org.unicode.cldr.unittest.TestCldrFactory",
"org.unicode.cldr.unittest.TestUnContainment",
+ "org.unicode.cldr.unittest.TestUnits",
// "org.unicode.cldr.unittest.TestCollators" See Ticket #8288
"org.unicode.cldr.api.AllTests",
},
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAlt.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAlt.java
index 87dda13..3592e31 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAlt.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAlt.java
@@ -9,6 +9,7 @@
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CLDRFile.Status;
import org.unicode.cldr.util.Factory;
import org.unicode.cldr.util.PathStarrer;
import org.unicode.cldr.util.XPathParts;
@@ -19,6 +20,7 @@
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.impl.Row;
import com.ibm.icu.impl.Row.R4;
+import com.ibm.icu.util.Output;
public class TestAlt extends TestFmwk {
private static final Set<String> SINGLETON_ALT = Collections.singleton("alt");
@@ -71,4 +73,31 @@
System.out.println(entry.getKey() + "\t" + CollectionUtilities.join(entry.getValue(), "\t"));
}
}
+
+ public void testAlt() {
+ Output<String> pathWhereFound = new Output<String>();
+ Output<String> localeWhereFound = new Output<String>();
+
+ CLDRFile testCldrFile = CLDRConfig.getInstance().getCLDRFile("fr_CA", true);
+ String plain = "//ldml/localeDisplayNames/languages/language[@type=\"af\"]";
+
+ String expected = testCldrFile.getStringValue(plain);
+ String altMedium = "[@alt=\"medium\"]";
+
+ String actual = testCldrFile.getStringValue(plain+altMedium);
+ assertEquals(plain+altMedium, expected, actual);
+ Status status = new Status();
+ localeWhereFound.value = testCldrFile.getSourceLocaleID(plain+altMedium, status);
+ pathWhereFound.value = status.pathWhereFound;
+ assertEquals("Regular, pathWhereFound", plain, pathWhereFound.value);
+ assertEquals("Regular, localeWhereFound", "fr_CA", localeWhereFound.value);
+
+ String actualBailey = testCldrFile.getConstructedBaileyValue(plain+altMedium, pathWhereFound, localeWhereFound);
+ assertEquals("Bailey, " + plain+altMedium, expected, actualBailey);
+
+ assertEquals("Bailey, pathWhereFound", plain, pathWhereFound.value);
+ assertEquals("Bailey, localeWhereFound", "fr_CA", localeWhereFound.value);
+
+ //TODO check constructed
+ }
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAnnotations.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAnnotations.java
index 88fe00e..b7af13e 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAnnotations.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAnnotations.java
@@ -6,6 +6,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
@@ -23,6 +24,7 @@
import org.unicode.cldr.util.CldrUtility;
import org.unicode.cldr.util.Emoji;
import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.PathHeader.PageId;
import org.unicode.cldr.util.SimpleFactory;
import org.unicode.cldr.util.XListFormatter;
import org.unicode.cldr.util.XListFormatter.ListTypeLength;
@@ -36,10 +38,16 @@
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.dev.util.UnicodeMap;
import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.Row;
+import com.ibm.icu.impl.Row.R3;
+import com.ibm.icu.impl.Row.R4;
import com.ibm.icu.impl.Utility;
+import com.ibm.icu.text.Collator;
import com.ibm.icu.text.UnicodeSet;
public class TestAnnotations extends TestFmwkPlus {
+ private static final boolean DEBUG = false;
+
private static final boolean SHOW_LIST = false;
private static final boolean SHOW_ENGLISH = false;
@@ -106,8 +114,9 @@
}
}
+ final AnnotationSet eng = Annotations.getDataSet("en");
+
public void TestNames() {
- AnnotationSet eng = Annotations.getDataSet("en");
String[][] tests = { // the expected value for keywords can use , as well as |.
{"👨🏻", "man: light skin tone", "adult | man | light skin tone"},
{"👱♂️", "man: blond hair", "blond, blond-haired man, hair, man, man: blond hair"},
@@ -168,28 +177,63 @@
}
}
-
+ static final UnicodeSet symbols = new UnicodeSet(Emoji.EXTRA_SYMBOL_MINOR_CATEGORIES.keySet())
+ .freeze();
/** The English name should line up with the emoji-test.txt file */
public void TestNamesVsEmojiData() {
- AnnotationSet eng = Annotations.getDataSet("en");
for (Entry<String, Annotations> s : eng.getExplicitValues().entrySet()) {
String emoji = s.getKey();
Annotations annotations = s.getValue();
String name = Emoji.getName(emoji);
String annotationName = annotations.getShortName();
- if (!emoji.contains("👲")) {
+ if (!symbols.contains(emoji) && !emoji.contains("👲")) {
assertEquals(emoji, name, annotationName);
}
}
}
+
+ public void TestCategories() {
+ if (DEBUG) System.out.println();
- // comment this out, since we now have console check for this.
+ TreeSet<R4<PageId, Long, String, R3<String, String, String>>> sorted = new TreeSet<>();
+ for (Entry<String, Annotations> s : eng.getExplicitValues().entrySet()) {
+ String emoji = s.getKey();
+ Annotations annotations = s.getValue();
+ final String rawCategory = Emoji.getMajorCategory(emoji);
+ PageId majorCategory = PageId.forString(rawCategory);
+ if (majorCategory == PageId.Symbols) {
+ majorCategory = PageId.Symbols2;
+ }
+ String minorCategory = Emoji.getMinorCategory(emoji);
+ long emojiOrder = Emoji.getEmojiToOrder(emoji);
+ R3<String, String, String> row2 = Row.of(emoji, annotations.getShortName(), CollectionUtilities.join(annotations.getKeywords(), " | "));
+ R4<PageId, Long, String, R3<String, String, String>> row = Row.of(majorCategory, emojiOrder, minorCategory, row2);
+ sorted.add(row);
+ }
+ for (R4<PageId, Long, String, R3<String, String, String>> row : sorted) {
+ PageId majorCategory = row.get0();
+ Long emojiOrder = row.get1();
+ String minorCategory = row.get2();
+ R3<String, String, String> row2 = row.get3();
+ String emoji = row2.get0();
+ String shortName = row2.get1();
+ String keywords = row2.get2();
+ if (DEBUG) System.out.println(majorCategory
+ + "\t" + emojiOrder
+ + "\t" + minorCategory
+ + "\t" + emoji
+ + "\t" + shortName
+ + "\t" + keywords
+ );
+ }
+ }
+
public void TestUniqueness() {
// if (logKnownIssue("cldrbug:10104", "Disable until the uniqueness problems are fixed")) {
// return;
// }
Set<String> locales = new TreeSet<>();
-
+
locales.add("en");
locales.addAll(Annotations.getAvailable());
locales.remove("root");
@@ -200,7 +244,6 @@
Multimap<String, String> localeToNameToEmoji = TreeMultimap.create();
Multimap<String, String> nameToEmoji = TreeMultimap.create();
UnicodeMap<Annotations> english = Annotations.getData("en");
- AnnotationSet englishSet = Annotations.getDataSet("en");
UnicodeSet englishKeys = getCurrent(english.keySet());
Map<String, UnicodeSet> localeToMissing = new TreeMap<>();
@@ -235,7 +278,7 @@
String locale = entry.getKey();
String emoji = entry.getValue();
System.out.println(locale
- + "\t" + englishSet.getShortName(emoji)
+ + "\t" + eng.getShortName(emoji)
+ "\t" + emoji);
}
}
@@ -247,10 +290,10 @@
for (String emoji : entry.getValue()) {
System.out.println(locale
+ "\t" + emoji
- + "\t" + englishSet.getShortName(emoji)
+ + "\t" + eng.getShortName(emoji)
+ "\t" + "=GOOGLETRANSLATE(C" + count + ",\"en\",A" + count + ")"
- // =GOOGLETRANSLATE(C2,"en",A2)
- );
+ // =GOOGLETRANSLATE(C2,"en",A2)
+ );
++count;
}
}
@@ -276,7 +319,8 @@
CLDRFile enAnnotations = factoryAnnotations.make(locale, false);
// //ldml/annotations/annotation[@cp="🧜"][@type="tts"]
Set<String> annotationPaths = enAnnotations.getPaths("//ldml/anno",
- Pattern.compile("//ldml/annotations/annotation.*tts.*").matcher(""), new TreeSet<>());
+ Pattern.compile("//ldml/annotations/annotation.*tts.*").matcher(""),
+ new TreeSet<>());
Set<String> annotationPathsExpected = Emoji.getNamePaths();
checkAMinusBIsC("(" + locale + ".xml - Emoji.getNamePaths)", annotationPaths, annotationPathsExpected, Collections.<String> emptySet());
checkAMinusBIsC("(Emoji.getNamePaths - " + locale + ".xml)", annotationPathsExpected, annotationPaths, Collections.<String> emptySet());
@@ -289,28 +333,34 @@
String emojiImageDir = CLDRPaths.BASE_DIRECTORY + "/tools/cldr-apps/WebContent/images/emoji";
for (String emoji : Emoji.getNonConstructed()) {
String noVs = emoji.replace(Emoji.EMOJI_VARIANT, "");
-
+
// example: emoji_1f1e7_1f1ec.png
String fileName = "emoji_" + Utility.hex(noVs, 4, "_").toLowerCase(Locale.ENGLISH) + ".png";
File file = new File(emojiImageDir, fileName);
-
+
if (!file.exists()) {
String name = enAnnotations.getStringValue("//ldml/annotations/annotation[@cp=\"" + noVs + "\"][@type=\"tts\"]");
errln(fileName + " missing; " + name);
}
}
}
-
+
/**
- * check that the order info and categories are consistent.
+ * Check that the order info, categories, and collation are consistent.
*/
public void testEmojiOrdering() {
// load an array for sorting
// and test that every order value maps to exactly one emoji
Map<String,String> minorToMajor = new HashMap<>();
- Map<Integer, String> orderToEmoji = new TreeMap<>();
+ Map<Long, String> orderToEmoji = new TreeMap<>();
+ Collator col = CLDRConfig.getInstance().getCollatorRoot();
+
for (String emoji : Emoji.getNonConstructed()) {
- Integer emojiOrder = Emoji.getEmojiToOrder(emoji);
+ Long emojiOrder = Emoji.getEmojiToOrder(emoji);
+ if (DEBUG) {
+ String minor = Emoji.getMinorCategory(emoji);
+ System.out.println(emojiOrder + "\t" + emoji + "\t" + minor);
+ }
String oldEmoji = orderToEmoji.get(emojiOrder);
if (oldEmoji == null) {
orderToEmoji.put(emojiOrder, emoji);
@@ -322,8 +372,27 @@
String lastMajor = "";
Set<String> minorsSoFar = new TreeSet<>();
String lastMinor = "";
- for (Entry<Integer, String> entry : orderToEmoji.entrySet()) {
+ Set<String> lastMajorGroup = new LinkedHashSet<>();
+ Set<String> lastMinorGroup = new LinkedHashSet<>();
+ String lastEmoji = "";
+ long lastEmojiOrdering = -1L;
+ for (Entry<Long, String> entry : orderToEmoji.entrySet()) {
String emoji = entry.getValue();
+ Long emojiOrdering = entry.getKey();
+ // check against collation
+ if (col.compare(emoji, lastEmoji) <= 0) {
+ String name = eng.getShortName(emoji);
+ String lastName = eng.getShortName(lastEmoji);
+ int errorType = ERR;
+ if (logKnownIssue("cldr13660", "slightly out of order")) {
+ errorType = WARN;
+ };
+ msg("Out of order: "
+ + lastEmoji + " (" + lastEmojiOrdering + ") " + lastName
+ + " > "
+ + emoji + " (" + emojiOrdering + ") " + name, errorType, true, true);
+ }
+
String major = Emoji.getMajorCategory(emoji);
String minor = Emoji.getMinorCategory(emoji);
if (isVerbose()) {
@@ -338,21 +407,35 @@
}
// never get major1 < major2 < major1
if (!major.equals(lastMajor)) {
- if (majorsSoFar.contains(major)) {
- errln("Non-contiguous majors: " + major + " <… " + lastMajor + " < " + major);
- }
+ //System.out.println(lastMajor + "\t" + lastMajorGroup);
+
+// if (majorsSoFar.contains(major)) {
+// errln("Non-contiguous majors: " + major + " <… " + lastMajor + " < " + major);
+// }
majorsSoFar.add(major);
lastMajor = major;
+ lastMajorGroup.clear();
+ lastMajorGroup.add(emoji); // add emoji with different cat
+ } else {
+ lastMajorGroup.add(emoji);
}
// never get minor1 < minor2 < minor1
if (!minor.equals(lastMinor)) {
+ if (DEBUG) System.out.println(lastMinor + "\t" + lastMinorGroup);
if (minorsSoFar.contains(minor)) {
errln("Non-contiguous minors: " + minor + " <… " + lastMinor + " < " + minor);
}
minorsSoFar.add(minor);
lastMinor = minor;
+ lastMinorGroup.clear();
+ lastMinorGroup.add(emoji); // add emoji with different cat
+ } else {
+ lastMinorGroup.add(emoji);
}
+ lastEmoji = emoji;
+ lastEmojiOrdering = emojiOrdering;
}
+ if (DEBUG) System.out.println(lastMinor + "\t" + lastMinorGroup);
}
@@ -405,9 +488,15 @@
private void checkAMinusBIsC(String title, Set<String> a, Set<String> b, Set<String> c) {
Set<String> aMb = new TreeSet<>(a);
aMb.removeAll(b);
+ for (Iterator<String> it = aMb.iterator(); it.hasNext();) {
+ String item = it.next();
+ if (symbols.containsSome(item)) {
+ it.remove();
+ }
+ }
assertEquals(title + " (" + aMb.size() + ")", c, aMb);
}
-
+
public void testListFormatter() {
Object[][] tests = {
{"en", ListTypeLength.NORMAL, "ABC", "A, B, and C"},
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAttributeValues.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAttributeValues.java
index 3485b92..ff4830b 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAttributeValues.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAttributeValues.java
@@ -289,6 +289,10 @@
// get the status & store
ValueStatus valueStatus = dtdData.getValueStatus(element, attribute, attrValue);
+ if (valueStatus != ValueStatus.valid) {
+ // Set breakpoint here for debugging (referenced from http://cldr.unicode.org/development/testattributevalues)
+ dtdData.getValueStatus(element, attribute, attrValue);
+ }
synchronized (valueStatusInfo) {
valueStatusInfo.put(valueStatus, element, attribute, attrValue, Boolean.TRUE);
}
@@ -313,13 +317,14 @@
return;
}
StringBuilder out = new StringBuilder();
- out.append("\n");
+ out.append("\nIf the test fails, look at http://cldr.unicode.org/development/testattributevalues\n");
out.append("file\tCount:\t" + dtdData.dtdType + "\t" + fileCount + "\n");
out.append("element\tCount:\t" + dtdData.dtdType + "\t" + elementCount + "\n");
out.append("attribute\tCount:\t" + dtdData.dtdType + "\t" + attributeCount + "\n");
- out.append("status\tdtdType\telement\tattribute\tmatch\t#attr values\tattr values\n");
+ out.append("\nStatus\tDtdType\tElement\tAttribute\tMatch expression\t#Failures\tFailing values\n");
+
for (Entry<ValueStatus, Map<String, Map<String, Map<String, Boolean>>>> entry : valueStatusInfo) {
ValueStatus valueStatus = entry.getKey();
if (retain != null && !retain.contains(valueStatus)) {
@@ -376,7 +381,7 @@
}
}
synchronized (testLog) {
- testLog.warnln(out.toString());
+ testLog.errln(out.toString());
}
}
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCLDRLocaleCoverage.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCLDRLocaleCoverage.java
index 2a89410..050d988 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCLDRLocaleCoverage.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCLDRLocaleCoverage.java
@@ -50,7 +50,7 @@
public void TestLanguageNameCoverage() {
- Set<String> additionsToTranslate = new TreeSet<>(Arrays.asList("zxx", "ceb", "ny", "co", "ht", "hmn", "la", "sm", "st", "su", "sa", "mul"));
+ Set<String> additionsToTranslate = new TreeSet<>(Arrays.asList("zxx", "ceb", "ny", "co", "ht", "hmn", "la", "sm", "st", "sa", "mul"));
Map<String, Status> validity = Validity.getInstance().getCodeToStatus(LstrType.language);
Multimap<Status, String> statusToLang = Multimaps.invertFrom(Multimaps.forMap(validity), TreeMultimap.create());
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java
index 07bd22f..f3cbdec 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java
@@ -1,6 +1,5 @@
package org.unicode.cldr.unittest;
-import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -31,13 +30,13 @@
import org.unicode.cldr.test.SubmissionLocales;
import org.unicode.cldr.test.TestCache;
import org.unicode.cldr.test.TestCache.TestResultBundle;
+import org.unicode.cldr.tool.LikelySubtags;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRInfo.CandidateInfo;
import org.unicode.cldr.util.CLDRInfo.PathValueInfo;
import org.unicode.cldr.util.CLDRInfo.UserInfo;
import org.unicode.cldr.util.CLDRLocale;
-import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.Counter;
import org.unicode.cldr.util.DayPeriodInfo;
import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
@@ -53,11 +52,15 @@
import org.unicode.cldr.util.PatternPlaceholders;
import org.unicode.cldr.util.PatternPlaceholders.PlaceholderInfo;
import org.unicode.cldr.util.PatternPlaceholders.PlaceholderStatus;
-import org.unicode.cldr.util.SimpleFactory;
import org.unicode.cldr.util.SimpleXMLSource;
+import org.unicode.cldr.util.StandardCodes;
+import org.unicode.cldr.util.StandardCodes.LstrType;
import org.unicode.cldr.util.StringId;
+import org.unicode.cldr.util.Validity;
+import org.unicode.cldr.util.Validity.Status;
import org.unicode.cldr.util.VoteResolver.VoterInfo;
+import com.google.common.collect.ImmutableSet;
import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.impl.Row.R2;
import com.ibm.icu.impl.Row.R5;
@@ -286,21 +289,25 @@
}
public void TestAllLocales() {
-
CheckCLDR test = CheckCLDR.getCheckAll(factory, INDIVIDUAL_TESTS);
CheckCLDR.setDisplayInformation(english);
Set<String> unique = new HashSet<String>();
-
LanguageTagParser ltp = new LanguageTagParser();
- int count = 0;
+ Set<String> locales = new HashSet<String>();
for (String locale : getInclusion() <= 5 ? eightPointLocales : factory.getAvailable()) {
- if (!ltp.set(locale).getRegion().isEmpty()) {
- continue;
+ /*
+ * Only test locales without regions. E.g., test "pt", skip "pt_PT"
+ */
+ if (ltp.set(locale).getRegion().isEmpty()) {
+ locales.add(locale);
}
- checkLocale(test, locale, null, unique);
- ++count;
}
- logln("Count:\t" + count);
+ // With ICU4J libs of 2020-03-23, using locales.parallelStream().forEach below
+ // hangs, or crashes with NPE. Likely an ICU4J issue, but we don't really need
+ // parallelStream() here anyway since we are only handling around 35 locales.
+ // (And in fact this test seems faster without it)
+ locales.forEach(locale -> checkLocale(test, locale, null, unique));
+ logln("Count:\t" + locales.size());
}
public void TestA() {
@@ -344,27 +351,27 @@
// override.overridePath = path;
final String resolvedValue = dummyValue == null ? patched.getStringValueWithBailey(path)
: dummyValue;
- test.handleCheck(path, patched.getFullXPath(path), resolvedValue,
- options, result);
- if (result.size() != 0) {
- for (CheckStatus item : result) {
- addExemplars(item, missingCurrencyExemplars,
- missingExemplars);
- final String mainMessage = StringId.getId(path) + "\t"
- + pathHeader + "\t" + english.getStringValue(path)
- + "\t" + item.getType() + "\t" + item.getSubtype();
- if (unique != null) {
- if (unique.contains(mainMessage)) {
- continue;
- } else {
- unique.add(mainMessage);
- }
+ test.handleCheck(path, patched.getFullXPath(path), resolvedValue,
+ options, result);
+ if (result.size() != 0) {
+ for (CheckStatus item : result) {
+ addExemplars(item, missingCurrencyExemplars,
+ missingExemplars);
+ final String mainMessage = StringId.getId(path) + "\t"
+ + pathHeader + "\t" + english.getStringValue(path)
+ + "\t" + item.getType() + "\t" + item.getSubtype();
+ if (unique != null) {
+ if (unique.contains(mainMessage)) {
+ continue;
+ } else {
+ unique.add(mainMessage);
}
- logln(localeID + "\t" + mainMessage + "\t" + resolvedValue
- + "\t" + item.getMessage() + "\t"
- + pathHeader.getOriginalPath());
}
+ logln(localeID + "\t" + mainMessage + "\t" + resolvedValue
+ + "\t" + item.getMessage() + "\t"
+ + pathHeader.getOriginalPath());
}
+ }
}
if (missingCurrencyExemplars.size() != 0) {
logln(localeID + "\tMissing Exemplars (Currency):\t"
@@ -425,7 +432,7 @@
// * Sometimes the English change is suppressed in a limited release if the change is small. Pick another in that case.
// * check the data files to ensure that it is in fact outdated.
// * change the path to that value
-
+
String locale = "fr";
String path = "//ldml/localeDisplayNames/territories/territory[@type=\"MO\"][@alt=\"short\"]";
CheckCLDR c = new CheckNew(testInfo.getCommonAndSeedAndMainAndAnnotationsFactory());
@@ -765,88 +772,115 @@
return xpath;
}
}
-
+
public void TestSubmissionLocales() {
-
- // will need to change this for new releases!!
-
- String pathNotSameValue = "//ldml/listPatterns/listPattern[@type=\"standard\"]";
- String pathSameValue = "//ldml/listPatterns/listPattern[@type=\"or\"]";
-
- // outside of cldr, skip all except isError
- assertTrue("vo, engSame, isError, !isMissing", SubmissionLocales.allowEvenIfLimited("vo", pathSameValue, true, false));
- assertFalse("vo, engSame, !isError, isMissing", SubmissionLocales.allowEvenIfLimited("vo", pathSameValue, false, true));
- assertFalse("vo, !engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("vo", pathNotSameValue, false, false));
- assertFalse("vo, engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("vo", pathSameValue, false, false));
- // new cldr locale, allow all
- assertTrue("jv, engSame, isError, !isMissing", SubmissionLocales.allowEvenIfLimited("jv", pathSameValue, true, false));
- assertTrue("jv, engSame, !isError, isMissing", SubmissionLocales.allowEvenIfLimited("jv", pathSameValue, false, true));
- assertTrue("jv, !engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("jv", pathNotSameValue, false, false));
- assertTrue("jv, engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("jv", pathSameValue, false, false));
- // old cldr locale, allow isError, or missing in last release, or EnglishChanged
- assertTrue("fr, engSame, isError, !isMissing", SubmissionLocales.allowEvenIfLimited("fr", pathSameValue, true, false));
- assertTrue("fr, engSame, !isError, isMissing", SubmissionLocales.allowEvenIfLimited("fr", pathSameValue, false, true));
- assertTrue("fr, !engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("fr", pathNotSameValue, false, false));
- assertFalse("fr, engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("fr", pathSameValue, false, false));
+
+ for (String locale : SubmissionLocales.NEW_CLDR_LOCALES) {
+ checkLocaleOk(locale, true);
+ }
+ for (String locale : SubmissionLocales.HIGH_LEVEL_LOCALES) {
+ checkLocaleOk(locale, false);
+ }
}
+
+ final Set<String> cldrLocales = StandardCodes.make().getLocaleCoverageLocales(Organization.cldr);
+ final Map<String, Status> validity = Validity.getInstance().getCodeToStatus(LstrType.language);
+ final Map<String, R2<List<String>, String>> langAliases = CLDRConfig.getInstance().getSupplementalDataInfo()
+ .getLocaleAliasInfo().get("language");
+ final Set<String> existingLocales = CLDRConfig.getInstance().getCommonAndSeedAndMainAndAnnotationsFactory().getAvailable();
+ final LikelySubtags likely = new LikelySubtags();
+
/**
- * Check that the English changes are captured
+ * Check that the locale is valid, that it is either in or out of cldrLocales, and that the locale is not deprecated
+ * @param language
+ * @param inclusionDesired
+ */
+ private void checkLocaleOk(String locale, boolean inclusionDesired) {
+ final LanguageTagParser ltp = new LanguageTagParser().set(locale);
+ String language = ltp.getLanguage();
+ String explicitScript = ltp.getScript();
+
+ Status status = validity.get(language);
+ assertTrue(language + " valid?", status == Status.regular || status == Status.macroregion);
+
+ final R2<List<String>, String> alias = langAliases.get(language);
+ if (!assertNull(language + " language is not deprecated", alias)) {
+ errln(language + ": " + alias);
+ }
+
+ // locale tests
+ if (!assertTrue(locale + " locale is in common or seed", existingLocales.contains(locale))) {
+ return;
+ }
+
+ assertTrue(language + " locale is " + (inclusionDesired ? "" : "not ") + "in cldrLocales", cldrLocales.contains(locale) == inclusionDesired);
+
+ // check for expected script
+ String max = likely.maximize(locale);
+ assertNotNull(language + " locale has script", max);
+ String maxScript = max == null ? null : ltp.set(max).getScript();
+
+ String desiredScript = "Latn";
+ switch(language) {
+ case "mai": case "kok": desiredScript = "Deva"; break;
+ case "sat": desiredScript = "Olck"; break;
+ case "mni": desiredScript = "Beng"; break;
+ case "chr": desiredScript = "Cher"; break;
+ default:
+ if (!explicitScript.isEmpty()) {
+ desiredScript = explicitScript;
+ }
+ break;
+ }
+ if (desiredScript != null) {
+ assertEquals(locale + " default script", desiredScript, maxScript);
+ }
+ }
+
+ final Set<String> sampleNewPaths = ImmutableSet.of(
+ "//ldml/annotations/annotation[@cp=\\\"🐻❄\\\"][@type=\\\"tts\\\"]",
+ "//ldml/annotations/annotation[@cp=\\\"√\\\"][@type=\\\"tts\\\"]",
+ "//ldml/units/unitLength[@type=\\\"short\\\"]/compoundUnit[@type=\\\"10p-1\\\"]/unitPrefixPattern",
+ "//ldml/localeDisplayNames/languages/language[@type=\\\"fa_AF\\\"]",
+ "//ldml/units/unitLength[@type=\\\"long\\\"]/compoundUnit[@type=\\\"power2\\\"]/compoundUnitPattern1"
+ );
+
+ final Set<String> SAMPLE_EXCEPTIONAL_PATHS = ImmutableSet.of(
+ "//ldml/annotations/annotation[@cp=\"🤵\"]",
+ "//ldml/annotations/annotation[@cp=\"🤵♂\"][@type=\"tts\"]"
+ );
+
+ final String sampleDisallowedInLimitedSubmission = "//ldml/annotations/annotation[@cp=\"🎅\"]";
+
+ /**
+ * will need to change this for new releases!!
*/
public void TestALLOWED_IN_LIMITED_PATHS() {
- if (logKnownIssue("cldrbug:11583", "Comment out test until last release data is available for unit tests")) {
+ if (!CheckCLDR.LIMITED_SUBMISSION) {
return;
}
- CLDRConfig conf = testInfo;
- Factory factory = conf.getMainAndAnnotationsFactory();
- File[] paths = {
- new File(CLDRPaths.LAST_COMMON_DIRECTORY + "main/"),
- new File(CLDRPaths.LAST_COMMON_DIRECTORY + "annotations/"),
- };
- Factory factoryOld = SimpleFactory.make(paths, ".*");
-
- CLDRFile english = factory.make("en", true);
- CLDRFile oldEnglish = factoryOld.make("en", true);
- Set<String> newPaths = new TreeSet<>();
- Set<String> diffValues = new TreeSet<>();
- boolean firstFail = true;
-
- UnicodeSet okAnnotations = new UnicodeSet("[🤖 😺 😸 😹 😻-😽 🙀 😿 😾 🐺 🦊 🦁 🦄 🐹 🐻 🐼 🐸 🧩 ⭕]").freeze();
-
- for (String path : english) {
- if (path.contains("/alias")) {
- continue;
- }
- String value = english.getStringValue(path);
- String valueOld = oldEnglish.getStringValue(path);
- boolean isDiff = false;
- if (valueOld == null) {
- newPaths.add(path);
- } else if (value != null
- && !value.equalsIgnoreCase(valueOld)
- && !path.startsWith("//ldml/localeDisplayNames/types/type[@key=\"m0\"]")) {
- diffValues.add(path);
- isDiff = true;
- }
- boolean regexMatch = SubmissionLocales.pathAllowedInLimitedSubmission(path);
- if (isDiff && !regexMatch) {
- errln((firstFail ? "Add these to regex in SubmissionLocales OR filter from this test if unimportant:\n\t\t\t" : "")
- + "Match fails with " + path + ", old: " + valueOld + ", new: " + value);
- firstFail = false;
- } else if (!isDiff && regexMatch) {
-
- // will need to change this for new releases!!
-
- if (path.endsWith("/listPatternPart[@type=\"start\"]")
- || path.endsWith("/listPatternPart[@type=\"middle\"]")
- || path.endsWith("[@type=\"tts\"]")
- || okAnnotations.containsSome(path)
- ) {
- continue;
- }
- errln("Match overshoots with " + path
- + (firstFail ? "\nAdd these to regex in SubmissionLocales or filter from this test if unimportant" : ""));
- }
+ for (String path : sampleNewPaths) {
+ assertTrue(path, SubmissionLocales.allowEvenIfLimited("fr", path, false, true));
}
- }
+
+ for (String path : SAMPLE_EXCEPTIONAL_PATHS) {
+ assertTrue(path, SubmissionLocales.allowEvenIfLimited("fr", path, false, false));
+ }
+
+ assertFalse(sampleDisallowedInLimitedSubmission,
+ SubmissionLocales.allowEvenIfLimited("fr", sampleDisallowedInLimitedSubmission, false, false));
+
+ // test non-cldr locale
+
+ for (String path : sampleNewPaths) {
+ assertFalse(path, SubmissionLocales.allowEvenIfLimited("xx", path, false, true));
+ }
+ for (String path : SAMPLE_EXCEPTIONAL_PATHS) {
+ assertFalse(path, SubmissionLocales.allowEvenIfLimited("xx", path, false, false));
+ }
+
+ // TODO enhance to check more conditions
+ // like old: assertFalse("vo, !engSame, !isError, !isMissing", SubmissionLocales.allowEvenIfLimited("vo", pathNotSameValue, false, false));
+ }
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckDisplayCollisions.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckDisplayCollisions.java
index ddf1c12..8d10933 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckDisplayCollisions.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckDisplayCollisions.java
@@ -21,14 +21,23 @@
import com.google.common.collect.ImmutableList;
public class TestCheckDisplayCollisions extends TestFmwkPlus {
- private static final String ukRegion = "//ldml/localeDisplayNames/territories/territory[@type=\"GB\"]";
+ private static final String ukRegion = "//ldml/localeDisplayNames/territories/territory[@type=\"GB\"]";
private static final String englandSubdivision = "//ldml/localeDisplayNames/subdivisions/subdivision[@type=\"gbeng\"]";
+
private static final String scorpioEmoji = "//ldml/annotations/annotation[@cp=\"♏\"][@type=\"tts\"]";
private static final String scorpionEmoji = "//ldml/annotations/annotation[@cp=\"🦂\"][@type=\"tts\"]";
+
private static final String japanRegion = "//ldml/localeDisplayNames/territories/territory[@type=\"JP\"]";
private static final String japanMap = "//ldml/annotations/annotation[@cp=\"🗾\"][@type=\"tts\"]";
-
- public static void main(String[] args) {
+
+ private static final String milli = "//ldml/units/unitLength[@type=\"short\"]/compoundUnit[@type=\"10p-3\"]/unitPrefixPattern";
+ private static final String mega = "//ldml/units/unitLength[@type=\"short\"]/compoundUnit[@type=\"10p6\"]/unitPrefixPattern";
+
+ private static final String deciLong = "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"10p-1\"]/unitPrefixPattern";
+ private static final String deciNarrow = "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"10p-1\"]/unitPrefixPattern";
+ private static final String deciShort = "//ldml/units/unitLength[@type=\"short\"]/compoundUnit[@type=\"10p-1\"]/unitPrefixPattern";
+
+ public static void main(String[] args) {
new TestCheckDisplayCollisions().run(args);
}
@@ -46,6 +55,13 @@
frSource.putValueAtPath(ukRegion, "Royaume-Uni");
frSource.putValueAtDPath(japanRegion, "Japon");
frSource.putValueAtDPath(japanMap, "carte du Japon");
+ frSource.putValueAtDPath(milli, "m{0}");
+ frSource.putValueAtDPath(mega, "M{0}");
+
+ frSource.putValueAtDPath(deciLong, "d{0}");
+ frSource.putValueAtDPath(deciNarrow, "d{0}");
+ frSource.putValueAtDPath(deciShort, "d{0}");
+
CLDRFile fr = new CLDRFile(frSource);
XMLSource frCaSource = new SimpleXMLSource("fr_CA");
@@ -59,7 +75,6 @@
factory.addFile(en);
factory.addFile(fr);
factory.addFile(frCA);
-
CheckDisplayCollisions cdc = new CheckDisplayCollisions(factory);
cdc.setEnglishFile(CLDRConfig.getInstance().getEnglish());
@@ -67,40 +82,44 @@
CLDRFile frResolved = factory.make("fr", true);
checkFile(cdc, fr, frResolved);
- CLDRFile frCaResolved = factory.make("fr_CA", true);
- checkFile(cdc, frCA, frCaResolved, scorpionEmoji, scorpioEmoji, englandSubdivision, ukRegion, japanMap);
+ CLDRFile frCaResolved = factory.make("fr_CA", false);
+ checkFile(cdc, frCA, frCaResolved,
+ scorpioEmoji, ukRegion);
}
-
- private void checkFile(CheckDisplayCollisions cdc, CLDRFile frCa, CLDRFile frCaResolved, String... expecteds) {
- Set<String> expected = new TreeSet<>(Arrays.asList(expecteds));
+
+ private void checkFile(CheckDisplayCollisions cdc, CLDRFile cldrFile, CLDRFile cldrFileResolved, String... expectedErrors) {
List<CheckStatus> possibleErrors = new ArrayList<>();
Options options = new Options();
- cdc.setCldrFileToCheck(frCa, options, possibleErrors);
+ cdc.setCldrFileToCheck(cldrFile, options, possibleErrors);
if (!possibleErrors.isEmpty()) {
errln("init: " + possibleErrors);
possibleErrors.clear();
}
Map<String,List<CheckStatus>> found = new HashMap<>();
- for (String path : frCaResolved) {
- String value = frCaResolved.getStringValue(path);
+ for (String path : cldrFileResolved) {
+ String value = cldrFileResolved.getStringValue(path);
//System.out.println(path + "\t" + value);
- if (path.equals(japanMap)) {
+ if (path.equals(deciLong)) {
int debug = 0;
}
cdc.check(path, path, value, options, possibleErrors);
if (!possibleErrors.isEmpty()) {
found.put(path, ImmutableList.copyOf(possibleErrors));
possibleErrors.clear();
+ logln("Found error " + cldrFile.getLocaleID() + ":\t" + path + ", " + value);
+ } else {
+ logln("No error " + cldrFile.getLocaleID() + ":\t" + path + ", " + value);
}
}
+ Set<String> expected = new TreeSet<>(Arrays.asList(expectedErrors));
for (Entry<String, List<CheckStatus>> entry : found.entrySet()) {
String path = entry.getKey();
if (expected.contains(path)) {
expected.remove(path);
} else {
- errln(frCa.getLocaleID() + " unexpected error: " + path + " : " + entry.getValue());
+ errln(cldrFile.getLocaleID() + " unexpected error: " + path + " : " + entry.getValue());
}
}
- assertEquals(frCa.getLocaleID() + " missing error: ", Collections.emptySet(), expected);
+ assertEquals(cldrFile.getLocaleID() + " expected to be errors: ", Collections.emptySet(), expected);
}
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCompactNumbers.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCompactNumbers.java
new file mode 100644
index 0000000..0b3cae7
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCompactNumbers.java
@@ -0,0 +1,91 @@
+package org.unicode.cldr.unittest;
+
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.unicode.cldr.test.BuildIcuCompactDecimalFormat;
+import org.unicode.cldr.test.BuildIcuCompactDecimalFormat.CurrencyStyle;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.ICUServiceBuilder;
+import org.unicode.cldr.util.StandardCodes;
+import org.unicode.cldr.util.SupplementalDataInfo;
+import org.unicode.cldr.util.VerifyCompactNumbers;
+
+import com.ibm.icu.text.CompactDecimalFormat;
+import com.ibm.icu.text.CompactDecimalFormat.CompactStyle;
+import com.ibm.icu.text.NumberFormat;
+import com.ibm.icu.util.ULocale;
+
+public class TestCompactNumbers extends TestFmwkPlus {
+ static final boolean DEBUG = false;
+ private static StandardCodes sc = StandardCodes.make();
+ private static final CLDRConfig CLDRCONFIG = CLDRConfig.getInstance();
+ private static final SupplementalDataInfo SDI = CLDRCONFIG.getSupplementalDataInfo();
+ private static final CLDRFile ENGLISH = CLDRCONFIG.getEnglish();
+ private static final Factory factory2 = CLDRCONFIG.getCldrFactory();
+
+ public static void main(String[] args) {
+ new TestCompactNumbers().run(args);
+ }
+
+ public void TestVerify() {
+ // Just verify no crashes
+ CLDRFile cldrFile = factory2.make("it", true);
+ Appendable out = new StringBuilder();
+ VerifyCompactNumbers.showNumbers(cldrFile, true, "EUR", out, factory2);
+ if (DEBUG) {
+ System.out.println(out);
+ }
+ }
+
+ public void TestInternals() {
+ // Just verify no crashes
+ String locale = "it";
+ String currencyCode = "EUR";
+ ULocale locale2 = ULocale.forLanguageTag(locale);
+ CLDRFile cldrFile = factory2.make(locale, true);
+ Set<String> debugCreationErrors = new LinkedHashSet<>();
+ String[] debugOriginals = null;
+
+ ICUServiceBuilder builder = new ICUServiceBuilder().setCldrFile(cldrFile);
+ NumberFormat nf = builder.getNumberFormat(1);
+
+ CompactDecimalFormat cdf = BuildIcuCompactDecimalFormat.build(cldrFile, debugCreationErrors,
+ debugOriginals, CompactStyle.SHORT, locale2, CurrencyStyle.PLAIN, currencyCode);
+
+ Map<String, Map<String, String>> data = BuildIcuCompactDecimalFormat.buildCustomData(cldrFile, CompactStyle.SHORT, CurrencyStyle.PLAIN);
+ if (DEBUG) {
+ for (Entry<String, Map<String, String>> entry : data.entrySet()) {
+ System.out.println(entry);
+ }
+ }
+
+ CompactDecimalFormat cdfs = BuildIcuCompactDecimalFormat.build(cldrFile, debugCreationErrors,
+ debugOriginals, CompactStyle.LONG, locale2, CurrencyStyle.PLAIN, currencyCode);
+ CompactDecimalFormat cdfCurr = BuildIcuCompactDecimalFormat.build(cldrFile, debugCreationErrors,
+ debugOriginals, CompactStyle.SHORT, locale2, CurrencyStyle.CURRENCY, currencyCode);
+
+ Set<Double> allSamples = VerifyCompactNumbers.collectSamplesAndSetFormats(currencyCode, locale, SDI, cdf, cdfs, cdfCurr);
+
+ for (double source : allSamples) {
+ if (false && source == 22000000 && locale.equals("cs")) {
+ System.out.println("**");
+ }
+
+ String formattedNumber = nf.format(source);
+ String compactFormattedNumber = cdf == null ? "n/a" : cdf.format(source);
+ String compactLongFormattedNumber = cdfs == null ? "n/a" : cdfs.format(source);
+ String compactCurrFormattedNumber = cdfs == null ? "n/a" : cdfCurr.format(source);
+ if (DEBUG) System.out.println(source
+ + "\tnf:\t" + formattedNumber
+ + "\tcnf:\t" + compactFormattedNumber
+ + "\tclnf:\t" + compactLongFormattedNumber
+ + "\tccnf:\t" + compactCurrFormattedNumber
+ );
+ }
+ }
+}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCoverageLevel.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCoverageLevel.java
index b4d4f34..b4edb6b 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCoverageLevel.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCoverageLevel.java
@@ -373,7 +373,7 @@
+ "syr|kv|umb|)");
final Pattern script100 = PatternCache.get("("
- + "Adlm|Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Bhks|Blis|Brah|Bugi|Buhd|"
+ + "Adlm|Afak|Aghb|Ahom|Aran|Armi|Avst|Bali|Bamu|Bass|Batk|Bhks|Blis|Brah|Bugi|Buhd|"
+ "Cakm|Cans|Cari|Cham|Chrs|Cher|Cirt|Copt|Cprt|Cyrs|"
+ "Diak|Dogr|Dsrt|Dupl|Egy[dhp]|Elba|Elym|Geok|Glag|Gong|Gonm|Goth|Gran|"
+ "Hatr|Hanb|Hano|Hluw|Hmng|Hmnp|Hrkt|Hung|Inds|Ital|Jamo|Java|Jurc|"
@@ -393,7 +393,7 @@
+ "finance|native|traditional|adlm|ahom|bali|bhks|brah|cakm|cham|cyrl|diak|"
+ "gong|gonm|hanidays|hmng|hmnp|java|jpanyear|kali|lana(tham)?|lepc|limb|"
+ "math(bold|dbl|mono|san[bs])|modi|mong|mroo|mtei|mymr(shan|tlng)|"
- + "newa|nkoo|olck|osma|rohg|saur|shrd|sin[dh]|sora|sund|takr|talu|tirh|vaii|wara|wcho)");
+ + "newa|nkoo|olck|osma|rohg|saur|segment|shrd|sin[dh]|sora|sund|takr|talu|tirh|vaii|wara|wcho)");
final Pattern collation100 = PatternCache.get("("
+ "big5han|compat|dictionary|emoji|eor|gb2312han|phonebook|phonetic|pinyin|reformed|searchjl|stroke|traditional|unihan|zhuyin)");
@@ -638,8 +638,11 @@
continue;
}
Set<String> grouping = LogicalGrouping.getPaths(cldrFile, path);
+ seen.add(path);
+ if (grouping == null) {
+ continue;
+ }
seen.addAll(grouping);
- seen.add(path); // needed too?
levelToPaths.clear();
for (String groupingPath : grouping) {
if (LogicalGrouping.isOptional(cldrFile, groupingPath)) {
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestDtdData.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestDtdData.java
index 773af51..b6fb43b 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestDtdData.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestDtdData.java
@@ -21,8 +21,12 @@
import org.unicode.cldr.util.DtdData.Element;
import org.unicode.cldr.util.DtdData.ElementType;
import org.unicode.cldr.util.DtdType;
+import org.unicode.cldr.util.MatchValue;
+import org.unicode.cldr.util.MatchValue.EnumParser;
import org.unicode.cldr.util.Pair;
import org.unicode.cldr.util.SupplementalDataInfo;
+import org.unicode.cldr.util.Validity;
+import org.unicode.cldr.util.Validity.Status;
import org.unicode.cldr.util.XMLFileReader;
import org.unicode.cldr.util.XPathParts;
@@ -153,7 +157,7 @@
DtdType dtdTypeFromPath = DtdType.fromPath(pathValue.getFirst());
if (!dtdTypeFromPath.directories.contains(dir.getName())) {
errln("Mismatch in " + file.toString()
- + ": " + dtdTypeFromPath + ", " + dtdTypeFromPath.directories);
+ + ": " + dtdTypeFromPath + ", " + dtdTypeFromPath.directories);
}
logln("\t" + file.getName() + "\t" + dtdTypeFromPath);
break;
@@ -422,8 +426,9 @@
"exception", // needed for new segmentations
"coverageLevel", // needed for supplemental/coverageLevel.xml
"coverageVariable", // needed for supplemental/coverageLevel.xml
- "substitute" // needed for characters.xml
- )));
+ "substitute", // needed for characters.xml
+ "unitPreference"
+ )));
public static boolean isOrderedOld(String element, DtdType type) {
return orderedElements.contains(element);
@@ -476,94 +481,99 @@
|| attribute.equals("dtds")
|| attribute.equals("idStatus")
|| elementName.equals("deprecatedItems")
- && (attribute.equals("type") || attribute.equals("elements") || attribute.equals("attributes") || attribute.equals("values"))
+ && (attribute.equals("type") || attribute.equals("elements") || attribute.equals("attributes") || attribute.equals("values"))
|| elementName.equals("character")
- && attribute.equals("value")
+ && attribute.equals("value")
|| elementName.equals("dayPeriodRules")
- && attribute.equals("locales")
+ && attribute.equals("locales")
|| elementName.equals("dayPeriodRule")
- && (attribute.equals("type"))
+ && (attribute.equals("type"))
|| elementName.equals("metazones") && attribute.equals("type")
|| elementName.equals("subgroup") && attribute.equals("subtype")
|| elementName.equals("mapZone")
- && (attribute.equals("other") || attribute.equals("territory"))
+ && (attribute.equals("other") || attribute.equals("territory"))
|| elementName.equals("postCodeRegex")
- && attribute.equals("territoryId")
+ && attribute.equals("territoryId")
|| elementName.equals("calendarPreference")
- && attribute.equals("territories")
+ && attribute.equals("territories")
|| elementName.equals("minDays")
- && attribute.equals("count")
+ && attribute.equals("count")
|| elementName.equals("firstDay")
- && attribute.equals("day")
+ && attribute.equals("day")
|| elementName.equals("weekendStart")
- && attribute.equals("day")
+ && attribute.equals("day")
|| elementName.equals("weekendEnd")
- && attribute.equals("day")
+ && attribute.equals("day")
|| elementName.equals("measurementSystem")
- && attribute.equals("category")
+ && attribute.equals("category")
|| elementName.equals("unitPreferences")
- && (attribute.equals("category") || attribute.equals("usage") || attribute.equals("scope"))
+ && (attribute.equals("category") || attribute.equals("usage") || attribute.equals("scope"))
|| elementName.equals("unitPreference")
- && attribute.equals("regions")
+ && (attribute.equals("regions") || attribute.equals("geq"))
|| elementName.equals("distinguishingItems")
- && attribute.equals("attributes")
+ && attribute.equals("attributes")
|| elementName.equals("codesByTerritory")
- && attribute.equals("territory")
+ && attribute.equals("territory")
|| elementName.equals("currency")
- && attribute.equals("iso4217")
+ && attribute.equals("iso4217")
|| elementName.equals("territoryAlias")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("territoryCodes")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("group")
- && (attribute.equals("status")) // || attribute.equals("grouping")
+ && (attribute.equals("status")) // || attribute.equals("grouping")
|| elementName.equals("plurals")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("pluralRules")
- && attribute.equals("locales")
+ && attribute.equals("locales")
|| elementName.equals("pluralRule")
- && attribute.equals("count")
+ && attribute.equals("count")
|| elementName.equals("pluralRanges")
- && attribute.equals("locales")
+ && attribute.equals("locales")
|| elementName.equals("pluralRange")
- && (attribute.equals("start") || attribute.equals("end"))
+ && (attribute.equals("start") || attribute.equals("end"))
|| elementName.equals("hours")
- && (attribute.equals("preferred") || attribute.equals("allowed"))
+ && (attribute.equals("preferred") || attribute.equals("allowed"))
|| elementName.equals("personList") && attribute.equals("type")
|| elementName.equals("likelySubtag")
- && attribute.equals("from")
+ && attribute.equals("from")
|| elementName.equals("rgPath")
- && attribute.equals("path")
+ && attribute.equals("path")
|| elementName.equals("timezone")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("usesMetazone")
- && (attribute.equals("to") || attribute.equals("from")) // attribute.equals("mzone") ||
+ && (attribute.equals("to") || attribute.equals("from")) // attribute.equals("mzone") ||
|| elementName.equals("numberingSystem")
- && attribute.equals("id")
+ && attribute.equals("id")
|| elementName.equals("group")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("currency")
- && attribute.equals("from")
+ && attribute.equals("from")
|| elementName.equals("currency")
- && attribute.equals("to")
+ && attribute.equals("to")
|| elementName.equals("currency")
- && attribute.equals("iso4217")
+ && attribute.equals("iso4217")
|| (elementName.equals("parentLocale") || elementName.equals("languageGroup"))
- && attribute.equals("parent")
+ && attribute.equals("parent")
|| elementName.equals("currencyCodes")
- && attribute.equals("type")
+ && attribute.equals("type")
|| elementName.equals("approvalRequirement")
- && (attribute.equals("locales") || attribute.equals("paths"))
+ && (attribute.equals("locales") || attribute.equals("paths"))
|| elementName.equals("weekOfPreference")
- && attribute.equals("locales")
+ && attribute.equals("locales")
|| elementName.equals("coverageVariable")
- && attribute.equals("key")
+ && attribute.equals("key")
|| elementName.equals("coverageLevel")
- && (attribute.equals("inLanguage") || attribute.equals("inScript") || attribute.equals("inTerritory") || attribute.equals("match"))
+ && (attribute.equals("inLanguage") || attribute.equals("inScript") || attribute.equals("inTerritory") || attribute.equals("match"))
|| elementName.equals("languageMatch")
- && (attribute.equals("desired") || attribute.equals("supported"))
+ && (attribute.equals("desired") || attribute.equals("supported"))
|| (elementName.equals("transform") && (attribute.equals("source") || attribute.equals("target") || attribute.equals("direction") || attribute
- .equals("variant")));
+ .equals("variant")))
+ || (elementName.equals("grammaticalFeatures") && (attribute.equals("locales") || attribute.equals("targets")))
+ || (elementName.equals("convertUnit") && (attribute.equals("source") || attribute.equals("target")))
+ || (elementName.equals("unitConstant") && attribute.equals("constant"))
+ || (elementName.equals("unitQuantity") && attribute.equals("baseUnit"))
+ ;
case keyboard:
return attribute.equals("_q")
@@ -615,4 +625,48 @@
public static Set<String> getSerialElements() {
return orderedElements;
}
+
+ public static enum TestEnum {a, b, c, d}
+
+ public void TestEnumParser() throws ClassNotFoundException {
+ Object[][] tests = {
+ {Status.class, "regular", Status.regular},
+ {Status.class, "regular deprecated", Validity.Status.regular, Status.deprecated},
+ {Status.class, "deprecated regular", "regular deprecated", Validity.Status.regular, Status.deprecated},
+ {TestEnum.class, "b a", "a b", TestEnum.a, TestEnum.b},
+ {TestEnum.class, "!c d", "a b", TestEnum.a, TestEnum.b},
+ };
+ for (Object[] test : tests) {
+ Class aClass = (Class<Enum>)test[0];
+ EnumParser parser = MatchValue.EnumParser.of(aClass);
+ final String inputText = (String)test[1];
+ int startOfValues = test[2] instanceof String ? 3 : 2;
+ String expectedFormat = startOfValues == 3 ? (String) test[2] : inputText;
+ Set<Enum> expected = new TreeSet<Enum>();
+ for (Object item : Arrays.asList(test).subList(startOfValues, test.length)) {
+ expected.add((Enum)item);
+ }
+
+ Set<Enum> actual = parser.parse(inputText);
+ assertEquals("parse " + test[1], expected, actual);
+
+ String formatted = parser.format(expected);
+ assertEquals("format " + expected, expectedFormat, formatted);
+
+ }
+ }
+
+ public void TestMatchValue() {
+ Object[][] tests = {
+ {"validity/short-unit/deprecated", "inch-hg"}
+ };
+ for (Object[] test : tests) {
+ MatchValue matcher = MatchValue.of((String)test[0]);
+ final String toMatch = (String)test[1];
+ boolean expectedValue = test.length < 3 ? true : Boolean.valueOf((String)test[2]);
+
+ final boolean actual = matcher.is(toMatch);
+ assertEquals(Arrays.asList(test).toString(), expectedValue, actual);
+ }
+ }
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleDependencies.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleDependencies.java
new file mode 100644
index 0000000..3592a68
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleDependencies.java
@@ -0,0 +1,407 @@
+package org.unicode.cldr.unittest;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.unicode.cldr.draft.FileUtilities;
+import org.unicode.cldr.test.ExampleGenerator;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.LocaleIDParser;
+import org.unicode.cldr.util.PathStarrer;
+import org.unicode.cldr.util.XMLSource;
+
+import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.dev.util.CollectionUtilities;
+
+public class TestExampleDependencies extends TestFmwk {
+ CLDRConfig info = CLDRConfig.getInstance();
+
+ static boolean testDependencies = false; // make true to test
+
+ public static void main(String[] args) {
+ testDependencies = true;
+ new TestExampleDependencies().run(args);
+ testDependencies = false;
+ }
+
+ /**
+ * Test dependencies where changing the value of one path changes example-generation for another path.
+ *
+ * The goal is to optimize example caching by only regenerating examples when necessary.
+ *
+ * Still under construction. Reference: https://unicode-org.atlassian.net/browse/CLDR-13331
+ *
+ * @throws IOException
+ */
+ public void TestExampleGeneratorDependencies() throws IOException {
+ if (!testDependencies) {
+ return;
+ }
+ final boolean JUST_LIST_PATHS = false;
+ final boolean USE_STARRED_PATHS = true;
+
+ /*
+ * Different localeId gives different dependencies.
+ * So far, have tested with these locales:
+ * "fr": 650 "type A"
+ * "de": 652 "type A"
+ * "am": 618 "type A"
+ * "zh": 12521 "type A"!
+ * "ar": ?
+ */
+ final String localeId = "sr_Cyrl_BA";
+
+ CLDRFile englishFile = info.getEnglish();
+
+ Factory factory = CLDRConfig.getInstance().getCldrFactory();
+ CLDRFile cldrFile = makeMutableResolved(factory, localeId); // time-consuming
+ cldrFile.disableCaching();
+ CLDRFile top = cldrFile.getUnresolved(); // can mutate top
+
+ Set<String> paths = new TreeSet<String>(cldrFile.getComparator());
+ CollectionUtilities.addAll(cldrFile.iterator(), paths); // time-consuming
+ if (JUST_LIST_PATHS) {
+ String dir = CLDRPaths.GEN_DIRECTORY + "test/";
+ String name = "allpaths_" + localeId + ".txt";
+ PrintWriter writer = FileUtilities.openUTF8Writer(dir, name);
+ ArrayList<String> list = new ArrayList<String>(paths);
+ Collections.sort(list);
+ for (String path : list) {
+ // writer.println(path);
+ writer.println(path.replaceAll("\"", "\\\\\""));
+ }
+ return;
+ }
+ final PathStarrer pathStarrer = USE_STARRED_PATHS ? new PathStarrer().setSubstitutionPattern("*") : null;
+
+ ExampleGenerator egBase = new ExampleGenerator(cldrFile, englishFile, CLDRPaths.DEFAULT_SUPPLEMENTAL_DIRECTORY);
+
+ HashMap<String, String> originalValues = new HashMap<String, String>();
+
+ /*
+ * Get all the examples so they'll be added to the cache for egBase.
+ */
+ for (String path : paths) {
+ if (path.endsWith("/alias") || path.startsWith("//ldml/identity")) {
+ continue;
+ }
+ String value = cldrFile.getStringValue(path);
+ if (value == null) {
+ continue;
+ }
+ originalValues.put(path, value);
+ if (false && path.equals("//ldml/numbers/currencies/currency[@type=\"EUR\"]/symbol")) {
+ System.out.println("Got " + path + " in first loop ...");
+ }
+ egBase.getExampleHtml(path, value);
+ }
+ /*
+ * Make egBase "cacheOnly" so that getExampleHtml will throw an exception if future queries
+ * are not found in the cache. Alternatively, could just make a local hashmap originalExamples,
+ * similar to originalValues. That might be more robust, require more memory, faster or slower?
+ * Should try both ways.
+ */
+ egBase.makeCacheOnly();
+
+ ExampleGenerator egTest = new ExampleGenerator(cldrFile, englishFile, CLDRPaths.DEFAULT_SUPPLEMENTAL_DIRECTORY);
+ egTest.disableCaching(); // will not employ a cache -- this should save some time, since cache would be wasted
+
+ /*
+ * For each path (A), temporarily change its value, and then check each other path (B),
+ * to see whether changing the value for A changed the example for B.
+ */
+ HashMap<String, HashSet<String>> dependenciesA = new HashMap<String, HashSet<String>>();
+ // HashMap<String, HashSet<String>> dependenciesB = new HashMap<String, HashSet<String>>();
+ long count = 0;
+ long skipCount = 0;
+ long dependencyCount = 0;
+
+ for (String pathA : paths) {
+ if (skipPathForDependencies(pathA, true)) {
+ ++skipCount;
+ continue;
+ }
+ String valueA = cldrFile.getStringValue(pathA);
+ if (valueA == null) {
+ continue;
+ }
+ if ((++count % 100) == 0) {
+ System.out.println(count);
+ }
+ if (count > 500000) {
+ break;
+ }
+ /*
+ * Modify the value for pathA in some random way
+ */
+ String newValue = modifyValueRandomly(valueA);
+ /*
+ * cldrFile.add would lead to UnsupportedOperationException("Resolved CLDRFiles are read-only");
+ * Instead do top.add(), which works since top.dataSource = cldrFile.dataSource.currentSource.
+ * First, need to do valueChanged to clear getSourceLocaleIDCache.
+ */
+ cldrFile.valueChanged(pathA);
+ top.add(pathA, newValue);
+
+ /*
+ * Reality check, did we really change the value returned by cldrFile.getStringValue?
+ */
+ String valueAX = cldrFile.getStringValue(pathA);
+ if (valueAX.equals(newValue)) {
+ // Good, expected
+ // System.out.println("Changing top changed cldrFile: newValue = " + newValue
+ // + "; valueAX = " + valueAX + "; valueA = " + valueA);
+ } else {
+ // Bad, didn't work as expected
+ System.out.println("Changing top did not change cldrFile: newValue = " + newValue
+ + "; valueAX = " + valueAX + "; valueA = " + valueA);
+ }
+ String starredA = USE_STARRED_PATHS ? pathStarrer.set(pathA) : null;
+ HashSet<String> a = USE_STARRED_PATHS ? dependenciesA.get(starredA) : null;
+ boolean maybeTypeA = ExampleGenerator.pathMightBeTypeA(pathA);
+
+ for (String pathB : paths) {
+ if (pathA.equals(pathB) || skipPathForDependencies(pathB, false)) {
+ continue;
+ }
+ /*
+ * For valueB, use originalValues.get(pathB), not cldrFile.getStringValue(pathB).
+ * They could be different if changing valueA changes valueB (probably due to aliasing).
+ * In that case, we're not interested in whether changing valueA changes valueB. We need
+ * to know whether changing valueA changes an example that was already cached, keyed by
+ * pathB and the original valueB.
+ */
+ String valueB = originalValues.get(pathB);
+ // String valueB = cldrFile.getStringValue(pathB);
+ if (valueB == null) {
+ continue;
+ }
+ if (false && pathA.equals("//ldml/localeDisplayNames/languages/language[@type=\"aa\"]")
+ && pathB.equals("//ldml/numbers/currencies/currency[@type=\"EUR\"]/symbol")) {
+ System.out.println("Got our paths in inner loop...");
+ }
+ pathB = pathB.intern();
+
+ // egTest.icuServiceBuilder.setCldrFile(cldrFile); // clear caches in icuServiceBuilder; has to be public
+ String exBase = egBase.getExampleHtml(pathB, valueB); // this will come from cache (or throw cacheOnly exception)
+ String exTest = egTest.getExampleHtml(pathB, valueB); // this won't come from cache
+ if ((exTest == null) != (exBase == null)) {
+ throw new InternalError("One null but not both? " + pathA + " --- " + pathB);
+ } else if (exTest != null && !exTest.equals(exBase)) {
+ if (!maybeTypeA) {
+ System.out.println("Warning: !maybeTypeA: " + pathA);
+ }
+ if (a == null) {
+ a = new HashSet<String>();
+ }
+ a.add(USE_STARRED_PATHS ? pathStarrer.set(pathB).intern() : pathB);
+
+ /***
+ HashSet<String> b = dependenciesB.get(pathB);
+ if (b == null) {
+ b = new HashSet<String>();
+ }
+ b.add(pathA);
+ dependenciesB.put(pathB, b);
+ ***/
+
+ ++dependencyCount;
+ }
+ }
+ if (a != null && !a.isEmpty()) {
+ dependenciesA.put(USE_STARRED_PATHS ? starredA : pathA, a);
+ }
+ /*
+ * Restore the original value, so that the changes due to this pathA don't get
+ * carried over to the next pathA. Again call valueChanged to clear getSourceLocaleIDCache.
+ */
+ top.add(pathA, valueA);
+ cldrFile.valueChanged(pathA);
+ String valueAXX = cldrFile.getStringValue(pathA);
+ if (!valueAXX.equals(valueA)) {
+ System.out.println("Failed to restore original value: valueAXX = " + valueAXX
+ + "; valueA = " + valueA);
+ }
+ }
+ final boolean countOnly = false;
+ writeDependenciesToFile(dependenciesA, "example_dependencies_A_" + localeId
+ + (USE_STARRED_PATHS ? "_star" : ""), countOnly);
+ // writeDependenciesToFile(dependenciesB, "example_dependencies_B_" + localeId, countOnly);
+ System.out.println("count = " + count + "; skipCount = " + skipCount + "; dependencyCount = " + dependencyCount);
+ }
+
+ /**
+ * Modify the given value string for testing dependencies
+ *
+ * @param value
+ * @return the modified value, guaranteed to be different from value
+ *
+ * TODO: avoid IllegalArgumentException thrown/caught in, e.g., ICUServiceBuilder.getSymbolString;
+ * this function might need path as parameter, to generate only "legal" values for specific paths.
+ */
+ private String modifyValueRandomly(String value) {
+ /*
+ * Change 1 to 0
+ */
+ String newValue = value.replace("1", "0");
+ if (!newValue.equals(value)) {
+ return newValue;
+ }
+ /*
+ * Change 0 to 1
+ */
+ newValue = value.replace("0", "1");
+ if (!newValue.equals(value)) {
+ return newValue;
+ }
+ /*
+ * String concatenation, e.g., change "foo" to "foo1"
+ */
+ return value + "1";
+ // return "1".equals(value) ? "2" : "1";
+ }
+
+ /**
+ * Get a CLDRFile that is mutable yet shares the same dataSource as a pre-existing
+ * resolving CLDRFile for the same locale.
+ *
+ * If cldrFile is the pre-existing resolving CLDRFile, and we return topCldrFile, then
+ * we'll end up with topCldrFile.dataSource = cldrFile.dataSource.currentSource, which
+ * will be a SimpleXMLSource.
+ *
+ * @param factory
+ * @param localeID
+ * @return the CLDRFile
+ */
+ private static CLDRFile makeMutableResolved(Factory factory, String localeID) {
+ XMLSource topSource = factory.makeSource(localeID).cloneAsThawed(); // make top one modifiable
+ List<XMLSource> parents = getParentSources(factory, localeID);
+ XMLSource[] a = new XMLSource[parents.size()];
+ return new CLDRFile(topSource, parents.toArray(a));
+ }
+
+ /**
+ * Get the parent sources for the given localeId
+ *
+ * @param factory
+ * @param localeID
+ * @return the List of XMLSource objects
+ *
+ * Called only by makeMutableResolved
+ */
+ private static List<XMLSource> getParentSources(Factory factory, String localeID) {
+ List<XMLSource> parents = new ArrayList<>();
+ for (String currentLocaleID = LocaleIDParser.getParent(localeID);
+ currentLocaleID != null;
+ currentLocaleID = LocaleIDParser.getParent(currentLocaleID)) {
+ parents.add(factory.makeSource(currentLocaleID));
+ }
+ return parents;
+ }
+
+ /**
+ * Should the given path be skipped when testing example-generator path dependencies?
+ *
+ * @param path
+ * @param isTypeA true if path is playing role of pathA not pathB
+ * @return true to skip, else false
+ */
+ private static boolean skipPathForDependencies(String path, boolean isTypeA) {
+ if (path.endsWith("/alias") || path.startsWith("//ldml/identity")) {
+ return true;
+ }
+ if (false && isTypeA) {
+ final String[] toSkip = {
+ "//ldml/characters/ellipsis",
+ "//ldml/characters/exemplarCharacters",
+ "//ldml/characters/parseLenients",
+ "//ldml/layout/orientation/lineOrder",
+ "//ldml/localeDisplayNames/codePatterns/codePattern",
+ "//ldml/localeDisplayNames/keys/key",
+ "//ldml/localeDisplayNames/languages/language",
+ "//ldml/localeDisplayNames/localeDisplayPattern/localeKeyTypePattern",
+ "//ldml/localeDisplayNames/localeDisplayPattern/localePattern",
+ "//ldml/localeDisplayNames/scripts/script",
+ "//ldml/localeDisplayNames/territories/territory",
+ "//ldml/localeDisplayNames/types/type",
+ "//ldml/localeDisplayNames/variants/variant",
+ };
+ for (String s: toSkip) {
+ if (path.startsWith(s)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Write the given map of example-generator path dependencies to a json file.
+ *
+ * If this function is to be used and revised long-term, it would be better to use JSONObject,
+ * or write a format other than json.
+ * JSONObject isn't currently linked to cldr-unittest TestAll, package org.unicode.cldr.unittest.
+ *
+ * @param dependencies the map of example-generator path dependencies
+ * @param fileName the name of the file to create, without path or extension
+ * @param countOnly true to show only the count of the set for each key path in the map
+ * false to include all the paths
+ *
+ * @throws IOException
+ */
+ private void writeDependenciesToFile(HashMap<String, HashSet<String>> dependencies, String fileName, boolean countOnly) throws IOException {
+ // JSONObject json = new JSONObject(dependencies);
+ // json.write(writer);
+ String dir = CLDRPaths.GEN_DIRECTORY + "test/";
+ String name = fileName + ".json";
+ PrintWriter writer = FileUtilities.openUTF8Writer(dir, name);
+ writer.println("{");
+
+ ArrayList<String> list = new ArrayList<String>(dependencies.keySet());
+ Collections.sort(list);
+ boolean firstPathA = true;
+ int keysWritten = 0;
+ for (String pathA : list) {
+ if (firstPathA) {
+ firstPathA = false;
+ } else {
+ writer.println(",");
+ }
+ HashSet<String> set = dependencies.get(pathA);
+ writer.print(" " + "\"" + pathA.replaceAll("\"", "\\\\\"") + "\"" + ": ");
+ if (countOnly) {
+ Integer count = set.size();
+ writer.println(count.toString());
+ } else {
+ writer.println("[");
+ boolean firstPathB = true;
+ for (String pathB : set) {
+ if (firstPathB) {
+ firstPathB = false;
+ } else {
+ writer.println(",");
+ }
+ writer.print(" " + "\"" + pathB.replaceAll("\"", "\\\\\"") + "\"");
+ }
+ writer.println("");
+ writer.print(" ]");
+ }
+ ++keysWritten;
+ }
+
+ writer.println("");
+ writer.println("}");
+ writer.close();
+ System.out.println("Wrote " + keysWritten + " keys to " + dir + name);
+ }
+}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleGenerator.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleGenerator.java
index 1467bd4..8b6f8ba 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleGenerator.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleGenerator.java
@@ -1,16 +1,17 @@
package org.unicode.cldr.unittest;
+import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
import org.unicode.cldr.test.ExampleGenerator;
-import org.unicode.cldr.test.ExampleGenerator.ExampleType;
import org.unicode.cldr.test.ExampleGenerator.UnitLength;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.Factory;
import org.unicode.cldr.util.PathStarrer;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
import org.unicode.cldr.util.With;
@@ -32,35 +33,34 @@
"fr",
"one",
"〖❬1,23 ❭value-one〗〖❬0,00 ❭value-one〗",
- "〖❬1,23❭_❬dollar des États-Unis❭〗〖❬1,23❭_❬euro❭〗〖❬0,00❭_❬dollar des États-Unis❭〗〖❬0,00❭_❬euro❭〗" },
+ "〖❬1,23❭_❬dollar des États-Unis❭〗〖❬1,23❭_❬euro❭〗〖❬0,00❭_❬dollar des États-Unis❭〗〖❬0,00❭_❬euro❭〗" },
{
"fr",
"other",
"〖❬2,34 ❭value-other〗〖❬3,45 ❭value-other〗",
- "〖❬2,34❭_❬dollars des États-Unis❭〗〖❬2,34❭_❬euros❭〗〖❬3,45❭_❬dollars des États-Unis❭〗〖❬3,45❭_❬euros❭〗" },
+ "〖❬2,34❭_❬dollars des États-Unis❭〗〖❬2,34❭_❬euros❭〗〖❬3,45❭_❬dollars des États-Unis❭〗〖❬3,45❭_❬euros❭〗" },
{ "en", "one", "〖❬1 ❭Bermudan dollar〗",
- "〖❬1❭ ❬US dollar❭〗〖❬1❭ ❬euro❭〗" },
+ "〖❬1❭ ❬US dollar❭〗〖❬1❭ ❬euro❭〗" },
{ "en", "other",
"〖❬1.23 ❭Bermudan dollars〗〖❬0.00 ❭Bermudan dollars〗",
- "〖❬1.23❭ ❬US dollars❭〗〖❬1.23❭ ❬euros❭〗〖❬0.00❭ ❬US dollars❭〗〖❬0.00❭ ❬euros❭〗" }, };
+ "〖❬1.23❭ ❬US dollars❭〗〖❬1.23❭ ❬euros❭〗〖❬0.00❭ ❬US dollars❭〗〖❬0.00❭ ❬euros❭〗" }, };
String sampleCurrencyPatternPrefix = "//ldml/numbers/currencyFormats[@numberSystem=\"latn\"]/unitPattern[@count=\"";
String sampleCurrencyPrefix = "//ldml/numbers/currencies/currency[@type=\"BMD\"]/displayName[@count=\"";
String sampleTemplateSuffix = "\"]";
for (String[] row : tests) {
- ExampleType exType = row[0].equals("en") ? ExampleType.ENGLISH : ExampleType.NATIVE;
ExampleGenerator exampleGenerator = getExampleGenerator(row[0]);
String value = "value-" + row[1];
String path = sampleCurrencyPrefix + row[1] + sampleTemplateSuffix;
String result = ExampleGenerator
- .simplify(exampleGenerator.getExampleHtml(path, value, exType), false);
+ .simplify(exampleGenerator.getExampleHtml(path, value), false);
assertEquals(row[0] + "-" + row[1] + "-BMD", row[2], result);
value = "{0}_{1}";
path = sampleCurrencyPatternPrefix + row[1] + sampleTemplateSuffix;
result = ExampleGenerator
- .simplify(exampleGenerator.getExampleHtml(path, value, exType), false);
+ .simplify(exampleGenerator.getExampleHtml(path, value), false);
assertEquals(row[0] + "-" + row[1] + "-pat", row[3], result);
}
}
@@ -157,11 +157,11 @@
"//ldml/typographicNames/styleName[@type=\"([^\"]*+)\"][@subtype=\"([^\"]*+)\"][@alt=\"([^\"]*+)\"]",
"//ldml/typographicNames/styleName[@type=\"([^\"]*+)\"][@subtype=\"([^\"]*+)\"]",
"//ldml/typographicNames/featureName[@type=\"([^\"]*+)\"]",
-
+
"//ldml/localeDisplayNames/subdivisions/subdivision[@type=\"([^\"]*+)\"]",
"//ldml/dates/timeZoneNames/zone[@type=\"([^\"]*+)\"]/long/standard" // Error: (TestExampleGenerator.java:245) No background: <Coordinated Universal Time> 〖Coordinated Universal Time〗
- );
+ );
// Add to above if the example SHOULD appear, but we don't have it yet. TODO Add later
@@ -192,7 +192,7 @@
"//ldml/units/durationUnit[@type=\"([^\"]*+)\"]/durationUnitPattern");
// Only add to above if the background should NEVER appear.
-
+
/**
* Add to this if the background SHOULD appear, but we don't have them yet.
* <br> The background is used when the element is used as part of another format.
@@ -229,7 +229,7 @@
}
continue;
}
- String example = exampleGenerator.getExampleHtml(path, value, ExampleType.NATIVE);
+ String example = exampleGenerator.getExampleHtml(path, value);
String javaEscapedStarred = "\""
+ plainStarred.replace("\"", "\\\"") + "\",";
if (example == null) {
@@ -258,8 +258,8 @@
if (TEMPORARY_OK_TO_MISS_BACKGROUND.contains(plainStarred)
&& logKnownIssue(
- "Cldrbug:6342",
- "Make sure that background appears: " + simplified + "; " + plainStarred)) {
+ "Cldrbug:6342",
+ "Make sure that background appears: " + simplified + "; " + plainStarred)) {
continue;
}
@@ -278,22 +278,22 @@
"//ldml/units/durationUnit[@type=\"hm\"]/durationUnitPattern");
checkValue(
"Length m",
- "〖❬1.00❭ meter〗",
+ "〖❬1❭ meter〗",
exampleGenerator,
"//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"length-meter\"]/unitPattern[@count=\"one\"]");
checkValue(
"Length m",
- "〖❬1.50❭ meters〗",
+ "〖❬1.5❭ meters〗",
exampleGenerator,
"//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"length-meter\"]/unitPattern[@count=\"other\"]");
checkValue(
"Length m",
- "〖❬1.50❭ m〗",
+ "〖❬1.5❭ m〗",
exampleGenerator,
"//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"length-meter\"]/unitPattern[@count=\"other\"]");
checkValue(
"Length m",
- "〖❬1.50❭m〗",
+ "〖❬1.5❭m〗",
exampleGenerator,
"//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"length-meter\"]/unitPattern[@count=\"other\"]");
}
@@ -301,26 +301,26 @@
private void checkValue(String message, String expected,
ExampleGenerator exampleGenerator, String path) {
String value = exampleGenerator.getCldrFile().getStringValue(path);
- String actual = exampleGenerator.getExampleHtml(path, value, ExampleType.NATIVE);
+ String actual = exampleGenerator.getExampleHtml(path, value);
assertEquals(message, expected,
ExampleGenerator.simplify(actual, false));
}
public void TestCompoundUnit() {
String[][] tests = {
- { "per", "LONG", "one", "〖❬1.00 meter❭ per ❬second❭〗" },
- { "per", "SHORT", "one", "〖❬1.00 m❭/❬sec❭〗" },
- { "per", "NARROW", "one", "〖❬1.00m❭/❬s❭〗" },
- { "per", "LONG", "other", "〖❬1.50 meters❭ per ❬second❭〗" },
- { "per", "SHORT", "other", "〖❬1.50 m❭/❬sec❭〗" },
- { "per", "NARROW", "other", "〖❬1.50m❭/❬s❭〗" },
- { "times", "LONG", "one", "〖❬1.00 newton❭⋅❬meter❭〗" },
- { "times", "SHORT", "one", "〖❬1.00 N❭⋅❬m❭〗" },
- { "times", "NARROW", "one", "〖❬1.00N❭⋅❬m❭〗" },
- { "times", "LONG", "other", "〖❬1.50 newton❭⋅❬meters❭〗" },
- { "times", "SHORT", "other", "〖❬1.50 N❭⋅❬m❭〗" },
- { "times", "NARROW", "other", "〖❬1.50N❭⋅❬m❭〗" },
- };
+ { "per", "LONG", "one", "〖❬1 meter❭ per ❬second❭〗" },
+ { "per", "SHORT", "one", "〖❬1 m❭/❬sec❭〗" },
+ { "per", "NARROW", "one", "〖❬1m❭/❬s❭〗" },
+ { "per", "LONG", "other", "〖❬1.5 meters❭ per ❬second❭〗" },
+ { "per", "SHORT", "other", "〖❬1.5 m❭/❬sec❭〗" },
+ { "per", "NARROW", "other", "〖❬1.5m❭/❬s❭〗" },
+ { "times", "LONG", "one", "〖❬1 newton❭⋅❬meter❭〗" },
+ { "times", "SHORT", "one", "〖❬1 N❭⋅❬m❭〗" },
+ { "times", "NARROW", "one", "〖❬1N❭⋅❬m❭〗" },
+ { "times", "LONG", "other", "〖❬1.5 newton❭⋅❬meters❭〗" },
+ { "times", "SHORT", "other", "〖❬1.5 N❭⋅❬m❭〗" },
+ { "times", "NARROW", "other", "〖❬1.5N❭⋅❬m❭〗" },
+ };
checkCompoundUnits("en", tests);
// reenable these after Arabic has meter translated
// String[][] tests2 = {
@@ -341,6 +341,91 @@
}
}
+ public void TestCompoundUnit2() {
+ String[][] tests = {
+ { "de", "LONG", "other", "Quadrat{0}", "〖❬1,5 ❭Quadrat❬meter❭〗" },
+
+ { "en", "SHORT", "one", "z{0}", "〖❬1 ❭z❬m❭〗" },
+ { "en", "LONG", "other", "zetta{0}", "〖❬1.5 ❭zetta❬meters❭〗" },
+
+ { "en", "SHORT", "one", "{0}²", "〖❬1 m❭²〗" },
+ { "en", "LONG", "other", "square {0}", "〖❬1.5 ❭square ❬meters❭〗" },
+
+ { "de", "SHORT", "one", "z{0}", "〖❬1 ❭z❬m❭〗" },
+ { "de", "LONG", "other", "Zetta{0}", "〖❬1,5 ❭Zetta❬meter❭〗" },
+
+ { "de", "SHORT", "one", "{0}²", "〖❬1 m❭²〗" },
+ { "de", "LONG", "other", "Quadrat{0}", "〖❬1,5 ❭Quadrat❬meter❭〗" },
+ };
+ for (String[] test : tests) {
+
+ ExampleGenerator exampleGenerator = getExampleGenerator(test[0]);
+
+ String actual = exampleGenerator.handleCompoundUnit1(
+ UnitLength.valueOf(test[1]),
+ Count.valueOf(test[2]),
+ test[3]);
+ assertEquals("CompoundUnit", test[4],
+ ExampleGenerator.simplify(actual, true));
+ }
+ }
+
+ public void TestCompoundUnit3() {
+ final Factory cldrFactory = CLDRConfig.getInstance().getCldrFactory();
+ String[][] tests = {
+ // locale, path, value, expected-example
+ { "en", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1",
+ "LOCALE", "〖square ❬meters❭〗" }, //
+ { "en", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"one\"]",
+ "LOCALE", "〖❬1 ❭square ❬meter❭〗" }, //
+ { "en", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"other\"]",
+ "LOCALE", "〖❬1.5 ❭square ❬meters❭〗" }, //
+
+ { "en", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1",
+ "LOCALE", "〖❬m❭²〗" },
+ { "en", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"one\"]",
+ "LOCALE", "〖❬1m❭²〗" },
+ { "en", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"other\"]",
+ "LOCALE", "〖❬1.5m❭²〗" },
+
+ // warning, french patterns has U+00A0 in them
+ { "fr", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1",
+ "Square {0}", "〖Square ❬mètres❭〗" },
+ { "fr", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"one\"]",
+ "square {0}", "〖❬1,5 ❭square ❬mètre❭〗" },
+ { "fr", "//ldml/units/unitLength[@type=\"long\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"other\"]",
+ "squares {0}", "〖❬3,5 ❭squares ❬mètres❭〗" },
+
+ { "fr", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1",
+ "LOCALE", "〖❬m❭²〗" },
+ { "fr", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"one\"]",
+ "LOCALE", "〖❬1,5m❭²〗" },
+ { "fr", "//ldml/units/unitLength[@type=\"narrow\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1[@count=\"other\"]",
+ "LOCALE", "〖❬3,5m❭²〗" },
+ };
+
+ int lineCount = 0;
+ for (String[] test : tests) {
+
+ final String localeID = test[0];
+ final String xpath = test[1];
+ String value = test[2];
+ String expected = test[3];
+
+ ExampleGenerator exampleGenerator = getExampleGenerator(localeID);
+
+ if (value.equals("LOCALE")) {
+ value = cldrFactory.make(localeID, true).getStringValue(xpath);
+ }
+ String actual = exampleGenerator.getExampleHtml(xpath, value);
+ assertEquals(++lineCount + ") "
+ + localeID
+ + ", CompoundUnit3", expected,
+ ExampleGenerator.simplify(actual, false));
+ }
+
+ }
+
HashMap<String, ExampleGenerator> ExampleGeneratorCache = new HashMap<String, ExampleGenerator>();
private ExampleGenerator getExampleGenerator(String locale) {
@@ -373,7 +458,7 @@
String expected) {
String value = exampleGenerator.getCldrFile().getStringValue(path);
String result = ExampleGenerator.simplify(
- exampleGenerator.getExampleHtml(path, value, ExampleType.NATIVE), false);
+ exampleGenerator.getExampleHtml(path, value), false);
assertEquals("Ellipsis", expected, result);
}
@@ -421,22 +506,22 @@
ExampleGenerator exampleGenerator = getExampleGenerator("it");
String actual = exampleGenerator.getExampleHtml(
"//ldml/localeDisplayNames/localeDisplayPattern/localePattern",
- "{0} [{1}]", ExampleType.NATIVE);
+ "{0} [{1}]");
assertEquals(
"localePattern example faulty",
"<div class='cldr_example'><span class='cldr_substituted'>uzbeco</span> [<span class='cldr_substituted'>Afghanistan</span>]</div>"
+ "<div class='cldr_example'><span class='cldr_substituted'>uzbeco</span> [<span class='cldr_substituted'>arabo, Afghanistan</span>]</div>"
+ "<div class='cldr_example'><span class='cldr_substituted'>uzbeco</span> [<span class='cldr_substituted'>arabo, Afghanistan, Cifre indo-arabe, Fuso orario: Ora Etiopia</span>]</div>",
- actual);
+ actual);
actual = exampleGenerator
.getExampleHtml(
"//ldml/localeDisplayNames/localeDisplayPattern/localeSeparator",
- "{0}. {1}", ExampleType.NATIVE);
+ "{0}. {1}");
assertEquals(
"localeSeparator example faulty",
"<div class='cldr_example'><span class='cldr_substituted'>uzbeco (arabo</span>. <span class='cldr_substituted'>Afghanistan)</span></div>"
+ "<div class='cldr_example'><span class='cldr_substituted'>uzbeco (arabo</span>. <span class='cldr_substituted'>Afghanistan</span>. <span class='cldr_substituted'>Cifre indo-arabe</span>. <span class='cldr_substituted'>Fuso orario: Ora Etiopia)</span></div>",
- actual);
+ actual);
}
public void TestCurrencyFormats() {
@@ -444,9 +529,9 @@
String actual = simplify(exampleGenerator
.getExampleHtml(
"//ldml/numbers/currencyFormats[@numberSystem=\"latn\"]/currencyFormatLength/currencyFormat[@type=\"standard\"]/pattern[@type=\"standard\"]",
- "¤ #0.00", ExampleType.ENGLISH));
+ "¤ #0.00"));
assertEquals("Currency format example faulty",
- "〖USD ❬1295,00❭〗〖-USD ❬1295,00❭〗", actual);
+ "〖€ ❬1295,00❭〗〖-€ ❬1295,00❭〗", actual);
}
public void TestSymbols() {
@@ -456,7 +541,7 @@
String actual = exampleGenerator
.getExampleHtml(
"//ldml/numbers/symbols[@numberSystem=\"latn\"]/superscriptingExponent",
- "x", ExampleType.NATIVE);
+ "x");
assertEquals(
"superscriptingExponent faulty",
@@ -469,7 +554,7 @@
info.getEnglish(), info.getEnglish(),
CLDRPaths.DEFAULT_SUPPLEMENTAL_DIRECTORY);
String actual = exampleGenerator.getExampleHtml(
- "//ldml/dates/timeZoneNames/fallbackFormat", "{1} [{0}]", ExampleType.NATIVE);
+ "//ldml/dates/timeZoneNames/fallbackFormat", "{1} [{0}]");
assertEquals("fallbackFormat faulty", "〖❬Central Time❭ [❬Cancun❭]〗",
ExampleGenerator.simplify(actual, false));
}
@@ -480,13 +565,13 @@
"//ldml/dates/timeZoneNames",
exampleGenerator.getCldrFile().getComparator()))) {
String value = exampleGenerator.getCldrFile().getStringValue(xpath);
- String actual = exampleGenerator.getExampleHtml(xpath, value, ExampleType.NATIVE);
+ String actual = exampleGenerator.getExampleHtml(xpath, value);
if (actual == null) {
if (!xpath.contains("singleCountries")
&& !xpath.contains("gmtZeroFormat")) {
errln("Null value for " + value + "\t" + xpath);
// for debugging
- exampleGenerator.getExampleHtml(xpath, value, ExampleType.NATIVE);
+ exampleGenerator.getExampleHtml(xpath, value);
}
} else {
logln(actual + "\t" + value + "\t" + xpath);
@@ -498,19 +583,19 @@
String[][] testPairs = {
{
"//ldml/numbers/currencies/currency[@type=\"BMD\"]/displayName[@count=\"other\"]",
- "〖❬1,23 ❭dollari delle Bermuda〗〖❬0,00 ❭dollari delle Bermuda〗" },
+ "〖❬1,23 ❭dollari delle Bermuda〗〖❬0,00 ❭dollari delle Bermuda〗" },
{
"//ldml/numbers/currencyFormats[@numberSystem=\"latn\"]/unitPattern[@count=\"other\"]",
- "〖❬1,23❭ ❬dollari statunitensi❭〗〖❬1,23❭ ❬euro❭〗〖❬0,00❭ ❬dollari statunitensi❭〗〖❬0,00❭ ❬euro❭〗" },
+ "〖❬1,23❭ ❬dollari statunitensi❭〗〖❬1,23❭ ❬euro❭〗〖❬0,00❭ ❬dollari statunitensi❭〗〖❬0,00❭ ❬euro❭〗" },
{ "//ldml/numbers/currencies/currency[@type=\"BMD\"]/symbol",
- "〖❬123.456,79 ❭BMD〗" }, };
+ "〖❬123.456,79 ❭BMD〗" }, };
ExampleGenerator exampleGenerator = getExampleGenerator("it");
for (String[] testPair : testPairs) {
String xpath = testPair[0];
String expected = testPair[1];
String value = exampleGenerator.getCldrFile().getStringValue(xpath);
- String actual = simplify(exampleGenerator.getExampleHtml(xpath, value, ExampleType.NATIVE));
+ String actual = simplify(exampleGenerator.getExampleHtml(xpath, value));
assertEquals("specifics", expected, actual);
}
}
@@ -519,7 +604,7 @@
String[][] testPairs = {
{
"//ldml/numbers/decimalFormats[@numberSystem=\"latn\"]/decimalFormatLength[@type=\"long\"]/decimalFormat[@type=\"standard\"]/pattern[@type=\"1000\"][@count=\"one\"]",
- "<div class='cldr_example'><span class='cldr_substituted'>1</span> thousand</div>" },
+ "<div class='cldr_example'><span class='cldr_substituted'>1</span> thousand</div>" },
{
"//ldml/numbers/percentFormats[@numberSystem=\"latn\"]/percentFormatLength/percentFormat[@type=\"standard\"]/pattern[@type=\"standard\"]",
"<div class='cldr_example'><span class='cldr_substituted'>5</span>%</div>"
@@ -533,7 +618,7 @@
String xpath = testPair[0];
String expected = testPair[1];
String value = nativeCldrFile.getStringValue(xpath);
- String actual = exampleGenerator.getExampleHtml(xpath, value, ExampleType.NATIVE);
+ String actual = exampleGenerator.getExampleHtml(xpath, value);
assertEquals("specifics", expected, actual);
}
}
@@ -562,36 +647,34 @@
private void checkPathValue(ExampleGenerator exampleGenerator,
String xpath, String value, String expected) {
Set<String> alreadySeen = new HashSet<String>();
- for (ExampleType exType : ExampleType.values()) {
- try {
- String text = exampleGenerator.getExampleHtml(xpath, value, exType);
- if (text == null)
- continue;
- if (text.contains("Exception")) {
- errln("getExampleHtml\t" + exType + "\t" + text);
- } else if (!alreadySeen.contains(text)) {
- if (text.contains("n/a")) {
- if (text.contains("<")) {
- errln("Text not quoted correctly:" + "\t" + text
- + "\t" + xpath);
- }
+ try {
+ String text = exampleGenerator.getExampleHtml(xpath, value);
+ if (text == null) {
+ // skip
+ } else if (text.contains("Exception")) {
+ errln("getExampleHtml\t" + text);
+ } else if (!alreadySeen.contains(text)) {
+ if (text.contains("n/a")) {
+ if (text.contains("<")) {
+ errln("Text not quoted correctly:" + "\t" + text
+ + "\t" + xpath);
}
- boolean skipLog = false;
- if (expected != null && exType == ExampleType.NATIVE) {
- String simplified = ExampleGenerator.simplify(text, false);
- // redo for debugging
- text = exampleGenerator.getExampleHtml(xpath, value, exType);
- skipLog = !assertEquals("Example text for «" + value + "»", expected, simplified);
- }
- if (!skipLog) {
- logln("getExampleHtml\t" + exType + "\t" + text + "\t"
- + xpath);
- }
- alreadySeen.add(text);
}
- } catch (Exception e) {
- errln("getExampleHtml\t" + exType + "\t" + e.getMessage());
+ boolean skipLog = false;
+ if (expected != null) {
+ String simplified = ExampleGenerator.simplify(text, false);
+ // redo for debugging
+ text = exampleGenerator.getExampleHtml(xpath, value);
+ skipLog = !assertEquals("Example text for «" + value + "»", expected, simplified);
+ }
+ if (!skipLog) {
+ logln("getExampleHtml\t" + text + "\t"
+ + xpath);
+ }
+ alreadySeen.add(text);
}
+ } catch (Exception e) {
+ errln("getExampleHtml\t" + e.getMessage());
}
try {
@@ -635,7 +718,7 @@
expected);
}
- //ldml/numbers/currencyFormats[@numberSystem="latn"]/currencyFormatLength[@type="short"]/currencyFormat[@type="standard"]/pattern[@type="1000"][@count="one"]
+//ldml/numbers/currencyFormats[@numberSystem="latn"]/currencyFormatLength[@type="short"]/currencyFormat[@type="standard"]/pattern[@type="1000"][@count="one"]
public void TestDayPeriods() {
//checkDayPeriod("da", "format", "morning1", "〖05:00 – 10:00〗〖❬7:30❭ morgens〗");
@@ -667,4 +750,44 @@
String path = prefix + type + suffix;
checkPathValue(exampleGenerator, path, cldrFile.getStringValue(path), expected);
}
+
+ /**
+ * Test that getExampleHtml returns same output for same input regardless of
+ * order in which it is called with different inputs.
+ *
+ * Calling getExampleHtml with a particular path and value presumably should NOT depend on the
+ * history of paths and/or values it has been called with previously.
+ *
+ * We formerly got different examples for SPECIAL_PATH depending on whether an example was
+ * first gotten for USE_EVIL_PATH.
+ *
+ * Without EVIL_PATH, got right value for SPECIAL_PATH:
+ * <div class='cldr_example'><span class='cldr_substituted'>123 456,79 </span>€</div>
+ *
+ * With EVIL_PATH, got wrong value for SPECIAL_PATH:
+ * <div class='cldr_example'><span class='cldr_substituted'>123457 k </span>€</div>
+ *
+ * This was fixed by doing clone() before returning a DecimalFormat in ICUServiceBuilder.
+ * Reference: https://unicode-org.atlassian.net/browse/CLDR-13375.
+ *
+ * @throws IOException
+ */
+ public void TestExampleGeneratorConsistency() throws IOException {
+ final String EVIL_PATH = "//ldml/numbers/currencyFormats/currencyFormatLength[@type=\"short\"]/currencyFormat[@type=\"standard\"]/pattern[@type=\"10000\"][@count=\"one\"]";
+ final String SPECIAL_PATH = "//ldml/numbers/currencies/currency[@type=\"EUR\"]/symbol";
+ final String EXPECTED = "123 456,79";
+
+ final CLDRFile cldrFile = info.getCLDRFile("fr", true);
+ final ExampleGenerator eg = new ExampleGenerator(cldrFile, info.getEnglish(), CLDRPaths.DEFAULT_SUPPLEMENTAL_DIRECTORY);
+
+ final String evilValue = cldrFile.getStringValue(EVIL_PATH);
+ final String specialValue = cldrFile.getStringValue(SPECIAL_PATH);
+
+ eg.getExampleHtml(EVIL_PATH, evilValue);
+ final String specialExample = eg.getExampleHtml(SPECIAL_PATH, specialValue);
+
+ if (!specialExample.contains(EXPECTED)) {
+ errln("Expected example to contain " + EXPECTED + "; got " + specialExample);
+ }
+ }
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestInheritance.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestInheritance.java
index 0731d0f..8f6ec8b 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestInheritance.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestInheritance.java
@@ -392,7 +392,7 @@
Set<String> skip = Builder.with(new HashSet<String>())
.addAll("root", "und")
.freeze();
- Set<String> languagesWithOneOrLessLocaleScriptInCommon = new HashSet<String>(Arrays.asList("bm", "ha", "ms", "iu", "mn"));
+ Set<String> languagesWithOneOrLessLocaleScriptInCommon = new HashSet<String>(Arrays.asList("bm", "ha", "hi", "ms", "iu", "mn"));
// for each base we have to have,
// if multiscript, we have default contents for base+script,
// base+script+region;
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocalCurrency.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocalCurrency.java
index 1c1ef6b..0914753 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocalCurrency.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocalCurrency.java
@@ -27,6 +27,7 @@
private int maxLocalizedSymbols(String region) {
final List<String> regionsWithTwoCurrencySymbols = Arrays.asList("AE", "AZ",
"BA", "CN", "DZ", "ET", "IQ", "IR", "LK", "KM", "MA", "MR", "MK", "PK",
+ "NE", "GW", "CM", "SN", "BF", // << ff_Adlm regions are multiscript, Latn+Adlm
"RS", "SD", "SY", "TN", "UZ");
if (regionsWithTwoCurrencySymbols.contains(region)) {
return 2;
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocale.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocale.java
index a2eb9ef..b7f88ee 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocale.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocale.java
@@ -17,7 +17,6 @@
import javax.xml.xpath.XPathException;
import org.unicode.cldr.test.ExampleGenerator;
-import org.unicode.cldr.test.ExampleGenerator.ExampleType;
import org.unicode.cldr.util.AttributeValueValidity;
import org.unicode.cldr.util.AttributeValueValidity.MatcherPattern;
import org.unicode.cldr.util.CLDRConfig;
@@ -78,7 +77,7 @@
public void TestLanguageRegions() {
Set<String> missingLanguageRegion = new LinkedHashSet<String>();
// TODO This should be derived from metadata: https://unicode.org/cldr/trac/ticket/11224
- Set<String> knownMultiScriptLanguages = new HashSet<String>(Arrays.asList("az", "ff", "bs", "pa", "shi", "sr", "vai", "uz", "yue", "zh"));
+ Set<String> knownMultiScriptLanguages = new HashSet<String>(Arrays.asList("az", "ff", "bs", "hi", "ks", "mni", "ms", "pa", "sat", "sd", "shi", "sr", "su", "vai", "uz", "yue", "zh"));
Set<String> available = testInfo.getCldrFactory().getAvailable();
LanguageTagParser ltp = new LanguageTagParser();
Set<String> defaultContents = SUPPLEMENTAL_DATA_INFO
@@ -411,14 +410,15 @@
if (row[0] != null) {
int typeCode = CLDRFile.typeNameToCode(row[0]);
String standAlone = f.getName(typeCode, row[1]);
+ logln(typeCode + ": " + standAlone);
if (!assertEquals("stand-alone " + row[3], row[2], standAlone)) {
typeCode = CLDRFile.typeNameToCode(row[0]);
standAlone = f.getName(typeCode, row[1]);
}
- ;
+
if (row[5] != null) {
String path = CLDRFile.getKey(typeCode, row[1]);
- String example = eg.getExampleHtml(path, "?" + row[2] + "?", ExampleType.NATIVE);
+ String example = eg.getExampleHtml(path, "?" + row[2] + "?");
assertEquals("example " + row[3], row[5], ExampleGenerator.simplify(example));
}
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPathHeader.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPathHeader.java
index 031f4f1..d18f44f 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPathHeader.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPathHeader.java
@@ -20,7 +20,6 @@
import org.unicode.cldr.test.CoverageLevel2;
import org.unicode.cldr.test.ExampleGenerator;
-import org.unicode.cldr.test.ExampleGenerator.ExampleType;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRFile.Status;
@@ -46,7 +45,6 @@
import org.unicode.cldr.util.PatternPlaceholders;
import org.unicode.cldr.util.PatternPlaceholders.PlaceholderInfo;
import org.unicode.cldr.util.PatternPlaceholders.PlaceholderStatus;
-import org.unicode.cldr.util.PrettyPath;
import org.unicode.cldr.util.StandardCodes;
import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo;
@@ -184,7 +182,11 @@
try {
ph = pathHeaderFactory2.fromPath(p);
} catch (Exception e1) {
- throw new IllegalArgumentException(locale + ":\t" + p);
+ try {
+ ph = pathHeaderFactory2.fromPath(p);
+ } catch (Exception e2) {
+ throw new IllegalArgumentException(locale + ":\t" + p, e2);
+ }
}
if (ph == null) {
errln("Failed to create path from: " + p);
@@ -331,7 +333,7 @@
placeholderInfo2.example);
}
ExampleGenerator eg = new ExampleGenerator(cldrFile, cldrFile, CLDRPaths.SUPPLEMENTAL_DIRECTORY);
- String example = eg.getExampleHtml(APPEND_TIMEZONE, cldrFile.getStringValue(APPEND_TIMEZONE), ExampleType.NATIVE);
+ String example = eg.getExampleHtml(APPEND_TIMEZONE, cldrFile.getStringValue(APPEND_TIMEZONE));
String result = ExampleGenerator.simplify(example, false);
assertEquals("", "〖❬6:25:59 PM❭ ❬GMT❭〗", result);
}
@@ -339,7 +341,6 @@
public void TestOptional() {
if (true) return;
Map<PathHeader, String> sorted = new TreeMap<PathHeader, String>();
- XPathParts parts = new XPathParts();
for (String locale : new String[] { "af" }) {
sorted.clear();
CLDRFile cldrFile = info.getCLDRFile(locale, true);
@@ -664,8 +665,6 @@
EnumMap<SurveyToolStatus, Relation<String, String>> info2 = new EnumMap<SurveyToolStatus, Relation<String, String>>(
SurveyToolStatus.class);
Set<String> nuked = new HashSet<String>();
- PrettyPath pp = new PrettyPath();
- XPathParts parts = new XPathParts();
Set<String> deprecatedStar = new HashSet<String>();
Set<String> differentStar = new HashSet<String>();
@@ -767,7 +766,7 @@
PathDescription pathDescription = new PathDescription(supplemental,
english, null, null, PathDescription.ErrorHandling.CONTINUE);
Matcher normal = PatternCache.get(
- "http://cldr.org/translation/[a-zA-Z0-9_]").matcher("");
+ "http://cldr.org/translation/[-a-zA-Z0-9_]").matcher("");
// http://cldr.unicode.org/translation/plurals#TOC-Minimal-Pairs
Set<String> alreadySeen = new HashSet<String>();
PathStarrer starrer = new PathStarrer();
@@ -1114,7 +1113,6 @@
public void TestCompletenessNonLdmlDtd() {
PathChecker pathChecker = new PathChecker();
Set<String> directories = new LinkedHashSet<>();
- XPathParts parts = new XPathParts();
Multimap<String, String> pathValuePairs = LinkedListMultimap.create();
// get all the directories containing non-Ldml dtd files
for (DtdType dtdType : DtdType.values()) {
@@ -1140,7 +1138,8 @@
final String path = pathValue.getFirst();
final String value = pathValue.getSecond();
// logln("\t\t" + path);
- if (path.startsWith("//supplementalData/weekData/weekOf")) {
+ if (path.startsWith("//supplementalData/unitPreferenceData/unitPreferences")
+ && path.contains("skeleton")) {
int debug = 0;
}
pathChecker.checkPathHeader(dtdData, path);
@@ -1184,6 +1183,9 @@
public void checkSubpath(String path) {
String message = ": Can't compute path header";
+ if (path.contentEquals("//supplementalData/grammaticalData/grammaticalFeatures[@targets=\"nominal\"][@locales=\"it\"]/grammaticalGender/_values") ) {
+ int debug = 0;
+ }
PathHeader ph = null;
try {
ph = phf.fromPath(path);
@@ -1214,6 +1216,13 @@
String star = starrer.set(path);
if (badHeaders.add(star)) {
errln(star + message + ", " + ph);
+ System.out.println("\tNo match in PathHeader.txt for " + path
+ + "\n\tYou get only one message for all paths matching " + star
+ + "\n\tFor example, check to see if the field in PathHeader.txt is in PathHeader.PageId."
+ + "\n\tIf not, either correct PathHeader.txt or add it to PageId"
+ + "\n\tIf you have a value attribute, you will need extra _ characters. The value attribute will show at the end with prefixed _, eg [...]/_skeleton."
+ + "If there can be a value for the path then that element will add _. "
+ );
}
}
}
@@ -1326,7 +1335,9 @@
assertEquals("Section", lastItem.getSectionId(), item.getSectionId());
assertEquals("Page", lastItem.getPageId(), item.getPageId());
assertEquals("Header", lastItem.getHeader(), item.getHeader());
- assertTrue(lastItem + " < " + item, lastItem.compareTo(item) < 0);
+ if (!assertTrue(lastItem + " < " + item, lastItem.compareTo(item) < 0)) {
+ lastItem.compareTo(item); // for debugging
+ }
}
lastItem = item;
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java
index 3a8ceec..9bfc693 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java
@@ -260,7 +260,7 @@
if (ALLOWED.contains(elementName)) {
return false;
}
- testPaths.errln("Deprecated item in data: "
+ testPaths.errln("Deprecated element in data: "
+ dtdData.dtdType
+ ":" + elementName
+ " \t;" + fullName);
@@ -270,7 +270,7 @@
for (Entry<String, String> attributeNValue : parts.getAttributes(i).entrySet()) {
String attributeName = attributeNValue.getKey();
if (dtdData.isDeprecated(elementName, attributeName, "*")) {
- testPaths.errln("Deprecated item in data: "
+ testPaths.errln("Deprecated attribute in data: "
+ dtdData.dtdType
+ ":" + elementName
+ ":" + attributeName
@@ -279,7 +279,7 @@
}
String attributeValue = attributeNValue.getValue();
if (dtdData.isDeprecated(elementName, attributeName, attributeValue)) {
- testPaths.errln("Deprecated item in data: "
+ testPaths.errln("Deprecated attribute value in data: "
+ dtdData.dtdType
+ ":" + elementName
+ ":" + attributeName
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestSupplementalInfo.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestSupplementalInfo.java
index 735b536..ad27b34 100644
--- a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestSupplementalInfo.java
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestSupplementalInfo.java
@@ -374,7 +374,7 @@
}
}
- ImmutableSet<String> variants = ImmutableSet.of("Aran", "Cyrs", "Geok", "Latf", "Latg", "Syre", "Syrj", "Syrn");
+ ImmutableSet<String> variants = ImmutableSet.of("Cyrs", "Geok", "Latf", "Latg", "Syre", "Syrj", "Syrn");
assertRelation("getCLDRScriptCodes contains variants", false, codes, CONTAINS_SOME, variants);
}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestUnits.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestUnits.java
new file mode 100644
index 0000000..2d3a19c
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestUnits.java
@@ -0,0 +1,1706 @@
+package org.unicode.cldr.unittest;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import org.unicode.cldr.draft.FileUtilities;
+import org.unicode.cldr.test.ExampleGenerator;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.DtdType;
+import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.MapComparator;
+import org.unicode.cldr.util.Pair;
+import org.unicode.cldr.util.Rational;
+import org.unicode.cldr.util.Rational.ContinuedFraction;
+import org.unicode.cldr.util.Rational.FormatStyle;
+import org.unicode.cldr.util.Rational.RationalParser;
+import org.unicode.cldr.util.SimpleXMLSource;
+import org.unicode.cldr.util.StandardCodes.LstrType;
+import org.unicode.cldr.util.SupplementalDataInfo;
+import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo;
+import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
+import org.unicode.cldr.util.SupplementalDataInfo.PluralType;
+import org.unicode.cldr.util.UnitConverter;
+import org.unicode.cldr.util.UnitConverter.Continuation;
+import org.unicode.cldr.util.UnitConverter.ConversionInfo;
+import org.unicode.cldr.util.UnitConverter.TargetInfo;
+import org.unicode.cldr.util.UnitConverter.UnitId;
+import org.unicode.cldr.util.UnitPreferences;
+import org.unicode.cldr.util.UnitPreferences.UnitPreference;
+import org.unicode.cldr.util.Units;
+import org.unicode.cldr.util.Validity;
+import org.unicode.cldr.util.Validity.Status;
+import org.unicode.cldr.util.XMLSource;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.TreeMultimap;
+import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.ICUUncheckedIOException;
+import com.ibm.icu.util.Output;
+
+public class TestUnits extends TestFmwk {
+ private static final boolean SHOW_DATA = CldrUtility.getProperty("TestUnits:SHOW_DATA", false); // set for verbose debugging information
+ private static final boolean GENERATE_TESTS = CldrUtility.getProperty("TestUnits:GENERATE_TESTS", false);
+
+ private static final String TEST_SEP = ";\t";
+
+ private static final ImmutableSet<String> WORLD_SET = ImmutableSet.of("001");
+ private static final CLDRConfig info = CLDRConfig.getInstance();
+ private static final SupplementalDataInfo SDI = info.getSupplementalDataInfo();
+
+ static final UnitConverter converter = SDI.getUnitConverter();
+ static final Splitter SPLIT_SEMI = Splitter.on(Pattern.compile("\\s*;\\s*")).trimResults();
+ static final Splitter SPLIT_SPACE = Splitter.on(' ').trimResults().omitEmptyStrings();
+ static final Splitter SPLIT_AND = Splitter.on("-and-").trimResults().omitEmptyStrings();
+
+ static final Rational R1000 = Rational.of(1000);
+
+ public static void main(String[] args) {
+ new TestUnits().run(args);
+ }
+
+ private Map<String, String> BASE_UNIT_TO_QUANTITY = converter.getBaseUnitToQuantity();
+
+ public void TestSpaceInNarrowUnits() {
+ final CLDRFile english = CLDRConfig.getInstance().getEnglish();
+ final Matcher m = Pattern.compile("narrow.*unitPattern").matcher("");
+ for (String path : english) {
+ if (m.reset(path).find()) {
+ String value = english.getStringValue(path);
+ if (value.contains("} ")) {
+ errln(path + " fails, «" + value + "» contains } + space");
+ }
+ }
+ }
+ }
+
+ static final String[][] COMPOUND_TESTS = {
+ {"area-square-centimeter", "square", "length-centimeter"},
+ {"area-square-foot", "square", "length-foot"},
+ {"area-square-inch", "square", "length-inch"},
+ {"area-square-kilometer", "square", "length-kilometer"},
+ {"area-square-meter", "square", "length-meter"},
+ {"area-square-mile", "square", "length-mile"},
+ {"area-square-yard", "square", "length-yard"},
+ {"digital-gigabit", "giga", "digital-bit"},
+ {"digital-gigabyte", "giga", "digital-byte"},
+ {"digital-kilobit", "kilo", "digital-bit"},
+ {"digital-kilobyte", "kilo", "digital-byte"},
+ {"digital-megabit", "mega", "digital-bit"},
+ {"digital-megabyte", "mega", "digital-byte"},
+ {"digital-petabyte", "peta", "digital-byte"},
+ {"digital-terabit", "tera", "digital-bit"},
+ {"digital-terabyte", "tera", "digital-byte"},
+ {"duration-microsecond", "micro", "duration-second"},
+ {"duration-millisecond", "milli", "duration-second"},
+ {"duration-nanosecond", "nano", "duration-second"},
+ {"electric-milliampere", "milli", "electric-ampere"},
+ {"energy-kilocalorie", "kilo", "energy-calorie"},
+ {"energy-kilojoule", "kilo", "energy-joule"},
+ {"frequency-gigahertz", "giga", "frequency-hertz"},
+ {"frequency-kilohertz", "kilo", "frequency-hertz"},
+ {"frequency-megahertz", "mega", "frequency-hertz"},
+ {"graphics-megapixel", "mega", "graphics-pixel"},
+ {"length-centimeter", "centi", "length-meter"},
+ {"length-decimeter", "deci", "length-meter"},
+ {"length-kilometer", "kilo", "length-meter"},
+ {"length-micrometer", "micro", "length-meter"},
+ {"length-millimeter", "milli", "length-meter"},
+ {"length-nanometer", "nano", "length-meter"},
+ {"length-picometer", "pico", "length-meter"},
+ {"mass-kilogram", "kilo", "mass-gram"},
+ {"mass-microgram", "micro", "mass-gram"},
+ {"mass-milligram", "milli", "mass-gram"},
+ {"power-gigawatt", "giga", "power-watt"},
+ {"power-kilowatt", "kilo", "power-watt"},
+ {"power-megawatt", "mega", "power-watt"},
+ {"power-milliwatt", "milli", "power-watt"},
+ {"pressure-hectopascal", "hecto", "pressure-pascal"},
+ {"pressure-millibar", "milli", "pressure-bar"},
+ {"pressure-kilopascal", "kilo", "pressure-pascal"},
+ {"pressure-megapascal", "mega", "pressure-pascal"},
+ {"volume-centiliter", "centi", "volume-liter"},
+ {"volume-cubic-centimeter", "cubic", "length-centimeter"},
+ {"volume-cubic-foot", "cubic", "length-foot"},
+ {"volume-cubic-inch", "cubic", "length-inch"},
+ {"volume-cubic-kilometer", "cubic", "length-kilometer"},
+ {"volume-cubic-meter", "cubic", "length-meter"},
+ {"volume-cubic-mile", "cubic", "length-mile"},
+ {"volume-cubic-yard", "cubic", "length-yard"},
+ {"volume-deciliter", "deci", "volume-liter"},
+ {"volume-hectoliter", "hecto", "volume-liter"},
+ {"volume-megaliter", "mega", "volume-liter"},
+ {"volume-milliliter", "milli", "volume-liter"},
+ };
+
+ static final String[][] PREFIX_NAME_TYPE = {
+ {"deci", "10p-1"},
+ {"centi", "10p-2"},
+ {"milli", "10p-3"},
+ {"micro", "10p-6"},
+ {"nano", "10p-9"},
+ {"pico", "10p-12"},
+ {"femto", "10p-15"},
+ {"atto", "10p-18"},
+ {"zepto", "10p-21"},
+ {"yocto", "10p-24"},
+ {"deka", "10p1"},
+ {"hecto", "10p2"},
+ {"kilo", "10p3"},
+ {"mega", "10p6"},
+ {"giga", "10p9"},
+ {"tera", "10p12"},
+ {"peta", "10p15"},
+ {"exa", "10p18"},
+ {"zetta", "10p21"},
+ {"yotta", "10p24"},
+ {"square", "power2"},
+ {"cubic", "power3"},
+ };
+
+ static final String PATH_UNIT_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/unit[@type=\"{1}\"]/unitPattern[@count=\"{2}\"]";
+
+ static final String PATH_PREFIX_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/compoundUnit[@type=\"{1}\"]/unitPrefixPattern";
+ static final String PATH_SUFFIX_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/compoundUnit[@type=\"{1}\"]/compoundUnitPattern1";
+
+ static final String PATH_MILLI_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/compoundUnit[@type=\"10p-3\"]/unitPrefixPattern";
+ static final String PATH_SQUARE_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/compoundUnit[@type=\"power2\"]/compoundUnitPattern1";
+
+
+ static final String PATH_METER_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/unit[@type=\"length-meter\"]/unitPattern[@count=\"{1}\"]";
+ static final String PATH_MILLIMETER_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/unit[@type=\"length-millimeter\"]/unitPattern[@count=\"{1}\"]";
+ static final String PATH_SQUARE_METER_PATTERN = "//ldml/units/unitLength[@type=\"{0}\"]/unit[@type=\"area-square-meter\"]/unitPattern[@count=\"{1}\"]";
+
+ public void TestCompoundUnit3() {
+ Factory factory = CLDRConfig.getInstance().getCldrFactory();
+
+ Map<String,String> prefixToType = new LinkedHashMap<>();
+ for (String[] prefixRow : PREFIX_NAME_TYPE) {
+ prefixToType.put(prefixRow[0], prefixRow[1]);
+ }
+ prefixToType = ImmutableMap.copyOf(prefixToType);
+
+ Set<String> localesToTest = ImmutableSet.of("en"); // factory.getAvailableLanguages();
+ int testCount = 0;
+ for (String locale : localesToTest) {
+ CLDRFile file = factory.make(locale, true);
+ //ExampleGenerator exampleGenerator = getExampleGenerator(locale);
+ PluralInfo pluralInfo = SDI.getPlurals(PluralType.cardinal, locale);
+ final boolean isEnglish = locale.contentEquals("en");
+ int errMsg = isEnglish ? ERR : WARN;
+
+ for (String[] compoundTest : COMPOUND_TESTS) {
+ String targetUnit = compoundTest[0];
+ String prefix = compoundTest[1];
+ String baseUnit = compoundTest[2];
+ String prefixType = prefixToType.get(prefix); // will be null for square, cubic
+ final boolean isPrefix = prefixType.startsWith("1");
+
+ for (String len : Arrays.asList("long", "short", "narrow")) {
+ String prefixPath = ExampleGenerator.format(isPrefix ? PATH_PREFIX_PATTERN
+ : PATH_SUFFIX_PATTERN,
+ len, prefixType);
+ String prefixValue = file.getStringValue(prefixPath);
+ boolean lowercaseIfSpaced = len.equals("long");
+
+ for (Count count : pluralInfo.getCounts()) {
+ final String countString = count.toString();
+ String targetUnitPath = ExampleGenerator.format(PATH_UNIT_PATTERN, len, targetUnit, countString);
+ String targetUnitPattern = file.getStringValue(targetUnitPath);
+
+ String baseUnitPath = ExampleGenerator.format(PATH_UNIT_PATTERN, len, baseUnit, countString);
+ String baseUnitPattern = file.getStringValue(baseUnitPath);
+
+ String composedTargetUnitPattern = Units.combinePattern(baseUnitPattern, prefixValue, lowercaseIfSpaced);
+ if (isEnglish && !targetUnitPattern.equals(composedTargetUnitPattern)) {
+ if (allowEnglishException(targetUnitPattern, composedTargetUnitPattern)) {
+ continue;
+ }
+ }
+ if (!assertEquals2(errMsg, testCount++ + ") "
+ + locale + "/" + len + "/" + count + "/" + prefix + "+" + baseUnit
+ + ": constructed pattern",
+ targetUnitPattern,
+ composedTargetUnitPattern)) {
+ Units.combinePattern(baseUnitPattern, prefixValue, lowercaseIfSpaced);
+ int debug = 0;
+ };
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Curated list of known exceptions. Usually because the short form of a unit is shorter when combined with a prefix or suffix
+ */
+ static final Map<String,String> ALLOW_ENGLISH_EXCEPTION = ImmutableMap.<String,String>builder()
+ .put("sq ft", "ft²")
+ .put("sq mi", "mi²")
+ .put("ft", "′")
+ .put("in", "″")
+ .put("MP", "Mpx")
+ .put("b", "bit")
+ .put("mb", "mbar")
+ .put("B", "byte")
+ .put("s", "sec")
+ .build();
+ private boolean allowEnglishException(String targetUnitPattern, String composedTargetUnitPattern) {
+ for (Entry<String, String> entry : ALLOW_ENGLISH_EXCEPTION.entrySet()) {
+ String mod = targetUnitPattern.replace(entry.getKey(), entry.getValue());
+ if (mod.contentEquals(composedTargetUnitPattern)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // TODO Work this into a generating and then maintaining a data table for the units
+ /*
+ CLDRFile english = factory.make("en", false);
+ Set<String> prefixes = new TreeSet<>();
+ for (String path : english) {
+ XPathParts parts = XPathParts.getFrozenInstance(path);
+ String lastElement = parts.getElement(-1);
+ if (lastElement.equals("unitPrefixPattern") || lastElement.equals("compoundUnitPattern1")) {
+ if (!parts.getAttributeValue(2, "type").equals("long")) {
+ continue;
+ }
+ String value = english.getStringValue(path);
+ prefixes.add(value.replace("{0}", "").trim());
+ }
+ }
+ Map<Status, Set<String>> unitValidity = Validity.getInstance().getStatusToCodes(LstrType.unit);
+ Multimap<String, String> from = LinkedHashMultimap.create();
+ for (String unit : unitValidity.get(Status.regular)) {
+ String[] parts = unit.split("[-]");
+ String main = parts[1];
+ for (String prefix : prefixes) {
+ if (main.startsWith(prefix)) {
+ if (main.length() == prefix.length()) { // square,...
+ from.put(unit, main);
+ } else { // milli
+ from.put(unit, main.substring(0,prefix.length()));
+ from.put(unit, main.substring(prefix.length()));
+ }
+ for (int i = 2; i < parts.length; ++i) {
+ from.put(unit, parts[i]);
+ }
+ }
+ }
+ }
+ for (Entry<String, Collection<String>> set : from.asMap().entrySet()) {
+ System.out.println(set.getKey() + "\t" + CollectionUtilities.join(set.getValue(), "\t"));
+ }
+ */
+ private boolean assertEquals2(int TestERR, String title, String sqmeterPattern, String conSqmeterPattern) {
+ if (!Objects.equals(sqmeterPattern, conSqmeterPattern)) {
+ msg(title + ", expected «" + sqmeterPattern + "», got «" + conSqmeterPattern + "»", TestERR, true, true);
+ return false;
+ } else if (isVerbose()) {
+ msg(title + ", expected «" + sqmeterPattern + "», got «" + conSqmeterPattern + "»", LOG, true, true);
+ }
+ return true;
+ }
+
+ static final boolean DEBUG = false;
+
+ public void TestConversion() {
+ UnitConverter converter = SDI.getUnitConverter();
+ Object[][] tests = {
+ {"foot", 12, "inch"},
+ {"gallon", 4, "quart"},
+ {"gallon", 16, "cup"},
+ };
+ for (Object[] test : tests) {
+ String sourceUnit = test[0].toString();
+ String targetUnit = test[2].toString();
+ int numerator = (Integer) test[1];
+ final Rational convert = converter.convertDirect(Rational.ONE, sourceUnit, targetUnit);
+ assertEquals(sourceUnit + " to " + targetUnit, Rational.of(numerator, 1), convert);
+ }
+
+ // test conversions are disjoint
+ Set<String> gotAlready = new HashSet<>();
+ List<Set<String>> equivClasses = new ArrayList<>();
+ Map<String,String> classToId = new TreeMap<>();
+ for (String unit : converter.canConvert()) {
+ if (gotAlready.contains(unit)) {
+ continue;
+ }
+ Set<String> set = converter.canConvertBetween(unit);
+ final String id = "ID" + equivClasses.size();
+ equivClasses.add(set);
+ gotAlready.addAll(set);
+ for (String s : set) {
+ classToId.put(s, id);
+ }
+ }
+
+ // check not overlapping
+ // now handled by TestParseUnit, but we might revive a modified version of this.
+// for (int i = 0; i < equivClasses.size(); ++i) {
+// Set<String> eclass1 = equivClasses.get(i);
+// for (int j = i+1; j < equivClasses.size(); ++j) {
+// Set<String> eclass2 = equivClasses.get(j);
+// if (!Collections.disjoint(eclass1, eclass2)) {
+// errln("Overlapping equivalence classes: " + eclass1 + " ~ " + eclass2 + "\n\tProbably bad chain requiring 3 steps.");
+// }
+// }
+//
+// // check that all elements of an equivalence class have the same type
+// Multimap<String,String> breakdown = TreeMultimap.create();
+// for (String item : eclass1) {
+// String type = CORE_TO_TYPE.get(item);
+// if (type == null) {
+// type = "?";
+// }
+// breakdown.put(type, item);
+// }
+// if (DEBUG) System.out.println("type to item: " + breakdown);
+// if (breakdown.keySet().size() != 1) {
+// errln("mixed categories: " + breakdown);
+// }
+//
+// }
+//
+// // check that all units with the same type have the same equivalence class
+// for (Entry<String, Collection<String>> entry : TYPE_TO_CORE.asMap().entrySet()) {
+// Multimap<String,String> breakdown = TreeMultimap.create();
+// for (String item : entry.getValue()) {
+// String id = classToId.get(item);
+// if (id == null) {
+// continue;
+// }
+// breakdown.put(id, item);
+// }
+// if (DEBUG) System.out.println(entry.getKey() + " id to item: " + breakdown);
+// if (breakdown.keySet().size() != 1) {
+// errln(entry.getKey() + " mixed categories: " + breakdown);
+// }
+// }
+ }
+
+ public void TestBaseUnits() {
+ Splitter barSplitter = Splitter.on('-');
+ for (String unit : converter.baseUnits()) {
+ for (String piece : barSplitter.split(unit)) {
+ assertTrue(unit + ": " + piece + " in " + UnitConverter.BASE_UNIT_PARTS, UnitConverter.BASE_UNIT_PARTS.contains(piece));
+ }
+ }
+ }
+
+ public void TestUnitId() {
+
+ for (String simple : converter.getSimpleUnits()) {
+ String canonicalUnit = converter.getBaseUnit(simple);
+ UnitId unitId = converter.createUnitId(canonicalUnit);
+ String output = unitId.toString();
+ if (!assertEquals(simple + ": targets should be in canonical form",
+ output, canonicalUnit)) {
+ // for debugging
+ converter.createUnitId(canonicalUnit);
+ unitId.toString();
+ }
+ }
+ for (Entry<String, String> baseUnitToQuantity : BASE_UNIT_TO_QUANTITY.entrySet()) {
+ String baseUnit = baseUnitToQuantity.getKey();
+ String quantity = baseUnitToQuantity.getValue();
+ try {
+ UnitId unitId = converter.createUnitId(baseUnit);
+ String output = unitId.toString();
+ if (!assertEquals(quantity + ": targets should be in canonical form",
+ output, baseUnit)) {
+ // for debugging
+ converter.createUnitId(baseUnit);
+ unitId.toString();
+ }
+ } catch (Exception e) {
+ errln("Can't convert baseUnit: " + baseUnit);
+ }
+ }
+
+ for (String baseUnit : CORE_TO_TYPE.keySet()) {
+ try {
+ UnitId unitId = converter.createUnitId(baseUnit);
+ assertNotNull("Can't parse baseUnit: " + baseUnit, unitId);
+ } catch (Exception e) {
+ UnitId unitId = converter.createUnitId(baseUnit); // for debugging
+ errln("Can't parse baseUnit: " + baseUnit);
+ }
+ }
+
+ }
+
+ public void TestParseUnit() {
+ Output<String> compoundBaseUnit = new Output<>();
+ String[][] tests = {
+ {"kilometer-pound-per-hour", "kilogram-meter-per-second", "45359237/360000000"},
+ {"kilometer-per-hour", "meter-per-second", "5/18"},
+ };
+ for (String[] test : tests) {
+ String source = test[0];
+ String expectedUnit = test[1];
+ Rational expectedRational = new Rational.RationalParser().parse(test[2]);
+ ConversionInfo unitInfo = converter.parseUnitId(source, compoundBaseUnit, false);
+ assertEquals(source, expectedUnit, compoundBaseUnit.value);
+ assertEquals(source, expectedRational, unitInfo.factor);
+ }
+
+ // check all
+ if (GENERATE_TESTS) System.out.println();
+ Set<String> badUnits = new LinkedHashSet<>();
+ Set<String> noQuantity = new LinkedHashSet<>();
+ Multimap<Pair<String,Double>, String> testPrintout = TreeMultimap.create();
+
+ // checkUnitConvertability(converter, compoundBaseUnit, badUnits, "pint-metric-per-second");
+
+ for (Entry<String, String> entry : TYPE_TO_CORE.entries()) {
+ String type = entry.getKey();
+ String unit = entry.getValue();
+ if (NOT_CONVERTABLE.contains(unit)) {
+ continue;
+ }
+ checkUnitConvertability(converter, compoundBaseUnit, badUnits, noQuantity, type, unit, testPrintout);
+ }
+ if (GENERATE_TESTS) { // test data
+ System.out.println(
+ "# Test data for unit conversions\n"
+ + CldrUtility.getCopyrightString("# ") + "\n"
+ + "#\n"
+ + "# Format:\n"
+ + "#\tQuantity\t;\tx\t;\ty\t;\tconversion to y (rational)\t;\ttest: 1000 x ⟹ y\n"
+ + "#\n"
+ + "# Use: convert 1000 x units to the y unit; the result should match the final column,\n"
+ + "# at the given precision. For example, when the last column is 159.1549,\n"
+ + "# round to 4 decimal digits before comparing.\n"
+ + "# Note that certain conversions are approximate, such as degrees to radians\n"
+ + "#\n"
+ + "# Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestParseUnit results.\n"
+ );
+ for (Entry<Pair<String, Double>, String> entry : testPrintout.entries()) {
+ System.out.println(entry.getValue());
+ }
+ }
+ assertEquals("Unconvertable units", Collections.emptySet(), badUnits);
+ assertEquals("Units without Quantity", Collections.emptySet(), noQuantity);
+ }
+
+ static final Set<String> NOT_CONVERTABLE = ImmutableSet.of("generic");
+
+ private void checkUnitConvertability(UnitConverter converter, Output<String> compoundBaseUnit,
+ Set<String> badUnits, Set<String> noQuantity, String type, String unit,
+ Multimap<Pair<String, Double>, String> testPrintout) {
+
+ if (converter.isBaseUnit(unit)) {
+ String quantity = converter.getQuantityFromBaseUnit(unit);
+ if (quantity == null) {
+ noQuantity.add(unit);
+ }
+ if (GENERATE_TESTS) {
+ testPrintout.put(
+ new Pair<>(quantity, 1000d),
+ quantity
+ + "\t;\t" + unit
+ + "\t;\t" + unit
+ + "\t;\t1 * x\t;\t1,000.00");
+ }
+ } else {
+ ConversionInfo unitInfo = converter.getUnitInfo(unit, compoundBaseUnit);
+ if (unitInfo == null) {
+ unitInfo = converter.parseUnitId(unit, compoundBaseUnit, false);
+ }
+ if (unitInfo == null) {
+ badUnits.add(unit);
+ } else if (GENERATE_TESTS){
+ String quantity = converter.getQuantityFromBaseUnit(compoundBaseUnit.value);
+ if (quantity == null) {
+ noQuantity.add(compoundBaseUnit.value);
+ }
+ final double testValue = unitInfo.convert(R1000).toBigDecimal(MathContext.DECIMAL32).doubleValue();
+ testPrintout.put(
+ new Pair<>(quantity, testValue),
+ quantity
+ + "\t;\t" + unit
+ + "\t;\t" + compoundBaseUnit
+ + "\t;\t" + unitInfo
+ + "\t;\t" + testValue
+// + "\t" + unitInfo.factor.toBigDecimal(MathContext.DECIMAL32)
+// + "\t" + unitInfo.factor.reciprocal().toBigDecimal(MathContext.DECIMAL32)
+ );
+ }
+ }
+ }
+
+ public void TestRational() {
+ Rational a3_5 = Rational.of(3,5);
+
+ Rational a6_10 = Rational.of(6,10);
+ assertEquals("", a3_5, a6_10);
+
+ Rational a5_3 = Rational.of(5,3);
+ assertEquals("", a3_5, a5_3.reciprocal());
+
+ assertEquals("", Rational.ONE, a3_5.multiply(a3_5.reciprocal()));
+ assertEquals("", Rational.ZERO, a3_5.add(a3_5.negate()));
+
+ assertEquals("", Rational.INFINITY, Rational.ZERO.reciprocal());
+ assertEquals("", Rational.NEGATIVE_INFINITY, Rational.INFINITY.negate());
+ assertEquals("", Rational.NEGATIVE_ONE, Rational.ONE.negate());
+
+ assertEquals("", Rational.NaN, Rational.ZERO.divide(Rational.ZERO));
+
+ assertEquals("", BigDecimal.valueOf(2), Rational.of(2,1).toBigDecimal());
+ assertEquals("", BigDecimal.valueOf(0.5), Rational.of(1,2).toBigDecimal());
+
+ assertEquals("", BigDecimal.valueOf(100), Rational.of(100,1).toBigDecimal());
+ assertEquals("", BigDecimal.valueOf(0.01), Rational.of(1,100).toBigDecimal());
+
+ assertEquals("", Rational.of(12370,1), Rational.of(BigDecimal.valueOf(12370)));
+ assertEquals("", Rational.of(1237,10), Rational.of(BigDecimal.valueOf(1237.0/10)));
+ assertEquals("", Rational.of(1237,10000), Rational.of(BigDecimal.valueOf(1237.0/10000)));
+
+ ConversionInfo uinfo = new ConversionInfo(Rational.of(2), Rational.of(3));
+ assertEquals("", Rational.of(3), uinfo.convert(Rational.ZERO));
+ assertEquals("", Rational.of(7), uinfo.convert(Rational.of(2)));
+ }
+
+ public void TestRationalParse() {
+ Rational.RationalParser parser = SDI.getRationalParser();
+
+ Rational a3_5 = Rational.of(3,5);
+
+ assertEquals("", a3_5, parser.parse("6/10"));
+
+ assertEquals("", a3_5, parser.parse("0.06/0.10"));
+
+ assertEquals("", Rational.of(381, 1250), parser.parse("ft_to_m"));
+ assertEquals("", 6.02214076E+23d, parser.parse("6.02214076E+23").toBigDecimal().doubleValue());
+ Rational temp = parser.parse("gal_to_m3");
+ //System.out.println(" " + temp);
+ assertEquals("", 0.003785411784, temp.numerator.doubleValue()/temp.denominator.doubleValue());
+ }
+
+
+ static final Map<String,String> CORE_TO_TYPE;
+ static final Multimap<String,String> TYPE_TO_CORE;
+ static {
+ Set<String> VALID_UNITS = Validity.getInstance().getStatusToCodes(LstrType.unit).get(Status.regular);
+
+ Map<String, String> coreToType = new TreeMap<>();
+ TreeMultimap<String, String> typeToCore = TreeMultimap.create();
+ for (String s : VALID_UNITS) {
+ int dashPos = s.indexOf('-');
+ String unitType = s.substring(0,dashPos);
+ String coreUnit = s.substring(dashPos+1);
+ coreUnit = converter.fixDenormalized(coreUnit);
+ coreToType.put(coreUnit, unitType);
+ typeToCore.put(unitType, coreUnit);
+ }
+ CORE_TO_TYPE = ImmutableMap.copyOf(coreToType);
+ TYPE_TO_CORE = ImmutableMultimap.copyOf(typeToCore);
+ }
+
+ public void TestUnitCategory() {
+ if (SHOW_DATA) System.out.println();
+
+ Map<String,Multimap<String,String>> bad = new TreeMap<>();
+ for (Entry<String, String> entry : TYPE_TO_CORE.entries()) {
+ final String coreUnit = entry.getValue();
+ final String unitType = entry.getKey();
+ if (coreUnit.equals("generic")) {
+ continue;
+ }
+ String quantity = converter.getQuantityFromUnit(coreUnit, false);
+ if (SHOW_DATA) {
+ System.out.format("%s\t%s\t%s\n", coreUnit, quantity, unitType);
+ }
+ if (quantity == null) {
+ converter.getQuantityFromUnit(coreUnit, true);
+ errln("Null quantity " + coreUnit);
+ } else if (!unitType.equals(quantity)) {
+ switch (unitType) {
+ case "concentr":
+ switch (quantity) {
+ case "portion": case "mass-density": case "concentration": case "substance-amount": continue;
+ }
+ break;
+ case "consumption":
+ switch (quantity) {
+ case "consumption-inverse": continue;
+ }
+ break;
+ case "duration":
+ switch (quantity) {
+ case "year-duration": continue;
+ }
+ break;
+ case "electric":
+ switch (quantity) {
+ case "electric-current": case "electric-resistance": case "voltage": continue;
+ }
+ break;
+ case "graphics":
+ switch (quantity) {
+ case "resolution": case "typewidth": continue;
+ }
+ break;
+ case "light":
+ switch (quantity) {
+ case "luminous-flux": case "power": case "luminous-intensity": continue;
+ }
+ break;
+ case "mass":
+ switch (quantity) {
+ case "energy": continue;
+ }
+ break;
+ case "torque":
+ switch (quantity) {
+ case "energy": continue;
+ }
+ break;
+ case "pressure":
+ switch (quantity) {
+ case "pressure-per-length": continue;
+ }
+ break;
+ }
+ Multimap<String, String> badMap = bad.get(unitType);
+ if (badMap == null) {
+ bad.put(unitType, badMap = TreeMultimap.create());
+ }
+ badMap.put(quantity, coreUnit);
+ }
+ }
+ for (Entry<String, Multimap<String, String>> entry : bad.entrySet()) {
+ assertNull("UnitType != quantity: " + entry.getKey(), '"' + Joiner.on("\", \"").join(entry.getValue().asMap().entrySet()) + '"');
+ }
+ }
+
+ public void TestQuantities() {
+ // put quantities in order
+ Multimap<String,String> quantityToBaseUnits = LinkedHashMultimap.create();
+
+ Multimaps.invertFrom(Multimaps.forMap(BASE_UNIT_TO_QUANTITY), quantityToBaseUnits);
+
+ for ( Entry<String, Collection<String>> entry : quantityToBaseUnits.asMap().entrySet()) {
+ assertEquals(entry.toString(), 1, entry.getValue().size());
+ }
+
+ TreeMultimap<String, String> quantityToConvertible = TreeMultimap.create();
+ Set<String> missing = new TreeSet<>(CORE_TO_TYPE.keySet());
+ missing.removeAll(NOT_CONVERTABLE);
+
+ for (Entry<String, String> entry : BASE_UNIT_TO_QUANTITY.entrySet()) {
+ String baseUnit = entry.getKey();
+ String quantity = entry.getValue();
+ Set<String> convertible = converter.canConvertBetween(baseUnit);
+ missing.removeAll(convertible);
+ quantityToConvertible.putAll(quantity, convertible);
+ }
+
+ // handle missing
+ for (String missingUnit : ImmutableSet.copyOf(missing)) {
+ if (missingUnit.equals("mile-per-gallon")) {
+ int debug = 0;
+ }
+ String quantity = converter.getQuantityFromUnit(missingUnit, false);
+ if (quantity != null) {
+ quantityToConvertible.put(quantity, missingUnit);
+ missing.remove(missingUnit);
+ } else {
+ quantity = converter.getQuantityFromUnit(missingUnit, true); // for debugging
+ }
+ }
+ assertEquals("all units have quantity", Collections.emptySet(), missing);
+
+ if (SHOW_DATA) {
+ System.out.println();
+ for (Entry<String, String> entry : BASE_UNIT_TO_QUANTITY.entrySet()) {
+ String baseUnit = entry.getKey();
+ String quantity = entry.getValue();
+ System.out.println(" <unitQuantity"
+ + " baseUnit='" + baseUnit + "'"
+ + " quantity='" + quantity + "'"
+ + "/>");
+ }
+ System.out.println();
+ System.out.println("Quantities");
+ for (Entry<String, Collection<String>> entry : quantityToConvertible.asMap().entrySet()) {
+ String quantity = entry.getKey();
+ Collection<String> convertible = entry.getValue();
+ System.out.println(quantity + "\t" + convertible);
+ }
+ }
+ }
+
+ static final UnicodeSet ALLOWED_IN_COMPONENT = new UnicodeSet("[a-z0-9]").freeze();
+ static final Set<String> GRANDFATHERED_SIMPLES = ImmutableSet.of("em", "g-force", "therm-us");
+
+ public void TestOrder() {
+ if (SHOW_DATA) System.out.println();
+ for (String s : UnitConverter.BASE_UNITS) {
+ String quantity = converter.getQuantityFromBaseUnit(s);
+ if (SHOW_DATA) {
+ System.out.println("\"" + quantity + "\",");
+ }
+ }
+ for (String unit : CORE_TO_TYPE.keySet()) {
+ if (!GRANDFATHERED_SIMPLES.contains(unit)) {
+ for (String part : unit.split("-")) {
+ assertTrue(unit + " has no parts < 2 in length", part.length() > 2);
+ assertTrue(unit + " has only allowed characters", ALLOWED_IN_COMPONENT.containsAll(part));
+ }
+ }
+ if (unit.equals("generic")) {
+ continue;
+ }
+ String quantity = converter.getQuantityFromUnit(unit, false); // make sure doesn't crash
+ }
+ }
+
+ public void TestConversionLineOrder() {
+ Map<String, TargetInfo> data = converter.getInternalConversionData();
+ Multimap<TargetInfo, String> sorted = TreeMultimap.create(converter.targetInfoComparator,
+ Comparator.naturalOrder());
+ Multimaps.invertFrom(Multimaps.forMap(data), sorted);
+
+ String lastBase = "";
+
+ // Test that sorted is in same order as the file.
+ MapComparator<String> conversionOrder = new MapComparator<>(data.keySet());
+ String lastUnit = null;
+ for (Entry<TargetInfo, String> entry : sorted.entries()) {
+ final TargetInfo tInfo = entry.getKey();
+ final String unit = entry.getValue();
+ if (lastUnit != null) {
+ assertTrue(lastUnit + " < " + unit, conversionOrder.compare(lastUnit, unit) < 0);
+ }
+ lastUnit = unit;
+ if (SHOW_DATA) {
+ if (!lastBase.equals(tInfo.target)) {
+ lastBase = tInfo.target;
+ System.out.println("\n <!-- " + converter.getQuantityFromBaseUnit(lastBase) + " -->");
+ }
+ // <convertUnit source='week-person' target='second' factor='604800'/>
+ System.out.println(" " + tInfo.formatOriginalSource(entry.getValue()));
+ }
+ }
+ }
+
+ public final void TestSimplify() {
+ Set<Rational> seen = new HashSet<>();
+ checkSimplify("ZERO", Rational.ZERO, seen);
+ checkSimplify("ONE", Rational.ONE, seen);
+ checkSimplify("NEGATIVE_ONE", Rational.NEGATIVE_ONE, seen);
+ checkSimplify("INFINITY", Rational.INFINITY, seen);
+ checkSimplify("NEGATIVE_INFINITY", Rational.NEGATIVE_INFINITY, seen);
+ checkSimplify("NaN", Rational.NaN, seen);
+
+ checkSimplify("Simplify", Rational.of(25, 300), seen);
+ checkSimplify("Simplify", Rational.of(100, 1), seen);
+ checkSimplify("Simplify", Rational.of(2, 5), seen);
+ checkSimplify("Simplify", Rational.of(4, 25), seen);
+ checkSimplify("Simplify", Rational.of(5, 2), seen);
+ checkSimplify("Simplify", Rational.of(25, 4), seen);
+
+ for (Entry<String, TargetInfo> entry : converter.getInternalConversionData().entrySet()) {
+ final Rational factor = entry.getValue().unitInfo.factor;
+ checkSimplify(entry.getKey(), factor, seen);
+ if (!factor.equals(Rational.ONE)) {
+ checkSimplify(entry.getKey(), factor, seen);
+ }
+ final Rational offset = entry.getValue().unitInfo.offset;
+ if (!offset.equals(Rational.ZERO)) {
+ checkSimplify(entry.getKey(), offset, seen);
+ }
+ }
+ }
+
+ private void checkSimplify(String title, Rational expected, Set<Rational> seen) {
+ if (!seen.contains(expected)) {
+ seen.add(expected);
+ String simpleStr = expected.toString(FormatStyle.simple);
+ if (SHOW_DATA) System.out.println(title + ": " + expected + " => " + simpleStr);
+ Rational actual = RationalParser.BASIC.parse(simpleStr);
+ assertEquals("simplify", expected, actual);
+ }
+ }
+
+ public void TestContinuationOrder() {
+ Continuation fluid = new Continuation(Arrays.asList("fluid"), "fluid-ounce");
+ Continuation fluid_imperial = new Continuation(Arrays.asList("fluid", "imperial"), "fluid-ounce-imperial");
+ final int fvfl = fluid.compareTo(fluid_imperial);
+ assertTrue(fluid + " vs " + fluid_imperial, fvfl > 0);
+ assertTrue(fluid_imperial + " vs " + fluid, fluid_imperial.compareTo(fluid) < 0);
+ }
+
+ static final Pattern usSystemPattern = Pattern.compile("\\b(lb_to_kg|ft_to_m|ft2_to_m2|ft3_to_m3|in3_to_m3|gal_to_m3|cup_to_m3)\\b");
+ static final Pattern ukSystemPattern = Pattern.compile("\\b(lb_to_kg|ft_to_m|ft2_to_m2|ft3_to_m3|in3_to_m3|gal_imp_to_m3)\\b");
+
+ static final Set<String> OK_BOTH = ImmutableSet.of(
+ "ounce-troy", "nautical-mile", "fahrenheit", "inch-ofhg",
+ "british-thermal-unit", "foodcalorie", "knot");
+
+ static final Set<String> OK_US = ImmutableSet.of(
+ "therm-us", "bushel");
+ static final Set<String> NOT_US = ImmutableSet.of(
+ "stone");
+
+ static final Set<String> OK_UK = ImmutableSet.of();
+ static final Set<String> NOT_UK = ImmutableSet.of(
+ "therm-us", "bushel", "barrel");
+
+ public void TestSystems() {
+ Multimap<String, String> toSystems = converter.getSourceToSystems();
+
+ Map<String, TargetInfo> data = converter.getInternalConversionData();
+ for (Entry<String, TargetInfo> entry : data.entrySet()) {
+ String unit = entry.getKey();
+ TargetInfo value = entry.getValue();
+ String inputFactor = value.inputParameters.get("factor");
+ if (inputFactor == null) {
+ inputFactor = "";
+ }
+ boolean usSystem = !NOT_US.contains(unit) &&
+ (OK_BOTH.contains(unit)
+ || OK_US.contains(unit)
+ || usSystemPattern.matcher(inputFactor).find());
+
+ boolean ukSystem = !NOT_UK.contains(unit) &&
+ (OK_BOTH.contains(unit)
+ || OK_UK.contains(unit)
+ || ukSystemPattern.matcher(inputFactor).find());
+
+ Collection<String> systems = toSystems.get(unit);
+ if (systems == null) {
+ systems = Collections.emptySet();
+ }
+ if (!assertEquals(unit + ": US? (" + inputFactor + ")", usSystem, systems.contains("ussystem"))) {
+ int debug = 0;
+ }
+ if (!assertEquals(unit + ": UK? (" + inputFactor + ")", ukSystem, systems.contains("uksystem"))) {
+ int debug = 0;
+ }
+ }
+ }
+
+ public void TestTestFile() {
+ File base = info.getCldrBaseDirectory();
+ File testFile = new File(base, "common/testData/units/unitsTest.txt");
+ Output<String> metricUnit = new Output<>();
+ Stream<String> lines;
+ try {
+ lines = Files.lines(testFile.toPath());
+ } catch (IOException e) {
+ throw new ICUUncheckedIOException("Couldn't process " + testFile);
+ }
+ lines.forEach(line -> {
+ // angle ; arc-second ; revolution ; 1 / 1296000 * x ; 7.716049E-4
+ line = line.trim();
+ if (line.isEmpty() || line.charAt(0) == '#') {
+ return;
+ }
+ List<String> fields = SPLIT_SEMI.splitToList(line);
+ ConversionInfo unitInfo;
+ try {
+ unitInfo = converter.parseUnitId(fields.get(1), metricUnit, false);
+ } catch (Exception e1) {
+ throw new IllegalArgumentException("Couldn't access fields on " + line);
+ }
+ if (unitInfo == null) {
+ throw new IllegalArgumentException("Couldn't get unitInfo on " + line);
+ }
+ double expected;
+ try {
+ expected = Double.parseDouble(fields.get(4).replace(",", ""));
+ } catch (NumberFormatException e) {
+ errln("Can't parse double in: " + line);
+ return;
+ }
+ double actual = unitInfo.convert(R1000).toBigDecimal(MathContext.DECIMAL32).doubleValue();
+ assertEquals(Joiner.on(" ; ").join(fields), expected, actual);
+ });
+ lines.close();
+ }
+
+ public void TestSpecialCases() {
+ String [][] tests = {
+ {"50", "foot", "xxx", "0/0"},
+ {"50", "xxx", "mile", "0/0"},
+ {"50", "foot", "second", "0/0"},
+ {"50", "foot-per-xxx", "mile-per-hour", "0/0"},
+ {"50", "foot-per-minute", "mile", "0/0"},
+ {"50", "foot-per-ampere", "mile-per-hour", "0/0"},
+
+ {"50", "foot", "mile", "5 / 528"},
+ {"50", "foot-per-minute", "mile-per-hour", "25 / 44"},
+ {"50", "foot-per-minute", "hour-per-mile", "44 / 25"},
+ {"50", "mile-per-gallon", "liter-per-100-kilometer", "112903 / 24000"},
+ {"50", "celsius-per-second", "kelvin-per-second", "50"},
+ {"50", "celsius-per-second", "fahrenheit-per-second", "90"},
+ {"50", "pound-force", "kilogram-meter-per-square-second", "8896443230521 / 40000000000"},
+ // Note: pound-foot-per-square-second is a pound-force divided by gravity
+ {"50", "pound-foot-per-square-second", "kilogram-meter-per-square-second", "17281869297 / 2500000000"},
+ };
+ int count = 0;
+ for (String[] test : tests) {
+ final Rational sourceValue = Rational.of(test[0]);
+ final String sourceUnit = test[1];
+ final String targetUnit = test[2];
+ final Rational expectedValue = Rational.of(test[3]);
+ final Rational conversion = converter.convert(sourceValue, sourceUnit, targetUnit, SHOW_DATA);
+ if (!assertEquals(count++ + ") " + sourceValue + " " + sourceUnit + " ⟹ " + targetUnit, expectedValue, conversion)) {
+ converter.convert(sourceValue, sourceUnit, targetUnit, SHOW_DATA);
+ }
+ }
+ }
+
+ static Multimap<String,String> EXTRA_UNITS = ImmutableMultimap.<String,String>builder()
+ .putAll("area", "square-foot", "square-yard", "square-mile")
+ .putAll("volume", "cubic-inch", "cubic-foot", "cubic-yard")
+ .build();
+
+ public void TestEnglishSystems() {
+ Multimap<String, String> systemToUnits = TreeMultimap.create();
+ for (String unit : converter.canConvert()) {
+ Set<String> systems = converter.getSystems(unit);
+ if (systems.isEmpty()) {
+ systemToUnits.put("other", unit);
+ } else for (String s : systems) {
+ systemToUnits.put(s, unit);
+ }
+ }
+ for (Entry<String, Collection<String>> systemAndUnits : systemToUnits.asMap().entrySet()) {
+ String system = systemAndUnits.getKey();
+ final Collection<String> units = systemAndUnits.getValue();
+ printSystemUnits(system, units);
+ }
+ }
+
+ private void printSystemUnits(String system, Collection<String> units) {
+ Multimap<String,String> quantityToUnits = TreeMultimap.create();
+ boolean metric = system.equals("metric");
+ for (String unit : units) {
+ quantityToUnits.put(converter.getQuantityFromUnit(unit, false), unit);
+ }
+ for (Entry<String, Collection<String>> entry : quantityToUnits.asMap().entrySet()) {
+ String quantity = entry.getKey();
+ String baseUnit = converter.getBaseUnitToQuantity().inverse().get(quantity);
+ Multimap<Rational,String> sorted = TreeMultimap.create();
+ sorted.put(Rational.ONE, baseUnit);
+ if (!metric) {
+ String englishBaseUnit = getEnglishBaseUnit(baseUnit);
+ addUnit(baseUnit, englishBaseUnit, sorted);
+ Collection<String> extras = EXTRA_UNITS.get(quantity);
+ if (extras != null) {
+ for (String unit2 : extras) {
+ addUnit(baseUnit, unit2, sorted);
+ }
+ }
+ }
+ for (String unit : entry.getValue()) {
+ addUnit(baseUnit, unit, sorted);
+ }
+ Set<String> comparableUnits = ImmutableSet.copyOf(sorted.values());
+
+ printUnits(system, quantity, comparableUnits);
+ }
+ }
+
+ private void addUnit(String baseUnit, String englishBaseUnit, Multimap<Rational, String> sorted) {
+ Rational value = converter.convert(Rational.ONE, englishBaseUnit, baseUnit, false);
+ sorted.put(value, englishBaseUnit);
+ }
+
+ private void printUnits(String system, String quantity, Set<String> comparableUnits) {
+ if (SHOW_DATA) System.out.print("\n"+ system + "\t" + quantity);
+ for (String targetUnit : comparableUnits) {
+ if (SHOW_DATA) System.out.print("\t" + targetUnit);
+ }
+ if (SHOW_DATA) System.out.println();
+ for (String sourceUnit : comparableUnits) {
+ if (SHOW_DATA) System.out.print("\t" + sourceUnit);
+ for (String targetUnit : comparableUnits) {
+ Rational rational = converter.convert(Rational.ONE, sourceUnit, targetUnit, false);
+ if (SHOW_DATA) System.out.print("\t" + rational.toBigDecimal(MathContext.DECIMAL64).doubleValue());
+ }
+ if (SHOW_DATA) System.out.println();
+ }
+ }
+
+ private String getEnglishBaseUnit(String baseUnit) {
+ return baseUnit.replace("kilogram", "pound").replace("meter", "foot");
+ }
+
+ public void TestPI() {
+ Rational PI = converter.getConstants().get("PI");
+ double PID = PI.toBigDecimal(MathContext.DECIMAL128).doubleValue();
+ final BigDecimal bigPi = new BigDecimal("3.141592653589793238462643383279502884197169399375105820974944");
+ double bigPiD = bigPi.doubleValue();
+ assertEquals("pi accurate enough", bigPiD, PID);
+
+ // also test continued fractions used in deriving values
+
+ Object[][] tests0 = {
+ {new ContinuedFraction(0, 1, 5, 2, 2), Rational.of(27, 32), ImmutableList.of(Rational.of(0), Rational.of(1), Rational.of(5,6), Rational.of(11, 13))},
+ };
+ for (Object[] test : tests0) {
+ ContinuedFraction source = (ContinuedFraction) test[0];
+ Rational expected = (Rational) test[1];
+ List<Rational> expectedIntermediates = (List<Rational>) test[2];
+ List<Rational> intermediates = new ArrayList<>();
+ final Rational actual = source.toRational(intermediates);
+ assertEquals("continued", expected, actual);
+ assertEquals("continued", expectedIntermediates, intermediates);
+ }
+ Object[][] tests = {
+ {Rational.of(3245,1000), new ContinuedFraction(3, 4, 12, 4)},
+ {Rational.of(39,10), new ContinuedFraction(3, 1, 9)},
+ {Rational.of(-3245,1000), new ContinuedFraction(-4, 1, 3, 12, 4)},
+ };
+ for (Object[] test : tests) {
+ Rational source = (Rational) test[0];
+ ContinuedFraction expected =(ContinuedFraction) test[1];
+ ContinuedFraction actual = new ContinuedFraction(source);
+ assertEquals(source.toString(), expected, actual);
+ assertEquals(actual.toString(), source, actual.toRational(null));
+ }
+
+
+ if (SHOW_DATA) {
+ ContinuedFraction actual = new ContinuedFraction(Rational.of(bigPi));
+ List<Rational> intermediates = new ArrayList<>();
+ actual.toRational(intermediates);
+ System.out.println("\nRational\tdec64\tdec128\tgood enough");
+ System.out.println("Target\t"
+ + bigPi.round(MathContext.DECIMAL64)+"x"
+ + "\t" + bigPi.round(MathContext.DECIMAL128)+"x"
+ + "\t" + "delta");
+ int goodCount = 0;
+ for (Rational item : intermediates) {
+ final BigDecimal dec64 = item.toBigDecimal(MathContext.DECIMAL64);
+ final BigDecimal dec128 = item.toBigDecimal(MathContext.DECIMAL128);
+ final boolean goodEnough = bigPiD == item.toBigDecimal(MathContext.DECIMAL128).doubleValue();
+ System.out.println(item
+ + "\t" + dec64
+ + "x\t" + dec128
+ + "x\t" + goodEnough
+ + "\t" + item.toBigDecimal(MathContext.DECIMAL128).subtract(bigPi));
+ if (goodEnough && goodCount++ > 6) {
+ break;
+ }
+ }
+ }
+ }
+ public void TestUnitPreferenceSource() {
+ XMLSource xmlSource = new SimpleXMLSource("units");
+ xmlSource.setNonInheriting(true);
+ CLDRFile foo = new CLDRFile(xmlSource );
+ foo.setDtdType(DtdType.supplementalData);
+ UnitPreferences uprefs = new UnitPreferences();
+ int order = 0;
+ for (String line : FileUtilities.in(TestUnits.class, "UnitPreferenceSource.txt")) {
+ line = line.trim();
+ if (line.isEmpty() || line.startsWith("#")) {
+ continue;
+ }
+ List<String> items = SPLIT_SEMI.splitToList(line);
+ try {
+ String quantity = items.get(0);
+ String usage = items.get(1);
+ String regionsStr = items.get(2);
+ List<String> regions = SPLIT_SPACE.splitToList(items.get(2));
+ String geqStr = items.get(3);
+ Rational geq = geqStr.isEmpty() ? Rational.ONE : Rational.of(geqStr);
+ String skeleton = items.get(4);
+ String unit = items.get(5);
+ uprefs.add(quantity, usage, regionsStr, geqStr, skeleton, unit);
+ String path = uprefs.getPath(order++, quantity, usage, regions, geq, skeleton);
+ xmlSource.putValueAtPath(path, unit);
+ } catch (Exception e) {
+ errln("Failure on line: " + line + "; " + e.getMessage());
+ }
+ }
+ if (SHOW_DATA) {
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(System.out));
+ foo.write(out);
+ out.flush();
+ }
+ }
+
+ static final Joiner JOIN_SPACE = Joiner.on(' ');
+
+ private void checkUnitPreferences(UnitPreferences uprefs) {
+ Set<String> usages = new LinkedHashSet<>();
+ for (Entry<String, Map<String, Multimap<Set<String>, UnitPreference>>> entry1 : uprefs.getData().entrySet()) {
+ String quantity = entry1.getKey();
+
+ // Each of the quantities is valid.
+ assertNotNull("quantity is convertible", converter.getBaseUnitFromQuantity(quantity));
+
+ Map<String, Multimap<Set<String>, UnitPreference>> usageToRegionToUnitPreference = entry1.getValue();
+
+ // each of the quantities has a default usage
+ assertTrue("Quantity " + quantity + " contains default usage", usageToRegionToUnitPreference.containsKey("default"));
+
+ for (Entry<String, Multimap<Set<String>, UnitPreference>> entry2 : usageToRegionToUnitPreference.entrySet()) {
+ String usage = entry2.getKey();
+ final String quantityPlusUsage = quantity + "/" + usage;
+ Multimap<Set<String>, UnitPreference> regionsToUnitPreference = entry2.getValue();
+ usages.add(usage);
+ Set<Set<String>> regionSets = regionsToUnitPreference.keySet();
+
+ // all quantity + usage pairs must contain 001 (one exception)
+ assertTrue("For " + quantityPlusUsage + ", the set of sets of regions must contain 001", regionSets.contains(WORLD_SET)
+ || quantityPlusUsage.contentEquals("concentration/blood-glucose"));
+
+ // Check that regions don't overlap for same quantity/usage
+ Multimap<String, Set<String>> checkOverlap = LinkedHashMultimap.create();
+ for (Set<String> regionSet : regionsToUnitPreference.keySet()) {
+ for (String region : regionSet) {
+ checkOverlap.put(region, regionSet);
+ }
+ }
+ for (Entry<String, Collection<Set<String>>> entry : checkOverlap.asMap().entrySet()) {
+ assertEquals(quantityPlusUsage + ": regions must be in only one set: " + entry.getValue(), 1, entry.getValue().size());
+ }
+
+ Set<String> systems = new TreeSet<>();
+ for (Entry<Set<String>, Collection<UnitPreference>> entry : regionsToUnitPreference.asMap().entrySet()) {
+ Collection<UnitPreference> uPrefs = entry.getValue();
+ Set<String> regions = entry.getKey();
+
+
+ // reset these for every new set of regions
+ Rational lastSize = null;
+ String lastUnit = null;
+ Rational lastgeq = null;
+ systems.clear();
+ Set<String> lastRegions = null;
+ preferences:
+ for (UnitPreference up : uPrefs) {
+ String unitQuantity = null;
+ String topUnit = null;
+ if ("minute:second".equals(up.unit)) {
+ int debug = 0;
+ }
+ String lastQuantity = null;
+ Rational lastValue = null;
+ Rational geq = converter.parseRational(String.valueOf(up.geq));
+
+ // where we have an 'and' unit, get its information
+ for (String unit : SPLIT_AND.split(up.unit)) {
+ try {
+ if (topUnit == null) {
+ topUnit = unit;
+ }
+ unitQuantity = converter.getQuantityFromUnit(unit, false);
+ } catch (Exception e) {
+ errln("Unit is not covertible: " + up.unit);
+ continue preferences;
+ }
+ String baseUnit = converter.getBaseUnitFromQuantity(unitQuantity);
+ if (geq.compareTo(Rational.ZERO) < 0) {
+ throw new IllegalArgumentException("geq must be > 0" + geq);
+ }
+ Rational value = converter.convert(Rational.ONE, unit, baseUnit, false);
+ if (lastQuantity != null) {
+ int diff = value.compareTo(lastValue);
+ if (diff >= 0) {
+ throw new IllegalArgumentException("Bad mixed unit; biggest unit must be first: " + up.unit);
+ }
+ if (!lastQuantity.contentEquals(quantity)) {
+ throw new IllegalArgumentException("Inconsistent quantities for mixed unit: " + up.unit);
+ }
+ }
+ lastValue = value;
+ lastQuantity = quantity;
+ systems.addAll(converter.getSystems(unit));
+ }
+ String baseUnit = converter.getBaseUnitFromQuantity(unitQuantity);
+ Rational size = converter.convert(up.geq, topUnit, baseUnit, false);
+ if (lastSize != null) { // ensure descending order
+ if (!assertTrue("Successive items must be ≥ previous:\n\t" + quantityPlusUsage
+ + "; unit: " + up.unit
+ + "; size: " + size
+ + "; regions: " + regions
+ + "; lastUnit: " + lastUnit
+ + "; lastSize: " + lastSize
+ + "; lastRegions: " + lastRegions
+ , size.compareTo(lastSize) <= 0)) {
+ int debug = 0;
+ }
+ }
+ lastSize = size;
+ lastUnit = up.unit;
+ lastgeq = geq;
+ lastRegions = regions;
+ if (SHOW_DATA) System.out.println(quantity + "\t" + usage + "\t" + regions + "\t" + up.geq + "\t" + up.unit + "\t" + up.skeleton);
+ }
+ // Check that last geq is ONE.
+ assertEquals(usage + " + " + regions + ": the least unit must have geq=1 (or equivalently, no geq)", Rational.ONE, lastgeq);
+
+ // Check that each set has a consistent system.
+ assertTrue(usage + " + " + regions + " has mixed systems: " + systems + "\n\t" + uPrefs, areConsistent(systems));
+ }
+ }
+ }
+ }
+
+ private boolean areConsistent(Set<String> systems) {
+ return !(systems.contains("metric") && (systems.contains("ussystem") || systems.contains("uksystem")));
+ }
+
+ public void TestBcp47() {
+ checkBcp47("Quantity", converter.getQuantities(), lowercaseAZ, false);
+ checkBcp47("Usage", SDI.getUnitPreferences().getUsages(), lowercaseAZ09, true);
+ checkBcp47("Unit", converter.getSimpleUnits(), lowercaseAZ09, true);
+ }
+
+ private void checkBcp47(String identifierType, Set<String> identifiers, UnicodeSet allowed, boolean allowHyphens) {
+ Output<Integer> counter = new Output<>(0);
+ Multimap<String,String> truncatedToFullIdentifier = TreeMultimap.create();
+ final Set<String> simpleUnits = identifiers;
+ for (String unit : simpleUnits) {
+ if (!allowHyphens && unit.contains("-")) {
+ truncatedToFullIdentifier.put(unit, "-");
+ }
+ checkBcp47(counter, identifierType, unit, allowed, truncatedToFullIdentifier);
+ }
+ for (Entry<String, Collection<String>> entry : truncatedToFullIdentifier.asMap().entrySet()) {
+ Set<String> identifierSet = ImmutableSet.copyOf(entry.getValue());
+ assertEquals(identifierType + ": truncated identifier " + entry.getKey() + " must be unique", ImmutableSet.of(identifierSet.iterator().next()), identifierSet);
+ }
+ }
+
+ private static int MIN_SUBTAG_LENGTH = 3;
+ private static int MAX_SUBTAG_LENGTH = 8;
+
+ static final UnicodeSet lowercaseAZ = new UnicodeSet("[a-z]").freeze();
+ static final UnicodeSet lowercaseAZ09 = new UnicodeSet("[a-z0-9]").freeze();
+
+ private void checkBcp47(Output<Integer> counter, String title, String identifier, UnicodeSet allowed, Multimap<String,String> truncatedToFullIdentifier) {
+ StringBuilder shortIdentifer = new StringBuilder();
+ boolean fail = false;
+ for (String subtag : identifier.split("-")) {
+ assertTrue(++counter.value + ") " + title + " identifier=" + identifier + " subtag=" + subtag + " has right characters", allowed.containsAll(subtag));
+ if (!(subtag.length() >= MIN_SUBTAG_LENGTH && subtag.length() <= MAX_SUBTAG_LENGTH)) {
+ for (Entry<String, Rational> entry : UnitConverter.PREFIXES.entrySet()) {
+ String prefix = entry.getKey();
+ if (subtag.startsWith(prefix)) {
+ subtag = subtag.substring(prefix.length());
+ break;
+ }
+ }
+ }
+ if (shortIdentifer.length() != 0) {
+ shortIdentifer.append('-');
+ }
+ if (subtag.length() > MAX_SUBTAG_LENGTH) {
+ shortIdentifer.append(subtag.substring(0, MAX_SUBTAG_LENGTH));
+ fail = true;
+ } else {
+ shortIdentifer.append(subtag);
+ }
+ }
+ if (fail) {
+ String shortIdentiferStr = shortIdentifer.toString();
+ truncatedToFullIdentifier.put(shortIdentiferStr, identifier);
+ }
+ }
+
+ public void TestUnitPreferences() {
+ System.out.println("\n\t\t If this fails, check the output of TestUnitPreferencesSource (with -DTestUnits:SHOW_DATA), fix as needed, then incorporate.");
+ UnitPreferences prefs = SDI.getUnitPreferences();
+ checkUnitPreferences(prefs);
+// Map<String, Map<String, Map<String, UnitPreference>>> fastMap = prefs.getFastMap(converter);
+// for (Entry<String, Map<String, Map<String, UnitPreference>>> entry : fastMap.entrySet()) {
+// String quantity = entry.getKey();
+// String baseUnit = converter.getBaseUnitFromQuantity(quantity);
+// for (Entry<String, Map<String, UnitPreference>> entry2 : entry.getValue().entrySet()) {
+// String usage = entry2.getKey();
+// for (Entry<String, UnitPreference> entry3 : entry2.getValue().entrySet()) {
+// String region = entry3.getKey();
+// UnitPreference pref = entry3.getValue();
+// System.out.println(quantity + "\t" + usage + "\t" + region + "\t" + pref.toString(baseUnit));
+// }
+// }
+// }
+ prefs.getFastMap(converter); // call just to make sure we don't get an exception
+
+ if (GENERATE_TESTS) {
+ System.out.println(
+ "\n# Test data for unit preferences\n"
+ + CldrUtility.getCopyrightString("# ") + "\n"
+ + "#\n"
+ + "# Format:\n"
+ + "#\tQuantity;\tUsage;\tRegion;\tInput (r);\tInput (d);\tInput Unit;\tOutput (r);\tOutput (d);\tOutput Unit\n"
+ + "#\n"
+ + "# Use: Convert the Input amount & unit according to the Usage and Region.\n"
+ + "#\t The result should match the Output amount and unit.\n"
+ + "#\t Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations\n"
+ + "#\t have two options for testing based on the precision in their implementations. For example:\n"
+ + "#\t 3429 / 12500; 0.27432; meter;\n"
+ + "#\t The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have\n"
+ + "#\t both a rational and decimal amount; the others will have a single integer value, such as:\n"
+ + "#\t length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch\n"
+ + "#\t The input and output units are unit identifers; in particular, the output does not have further processing:\n"
+ + "#\t\t • no localization\n"
+ + "#\t\t • no adjustment for pluralization\n"
+ + "#\t\t • no formatted with the skeleton\n"
+ + "#\t\t • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)\n"
+ + "#\n"
+ + "# Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestUnitPreferences results.\n"
+ );
+ Rational ONE_TENTH = Rational.of(1,10);
+
+ // Note that for production usage, precomputed data like the prefs.getFastMap(converter) would be used instead of the raw data.
+
+ for (Entry<String, Map<String, Multimap<Set<String>, UnitPreference>>> entry : prefs.getData().entrySet()) {
+ String quantity = entry.getKey();
+ String baseUnit = converter.getBaseUnitFromQuantity(quantity);
+ for (Entry<String, Multimap<Set<String>, UnitPreference>> entry2 : entry.getValue().entrySet()) {
+ String usage = entry2.getKey();
+
+ // collect samples of base units
+ for (Entry<Set<String>, Collection<UnitPreference>> entry3 : entry2.getValue().asMap().entrySet()) {
+ boolean first = true;
+ Set<Rational> samples = new TreeSet<>(Comparator.reverseOrder());
+ for (UnitPreference pref : entry3.getValue()) {
+ final String topUnit = UnitPreferences.SPLIT_AND.split(pref.unit).iterator().next();
+ if (first) {
+ samples.add(converter.convert(pref.geq.add(ONE_TENTH), topUnit, baseUnit, false));
+ first = false;
+ }
+ samples.add(converter.convert(pref.geq, topUnit, baseUnit, false));
+ samples.add(converter.convert(pref.geq.subtract(ONE_TENTH), topUnit, baseUnit, false));
+ }
+ // show samples
+ Set<String> regions = entry3.getKey();
+ String sampleRegion = regions.iterator().next();
+ if (usage.equals("person-age")) {
+ int debug = 0;
+ }
+ Collection<UnitPreference> uprefs = entry3.getValue();
+ for (Rational sample : samples) {
+ showSample(quantity, usage, sampleRegion, sample, baseUnit, uprefs);
+ }
+ System.out.println();
+ }
+ }
+ }
+ }
+ }
+
+ private void showSample(String quantity, String usage, String sampleRegion, Rational sampleBaseValue, String baseUnit, Collection<UnitPreference> prefs) {
+ String lastUnit = null;
+ boolean gotOne = false;
+ for (UnitPreference pref : prefs) {
+ final String topUnit = UnitPreferences.SPLIT_AND.split(pref.unit).iterator().next();
+ Rational baseGeq = converter.convert(pref.geq, topUnit, baseUnit, false);
+ if (sampleBaseValue.compareTo(baseGeq) >= 0) {
+ showSample2(quantity, usage, sampleRegion, sampleBaseValue, baseUnit, pref.unit);
+ gotOne = true;
+ break;
+ }
+ lastUnit = pref.unit;
+ }
+ if (!gotOne) {
+ showSample2(quantity, usage, sampleRegion, sampleBaseValue, baseUnit, lastUnit);
+ }
+ }
+
+ private void showSample2(String quantity, String usage, String sampleRegion, Rational sampleBaseValue, String baseUnit, String lastUnit) {
+ Rational originalSampleBaseValue = sampleBaseValue;
+ // Known slow algorithm for mixed values, but for generating tests we don't care.
+ final List<String> units = UnitPreferences.SPLIT_AND.splitToList(lastUnit);
+ StringBuilder formattedUnit = new StringBuilder();
+ int remaining = units.size();
+ for (String unit : units) {
+ --remaining;
+ Rational sample = converter.convert(sampleBaseValue, baseUnit, unit, false);
+ if (formattedUnit.length() != 0) {
+ formattedUnit.append(TEST_SEP);
+ }
+ if (remaining != 0) {
+ BigInteger floor = sample.floor();
+ formattedUnit.append(floor + TEST_SEP + unit);
+ // convert back to base unit
+ sampleBaseValue = converter.convert(sample.subtract(Rational.of(floor)), unit, baseUnit, false);
+ } else {
+ formattedUnit.append(sample + TEST_SEP + sample.doubleValue() + TEST_SEP + unit);
+ }
+ }
+ System.out.println(quantity + TEST_SEP + usage + TEST_SEP + sampleRegion
+ + TEST_SEP + originalSampleBaseValue + TEST_SEP + originalSampleBaseValue.doubleValue() + TEST_SEP + baseUnit
+ + TEST_SEP + formattedUnit);
+ }
+
+ public void TestWithExternalData() throws IOException {
+
+ Multimap<String, ExternalUnitConversionData> seen = HashMultimap.create();
+ Set<ExternalUnitConversionData> cantConvert = new LinkedHashSet<>();
+ Map<ExternalUnitConversionData, Rational> convertDiff = new LinkedHashMap<>();
+ Set<String> remainingCldrUnits = new LinkedHashSet<>(converter.getInternalConversionData().keySet());
+ Set<ExternalUnitConversionData> couldAdd = new LinkedHashSet<>();
+
+ if (SHOW_DATA) {
+ System.out.println();
+ }
+ for (ExternalUnitConversionData data : NistUnits.externalConversionData) {
+ Rational externalResult = data.info.convert(Rational.ONE);
+ Rational cldrResult = converter.convert(Rational.ONE, data.source, data.target, false);
+ seen.put(data.source + "⟹" + data.target, data);
+
+ if (externalResult.isPowerOfTen()) {
+ couldAdd.add(data);
+ }
+
+ if (cldrResult.equals(Rational.NaN)) {
+ cantConvert.add(data);
+ } else {
+ final Rational symmetricDiff = externalResult.symmetricDiff(cldrResult);
+ if (symmetricDiff.abs().compareTo(Rational.of(1, 1000000)) > 0){
+ convertDiff.put(data, cldrResult);
+ } else {
+ remainingCldrUnits.remove(data.source);
+ remainingCldrUnits.remove(data.target);
+ if (SHOW_DATA) System.out.println("*Converted"
+ + "\t" + cldrResult.doubleValue()
+ + "\t" + externalResult.doubleValue()
+ + "\t" + symmetricDiff.doubleValue()
+ + "\t" + data);
+ }
+ }
+ }
+
+ // get additional data on derived units
+// for (Entry<String, TargetInfo> e : NistUnits.derivedUnitToConversion.entrySet()) {
+// String sourceUnit = e.getKey();
+// TargetInfo targetInfo = e.getValue();
+//
+// Rational conversion = converter.convert(Rational.ONE, sourceUnit, targetInfo.target, false);
+// if (conversion.equals(Rational.NaN)) {
+// couldAdd.add(new ExternalUnitConversionData("", sourceUnit, targetInfo.target, conversion, "?", null));
+// }
+// }
+ if (SHOW_DATA) {
+ for (Entry<String, Collection<String>> e : NistUnits.unitToQuantity.asMap().entrySet()) {
+ System.out.println("*Quantities:" + "\t" + e.getKey() + "\t" + e.getValue());
+ }
+ }
+
+ for (String remainingUnit : remainingCldrUnits) {
+ final TargetInfo targetInfo = converter.getInternalConversionData().get(remainingUnit);
+ if (!targetInfo.target.contentEquals(remainingUnit)) {
+ warnln("Not tested against external data\t" + remainingUnit + "\t" + targetInfo);
+ }
+ }
+
+ boolean showDiagnostics = false;
+ for (Entry<String, Collection<ExternalUnitConversionData>> entry : seen.asMap().entrySet()) {
+ if (entry.getValue().size() != 1) {
+ Multimap<ConversionInfo, ExternalUnitConversionData> factors = HashMultimap.create();
+ for (ExternalUnitConversionData s : entry.getValue()) {
+ factors.put(s.info, s);
+ }
+ if (factors.keySet().size() > 1) {
+ for (ExternalUnitConversionData s : entry.getValue()) {
+ errln("*DUP-" + s);
+ showDiagnostics = true;
+ }
+ }
+ }
+ }
+
+ if (convertDiff.size() > 0) {
+ for (Entry<ExternalUnitConversionData, Rational> e : convertDiff.entrySet()) {
+ final Rational computed = e.getValue();
+ final ExternalUnitConversionData external = e.getKey();
+ Rational externalResult = external.info.convert(Rational.ONE);
+ showDiagnostics = true;
+ // for debugging
+ converter.convert(Rational.ONE, external.source, external.target, true);
+
+ errln("*DIFF CONVERT:"
+ + "\t" + external.source
+ + "\t⟹\t" + external.target
+ + "\texpected\t" + externalResult.doubleValue()
+ + "\tactual:\t" + computed.doubleValue()
+ + "\tsdiff:\t" + computed.symmetricDiff(externalResult).abs().doubleValue()
+ + "\txdata:\t" + external);
+ }
+ }
+
+ // temporary: show the items that didn't covert correctly
+ if (showDiagnostics) {
+ System.out.println();
+ Rational x = showDelta("pound-fahrenheit", "gram-celsius", false);
+ Rational y = showDelta("calorie", "joule", false);
+ showDelta("product\t", x.multiply(y));
+ showDelta("british-thermal-unit", "calorie", false);
+ showDelta("inch-ofhg", "pascal", false);
+ showDelta("millimeter-ofhg", "pascal", false);
+ showDelta("ofhg", "kilogram-per-square-meter-square-second", false);
+ showDelta("13595.1*gravity", Rational.of("9.80665*13595.1"));
+
+ showDelta("fahrenheit-hour-square-foot-per-british-thermal-unit-inch", "meter-kelvin-per-watt", true);
+ }
+
+ if (showDiagnostics && NistUnits.skipping.size() > 0) {
+ System.out.println();
+ for (String s : NistUnits.skipping) {
+ System.out.println("*SKIPPING " + s);
+ }
+ }
+ if (showDiagnostics && NistUnits.idChanges.size() > 0) {
+ System.out.println();
+ for (Entry<String, Collection<String>> e : NistUnits.idChanges.asMap().entrySet()) {
+ if (SHOW_DATA) System.out.println("*CHANGES\t" + e.getKey() + "\t" + Joiner.on('\t').join(e.getValue()));
+ }
+ }
+
+ if (showDiagnostics && cantConvert.size() > 0) {
+ System.out.println();
+ for (ExternalUnitConversionData e : cantConvert) {
+ System.out.println("*CANT CONVERT-" + e);
+ }
+ }
+ Output<String> baseUnit = new Output<String>();
+ for (ExternalUnitConversionData s : couldAdd) {
+ String target = s.target;
+ Rational endFactor = s.info.factor;
+ String mark = "";
+ TargetInfo baseUnit2 = NistUnits.derivedUnitToConversion.get(s.target);
+ if (baseUnit2 != null) {
+ target = baseUnit2.target;
+ endFactor = baseUnit2.unitInfo.factor;
+ mark="¹";
+ } else {
+ ConversionInfo conversionInfo = converter.getUnitInfo(s.target, baseUnit);
+ if (conversionInfo != null && !s.target.equals(baseUnit.value)) {
+ target = baseUnit.value;
+ endFactor = conversionInfo.convert(s.info.factor);
+ mark="²";
+ }
+ }
+ System.out.println("Could add 10^X conversion from a"
+ + "\t" + s.source
+ + "\tto" + mark
+ + "\t" + endFactor.toString(FormatStyle.simple)
+ + "\t" + target);
+ }
+ }
+
+ private Rational showDelta(String firstUnit, String secondUnit, boolean showYourWork) {
+ Rational x = converter.convert(Rational.ONE, firstUnit, secondUnit, showYourWork);
+ return showDelta(firstUnit + "\t" + secondUnit, x);
+ }
+
+ private Rational showDelta(final String title, Rational rational) {
+ System.out.print("*CONST\t" + title);
+ System.out.print("\t" + rational.toString(FormatStyle.simple));
+ System.out.println("\t" + rational.doubleValue());
+ return rational;
+ }
+
+ public void TestRepeating() {
+ Set<Rational> seen = new HashSet<>();
+ String[][] tests = {
+ {"0/0", "NaN"},
+ {"1/0", "INF"},
+ {"-1/0", "-INF"},
+ {"0/1", "0"},
+ {"1/1", "1"},
+ {"1/2", "0.5"},
+ {"1/3", "0.˙3"},
+ {"1/4", "0.25"},
+ {"1/5", "0.2"},
+ {"1/6", "0.1˙6"},
+ {"1/7", "0.˙142857"},
+ {"1/8", "0.125"},
+ {"1/9", "0.˙1"},
+ {"1/10", "0.1"},
+ {"1/11", "0.˙09"},
+ {"1/12", "0.08˙3"},
+ {"1/13", "0.˙076923"},
+ {"1/14", "0.0˙714285"},
+ {"1/15", "0.0˙6"},
+ {"1/16", "0.0625"},
+ };
+ for (String[] test : tests) {
+ Rational source = Rational.of(test[0]);
+ seen.add(source);
+ String expected = test[1];
+ String actual = source.toString(FormatStyle.repeating);
+ assertEquals(test[0], expected, actual);
+ Rational roundtrip = Rational.of(expected);
+ assertEquals(expected, source, roundtrip);
+ }
+ for (int i = -50; i < 200; ++i) {
+ for (int j = 0; j < 50; ++j) {
+ checkFormat(Rational.of(i, j), seen);
+ }
+ }
+ for (Entry<String, TargetInfo> unitAndInfo : converter.getInternalConversionData().entrySet()) {
+ final TargetInfo targetInfo2 = unitAndInfo.getValue();
+ ConversionInfo targetInfo = targetInfo2.unitInfo;
+ checkFormat(targetInfo.factor, seen);
+ if (SHOW_DATA) {
+ String rFormat = targetInfo.factor.toString(FormatStyle.repeating);
+ String sFormat = targetInfo.factor.toString(FormatStyle.simple);
+ if (!rFormat.equals(sFormat)) {
+ System.out.println("\t\t" + unitAndInfo.getKey() + "\t" + targetInfo2.target + "\t" + sFormat + "\t" + rFormat + "\t" + targetInfo.factor.doubleValue());
+ }
+ }
+ }
+ }
+
+ private void checkFormat(Rational source, Set<Rational> seen) {
+ if (seen.contains(source)) {
+ return;
+ }
+ seen.add(source);
+ String formatted = source.toString(FormatStyle.repeating);
+ Rational roundtrip = Rational.of(formatted);
+ assertEquals("roundtrip " + formatted, source, roundtrip);
+ }
+}
diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/UnitPreferenceSource.txt b/tools/cldr-unittest/src/org/unicode/cldr/unittest/UnitPreferenceSource.txt
new file mode 100644
index 0000000..772c5db
--- /dev/null
+++ b/tools/cldr-unittest/src/org/unicode/cldr/unittest/UnitPreferenceSource.txt
@@ -0,0 +1,162 @@
+# Generate data for UnitPreferencesSource.txt, will eventually turn into ... <unitPreference regions="CA GB IN US" geq="1.5" unit="foot+inch" />
+area; default; 001; ; ; square-kilometer
+area; default; 001; ; ; hectare
+area; default; 001; ; ; square-meter
+area; default; 001; ; ; square-centimeter
+area; default; US GB; ; ; square-mile
+area; default; US GB; ; ; acre
+area; default; US GB; ; ; square-foot
+area; default; US GB; ; ; square-inch
+
+area; geograph; 001; ; ; square-kilometer
+area; geograph; US GB; ; ; square-mile
+
+area; land; 001; ; ; hectare
+area; land; US GB; ; ; acre
+
+mass-density; default; 001; ; ; kilogram-per-cubic-meter
+mass-density; blood-glucose; 001; ; ; milligram-per-deciliter
+
+concentration; default; 001; ; ; item-per-cubic-meter
+concentration; blood-glucose; AG AI AO AU BA BG BH BM BN BW BY CA CH CM CN CZ DK DM EE FI FJ GB GD HK HR HU IE IM IS KE KN KW KZ LC LI LT LU LV ME MG MK MO MS MT MU MY MZ NA NL NO NZ OM PG RS RU SE SG SI SK TC TO UA UG VC VG VN VU ZA; ; ; millimole-per-liter
+
+consumption; default; 001; ; ; liter-per-100-kilometer
+consumption; vehicle-fuel; 001; ; ; liter-per-100-kilometer
+consumption; vehicle-fuel; BR IT JP KR MX MY NL TH TR; ; ; liter-per-kilometer
+
+consumption-inverse; default; 001; ; ; kilometer-per-centiliter
+consumption-inverse; vehicle-fuel; 001; ; ; kilometer-per-centiliter
+consumption-inverse; vehicle-fuel; US; ; ; mile-per-gallon
+consumption-inverse; vehicle-fuel; CA GB; ; ; mile-per-gallon-imperial
+
+year-duration; default; 001; ; ; year
+year-duration; default; 001; ; ; month
+duration; default; 001; ; ; day
+duration; default; 001; ; ; hour
+duration; default; 001; ; ; minute
+duration; default; 001; ; ; second
+duration; default; 001; ; ; millisecond
+duration; default; 001; ; ; microsecond
+duration; default; 001; ; ; nanosecond
+
+duration; media; 001; ; ; minute-and-second
+duration; media; 001; ; ; second
+
+year-duration; person-age; 001; 2.5; ; year-person
+year-duration; person-age; 001; ; ; year-person-and-month-person
+year-duration; person-age; 001; ; ; month-person
+
+energy; default; 001; ; ; kilowatt-hour
+energy; food; US; ; ; foodcalorie
+energy; food; 001; ; ; kilocalorie
+
+length; default; 001; ; ; kilometer
+length; default; 001; ; ; meter
+length; default; 001; ; ; centimeter
+length; default; US GB; ; ; mile
+length; default; US GB; ; ; foot
+length; default; US GB; ; ; inch
+
+length; person; 001; ; ; centimeter
+length; person; CA GB IN US; ; ; inch
+length; person-height; 001; ; ; centimeter
+length; person-height; CA GB IN US; 3; ; foot-and-inch
+length; person-height; AT BE BR CN DE DK DZ EG ES FR HK ID IL IT JO MX MY NL NO PL PT RU SA SE TR VN; ; ; meter-and-centimeter
+
+length; road; 001; 0.9; ; kilometer
+length; road; 001; 300; precision-increment/50; meter
+length; road; 001; ; precision-increment/10; meter
+length; road; 001; ; ; meter
+length; road; US ; 0.5; ; mile
+length; road; US; 100; precision-increment/50; foot
+length; road; US; ; precision-increment/10; foot
+length; road; GB; 0.5; ; mile
+length; road; GB; 100; precision-increment/50; yard
+length; road; GB; ; ; yard
+length; road; SE; 0.1; ; mile-scandinavian
+
+length; rainfall; BR; ; ; centimeter
+length; rainfall; US; ; ; inch
+length; rainfall; 001; ; ; millimeter
+
+length; snowfall; 001; ; ; centimeter
+length; snowfall; US; ; ; inch
+
+length; vehicle; GB US; ; ; foot-and-inch
+length; vehicle; 001; ; ; meter
+length; vehicle; MX; ; ; meter-and-centimeter
+
+length; visiblty; 001; 0.1; ; kilometer
+length; visiblty; 001; ; ; meter
+length; visiblty; DE NL; ; ; meter
+length; visiblty; GB US; ; ; mile
+length; visiblty; GB US; ; ; foot
+
+mass; default; 001; ; ; metric-ton
+mass; default; 001; ; ; kilogram
+mass; default; 001; ; ; gram
+mass; default; 001; ; ; milligram
+mass; default; 001; ; ; microgram
+
+mass; default; US GB; ; ; ton
+mass; default; US GB; ; ; pound
+mass; default; US GB; ; ; ounce
+
+mass; person; 001; ; ; kilogram
+mass; person; 001; ; ; gram
+mass; person; DZ EG ES JO SA; ; ; kilogram-and-gram
+mass; person; US; ; ; pound
+mass; person; US; ; ; pound-and-ounce
+mass; person; GB; ; ; stone-and-pound
+mass; person; GB; ; ; pound-and-ounce
+mass; person; HK; ; ; pound-and-ounce
+
+power; default; 001; ; ; gigawatt
+power; default; 001; ; ; megawatt
+power; default; 001; ; ; kilowatt
+power; default; 001; ; ; watt
+power; default; 001; ; ; milliwatt
+power; engine; 001; ; ; kilowatt
+power; engine; US GB; ; ; horsepower
+
+pressure; default; 001; ; ; megapascal
+pressure; baromtrc; 001; ; ; hectopascal
+pressure; default; 001; ; ; pascal
+pressure; default; US GB; ; ; pound-force-per-square-inch
+pressure; baromtrc; IN US; ; ; inch-ofhg
+pressure; baromtrc; BR EG GB IL TH; ; ; millibar
+pressure; baromtrc; MX RU; ; ; millimeter-ofhg
+
+speed; default; 001; ; ; kilometer-per-hour
+speed; default; GB US; ; ; mile-per-hour
+speed; wind; 001; ; ; kilometer-per-hour
+speed; wind; FI KR NO PL RU SE; ; ; meter-per-second
+speed; wind; US; ; ; mile-per-hour
+
+temperature; default; 001; ; ; celsius
+temperature; default; US; ; ; fahrenheit
+temperature; weather; 001; ; ; celsius
+temperature; weather; BS BZ KY PR PW US; ; ; fahrenheit
+
+volume; default; 001; ; ; cubic-meter
+volume; default; 001; ; ; cubic-centimeter
+
+volume; default; US GB; ; ; cubic-foot
+volume; default; US GB; ; ; cubic-inch
+
+volume; fluid; 001; ; ; liter
+volume; fluid; 001; ; ; milliliter
+volume; fluid; US; ; ; gallon
+volume; fluid; US; ; ; quart
+volume; fluid; US; ; ; pint
+volume; fluid; US; ; ; cup
+volume; fluid; US; ; ; fluid-ounce
+volume; fluid; US; ; ; tablespoon
+volume; fluid; US; ; ; teaspoon
+volume; fluid; GB; ; ; gallon-imperial
+volume; fluid; GB; ; ; fluid-ounce-imperial
+
+volume; oil; 001; ; ; barrel
+
+volume; vehicle; US; ; ; gallon
+volume; vehicle; 001; ; ; liter
diff --git a/tools/java/libs/icu4j-src.jar b/tools/java/libs/icu4j-src.jar
index 2fa7776..ff6059d 100644
--- a/tools/java/libs/icu4j-src.jar
+++ b/tools/java/libs/icu4j-src.jar
Binary files differ
diff --git a/tools/java/libs/icu4j-version.txt b/tools/java/libs/icu4j-version.txt
index 3920760..e754f91 100644
--- a/tools/java/libs/icu4j-version.txt
+++ b/tools/java/libs/icu4j-version.txt
@@ -1 +1 @@
-icu4j ffbc8cf85f1379a1461b6928d40cfd6ae2464694 2019-12-04 (branch maint/maint-66 release-66-preview)
+icu4j b9d1ba87f545744f2b81f1f413484f55a0da3d2f 2020-04-14 (from maint/maint-67, ICU 67 post rc)
diff --git a/tools/java/libs/icu4j.jar b/tools/java/libs/icu4j.jar
index f8697c8..942b634 100644
--- a/tools/java/libs/icu4j.jar
+++ b/tools/java/libs/icu4j.jar
Binary files differ
diff --git a/tools/java/libs/utilities-src.jar b/tools/java/libs/utilities-src.jar
index 7fa44f4..ebd553f 100644
--- a/tools/java/libs/utilities-src.jar
+++ b/tools/java/libs/utilities-src.jar
Binary files differ
diff --git a/tools/java/libs/utilities.jar b/tools/java/libs/utilities.jar
index 7bd7314..35b0f5c 100644
--- a/tools/java/libs/utilities.jar
+++ b/tools/java/libs/utilities.jar
Binary files differ
diff --git a/tools/java/org/unicode/cldr/api/CldrData.java b/tools/java/org/unicode/cldr/api/CldrData.java
index e8c821a..4448b8a 100644
--- a/tools/java/org/unicode/cldr/api/CldrData.java
+++ b/tools/java/org/unicode/cldr/api/CldrData.java
@@ -188,5 +188,14 @@
* sub-hierarchy visitation.
*/
default void visitPrefixEnd(CldrPath prefix) {}
+
+ /**
+ * Callback method invoked for each value encountered by this visitor. This is equivalent
+ * to the {@link ValueVisitor#visit(CldrValue)} method but is not normally needed for
+ * prefix visitors (which are expected to delegate to a separate ValueVisitor). This
+ * method is useful for implementing visitors with full coverage of all paths and values
+ * in the {@link CldrData} hierarchy.
+ */
+ default void visitValue(CldrValue value) {}
}
}
diff --git a/tools/java/org/unicode/cldr/api/FilteredData.java b/tools/java/org/unicode/cldr/api/FilteredData.java
new file mode 100644
index 0000000..d61a269
--- /dev/null
+++ b/tools/java/org/unicode/cldr/api/FilteredData.java
@@ -0,0 +1,67 @@
+// © 2019 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+package org.unicode.cldr.api;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Filters underlying {@link CldrData} source data to transform values or remove values on the fly.
+ * The order of transformed values produced by the class is the same order as the underlying data.
+ *
+ * <p>This class does not currently support injecting additional values due to the difficulty in
+ * ensuring correct ordering semantics.
+ *
+ * <p>A subclass should implement the {@link FilteredData#filter(CldrValue)} method to achieve the
+ * desired results. Note however that this API is currently unstable and is expected to change once
+ * DTD path ordering is enforced everywhere.
+ */
+// TODO: Once DTD ordering is the only allowed order, this can be extended to allow adding paths.
+public abstract class FilteredData implements CldrData {
+ private final CldrData src;
+
+ /** Constructs the parent class with a {@link CldrData} source. */
+ protected FilteredData(CldrData src) {
+ this.src = checkNotNull(src);
+ }
+
+ /** Returns the underlying source data to sub-class implementations. */
+ protected CldrData getSourceData() {
+ return src;
+ }
+
+ /**
+ * Returns a filtered CLDR value, replacing or removing the original value during visitation.
+ * The filtered value can only differ in its base value or value attributes, and must have
+ * the same {@link CldrPath} associated with it.
+ *
+ * @return the filtered value to be replaced, or {@code null} to remove the value.
+ */
+ protected abstract CldrValue filter(CldrValue value);
+
+ @Override
+ public final void accept(PathOrder order, ValueVisitor visitor) {
+ src.accept(order, v -> visitFiltered(v, visitor));
+ }
+
+ @Override
+ public final CldrValue get(CldrPath path) {
+ CldrValue value = src.get(path);
+ return value != null ? checkFiltered(value) : null;
+ }
+
+ private void visitFiltered(CldrValue value, ValueVisitor visitor) {
+ CldrValue filteredValue = checkFiltered(value);
+ if (filteredValue != null) {
+ visitor.visit(filteredValue);
+ }
+ }
+
+ private CldrValue checkFiltered(CldrValue value) {
+ CldrValue filteredValue = filter(value);
+ checkArgument(filteredValue == null || filteredValue.getPath().equals(value.getPath()),
+ "filtering is not permitted to modify distinguishing paths: source=%s, filtered=%s",
+ value, filteredValue);
+ return filteredValue;
+ }
+}
diff --git a/tools/java/org/unicode/cldr/api/PathMatcher.java b/tools/java/org/unicode/cldr/api/PathMatcher.java
new file mode 100644
index 0000000..a8fb4a8
--- /dev/null
+++ b/tools/java/org/unicode/cldr/api/PathMatcher.java
@@ -0,0 +1,290 @@
+// © 2019 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+package org.unicode.cldr.api;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkPositionIndex;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static org.unicode.cldr.api.AttributeKey.keyOf;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * An immutable matcher for {@link CldrPath} instances.
+ *
+ * <p>A path matcher pattern looks like:
+ * <ul>
+ * <li>{@code //ldml/path/prefix/element[@attribute="value"]}
+ * <li>{@code //ldml/path/prefix/element[@attribute=*]}
+ * <li>{@code //ldml/path/prefix/*[@attribute="value"]}
+ * <li>{@code //ldml/path/prefix/element[@foo=*]/*[@bar="value"]}
+ * </ul>
+ * where element names and attribute values can be wildcards. No capturing of wildcard values is
+ * done, and currently wildcards are limited to the entire field (element name, or attribute value).
+ *
+ * <h2>Matching an exact path</h2>
+ * <pre>{@code
+ * private static final PathMatcher ALIAS =
+ * PathMatcher.of("//supplementalData/likelySubtags/likelySubtag[@from=*][@to=*]");
+ *
+ * ...
+ *
+ * if (ALIAS.matches(path)) {
+ * // Path represents a subtag alias.
+ * }
+ * }</pre>
+ *
+ * <h2>Matching path prefixes and hierarchical matching</h2>
+ * <pre>{@code
+ * private static final PathMatcher KEY = PathMatcher.of("//ldmlBCP47/keyword/key[@name=\"ca\"]");
+ * private static final PathMatcher TYPE = key.withSuffix("type[@name=*]");
+ *
+ * ...
+ *
+ * if (KEY.matchesPrefixOf(path)) {
+ * // Once the KEY prefix is matched, we can just "locally" match the suffix.
+ * if (TYPE.locallyMatches(path)) {
+ * // Path is a key-type mapping.
+ * }
+ * }
+ * }</pre>
+ */
+public final class PathMatcher {
+ private static final Pattern ROOT_PATH_SPEC = Pattern.compile("//(\\w+)(/|$)");
+
+ /**
+ * Parses the full or partial (prefix) path pattern into a matcher. Path patterns given to this
+ * method must start with {@code "//xxx/..."} where {@code xxx} is a known CLDR XML path prefix
+ * (such as {@code "ldml"}).
+ */
+ public static PathMatcher of(String pattern) {
+ Matcher m = ROOT_PATH_SPEC.matcher(pattern);
+ checkArgument(m.lookingAt(), "invalid path pattern: %s", pattern);
+ // This throws IllegalArgumentException if the type isn't valid.
+ CldrDataType.forXmlName(m.group(1));
+ return new PathMatcher(null, parse(pattern.substring(2)));
+ }
+
+ private final Optional<PathMatcher> parent;
+ private final ImmutableList<Predicate<CldrPath>> elementMatchers;
+ private final int totalElementCount;
+
+ private PathMatcher(PathMatcher parent, List<Predicate<CldrPath>> elementMatchers) {
+ this.parent = Optional.ofNullable(parent);
+ this.elementMatchers = ImmutableList.copyOf(elementMatchers);
+ this.totalElementCount =
+ elementMatchers.size() + (parent != null ? parent.totalElementCount : 0);
+ }
+
+ /**
+ * Extends this matcher by the given path pattern suffix.
+ *
+ * <p>For example if we define:
+ * <pre>{@code
+ * private static final PathMatcher COLLATIONS = PathMatcher.of("//ldml/collations");
+ * private static final PathMatcher RULE = COLLATIONS.extendBy("collation/cr");
+ * }</pre>
+ * Then {@code RULE} would match paths like {@code "//ldml/collations/collation/cr"}.
+ */
+ public PathMatcher withSuffix(String pattern) {
+ return new PathMatcher(this, parse(pattern));
+ }
+
+ /**
+ * Returns whether this matcher fully matches the given path, including taking into account
+ * any parent matchers from which this matcher might have been extended.
+ */
+ public boolean matches(CldrPath path) {
+ if (!locallyMatches(path)) {
+ return false;
+ }
+ if (!parent.isPresent()) {
+ // No parent means this is a "root" matcher, so we've finished matching everything.
+ return true;
+ }
+ while (path.getLength() > totalElementCount - elementMatchers.size()) {
+ path = path.getParent();
+ }
+ return parent.get().locallyMatches(path);
+ }
+
+ /**
+ * Returns whether this matcher matches a proper prefix of the given path, including taking
+ * into account any parent matchers from which this matcher might have been extended. Note that
+ * the matcher for {@code "//ldml/foo/bar"} is not considered a prefix match for the path
+ * {@code //ldml/foo/barbaz}, since partial matching of an element name is not allowed.
+ */
+ public boolean matchesPrefixOf(CldrPath path) {
+ if (path.getLength() < totalElementCount) {
+ return false;
+ }
+ while (path.getLength() > totalElementCount) {
+ path = path.getParent();
+ }
+ return matches(path);
+ }
+
+ /**
+ * Returns whether this matcher matches the given path only in relation to the pattern
+ * used to generate this matcher. This method is useful for nested visitation via {@link
+ * org.unicode.cldr.api.CldrData.PrefixVisitor PrefixVisitor} when path prefixes are visited
+ * before values.
+ *
+ * <p>This method assumes that any parent matchers from which this matcher was extended already
+ * match the path. The possible length of the parent matchers is taken into account however to
+ * ensure that the sub-sequence match for this matcher starts at the correct point in the path.
+ */
+ public boolean locallyMatches(CldrPath path) {
+ return (path.getLength() == totalElementCount)
+ && matchRegion(path, totalElementCount - elementMatchers.size());
+ }
+
+ private boolean matchRegion(CldrPath path, int offset) {
+ // offset is the path element corresponding the the "top most" element matcher, it
+ // must be in the range 0 ... (path.length() - elementMatchers.size()).
+ checkPositionIndex(offset, path.getLength() - elementMatchers.size());
+ // First jump over the path parents until we find the last matcher.
+ int matchPathLength = offset + elementMatchers.size();
+ while (path.getLength() > matchPathLength) {
+ path = path.getParent();
+ }
+ return matchForward(path, elementMatchers.size() - 1);
+ }
+
+ private boolean matchForward(CldrPath path, int matcherIndex) {
+ if (matcherIndex < 0) {
+ return true;
+ }
+ return matchForward(path.getParent(), matcherIndex - 1)
+ && elementMatchers.get(matcherIndex).test(path);
+ }
+
+ // --- Parsing of matcher path patterns ----
+
+ // Make a new, non-interned, unique instance here which we can test by reference to
+ // determine if the argument is to be captured (needed as ImmutableMap prohibits null).
+ // DO NOT change this code to assign "*" as the value directly, it MUST be a new instance.
+ @SuppressWarnings("StringOperationCanBeSimplified")
+ private static final String WILDCARD = new String("*");
+
+ private static final Pattern ELEMENT_START_REGEX =
+ Pattern.compile("(\\*|[-:\\w]+)(?:/|\\[|$)");
+ private static final Pattern ATTRIBUTE_REGEX =
+ Pattern.compile("\\[@([-:\\w]+)=(?:\\*|\"([^\"]*)\")]");
+
+ // element := foo, foo[@bar="baz"], foo[@bar=*]
+ // pathspec := element{/element}*
+ private static List<Predicate<CldrPath>> parse(String pattern) {
+ List<Predicate<CldrPath>> specs = new ArrayList<>();
+ int pos = 0;
+ do {
+ pos = parse(pattern, pos, specs);
+ } while (pos >= 0);
+ return specs;
+ }
+
+ // Return next start index or -1.
+ private static int parse(String pattern, int pos, List<Predicate<CldrPath>> specs) {
+ Matcher m = ELEMENT_START_REGEX.matcher(pattern).region(pos, pattern.length());
+ checkArgument(m.lookingAt(), "invalid path pattern (index=%s): %s", pos, pattern);
+ String name = m.group(1);
+ Map<String, String> attributes = ImmutableMap.of();
+ pos = m.end(1);
+ if (pos < pattern.length() && pattern.charAt(pos) == '[') {
+ // We have attributes to add.
+ attributes = new LinkedHashMap<>();
+ do {
+ m = ATTRIBUTE_REGEX.matcher(pattern).region(pos, pattern.length());
+ checkArgument(m.lookingAt(),
+ "invalid path pattern (index=%s): %s", pos, pattern);
+ // Null if we matched the '*' wildcard.
+ String value = m.group(2);
+ attributes.put(m.group(1), value != null ? value : WILDCARD);
+ pos = m.end();
+ } while (pos < pattern.length() && pattern.charAt(pos) == '[');
+ }
+ // Wildcard matching is less efficient because attribute keys cannot be made in advance, so
+ // since it's also very rare, we special case it.
+ Predicate<CldrPath> matcher = name.equals(WILDCARD)
+ ? new WildcardElementMatcher(attributes)::match
+ : new ElementMatcher(name, attributes)::match;
+ specs.add(matcher);
+ if (pos == pattern.length()) {
+ return -1;
+ }
+ checkState(pattern.charAt(pos) == '/',
+ "invalid path pattern (index=%s): %s", pos, pattern);
+ return pos + 1;
+ }
+
+ // Matcher for path elements like "foo[@bar=*]" where the name is known in advance.
+ private static final class ElementMatcher {
+ private final String name;
+ private final ImmutableMap<AttributeKey, String> attributes;
+
+ private ElementMatcher(String name, Map<String, String> attributes) {
+ this.name = checkNotNull(name);
+ this.attributes = attributes.entrySet().stream()
+ .collect(toImmutableMap(e -> keyOf(name, e.getKey()), Map.Entry::getValue));
+ }
+
+ @SuppressWarnings("StringEquality")
+ boolean match(CldrPath path) {
+ if (!path.getName().equals(name)) {
+ return false;
+ }
+ for (Map.Entry<AttributeKey, String> e : attributes.entrySet()) {
+ String actual = path.get(e.getKey());
+ if (actual == null) {
+ return false;
+ }
+ String expected = e.getValue();
+ // DO NOT change this to use expected.equals(WILDCARD).
+ if (expected != WILDCARD && !expected.equals(actual)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ // Matcher for path elements like "*[@bar=*]", where the name isn't known until match time.
+ private static final class WildcardElementMatcher {
+ private final ImmutableMap<String, String> attributes;
+
+ private WildcardElementMatcher(Map<String, String> attributes) {
+ this.attributes = ImmutableMap.copyOf(attributes);
+ }
+
+ @SuppressWarnings("StringEquality")
+ private boolean match(CldrPath path) {
+ // The wildcard matcher never fails due to the element name but must create new key
+ // instances every time matching occurs (because the key name is dynamic). Since this
+ // is rare, it's worth making into a separate case.
+ for (Map.Entry<String, String> attribute : attributes.entrySet()) {
+ String actual = path.get(keyOf(path.getName(), attribute.getKey()));
+ if (actual == null) {
+ return false;
+ }
+ String expected = attribute.getValue();
+ // DO NOT change this to use expected.equals(WILDCARD).
+ if (expected != WILDCARD && !expected.equals(actual)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+}
diff --git a/tools/java/org/unicode/cldr/api/PrefixVisitorHost.java b/tools/java/org/unicode/cldr/api/PrefixVisitorHost.java
index b6a9e5b..887f8be 100644
--- a/tools/java/org/unicode/cldr/api/PrefixVisitorHost.java
+++ b/tools/java/org/unicode/cldr/api/PrefixVisitorHost.java
@@ -75,13 +75,13 @@
* sub hierarchy visitation and removed automatically once the visitation is complete.
*/
@SuppressWarnings("unused") // For unused arguments in no-op default methods.
- private static abstract class VisitorState {
+ private static abstract class VisitorState implements PrefixVisitor {
/** Creates a visitor state from the given visitor for the specified leaf value. */
static <T extends ValueVisitor> VisitorState of(
T visitor, Consumer<T> doneHandler, CldrPath prefix) {
return new VisitorState(prefix, () -> doneHandler.accept(visitor)) {
@Override
- public void visit(CldrValue value) {
+ public void visitValue(CldrValue value) {
visitor.visit(value);
}
};
@@ -93,12 +93,17 @@
return new VisitorState(prefix, () -> doneHandler.accept(visitor)) {
@Override
public void visitPrefixStart(CldrPath prefix, Context ctx) {
- safeVisitPrefix(prefix, p -> visitor.visitPrefixStart(p, ctx));
+ visitor.visitPrefixStart(prefix, ctx);
}
@Override
public void visitPrefixEnd(CldrPath prefix) {
- safeVisitPrefix(prefix, visitor::visitPrefixEnd);
+ visitor.visitPrefixEnd(prefix);
+ }
+
+ @Override
+ public void visitValue(CldrValue value) {
+ visitor.visitValue(value);
}
};
}
@@ -111,26 +116,6 @@
this.prefix = prefix;
this.doneCallback = doneCallback;
}
-
- // These methods are the union of the public visitor methods and are used to dispatch
- // the events triggered by path processing to the currently installed visitor.
- void visit(CldrValue value) { }
-
- void visitPrefixStart(CldrPath prefix, Context ctx) { }
-
- void visitPrefixEnd(CldrPath prefix) { }
-
- // Helper to ensure that we don't fail the entire visitation when a single visitor fails.
- // NOTE: This could be removed once a more coherent error handling strategy is defined.
- private static void safeVisitPrefix(CldrPath prefix, Consumer<CldrPath> fn) {
- try {
- fn.accept(prefix);
- } catch (RuntimeException e) {
- System.err.format("Exception thrown by prefix visitor for path '%s'\n", prefix);
- System.err.println(e);
- e.printStackTrace(System.err);
- }
- }
}
// Stack of currently installed visitor.
@@ -154,12 +139,13 @@
"unexpected parent path encountered: %s is parent of %s", path, lastValuePath);
recursiveStartVisit(path.getParent(), commonLength, new PrefixContext());
// This is a no-op if the head of the stack is a prefix visitor.
- visitorStack.peek().visit(value);
+ visitorStack.peek().visitValue(value);
lastValuePath = path;
};
private PrefixVisitorHost(PrefixVisitor visitor) {
- this.visitorStack.push(VisitorState.of(visitor, v -> {}, null));
+ this.visitorStack.push(VisitorState.of(visitor, v -> {
+ }, null));
}
// Called after visitation is complete to close out the last visited value path.
diff --git a/tools/java/org/unicode/cldr/icu/ldml2icu_locale.txt b/tools/java/org/unicode/cldr/icu/ldml2icu_locale.txt
index 1abbc12..61d87f5 100644
--- a/tools/java/org/unicode/cldr/icu/ldml2icu_locale.txt
+++ b/tools/java/org/unicode/cldr/icu/ldml2icu_locale.txt
@@ -245,10 +245,22 @@
//ldml/units/unitLength[@type="short"]/unit[@type="(\w++)-(%A)"]/unitPattern[@count="(%A)"] ; /unitsShort/$1/$2/$3
//ldml/units/unitLength[@type="long"]/unit[@type="(\w++)-(%A)"]/unitPattern[@count="(%A)"] ; /units/$1/$2/$3
+//ldml/units/unitLength[@type="narrow"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1 ; /unitsNarrow/compound1/$1
+//ldml/units/unitLength[@type="short"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1 ; /unitsShort/compound1/$1
+//ldml/units/unitLength[@type="long"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1 ; /units/compound1/$1
+
+//ldml/units/unitLength[@type="narrow"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1[@count="(%A)"] ; /unitsNarrow/compoundPlurals/$1/$2
+//ldml/units/unitLength[@type="short"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1[@count="(%A)"] ; /unitsShort/compoundPlurals/$1/$2
+//ldml/units/unitLength[@type="long"]/compoundUnit[@type="(%A)"]/compoundUnitPattern1[@count="(%A)"] ; /units/compoundPlurals/$1/$2
+
//ldml/units/unitLength[@type="narrow"]/compoundUnit[@type="(%A)"]/compoundUnitPattern ; /unitsNarrow/compound/$1
//ldml/units/unitLength[@type="short"]/compoundUnit[@type="(%A)"]/compoundUnitPattern ; /unitsShort/compound/$1
//ldml/units/unitLength[@type="long"]/compoundUnit[@type="(%A)"]/compoundUnitPattern ; /units/compound/$1
+//ldml/units/unitLength[@type="narrow"]/compoundUnit[@type="(%A)"]/unitPrefixPattern ; /unitsNarrow/prefix/$1
+//ldml/units/unitLength[@type="short"]/compoundUnit[@type="(%A)"]/unitPrefixPattern ; /unitsShort/prefix/$1
+//ldml/units/unitLength[@type="long"]/compoundUnit[@type="(%A)"]/unitPrefixPattern ; /units/prefix/$1
+
//ldml/units/unitLength[@type="narrow"]/coordinateUnit/displayName ; /unitsNarrow/coordinate/dnam
//ldml/units/unitLength[@type="short"]/coordinateUnit/displayName ; /unitsShort/coordinate/dnam
//ldml/units/unitLength[@type="long"]/coordinateUnit/displayName ; /units/coordinate/dnam
diff --git a/tools/java/org/unicode/cldr/json/JSON_config_supplemental.txt b/tools/java/org/unicode/cldr/json/JSON_config_supplemental.txt
index b0d862c..6cd5b55 100644
--- a/tools/java/org/unicode/cldr/json/JSON_config_supplemental.txt
+++ b/tools/java/org/unicode/cldr/json/JSON_config_supplemental.txt
@@ -17,7 +17,6 @@
section=territoryInfo ; path=//cldr/supplemental/territoryInfo/.* ; package=core
section=calendarData ; path=//cldr/supplemental/calendarData/.* ; package=core
section=calendarPreferenceData ; path=//cldr/supplemental/calendarPreferenceData/.* ; package=core
-section=unitPreferenceData ; path=//cldr/supplemental/unitPreferenceData/.* ; package=core
section=weekData ; path=//cldr/supplemental/weekData/.* ; package=core
section=timeData ; path=//cldr/supplemental/timeData/.* ; package=core
section=measurementData ; path=//cldr/supplemental/measurementData/.* ; package=core
@@ -26,4 +25,4 @@
section=references ; path=//cldr/supplemental/references/.* ; package=core
section=telephoneCodeData ; path=//cldr/supplemental/telephoneCodeData/.* ; package=core
section=windowsZones ; path=//cldr/supplemental/windowsZones/.* ; package=core
-section=aliases ; path=//cldr/supplemental/metadata/alias/(language|script|territory|variant|zone)Alias.* ; package=core
+section=aliases ; path=//cldr/supplemental/metadata/alias/(language|script|subdivision|territory|variant|zone)Alias.* ; package=core
diff --git a/tools/java/org/unicode/cldr/json/LdmlConvertRules.java b/tools/java/org/unicode/cldr/json/LdmlConvertRules.java
index e0b58e4..932b74f 100644
--- a/tools/java/org/unicode/cldr/json/LdmlConvertRules.java
+++ b/tools/java/org/unicode/cldr/json/LdmlConvertRules.java
@@ -13,8 +13,8 @@
class LdmlConvertRules {
/** File sets that will not be processed in JSON transformation. */
- public static final ImmutableSet<String> IGNORE_FILE_SET = ImmutableSet.of("attributeValueValidity", "coverageLevels", "postalCodeData", "pluralRanges",
- "subdivisions");
+ public static final ImmutableSet<String> IGNORE_FILE_SET = ImmutableSet.of("attributeValueValidity", "coverageLevels", "grammaticalFeatures", "postalCodeData", "pluralRanges",
+ "subdivisions", "units");
/**
* The attribute list that should become part of the name in form of
@@ -423,6 +423,7 @@
new PathTransformSpec("(.*/languageAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
new PathTransformSpec("(.*/scriptAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
new PathTransformSpec("(.*/territoryAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
+ new PathTransformSpec("(.*/subdivisionAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
new PathTransformSpec("(.*/variantAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
new PathTransformSpec("(.*/zoneAlias)\\[@type=\"([^\"]*)\"\\](.*)", "$1/$2$3"),
new PathTransformSpec("(.*/alias)(.*)", "$1/alias$2"),
diff --git a/tools/java/org/unicode/cldr/test/BuildIcuCompactDecimalFormat.java b/tools/java/org/unicode/cldr/test/BuildIcuCompactDecimalFormat.java
index 7d3273f..afa5c9f 100644
--- a/tools/java/org/unicode/cldr/test/BuildIcuCompactDecimalFormat.java
+++ b/tools/java/org/unicode/cldr/test/BuildIcuCompactDecimalFormat.java
@@ -5,6 +5,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.regex.Pattern;
import org.unicode.cldr.util.CLDRFile;
@@ -41,7 +42,23 @@
Set<String> debugCreationErrors, String[] debugOriginals,
CompactStyle style, ULocale locale, CurrencyStyle currencyStyle, String currencyCodeOrUnit) {
- final Map<String, Map<String, String>> customData = new HashMap<String, Map<String, String>>();
+ final Map<String, Map<String, String>> customData = buildCustomData(resolvedCldrFile, style, currencyStyle);
+ CompactDecimalFormat cdf = CompactDecimalFormat.getInstance(locale, style);
+ ICUServiceBuilder builder = new ICUServiceBuilder().setCldrFile(resolvedCldrFile);
+
+ cdf.setDecimalFormatSymbols(builder.getDecimalFormatSymbols("latn"));
+ cdf.setProperties(new PropertySetter() {
+ @Override
+ public void set(DecimalFormatProperties props) {
+ props.setCompactCustomData(customData);
+ }
+ });
+ return cdf;
+ }
+
+ public static Map<String, Map<String, String>> buildCustomData(CLDRFile resolvedCldrFile, CompactStyle style, CurrencyStyle currencyStyle) {
+
+ final Map<String, Map<String, String>> customData = new TreeMap<String, Map<String, String>>();
String prefix = currencyStyle == CurrencyStyle.PLAIN ? "//ldml/numbers/decimalFormats[@numberSystem=\"latn\"]/decimalFormatLength"
: "//ldml/numbers/currencyFormats[@numberSystem=\"latn\"]/currencyFormatLength";
@@ -62,6 +79,9 @@
String type = parts.getAttributeValue(-1, "type");
String key = parts.getAttributeValue(-1, "count");
String pattern = resolvedCldrFile.getStringValue(path);
+ if (pattern.contentEquals("0")) {
+ continue;
+ }
/*
<pattern type="1000" count="one">0K</pattern>
@@ -69,17 +89,7 @@
add(customData, type, key, pattern);
}
- CompactDecimalFormat cdf = CompactDecimalFormat.getInstance(locale, style);
- ICUServiceBuilder builder = new ICUServiceBuilder().setCldrFile(resolvedCldrFile);
-
- cdf.setDecimalFormatSymbols(builder.getDecimalFormatSymbols("latn"));
- cdf.setProperties(new PropertySetter() {
- @Override
- public void set(DecimalFormatProperties props) {
- props.setCompactCustomData(customData);
- }
- });
- return cdf;
+ return customData;
}
private static <A, B, C> void add(Map<A, Map<B, C>> customData, A a, B b, C c) {
diff --git a/tools/java/org/unicode/cldr/test/CheckAlt.java b/tools/java/org/unicode/cldr/test/CheckAlt.java
index 361beb0..581fb20 100644
--- a/tools/java/org/unicode/cldr/test/CheckAlt.java
+++ b/tools/java/org/unicode/cldr/test/CheckAlt.java
@@ -6,12 +6,9 @@
import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
import org.unicode.cldr.util.CLDRFile;
-import org.unicode.cldr.util.XPathParts;
public class CheckAlt extends CheckCLDR {
- XPathParts parts = new XPathParts();
- // CLDRFile.Status status = new CLDRFile.Status();
Set<String> seenSoFar = new HashSet<String>();
// determine if we have an alt=...proposed
diff --git a/tools/java/org/unicode/cldr/test/CheckCLDR.java b/tools/java/org/unicode/cldr/test/CheckCLDR.java
index ed28994..e6ee4cc 100644
--- a/tools/java/org/unicode/cldr/test/CheckCLDR.java
+++ b/tools/java/org/unicode/cldr/test/CheckCLDR.java
@@ -107,17 +107,19 @@
FORBID_ERRORS(true),
FORBID_READONLY(true),
FORBID_UNLESS_DATA_SUBMISSION(true),
- FORBID_NULL(true);
+ FORBID_NULL(true),
+ FORBID_ROOT(true),
+ FORBID_PERMANENT_WITHOUT_FORUM(true);
private final boolean isForbidden;
private StatusAction() {
isForbidden = false;
- };
+ }
private StatusAction(boolean isForbidden) {
this.isForbidden = isForbidden;
- };
+ }
public boolean isForbidden() {
return isForbidden;
diff --git a/tools/java/org/unicode/cldr/test/CheckConsistentCasing.java b/tools/java/org/unicode/cldr/test/CheckConsistentCasing.java
index cf86955..ff8a5dc 100644
--- a/tools/java/org/unicode/cldr/test/CheckConsistentCasing.java
+++ b/tools/java/org/unicode/cldr/test/CheckConsistentCasing.java
@@ -20,7 +20,6 @@
import org.unicode.cldr.util.PathStarrer;
import org.unicode.cldr.util.PatternCache;
import org.unicode.cldr.util.RegexLookup;
-import org.unicode.cldr.util.XPathParts;
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.lang.UCharacter;
@@ -35,7 +34,6 @@
// remember to add this class to the list in CheckCLDR.getCheckAll
// to run just this test, on just locales starting with 'nl', use CheckCLDR with -fnl.* -t.*Currencies.*
- XPathParts parts = new XPathParts(); // used to parse out a path
ULocale uLocale = null;
BreakIterator breaker = null;
private String locale;
diff --git a/tools/java/org/unicode/cldr/test/CheckCurrencies.java b/tools/java/org/unicode/cldr/test/CheckCurrencies.java
index 7079c8a..42ac069 100644
--- a/tools/java/org/unicode/cldr/test/CheckCurrencies.java
+++ b/tools/java/org/unicode/cldr/test/CheckCurrencies.java
@@ -3,7 +3,6 @@
import java.util.List;
import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
-import org.unicode.cldr.util.XPathParts;
import com.ibm.icu.lang.UCharacter;
@@ -11,8 +10,6 @@
// remember to add this class to the list in CheckCLDR.getCheckAll
// to run just this test, on just locales starting with 'nl', use CheckCLDR with -fnl.* -t.*Currencies.*
- XPathParts parts = new XPathParts(); // used to parse out a path
-
// If you don't need any file initialization or postprocessing, you only need this one routine
public CheckCLDR handleCheck(String path, String fullPath, String value, Options options,
List<CheckStatus> result) {
diff --git a/tools/java/org/unicode/cldr/test/CheckDates.java b/tools/java/org/unicode/cldr/test/CheckDates.java
index d8a1191..eaa984d 100644
--- a/tools/java/org/unicode/cldr/test/CheckDates.java
+++ b/tools/java/org/unicode/cldr/test/CheckDates.java
@@ -342,30 +342,36 @@
wideValue);
result.add(item);
}
- for (String lgPath : LogicalGrouping.getPaths(getCldrFileToCheck(), path)) {
- String lgPathValue = getCldrFileToCheck().getWinningValueWithBailey(lgPath);
- String lgPathToWide = lgPath.replace("[@type=\"abbreviated\"]", "[@type=\"wide\"]");
- String lgPathWideValue = getCldrFileToCheck().getWinningValueWithBailey(lgPathToWide);
- // This helps us get around things like "de març" vs. "març" in Catalan
- String thisValueStripped = stripPrefix(value);
- String wideValueStripped = stripPrefix(wideValue);
- String lgPathValueStripped = stripPrefix(lgPathValue);
- String lgPathWideValueStripped = stripPrefix(lgPathWideValue);
- boolean thisPathHasPeriod = value.contains(".");
- boolean lgPathHasPeriod = lgPathValue.contains(".");
- if (!thisValueStripped.equalsIgnoreCase(wideValueStripped) && !lgPathValueStripped.equalsIgnoreCase(lgPathWideValueStripped) &&
- thisPathHasPeriod != lgPathHasPeriod) {
- CheckStatus.Type et = CheckStatus.errorType;
- if (path.contains("dayPeriod")) {
- et = CheckStatus.warningType;
+ Set<String> grouping = LogicalGrouping.getPaths(getCldrFileToCheck(), path);
+ if (grouping != null) {
+ for (String lgPath : grouping) {
+ String lgPathValue = getCldrFileToCheck().getWinningValueWithBailey(lgPath);
+ if (lgPathValue == null) {
+ continue;
}
- CheckStatus item = new CheckStatus()
- .setCause(this)
- .setMainType(et)
- .setSubtype(Subtype.inconsistentPeriods)
- .setMessage("Inconsistent use of periods in abbreviations for this section.");
- result.add(item);
- break;
+ String lgPathToWide = lgPath.replace("[@type=\"abbreviated\"]", "[@type=\"wide\"]");
+ String lgPathWideValue = getCldrFileToCheck().getWinningValueWithBailey(lgPathToWide);
+ // This helps us get around things like "de març" vs. "març" in Catalan
+ String thisValueStripped = stripPrefix(value);
+ String wideValueStripped = stripPrefix(wideValue);
+ String lgPathValueStripped = stripPrefix(lgPathValue);
+ String lgPathWideValueStripped = stripPrefix(lgPathWideValue);
+ boolean thisPathHasPeriod = value.contains(".");
+ boolean lgPathHasPeriod = lgPathValue.contains(".");
+ if (!thisValueStripped.equalsIgnoreCase(wideValueStripped) && !lgPathValueStripped.equalsIgnoreCase(lgPathWideValueStripped) &&
+ thisPathHasPeriod != lgPathHasPeriod) {
+ CheckStatus.Type et = CheckStatus.errorType;
+ if (path.contains("dayPeriod")) {
+ et = CheckStatus.warningType;
+ }
+ CheckStatus item = new CheckStatus()
+ .setCause(this)
+ .setMainType(et)
+ .setSubtype(Subtype.inconsistentPeriods)
+ .setMessage("Inconsistent use of periods in abbreviations for this section.");
+ result.add(item);
+ break;
+ }
}
}
} else if (path.indexOf("[@type=\"narrow\"]") >= 0) {
@@ -456,9 +462,11 @@
Output<Integer> sampleError = new Output<>();
for (String item : retrievedPaths) {
+ XPathParts itemParts = XPathParts.getFrozenInstance(item);
if (item.equals(path)
|| skipPath(item)
- || endsWithDisplayName != item.endsWith("displayName")) {
+ || endsWithDisplayName != item.endsWith("displayName")
+ || itemParts.containsElement("alias")) {
continue;
}
String otherType = getLastType(item);
@@ -471,7 +479,6 @@
}
if (isDayPeriod) {
//ldml/dates/calendars/calendar[@type="gregorian"]/dayPeriods/dayPeriodContext[@type="format"]/dayPeriodWidth[@type="wide"]/dayPeriod[@type="am"]
- XPathParts itemParts = XPathParts.getFrozenInstance(item);
Type itemType = Type.fromString(itemParts.getAttributeValue(5, "type"));
DayPeriod itemDayPeriod = DayPeriod.valueOf(itemParts.getAttributeValue(-1, "type"));
diff --git a/tools/java/org/unicode/cldr/test/CheckDisplayCollisions.java b/tools/java/org/unicode/cldr/test/CheckDisplayCollisions.java
index e2a756e..6ee2f81 100644
--- a/tools/java/org/unicode/cldr/test/CheckDisplayCollisions.java
+++ b/tools/java/org/unicode/cldr/test/CheckDisplayCollisions.java
@@ -56,34 +56,35 @@
}
private static enum Type {
- LANGUAGE("//ldml/localeDisplayNames/languages/language", MatchType.PREFIX, 0),
- SCRIPT("//ldml/localeDisplayNames/scripts/script", MatchType.PREFIX, 1),
- TERRITORY("//ldml/localeDisplayNames/(territories/territory|subdivisions/subdivision\\[@type=\"gb(eng|sct|wls)\")", MatchType.REGEX, 2),
- VARIANT("//ldml/localeDisplayNames/variants/variant", MatchType.PREFIX, 3),
- CURRENCY("//ldml/numbers/currencies/currency", MatchType.PREFIX, 4),
- ZONE("//ldml/dates/timeZoneNames/zone", MatchType.PREFIX, 5),
- METAZONE("//ldml/dates/timeZoneNames/metazone", MatchType.PREFIX, 6),
- DECIMAL_FORMAT("//ldml/numbers/decimalFormats", MatchType.PREFIX, 7),
- UNITS_COMPOUND_LONG("//ldml/units/unitLength[@type=\"long\"]/compoundUnit", MatchType.PREFIX, 8),
- UNITS_COMPOUND_SHORT("//ldml/units/unitLength[@type=\"short\"]/compoundUnit", MatchType.PREFIX, 9),
- UNITS_COORDINATE( "//ldml/units/unitLength\\[@type=\".*\"\\]/coordinateUnit/", MatchType.REGEX, 10),
- UNITS_IGNORE("//ldml/units/unitLength[@type=\"narrow\"]", MatchType.PREFIX, 11),
- UNITS("//ldml/units/unitLength", MatchType.PREFIX, 12),
- FIELDS_NARROW("//ldml/dates/fields/field\\[@type=\"(sun|mon|tue|wed|thu|fri|sat)-narrow\"\\]/relative", MatchType.REGEX, 13),
- FIELDS_RELATIVE("//ldml/dates/fields/field\\[@type=\".*\"\\]/relative\\[@type=\"(-1|0|1)\"\\]", MatchType.REGEX, 14),
- ANNOTATIONS("//ldml/annotations/annotation\\[@cp=\".*\"\\]\\[@type=\"tts\"\\]", MatchType.REGEX, 15),
- CARDINAL_MINIMAL("//ldml/numbers/minimalPairs/pluralMinimalPairs", MatchType.PREFIX, 16),
- ORDINAL_MINIMAL("//ldml/numbers/minimalPairs/ordinalMinimalPairs", MatchType.PREFIX, 17),
- TYPOGRAPHIC_AXIS("//ldml/typographicNames/axisName", MatchType.PREFIX, 18),
- TYPOGRAPHIC_FEATURE("//ldml/typographicNames/featureName", MatchType.PREFIX, 19),
- TYPOGRAPHIC_STYLE("//ldml/typographicNames/styleName", MatchType.PREFIX, 20),
+ LANGUAGE("//ldml/localeDisplayNames/languages/language", MatchType.PREFIX),
+ SCRIPT("//ldml/localeDisplayNames/scripts/script", MatchType.PREFIX),
+ TERRITORY("//ldml/localeDisplayNames/(territories/territory|subdivisions/subdivision\\[@type=\"gb(eng|sct|wls)\")", MatchType.REGEX),
+ VARIANT("//ldml/localeDisplayNames/variants/variant", MatchType.PREFIX),
+ CURRENCY("//ldml/numbers/currencies/currency", MatchType.PREFIX),
+ ZONE("//ldml/dates/timeZoneNames/zone", MatchType.PREFIX),
+ METAZONE("//ldml/dates/timeZoneNames/metazone", MatchType.PREFIX),
+ DECIMAL_FORMAT("//ldml/numbers/decimalFormats", MatchType.PREFIX),
+ UNIT_PREFIX("//ldml/units/unitLength.*/unitPrefixPattern", MatchType.REGEX),
+ UNITS_COMPOUND_LONG("//ldml/units/unitLength[@type=\"long\"]/compoundUnit", MatchType.PREFIX),
+ UNITS_COMPOUND_SHORT("//ldml/units/unitLength[@type=\"short\"]/compoundUnit", MatchType.PREFIX),
+ UNITS_COORDINATE( "//ldml/units/unitLength\\[@type=\".*\"\\]/coordinateUnit/", MatchType.REGEX),
+ UNITS_IGNORE("//ldml/units/unitLength[@type=\"narrow\"]", MatchType.PREFIX),
+ UNITS("//ldml/units/unitLength", MatchType.PREFIX),
+ FIELDS_NARROW("//ldml/dates/fields/field\\[@type=\"(sun|mon|tue|wed|thu|fri|sat)-narrow\"\\]/relative", MatchType.REGEX),
+ FIELDS_RELATIVE("//ldml/dates/fields/field\\[@type=\".*\"\\]/relative\\[@type=\"(-1|0|1)\"\\]", MatchType.REGEX),
+ ANNOTATIONS("//ldml/annotations/annotation\\[@cp=\".*\"\\]\\[@type=\"tts\"\\]", MatchType.REGEX),
+ CARDINAL_MINIMAL("//ldml/numbers/minimalPairs/pluralMinimalPairs", MatchType.PREFIX),
+ ORDINAL_MINIMAL("//ldml/numbers/minimalPairs/ordinalMinimalPairs", MatchType.PREFIX),
+ TYPOGRAPHIC_AXIS("//ldml/typographicNames/axisName", MatchType.PREFIX),
+ TYPOGRAPHIC_FEATURE("//ldml/typographicNames/featureName", MatchType.PREFIX),
+ TYPOGRAPHIC_STYLE("//ldml/typographicNames/styleName", MatchType.PREFIX),
;
private MatchType matchType;
private String basePrefix;
private Pattern basePattern;
- private Type(String basePrefix, MatchType matchType, int index) {
+ private Type(String basePrefix, MatchType matchType) {
this.matchType = matchType;
this.basePrefix = basePrefix;
this.basePattern = PatternCache.get("^" + basePrefix + ".*");
@@ -132,6 +133,7 @@
private final Matcher typePattern = PatternCache.get("\\[@type=\"([^\"]*+)\"]").matcher("");
private final Matcher ignoreAltAndCountAttributes = PatternCache.get("\\[@(?:count|alt)=\"[^\"]*+\"]").matcher("");
private final Matcher ignoreAltAttributes = PatternCache.get("\\[@(?:alt)=\"[^\"]*+\"]").matcher("");
+ private final Matcher ignoreAltShortOrVariantAttributes = PatternCache.get("\\[@(?:alt)=\"(?:short|variant)\"]").matcher("");
private final Matcher compoundUnitPatterns = PatternCache.get("compoundUnitPattern").matcher("");
// map unique path fragment to set of unique fragments for other
@@ -299,7 +301,7 @@
currentAttributesToIgnore = ignoreAltAttributes;
message = "Can't have same number pattern as {0}";
paths = getPathsWithValue(getResolvedCldrFileToCheck(), path, value, myType, myPrefix, matcher, currentAttributesToIgnore, Equivalence.exact);
- } else if (myType == Type.UNITS) {
+ } else if (myType == Type.UNITS || myType == Type.UNIT_PREFIX) {
paths = getPathsWithValue(getResolvedCldrFileToCheck(), path, value, myType, myPrefix, matcher, currentAttributesToIgnore, Equivalence.unit);
} else if (myType == Type.CARDINAL_MINIMAL || myType == Type.ORDINAL_MINIMAL) {
if (value.equals("{0}?")) {
@@ -307,6 +309,9 @@
}
currentAttributesToIgnore = ignoreAltAttributes;
paths = getPathsWithValue(getResolvedCldrFileToCheck(), path, value, myType, myPrefix, matcher, currentAttributesToIgnore, Equivalence.normal);
+ } else if (myType == Type.SCRIPT) {
+ currentAttributesToIgnore = ignoreAltShortOrVariantAttributes; // i.e. do NOT ignore alt="stand-alone"
+ paths = getPathsWithValue(getResolvedCldrFileToCheck(), path, value, myType, myPrefix, matcher, currentAttributesToIgnore, Equivalence.normal);
} else {
paths = getPathsWithValue(getResolvedCldrFileToCheck(), path, value, myType, myPrefix, matcher, currentAttributesToIgnore, Equivalence.normal);
}
@@ -368,11 +373,11 @@
}
}
}
-
+
// Collisions between different lengths and counts of the same unit are allowed
// Collisions between 'narrow' forms are allowed (the current is filtered by UNITS_IGNORE)
//ldml/units/unitLength[@type="narrow"]/unit[@type="duration-day-future"]/unitPattern[@count="one"]
- if (myType == Type.UNITS) {
+ if (myType == Type.UNITS || myType == Type.UNIT_PREFIX) {
XPathParts parts = XPathParts.getFrozenInstance(path);
int typeLocation = 3;
String myUnit = parts.getAttributeValue(typeLocation, "type");
@@ -435,7 +440,7 @@
}
}
}
-
+
// removeMatches(myType);
// check again on size
if (paths.isEmpty()) {
@@ -536,6 +541,11 @@
thisErrorType = CheckStatus.warningType;
}
}
+ } else if (myType == Type.SCRIPT && collidingTypes.size() == 1) {
+ String collisionString = collidingTypes.toString();
+ if (path.contains("stand-alone") || collisionString.contains("stand-alone")) {
+ thisErrorType = CheckStatus.warningType;
+ }
}
CheckStatus item = new CheckStatus().setCause(this)
.setMainType(thisErrorType)
diff --git a/tools/java/org/unicode/cldr/test/CheckForCopy.java b/tools/java/org/unicode/cldr/test/CheckForCopy.java
index 0edd9e7..540294b 100644
--- a/tools/java/org/unicode/cldr/test/CheckForCopy.java
+++ b/tools/java/org/unicode/cldr/test/CheckForCopy.java
@@ -3,7 +3,6 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
import org.unicode.cldr.util.CLDRFile;
@@ -14,7 +13,6 @@
import org.unicode.cldr.util.RegexLookup;
import org.unicode.cldr.util.XPathParts;
-import com.google.common.collect.ImmutableSet;
import com.ibm.icu.lang.CharSequences;
import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.util.ICUException;
@@ -56,8 +54,8 @@
private static final RegexLookup<Boolean> SKIP_CODE_CHECK = new RegexLookup<Boolean>()
.add("^//ldml/characterLabels/characterLabel", true)
- .add("^//ldml/dates/fields/field\\[@type=\"(era|week|minute|quarter)\"]/displayName", true)
- .add("^//ldml/localeDisplayNames/scripts/script\\[@type=\"(Jamo|Thai|Ahom|Loma|Moon|Newa)\"]", true)
+ .add("^//ldml/dates/fields/field\\[@type=\"(era|week|minute|quarter|second)\"]/displayName", true)
+ .add("^//ldml/localeDisplayNames/scripts/script\\[@type=\"(Jamo|Thai|Ahom|Loma|Moon|Newa|Arab|Lisu|Bali|Cham|Modi)\"]", true)
.add("^//ldml/localeDisplayNames/languages/language\\[@type=\"(fon|gan|luo|tiv|yao|vai)\"]", true)
.add("^//ldml/dates/timeZoneNames/metazone\\[@type=\"GMT\"]", true)
.add("^//ldml/localeDisplayNames/territories/territory\\[@type=\"[^\"]*+\"]\\[@alt=\"short\"]", true)
@@ -65,85 +63,85 @@
.add("^//ldml/localeDisplayNames/types/type\\[@key=\"collation\"]\\[@type=\"standard\"]", true)
;
- private static final Set<String> SKIP_TYPES = ImmutableSet.of(
- "CHF", "EUR", "XPD",
- "Vaii", "Yiii", "Thai",
- "SAAHO", "BOONT", "SCOUSE",
- "fon", "ijo", "luo", "tiv", "yao", "zu", "zza", "tw", "ur", "vo", "ha", "hi", "ig", "yo", "ak", "vai",
- "eo", "af",
- "Cuba",
- // languages that are the same in English as in themselves
- // and countries that have the same name as English in one of their official languages.
- "af", // Afrikaans
- "ak", // Akan
- "AD", // Andorra
- "LI", // Liechtenstein
- "NA", // Namibia
- "AR", // Argentina
- "CO", // Colombia
- "VE", // Venezuela
- "CL", // Chile
- "CU", // Cuba
- "EC", // Ecuador
- "GT", // Guatemala
- "BO", // Bolivia
- "HN", // Honduras
- "SV", // El Salvador
- "CR", // Costa Rica
- "PR", // Puerto Rico
- "NI", // Nicaragua
- "UY", // Uruguay
- "PY", // Paraguay
- "fil", // Filipino
- "FR", // France
- "MG", // Madagascar
- "CA", // Canada
- "CI", // Côte d’Ivoire
- "BI", // Burundi
- "ML", // Mali
- "TG", // Togo
- "NE", // Niger
- "BF", // Burkina Faso
- "RE", // Réunion
- "GA", // Gabon
- "LU", // Luxembourg
- "MQ", // Martinique
- "GP", // Guadeloupe
- "YT", // Mayotte
- "VU", // Vanuatu
- "SC", // Seychelles
- "MC", // Monaco
- "DJ", // Djibouti
- "RW", // Rwanda
- "ha", // Hausa
- "ID", // Indonesia
- "ig", // Igbo
- "NG", // Nigeria
- "SM", // San Marino
- "kln", // Kalenjin
- "mg", // Malagasy
- "MY", // Malaysia
- "BN", // Brunei
- "MT", // Malta
- "ZW", // Zimbabwe
- "SR", // Suriname
- "AW", // Aruba
- "PT", // Portugal
- "AO", // Angola
- "TL", // Timor-Leste
- "RS", // Serbia
- "rw", // Kinyarwanda
- "RW", // Rwanda
- "ZW", // Zimbabwe
- "FI", // Finland
- "TZ", // Tanzania
- "KE", // Kenya
- "UG", // Uganda
- "TO", // Tonga
- "wae", // Walser
- "metric");
+// private static final Set<String> SKIP_TYPES = ImmutableSet.of(
+// "CHF", "EUR", "XPD",
+// "Vaii", "Yiii", "Thai",
+// "SAAHO", "BOONT", "SCOUSE",
+// "fon", "ijo", "luo", "tiv", "yao", "zu", "zza", "tw", "ur", "vo", "ha", "hi", "ig", "yo", "ak", "vai",
+// "eo", "af",
+// "Cuba",
+// // languages that are the same in English as in themselves
+// // and countries that have the same name as English in one of their official languages.
+// "af", // Afrikaans
+// "ak", // Akan
+// "AD", // Andorra
+// "LI", // Liechtenstein
+// "NA", // Namibia
+// "AR", // Argentina
+// "CO", // Colombia
+// "VE", // Venezuela
+// "CL", // Chile
+// "CU", // Cuba
+// "EC", // Ecuador
+// "GT", // Guatemala
+// "BO", // Bolivia
+// "HN", // Honduras
+// "SV", // El Salvador
+// "CR", // Costa Rica
+// "PR", // Puerto Rico
+// "NI", // Nicaragua
+// "UY", // Uruguay
+// "PY", // Paraguay
+// "fil", // Filipino
+// "FR", // France
+// "MG", // Madagascar
+// "CA", // Canada
+// "CI", // Côte d’Ivoire
+// "BI", // Burundi
+// "ML", // Mali
+// "TG", // Togo
+// "NE", // Niger
+// "BF", // Burkina Faso
+// "RE", // Réunion
+// "GA", // Gabon
+// "LU", // Luxembourg
+// "MQ", // Martinique
+// "GP", // Guadeloupe
+// "YT", // Mayotte
+// "VU", // Vanuatu
+// "SC", // Seychelles
+// "MC", // Monaco
+// "DJ", // Djibouti
+// "RW", // Rwanda
+// "ha", // Hausa
+// "ID", // Indonesia
+// "ig", // Igbo
+// "NG", // Nigeria
+// "SM", // San Marino
+// "kln", // Kalenjin
+// "mg", // Malagasy
+// "MY", // Malaysia
+// "BN", // Brunei
+// "MT", // Malta
+// "ZW", // Zimbabwe
+// "SR", // Suriname
+// "AW", // Aruba
+// "PT", // Portugal
+// "AO", // Angola
+// "TL", // Timor-Leste
+// "RS", // Serbia
+// "rw", // Kinyarwanda
+// "RW", // Rwanda
+// "ZW", // Zimbabwe
+// "FI", // Finland
+// "TZ", // Tanzania
+// "KE", // Kenya
+// "UG", // Uganda
+// "TO", // Tonga
+// "wae", // Walser
+// "metric");
- static UnicodeSet ASCII_LETTER = new UnicodeSet("[a-zA-Z]");
+ static UnicodeSet ASCII_LETTER = new UnicodeSet("[a-zA-Z]").freeze();
enum Failure {
ok, same_as_english, same_as_code
@@ -152,20 +150,26 @@
public CheckCLDR handleCheck(String path, String fullPath, String value,
Options options, List<CheckStatus> result) {
- if (fullPath == null || value == null) return this; // skip paths that we don't have
+ if (fullPath == null || value == null) {
+ return this; // skip root, and paths that we don't have
+ }
if (value.contentEquals("Hanb")) {
int debug = 0;
}
Status status = new Status();
- String loc = getCldrFileToCheck().getSourceLocaleID(path, status);
- if (!getCldrFileToCheck().getLocaleID().equals(loc) || !path.equals(status.pathWhereFound)) {
- String topStringValue = getCldrFileToCheck().getUnresolved().getStringValue(path);
- if (!CldrUtility.INHERITANCE_MARKER.equals(topStringValue)) {
+ // don't check inherited values unless they are from ^^^
+ String topStringValue = getCldrFileToCheck().getUnresolved().getStringValue(path);
+ final boolean isExplicitBailey = CldrUtility.INHERITANCE_MARKER.equals(topStringValue);
+ if (!isExplicitBailey) {
+ String loc = getCldrFileToCheck().getSourceLocaleID(path, status);
+ if (!getCldrFileToCheck().getLocaleID().equals(loc)
+ || !path.equals(status.pathWhereFound)) {
return this;
- }
- }
+ }
+ }
+
if (Boolean.TRUE == skip.get(path)) {
return this;
@@ -183,6 +187,14 @@
// Check for attributes.
// May override English test
if (Boolean.TRUE != SKIP_CODE_CHECK.get(path)) {
+ String value2 = value;
+ if (isExplicitBailey) {
+ value2 = getCldrFileToCheck().getConstructedValue(path);
+ if (value2 == null) { // no special constucted value
+ value2 = value;
+ }
+ }
+
XPathParts parts = XPathParts.getFrozenInstance(path);
int elementCount = parts.size();
@@ -195,7 +207,7 @@
// break;
// }
try {
- if (value.equals(attributeValue)) {
+ if (value2.equals(attributeValue)) {
failure = Failure.same_as_code;
break;
}
@@ -238,19 +250,19 @@
@Override
public CheckCLDR setCldrFileToCheck(CLDRFile cldrFileToCheck, Options options,
List<CheckStatus> possibleErrors) {
+
if (cldrFileToCheck == null) return this;
final String localeID = cldrFileToCheck.getLocaleID();
+
LanguageTagParser ltp = new LanguageTagParser().set(localeID);
String lang = ltp.getLanguage();
- UnicodeSet exemplars = cldrFileToCheck.getExemplarSet("main", CLDRFile.WinningChoice.WINNING);
-
- // Don't skip non-Latin, because the exemplar set will only have warning
- if (lang.equals("en") || lang.equals("root")) {// || exemplars != null && ASCII_LETTER.containsNone(exemplars)) {
+ setSkipTest(false);
+ if (lang.equals("en") || localeID.equals("root")) {// || exemplars != null && ASCII_LETTER.containsNone(exemplars)) {
setSkipTest(true);
if (DEBUG) {
- System.out.println("CheckForCopy: Skipping: " + localeID);
+ System.out.println("# CheckForCopy: Skipping: " + localeID);
}
return this;
}
diff --git a/tools/java/org/unicode/cldr/test/CheckForExemplars.java b/tools/java/org/unicode/cldr/test/CheckForExemplars.java
index 5476f94..645b1c0 100644
--- a/tools/java/org/unicode/cldr/test/CheckForExemplars.java
+++ b/tools/java/org/unicode/cldr/test/CheckForExemplars.java
@@ -336,7 +336,6 @@
if (null != (disallowed = containsAllCountingParens(exemplars, exemplarsPlusAscii, value))) {
disallowed.removeAll(ALL_CURRENCY_SYMBOLS);
disallowed.removeAll(LETTER); // Allow ASCII A-Z in currency symbols
- // String currency = new XPathParts().set(path).getAttributeValue(-2, "type");
if (disallowed.size() > 0) {
// && asciiNotAllowed(getCldrFileToCheck().getLocaleID(), currency)) {
addMissingMessage(disallowed, errorOption,
diff --git a/tools/java/org/unicode/cldr/test/CheckLogicalGroupings.java b/tools/java/org/unicode/cldr/test/CheckLogicalGroupings.java
index e5f48db..8b6b871 100644
--- a/tools/java/org/unicode/cldr/test/CheckLogicalGroupings.java
+++ b/tools/java/org/unicode/cldr/test/CheckLogicalGroupings.java
@@ -57,8 +57,6 @@
// remember to add this class to the list in CheckCLDR.getCheckAll
// to run just this test, on just locales starting with 'nl', use CheckCLDR with -fnl.* -t.*LogicalGroupings.*
- //private XPathParts parts = new XPathParts(); // used to parse out a path
-
/**
* We are not as strict with sublocales (where the parent is neither root nor code_fallback).
* @param path
@@ -90,7 +88,7 @@
}
Set<String> paths = LogicalGrouping.getPaths(getCldrFileToCheck(), path);
- if (paths.size() < 2) return this; // skip if not part of a logical grouping
+ if (paths == null || paths.size() < 2) return this; // skip if not part of a logical grouping
// TODO
Set<String> paths2 = new HashSet<String>(paths);
diff --git a/tools/java/org/unicode/cldr/test/CheckNumbers.java b/tools/java/org/unicode/cldr/test/CheckNumbers.java
index 823b06f..cbc815f 100644
--- a/tools/java/org/unicode/cldr/test/CheckNumbers.java
+++ b/tools/java/org/unicode/cldr/test/CheckNumbers.java
@@ -124,7 +124,8 @@
public CheckCLDR handleCheck(String path, String fullPath, String value, Options options,
List<CheckStatus> result) {
- if (fullPath == null) return this; // skip paths that we don't have
+ if (fullPath == null || value == null) return this; // skip paths that we don't have
+
// Do a quick check on the currencyMatch, to make sure that it is a proper UnicodeSet
if (path.indexOf("/currencyMatch") >= 0) {
try {
diff --git a/tools/java/org/unicode/cldr/test/CheckUnits.java b/tools/java/org/unicode/cldr/test/CheckUnits.java
index 4fb470c..d3f728e 100644
--- a/tools/java/org/unicode/cldr/test/CheckUnits.java
+++ b/tools/java/org/unicode/cldr/test/CheckUnits.java
@@ -27,13 +27,16 @@
if (path.startsWith("//ldml/units/unitLength")) {
int min = 0;
int max = 0;
- if (path.contains("compoundUnitPattern")) {
- min = 2;
- max = 2;
- } else if (path.contains("perUnitPattern") || path.contains("coordinateUnitPattern")) {
+ if (path.contains("/compoundUnitPattern1") || path.contains("/unitPrefixPattern")) {
min = 1;
max = 1;
- } else if (path.contains("unitPattern")) {
+ } else if (path.contains("/compoundUnitPattern")) {
+ min = 2;
+ max = 2;
+ } else if (path.contains("/perUnitPattern") || path.contains("/coordinateUnitPattern")) {
+ min = 1;
+ max = 1;
+ } else if (path.contains("/unitPattern")) {
min = 0;
max = 1;
} // else we have displayName, with min/max = 0
diff --git a/tools/java/org/unicode/cldr/test/CheckWidths.java b/tools/java/org/unicode/cldr/test/CheckWidths.java
index b343087..76a0a94 100644
--- a/tools/java/org/unicode/cldr/test/CheckWidths.java
+++ b/tools/java/org/unicode/cldr/test/CheckWidths.java
@@ -176,19 +176,19 @@
+ "|mass-ounce"
+ "|mass-pound"
+ "|power-horsepower"
- + "|pressure-inch-hg"
- + "|pressure-millimeter-of-mercury"
+ + "|pressure-inch-ofhg"
+ + "|pressure-millimeter-ofhg"
+ "|speed-mile-per-hour"
+ "|temperature-fahrenheit"
+ "|volume-cubic-mile"
+ "|acceleration-g-force"
+ "|speed-kilometer-per-hour"
+ "|speed-meter-per-second"
- + "|pressure-pound-per-square-inch"
+ + "|pressure-pound-force-per-square-inch"
+ "|energy-therm-us"
+ ")";
- static final String ALLOW_LONGEST = "consumption-liter-per-100kilometers";
+ static final String ALLOW_LONGEST = "consumption-liter-per-100-kilometer";
static RegexLookup<Limit[]> lookup = new RegexLookup<Limit[]>()
.setPatternTransform(RegexLookup.RegexFinderTransformPath)
diff --git a/tools/java/org/unicode/cldr/test/ConsoleCheckCLDR.java b/tools/java/org/unicode/cldr/test/ConsoleCheckCLDR.java
index 0345a0d..677ba9e 100644
--- a/tools/java/org/unicode/cldr/test/ConsoleCheckCLDR.java
+++ b/tools/java/org/unicode/cldr/test/ConsoleCheckCLDR.java
@@ -27,7 +27,6 @@
import org.unicode.cldr.test.CheckCLDR.Options;
import org.unicode.cldr.test.CheckCLDR.Phase;
import org.unicode.cldr.test.CheckCLDR.SimpleDemo;
-import org.unicode.cldr.test.ExampleGenerator.ExampleType;
import org.unicode.cldr.tool.Option;
import org.unicode.cldr.tool.Option.Params;
import org.unicode.cldr.tool.ShowData;
@@ -660,7 +659,7 @@
String example = "";
if (SHOW_EXAMPLES) {
- example = ExampleGenerator.simplify(exampleGenerator.getExampleHtml(path, value, ExampleType.NATIVE));
+ example = ExampleGenerator.simplify(exampleGenerator.getExampleHtml(path, value));
showExamples(checkCldr, prettyPath, localeID, path, value, fullPath, example);
}
@@ -794,7 +793,7 @@
* TODO: fix this code. Calling getExampleHtml with value = null will always return null,
* so what's this supposed to accomplish?
*/
- String example = ExampleGenerator.simplify(exampleGenerator.getExampleHtml(path, null /* value */, ExampleType.NATIVE));
+ String example = ExampleGenerator.simplify(exampleGenerator.getExampleHtml(path, null /* value */));
showExamples(checkCldr, prettyPath, localeID, path, null, fullPath, example);
}
}
@@ -1519,8 +1518,7 @@
String englishExample = null;
final String englishPathValue = path == null ? null : getEnglishPathValue(path);
if (SHOW_EXAMPLES && path != null) {
- englishExample = ExampleGenerator.simplify(getExampleGenerator().getExampleHtml(path, englishPathValue,
- ExampleType.ENGLISH));
+ englishExample = ExampleGenerator.simplify(getExampleGenerator().getExampleHtml(path, englishPathValue));
}
englishExample = englishExample == null ? "" : englishExample;
String cleanPrettyPath = path == null ? null : prettyPath; // prettyPathMaker.getOutputForm(prettyPath);
diff --git a/tools/java/org/unicode/cldr/test/DisplayAndInputProcessor.java b/tools/java/org/unicode/cldr/test/DisplayAndInputProcessor.java
index debb6a5..2a70024 100644
--- a/tools/java/org/unicode/cldr/test/DisplayAndInputProcessor.java
+++ b/tools/java/org/unicode/cldr/test/DisplayAndInputProcessor.java
@@ -106,7 +106,7 @@
private static final CLDRLocale SWISS_GERMAN = CLDRLocale.getInstance("gsw");
private static final CLDRLocale FF_ADLAM = CLDRLocale.getInstance("ff_Adlm");
public static final Set<String> LANGUAGES_USING_MODIFIER_APOSTROPHE = new HashSet<String>(
- Arrays.asList("br", "bss", "cic", "cch", "gn", "ha", "ha_Latn", "lkt", "mgo", "moh", "mus", "nnh", "qu", "quc", "uk", "uz", "uz_Latn"));
+ Arrays.asList("br", "bss", "cad", "cic", "cch", "gn", "ha", "ha_Latn", "lkt", "mgo", "moh", "mus", "nnh", "qu", "quc", "uk", "uz", "uz_Latn"));
// Ş ş Ţ ţ => Ș ș Ț ț
private static final char[][] ROMANIAN_CONVERSIONS = {
@@ -553,7 +553,7 @@
value = "[" + value + "]";
UnicodeSet exemplar = new UnicodeSet(value);
- XPathParts parts = XPathParts.getFrozenInstance(path); // new XPathParts().set(path);
+ XPathParts parts = XPathParts.getFrozenInstance(path);
if (parts.getElement(2).equals("parseLenients")) {
return exemplar.toPattern(false);
}
diff --git a/tools/java/org/unicode/cldr/test/ExampleGenerator.java b/tools/java/org/unicode/cldr/test/ExampleGenerator.java
index e3fbb19..ba62b29 100644
--- a/tools/java/org/unicode/cldr/test/ExampleGenerator.java
+++ b/tools/java/org/unicode/cldr/test/ExampleGenerator.java
@@ -43,6 +43,7 @@
import org.unicode.cldr.util.SupplementalDataInfo.PluralType;
import org.unicode.cldr.util.TimezoneFormatter;
import org.unicode.cldr.util.TransliteratorUtilities;
+import org.unicode.cldr.util.Units;
import org.unicode.cldr.util.XListFormatter.ListTypeLength;
import org.unicode.cldr.util.XPathParts;
@@ -67,6 +68,7 @@
import com.ibm.icu.text.Transliterator;
import com.ibm.icu.text.UTF16;
import com.ibm.icu.util.Calendar;
+import com.ibm.icu.util.Output;
import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale;
@@ -92,7 +94,26 @@
private static SupplementalDataInfo supplementalDataInfo;
private PathDescription pathDescription;
- private final static boolean CACHING = true;
+ /*
+ * For testing, caching can be disabled for some ExampleGenerators while still
+ * enabled for others.
+ */
+ private boolean cachingIsEnabled = true;
+
+ public void disableCaching() {
+ cachingIsEnabled = false;
+ }
+
+ /*
+ * For testing, we can switch some ExampleGenerators into a special "cache only"
+ * mode, where they will throw an exception if queried for a path+value that isn't
+ * already in the cache. See TestExampleGeneratorDependencies.
+ */
+ private boolean cacheOnly = false;
+
+ public void makeCacheOnly() {
+ cacheOnly = true;
+ }
public final static double NUMBER_SAMPLE = 123456.789;
public final static double NUMBER_SAMPLE_WHOLE = 2345;
@@ -116,8 +137,8 @@
private static final String startSup = "<sup>";
private static final String endSup = "</sup>";
- private static final String backgroundStartSymbol = "\uE234";
- private static final String backgroundEndSymbol = "\uE235";
+ public static final String backgroundStartSymbol = "\uE234";
+ public static final String backgroundEndSymbol = "\uE235";
private static final String backgroundTempSymbol = "\uE236";
private static final String exampleSeparatorSymbol = "\uE237";
private static final String startItalicSymbol = "\uE238";
@@ -157,8 +178,157 @@
private CLDRFile englishFile;
Matcher URLMatcher = URL_PATTERN.matcher("");
+ /**
+ * The cache is accessed only by getExampleHtml and updateCache.
+ * Its key is built from an xpath, and a value for that xpath.
+ * Its value is an HTML string showing example(s) using that value for that path, for the locale of this ExampleGenerator.
+ *
+ * Note that this cache is internal to each ExampleGenerator. Compare TestCache.exampleGeneratorCache,
+ * which is at a higher level, caching entire ExampleGenerator objects, one for each locale.
+ */
private Map<String, String> cache = new ConcurrentHashMap<String, String>();
+ /**
+ * AVOID_CLEARING_CACHE: work in progress, keep false until it becomes beneficial and reliable.
+ * Reference: https://unicode-org.atlassian.net/browse/CLDR-13331
+ */
+ private static final boolean AVOID_CLEARING_CACHE = false;
+
+ /**
+ * For this (locale-specific) ExampleGenerator, clear the cached examples for
+ * any paths whose examples might depend on the winning value of the given path,
+ * since the winning value of the given path has (or may have?) changed.
+ *
+ * There is no need to update the example(s) for the given path itself, since
+ * the cache key includes path+value and therefore each path+value has its own
+ * example, regardless of which value is winning. There is a need to update
+ * the examples for OTHER paths whose examples depend on the winning value
+ * of the given path.
+ *
+ * For example, let pathA = "//ldml/localeDisplayNames/languages/language[@type=\"aa\"]"
+ * and pathB = "//ldml/localeDisplayNames/territories/territory[@type=\"DJ\"]". The values,
+ * in locale fr, might be "afar" for pathA and "Djibouti" for pathB. The example for pathB
+ * might include "afar (Djibouti)", which depends on the values of both pathA and pathB.
+ *
+ * @param xpath the path whose winning value has (may have?) changed
+ *
+ * TODO: make sure we're only called if the winning value really HAS changed.
+ * Looking at the callers, it's not obvious if that's the case, or if this
+ * function may sometimes be called when a vote has been made without actually
+ * changing the winning value.
+ *
+ * Called by TestCache.updateExampleGeneratorCache
+ */
+ public void updateCache(@SuppressWarnings("unused") String xpath) {
+ /*
+ * TODO: instead of removing ALL keys, only remove keys for which the examples
+ * may be affected by this change.
+ *
+ * It appears (based on incomplete evidence), that all paths of type “A”
+ * (i.e., all that have dependencies) start with one of these seven strings:
+ * //ldml/characterLabels
+ * //ldml/dates
+ * //ldml/delimiters
+ * //ldml/listPatterns
+ * //ldml/localeDisplayNames
+ * //ldml/numbers
+ * //ldml/units
+ *
+ * Problem: that's something like 98% of all paths! Need to narrow it down much further.
+ *
+ * For any other path given as the argument to this function, there should be no need to clear the cache.
+ * Also, when there are dependencies, ideally only the keys for paths that are dependent on this path
+ * should be removed. It might be slow to loop through the cache testing each path to see if it's affected.
+ * Ideally we might maintain a complete mapping of dependencies, so given pathA we could quickly loop
+ * through the pre-existing set of paths B that depend on pathA.
+ *
+ * Reference: https://unicode-org.atlassian.net/browse/CLDR-13331
+ */
+ if (AVOID_CLEARING_CACHE) {
+ if (!pathMightBeTypeA(xpath)) {
+ return;
+ }
+ }
+ cache.clear();
+ }
+
+ static long typeACount = 0, notTypeACount = 0;
+
+ /**
+ * Does changing the winning value for the given path potentially have side-effect of changing the example
+ * html for other paths? In other words, might this be a path of type "A"?
+ *
+ * We say "might be", since this function is meant to be fast rather than exact. It should never return
+ * false for a path that really is type "A", but it may return true for some paths that aren't really type "A".
+ *
+ * @param xpath
+ * @return true or false
+ *
+ * Called locally (only if AVOID_CLEARING_CACHE is true), and also by TestExampleGeneratorDependencies.
+ */
+ static public boolean pathMightBeTypeA(String xpath) {
+ final String pathAStarts[] = {
+ "//ldml/characterLabels/characterLabelPattern",
+ "//ldml/characterLabels/characterLabel",
+ "//ldml/dates/calendars",
+ "//ldml/dates/fields",
+ "//ldml/dates/timeZoneNames",
+ "//ldml/delimiters/alternateQuotationEnd",
+ "//ldml/delimiters/alternateQuotationStart",
+ "//ldml/delimiters/quotationEnd",
+ "//ldml/delimiters/quotationStart",
+ "//ldml/listPatterns/listPattern",
+ "//ldml/localeDisplayNames/codePatterns",
+ "//ldml/localeDisplayNames/keys",
+ "//ldml/localeDisplayNames/languages",
+ "//ldml/localeDisplayNames/localeDisplayPattern",
+ "//ldml/localeDisplayNames/scripts",
+ "//ldml/localeDisplayNames/territories",
+ "//ldml/localeDisplayNames/types",
+ "//ldml/numbers/currencies",
+ "//ldml/numbers/currencyFormats",
+ "//ldml/numbers/decimalFormats",
+ "//ldml/numbers/defaultNumberingSystem",
+ "//ldml/numbers/minimalPairs",
+ "//ldml/numbers/minimumGroupingDigits",
+ "//ldml/numbers/miscPatterns",
+ "//ldml/numbers/otherNumberingSystems",
+ "//ldml/numbers/percentFormats",
+ "//ldml/numbers/scientificFormats",
+ "//ldml/numbers/symbols",
+ "//ldml/posix/messages",
+ "//ldml/typographicNames",
+ "//ldml/units/durationUnit",
+ "//ldml/units/unitLength",
+ };
+ /***
+ final String pathAStartsShorter[] = {
+ "//ldml/characterLabels",
+ "//ldml/dates",
+ "//ldml/delimiters",
+ "//ldml/listPatterns",
+ "//ldml/localeDisplayNames",
+ "//ldml/numbers",
+ "//ldml/units"
+ };
+ ***/
+ boolean maybeTypeA = false;
+ for (String s : pathAStarts) {
+ if (xpath.startsWith(s)) {
+ maybeTypeA = true;
+ break;
+ }
+ }
+ if (maybeTypeA) {
+ ++typeACount;
+ } else {
+ ++notTypeACount; // e.g., //ldml/localeDisplayNames/subdivisions/subdivision[@type="gbeng"] or //ldml/localeDisplayNames/variants/variant[@type="1901"] or //ldml/localeDisplayNames/measurementSystemNames/measurementSystemName[@type="US"]
+ }
+ // System.out.println("type A percent = " + ((100 * typeACount) / (typeACount + notTypeACount))
+ // + " [" + typeACount + ", " + notTypeACount + "]");
+ return maybeTypeA;
+ }
+
private static final String NONE = "\uFFFF";
private ICUServiceBuilder icuServiceBuilder = new ICUServiceBuilder();
@@ -226,9 +396,16 @@
private String creationTime = null; // only used if DEBUG_EXAMPLE_GENERATOR
/**
+ * True if this ExampleGenerator is especially for generating "English" examples,
+ * false if it is for generating "native" examples.
+ */
+ private boolean typeIsEnglish;
+
+ /**
* Create an Example Generator. If this is shared across threads, it must be synchronized.
*
* @param resolvedCldrFile
+ * @param englishFile
* @param supplementalDataDirectory
*/
public ExampleGenerator(CLDRFile resolvedCldrFile, CLDRFile englishFile, String supplementalDataDirectory) {
@@ -241,6 +418,7 @@
this.cldrFile = resolvedCldrFile;
this.subdivisionIdToName = EmojiSubdivisionNames.getSubdivisionIdToName(cldrFile.getLocaleID());
this.englishFile = englishFile;
+ this.typeIsEnglish = (resolvedCldrFile == englishFile);
synchronized (ExampleGenerator.class) {
if (supplementalDataInfo == null) {
supplementalDataInfo = SupplementalDataInfo.getInstance(supplementalDataDirectory);
@@ -249,17 +427,13 @@
icuServiceBuilder.setCldrFile(cldrFile);
pluralInfo = supplementalDataInfo.getPlurals(PluralType.cardinal, cldrFile.getLocaleID());
-
+
if (DEBUG_EXAMPLE_GENERATOR) {
creationTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Calendar.getInstance().getTime());
System.out.println("🧞 Created new ExampleGenerator for loc " + cldrFile.getLocaleID() + " at " + creationTime);
}
}
- public enum ExampleType {
- NATIVE, ENGLISH
- };
-
/**
* Get an example string, in html, if there is one for this path,
* otherwise null. For use in the survey tool, an example might be returned
@@ -269,23 +443,18 @@
* The result is valid HTML.
*
* @param xpath the path; e.g., "//ldml/dates/timeZoneNames/fallbackFormat"
- * @param value the value; e.g., "{1} [{0}]"
- * @param exType ExampleType.ENGLISH or ExampleType.NATIVE; null is not allowed
+ * @param value the value; e.g., "{1} [{0}]"; not necessarily the winning value
* @return the example HTML, or null
*/
- public String getExampleHtml(String xpath, String value, ExampleType exType) {
- if (exType == null) {
- throw new IllegalArgumentException("ExampleType null in ExampleGenerator.getExampleHtml");
- }
+ public String getExampleHtml(String xpath, String value) {
if (value == null) {
return null;
}
String cacheKey = null;
String result = null;
try {
- if (CACHING) {
- String exTypeLetter = (exType == ExampleType.ENGLISH) ? "E" : "N";
- cacheKey = exTypeLetter + xpath + "," + value;
+ if (cachingIsEnabled) {
+ cacheKey = xpath + "," + value;
result = cache.get(cacheKey);
if (result != null) {
if (result == NONE) {
@@ -293,15 +462,13 @@
}
return result;
}
+ } else if (cacheOnly ) {
+ throw new InternalError("getExampleHtml cacheOnly not found: " + cacheKey);
}
// If generating examples for an inheritance marker, then we need to find the
// "real" value to generate from.
if (CldrUtility.INHERITANCE_MARKER.equals(value)) {
- if (exType.equals(ExampleType.ENGLISH)) {
- value = englishFile.getConstructedBaileyValue(xpath, null, null);
- } else { // ExampleType.NATIVE
- value = cldrFile.getConstructedBaileyValue(xpath, null, null);
- }
+ value = cldrFile.getConstructedBaileyValue(xpath, null, null);
}
/*
@@ -318,7 +485,7 @@
} else if (parts.contains("localeDisplayNames")) {
result = handleDisplayNames(xpath, parts, value);
} else if (parts.contains("currency")) {
- result = handleCurrency(xpath, parts, value, exType);
+ result = handleCurrency(xpath, parts, value);
} else if (parts.contains("dayPeriods")) {
result = handleDayPeriod(parts, value);
} else if (parts.contains("pattern") || parts.contains("dateFormatItem")) {
@@ -328,7 +495,7 @@
result = handleMiscPatterns(parts, value);
} else if (parts.contains("numbers")) {
if (parts.contains("currencyFormat")) {
- result = handleCurrencyFormat(parts, value, exType);
+ result = handleCurrencyFormat(parts, value);
} else {
result = handleDecimalFormat(parts, value);
}
@@ -338,9 +505,12 @@
} else if (parts.contains("defaultNumberingSystem") || parts.contains("otherNumberingSystems")) {
result = handleNumberingSystem(value);
} else if (parts.contains("currencyFormats") && parts.contains("unitPattern")) {
- result = formatCountValue(xpath, parts, value, exType);
- } else if (parts.getElement(-2).equals("compoundUnit")) {
+ result = formatCountValue(xpath, parts, value);
+ } else if (parts.getElement(-1).equals("compoundUnitPattern")) {
result = handleCompoundUnit(parts);
+ } else if (parts.getElement(-1).equals("compoundUnitPattern1")
+ || parts.getElement(-1).equals("unitPrefixPattern")) {
+ result = handleCompoundUnit1(parts, value);
} else if (parts.getElement(-1).equals("unitPattern")) {
String count = parts.getAttributeValue(-1, "count");
result = handleFormatUnit(Count.valueOf(count), value);
@@ -380,13 +550,13 @@
if (result != null) {
// add transliteration if one exists
- if (exType == ExampleType.NATIVE) {
+ if (!typeIsEnglish) {
result = addTransliteration(result, value);
}
result = finalizeBackground(result);
}
- if (CACHING) {
+ if (cachingIsEnabled) {
if (result == null) {
cache.put(cacheKey, NONE);
} else {
@@ -479,7 +649,7 @@
case 0x1F48F: // 💏 U+1F48F KISS 👩👨
examples.add(formatGroup(value, "👩❤️💋👨", "👩", "👨"));
examples.add(formatGroup(value, "👩❤️💋👩", "👩", "👩"));
- break;
+ break;
case 0x1F491: // 💑 U+1F491 COUPLE WITH HEART
examples.add(formatGroup(value, "👩❤️👨", "👩", "👨"));
examples.add(formatGroup(value, "👩❤️👩", "👩", "👩"));
@@ -632,7 +802,7 @@
case "times":
unit1mid = getFormattedUnit("force-newton", unitLength, oneValue, icuServiceBuilder.getNumberFormat(1).format(amount));
unit2mid = getFormattedUnit("length-meter", unitLength, amount, "");
- break;
+ break;
}
String unit1 = backgroundStartSymbol + unit1mid.trim() + backgroundEndSymbol;
String unit2 = backgroundStartSymbol + unit2mid.trim() + backgroundEndSymbol;
@@ -640,15 +810,73 @@
// TODO fix hack
String form = this.pluralInfo.getPluralRules().select(amount);
// we rebuild a path, because we may have changed it.
- String perPath = makeCompoundUnitPath(unitLength, compoundType);
+ String perPath = makeCompoundUnitPath(unitLength, compoundType, "compoundUnitPattern");
return format(getValueFromFormat(perPath, form), unit1, unit2);
}
+
+ public String handleCompoundUnit1(XPathParts parts, String compoundPattern) {
+ UnitLength unitLength = getUnitLength(parts);
+ String pathCount = parts.getAttributeValue(-1, "count");
+ if (pathCount == null) {
+ return handleCompoundUnit1Name(unitLength, compoundPattern);
+ } else {
+ return handleCompoundUnit1(unitLength, Count.valueOf(pathCount), compoundPattern);
+ }
+ }
+
+ private String handleCompoundUnit1Name(UnitLength unitLength, String compoundPattern) {
+ String pathFormat = "//ldml/units/unitLength" + unitLength.typeString + "/unit[@type=\"{0}\"]/displayName";
+
+ String meterFormat = getValueFromFormat(pathFormat, "length-meter");
+
+ String modFormat = combinePrefix(meterFormat, compoundPattern, unitLength == UnitLength.LONG);
+
+ return removeEmptyRuns(modFormat);
+ }
+
+ public String handleCompoundUnit1(UnitLength unitLength, Count count, String compoundPattern) {
+
+ // we want to get a number that works for the count passed in.
+ FixedDecimal amount = getBest(count);
+ if (amount == null) {
+ return "n/a";
+ }
+ FixedDecimal oneValue = new FixedDecimal(1d, 0);
+ DecimalFormat numberFormat = icuServiceBuilder.getNumberFormat(1);
+ String form1 = this.pluralInfo.getPluralRules().select(amount);
+
+ String pathFormat = "//ldml/units/unitLength" + unitLength.typeString
+ + "/unit[@type=\"{0}\"]/unitPattern[@count=\"{1}\"]";
+
+ // now pick up the meter pattern
+
+ String meterFormat = getValueFromFormat(pathFormat, "length-meter", form1);
+
+ // now combine them
+
+ String modFormat = combinePrefix(meterFormat, compoundPattern, unitLength == UnitLength.LONG);
+
+ return removeEmptyRuns(format(modFormat, numberFormat.format(amount)));
+ }
+
+ // TODO, pass in unitLength instead of last parameter, and do work in Units.combinePattern.
+
+ public String combinePrefix(String unitFormat, String inCompoundPattern, boolean lowercaseUnitIfNoSpaceInCompound) {
+ // mark the part except for the {0} as foreground
+ String compoundPattern = backgroundEndSymbol
+ + inCompoundPattern.replace("{0}", backgroundStartSymbol + "{0}" + backgroundEndSymbol)
+ + backgroundStartSymbol;
+
+ String modFormat = Units.combinePattern(unitFormat, compoundPattern, lowercaseUnitIfNoSpaceInCompound);
+
+ return backgroundStartSymbol + modFormat + backgroundEndSymbol;
+ }
//ldml/units/unitLength[@type="long"]/compoundUnit[@type="per"]/compoundUnitPattern
- public String makeCompoundUnitPath(UnitLength unitLength, String compoundType) {
+ public String makeCompoundUnitPath(UnitLength unitLength, String compoundType, String patternType) {
return "//ldml/units/unitLength" + unitLength.typeString
+ "/compoundUnit[@type=\"" + compoundType + "\"]"
- + "/compoundUnitPattern";
+ + "/" + patternType;
}
private FixedDecimal getBest(Count count) {
@@ -982,11 +1210,11 @@
new FixedDecimal(5.67),
new FixedDecimal(1));
- private String formatCountValue(String xpath, XPathParts parts, String value, ExampleType exType) {
+ private String formatCountValue(String xpath, XPathParts parts, String value) {
if (!parts.containsAttribute("count")) { // no examples for items that don't format
return null;
}
- final PluralInfo plurals = supplementalDataInfo.getPlurals(cldrFile.getLocaleID());
+ final PluralInfo plurals = supplementalDataInfo.getPlurals(PluralType.cardinal, cldrFile.getLocaleID());
PluralRules pluralRules = plurals.getPluralRules();
String unitType = parts.getAttributeValue(-2, "type");
@@ -1048,11 +1276,11 @@
}
String resultItem;
- resultItem = formatCurrency(value, exType, unitType, isPattern, isCurrency, count, example);
+ resultItem = formatCurrency(value, unitType, isPattern, isCurrency, count, example);
// now add to list
result = addExampleResult(resultItem, result);
if (isPattern) {
- String territory = getDefaultTerritory(exType);
+ String territory = getDefaultTerritory();
String currency = supplementalDataInfo.getDefaultCurrency(territory);
if (currency.equals(unitType)) {
currency = "EUR";
@@ -1060,7 +1288,7 @@
currency = "JAY";
}
}
- resultItem = formatCurrency(value, exType, currency, isPattern, isCurrency, count, example);
+ resultItem = formatCurrency(value, currency, isPattern, isCurrency, count, example);
// now add to list
result = addExampleResult(resultItem, result);
@@ -1082,7 +1310,7 @@
}
}
- private String formatCurrency(String value, ExampleType exType, String unitType, final boolean isPattern, final boolean isCurrency, Count count,
+ private String formatCurrency(String value, String unitType, final boolean isPattern, final boolean isCurrency, Count count,
FixedDecimal example) {
String resultItem;
{
@@ -1094,10 +1322,10 @@
if (isPattern) {
// //ldml/numbers/currencies/currency[@type="USD"]/displayName
unitName = getUnitName(unitType, isCurrency, count);
- unitPattern = exType != ExampleType.ENGLISH ? value : getUnitPattern(unitType, isCurrency, count);
+ unitPattern = typeIsEnglish ? getUnitPattern(unitType, isCurrency, count) : value;
} else {
unitPattern = getUnitPattern(unitType, isCurrency, count);
- unitName = exType != ExampleType.ENGLISH ? value : getUnitName(unitType, isCurrency, count);
+ unitName = typeIsEnglish ? getUnitName(unitType, isCurrency, count) : value;
}
if (isPattern) {
@@ -1379,9 +1607,9 @@
* @param value
* @return
*/
- private String handleCurrencyFormat(XPathParts parts, String value, ExampleType exType) {
+ private String handleCurrencyFormat(XPathParts parts, String value) {
- String territory = getDefaultTerritory(exType);
+ String territory = getDefaultTerritory();
String currency = supplementalDataInfo.getDefaultCurrency(territory);
String checkPath = "//ldml/numbers/currencies/currency[@type=\"" + currency + "\"]/symbol";
@@ -1403,10 +1631,10 @@
return example;
}
- private String getDefaultTerritory(ExampleType exType) {
+ private String getDefaultTerritory() {
CLDRLocale loc;
String territory = "US";
- if (ExampleType.NATIVE.equals(exType)) {
+ if (!typeIsEnglish) {
loc = CLDRLocale.getInstance(cldrFile.getLocaleID());
territory = loc.getCountry();
if (territory == null || territory.length() == 0) {
@@ -1511,7 +1739,7 @@
return samples.get(count);
}
- private String handleCurrency(String xpath, XPathParts parts, String value, ExampleType exType) {
+ private String handleCurrency(String xpath, XPathParts parts, String value) {
String currency = parts.getAttributeValue(-2, "type");
String fullPath = cldrFile.getFullXPath(xpath, false);
if (parts.contains("symbol")) {
@@ -1525,7 +1753,7 @@
result = setBackground(result).replace(value, backgroundEndSymbol + value + backgroundStartSymbol);
return result;
} else if (parts.contains("displayName")) {
- return formatCountValue(xpath, parts, value, exType);
+ return formatCountValue(xpath, parts, value);
}
return null;
}
@@ -1665,9 +1893,13 @@
}
examples.add(invertBackground(format(localePattern, languageName, scriptTerritory)));
}
- if (isStandAloneValue || cldrFile.getStringValueWithBailey(xpath + ALT_STAND_ALONE) == null) {
+ Output<String> pathWhereFound = null;
+ if (isStandAloneValue
+ || cldrFile.getStringValueWithBailey(xpath + ALT_STAND_ALONE, pathWhereFound = new Output<>(), null) == null
+ || !pathWhereFound.value.contains(ALT_STAND_ALONE)) {
// only do this if either it is a stand-alone form,
// or it isn't and there is no separate stand-alone form
+ // the extra check after the == null is to make sure that we don't have sideways inheritance
String codePattern = cldrFile.getStringValueWithBailey("//ldml/localeDisplayNames/codePatterns/codePattern[@type=\"" + nameType + "\"]");
examples.add(invertBackground(format(codePattern, value)));
}
@@ -1707,7 +1939,7 @@
return result;
}
- public String format(String format, Object... objects) {
+ public static String format(String format, Object... objects) {
if (format == null) return null;
return MessageFormat.format(format, objects);
}
@@ -1824,14 +2056,17 @@
}
private String invertBackground(String input) {
- if (input == null) {
- return null;
- }
- input = input.replace(backgroundStartSymbol, backgroundTempSymbol)
+ return input == null ? null
+ : backgroundStartSymbol
+ + input.replace(backgroundStartSymbol, backgroundTempSymbol)
.replace(backgroundEndSymbol, backgroundStartSymbol)
- .replace(backgroundTempSymbol, backgroundEndSymbol);
+ .replace(backgroundTempSymbol, backgroundEndSymbol)
+ + backgroundEndSymbol;
+ }
- return backgroundStartSymbol + input + backgroundEndSymbol;
+ private String removeEmptyRuns(String input) {
+ return input.replace(backgroundStartSymbol + backgroundEndSymbol, "")
+ .replace(backgroundEndSymbol + backgroundStartSymbol, "");
}
public static final Pattern PARAMETER = PatternCache.get("(\\{[0-9]\\})");
diff --git a/tools/java/org/unicode/cldr/test/SubmissionLocales.java b/tools/java/org/unicode/cldr/test/SubmissionLocales.java
index a5edb97..c0256df 100644
--- a/tools/java/org/unicode/cldr/test/SubmissionLocales.java
+++ b/tools/java/org/unicode/cldr/test/SubmissionLocales.java
@@ -1,16 +1,35 @@
package org.unicode.cldr.test;
import java.util.Set;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.unicode.cldr.util.Organization;
+import org.unicode.cldr.util.RegexUtilities;
import org.unicode.cldr.util.StandardCodes;
import com.google.common.collect.ImmutableSet;
public final class SubmissionLocales {
- static Set<String> NEW_CLDR_LOCALES = ImmutableSet.of("jv", "so", "ceb", "ha", "ig", "yo");
- static Set<String> HIGH_LEVEL_LOCALES = ImmutableSet.of("chr", "gd", "fo");
+ public static Set<String> NEW_CLDR_LOCALES = ImmutableSet.of(
+ "ceb", // Cebuano (not new in release, but needs major changes)
+ "mai", // Maithili
+ "mni", // Manipuri (Bengali script)-Apple as well
+ "sat", // Santali -(Apple use Olck script)
+ "kok", // Konkani -(Note: this is already covered by a MS vetter at Modern level)
+ "sd_Deva", // Sindhi (Devanagari)
+ "su", // Sundanese (script TBD)
+ "cad", // Caddo
+ "pcm", // Nigerian Pidgin
+ "gn" // Guarani
+ );
+
+ public static Set<String> HIGH_LEVEL_LOCALES = ImmutableSet.of(
+ "chr", // Cherokee
+ "gd", // Scottish Gaelic, Gaelic
+ "fo" // Faroese
+ );
+
// have to have a lazy eval because otherwise CLDRConfig is called too early in the boot process
static Set<String> CLDR_LOCALES = ImmutableSet.<String>builder()
.addAll(HIGH_LEVEL_LOCALES)
@@ -25,7 +44,12 @@
// }
// }
- public static final Pattern ALLOWED_IN_LIMITED_PATHS = Pattern.compile(
+ public static final Pattern ALLOWED_IN_LIMITED_PATHS =
+ Pattern.compile("//ldml/annotations/annotation.*[🤵👰⬆➡⬇⬅♾✖➕➖➗]");
+
+
+ /* Example of special paths
+ * Pattern.compile(
"//ldml/"
+ "(listPatterns/listPattern\\[@type=\"standard"
+ "|annotations/annotation\\[@cp=\"([©®‼⁉☑✅✔✖✨✳✴❇❌❎❓-❕❗❣ ➕-➗👫-👭👱🥰🧩🧔😸😺😹😼😻🦊😽😼⭕😺😿😾😻😸😹🐺⭕🦄😽🐼🐸😿🤖🐹🐻🙀🦁]|👱♀|👱♂)\""
@@ -39,6 +63,7 @@
+ ")"
+ ")"
);
+ */
//ldml/dates/timeZoneNames/metazone[@type="Macau"]/long/daylight, old: Macau Summer Time, new: Macao Summer Time
//ldml/dates/timeZoneNames/metazone[@type="Macau"]/long/standard, old: Macau Standard Time, new: Macao Standard Time
@@ -53,10 +78,10 @@
* @param localeString
* @param path
* @param isError
- * @param missingInLastRelease
- * @return
+ * @param isMissing
+ * @return true if submission is allowed, else false
*/
- public static boolean allowEvenIfLimited(String localeString, String path, boolean isError, boolean missingInLastRelease) {
+ public static boolean allowEvenIfLimited(String localeString, String path, boolean isError, boolean isMissing) {
// don't limit new locales or errors
@@ -76,7 +101,7 @@
// in those locales, lock all paths except missing and special
- if (missingInLastRelease) {
+ if (isMissing) {
return true;
} else {
int debug = 0; // for debugging
@@ -91,7 +116,22 @@
return false; // skip
}
+ private static final boolean DEBUG_REGEX = false;
+
+ /**
+ * Only public for testing
+ * @param path
+ * @return
+ */
public static boolean pathAllowedInLimitedSubmission(String path) {
- return SubmissionLocales.ALLOWED_IN_LIMITED_PATHS.matcher(path).lookingAt();
+ if (ALLOWED_IN_LIMITED_PATHS == null) {
+ return false;
+ }
+ final Matcher matcher = SubmissionLocales.ALLOWED_IN_LIMITED_PATHS.matcher(path);
+ boolean result = matcher.lookingAt();
+ if (DEBUG_REGEX && !result) {
+ System.out.println(RegexUtilities.showMismatch(matcher, path));
+ }
+ return result;
}
}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/test/TestCache.java b/tools/java/org/unicode/cldr/test/TestCache.java
index b991c08..c4cbe5d 100644
--- a/tools/java/org/unicode/cldr/test/TestCache.java
+++ b/tools/java/org/unicode/cldr/test/TestCache.java
@@ -20,7 +20,7 @@
import com.google.common.collect.ImmutableList;
/**
- * Caches tests
+ * Caches tests and examples
* Call XMLSource.addListener() on the instance to notify it of changes to the XMLSource.
*
* @author srl
@@ -80,7 +80,12 @@
private static final boolean DEBUG = false;
- private Cache<CheckCLDR.Options, TestResultBundle> cache = CacheBuilder.newBuilder().maximumSize(CLDRConfig.getInstance()
+ /*
+ * TODO: document whether CLDR_TESTCACHE_SIZE is set on production server, and if so to what, and why;
+ * evaluate why the fallback 12 for CLDR_TESTCACHE_SIZE is appropriate or too small. Consider not
+ * using maximumSize() at all, depending on softValues() instead to garbage collect only when needed.
+ */
+ private Cache<CheckCLDR.Options, TestResultBundle> testResultCache = CacheBuilder.newBuilder().maximumSize(CLDRConfig.getInstance()
.getProperty("CLDR_TESTCACHE_SIZE", 12)).softValues().build();
private Factory factory = null;
@@ -91,7 +96,7 @@
* Get the bundle for this test
*/
public TestResultBundle getBundle(CheckCLDR.Options options) {
- TestResultBundle b = cache.getIfPresent(options);
+ TestResultBundle b = testResultCache.getIfPresent(options);
if (DEBUG) {
if (b != null) {
System.err.println("Bundle refvalid: " + options + " -> " + (b != null));
@@ -102,7 +107,7 @@
// ElapsedTimer et = new ElapsedTimer("New test bundle " + locale + " opt " + options);
b = new TestResultBundle(options);
// System.err.println(et.toString());
- cache.put(options, b);
+ testResultCache.put(options, b);
}
return b;
}
@@ -134,10 +139,10 @@
@Override
public String toString() {
StringBuilder stats = new StringBuilder();
- stats.append("{" + this.getClass().getSimpleName() + super.toString() + " Size: " + cache.size() + " (");
+ stats.append("{" + this.getClass().getSimpleName() + super.toString() + " Size: " + testResultCache.size() + " (");
int good = 0;
int total = 0;
- for (Entry<Options, TestResultBundle> k : cache.asMap().entrySet()) {
+ for (Entry<Options, TestResultBundle> k : testResultCache.asMap().entrySet()) {
Options key = k.getKey();
TestResultBundle bundle = k.getValue();
if (bundle != null) {
@@ -153,7 +158,7 @@
}
/**
- * Update the cache as needed, given that the value has changed for this xpath and source.
+ * Update the caches as needed, given that the value has changed for this xpath and source.
*
* @param xpath the xpath
* @param source the XMLSource
@@ -165,7 +170,7 @@
}
/**
- * Update the cache as needed, given that the value has changed for this xpath and locale.
+ * Update the caches as needed, given that the value has changed for this xpath and locale.
*
* Called by valueChanged(String xpath, XMLSource source),
* and also calls itself recursively for sublocales
@@ -174,37 +179,141 @@
* @param locale the CLDRLocale
*
* There is room for improvement of performance. Currently we invalidate all paths for any affected locale.
- * Ideally, cache invalidation should only be done for each locale+path whose test results potentially depend
- * on the given locale+path, due to inheritance, aliasing, logical groups, etc. That could be done using a mapping
- * between paths that are related by such dependencies; that mapping would be constant for as long as the
- * paths and tests don't change.
+ * Ideally, cache invalidation should only be done for each locale+path whose test results or examples potentially
+ * depend on the given locale+path, due to inheritance, aliasing, logical groups, etc. That could be done using a mapping
+ * between paths that are related by such dependencies; that mapping would be constant for as long as the paths and tests
+ * (or example-generation methods) don't change.
*/
private void valueChangedInvalidateRecursively(String xpath, final CLDRLocale locale) {
if (DEBUG) {
System.err.println("BundDelLoc " + locale + " @ " + xpath);
}
+ /*
+ * Call self recursively for all sub-locales
+ */
for (CLDRLocale sub : ((SublocaleProvider) getFactory()).subLocalesOf(locale)) {
valueChangedInvalidateRecursively(xpath, sub);
}
- if (cache.asMap().isEmpty()) {
- return;
- }
- // Filter the cache to only remove the items where the locale matches
- List<Options> toRemove = new ArrayList<>();
- for (Options k : cache.asMap().keySet()) {
- if (k.getLocale().equals(locale)) {
- toRemove.add(k);
+ /*
+ * Update caching for TestResultBundle
+ */
+ updateTestResultCache(xpath, locale);
+ /*
+ * Update caching for ExampleGenerator
+ */
+ updateExampleGeneratorCache(xpath, locale);
+ }
+
+ /**
+ * Update the cache of TestResultBundle objects, per valueChanged
+ *
+ * @param xpath the xpath whose value has changed
+ * @param locale the CLDRLocale
+ *
+ * Called by valueChangedInvalidateRecursively
+ */
+ private void updateTestResultCache(@SuppressWarnings("unused") String xpath, CLDRLocale locale) {
+ if (!testResultCache.asMap().isEmpty()) {
+ // Filter the testResultCache to only remove the items where the locale matches
+ List<Options> toRemove = new ArrayList<>();
+ for (Options k : testResultCache.asMap().keySet()) {
+ if (k.getLocale().equals(locale)) {
+ toRemove.add(k);
+ }
+ }
+ if (!DEBUG) {
+ // no logging is done, simply invalidate all items
+ testResultCache.invalidateAll(toRemove);
+ } else {
+ // avoid concurrent remove
+ for (CheckCLDR.Options k : toRemove) {
+ testResultCache.invalidate(k);
+ System.err.println("BundDel " + k);
+ }
}
}
- if (!DEBUG) {
- // no logging is done, simply invalidate all items
- cache.invalidateAll(toRemove);
- } else {
- // avoid concurrent remove
- for (CheckCLDR.Options k : toRemove) {
- cache.invalidate(k);
- System.err.println("BundDel " + k);
+ }
+
+ /**
+ * Per-locale testResultCache of ExampleGenerator objects
+ *
+ * Re-use the TestCache implementation of XMLSource.Listener for ExampleGenerator
+ * objects in addition to TestResultBundle objects. The actual caches are distinct,
+ * only the Listener interface is shared.
+ *
+ * ExampleGenerator objects are for generating examples, rather than for
+ * checking validity, unlike other TestCache-related objects such as TestResultBundle.
+ * Still, ExampleGenerator has similar dependence on locales, paths, and values, and
+ * needs similar treatment for caching and performance. ExampleGenerator is in the
+ * same package ("test") as TestCache.
+ *
+ * There are currently unused (?) files Registerable.java and LocaleChangeRegistry.java
+ * that appear to have been intended for a similar purpose. They are in the web package.
+ *
+ * Reference: https://unicode-org.atlassian.net/browse/CLDR-12020
+ */
+ private static Cache<String, ExampleGenerator> exampleGeneratorCache = CacheBuilder.newBuilder().softValues().build();
+
+ /**
+ * Get an ExampleGenerator for the given locale, etc.
+ *
+ * Use a cache for performance.
+ *
+ * @param locale the CLDRLocale
+ * @param ourSrc the CLDRFile for the locale
+ * @param translationHintsFile the CLDRFile for translation hints (English)
+ * @param englishPath (a.k.a. supplementalDataDirectory)
+ * @return the ExampleGenerator
+ *
+ * Called by DataSection.make for use in SurveyTool.
+ *
+ * Note: other objects also have functions named "getExampleGenerator":
+ * org.unicode.cldr.unittest.TestExampleGenerator.getExampleGenerator(String)
+ * org.unicode.cldr.test.ConsoleCheckCLDR.getExampleGenerator()
+ */
+ public static ExampleGenerator getExampleGenerator(CLDRLocale locale, CLDRFile ourSrc, CLDRFile translationHintsFile, String englishPath) {
+ boolean egCacheIsEnabled = true;
+ if (!egCacheIsEnabled) {
+ return new ExampleGenerator(ourSrc, translationHintsFile, englishPath);
+ }
+ /*
+ * TODO: consider get(locString, Callable) instead of getIfPresent and put.
+ */
+ String locString = locale.toString();
+ ExampleGenerator eg = exampleGeneratorCache.getIfPresent(locString);
+ if (eg == null) {
+ synchronized(exampleGeneratorCache) {
+ eg = exampleGeneratorCache.getIfPresent(locString);
+ if (eg == null) {
+ eg = new ExampleGenerator(ourSrc, translationHintsFile, englishPath);
+ exampleGeneratorCache.put(locString, eg);
+ }
}
}
+ return eg;
+ }
+
+ /**
+ * Update the cached ExampleGenerator, per valueChanged
+ *
+ * @param xpath the xpath whose value has changed
+ * @param locale the CLDRLocale determining which ExampleGenerator to update
+ *
+ * Called by valueChangedInvalidateRecursively
+ */
+ private static void updateExampleGeneratorCache(String xpath, CLDRLocale locale) {
+ ExampleGenerator eg = exampleGeneratorCache.getIfPresent(locale.toString());
+ if (eg != null) {
+ /*
+ * Each ExampleGenerator has its own internal cache, which is not the same
+ * as exampleGeneratorCache.
+ *
+ * We could call exampleGeneratorCache.invalidate(locale.toString()) but that would be
+ * too drastic, effectively throwing away the ExampleGenerator for the entire locale.
+ * Ideally eg.updateCache will only clear the minimum set of examples (in its internal
+ * cache) required due to dependence on the given xpath.
+ */
+ eg.updateCache(xpath);
+ }
}
}
diff --git a/tools/java/org/unicode/cldr/tool/CLDRFileTransformer.java b/tools/java/org/unicode/cldr/tool/CLDRFileTransformer.java
index 6517ef1..baf3e9b 100644
--- a/tools/java/org/unicode/cldr/tool/CLDRFileTransformer.java
+++ b/tools/java/org/unicode/cldr/tool/CLDRFileTransformer.java
@@ -142,10 +142,10 @@
String ruleString = CLDRTransforms.getIcuRulesFromXmlFile(transformDir, localeTransform.getTransformFilename(), directionInfo);
transliterator = Transliterator.createFromRules(directionInfo.getId(),
ruleString, localeTransform.getDirection());
- transliterators.put(localeTransform, transliterator);
} else {
transliterator = Transliterator.getInstance(localeTransform.getTransformFilename());
}
+ transliterators.put(localeTransform, transliterator);
return transliterator;
}
@@ -253,11 +253,13 @@
if (dir.equals("casing") // skip, field contents are keywords, not localizable content
|| dir.equals("collation") // skip, field contents are complex, and can't be simply remapped
|| dir.equals("annotationsDerived") // skip, derived later
- ) {
+ ) {
continue;
}
System.out.println("\nDirectory: " + dir);
- Factory factory = Factory.make(CLDRPaths.COMMON_DIRECTORY + dir + "/", ".*");
+ final String sourceDirectory = CLDRPaths.COMMON_DIRECTORY + dir + "/";
+ Factory factory = Factory.make(sourceDirectory, ".*");
+
CLDRFileTransformer transformer = new CLDRFileTransformer(factory, CLDRPaths.COMMON_DIRECTORY + "transforms" + File.separator);
for (LocaleTransform localeTransform : LocaleTransform.values()) {
CLDRFile output = transformer.transform(localeTransform);
@@ -267,14 +269,15 @@
}
String outputDir = CLDRPaths.GEN_DIRECTORY + "common/" + dir + File.separator;
String outputFile = output.getLocaleID() + ".xml";
- PrintWriter out = FileUtilities.openUTF8Writer(outputDir, outputFile);
- System.out.println("Generating locale file: " + outputDir + outputFile);
- if (!transformer.unconverted.isEmpty()) {
- System.out.println("Untransformed characters: " + transformer.unconverted);
- transformer.unconverted.clear();
+
+ try (PrintWriter out = FileUtilities.openUTF8Writer(outputDir, outputFile)) {
+ System.out.println("Generating locale file: " + outputDir + outputFile);
+ if (!transformer.unconverted.isEmpty()) {
+ System.out.println("Untransformed characters: " + transformer.unconverted);
+ transformer.unconverted.clear();
+ }
+ output.write(out);
}
- output.write(out);
- out.close();
}
}
}
diff --git a/tools/java/org/unicode/cldr/tool/CLDRModify.java b/tools/java/org/unicode/cldr/tool/CLDRModify.java
index 8507239..3c7857a 100644
--- a/tools/java/org/unicode/cldr/tool/CLDRModify.java
+++ b/tools/java/org/unicode/cldr/tool/CLDRModify.java
@@ -1941,7 +1941,7 @@
keyValues.addAll(localeMatcher.getValue());
}
}
- System.out.println("# Checking entries & adding:\t" + keyValues.size());
+ System.out.println("# Checking entries & changing:\t" + keyValues.size());
for (Map<ConfigKeys, ConfigMatch> entry : keyValues) {
ConfigMatch action = entry.get(ConfigKeys.action);
//ConfigMatch locale = entry.get(ConfigKeys.locale);
@@ -2039,6 +2039,9 @@
public void handlePath(String xpath) {
// slow method; could optimize
for (Map<ConfigKeys, ConfigMatch> entry : keyValues) {
+ if (xpath.equals("AKUAPEM")) {
+ int debug = 0;
+ }
ConfigMatch pathMatch = entry.get(ConfigKeys.path);
if (pathMatch != null && !pathMatch.matches(xpath)) {
continue;
@@ -2184,7 +2187,7 @@
return;
}
Set<String> paths = LogicalGrouping.getPaths(cldrFileToFilter, xpath);
- if (paths.size() < 2) {
+ if (paths == null || paths.size() < 2) {
return;
}
Set<String> needed = new LinkedHashSet<>();
diff --git a/tools/java/org/unicode/cldr/tool/Chart.java b/tools/java/org/unicode/cldr/tool/Chart.java
index bf63bfe..882af23 100644
--- a/tools/java/org/unicode/cldr/tool/Chart.java
+++ b/tools/java/org/unicode/cldr/tool/Chart.java
@@ -1,13 +1,17 @@
package org.unicode.cldr.tool;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.stream.Collectors;
import org.unicode.cldr.tool.FormattedFileWriter.Anchors;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.SupplementalDataInfo;
+import com.ibm.icu.text.ListFormatter;
import com.ibm.icu.util.ICUUncheckedIOException;
+import com.ibm.icu.util.ULocale;
/**
* To add a new chart, subclass this, and add the subclass to {@link ShowLanguages.printLanguageData()}. There isn't much
@@ -19,6 +23,35 @@
public static final SupplementalDataInfo SDI = CONFIG.getSupplementalDataInfo();
public static final CLDRFile ENGLISH = CONFIG.getEnglish();
public static final String LS = System.lineSeparator();
+
+ public static final String PREV_CHART_VERSION_DIRECTORY = ToolConstants.getBaseDirectory(ToolConstants.PREV_CHART_VERSION);
+ public static final String CHART_VERSION_DIRECTORY = ToolConstants.getBaseDirectory(ToolConstants.CHART_VERSION);
+
+ private static final String GITHUB_ROOT = "https://github.com/unicode-org/cldr/blob/master/";
+ private static final String LDML_SPEC = "https://unicode.org/reports/tr35/";
+
+ public static String dataScrapeMessage(String specPart, String testFile, String... dataFiles) {
+ final String dataFileList = dataFiles.length == 0 ? null :
+ ListFormatter.getInstance(ULocale.ENGLISH).format(
+ Arrays.asList(dataFiles).stream()
+ .map(dataFile -> Chart.dataFileLink(dataFile))
+ .collect(Collectors.toSet()));
+
+ return "<p>"
+ + "<b>Warning:</b> Do not scrape this chart for production data.\n"
+ + "Instead, for the meaning of the fields and data consult the " + Chart.ldmlSpecLink(specPart)
+ + (dataFileList == null ? "" : ", and for machine-readable source data, access " + dataFileList)
+ + (testFile == null ? "" : ", and for test data, access " + dataFileLink(testFile))
+ + ".</p>\n";
+ }
+
+ private static String dataFileLink(String dataFile) {
+ return "<a href='" + GITHUB_ROOT + dataFile + "' target='" + dataFile + "'>" + dataFile + "</a>";
+ }
+
+ public static String ldmlSpecLink(String specPart) {
+ return "<a href='" + LDML_SPEC + (specPart == null ? "" : specPart) + "' target='units.xml'>LDML specification</a>";
+ }
/**
* null means a string will be constructed from the title. Otherwise a real file name (no html extension).
@@ -80,7 +113,7 @@
pw.write("<div style='text-align: center; margin-top:2em; margin-bottom: 60em;'><br>\n"
+ "<a href='http://www.unicode.org/unicode/copyright.html'>\n"
+ "<img src='http://www.unicode.org/img/hb_notice.gif' style='border-style: none; width: 216px; height=50px;' alt='Access to Copyright and terms of use'>"
- + "</a><br>\n<script language='Javascript' type='text/javascript' src='http://www.unicode.org/webscripts/lastModified.js'></script>"
+ + "</a><br>\n<script src='http://www.unicode.org/webscripts/lastModified.js'></script>"
+ "</div><script>\n\n"
+ "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){"
+ "(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),"
diff --git a/tools/java/org/unicode/cldr/tool/ChartAnnotations.java b/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
index 36e02f9..14a97e7 100644
--- a/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
+++ b/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
@@ -362,75 +362,4 @@
throw new IllegalArgumentException("Failure in rules for " + CLDRPaths.COMMON_DIRECTORY + "collation/" + "root", e);
}
}
-
-// static final Set<String> ENGLISH_LABELS = new LinkedHashSet<>(Arrays.asList(
-// "flag", "nature", "objects", "people", "places", "symbols", "travel", "animal",
-// "office", "sign", "word", "time", "food", "person", "weather", "activity",
-// "vehicle", "restaurant", "communication", "emotion", "geometric", "mark",
-// "education", "gesture", "japanese", "symbol", "congratulation", "body", "clothing"));
-
-// static class Annotations {
-//
-// final UnicodeRelation<String> values = new UnicodeRelation<>();
-//
-// static Factory cldrFactory = Factory.make(CLDRPaths.COMMON_DIRECTORY + "annotations/", ".*");
-//
-// static Set<String> getAvailableLocales() {
-// return cldrFactory.getAvailable();
-// }
-//
-// static Map<String, Annotations> cache = new ConcurrentHashMap<>();
-//
-// static synchronized Annotations make(String locale) {
-// Annotations result = cache.get(locale);
-// if (result == null) {
-// CLDRFile file = cldrFactory.make(locale, false); // for now, don't resolve
-// result = new Annotations();
-// LinkedHashSet<String> values = new LinkedHashSet<>();
-// XPathParts parts = new XPathParts();
-// Splitter sp = Splitter.on(';').omitEmptyStrings().trimResults();
-// for (String path : file) {
-// if (path.startsWith("//ldml/identity")) {
-// continue;
-// }
-// String value = file.getStringValue(path);
-// String fullPath = file.getFullXPath(path);
-// String cpString = parts.set(fullPath).getAttributeValue(-1, "cp");
-// UnicodeSet cps = new UnicodeSet(cpString);
-// String tts = parts.set(fullPath).getAttributeValue(-1, "tts");
-// values.clear();
-// if (tts != null) {
-// values.add(tts.trim()); // always first value
-// }
-// values.addAll(sp.splitToList(value));
-// result.values.addAll(cps, values);
-// }
-//
-// // remove labels
-//
-// if (locale.equals("en")) {
-// for (Entry<String, Set<String>> item : result.values.keyValues()) {
-// String key = item.getKey();
-// Set<String> valueSet = new LinkedHashSet<>(item.getValue());
-// for (String skip : ENGLISH_LABELS) {
-// if (valueSet.contains(skip)) {
-// result.values.remove(key, skip);
-// if (result.values.get(key) == null) {
-// result.values.add(key, skip); // restore
-// break;
-// }
-// }
-// }
-// Set<String> newSet = result.values.get(key);
-// if (!valueSet.equals(newSet)) {
-// if (DEBUG) System.out.println("dropping labels from " + item.getKey() + ", old: " + valueSet + ", new: " + newSet);
-// }
-// }
-// }
-// result.values.freeze();
-// cache.put(locale, result);
-// }
-// return result;
-// }
-// }
}
diff --git a/tools/java/org/unicode/cldr/tool/ChartCollation.java b/tools/java/org/unicode/cldr/tool/ChartCollation.java
index 864b442..20bd229 100644
--- a/tools/java/org/unicode/cldr/tool/ChartCollation.java
+++ b/tools/java/org/unicode/cldr/tool/ChartCollation.java
@@ -18,6 +18,7 @@
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRFile.DraftStatus;
+import org.unicode.cldr.util.CLDRFile.ExemplarType;
import org.unicode.cldr.util.CLDRFile.NumberingSystem;
import org.unicode.cldr.util.CLDRFile.WinningChoice;
import org.unicode.cldr.util.CLDRPaths;
@@ -40,14 +41,8 @@
static final String NOT_TAILORED = "notTailored";
static final String NOT_EXEMPLARS = "notExemplars";
- private static final String KNOWN_PROBLEMS = "<p>Known issues:</p>"
- + "<ul>" + LS
- + "<li>The ordering is illustrated with a basic list:"
- + "<ol>" + LS
- + "<li>it doesn't show the strength differences</li>" + LS
- + "<li>it does not yet take the settings or imports into account, so those are listed separately</li>" + LS
- + "<li>consult the XML file for the exact details</li>" + LS
- + "</ol>" + LS
+ private static final String KNOWN_PROBLEMS =
+ "<ul>" + LS
+ "<li>The characters used in the illustration are:" + LS
+ "<ol>" + LS
+ "<li>those <span class='" + NOT_TAILORED + "'>not tailored</span> (added from standard exemplars for context)</li>" + LS
@@ -89,14 +84,10 @@
@Override
public String getExplanation() {
- return "<p>This is a <i>preliminary</i> set of charts for CLDR collation tailorings. "
- + "Collation tailorings provide language or locale-specific modifications of the standard Unicode CLDR collation order, "
+ return "<p>Collation tailorings provide language or locale-specific modifications of the standard Unicode CLDR collation order, "
+ "which is based on <a target='_blank' href='http://unicode.org/charts/collation/'>Unicode default collation charts</a>. "
- + "Locales that just use the standard CLDR order are not listed. "
- + "For more information, see the "
- + "<a target='_blank' href='http://unicode.org/reports/tr35/tr35-collation.html'>LDML Collation spec</a>. "
- + "The complete data for these charts is in "
- + "<a target='_blank' href='" + ToolConstants.CHART_SOURCE + "common/collation/'>collation/</a>.</p>" + LS;
+ + "Locales that just use the standard CLDR order (<a href='root.html'>Root</a>) are not listed.</p>"
+ + dataScrapeMessage("/tr35-collation.html", "common/testData/units/unitsTest.txt", "common/collation")+ LS;
}
public void writeContents(FormattedFileWriter pw) throws IOException {
@@ -224,6 +215,8 @@
private void addCollator(Map<String, Data> data, String type, RuleBasedCollator col) {
if (type.startsWith("private-")) {
+ type = "\uFFFF\uFFFF" + type;
+ } else if (type.equals("search")) {
type = "\uFFFF" + type;
}
Data dataItem = data.get(type);
@@ -269,24 +262,31 @@
@Override
public String getExplanation() {
- return "<p>This is a <i>preliminary</i> chart for the " + title
- + " collation tailorings. "
- + "The complete data for this chart is found on "
- + "<a target='_blank' href='" + ToolConstants.CHART_SOURCE + "common/collation/" + file + ".xml'>" + file + ".xml</a>.</p>"
- + KNOWN_PROBLEMS;
+ return "<p>The following illustrates the ordering for the " + title
+ + " collation tailorings. It does not show the <i>strength differences</i>, such as where case is ignored where there are letter differences. "
+ + " The <i>search</i> order is special: it only used for comparing characters for similarity, so the order among the characters does not matter. "
+ + " Where a type is not present, such as <i>emoji</i> or <i>search</i>, it defaults to the <a href='root.html'>Root</a> type.</p>" + LS
+ + KNOWN_PROBLEMS
+ + dataScrapeMessage("/tr35-collation.html", null, "common/collation") + LS
+ ;
}
@Override
public void writeContents(FormattedFileWriter pw) throws IOException {
CLDRFile cldrFile = CLDR_FACTORY.make(file, true);
- UnicodeSet exemplars = cldrFile.getExemplarSet("", WinningChoice.WINNING).freeze();
-
- UnicodeSet exemplars_all = new UnicodeSet(exemplars);
- UnicodeSet exemplars_auxiliary = cldrFile.getExemplarSet("auxiliary", WinningChoice.WINNING);
- UnicodeSet exemplars_punctuation = cldrFile.getExemplarSet("punctuation", WinningChoice.WINNING);
- exemplars_all.addAll(exemplars_auxiliary)
- .addAll(exemplars_punctuation);
+ UnicodeSet exemplars_all = new UnicodeSet();
+ for (ExemplarType ex : ExemplarType.values()) {
+ UnicodeSet possExemplars = cldrFile.getExemplarSet(ex, WinningChoice.WINNING).freeze();
+ exemplars_all.addAll(possExemplars);
+ }
+// UnicodeSet exemplars = cldrFile.getExemplarSet("", WinningChoice.WINNING).freeze();
+//
+// UnicodeSet exemplars_all = new UnicodeSet(exemplars);
+// UnicodeSet exemplars_auxiliary = cldrFile.getExemplarSet("auxiliary", WinningChoice.WINNING);
+// UnicodeSet exemplars_punctuation = cldrFile.getExemplarSet("punctuation", WinningChoice.WINNING);
+// exemplars_all.addAll(exemplars_auxiliary)
+// .addAll(exemplars_punctuation);
for (NumberingSystem system : NumberingSystem.values()) {
UnicodeSet exemplars_numeric = cldrFile.getExemplarsNumeric(system);
@@ -319,7 +319,7 @@
} else {
UnicodeSet tailored = new UnicodeSet(col.getTailoredSet());
Set<String> sorted = new TreeSet<>(col);
- exemplars.addAllTo(sorted);
+ exemplars_all.addAllTo(sorted);
tailored.addAllTo(sorted);
boolean first = true;
for (String s : sorted) {
@@ -349,9 +349,9 @@
}
}
tablePrinter
- .addRow()
- .addCell(type)
- .addCell(list.toString());
+ .addRow()
+ .addCell(type)
+ .addCell(list.toString());
tablePrinter.finishRow();
}
pw.write(tablePrinter.toTable());
diff --git a/tools/java/org/unicode/cldr/tool/ChartDelta.java b/tools/java/org/unicode/cldr/tool/ChartDelta.java
index 2dc30e3..4acfb65 100644
--- a/tools/java/org/unicode/cldr/tool/ChartDelta.java
+++ b/tools/java/org/unicode/cldr/tool/ChartDelta.java
@@ -64,13 +64,13 @@
private static final String DIR_NAME = "delta";
- private static final boolean SKIP_REFORMAT_ANNOTATIONS = ToolConstants.PREVIOUS_CHART_VERSION.compareTo("30") >= 0;
+ private static final boolean SKIP_REFORMAT_ANNOTATIONS = ToolConstants.PREV_CHART_VERSION.compareTo("30") >= 0;
private static final PageId DEBUG_PAGE_ID = PageId.DayPeriod;
private static final SupplementalDataInfo SUPPLEMENTAL_DATA_INFO = CLDRConfig.getInstance().getSupplementalDataInfo();
- private static final String LAST_ARCHIVE_DIRECTORY = CLDRPaths.LAST_DIRECTORY;
- private static final String CURRENT_DIRECTORY = CLDRPaths.ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.LAST_CHART_VERSION + "/";
+ private static final String LAST_ARCHIVE_DIRECTORY = CLDRPaths.LAST_RELEASE_DIRECTORY;
+ private static final String CURRENT_DIRECTORY = CLDRPaths.ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.PREV_CHART_VERSION_WITH0 + "/";
private static final String LOG_DIR = CLDRPaths.GEN_DIRECTORY + "charts/";
enum MyOptions {
@@ -108,7 +108,7 @@
private final boolean verbose;
public static void main(String[] args) {
- System.out.println("use -DCHART_VERSION=28 to generate version 28.");
+ System.out.println("use -DCHART_VERSION=36.0 -DPREV_CHART_VERSION=34.0 to generate the differences between v36 and v34.");
MyOptions.parse(args, true);
Matcher fileFilter = !MyOptions.fileFilter.option.doesOccur() ? null : PatternCache.get(MyOptions.fileFilter.option.getValue()).matcher("");
if (MyOptions.orgFilter.option.doesOccur()) {
@@ -171,7 +171,7 @@
public void writeContents(FormattedFileWriter pw) throws IOException {
FormattedFileWriter.Anchors anchors = new FormattedFileWriter.Anchors();
FileUtilities.copyFile(ChartDelta.class, "index.css", getDirectory());
- FormattedFileWriter.copyIncludeHtmls(getDirectory());
+ FormattedFileWriter.copyIncludeHtmls(getDirectory(), true);
counter.clear();
fileCounters.clear();
writeNonLdmlPlain(anchors);
@@ -284,17 +284,18 @@
Counter<PathHeader> counts = new Counter<>();
- String dirBase =
- ToolConstants.CLDR_VERSIONS.contains(ToolConstants.LAST_CHART_VERSION) ? CURRENT_DIRECTORY
- : vxml ? CLDRPaths.SVN_DIRECTORY + "cldr-aux/" + "voting/36/vxml/" // TODO fix version to be variable
- : CLDRPaths.BASE_DIRECTORY;
+ String dirBase = ToolConstants.getBaseDirectory(ToolConstants.CHART_VERSION);
+ String prevDirBase = ToolConstants.getBaseDirectory(ToolConstants.PREV_CHART_VERSION);
+// ToolConstants.CLDR_RELEASE_VERSION_SET.contains(ToolConstants.PREV_CHART_VERSION) ? CURRENT_DIRECTORY
+// : vxml ? CLDRPaths.SVN_DIRECTORY + "cldr-aux/" + "voting/36/vxml/" // TODO fix version to be variable
+// : CLDRPaths.BASE_DIRECTORY;
for (String dir : DtdType.ldml.directories) {
if (dir.equals("annotationsDerived") || dir.equals("casing")) {
continue;
}
String current = dirBase + "common/" + dir;
- String past = LAST_ARCHIVE_DIRECTORY + "common/" + dir;
+ String past = prevDirBase + "common/" + dir;
try {
factories.add(Factory.make(current, ".*"));
} catch (Exception e1) {
@@ -311,7 +312,8 @@
System.out.println("Will compare: " + dir + "\t\t" + current + "\t\t" + past);
}
if (factories.isEmpty()) {
- throw new IllegalArgumentException("No factories found");
+ throw new IllegalArgumentException("No factories found for "
+ + dirBase + ": " + DtdType.ldml.directories);
}
// get a list of all the locales to cycle over
@@ -339,7 +341,6 @@
Set<String> paths = new HashSet<>();
Relation<PathHeader, String> diffAll = Relation.of(new TreeMap<PathHeader, Set<String>>(), TreeSet.class);
-// XPathParts pathPlain = new XPathParts();
for (Entry<String, Set<String>> baseNLocale : baseToLocales.keyValuesSet()) {
String base = baseNLocale.getKey();
// int qCount = 0;
@@ -675,6 +676,8 @@
private void writeDiffs(Anchors anchors, String file, String title, Multimap<PathHeader, String> bcp, PrintWriter tsvFile) {
if (bcp.isEmpty()) {
+ System.out.println("\tDeleting: " + DIR + "/" + file);
+ new File(DIR + file).delete();
return;
}
TablePrinter tablePrinter = new TablePrinter()
@@ -819,10 +822,11 @@
@Override
public String getExplanation() {
- return "<p>Lists data fields that differ from the last version."
+ return "<p>Lists data fields that differ from the last major version (see versions above)."
+ " Inherited differences in locales are suppressed, except where the source locales are different. "
- + " The collations and metadata still have a raw format."
- + " The rbnf, segmentations, and annotations are not yet included.<p>";
+// + " The collations and metadata still have a raw format."
+// + " The rbnf, segmentations, and annotations are not yet included."
+ + "<p>";
}
@Override
@@ -850,6 +854,8 @@
Counter<PathHeader> countSame = new Counter<>();
Counter<PathHeader> countAdded = new Counter<>();
Counter<PathHeader> countDeleted = new Counter<>();
+
+
for (String dir : new File(CLDRPaths.BASE_DIRECTORY + "common/").list()) {
if (DtdType.ldml.directories.contains(dir)
@@ -860,8 +866,10 @@
) {
continue;
}
- File dir1 = new File(LAST_ARCHIVE_DIRECTORY + "common/" + dir);
- File dir2 = new File(CLDRPaths.BASE_DIRECTORY + "common/" + dir);
+ File dirOld = new File(PREV_CHART_VERSION_DIRECTORY + "common/" + dir);
+ System.out.println("\tLast dir: " + dirOld);
+ File dir2 = new File(CHART_VERSION_DIRECTORY + "common/" + dir);
+ System.out.println("\tCurr dir: " + dir2);
for (String file : dir2.list()) {
if (!file.endsWith(".xml")) {
@@ -879,10 +887,10 @@
if (verbose) {
System.out.println(file);
}
- Relation<PathHeader, String> contents1 = fillData(dir1.toString() + "/", file);
+ Relation<PathHeader, String> contentsOld = fillData(dirOld.toString() + "/", file);
Relation<PathHeader, String> contents2 = fillData(dir2.toString() + "/", file);
- Set<PathHeader> keys = new TreeSet<PathHeader>(CldrUtility.ifNull(contents1.keySet(), Collections.<PathHeader> emptySet()));
+ Set<PathHeader> keys = new TreeSet<PathHeader>(CldrUtility.ifNull(contentsOld.keySet(), Collections.<PathHeader> emptySet()));
keys.addAll(CldrUtility.ifNull(contents2.keySet(), Collections.<PathHeader> emptySet()));
DtdType dtdType = null;
for (PathHeader key : keys) {
@@ -897,56 +905,56 @@
Multimap<PathHeader, String> target = dtdType == DtdType.ldmlBCP47 ? bcp
: isTransform ? transforms
: supplemental;
- Set<String> set1 = contents1.get(key);
+ Set<String> setOld = contentsOld.get(key);
Set<String> set2 = contents2.get(key);
- if (Objects.equals(set1, set2)) {
+ if (Objects.equals(setOld, set2)) {
if (file.equals(DEBUG_FILE)) { // for debugging
- System.out.println("**Same: " + key + "\t" + set1);
+ System.out.println("**Same: " + key + "\t" + setOld);
}
- addChange(parentAndFile, ChangeType.same, set1.size());
+ addChange(parentAndFile, ChangeType.same, setOld.size());
countSame.add(key, 1);
continue;
}
- if (set1 == null) {
+ if (setOld == null) {
addChange(parentAndFile, ChangeType.added, set2.size());
for (String s : set2) {
addRow(target, key, "▷missing◁", s);
countAdded.add(key, 1);
}
} else if (set2 == null) {
- addChange(parentAndFile, ChangeType.deleted, set1.size());
- for (String s : set1) {
+ addChange(parentAndFile, ChangeType.deleted, setOld.size());
+ for (String s : setOld) {
addRow(target, key, s, "▷removed◁");
countDeleted.add(key, 1);
}
} else {
- Set<String> s1M2 = set1;
+ Set<String> s1MOld = setOld;
Set<String> s2M1 = set2;
// Set<String> s1M2 = new LinkedHashSet<>(set1);
// s1M2.removeAll(set2);
// Set<String> s2M1 = new LinkedHashSet<>(set2);
// s2M1.removeAll(set1);
- if (s1M2.isEmpty()) {
+ if (s1MOld.isEmpty()) {
addRow(target, key, "▷missing◁", CollectionUtilities.join(s2M1, ", "));
addChange(parentAndFile, ChangeType.added, s2M1.size());
countAdded.add(key, 1);
} else if (s2M1.isEmpty()) {
- addRow(target, key, CollectionUtilities.join(s1M2, ", "), "▷removed◁");
- addChange(parentAndFile, ChangeType.deleted, s1M2.size());
+ addRow(target, key, CollectionUtilities.join(s1MOld, ", "), "▷removed◁");
+ addChange(parentAndFile, ChangeType.deleted, s1MOld.size());
countDeleted.add(key, 1);
} else {
String valueOld;
String valueCurrent;
int[] sameAndNotInSecond = new int[2];
- valueOld = getFilteredValue(s1M2, s1M2, sameAndNotInSecond);
+ valueOld = getFilteredValue(s1MOld, s1MOld, sameAndNotInSecond);
addChange(parentAndFile, ChangeType.same, sameAndNotInSecond[0]);
countSame.add(key, 1);
addChange(parentAndFile, ChangeType.deleted, sameAndNotInSecond[1]);
sameAndNotInSecond[1] = 0;
countDeleted.add(key, 1);
- valueCurrent = getFilteredValue(s2M1, s1M2, sameAndNotInSecond);
+ valueCurrent = getFilteredValue(s2M1, s1MOld, sameAndNotInSecond);
addChange(parentAndFile, ChangeType.added, sameAndNotInSecond[1]);
addRow(target, key, valueOld, valueCurrent);
countAdded.add(key, 1);
diff --git a/tools/java/org/unicode/cldr/tool/ChartDtdDelta.java b/tools/java/org/unicode/cldr/tool/ChartDtdDelta.java
index 6b7dd76..2030ff0 100644
--- a/tools/java/org/unicode/cldr/tool/ChartDtdDelta.java
+++ b/tools/java/org/unicode/cldr/tool/ChartDtdDelta.java
@@ -92,11 +92,10 @@
.setSpanRows(false);
String last = null;
- LinkedHashSet<String> allVersions = new LinkedHashSet<>(ToolConstants.CLDR_VERSIONS);
- allVersions.add(ToolConstants.LAST_CHART_VERSION);
- for (String current : allVersions) {
+
+ for (String current : ToolConstants.CLDR_RELEASE_AND_DEV_VERSION_SET) {
System.out.println("DTD delta: " + current);
- final boolean finalVersion = current.equals(ToolConstants.LAST_CHART_VERSION);
+ final boolean finalVersion = current.equals(ToolConstants.DEV_VERSION);
String currentName = finalVersion ? ToolConstants.CHART_DISPLAY_VERSION : current;
for (DtdType type : TYPES) {
String firstVersion = type.firstVersion; // FIRST_VERSION.get(type);
@@ -106,7 +105,10 @@
DtdData dtdCurrent = null;
try {
dtdCurrent = DtdData.getInstance(type,
- finalVersion && ToolConstants.CHART_STATUS != ToolConstants.ChartStatus.release ? null : current);
+ finalVersion
+ // && ToolConstants.CHART_STATUS != ToolConstants.ChartStatus.release
+ ? null
+ : current);
} catch (Exception e) {
if (!(e.getCause() instanceof FileNotFoundException)) {
throw e;
@@ -127,6 +129,9 @@
diff(currentName, dtdLast, dtdCurrent);
}
last = current;
+ if (current.contentEquals(ToolConstants.CHART_VERSION)) {
+ break;
+ }
}
for (DiffElement datum : data) {
diff --git a/tools/java/org/unicode/cldr/tool/ChartSubdivisions.java b/tools/java/org/unicode/cldr/tool/ChartSubdivisions.java
index 33e3676..ed25074 100644
--- a/tools/java/org/unicode/cldr/tool/ChartSubdivisions.java
+++ b/tools/java/org/unicode/cldr/tool/ChartSubdivisions.java
@@ -41,7 +41,8 @@
@Override
public String getExplanation() {
return "<p>Shows the subdivisions of territories, using the Unicode Subdivision Codes with the English names (and sort order). "
- + "For more information see the LDML spec.<p>";
+ + "For more information see the LDML spec.<p>"
+ + Chart.dataScrapeMessage(null, null, "common/supplemental/subdivisions.xml", "common/validity/subdivision.xml");
}
@Override
diff --git a/tools/java/org/unicode/cldr/tool/ChartUnitConversions.java b/tools/java/org/unicode/cldr/tool/ChartUnitConversions.java
new file mode 100644
index 0000000..5cfacc5
--- /dev/null
+++ b/tools/java/org/unicode/cldr/tool/ChartUnitConversions.java
@@ -0,0 +1,95 @@
+package org.unicode.cldr.tool;
+
+import java.io.IOException;
+import java.util.Map.Entry;
+
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.Rational;
+import org.unicode.cldr.util.Rational.FormatStyle;
+import org.unicode.cldr.util.UnitConverter;
+import org.unicode.cldr.util.UnitConverter.TargetInfo;
+
+import com.google.common.base.Joiner;
+
+public class ChartUnitConversions extends Chart {
+
+ public static final String QUANTITY_MSG = "The units are grouped and ordered by Quantity (which are based on the NIST quantities, see "
+ + "<a href='https://www.nist.gov/pml/special-publication-811' target='nist811'>NIST 811</a>). Note that the quantities are informative.";
+ public static final String RATIONAL_MSG = "Each numeric value is an exact rational. The format is a terminating decimal where possible; "
+ + "otherwise a repeating decimal if possible (where ˙ marks the start of the <a href='https://en.wikipedia.org/wiki/Repeating_decimal' target='wiki'>reptend</a>); "
+ + "otherwise a <a href='https://en.wikipedia.org/wiki/Rational_number' target='wiki'>rational number</a> (of the form <i>numerator/denominator</i>).";
+ public static final String SPEC_GENERAL_MSG = "The " + ldmlSpecLink("/tr35-general.html#Contents")
+ + " should be consulted for more details, such as how to handle complex units (such as foot-per-minute) by converting the elements";
+
+ public static void main(String[] args) {
+ new ChartUnitConversions().writeChart(null);
+ }
+
+ @Override
+ public String getDirectory() {
+ return FormattedFileWriter.CHART_TARGET_DIR;
+ }
+
+ @Override
+ public String getTitle() {
+ return "Unit Conversions";
+ }
+
+ @Override
+ public String getExplanation() {
+ return "<p>Unit Conversions provide conversions for units, such as meter ⟹ foot, "
+ + "so that a source units can be converted into what is needed for localized "
+ + "<a href='unit_preferences.html' target='unit_preferences'>Unit Preferences</a>. "
+ + "There are many possible units, and additional units and conversions will be added in future releases.</p>"
+ + "<ul>"
+ + "<li>Each Source Unit is converted to the Target Unit by multiplying it by the Factor and adding the Offset (if any).</li>"
+ + "<li>The unit identifiers are internal, and are to be localized for display to users. See <a href='https://www.unicode.org/cldr/charts/latest/by_type/units.area.html#hectare' target='units.area.hectare'>Hectare</a>, for example. "
+ + "<li>" + RATIONAL_MSG + "</li>"
+ + "<li>The Systems column indicates which systems the units are used in. For now, they just show the two ‘inch-pound’ systems.</li>"
+ + "<li>" + QUANTITY_MSG + "</li>"
+ + "<li>" + SPEC_GENERAL_MSG + ".</li>"
+ + "</ul>"
+ + dataScrapeMessage("/tr35-general.html#Contents", "common/testData/units/unitsTest.txt", "common/supplemental/units.xml");
+ }
+
+ @Override
+ public void writeContents(FormattedFileWriter pw) throws IOException {
+ // <convertUnit source='ounce' baseUnit='kilogram' factor='lb_to_kg/16' systems="ussystem uksystem"/>
+ // <convertUnit source='fahrenheit' baseUnit='kelvin' factor='5/9' offset='2298.35/9' systems="ussystem uksystem"/>
+
+
+ TablePrinter tablePrinter = new TablePrinter()
+ .addColumn("Quantity", "class='target'", null, "class='target'", true)
+ .setHidden(true)
+ .setRepeatHeader(true)
+ .setBreakSpans(true)
+ .addColumn("Source Unit", "class='source'", CldrUtility.getDoubleLinkMsg(), "class='source'", true)
+ .addColumn("Factor", "class='target'", null, "class='target'", true)
+ .setCellAttributes("class='target' style='text-align:right'")
+ .addColumn("Offset", "class='target'", null, "class='target'", true)
+ .setCellAttributes("class='target' style='text-align:right'")
+ .addColumn("Target", "class='target'", null, "class='target'", true)
+ .addColumn("Systems", "class='target'", null, "class='target'", true)
+ .addColumn("Quantity", "class='target'", CldrUtility.getDoubleLinkMsg(), "class='target'", true)
+ ;
+
+ UnitConverter converter = SDI.getUnitConverter();
+ converter.getSourceToSystems();
+
+ for (Entry<String, TargetInfo> entry : converter.getInternalConversionData().entrySet()) {
+ String sourceUnit = entry.getKey();
+ String quantity = converter.getQuantityFromUnit(sourceUnit, false);
+ TargetInfo targetInfo = entry.getValue();
+ tablePrinter.addRow()
+ .addCell(quantity)
+ .addCell(sourceUnit)
+ .addCell(targetInfo.unitInfo.factor.toString(FormatStyle.repeating))
+ .addCell(targetInfo.unitInfo.offset.equals(Rational.ZERO) ? "" : targetInfo.unitInfo.offset.toString(FormatStyle.repeating))
+ .addCell(targetInfo.target)
+ .addCell(Joiner.on(", ").join(converter.getSourceToSystems().get(sourceUnit)))
+ .addCell(quantity)
+ .finishRow();
+ }
+ pw.write(tablePrinter.toTable());
+ }
+}
diff --git a/tools/java/org/unicode/cldr/tool/ChartUnitPreferences.java b/tools/java/org/unicode/cldr/tool/ChartUnitPreferences.java
new file mode 100644
index 0000000..a030eff
--- /dev/null
+++ b/tools/java/org/unicode/cldr/tool/ChartUnitPreferences.java
@@ -0,0 +1,143 @@
+package org.unicode.cldr.tool;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.Pair;
+import org.unicode.cldr.util.Rational.FormatStyle;
+import org.unicode.cldr.util.UnitConverter;
+import org.unicode.cldr.util.UnitPreferences;
+import org.unicode.cldr.util.UnitPreferences.UnitPreference;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multiset;
+
+public class ChartUnitPreferences extends Chart {
+
+ public static void main(String[] args) {
+ new ChartUnitPreferences().writeChart(null);
+ }
+
+ @Override
+ public String getDirectory() {
+ return FormattedFileWriter.CHART_TARGET_DIR;
+ }
+
+ @Override
+ public String getTitle() {
+ return "Unit Preferences";
+ }
+
+ @Override
+ public String getExplanation() {
+ return "<p>Unit Preferences provide a way to get the units that are appropriate for a region, and usage, and threshold amounts. "
+ + "The <a href='unit_conversions.html' target='unit_conversions'>Unit Conversions</a> are used to handle conversion of units needed to use the preferences."
+ + "This release adds additional structure for usage and threshold amount, allowing for more additions of regions, usages, thresholds, and units in future releases.</p>"
+ + "<ul>"
+ + "<li>The Base Unit shows the unit whose amount is to be compared to the ‘If ≥’ amount of the Result Unit."
+ + "<li>The unit identifiers are internal, and would be localized for display to users. See <a href='https://www.unicode.org/cldr/charts/latest/by_type/units.area.html#hectare' target='units.area.hectare'>Hectare</a>, for example."
+ + "<li>The Usage shows the type of usage; <i>default</i> is used as a fallback no more specific match is found."
+ + "<li>The Sample region represents a set of regions if it has a superscript. See the table at the bottom. 001 (World) is the default if no more specific region is found.</li>"
+ + "<li>The ‘If ≥’ column shows the thresholds: the first line for a given region where the input amount is greater or equal applies. "
+ + "For example, for 0.5km as input for [area, default, 001] would result in <i>hectare</i>.</li>"
+ + "<li>" + ChartUnitConversions.RATIONAL_MSG + "</li>\n"
+ + "<li>" + ChartUnitConversions.QUANTITY_MSG + "</li>"
+ + "<li>" + ChartUnitConversions.SPEC_GENERAL_MSG + ", and how to fall back if a given usage or region is not found.</li>\n"
+ + "</ul>"
+ + dataScrapeMessage("/tr35-general.html#Contents", "common/testData/units/unitPreferencesTest.txt", "common/supplemental/units.xml");
+ }
+
+ @Override
+ public void writeContents(FormattedFileWriter pw) throws IOException {
+ // # Quantity; Usage; Region; Input (r); Input (d); Input Unit; Output (r); Output (d); Output Unit
+
+ TablePrinter tablePrinter = new TablePrinter()
+ .addColumn("Base Unit", "class='source'", CldrUtility.getDoubleLinkMsg(), "class='source'", true)
+ .setBreakSpans(true)
+ .setRepeatHeader(true)
+ .addColumn("Usage", "class='source'", CldrUtility.getDoubleLinkMsg(), "class='source'", true)
+ .addColumn("Sample Region", "class='source'", null, "class='source'", true)
+ .addColumn("If ≥", "class='source'", null, "class='source'", true)
+ .setCellAttributes("class='target' style='text-align:right'")
+ .addColumn("Result Unit", "class='target'", null, "class='target'", true)
+ .addColumn("Skeleton", "class='target'", null, "class='target'", true)
+ .addColumn("Quantity", "class='target'", null, "class='target'", true);
+
+ UnitConverter converter = SDI.getUnitConverter();
+ UnitPreferences prefs = SDI.getUnitPreferences();
+ Samples samples = new Samples();
+
+ for (Entry<String, Map<String, Multimap<Set<String>, UnitPreference>>> entry : prefs.getData().entrySet()) {
+ String quantity = entry.getKey();
+ String baseUnit = converter.getBaseUnitFromQuantity(quantity);
+ for (Entry<String, Multimap<Set<String>, UnitPreference>> entry2 : entry.getValue().entrySet()) {
+ String usage = entry2.getKey();
+ for (Entry<Set<String>, Collection<UnitPreference>> entry3 : entry2.getValue().asMap().entrySet()) {
+
+ Set<String> regions = entry3.getKey();
+ Pair<String, Integer> sampleRegion = samples.getSample(regions);
+ final String sampleRegionStr = sampleDisplay(sampleRegion);
+
+ for (UnitPreference pref : entry3.getValue()) {
+ tablePrinter.addRow()
+ .addCell(baseUnit)
+ .addCell(usage)
+ .addCell(sampleRegionStr)
+ .addCell(pref.geq.toString(FormatStyle.html))
+ .addCell(Joiner.on(" & ").join(Splitter.on("-and-").split(pref.unit)))
+ .addCell(pref.skeleton)
+ .addCell(quantity)
+ .finishRow();
+
+ }
+ }
+ }
+ }
+ pw.write(tablePrinter.toTable());
+ pw.write("<br><h1>Region Sets</h1>\n");
+ TablePrinter tablePrinter2 = new TablePrinter()
+ .addColumn("Sample Region", "class='source'", CldrUtility.getDoubleLinkMsg(), "class='source'", true)
+ .addColumn("Region Set", "class='target'", CldrUtility.getDoubleLinkMsg(), "class='source'", true);
+
+ TreeSet<Pair<String, Integer>> sorted = new TreeSet<>(samples.setToSample.values());
+ for (Pair<String, Integer> pair : sorted) {
+ tablePrinter2.addRow()
+ .addCell(sampleDisplay(pair))
+ .addCell(Joiner.on(", ").join(samples.setToSample.inverse().get(pair)))
+ .finishRow();
+ }
+ pw.write(tablePrinter2.toTable());
+ }
+
+ private String sampleDisplay(Pair<String, Integer> sampleRegion) {
+ return sampleRegion.getFirst() + (sampleRegion.getSecond() < 0 ? "" : "<sup>" + sampleRegion.getSecond() + "</sup>");
+ }
+
+ private static final class Samples {
+ BiMap<Set<String>, Pair<String, Integer>> setToSample = HashBiMap.create();
+ Multiset<String> counters = HashMultiset.create();
+
+ private Pair<String, Integer> getSample(Set<String> regions) {
+ if (regions.size() == 1) {
+ return new Pair<>(regions.iterator().next(), -1);
+ }
+ Pair<String, Integer> sample = setToSample.get(regions);
+ if (sample == null) {
+ String sampleBase = regions.iterator().next() + ", …";
+ counters.add(sampleBase);
+ setToSample.put(regions, sample = new Pair<>(sampleBase, counters.count(sampleBase)));
+ }
+ return sample;
+ }
+ }
+}
diff --git a/tools/java/org/unicode/cldr/tool/CldrVersion.java b/tools/java/org/unicode/cldr/tool/CldrVersion.java
index b02de4d..93b7414 100644
--- a/tools/java/org/unicode/cldr/tool/CldrVersion.java
+++ b/tools/java/org/unicode/cldr/tool/CldrVersion.java
@@ -26,7 +26,7 @@
unknown,
v1_1_1, v1_2, v1_3, v1_4_1, v1_5_1, v1_6_1, v1_7_2, v1_8_1, v1_9_1, v2_0_1,
v21_0, v22_1, v23_1, v24_0, v25_0, v26_0, v27_0, v28_0, v29_0, v30_0, v31_0, v32_0, v33_0, v33_1, v34_0,
- v35_0, v35_1,
+ v35_0, v35_1, v36_0,
trunk;
private final String baseDirectory;
diff --git a/tools/java/org/unicode/cldr/tool/CompareFilesBetweenReleases2.java b/tools/java/org/unicode/cldr/tool/CompareFilesBetweenReleases2.java
index 20be3e8..20d5dbf 100644
--- a/tools/java/org/unicode/cldr/tool/CompareFilesBetweenReleases2.java
+++ b/tools/java/org/unicode/cldr/tool/CompareFilesBetweenReleases2.java
@@ -7,19 +7,20 @@
import java.util.TreeSet;
import org.unicode.cldr.util.CLDRPaths;
-import org.unicode.cldr.util.CldrUtility;
+
+import com.google.common.collect.ImmutableSet;
public class CompareFilesBetweenReleases2 {
- private static final String STAGING_DIRECTORY = CldrUtility.getPath(CLDRPaths.BASE_DIRECTORY, "../cldr-staging/production");
+ //private static final String STAGING_DIRECTORY = CldrUtility.getPath(CLDRPaths.BASE_DIRECTORY, "../cldr-staging/production");
private static final String RELEASE_DIRECTORY = CLDRPaths.ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.LAST_RELEASE_VERSION + "/";
public static void main(String[] args) throws IOException {
- Set<String> staging = getFiles(new File(STAGING_DIRECTORY));
+ Set<String> staging = getFiles(new File(CLDRPaths.BASE_DIRECTORY));
Set<String> lastRelease = getFiles(new File(RELEASE_DIRECTORY));
- System.out.println("\nIn cldr-staging, but not last release:\n");
+ System.out.println("\nIn trunk, but not last release:\n");
showDiff(staging, lastRelease);
- System.out.println("\nIn last release, but not cldr-staging:\n");
+ System.out.println("\nIn last release, but not trunk:\n");
showDiff(lastRelease, staging);
}
@@ -38,10 +39,13 @@
return result;
}
+ static final Set<String> SKIP = ImmutableSet.of("seed", "exemplars", "docs", "tools");
+
private static void getFiles(int baseLen, File subdir, Set<String> names) throws IOException {
String name = subdir.getName();
if (subdir.isDirectory()) {
- if (name.equals("seed") || name.equals("exemplars")) {
+ if (SKIP.contains(name)
+ || name.startsWith(".")) {
return;
}
for (File file : subdir.listFiles()) {
diff --git a/tools/java/org/unicode/cldr/tool/CompareHanTransliterators.java b/tools/java/org/unicode/cldr/tool/CompareHanTransliterators.java
index 9059049..d277319 100644
--- a/tools/java/org/unicode/cldr/tool/CompareHanTransliterators.java
+++ b/tools/java/org/unicode/cldr/tool/CompareHanTransliterators.java
@@ -25,7 +25,7 @@
handler.map = new UnicodeMap<String>();
- reader.read(CLDRPaths.LAST_DIRECTORY + "/common/transforms/Han-Latin.xml",
+ reader.read(CLDRPaths.LAST_RELEASE_DIRECTORY + "/common/transforms/Han-Latin.xml",
XMLFileReader.CONTENT_HANDLER, false);
UnicodeMap<String> old = handler.map;
diff --git a/tools/java/org/unicode/cldr/tool/FindAttributeValueDifferences.java b/tools/java/org/unicode/cldr/tool/FindAttributeValueDifferences.java
index 2d1b9f6..daed724 100644
--- a/tools/java/org/unicode/cldr/tool/FindAttributeValueDifferences.java
+++ b/tools/java/org/unicode/cldr/tool/FindAttributeValueDifferences.java
@@ -46,7 +46,7 @@
CLDRConfig config = CLDRConfig.getInstance();
Factory current = config.getCldrFactory();
- Factory last = Factory.make(LAST_ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.PREVIOUS_CHART_VERSION + "/common/main/", ".*");
+ Factory last = Factory.make(LAST_ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.LAST_RELEASE_VERSION + "/common/main/", ".*");
@SuppressWarnings({ "rawtypes", "unchecked" })
M4<String, String, String, Boolean> newValues = ChainedMap.of(new TreeMap(), new TreeMap(), new TreeMap(), Boolean.class);
diff --git a/tools/java/org/unicode/cldr/tool/FormattedFileWriter.java b/tools/java/org/unicode/cldr/tool/FormattedFileWriter.java
index 4201e2d..1e7d7b9 100644
--- a/tools/java/org/unicode/cldr/tool/FormattedFileWriter.java
+++ b/tools/java/org/unicode/cldr/tool/FormattedFileWriter.java
@@ -170,8 +170,12 @@
}
public static void copyIncludeHtmls (String targetDirectory) {
+ copyIncludeHtmls(targetDirectory, false);
+ }
+
+ public static void copyIncludeHtmls (String targetDirectory, boolean addPrevVersion) {
String[] replacements = {
- "%version%", ToolConstants.CHART_DISPLAY_VERSION,
+ "%version%", ToolConstants.CHART_DISPLAY_VERSION + (addPrevVersion ? " – " + ToolConstants.PREV_CHART_VERSION_WITH0 : ""),
"%date%", CldrUtility.isoFormatDateOnly(new Date())
};
writeTargetWithReplacements(targetDirectory, "include-date.html", "include-date.html", replacements);
diff --git a/tools/java/org/unicode/cldr/tool/GenerateAttributeList.java b/tools/java/org/unicode/cldr/tool/GenerateAttributeList.java
index 00f6e33..7aae971 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateAttributeList.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateAttributeList.java
@@ -28,7 +28,6 @@
import org.unicode.cldr.util.PatternCache;
import org.unicode.cldr.util.StandardCodes;
import org.unicode.cldr.util.TransliteratorUtilities;
-import org.unicode.cldr.util.XPathParts;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -38,7 +37,6 @@
import org.xml.sax.ext.DeclHandler;
public class GenerateAttributeList {
- XPathParts parts = new XPathParts();
Map<String, Map<String, Set<String>[]>> element_attribute_valueSet = new TreeMap<String, Map<String, Set<String>[]>>();
Set<String> allElements = new TreeSet<String>();
Map<String, String> defaults = new HashMap<String, String>();
diff --git a/tools/java/org/unicode/cldr/tool/GenerateDayPeriods.java b/tools/java/org/unicode/cldr/tool/GenerateDayPeriods.java
index 1996ef7..2bc111f 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateDayPeriods.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateDayPeriods.java
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
@@ -26,7 +27,7 @@
public static void main(String[] args) throws IOException {
try (PrintWriter out = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY + "/supplemental", "dayPeriods.xml")) {
- out.println(DtdType.supplementalData.header(null)
+ out.println(DtdType.supplementalData.header(MethodHandles.lookup().lookupClass())
+ "\t<version number=\"$Revision" /* bypass SVN */ + "$\"/>");
Factory factory = CLDRConfig.getInstance().getCldrFactory();
for (Type type : Type.values()) {
diff --git a/tools/java/org/unicode/cldr/tool/GenerateDtd.java b/tools/java/org/unicode/cldr/tool/GenerateDtd.java
index e574290..b8ea285 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateDtd.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateDtd.java
@@ -1,13 +1,12 @@
package org.unicode.cldr.tool;
import java.io.IOException;
-import java.io.PrintWriter;
import java.util.Locale;
-import org.unicode.cldr.draft.FileUtilities;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.DtdData;
import org.unicode.cldr.util.DtdType;
+import org.unicode.cldr.util.TempPrintWriter;
import com.ibm.icu.text.CaseMap;
@@ -29,7 +28,7 @@
name = name.substring(0, name.length() - 4);
}
}
- try (PrintWriter out = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY + "dtd/", name + ".dtd")) {
+ try (TempPrintWriter out = TempPrintWriter.openUTF8Writer(CLDRPaths.BASE_DIRECTORY + type.dtdPath)) {
out.println(data);
}
}
diff --git a/tools/java/org/unicode/cldr/tool/GenerateItemCounts.java b/tools/java/org/unicode/cldr/tool/GenerateItemCounts.java
index 7e3d407..845db6c 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateItemCounts.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateItemCounts.java
@@ -289,7 +289,6 @@
TreeSet.class);
final PathStarrer PATH_STARRER = new PathStarrer().setSubstitutionPattern("*");
final Set<String> STARRED_PATHS = new TreeSet<String>();
- XPathParts parts = new XPathParts();
StringBuilder elementPath = new StringBuilder();
public void add(String path) {
diff --git a/tools/java/org/unicode/cldr/tool/GeneratePluralRanges.java b/tools/java/org/unicode/cldr/tool/GeneratePluralRanges.java
index a0f1bf4..5732b90 100644
--- a/tools/java/org/unicode/cldr/tool/GeneratePluralRanges.java
+++ b/tools/java/org/unicode/cldr/tool/GeneratePluralRanges.java
@@ -1,5 +1,6 @@
package org.unicode.cldr.tool;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -14,6 +15,8 @@
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.DtdType;
import org.unicode.cldr.util.Factory;
import org.unicode.cldr.util.ICUServiceBuilder;
import org.unicode.cldr.util.LanguageTagParser;
@@ -24,6 +27,7 @@
import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
+import org.unicode.cldr.util.TempPrintWriter;
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.impl.Relation;
@@ -88,14 +92,14 @@
}
for (RangeSample rangeSample : list) {
System.out.println(locale + "\t" + english.getName(locale)
- + "\t" + rangeSample.start
- + "\t" + rangeSample.end
- + "\t" + (rangeSample.result == null ? "missing" : rangeSample.result)
- + "\t" + rangeSample.min
- + "\t" + rangeSample.max
- + "\t" + rangeSample.startExample
- + "\t" + rangeSample.endExample
- + "\t" + rangeSample.resultExample);
+ + "\t" + rangeSample.start
+ + "\t" + rangeSample.end
+ + "\t" + (rangeSample.result == null ? "missing" : rangeSample.result)
+ + "\t" + rangeSample.min
+ + "\t" + rangeSample.max
+ + "\t" + rangeSample.startExample
+ + "\t" + rangeSample.endExample
+ + "\t" + rangeSample.resultExample);
}
}
}
@@ -227,37 +231,44 @@
public void reformatPluralRanges() {
Map<Set<Count>, Relation<Set<String>, String>> seen = new TreeMap<Set<Count>, Relation<Set<String>, String>>(COUNT_SET_COMPARATOR);
+ try (TempPrintWriter out = TempPrintWriter.openUTF8Writer(CLDRPaths.SUPPLEMENTAL_DIRECTORY,"pluralRanges.xml")) {
+ out.println(DtdType.supplementalData.header(MethodHandles.lookup().lookupClass()) +
+ "\t<version number=\"$Revision$\" />\n" +
+ "\t<plurals>"
+ );
+ for (String locale : SUPPLEMENTAL.getPluralRangesLocales()) {
- for (String locale : SUPPLEMENTAL.getPluralRangesLocales()) {
- PluralRanges pluralRanges = SUPPLEMENTAL.getPluralRanges(locale);
- PluralInfo pluralInfo = SUPPLEMENTAL.getPlurals(locale);
- Set<Count> counts = pluralInfo.getCounts();
+ PluralRanges pluralRanges = SUPPLEMENTAL.getPluralRanges(locale);
+ PluralInfo pluralInfo = SUPPLEMENTAL.getPlurals(locale);
+ Set<Count> counts = pluralInfo.getCounts();
- Set<String> s;
- if (false) {
- System.out.println("Minimized, but not ready for prime-time");
- s = minimize(pluralRanges, pluralInfo);
- } else {
- s = reformat(pluralRanges, counts);
- }
- Relation<Set<String>, String> item = seen.get(counts);
- if (item == null) {
- seen.put(counts,
- item = Relation.of(new TreeMap<Set<String>, Set<String>>(STRING_SET_COMPARATOR), TreeSet.class));
- }
- item.put(s, locale);
- }
-
- for (Entry<Set<Count>, Relation<Set<String>, String>> entry0 : seen.entrySet()) {
- System.out.println("\n<!-- " + CollectionUtilities.join(entry0.getKey(), ", ") + " -->");
- for (Entry<Set<String>, Set<String>> entry : entry0.getValue().keyValuesSet()) {
- System.out.println("\t\t<pluralRanges locales=\"" + CollectionUtilities.join(entry.getValue(), " ") + "\">");
- for (String line : entry.getKey()) {
- System.out.println("\t\t\t" + line);
+ Set<String> s;
+ if (false) {
+ out.println("Minimized, but not ready for prime-time");
+ s = minimize(pluralRanges, pluralInfo);
+ } else {
+ s = reformat(pluralRanges, counts);
}
- System.out.println("\t\t</pluralRanges>");
+ Relation<Set<String>, String> item = seen.get(counts);
+ if (item == null) {
+ seen.put(counts,
+ item = Relation.of(new TreeMap<Set<String>, Set<String>>(STRING_SET_COMPARATOR), TreeSet.class));
+ }
+ item.put(s, locale);
}
+ for (Entry<Set<Count>, Relation<Set<String>, String>> entry0 : seen.entrySet()) {
+ out.println("\n<!-- " + CollectionUtilities.join(entry0.getKey(), ", ") + " -->");
+ for (Entry<Set<String>, Set<String>> entry : entry0.getValue().keyValuesSet()) {
+ out.println("\t\t<pluralRanges locales=\"" + CollectionUtilities.join(entry.getValue(), " ") + "\">");
+ for (String line : entry.getKey()) {
+ out.println("\t\t\t" + line);
+ }
+ out.println("\t\t</pluralRanges>");
+ }
+ }
+ out.println("\t</plurals>\n" +
+ "</supplementalData>");
}
}
@@ -330,8 +341,8 @@
for (Count end : pluralInfo.getCounts()) {
Count r = matrix.endSame(end);
if (r != null
- //&& r != Count.other
- ) {
+ //&& r != Count.other
+ ) {
result.add("<pluralRange" +
" \t\tend=\"" + end
+ "\"\tresult=\"" + r + "\"/>");
@@ -342,8 +353,8 @@
for (Count start : pluralInfo.getCounts()) {
Count r = matrix.startSame(start, endDone, emit);
if (r != null
- // && r != Count.other
- ) {
+ // && r != Count.other
+ ) {
if (emit.value) {
result.add("<pluralRange" +
"\tstart=\"" + start
@@ -364,8 +375,8 @@
}
Count r = matrix.get(start, end);
if (r != null
- //&& !(MINIMAL && r == Count.other)
- ) {
+ //&& !(MINIMAL && r == Count.other)
+ ) {
result.add(PluralRanges.showRange(start, end, r));
} else {
result.add("<!-- <pluralRange" +
diff --git a/tools/java/org/unicode/cldr/tool/GenerateProductionData.java b/tools/java/org/unicode/cldr/tool/GenerateProductionData.java
index da51e48..5a77e68 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateProductionData.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateProductionData.java
@@ -356,7 +356,7 @@
// TODO Should be done in the converter tool!!
if (ADD_LOGICAL_GROUPS && !LogicalGrouping.isOptional(cldrFileResolved, xpath)) {
Set<String> paths = LogicalGrouping.getPaths(cldrFileResolved, xpath);
- if (paths.size() > 1) {
+ if (paths != null && paths.size() > 1) {
for (String possiblePath : paths) {
// Unclear from API whether we need to do this filtering
if (!LogicalGrouping.isOptional(cldrFileResolved, possiblePath)) {
diff --git a/tools/java/org/unicode/cldr/tool/GenerateSidewaysView.java b/tools/java/org/unicode/cldr/tool/GenerateSidewaysView.java
index c5ab499..2434c85 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateSidewaysView.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateSidewaysView.java
@@ -829,10 +829,6 @@
ShowData.getChartTemplate("By-Type Chart: " + title,
ToolConstants.CHART_DISPLAY_VERSION,
"",
- // "<link rel='stylesheet' type='text/css' href='by_type.css'>" +
- // "<style type='text/css'>" + Utility.LINE_SEPARATOR +
- // "h1 {margin-bottom:1em}" + Utility.LINE_SEPARATOR +
- // "</style>" + Utility.LINE_SEPARATOR,
headerAndFooter, null, false);
out.println(headerAndFooter[0]);
return out;
diff --git a/tools/java/org/unicode/cldr/tool/GenerateSubdivisions.java b/tools/java/org/unicode/cldr/tool/GenerateSubdivisions.java
index 0d5c753..bd27ccd 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateSubdivisions.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateSubdivisions.java
@@ -13,6 +13,7 @@
import org.unicode.cldr.draft.FileUtilities;
import org.unicode.cldr.tool.SubdivisionNode.SubDivisionExtractor;
import org.unicode.cldr.tool.SubdivisionNode.SubdivisionSet;
+import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.StandardCodes.LstrType;
import org.unicode.cldr.util.SupplementalDataInfo;
@@ -25,7 +26,7 @@
import com.ibm.icu.impl.Row.R2;
public class GenerateSubdivisions {
- private static final String ISO_COUNTRY_CODES = CLDRPaths.CLDR_PRIVATE_DIRECTORY + "iso/";
+ private static final String ISO_COUNTRY_CODES = CLDRPaths.CLDR_PRIVATE_DIRECTORY + "iso_country_codes/";
static final String ISO_SUBDIVISION_CODES = ISO_COUNTRY_CODES + "iso_country_codes.xml";
@@ -36,9 +37,9 @@
static final class SubdivisionInfo {
- static final SupplementalDataInfo SDI = SupplementalDataInfo.getInstance(CLDRPaths.LAST_RELEASE_DIRECTORY + "common/supplemental/");
+ static final SupplementalDataInfo SDI_LAST = SupplementalDataInfo.getInstance(CLDRPaths.LAST_RELEASE_DIRECTORY + "common/supplemental/");
- static final Map<String, R2<List<String>, String>> SUBDIVISION_ALIASES_FORMER = SDI.getLocaleAliasInfo().get("subdivision");
+ static final Map<String, R2<List<String>, String>> SUBDIVISION_ALIASES_FORMER = SDI_LAST.getLocaleAliasInfo().get("subdivision");
static final SubdivisionNames SUBDIVISION_NAMES_ENGLISH_FORMER = new SubdivisionNames("en", "main", "subdivisions");
@@ -71,6 +72,7 @@
}
public static void main(String[] args) throws IOException {
+ CLDRConfig.getInstance().getSupplementalDataInfo();
// TODO Restructure so that this call is done first to process the iso data
// then the extraction uses that data.
// also restructure the SubdivisionInfo to not be static
@@ -84,7 +86,8 @@
"2017-09-15_iso_country_code_ALL_xml",
"2018-02-20_iso_country_code_ALL_xml",
"2018-09-02_iso_country_code_ALL_xml",
- "2019-02-26_iso_country_code_ALL_xml"
+ "2019-02-26_iso_country_code_ALL_xml",
+ "2020-03-05_iso_country_code_ALL_xml"
)) {
SubdivisionSet sdset1 = new SubdivisionSet(CLDRPaths.CLDR_PRIVATE_DIRECTORY + source + "/iso_country_codes.xml");
try (PrintWriter pw = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "subdivision/" + source + ".txt")) {
diff --git a/tools/java/org/unicode/cldr/tool/GenerateValidityXml.java b/tools/java/org/unicode/cldr/tool/GenerateValidityXml.java
index 1c2eda1..55db9b6 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateValidityXml.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateValidityXml.java
@@ -1,7 +1,6 @@
package org.unicode.cldr.tool;
import java.io.IOException;
-import java.io.PrintWriter;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Date;
@@ -15,7 +14,6 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.unicode.cldr.draft.FileUtilities;
import org.unicode.cldr.draft.ScriptMetadata;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.CLDRTool;
@@ -27,6 +25,7 @@
import org.unicode.cldr.util.StringRange.Adder;
import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.SupplementalDataInfo.CurrencyDateInfo;
+import org.unicode.cldr.util.TempPrintWriter;
import org.unicode.cldr.util.Validity;
import org.unicode.cldr.util.Validity.Status;
@@ -146,7 +145,7 @@
String type = entry.getKey();
final Info info = entry.getValue();
Multimap<Status, String> subtypeMap = info.getStatusMap();
- try (PrintWriter output = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "validity/" + type + ".xml")) {
+ try (TempPrintWriter output = TempPrintWriter.openUTF8Writer(CLDRPaths.COMMON_DIRECTORY, "validity/" + type + ".xml")) {
adder.target = output;
output.append(DtdType.supplementalData.header(MethodHandles.lookup().lookupClass())
+ "\t<version number=\"$Revision" /*hack to stop SVN changing this*/ + "$\"/>\n"
@@ -320,6 +319,7 @@
break;
case script:
switch (code) {
+ case "Aran":
case "Qaag":
case "Zsye":
case "Zanb":
diff --git a/tools/java/org/unicode/cldr/tool/GeneratedPluralSamples.java b/tools/java/org/unicode/cldr/tool/GeneratedPluralSamples.java
index 753ff1f..0655846 100644
--- a/tools/java/org/unicode/cldr/tool/GeneratedPluralSamples.java
+++ b/tools/java/org/unicode/cldr/tool/GeneratedPluralSamples.java
@@ -1,6 +1,5 @@
package org.unicode.cldr.tool;
-import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
@@ -15,15 +14,16 @@
import java.util.TreeSet;
import java.util.regex.Matcher;
-import org.unicode.cldr.draft.FileUtilities;
import org.unicode.cldr.tool.GeneratedPluralSamples.Info.Type;
import org.unicode.cldr.tool.Option.Options;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.PatternCache;
+import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo;
import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
import org.unicode.cldr.util.SupplementalDataInfo.PluralType;
+import org.unicode.cldr.util.TempPrintWriter;
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.impl.Relation;
@@ -46,6 +46,8 @@
private static final int UNBOUNDED_LIMIT = 20;
private static final String RANGE_SEPARATOR = "~";
public static final String SEQUENCE_SEPARATOR = ", ";
+
+ static SupplementalDataInfo sInfo = CLDRConfig.getInstance().getSupplementalDataInfo(); // forward declaration
static class Range implements Comparable<Range> {
// invariant: visibleFractionDigitCount are the same
@@ -538,7 +540,7 @@
private static boolean CHECK_VALUE = false;
enum MyOptions {
- output(".*", CLDRPaths.GEN_DIRECTORY + "supplemental/", "output data directory"), filter(".*", null, "filter locales"),
+ output(".*", CLDRPaths.SUPPLEMENTAL_DIRECTORY, "output data directory"), filter(".*", null, "filter locales"),
//xml(null, null, "xml file format"),
multiline(null, null, "multiple lines in file"), sortNew(null, null, "sort without backwards compatible hack");
// boilerplate
@@ -564,120 +566,114 @@
PluralRules pluralRules2 = PluralRules.createRules("one: n is 3..9; two: n is 7..12");
System.out.println("Check: " + checkForDuplicates(pluralRules2, new FixedDecimal(8)));
- PrintWriter out = null;
for (PluralType type : PluralType.values()) {
- if (fileFormat) {
- out = FileUtilities.openUTF8Writer(MyOptions.output.option.getValue(), type == PluralType.cardinal ? "plurals.xml" : "ordinals.xml");
+ try (TempPrintWriter out = TempPrintWriter.openUTF8Writer(MyOptions.output.option.getValue(), type == PluralType.cardinal ? "plurals.xml" : "ordinals.xml")) {
out.print(WritePluralRules.formatPluralHeader(type, "GeneratedPluralSamples"));
- }
- System.out.println("\n");
- Set<String> locales = testInfo.getSupplementalDataInfo().getPluralLocales(type);
- Relation<PluralInfo, String> seenAlready = Relation.of(new TreeMap<PluralInfo, Set<String>>(), TreeSet.class);
-
- //System.out.println(type + ": " + locales);
- for (String locale : locales) {
+ System.out.println("\n");
+ Set<String> locales = testInfo.getSupplementalDataInfo().getPluralLocales(type);
+ Relation<PluralInfo, String> seenAlready = Relation.of(new TreeMap<PluralInfo, Set<String>>(), TreeSet.class);
+ //System.out.println(type + ": " + locales);
+ for (String locale : locales) {
// if (locale.equals("root")) {
// continue;
// }
- if (localeMatcher != null && !localeMatcher.reset(locale).find()) {
- continue;
- }
- PluralInfo pluralInfo = testInfo.getSupplementalDataInfo().getPlurals(type, locale);
- //System.out.println(type + ", " + locale + "=>" + pluralInfo);
- seenAlready.put(pluralInfo, locale);
- }
-
- // sort if necessary
- Set<Entry<PluralInfo, Set<String>>> sorted = sortNew ? new LinkedHashSet<Entry<PluralInfo, Set<String>>>()
- : new TreeSet<Entry<PluralInfo, Set<String>>>(new HackComparator(type == PluralType.cardinal
- ? WritePluralRules.HACK_ORDER_PLURALS : WritePluralRules.HACK_ORDER_ORDINALS));
- for (Entry<PluralInfo, Set<String>> entry : seenAlready.keyValuesSet()) {
- sorted.add(entry);
- }
- Set<String> oldKeywords = Collections.EMPTY_SET;
- Relation<GeneratedPluralSamples, PluralInfo> samplesToPlurals = Relation.of(new LinkedHashMap<GeneratedPluralSamples, Set<PluralInfo>>(),
- LinkedHashSet.class);
- for (Entry<PluralInfo, Set<String>> entry : sorted) {
- PluralInfo pluralInfo = entry.getKey();
- Set<String> equivalentLocales = entry.getValue();
-
- CHECK_VALUE = equivalentLocales.contains("pt"); // for debugging
-
- String representative = equivalentLocales.iterator().next();
-
- PluralRules pluralRules = pluralInfo.getPluralRules();
- Set<String> keywords = pluralRules.getKeywords();
-
- if (fileFormat) {
- if (!keywords.equals(oldKeywords)) {
- out.println("\n <!-- " + keywords.size() + ": " + CollectionUtilities.join(keywords, ",") + " -->\n");
- oldKeywords = keywords;
+ if (localeMatcher != null && !localeMatcher.reset(locale).find()) {
+ continue;
}
- out.println(WritePluralRules.formatPluralRuleHeader(equivalentLocales));
- System.out.println(type + "\t" + equivalentLocales);
+ PluralInfo pluralInfo = testInfo.getSupplementalDataInfo().getPlurals(type, locale);
+ //System.out.println(type + ", " + locale + "=>" + pluralInfo);
+ seenAlready.put(pluralInfo, locale);
}
- GeneratedPluralSamples samples = new GeneratedPluralSamples(pluralInfo, type);
- samplesToPlurals.put(samples, pluralInfo);
- for (String keyword : keywords) {
- Count count = Count.valueOf(keyword);
- String rule = pluralInfo.getRule(count);
- if (rule != null) {
- // strip original @...
- int atPos = rule.indexOf('@');
- if (atPos >= 0) {
- rule = rule.substring(0, atPos).trim();
+
+ // sort if necessary
+ Set<Entry<PluralInfo, Set<String>>> sorted = sortNew ? new LinkedHashSet<Entry<PluralInfo, Set<String>>>()
+ : new TreeSet<Entry<PluralInfo, Set<String>>>(new HackComparator(type == PluralType.cardinal
+ ? WritePluralRules.HACK_ORDER_PLURALS : WritePluralRules.HACK_ORDER_ORDINALS));
+ for (Entry<PluralInfo, Set<String>> entry : seenAlready.keyValuesSet()) {
+ sorted.add(entry);
+ }
+ Set<String> oldKeywords = Collections.EMPTY_SET;
+ Relation<GeneratedPluralSamples, PluralInfo> samplesToPlurals = Relation.of(new LinkedHashMap<GeneratedPluralSamples, Set<PluralInfo>>(),
+ LinkedHashSet.class);
+ for (Entry<PluralInfo, Set<String>> entry : sorted) {
+ PluralInfo pluralInfo = entry.getKey();
+ Set<String> equivalentLocales = entry.getValue();
+
+ CHECK_VALUE = equivalentLocales.contains("pt"); // for debugging
+
+ String representative = equivalentLocales.iterator().next();
+
+ PluralRules pluralRules = pluralInfo.getPluralRules();
+ Set<String> keywords = pluralRules.getKeywords();
+
+ if (fileFormat) {
+ if (!keywords.equals(oldKeywords)) {
+ out.println("\n <!-- " + keywords.size() + ": " + CollectionUtilities.join(keywords, ",") + " -->\n");
+ oldKeywords = keywords;
+ }
+ out.println(WritePluralRules.formatPluralRuleHeader(equivalentLocales));
+ System.out.println(type + "\t" + equivalentLocales);
+ }
+ GeneratedPluralSamples samples = new GeneratedPluralSamples(pluralInfo, type);
+ samplesToPlurals.put(samples, pluralInfo);
+ for (String keyword : keywords) {
+ Count count = Count.valueOf(keyword);
+ String rule = pluralInfo.getRule(count);
+ if (rule != null) {
+ // strip original @...
+ int atPos = rule.indexOf('@');
+ if (atPos >= 0) {
+ rule = rule.substring(0, atPos).trim();
+ }
+ }
+ if (rule == null && count != Count.other) {
+ pluralInfo.getRule(count);
+ throw new IllegalArgumentException("No rule for " + count);
+ }
+ if (!fileFormat) {
+ System.out.print(type + "\t" + representative + "\t" + keyword + "\t" + (rule == null ? "" : rule));
+ }
+ DataSamples data = samples.getData(keyword);
+ if (data == null) {
+ System.err.println("***Failure");
+ failureCount++;
+ continue;
+ }
+ if (fileFormat) {
+ out.println(WritePluralRules.formatPluralRule(keyword, rule, data.toString(), multiline));
+ } else {
+ System.out.println(data.toString());
}
}
- if (rule == null && count != Count.other) {
- pluralInfo.getRule(count);
- throw new IllegalArgumentException("No rule for " + count);
- }
- if (!fileFormat) {
- System.out.print(type + "\t" + representative + "\t" + keyword + "\t" + (rule == null ? "" : rule));
- }
- DataSamples data = samples.getData(keyword);
- if (data == null) {
- System.err.println("***Failure");
- failureCount++;
- continue;
- }
if (fileFormat) {
- out.println(WritePluralRules.formatPluralRule(keyword, rule, data.toString(), multiline));
+ out.println(WritePluralRules.formatPluralRuleFooter());
} else {
- System.out.println(data.toString());
+ System.out.println();
}
}
if (fileFormat) {
- out.println(WritePluralRules.formatPluralRuleFooter());
+ out.println(WritePluralRules.formatPluralFooter());
} else {
+ for (Entry<PluralInfo, Set<String>> entry : seenAlready.keyValuesSet()) {
+ if (entry.getValue().size() == 1) {
+ continue;
+ }
+ Set<String> remainder = new LinkedHashSet<String>(entry.getValue());
+ String first = remainder.iterator().next();
+ remainder.remove(first);
+ System.err.println(type + "\tEQUIV:\t\t" + first + "\t≣\t" + CollectionUtilities.join(remainder, ", "));
+ }
System.out.println();
}
- }
- if (fileFormat) {
- out.println(WritePluralRules.formatPluralFooter());
- } else {
- for (Entry<PluralInfo, Set<String>> entry : seenAlready.keyValuesSet()) {
- if (entry.getValue().size() == 1) {
- continue;
+ for (Entry<GeneratedPluralSamples, Set<PluralInfo>> entry : samplesToPlurals.keyValuesSet()) {
+ Set<PluralInfo> set = entry.getValue();
+ if (set.size() != 1) {
+ System.err.println("***Failure: Duplicate results " + set);
+ failureCount++;
}
- Set<String> remainder = new LinkedHashSet<String>(entry.getValue());
- String first = remainder.iterator().next();
- remainder.remove(first);
- System.err.println(type + "\tEQUIV:\t\t" + first + "\t≣\t" + CollectionUtilities.join(remainder, ", "));
}
- System.out.println();
- }
- for (Entry<GeneratedPluralSamples, Set<PluralInfo>> entry : samplesToPlurals.keyValuesSet()) {
- Set<PluralInfo> set = entry.getValue();
- if (set.size() != 1) {
- System.err.println("***Failure: Duplicate results " + set);
- failureCount++;
- }
- }
- System.out.println("\n");
- if (fileFormat) {
- out.close();
+ System.out.println("\n");
}
}
if (failureCount > 0) {
diff --git a/tools/java/org/unicode/cldr/tool/GetChanges.java b/tools/java/org/unicode/cldr/tool/GetChanges.java
index f843fd3..9fb4b6d 100644
--- a/tools/java/org/unicode/cldr/tool/GetChanges.java
+++ b/tools/java/org/unicode/cldr/tool/GetChanges.java
@@ -208,7 +208,7 @@
String release = "33.1";
String subdir = "annotations"; // "main";
- Factory lastReleaseFactory = Factory.make(CLDRPaths.LAST_DIRECTORY + "common/"
+ Factory lastReleaseFactory = Factory.make(CLDRPaths.LAST_RELEASE_DIRECTORY + "common/"
+ subdir, ".*");
Factory trunkFactory = testInfo.getAnnotationsFactory(); // CldrFactory();
Factory snapshotFactory = Factory.make(CLDRPaths.AUX_DIRECTORY + "voting/"
diff --git a/tools/java/org/unicode/cldr/tool/IdToPath.java b/tools/java/org/unicode/cldr/tool/IdToPath.java
index e483b3f..065e642 100644
--- a/tools/java/org/unicode/cldr/tool/IdToPath.java
+++ b/tools/java/org/unicode/cldr/tool/IdToPath.java
@@ -2493,7 +2493,7 @@
{ "7776906451936639769", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"power-kilowatt\"]/unitPattern", "{0} kilowatts" },
{ "1425041947804260336", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"power-watt\"]/unitPattern", "{0} watts" },
{ "879657229610499693", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"pressure-hectopascal\"]/unitPattern", "{0} hectopascals" },
- { "4825302634598929101", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"pressure-inch-hg\"]/unitPattern", "{0} inches of mercury" },
+ { "4825302634598929101", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"pressure-inch-ofhg\"]/unitPattern", "{0} inches of mercury" },
{ "1578723096519824917", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"pressure-millibar\"]/unitPattern", "{0} millibars" },
{ "143198155003474297", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"speed-kilometer-per-hour\"]/unitPattern", "{0} kilometers per hour" },
{ "3061759330027962162", "//ldml/units/unitLength[@type=\"long\"]/unit[@type=\"speed-meter-per-second\"]/unitPattern", "{0} meters per second" },
@@ -2537,7 +2537,7 @@
{ "703411355937731300", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"power-kilowatt\"]/unitPattern", "{0}kW" },
{ "4955201096551518495", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"power-watt\"]/unitPattern", "{0}W" },
{ "3237720444612413403", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"pressure-hectopascal\"]/unitPattern", "{0}hPa" },
- { "7257030169429694281", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"pressure-inch-hg\"]/unitPattern", "{0}\" Hg" },
+ { "7257030169429694281", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"pressure-inch-ofhg\"]/unitPattern", "{0}\" Hg" },
{ "4668218627955712716", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"pressure-millibar\"]/unitPattern", "{0}mb" },
{ "5297327779142954786", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"speed-kilometer-per-hour\"]/unitPattern", "{0}kph" },
{ "6872142846522390504", "//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"speed-meter-per-second\"]/unitPattern", "{0}m/s" },
@@ -2581,7 +2581,7 @@
{ "6965678794161006202", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"power-kilowatt\"]/unitPattern", "{0} kW" },
{ "6030193940287398769", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"power-watt\"]/unitPattern", "{0} W" },
{ "4432467229223378824", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"pressure-hectopascal\"]/unitPattern", "{0} hPa" },
- { "8872276327365841823", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"pressure-inch-hg\"]/unitPattern", "{0} inHg" },
+ { "8872276327365841823", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"pressure-inch-ofhg\"]/unitPattern", "{0} inHg" },
{ "1007131876340493048", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"pressure-millibar\"]/unitPattern", "{0} mbar" },
{ "1792382274299951330", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"speed-kilometer-per-hour\"]/unitPattern", "{0} kph" },
{ "678341565121186083", "//ldml/units/unitLength[@type=\"short\"]/unit[@type=\"speed-meter-per-second\"]/unitPattern", "{0} m/s" },
diff --git a/tools/java/org/unicode/cldr/tool/ListUnits.java b/tools/java/org/unicode/cldr/tool/ListUnits.java
index 8d14ca5..97406d1 100644
--- a/tools/java/org/unicode/cldr/tool/ListUnits.java
+++ b/tools/java/org/unicode/cldr/tool/ListUnits.java
@@ -54,7 +54,6 @@
Timer timer = new Timer();
int count = 0;
- XPathParts parts = new XPathParts();
Splitter SEMI = Splitter.on(";").trimResults();
Matcher currencyMatcher = PatternCache.get("([^0#]*).*[0#]([^0#]*)").matcher("");
diff --git a/tools/java/org/unicode/cldr/tool/SearchCLDR.java b/tools/java/org/unicode/cldr/tool/SearchCLDR.java
index bbad22f..b771fa0 100644
--- a/tools/java/org/unicode/cldr/tool/SearchCLDR.java
+++ b/tools/java/org/unicode/cldr/tool/SearchCLDR.java
@@ -2,15 +2,24 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.unicode.cldr.test.CheckCLDR;
+import org.unicode.cldr.test.CheckCLDR.CheckStatus;
+import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
import org.unicode.cldr.test.CoverageLevel2;
import org.unicode.cldr.tool.Option.Options;
+import org.unicode.cldr.tool.SearchXml.ConfigOption;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRFile.Status;
@@ -82,6 +91,7 @@
.add("Verbose", null, null, "verbose output")
.add("PathHeader", null, null, "show path header and string ID")
.add("diff", "\\d+(\\.\\d+)?", null, "show only paths whose values changed from specified version (and were present in that version)")
+ .add("Error", ".*", null, "filter by errors, eg CheckForCopy, or CheckForCopy:sameAsCode")
;
private static String fileMatcher;
@@ -90,6 +100,9 @@
private static boolean showPath;
private static PathHeader.Factory PATH_HEADER_FACTORY = null;
+ private static Subtype subtype;
+ private static CheckCLDR checkCldr;
+
private static String organization;
public static void main(String[] args) {
@@ -116,21 +129,27 @@
showPath = myOptions.get("z-showPath").doesOccur();
organization = myOptions.get("organization").getValue();
-
+
+ final CLDRFile english = CLDRConfig.getInstance().getEnglish();
if (myOptions.get("PathHeader").doesOccur()) {
- PATH_HEADER_FACTORY = PathHeader.getFactory(CLDRConfig.getInstance().getEnglish());
+ PATH_HEADER_FACTORY = PathHeader.getFactory(english);
}
boolean showParent = myOptions.get("q-showParent").doesOccur();
boolean showEnglish = myOptions.get("english").doesOccur();
- Factory cldrFactory = Factory.make(sourceDirectory, fileMatcher);
+ File[] paths = {
+ new File(CLDRPaths.MAIN_DIRECTORY),
+ new File(sourceDirectory) };
+
+ Factory cldrFactory = SimpleFactory.make(paths, fileMatcher);
+
Set<String> locales = new TreeSet<String>(cldrFactory.getAvailable());
-
+
String rawVersion = myOptions.get("diff").getValue();
-
+
Factory cldrDiffFactory = null;
if (rawVersion != null) {
String base = getArchiveDirectory(VersionInfo.getInstance(rawVersion));
@@ -138,9 +157,29 @@
cldrDiffFactory = SimpleFactory.make(files, ".*");
}
- CLDRFile english = cldrFactory.make("en", true);
PathHeader.Factory pathHeaderFactory = PathHeader.getFactory(english);
+ String errorMatcherText = myOptions.get("Error").getValue();
+ subtype = null;
+ checkCldr = null;
+ if (errorMatcherText != null) {
+ int errorSepPos = errorMatcherText.indexOf(':');
+ if (errorSepPos >= 0) {
+ subtype = Subtype.valueOf(errorMatcherText.substring(errorSepPos+1));
+ errorMatcherText = errorMatcherText.substring(0,errorSepPos);
+ }
+ // TODO create new object using name
+ // checkCldr = new CheckForCopy(cldrFactory);
+ try {
+ Class<?> checkCLDRClass = Class.forName("org.unicode.cldr.test." + errorMatcherText);
+ Constructor<?> ctor = checkCLDRClass.getConstructor(Factory.class);
+ checkCldr = (CheckCLDR) ctor.newInstance(cldrFactory);
+ } catch (Exception e) {
+ throw new ICUUncheckedIOException(e);
+ }
+ CheckCLDR.setDisplayInformation(english);
+ }
+
System.out.println("Searching...");
System.out.println();
System.out.flush();
@@ -154,13 +193,29 @@
System.out.println();
}
+ List<CheckStatus> result = new ArrayList<>();
+ Map<String, String> options = new HashMap<>();
+
+ int totalCount = 0;
+
for (String locale : locales) {
+ int localeCount = 0;
Level organizationLevel = organization == null ? null
: StandardCodes.make().getLocaleCoverageLevel(organization, locale);
CLDRFile file = (CLDRFile) cldrFactory.make(locale, resolved);
+ CLDRFile resolvedFile = resolved == true ? file
+ : (CLDRFile) cldrFactory.make(locale, true);
CLDRFile diffFile = null;
-
+
+ if (checkCldr != null) {
+ if (locale.equals("eo")) {
+ int debug = 0;
+ }
+ result.clear();
+ checkCldr.setCldrFileToCheck(resolvedFile, options, result);
+ }
+
if (cldrDiffFactory != null) {
try {
diffFile = cldrDiffFactory.make(locale, resolved);
@@ -181,6 +236,9 @@
Status status = new Status();
Set<PathHeader> sorted = new TreeSet<PathHeader>();
for (String path : file.fullIterable()) {
+ if (locale.equals("eo") && path.contains("type=\"MK\"")) {
+ int debug = 0;
+ }
String stringValue = file.getStringValue(path);
if (stringValue == null) {
continue;
@@ -191,14 +249,14 @@
if (diffStringValue == null) {
continue;
}
- String stringValueWithBailey = file.getWinningValueWithBailey(path);
+ String stringValueWithBailey = resolvedFile.getWinningValueWithBailey(path);
if (stringValueWithBailey == null) {
continue; // strange results; shouldn't have ^^^ with null
}
if (diffStringValue.equals(stringValueWithBailey)) {
continue;
}
- stringValueWithBailey = file.getWinningValueWithBailey(path);
+ stringValueWithBailey = resolvedFile.getWinningValueWithBailey(path);
int debug = 0;
}
sorted.add(pathHeaderFactory.fromPath(path));
@@ -207,6 +265,9 @@
String path = pathHeader.getOriginalPath();
String fullPath = file.getFullXPath(path);
String value = file.getStringValue(path);
+ if (locale.equals("eo") && path.contains("type=\"MK\"")) {
+ int debug = 0;
+ }
if (pathMatcher != null && pathExclude == pathMatcher.reset(fullPath).find()) {
continue;
@@ -225,6 +286,30 @@
continue;
}
+ if (checkCldr != null) {
+ if (checkCldr.isSkipTest()) {
+ continue;
+ }
+ result.clear();
+
+ checkCldr.check(path, file.getFullXPath(path), value, options, result);
+ if (result.isEmpty()) {
+ continue;
+ }
+ int count = 0;
+ for (CheckStatus item : result) {
+ if (item.getSubtype() == subtype) {
+ ++count;
+ };
+ }
+ if (count == 0) {
+ continue;
+ }
+ // for debugging
+ int debug = 0;
+ checkCldr.check(path, file.getFullXPath(path), value, options, result);
+ }
+
// made it through the sieve
if (countOnly) {
@@ -244,26 +329,36 @@
String cleanShort = pathHeader.toString().replace('\t', '|');
final String resolvedSource = !resolved ? null
: file.getSourceLocaleID(path, status)
- + (path.equals(status.pathWhereFound) ? "\t≣" : "\t" + status);
- showLine(showPath, showParent, showEnglish, resolved, locale,
- path, fullPath, value,
- cleanShort,
- !showParent ? null : english.getBaileyValue(path, null, null),
- english == null ? null : english.getStringValue(path),
- resolvedSource,
- Objects.toString(pathLevel));
+ + (path.equals(status.pathWhereFound) ? "\t≣" : "\t" + status);
+ if (checkCldr != null) {
+ SearchXml.show(ConfigOption.delete, locale, file.getDistinguishingXPath(fullPath, null), value, null, null, null);
+ } else {
+ showLine(showPath, showParent, showEnglish, resolved, locale,
+ path, fullPath, value,
+ cleanShort,
+ !showParent ? null : english.getBaileyValue(path, null, null),
+ english == null ? null : english.getStringValue(path),
+ resolvedSource,
+ Objects.toString(pathLevel));
+ }
+ totalCount++;
+ localeCount++;
}
if (countOnly) {
System.out.print(locale);
for (Level cLevel : Level.values()) {
System.out.print("\t" + levelCounter.get(cLevel));
}
- System.out.println();
+ }
+ if (localeCount != 0) {
+ System.out.println("# " + locale
+ + " Total " + localeCount + " found");
}
System.out.flush();
}
System.out
- .println("Done -- Elapsed time: " + ((System.currentTimeMillis() - startTime) / 60000.0) + " minutes");
+ .println("# All Total " + totalCount + " found\n"
+ + "Done -- Elapsed time: " + ((System.currentTimeMillis() - startTime) / 60000.0) + " minutes");
}
private static File[] getCorrespondingDirectories(String base, Factory cldrFactory) {
@@ -300,15 +395,16 @@
+ "\n\t" + pathHeader.getUrl(BaseUrl.PRODUCTION, locale);
}
}
- System.out.println(
- locale + "\t⟪" + value + "⟫"
- + (showEnglish ? "\t⟪" + englishValue + "⟫" : "")
- + (!showParent ? "" : CollectionUtilities.equals(value, parentValue) ? "\t≣" : "\t⟪" + parentValue + "⟫")
- + "\t" + shortPath
- + (showPath ? "\t" + fullPath : "")
- + (resolved ? "\t" + resolvedSource : "")
- + (organizationLevel != null ? "\t" + organizationLevel : "")
- + pathHeaderInfo);
+ System.out.println("# "
+ + locale
+ + "\t⟪" + value + "⟫"
+ + (showEnglish ? "\t⟪" + englishValue + "⟫" : "")
+ + (!showParent ? "" : CollectionUtilities.equals(value, parentValue) ? "\t≣" : "\t⟪" + parentValue + "⟫")
+ + "\t" + shortPath
+ + (showPath ? "\t" + fullPath : "")
+ + (resolved ? "\t" + resolvedSource : "")
+ + (organizationLevel != null ? "\t" + organizationLevel : "")
+ + pathHeaderInfo);
}
private static Matcher getMatcher(String property, Output<Boolean> exclude) {
diff --git a/tools/java/org/unicode/cldr/tool/SearchXml.java b/tools/java/org/unicode/cldr/tool/SearchXml.java
index c4d7c6d..ef21352 100644
--- a/tools/java/org/unicode/cldr/tool/SearchXml.java
+++ b/tools/java/org/unicode/cldr/tool/SearchXml.java
@@ -58,7 +58,7 @@
private static String valuePattern;
private static File comparisonDirectory;
private static boolean recursive;
-
+
private static Counter<String> kountRegexMatches;
private static Counter<String> starCounter;
private static final Set<String> ERRORS = new LinkedHashSet<String>();
@@ -383,7 +383,7 @@
diffInfo.sameCount += values.size();
}
if (diff && showValues) {
- show(file, path, values, otherValues);
+ show(ConfigOption.add, file, null, null, path, values, otherValues);
}
}
} else {
@@ -417,27 +417,27 @@
String data = groups
? group(value, valueMatcher) + "\t" + group(path, pathMatcher)
: value + "\t" + path;
- if (!unique) {
- String pathHeaderInfo = "";
- if (PATH_HEADER_FACTORY != null) {
- PathHeader pathHeader = PATH_HEADER_FACTORY.fromPath(path);
- if (pathHeader != null) {
- pathHeaderInfo = "\n\t" + pathHeader
- + "\n\t" + pathHeader.getUrl(BaseUrl.PRODUCTION, coreName);
+ if (!unique) {
+ String pathHeaderInfo = "";
+ if (PATH_HEADER_FACTORY != null) {
+ PathHeader pathHeader = PATH_HEADER_FACTORY.fromPath(path);
+ if (pathHeader != null) {
+ pathHeaderInfo = "\n\t" + pathHeader
+ + "\n\t" + pathHeader.getUrl(BaseUrl.PRODUCTION, coreName);
+ }
}
- }
- // http://st.unicode.org/cldr-apps/v#/en/Fields/59d8178ec2fe04ae
- if (!groups && pathHeaderInfo.isEmpty()) {
- show(file, path, Collections.singleton(value), null);
+ // http://st.unicode.org/cldr-apps/v#/en/Fields/59d8178ec2fe04ae
+ if (!groups && pathHeaderInfo.isEmpty()) {
+ show(ConfigOption.add, file, null, null, path, Collections.singleton(value), null);
+ } else {
+ System.out.println("#?" +
+ (recursive ? filePath + "\t" : "")
+ + file + "\t" + data
+ + pathHeaderInfo);
+ }
} else {
- System.out.println("#?" +
- (recursive ? filePath + "\t" : "")
- + file + "\t" + data
- + pathHeaderInfo);
+ uniqueData.add(data, 1);
}
- } else {
- uniqueData.add(data, 1);
- }
}
}
}
@@ -452,19 +452,41 @@
}
}
- private static void show(String fileName, String path, Set<String> values, Set<String> otherValues) {
+ enum ConfigOption {delete, add, addNew, replace};
+
+ public static void show(ConfigOption configOption,
+ String localeOrFile,
+ String match_path,
+ String match_value,
+ String new_path,
+ Set<String> new_values,
+ Set<String> otherValues) {
+ // locale= sv ; action=delete; value= YER ; path= //ldml/numbers/currencies/currency[@type="YER"]/symbol ;
+
+ // locale=en ; action=delete ; path=/.*short.*/
+
+ // locale=en ; action=add ; new_path=//ldml/localeDisplayNames/territories/territory[@type="PS"][@alt="short"] ; new_value=Palestine
// locale= af ; action=add ; new_path= //ldml/dates/fields/field[@type="second"]/relative[@type="0"] ; new_value= nou
- String fileWithoutSuffix = fileName.substring(0, fileName.length() - 4);
- String values2 = values.size() != 1 ? values.toString() : values.iterator().next();
+
+
+ int extensionPos = localeOrFile.lastIndexOf('.');
+ String fileWithoutSuffix = extensionPos >= 0 ? localeOrFile.substring(0, extensionPos) : localeOrFile;
+
+ String values2 = new_values == null ? null
+ : new_values.size() != 1 ? new_values.toString()
+ : new_values.iterator().next();
+
System.out.println("locale=" + fileWithoutSuffix
- + ";\taction=add"
- + ";\tnew_path=" + path
- + ";\tnew_value=" + escape(values2)
+ + ";\taction=" + configOption
+ + (match_value == null ? "" : ";\tvalue=" + escape(match_value))
+ + (match_path == null ? "" : ";\tpath=" + match_path)
+ + (values2 == null ? "" : ";\tnew_value=" + escape(values2))
+ + (new_path == null ? "" : ";\tnew_path=" + new_path)
+ (otherValues == null ? "" : ";\tother_value=" + otherValues));
}
static final Transliterator showInvisibles = Transliterator.getInstance("[[:whitespace:][:cf:]-[\\u0020]]hex/perl");
-
+
private static String escape(String source) {
return showInvisibles.transform(source);
}
diff --git a/tools/java/org/unicode/cldr/tool/ShowData.java b/tools/java/org/unicode/cldr/tool/ShowData.java
index 789781a..943a7e2 100644
--- a/tools/java/org/unicode/cldr/tool/ShowData.java
+++ b/tools/java/org/unicode/cldr/tool/ShowData.java
@@ -35,6 +35,7 @@
import org.unicode.cldr.util.LocaleIDParser;
import org.unicode.cldr.util.PathHeader;
import org.unicode.cldr.util.PathHeader.SectionId;
+import org.unicode.cldr.util.StringId;
import org.unicode.cldr.util.TransliteratorUtilities;
import com.ibm.icu.dev.tool.UOption;
@@ -61,7 +62,7 @@
UOption.DESTDIR().setDefault(CLDRPaths.CHART_DIRECTORY + "summary/"),
UOption.create("match", 'm', UOption.REQUIRES_ARG).setDefault(".*"),
UOption.create("getscript", 'g', UOption.NO_ARG),
- UOption.create("last", 'l', UOption.REQUIRES_ARG).setDefault(CLDRPaths.LAST_DIRECTORY + "common/main/"),
+ UOption.create("last", 'l', UOption.REQUIRES_ARG).setDefault(CLDRPaths.LAST_RELEASE_DIRECTORY + "common/main/"),
UOption.create("coverage", 'c', UOption.REQUIRES_ARG).setDefault(Level.MODERN.toString()),
};
@@ -100,7 +101,7 @@
// + "main/";
String targetDir = options[DESTDIR].value; // Utility.GEN_DIRECTORY +
// "main/";
- cldrFactory = Factory.make(sourceDir, ".*");
+ cldrFactory = CLDRConfig.getInstance().getMainAndAnnotationsFactory(); // ignore source directory for now
english = cldrFactory.make("en", true);
String lastSourceDir = options[LAST_DIR].value; // Utility.COMMON_DIRECTORY
@@ -233,7 +234,7 @@
getChartTemplate(
"Locale Data Summary for " + getLocaleNameAndCode(locale),
ToolConstants.CHART_DISPLAY_VERSION,
- "<script type='text/javascript'>" + System.lineSeparator()
+ "<script>" + System.lineSeparator()
+ "if (location.href.split('?')[1].split(',')[0]=='hide') {" + System.lineSeparator()
+ "document.write('<style>');" + System.lineSeparator()
+ "document.write('.xx {display:none}');" + System.lineSeparator()
@@ -330,7 +331,7 @@
(hide ? "<tr class='xx'><td" : "<tr><td")
+ statusClass
+ ">"
- + CldrUtility.getDoubleLinkedText(String.valueOf(++count))
+ + CldrUtility.getDoubleLinkedText(Long.toHexString(StringId.getId(path)), String.valueOf(++count))
+ addPart(oldParts == null ? null : oldParts.getSection(), prettyPath.getSection())
+ addPart(oldParts == null ? null : oldParts.getPage(), prettyPath.getPage())
+ addPart(oldParts == null ? null : oldParts.getHeader(), prettyPath.getHeader())
@@ -448,7 +449,6 @@
private static void getScripts() throws IOException {
Set<String> locales = cldrFactory.getAvailableLanguages();
Set<String> scripts = new TreeSet<String>();
- //XPathParts parts = new XPathParts();
Map<String, Map<String, Set<String>>> script_name_locales = new TreeMap<String, Map<String, Set<String>>>();
PrintWriter out = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY, "scriptNames.txt");
for (Iterator<String> it = locales.iterator(); it.hasNext();) {
diff --git a/tools/java/org/unicode/cldr/tool/ShowLanguages.java b/tools/java/org/unicode/cldr/tool/ShowLanguages.java
index 259d6ad..6b11496 100644
--- a/tools/java/org/unicode/cldr/tool/ShowLanguages.java
+++ b/tools/java/org/unicode/cldr/tool/ShowLanguages.java
@@ -80,7 +80,7 @@
import com.ibm.icu.util.ICUUncheckedIOException;
import com.ibm.icu.util.ULocale;
-@CLDRTool(alias = "showlanguages", description = "Generate Lanugage info charts")
+@CLDRTool(alias = "showlanguages", description = "Generate Language info charts")
public class ShowLanguages {
private static final boolean SHOW_NATIVE = true;
@@ -98,7 +98,7 @@
FileCopier.ensureDirectoryExists(FormattedFileWriter.CHART_TARGET_DIR);
FileCopier.copy(ShowLanguages.class, "index.css", FormattedFileWriter.CHART_TARGET_DIR);
FormattedFileWriter.copyIncludeHtmls(FormattedFileWriter.CHART_TARGET_DIR);
-
+
StringWriter sw = printLanguageData(cldrFactory, "index.html");
writeSupplementalIndex("index.html", sw);
@@ -126,6 +126,10 @@
new ChartLanguageMatching().writeChart(SUPPLEMENTAL_INDEX_ANCHORS);
new ChartLanguageGroups().writeChart(SUPPLEMENTAL_INDEX_ANCHORS);
new ChartSubdivisions().writeChart(SUPPLEMENTAL_INDEX_ANCHORS);
+ if (ToolConstants.CHART_VERSION.compareTo("37") >= 0) {
+ new ChartUnitConversions().writeChart(SUPPLEMENTAL_INDEX_ANCHORS);
+ new ChartUnitPreferences().writeChart(SUPPLEMENTAL_INDEX_ANCHORS);
+ }
// since we don't want these listed on the supplemental page, use null
@@ -182,7 +186,7 @@
linfo.printCharacters(pw);
pw.close();
-
+
return sw;
}
@@ -858,6 +862,8 @@
localeAliasInfo.put("variant", new TreeMap<String, String>());
localeAliasInfo.put("zone", new TreeMap<String, String>());
localeAliasInfo.put("subdivision", new TreeMap<String, String>());
+ localeAliasInfo.put("unit", new TreeMap<String, String>());
+ localeAliasInfo.put("usage", new TreeMap<String, String>());
localeAliasInfo.get("language").put("no", "nb");
localeAliasInfo.get("language").put("zh_CN", "zh_Hans_CN");
@@ -881,7 +887,12 @@
if (element.equals("timezone")) {
element = "zone";
}
- localeAliasInfo.get(element).put(type, replacement == null ? "?" : replacement);
+ try {
+ localeAliasInfo.get(element).put(type, replacement == null ? "?" : replacement);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ throw new IllegalArgumentException("Can't find alias data for '" + element + "'", e);
+ }
String name = "";
if (replacement == null) {
@@ -1493,7 +1504,7 @@
return " <span title='" + x.getOfficialStatus().toString().replace('_', ' ') + "'>{"
+ x.getOfficialStatus().toShortString() + "}</span>";
}
-
+
private String getRawOfficialStatus(String territoryCode, String languageCode) {
PopulationData x = supplementalDataInfo.getLanguageAndTerritoryPopulationData(languageCode, territoryCode);
if (x == null || x.getOfficialStatus() == OfficialStatus.unknown) return "";
diff --git a/tools/java/org/unicode/cldr/tool/ShowLocaleCoverage.java b/tools/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
index c6f460b..737ae59 100644
--- a/tools/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
+++ b/tools/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap;
@@ -75,12 +74,12 @@
import com.google.common.collect.Ordering;
import com.google.common.collect.TreeMultimap;
import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
import com.ibm.icu.impl.Relation;
import com.ibm.icu.impl.Row.R2;
import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.VersionInfo;
public class ShowLocaleCoverage {
private static final String VXML_CONSTANT = CLDRPaths.AUX_DIRECTORY + "voting/" + CLDRFile.GEN_VERSION + "/vxml/common/";
@@ -133,7 +132,7 @@
;
private static final String TSV_MISSING_BASIC_HEADER = "";
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG = true;
private static final char DEBUG_FILTER = 0; // use letter to only load locales starting with that letter
private static final String LATEST = ToolConstants.CHART_VERSION;
@@ -290,34 +289,48 @@
// break;
// }
// }
- Map<String, FoundAndTotal> latestData = addGrowth(factory, null, matcher, DEBUG);
- addCompletionList(getYearFromVersion(LATEST, false), getCompletion(latestData, latestData), growthData);
- if (DEBUG) System.out.println(latestData);
- //System.out.println(growthData);
- List<String> dirs = new ArrayList<>(Arrays.asList(new File(CLDRPaths.ARCHIVE_DIRECTORY).list()));
- Collections.reverse(dirs);
- for (String dir : dirs) {
- if (!dir.startsWith("cldr")) {
- continue;
- }
- String version = getNormalizedVersion(dir);
- if (version == null) {
- continue;
- }
-// if (version.compareTo("12") < 0) {
-// continue;
-// }
- System.out.println("Reading: " + version);
- if (version.equals("2008")) {
- int debug = 0;
- }
+ Map<String, FoundAndTotal> latestData = null;
+ for (ReleaseInfo versionNormalizedVersionAndYear : versionToYear) {
+ VersionInfo version = versionNormalizedVersionAndYear.version;
+ int year = versionNormalizedVersionAndYear.year;
+ String dir = ToolConstants.getBaseDirectory(version.getVersionString(2, 3));
Map<String, FoundAndTotal> currentData = addGrowth(factory, dir, matcher, false);
- System.out.println("Read: " + version + "\t" + currentData);
+ System.out.println("year: " + year + "; version: " + version + "; size: " + currentData);
+ if (latestData == null) {
+ latestData = currentData;
+ }
Counter2<String> completionData = getCompletion(latestData, currentData);
- //System.out.println(version + "\t" + completionData);
- addCompletionList(version, completionData, growthData);
+ addCompletionList(year+"", completionData, growthData);
if (DEBUG) System.out.println(currentData);
}
+// Map<String, FoundAndTotal> latestData = addGrowth(factory, null, matcher, false);
+// addCompletionList(getYearFromVersion(LATEST, false), getCompletion(latestData, latestData), growthData);
+// if (DEBUG) System.out.println(latestData);
+// //System.out.println(growthData);
+// List<String> dirs = new ArrayList<>(Arrays.asList(new File(CLDRPaths.ARCHIVE_DIRECTORY).list()));
+// Collections.reverse(dirs);
+// for (String dir : dirs) {
+// if (!dir.startsWith("cldr")) {
+// continue;
+// }
+// String version = getNormalizedVersion(dir);
+// if (version == null) {
+// continue;
+// }
+//// if (version.compareTo("12") < 0) {
+//// continue;
+//// }
+// System.out.println("Reading: " + version);
+// if (version.equals("2008")) {
+// int debug = 0;
+// }
+// Map<String, FoundAndTotal> currentData = addGrowth(factory, dir, matcher, false);
+// System.out.println("Read: " + version + "\t" + currentData);
+// Counter2<String> completionData = getCompletion(latestData, currentData);
+// //System.out.println(version + "\t" + completionData);
+// addCompletionList(version, completionData, growthData);
+// if (DEBUG) System.out.println(currentData);
+// }
boolean first = true;
for (Entry<String, List<Double>> entry : growthData.entrySet()) {
if (first) {
@@ -331,51 +344,73 @@
}
}
- static final Map<String, String> versionToYear = new HashMap<>();
+ static final class ReleaseInfo {
+ public ReleaseInfo(VersionInfo versionInfo, int year) {
+ this.version = versionInfo;
+ this.year = year;
+ }
+ VersionInfo version;
+ int year;
+ }
+
+ // TODO merge this into ToolConstants, and have the version expressed as VersionInfo.
+ static final List<ReleaseInfo> versionToYear;
static {
- int[][] mapping = {
- { 34, 2018 },
- { 32, 2017 },
- { 30, 2016 },
- { 28, 2015 },
- { 26, 2014 },
- { 24, 2013 },
- { 22, 2012 },
- { 20, 2011 },
- { 19, 2010 },
- { 17, 2009 },
- { 16, 2008 },
- { 15, 2007 },
- { 14, 2006 },
- { 13, 2005 },
- { 12, 2004 },
- { 10, 2003 },
+ Object[][] mapping = {
+ { VersionInfo.getInstance(37), 2020 },
+ { VersionInfo.getInstance(36), 2019 },
+ { VersionInfo.getInstance(34), 2018 },
+ { VersionInfo.getInstance(32), 2017 },
+ { VersionInfo.getInstance(30), 2016 },
+ { VersionInfo.getInstance(28), 2015 },
+ { VersionInfo.getInstance(26), 2014 },
+ { VersionInfo.getInstance(24), 2013 },
+ { VersionInfo.getInstance(22,1), 2012 },
+ { VersionInfo.getInstance(2,0,1), 2011 },
+ { VersionInfo.getInstance(1,9,1), 2010 },
+ { VersionInfo.getInstance(1,7,2), 2009 },
+ { VersionInfo.getInstance(1,6,1), 2008 },
+ { VersionInfo.getInstance(1,5,1), 2007 },
+ { VersionInfo.getInstance(1,4,1), 2006 },
+ { VersionInfo.getInstance(1,3), 2005 },
+ { VersionInfo.getInstance(1,2), 2004 },
+ { VersionInfo.getInstance(1,1,1), 2003 },
};
- for (int[] row : mapping) {
- versionToYear.put(String.valueOf(row[0]), String.valueOf(row[1]));
+ List<ReleaseInfo> _versionToYear = new ArrayList<>();
+ for (Object[] row : mapping) {
+ _versionToYear.add(new ReleaseInfo((VersionInfo)row[0], (int)row[1]));
}
+ versionToYear = ImmutableList.copyOf(_versionToYear);
}
- public static String getNormalizedVersion(String dir) {
- String rawVersion = dir.substring(dir.indexOf('-') + 1);
- int firstDot = rawVersion.indexOf('.');
- int secondDot = rawVersion.indexOf('.', firstDot + 1);
- if (secondDot > 0) {
- rawVersion = rawVersion.substring(0, firstDot) + rawVersion.substring(firstDot + 1, secondDot);
- } else {
- rawVersion = rawVersion.substring(0, firstDot);
- }
- String result = getYearFromVersion(rawVersion, true);
- return result == null ? null : result.toString();
- }
+// public static String getNormalizedVersion(String dir) {
+// String rawVersion = dir.substring(dir.indexOf('-') + 1);
+// int firstDot = rawVersion.indexOf('.');
+// int secondDot = rawVersion.indexOf('.', firstDot + 1);
+// if (secondDot > 0) {
+// rawVersion = rawVersion.substring(0, firstDot) + rawVersion.substring(firstDot + 1, secondDot);
+// } else {
+// rawVersion = rawVersion.substring(0, firstDot);
+// }
+// String result = getYearFromVersion(rawVersion, true);
+// return result == null ? null : result.toString();
+// }
- private static String getYearFromVersion(String version, boolean allowNull) {
- String result = versionToYear.get(version);
- if (!allowNull && result == null) {
- throw new IllegalArgumentException("No year for version: " + version);
- }
- return result;
- }
+// private static String getYearFromVersion(String version, boolean allowNull) {
+// String result = versionToYear.get(version);
+// if (!allowNull && result == null) {
+// throw new IllegalArgumentException("No year for version: " + version);
+// }
+// return result;
+// }
+//
+// private static String getVersionFromYear(String year, boolean allowNull) {
+// String result = versionToYear.inverse().get(year);
+// if (!allowNull && result == null) {
+// throw new IllegalArgumentException("No version for year: " + year);
+// }
+// return result;
+// }
public static void addCompletionList(String version, Counter2<String> completionData, TreeMap<String, List<Double>> growthData) {
List<Double> x = new ArrayList<>();
@@ -430,9 +465,10 @@
}
private static Map<String, FoundAndTotal> addGrowth(org.unicode.cldr.util.Factory latestFactory, String dir, Matcher matcher, boolean showMissing) {
- org.unicode.cldr.util.Factory newFactory = dir == null ? factory
- : org.unicode.cldr.util.Factory.make(
- CLDRPaths.ARCHIVE_DIRECTORY + "/" + dir + "/common/main/", ".*");
+ final File mainDir = new File(dir + "/common/main/");
+ final File annotationDir = new File(dir + "/common/annotations/");
+ File[] paths = annotationDir.exists() ? new File[] {mainDir, annotationDir} : new File[] {mainDir};
+ org.unicode.cldr.util.Factory newFactory = SimpleFactory.make(paths, ".*");
Map<String, FoundAndTotal> data = new HashMap<>();
char c = 0;
Set<String> latestAvailable = newFactory.getAvailableLanguages();
@@ -524,25 +560,6 @@
int debug = 0;
}
- // add annotations
- System.out.println(locale + " annotations");
- try {
- UnicodeMap<Annotations> annotations = dir == null ? Annotations.getData(locale)
- : Annotations.getData(CLDRPaths.ARCHIVE_DIRECTORY + "/" + dir + "/common/annotations/", locale);
- for (String cp : ENG_ANN) {
- Annotations annotation = annotations.get(cp);
- if (annotation == null) {
- missingCounter.add(Level.MODERN, 1);
- } else if (annotation.getShortName() == null) {
- missingCounter.add(Level.MODERN, 1);
- } else {
- foundCounter.add(Level.MODERN, 1);
- }
- }
- } catch (Exception e1) {
- missingCounter.add(Level.MODERN, ENG_ANN.size());
- }
-
data.put(locale, new FoundAndTotal(foundCounter, unconfirmedCounter, missingCounter));
}
return Collections.unmodifiableMap(data);
@@ -730,7 +747,7 @@
continue;
}
- CLDRFile vxmlCldrFile2 = getVxmlCldrFile(locale);
+ CLDRFile vxmlCldrFile2 = null; // getVxmlCldrFile(locale); TODO clean this up
tsv_summary.flush();
tsv_missing_summary.flush();
@@ -1265,23 +1282,23 @@
};
- static org.unicode.cldr.util.Factory VXML_FACTORY = SimpleFactory.make(new File[] {
- new File(VXML_CONSTANT + "main"),
- new File(VXML_CONSTANT + "annotations") }, ".*");
- static CLDRFile vxmlCldrFile;
- static String vxmlLocale = "";
+// static org.unicode.cldr.util.Factory VXML_FACTORY = SimpleFactory.make(new File[] {
+// new File(VXML_CONSTANT + "main"),
+// new File(VXML_CONSTANT + "annotations") }, ".*");
+ static CLDRFile vxmlCldrFile = null;
+// static String vxmlLocale = "";
- private static CLDRFile getVxmlCldrFile(String locale) {
- if (!vxmlLocale.equals(locale)) {
- try {
- vxmlCldrFile = VXML_FACTORY.make(locale, false);
- } catch (Exception e) {
- vxmlCldrFile = null;
- }
- vxmlLocale = locale;
- }
- return vxmlCldrFile;
- }
+// private static CLDRFile getVxmlCldrFile(String locale) {
+// if (!vxmlLocale.equals(locale)) {
+// try {
+// vxmlCldrFile = VXML_FACTORY.make(locale, false);
+// } catch (Exception e) {
+// vxmlCldrFile = null;
+// }
+// vxmlLocale = locale;
+// }
+// return vxmlCldrFile;
+// }
public static void gatherStarred(String path, Counter<String> starredCounter) {
starredCounter.add(new PathStarrer().setSubstitutionPattern("*").set(path), 1);
diff --git a/tools/java/org/unicode/cldr/tool/ToolConstants.java b/tools/java/org/unicode/cldr/tool/ToolConstants.java
index 026103a..09a1272 100644
--- a/tools/java/org/unicode/cldr/tool/ToolConstants.java
+++ b/tools/java/org/unicode/cldr/tool/ToolConstants.java
@@ -1,10 +1,14 @@
package org.unicode.cldr.tool;
import java.util.List;
+import java.util.Set;
+import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.CldrUtility;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.ibm.icu.util.VersionInfo;
/**
* Constants specific to CLDR tools.
@@ -22,27 +26,7 @@
release // for release version
}
- // Change the following for each release depending on the phase
-
- private static final String DEFAULT_CHART_VERSION = "37";
- public static final String CHART_DISPLAY_VERSION = "37β";
- public static final String LAST_RELEASE_VERSION = "36";
-
- private static final ChartStatus DEFAULT_CHART_STATUS = ChartStatus.beta;
-
- // DON'T CHANGE ANY OF THE FOLLOWING; THEY ARE DRIVEN BY THE ABOVE
-
- // allows overriding with -D
- public static final String CHART_VERSION = CldrUtility.getProperty("CHART_VERSION", DEFAULT_CHART_VERSION);
- public static final String LAST_CHART_VERSION = Integer.parseInt(CHART_VERSION) + ".0"; // must have 1 decimal
- public static final ChartStatus CHART_STATUS = !CHART_VERSION.equals(DEFAULT_CHART_VERSION) ? ChartStatus.release
- : ChartStatus.valueOf(CldrUtility.getProperty("CHART_STATUS", DEFAULT_CHART_STATUS.toString()));
-
- // build from the above
- public static final boolean BETA = CHART_STATUS == ChartStatus.beta;
- public static final String CHART_SOURCE = "http://unicode.org/repos/cldr/"
- + (CHART_STATUS != ChartStatus.release ? "trunk/" : "tags/release-" + CHART_VERSION + "/");
-
+ // TODO change this to a list of VersionInfos, add add in the ShowLocaleCoverage years.
public static final List<String> CLDR_VERSIONS = ImmutableList.of(
"1.1.1",
"1.2",
@@ -70,18 +54,63 @@
"33.1",
"34.0",
"35.0",
- "35.1"
- // add to this once the release is final!
- );
- public static final String PREVIOUS_CHART_VERSION;
- static {
+ "35.1",
+ "36.0",
+ "36.1"
+ // add to this once the release is final!
+ );
+ public static final String DEV_VERSION = "37";
+
+ public static final Set<String> CLDR_RELEASE_VERSION_SET = ImmutableSet.copyOf(ToolConstants.CLDR_VERSIONS);
+ public static final Set<String> CLDR_RELEASE_AND_DEV_VERSION_SET = ImmutableSet.<String>builder().addAll(CLDR_RELEASE_VERSION_SET).add(DEV_VERSION).build();
+
+ public static String previousVersion(String version) {
String last = "";
for (String current : CLDR_VERSIONS) {
- if (current.equals(LAST_CHART_VERSION)) {
+ if (current.equals(version)) {
break;
}
last = current;
}
- PREVIOUS_CHART_VERSION = last;
+ return last;
}
+
+ public static String getBaseDirectory(String version) {
+ if (version.equals(DEV_VERSION) || version.equals(DEV_VERSION + ".0")) {
+ return CLDRPaths.BASE_DIRECTORY;
+ } else if (CLDR_RELEASE_VERSION_SET.contains(version)) {
+ return CLDRPaths.ARCHIVE_DIRECTORY + "cldr-" + version + "/";
+ } else {
+ throw new IllegalArgumentException("not a known version: " + version);
+ }
+ }
+
+ // allows overriding with -D
+ public static final String CHART_VERSION = CldrUtility.getProperty("CHART_VERSION", DEV_VERSION);
+ public static final VersionInfo CHART_VI = VersionInfo.getInstance(CHART_VERSION);
+
+ public static final String PREV_CHART_VERSION = CldrUtility.getProperty("PREV_CHART_VERSION", previousVersion(CHART_VERSION));
+ public static final VersionInfo PREV_CHART_VI = VersionInfo.getInstance(PREV_CHART_VERSION);
+ public static final String PREV_CHART_VERSION_WITH0 = PREV_CHART_VI.getVersionString(2, 2); // must have 1 decimal
+
+ public static final ChartStatus CHART_STATUS = ChartStatus.valueOf(CldrUtility.getProperty("CHART_STATUS",
+ CLDR_RELEASE_VERSION_SET.contains(CHART_VERSION)
+ ? "release"
+ : "beta"));
+ public static final boolean BETA = CHART_STATUS == ChartStatus.beta;
+
+ // DON'T CHANGE ANY OF THE FOLLOWING DEFINITIONS; THEY ARE DRIVEN BY THE ABOVE
+
+ public static final String CHART_DISPLAY_VERSION = CHART_VI.getVersionString(2, 2) + (BETA ? "β" : "");
+
+ public static final String LAST_RELEASE_VERSION = CLDR_VERSIONS.get(CLDR_VERSIONS.size()-1);
+ public static final VersionInfo LAST_RELEASE_VI = VersionInfo.getInstance(LAST_RELEASE_VERSION);
+ public static final String LAST_RELEASE_VERSION_WITH0 = LAST_RELEASE_VI.getVersionString(2, 2); // must have 1 decimal
+
+
+ //public static final String CHART_SOURCE_DIRECTORY = CLDR_VERSIONS.contains(CHART_VERSION) ? ""
+
+ public static final String CHART_SOURCE = "http://unicode.org/repos/cldr/"
+ + (CHART_STATUS != ChartStatus.release ? "trunk/" : "tags/release-" + CHART_VERSION + "/");
+
}
diff --git a/tools/java/org/unicode/cldr/tool/VettingAdder.java b/tools/java/org/unicode/cldr/tool/VettingAdder.java
index 5557a07..c3d18f8 100644
--- a/tools/java/org/unicode/cldr/tool/VettingAdder.java
+++ b/tools/java/org/unicode/cldr/tool/VettingAdder.java
@@ -362,8 +362,6 @@
return "<" + current + ">" + (other.equals(current) ? "" : "\t[" + other + "]");
}
- XPathParts tempParts = new XPathParts();
-
/**
*
*/
diff --git a/tools/java/org/unicode/cldr/tool/XMLModify.java b/tools/java/org/unicode/cldr/tool/XMLModify.java
index adc278f..399237b 100644
--- a/tools/java/org/unicode/cldr/tool/XMLModify.java
+++ b/tools/java/org/unicode/cldr/tool/XMLModify.java
@@ -76,7 +76,7 @@
}
data.clear();
out.println(file);
- XPathParts lastParts = new XPathParts();
+ XPathParts lastParts = null;
for (Pair<String, String> pathValue : XMLFileReader.loadPathValues(
sourceDirectory.toString() + "/" + file, data, true, true)) {
String value = pathValue.getSecond();
diff --git a/tools/java/org/unicode/cldr/tool/bytype-index.html b/tools/java/org/unicode/cldr/tool/bytype-index.html
index da82265..42046f2 100644
--- a/tools/java/org/unicode/cldr/tool/bytype-index.html
+++ b/tools/java/org/unicode/cldr/tool/bytype-index.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>By-Type Charts</title>
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
<style>
.th, .td {
diff --git a/tools/java/org/unicode/cldr/tool/chart-template.html b/tools/java/org/unicode/cldr/tool/chart-template.html
index ec9e3cb..d2bae0a 100644
--- a/tools/java/org/unicode/cldr/tool/chart-template.html
+++ b/tools/java/org/unicode/cldr/tool/chart-template.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>%title%</title>
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
%header%
</head>
@@ -57,7 +57,7 @@
</div>
-->
%body%
- <script type="text/javascript">
+ <script>
(function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() {
diff --git a/tools/java/org/unicode/cldr/tool/keyboards-index.html b/tools/java/org/unicode/cldr/tool/keyboards-index.html
index dc74284..2057815 100644
--- a/tools/java/org/unicode/cldr/tool/keyboards-index.html
+++ b/tools/java/org/unicode/cldr/tool/keyboards-index.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>By-Type Charts</title>
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
</head>
diff --git a/tools/java/org/unicode/cldr/tool/main-index.html b/tools/java/org/unicode/cldr/tool/main-index.html
index ed2aa9c..51ac3da 100644
--- a/tools/java/org/unicode/cldr/tool/main-index.html
+++ b/tools/java/org/unicode/cldr/tool/main-index.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>CLDR Charts</title>
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
<style type="text/css">
.sub {
diff --git a/tools/java/org/unicode/cldr/tool/modify_config.txt b/tools/java/org/unicode/cldr/tool/modify_config.txt
index 29476ef..f2af29a 100644
--- a/tools/java/org/unicode/cldr/tool/modify_config.txt
+++ b/tools/java/org/unicode/cldr/tool/modify_config.txt
@@ -1,656 +1,183 @@
-locale=jv ; action=add ; new_path=3cead67f8ae5f035 ; new_value=Aghem
-locale=jv ; action=add ; new_path=260fb6c0c0209dde ; new_value=Akan
-locale=jv ; action=add ; new_path=915e508f496400f ; new_value=Amharik
-locale=jv ; action=add ; new_path=3eadc7346e0f5a88 ; new_value=Assam
-locale=jv ; action=add ; new_path=3a379e77aa91e890 ; new_value=Asu
-locale=jv ; action=add ; new_path=712372f760f980ec ; new_value=Asturia
-locale=jv ; action=add ; new_path=77492b7d377d4cdc ; new_value=Azerbaijan
-locale=jv ; action=add ; new_path=700f7be0e77ae39b ; new_value=Azeri
-locale=jv ; action=add ; new_path=363b4a1231433e8e ; new_value=Basaa
-locale=jv ; action=add ; new_path=78131d73be3d98fc ; new_value=Bemba
-locale=jv ; action=add ; new_path=32451966d1f7aef4 ; new_value=Bena
-locale=jv ; action=add ; new_path=4043f9a38addbfa3 ; new_value=Bulgaria
-locale=jv ; action=add ; new_path=6652c68f31a11fc2 ; new_value=Bambara
-locale=jv ; action=add ; new_path=6b1ab5b44fce9439 ; new_value=Tibet
-locale=jv ; action=add ; new_path=36bce4a589cda397 ; new_value=Breton
-locale=jv ; action=add ; new_path=71bc62ac1e0cf095 ; new_value=Bodo
-locale=jv ; action=add ; new_path=1c23cd54efee68be ; new_value=Katala
-locale=jv ; action=add ; new_path=3f83d49e35c35b84 ; new_value=Chechen
-locale=jv ; action=add ; new_path=54d2b8a6b397496b ; new_value=Cebuano
-locale=jv ; action=add ; new_path=1c0523cb51571abf ; new_value=Chiga
-locale=jv ; action=add ; new_path=542282d19f00853a ; new_value=Cherokee
-locale=jv ; action=add ; new_path=50b99c1c6d99711a ; new_value=Kurdi Tengah
-locale=jv ; action=add ; new_path=5554afc2db31ec ; new_value=Ceska
-locale=jv ; action=add ; new_path=1b6a513bdd9366f6 ; new_value=Slavia Gerejani
-locale=jv ; action=add ; new_path=18d077fb3707f076 ; new_value=Welsh
-locale=jv ; action=add ; new_path=6e2cb9ff29966dd5 ; new_value=Dansk
-locale=jv ; action=add ; new_path=7ced680afcd3ea58 ; new_value=Taita
-locale=jv ; action=add ; new_path=6431e2cf519dbc25 ; new_value=Zarma
-locale=jv ; action=add ; new_path=314ca97c10005996 ; new_value=Sorbia Non Standar
-locale=jv ; action=add ; new_path=3e111437db578d13 ; new_value=Duala
-locale=jv ; action=add ; new_path=6cf3b18334ed42b9 ; new_value=Jola-Fonyi
-locale=jv ; action=add ; new_path=4638afb109d2a2a0 ; new_value=Dzongkha
-locale=jv ; action=add ; new_path=30a457dd18d12da5 ; new_value=Embu
-locale=jv ; action=add ; new_path=62714a048ae10b6d ; new_value=Ewe
-locale=jv ; action=add ; new_path=53466a41920bfb38 ; new_value=Yunani
-locale=jv ; action=add ; new_path=1e6d8bbd5bd099c3 ; new_value=Esperanto
-locale=jv ; action=add ; new_path=29f87eb18dd7b2c4 ; new_value=Estonia
-locale=jv ; action=add ; new_path=2f7241270abf74fe ; new_value=Basque
-locale=jv ; action=add ; new_path=6ca47d28c298307c ; new_value=Ewondo
-locale=jv ; action=add ; new_path=27ae477903db4cc5 ; new_value=Persia
-locale=jv ; action=add ; new_path=7511a7ce7799fa0b ; new_value=Fulah
-locale=jv ; action=add ; new_path=4ab3781d227fcc46 ; new_value=Suomi
-locale=jv ; action=add ; new_path=c60c794b9117678 ; new_value=Tagalog
-locale=jv ; action=add ; new_path=19d11638f3609fe2 ; new_value=Faroe
-locale=jv ; action=add ; new_path=711d47cf80ab2975 ; new_value=Friulian
-locale=jv ; action=add ; new_path=540b398996b10ce0 ; new_value=Frisia Sisih Kulon
-locale=jv ; action=add ; new_path=22d9a449ce423c86 ; new_value=Irlandia
-locale=jv ; action=add ; new_path=61d61eb1fac7334c ; new_value=Gaulia
-locale=jv ; action=add ; new_path=58ff4884012bc33c ; new_value=Galisia
-locale=jv ; action=add ; new_path=225d5b8bb41c393 ; new_value=Jerman Swiss
-locale=jv ; action=add ; new_path=624d411afbecf6d0 ; new_value=Gujarat
-locale=jv ; action=add ; new_path=75718153ac1fcffe ; new_value=Gusii
-locale=jv ; action=add ; new_path=e593c3d7aae2b4c ; new_value=Manx
-locale=jv ; action=add ; new_path=1bfed8354572ada7 ; new_value=Hausa
-locale=jv ; action=add ; new_path=a3387025dca9a75 ; new_value=Hawaii
-locale=jv ; action=add ; new_path=180597b3001bb512 ; new_value=Ibrani
-locale=jv ; action=add ; new_path=3b393c95a6a52b4 ; new_value=Hmong
-locale=jv ; action=add ; new_path=6d43fe9eadc50e89 ; new_value=Kroasia
-locale=jv ; action=add ; new_path=6211129ff91d5c1a ; new_value=Sorbia Standar
-locale=jv ; action=add ; new_path=272eed2d2ee6437c ; new_value=Kreol Haiti
-locale=jv ; action=add ; new_path=5deafb1039de64ce ; new_value=Hungaria
-locale=jv ; action=add ; new_path=330672f4af32be9e ; new_value=Armenia
-locale=jv ; action=add ; new_path=52c570431102520b ; new_value=Interlingua
-locale=jv ; action=add ; new_path=47982bfd607379be ; new_value=Iqbo
-locale=jv ; action=add ; new_path=41fb418f571bee44 ; new_value=Sichuan Yi
-locale=jv ; action=add ; new_path=328d19a24f30b22a ; new_value=Islandia
-locale=jv ; action=add ; new_path=4b817a850faaae99 ; new_value=Ngomba
-locale=jv ; action=add ; new_path=6203845e317e2d85 ; new_value=Machame
-locale=jv ; action=add ; new_path=39dcb243fa1a2799 ; new_value=Georgia
-locale=jv ; action=add ; new_path=787d4e0576d7869a ; new_value=Kabyle
-locale=jv ; action=add ; new_path=226f4f0ad2a704ca ; new_value=Kamba
-locale=jv ; action=add ; new_path=53b4740121e84442 ; new_value=Makonde
-locale=jv ; action=add ; new_path=55808175c5b3dc2e ; new_value=Kabuverdianu
-locale=jv ; action=add ; new_path=38b92fe120d6f6b ; new_value=Koyra Chiini
-locale=jv ; action=add ; new_path=368dfa74f098b6b4 ; new_value=Kikuyu
-locale=jv ; action=add ; new_path=112f31d1a00b0f68 ; new_value=Kazakh
-locale=jv ; action=add ; new_path=6fc8fec9b8eb4953 ; new_value=Kako
-locale=jv ; action=add ; new_path=177b4a63294e3b03 ; new_value=Kalaallisut
-locale=jv ; action=add ; new_path=4bc4961de6a2c98 ; new_value=Kalenjin
-locale=jv ; action=add ; new_path=2fbc2bad8455322f ; new_value=Khmer
-locale=jv ; action=add ; new_path=3e98e22746c3e98b ; new_value=Kannada
-locale=jv ; action=add ; new_path=20b2b09614854000 ; new_value=Konkani
-locale=jv ; action=add ; new_path=1a13d2b147817161 ; new_value=Kashmiri
-locale=jv ; action=add ; new_path=31a9c7cfaa07ea4a ; new_value=Shambala
-locale=jv ; action=add ; new_path=45b9b33240d14336 ; new_value=Bafia
-locale=jv ; action=add ; new_path=4f0f83cd65f2f0c9 ; new_value=Colonia
-locale=jv ; action=add ; new_path=65b3e3fbf6497a70 ; new_value=Kurdis
-locale=jv ; action=add ; new_path=3dea8d141af8e7cd ; new_value=Kernowek
-locale=jv ; action=add ; new_path=72e5e103f39e1d8d ; new_value=Kirgis
-locale=jv ; action=add ; new_path=551fdd4693933c68 ; new_value=Latin
-locale=jv ; action=add ; new_path=d7c07f679d8e8d9 ; new_value=Langi
-locale=jv ; action=add ; new_path=45fc5f0dad6a5c6f ; new_value=Luksemburg
-locale=jv ; action=add ; new_path=7c0c2d74318d9b6a ; new_value=Ganda
-locale=jv ; action=add ; new_path=42992308733c69c7 ; new_value=Lakota
-locale=jv ; action=add ; new_path=7d3c622b3fc262bf ; new_value=Lingala
-locale=jv ; action=add ; new_path=49a6caf88e79daf1 ; new_value=Laos
-locale=jv ; action=add ; new_path=24efc5b3f250c109 ; new_value=Luri Sisih Lor
-locale=jv ; action=add ; new_path=263c441f26477aed ; new_value=Lithuania
-locale=jv ; action=add ; new_path=40090f0ac3ec29a ; new_value=Luba-Katanga
-locale=jv ; action=add ; new_path=3618e81356424116 ; new_value=Luo
-locale=jv ; action=add ; new_path=7e6ceca020f97dfc ; new_value=Luyia
-locale=jv ; action=add ; new_path=774230f76f27a54e ; new_value=Latvia
-locale=jv ; action=add ; new_path=3c00e76f2f2243b2 ; new_value=Masai
-locale=jv ; action=add ; new_path=19750adde5c2ae55 ; new_value=Meru
-locale=jv ; action=add ; new_path=79f760b3e249653a ; new_value=Morisyen
-locale=jv ; action=add ; new_path=97b58d26c0f4788 ; new_value=Malagasi
-locale=jv ; action=add ; new_path=5c9c911d5399c27b ; new_value=Makhuwa-Meeto
-locale=jv ; action=add ; new_path=2f4277862f1c0356 ; new_value=Meta’
-locale=jv ; action=add ; new_path=2acb45a2de6dc6fd ; new_value=Maori
-locale=jv ; action=add ; new_path=5d555e2ebacd93a1 ; new_value=Makedonia
-locale=jv ; action=add ; new_path=78f3e3087c24ba23 ; new_value=Malayalam
-locale=jv ; action=add ; new_path=6cc7bc4d6c007adb ; new_value=Mongolia
-locale=jv ; action=add ; new_path=1aed5a1643015693 ; new_value=Marathi
-locale=jv ; action=add ; new_path=60cebbd62a97fafe ; new_value=Melayu
-locale=jv ; action=add ; new_path=132345490064d839 ; new_value=Malta
-locale=jv ; action=add ; new_path=2b1793551ea84657 ; new_value=Mundang
-locale=jv ; action=add ; new_path=63ef268c21be0de8 ; new_value=Basa Multilingua
-locale=jv ; action=add ; new_path=54e3296486522ab ; new_value=Myanmar
-locale=jv ; action=add ; new_path=64bcc87907a7770 ; new_value=Mazanderani
-locale=jv ; action=add ; new_path=2b2f7a4d96be9f54 ; new_value=Nama
-locale=jv ; action=add ; new_path=2566ff8501493d16 ; new_value=Bokmål Norwegia
-locale=jv ; action=add ; new_path=9fd988164b08fc8 ; new_value=Ndebele Lor
-locale=jv ; action=add ; new_path=2b2fd7b13c51ef5c ; new_value=Jerman Non Standar
-locale=jv ; action=add ; new_path=32b0b69a09157bbf ; new_value=Nepal
-locale=jv ; action=add ; new_path=79d3a6aa99001871 ; new_value=Kwasio
-locale=jv ; action=add ; new_path=792dd7c07ea28773 ; new_value=Nynorsk Norwegia
-locale=jv ; action=add ; new_path=31aaa5e94dfaf0c2 ; new_value=Ngiemboon
-locale=jv ; action=add ; new_path=795be316eb537f02 ; new_value=Nuer
-locale=jv ; action=add ; new_path=45e506fa5eb1ee1f ; new_value=Nyanja
-locale=jv ; action=add ; new_path=2b89d34dcd2bcacc ; new_value=Nyankole
-locale=jv ; action=add ; new_path=792cf766be4ee1b7 ; new_value=Oromo
-locale=jv ; action=add ; new_path=cf769b80fd464b6 ; new_value=Odia
-locale=jv ; action=add ; new_path=65f8b487e67b0105 ; new_value=Ossetia
-locale=jv ; action=add ; new_path=71d9512673af4fed ; new_value=Punjab
-locale=jv ; action=add ; new_path=471b961b1c211855 ; new_value=Prusia
-locale=jv ; action=add ; new_path=54c951371ac8b6c7 ; new_value=Pashto
-locale=jv ; action=add ; new_path=7aa207022dcaec02 ; new_value=Quechua
-locale=jv ; action=add ; new_path=48798930a280653 ; new_value=Roman
-locale=jv ; action=add ; new_path=79bbf6d8cef4c15e ; new_value=Rundi
-locale=jv ; action=add ; new_path=d6e5e995515c60d ; new_value=Rumania
-locale=jv ; action=add ; new_path=13019ec0562b3141 ; new_value=Rombo
-locale=jv ; action=add ; new_path=661a714e916f35f0 ; new_value=Kinyarwanda
-locale=jv ; action=add ; new_path=2cd2ed6bc89a3595 ; new_value=Rwa
-locale=jv ; action=add ; new_path=5a363be3694a31e6 ; new_value=Sanskerta
-locale=jv ; action=add ; new_path=79262aa5d69820da ; new_value=Sakha
-locale=jv ; action=add ; new_path=3efdd2f06c7baf90 ; new_value=Samburu
-locale=jv ; action=add ; new_path=6a467f72d4840ad1 ; new_value=Sangu
-locale=jv ; action=add ; new_path=155dedef6e647c42 ; new_value=Sindhi
-locale=jv ; action=add ; new_path=5461ee0391d38394 ; new_value=Sami Sisih Lor
-locale=jv ; action=add ; new_path=5a78b41291324b49 ; new_value=Sena
-locale=jv ; action=add ; new_path=17a57cd8d4b03258 ; new_value=Koyraboro Senni
-locale=jv ; action=add ; new_path=eee63f654bc9d52 ; new_value=Sango
-locale=jv ; action=add ; new_path=5098b563976c6487 ; new_value=Tachelhit
-locale=jv ; action=add ; new_path=6b773b0f539e5dc6 ; new_value=Sinhala
-locale=jv ; action=add ; new_path=7cc18dc944091dcc ; new_value=Slowakia
-locale=jv ; action=add ; new_path=4d1dc9ed361b4929 ; new_value=Slovenia
-locale=jv ; action=add ; new_path=6df3e69286c235a6 ; new_value=Samoa
-locale=jv ; action=add ; new_path=208e8e1d7e2d8cff ; new_value=Inari Sami
-locale=jv ; action=add ; new_path=5bc1a72a40d233b5 ; new_value=Shona
-locale=jv ; action=add ; new_path=10eb13880a94007d ; new_value=Somalia
-locale=jv ; action=add ; new_path=2fa5e0b1e0e28119 ; new_value=Albania
-locale=jv ; action=add ; new_path=48b1a6b6c8ff0e3d ; new_value=Serbia
-locale=jv ; action=add ; new_path=2efb6c27a0e9aeb7 ; new_value=Sotho Sisih Kidul
-locale=jv ; action=add ; new_path=637d62ab17744526 ; new_value=Sunda
-locale=jv ; action=add ; new_path=7c87f3e9e0b63e00 ; new_value=Swedia
-locale=jv ; action=add ; new_path=7be8622a98282099 ; new_value=Swahili
-locale=jv ; action=add ; new_path=2d28859e81f3417e ; new_value=Tamil
-locale=jv ; action=add ; new_path=6bd210400dee4a6b ; new_value=Telugu
-locale=jv ; action=add ; new_path=539c9c990236ecc4 ; new_value=Teso
-locale=jv ; action=add ; new_path=30a9f9ea95918d38 ; new_value=Tajik
-locale=jv ; action=add ; new_path=5a374072ff248c3b ; new_value=Tigrinya
-locale=jv ; action=add ; new_path=4824aa6123aacc2d ; new_value=Turkmen
-locale=jv ; action=add ; new_path=1a160f94b4510f18 ; new_value=Tonga
-locale=jv ; action=add ; new_path=6bc756bf2c1bef1b ; new_value=Tatar
-locale=jv ; action=add ; new_path=63a4e7dbb39b971a ; new_value=Tasawaq
-locale=jv ; action=add ; new_path=346e71a8ed4de6f8 ; new_value=Tamazight Atlas Tengah
-locale=jv ; action=add ; new_path=225ff9e3cefec9bd ; new_value=Uighur
-locale=jv ; action=add ; new_path=75393258331b48a0 ; new_value=Ukraina
-locale=jv ; action=add ; new_path=1beb8b90c4a67343 ; new_value=Urdu
-locale=jv ; action=add ; new_path=2d1f41f43801dd1e ; new_value=Uzbek
-locale=jv ; action=add ; new_path=44287b6d4782bc24 ; new_value=Vai
-locale=jv ; action=add ; new_path=6d7c2e37642dad22 ; new_value=Vietnam
-locale=jv ; action=add ; new_path=65d16c714451f65c ; new_value=Volapuk
-locale=jv ; action=add ; new_path=510b958d69238fa8 ; new_value=Vunjo
-locale=jv ; action=add ; new_path=65ea482b4aaa13ee ; new_value=Walser
-locale=jv ; action=add ; new_path=4ccfa5f7e24388e3 ; new_value=Wolof
-locale=jv ; action=add ; new_path=7ef6e1bd36729755 ; new_value=Xhosa
-locale=jv ; action=add ; new_path=2fe3926f99b24189 ; new_value=Soga
-locale=jv ; action=add ; new_path=7bdb5846c29ba0e5 ; new_value=Yangben
-locale=jv ; action=add ; new_path=437c34b3643ed6c9 ; new_value=Yiddish
-locale=jv ; action=add ; new_path=7c2109b9de953216 ; new_value=Yoruba
-locale=jv ; action=add ; new_path=42df77a4fd7f5609 ; new_value=Kanton
-locale=jv ; action=add ; new_path=691f93d26aa315b7 ; new_value=Tamazight Moroko Standar
-locale=jv ; action=add ; new_path=450e2a2d29eab88d ; new_value=Zulu
-locale=jv ; action=add ; new_path=4ad9dcac005a90bc ; new_value=Konten tanpa linguistik
-locale=jv ; action=add ; new_path=26a9d1787aee96d5 ; new_value=Armenia
-locale=jv ; action=add ; new_path=3021d1652fc6a8c2 ; new_value=Bangla
-locale=jv ; action=add ; new_path=4ce0dc5a5581cf88 ; new_value=Bopomofo
-locale=jv ; action=add ; new_path=26e66c5cd72714a4 ; new_value=Braille
-locale=jv ; action=add ; new_path=6d08cbf4ce49f32b ; new_value=Devanagari
-locale=jv ; action=add ; new_path=7e3969525a51a0bf ; new_value=Ethiopik
-locale=jv ; action=add ; new_path=1084d72d1f2f5e68 ; new_value=Georgia
-locale=jv ; action=add ; new_path=b806d13710e0300 ; new_value=Yunani
-locale=jv ; action=add ; new_path=2f9eff302a5d3ff4 ; new_value=Gujarati
-locale=jv ; action=add ; new_path=78e9461e0014b93f ; new_value=Gurmukhi
-locale=jv ; action=add ; new_path=7b04b11e60590853 ; new_value=Han nganggo Bopomofo
-locale=jv ; action=add ; new_path=7ad00979b08041a ; new_value=Hangul
-locale=jv ; action=add ; new_path=6b160f4d80404d7a ; new_value=Ibrani
-locale=jv ; action=add ; new_path=3f0671a838d2fe81 ; new_value=Hiragana
-locale=jv ; action=add ; new_path=15c86698d964fdf ; new_value=Silabaris Jepang
-locale=jv ; action=add ; new_path=4bf7c7a6642bedfb ; new_value=Katakana
-locale=jv ; action=add ; new_path=31189f9fcf0a5be5 ; new_value=Khmer
-locale=jv ; action=add ; new_path=7185cb4a31a9caf6 ; new_value=Kannada
-locale=jv ; action=add ; new_path=50c609bb9a6a3886 ; new_value=Lao
-locale=jv ; action=add ; new_path=55c3a8c37b4eb82b ; new_value=Malayalam
-locale=jv ; action=add ; new_path=12682ec96dcea3bc ; new_value=Mongolia
-locale=jv ; action=add ; new_path=7f571610fd23503b ; new_value=Myanmar
-locale=jv ; action=add ; new_path=75a446f3251b5409 ; new_value=Odia
-locale=jv ; action=add ; new_path=7459eb903ee90b2f ; new_value=Sinhala
-locale=jv ; action=add ; new_path=3c49bd4a185dcb6a ; new_value=Tamil
-locale=jv ; action=add ; new_path=762b02b69034a08f ; new_value=Thaana
-locale=jv ; action=add ; new_path=402a7a5033096971 ; new_value=Tibetan
-locale=jv ; action=add ; new_path=4906be2d11c0b6bc ; new_value=Notasi Matematika
-locale=jv ; action=add ; new_path=6e3f50cd8d887621 ; new_value=Emoji
-locale=jv ; action=add ; new_path=27c9e428b64f55ec ; new_value=Simbol
-locale=jv ; action=add ; new_path=4b4b52bfb8751d1 ; new_value=Umum
-locale=jv ; action=add ; new_path=11a56646021b1e86 ; new_value=Tanggalan
-locale=jv ; action=add ; new_path=3b3b733148d0064d ; new_value=Format Mata Uang
-locale=jv ; action=add ; new_path=7a1056a90b3241b ; new_value=Urutan Pamilahan
-locale=jv ; action=add ; new_path=245e7472329f5da1 ; new_value=Mata Uang
-locale=jv ; action=add ; new_path=142e73381c19bfaf ; new_value=Siklus Jam (12 vs 24)
-locale=jv ; action=add ; new_path=45fd4ee5c7a3beb5 ; new_value=Gaya Ganti Baris
-locale=jv ; action=add ; new_path=77945b5b012ea902 ; new_value=Sistem Pangukuran
-locale=jv ; action=add ; new_path=112a45fe2e62d0de ; new_value=Angka
-locale=jv ; action=add ; new_path=641a8b6db7be7147 ; new_value=Tanggalan Buddha
-locale=jv ; action=add ; new_path=1e434d4fec531245 ; new_value=Tanggalan Cina
-locale=jv ; action=add ; new_path=95f1aa237f97285 ; new_value=Tanggalan Dangi
-locale=jv ; action=add ; new_path=594b6cd09ff2587c ; new_value=Tanggalan Etiopia
-locale=jv ; action=add ; new_path=4600f8c0985002e3 ; new_value=Tanggalan Ibrani
-locale=jv ; action=add ; new_path=3df52b1e4d65309a ; new_value=Tanggalan Islam
-locale=jv ; action=add ; new_path=5221727959e5fe7a ; new_value=Tanggalan Jepang
-locale=jv ; action=add ; new_path=e2df5d37fd43257 ; new_value=Tanggalan Persia
-locale=jv ; action=add ; new_path=6ddc07b95d93f621 ; new_value=Tanggalan Minguo
-locale=jv ; action=add ; new_path=1367016ec0927785 ; new_value=Format Mata Uang Akuntansi
-locale=jv ; action=add ; new_path=652417fe9333357f ; new_value=Format Mata Uang Standar
-locale=jv ; action=add ; new_path=6d507d87147fdffc ; new_value=Urutan Pamilahan Unicode Default
-locale=jv ; action=add ; new_path=23637d4b1cff7632 ; new_value=Panlusuran Tujuan Umum
-locale=jv ; action=add ; new_path=74b0407e0866025 ; new_value=Sistem 12 Jam (0–11)
-locale=jv ; action=add ; new_path=597159a595134cb9 ; new_value=Sistem 12 Jam (1–12)
-locale=jv ; action=add ; new_path=b7da0bb568a1870 ; new_value=Sistem 24 Jam (0–23)
-locale=jv ; action=add ; new_path=6e186bd24551ac94 ; new_value=Sistem 24 Jam (1–24)
-locale=jv ; action=add ; new_path=282cce0efeef5811 ; new_value=Gaya Ganti Baris Longgar
-locale=jv ; action=add ; new_path=5f8cfa615c2855f ; new_value=Gaya Ganti Baris Normal
-locale=jv ; action=add ; new_path=fd4740ef0421490 ; new_value=Gaya Ganti Baris Strik
-locale=jv ; action=add ; new_path=2584f1d27e13f3a4 ; new_value=Sistem Metrik
-locale=jv ; action=add ; new_path=5fed22bb1e5f7182 ; new_value=Sistem Pangukuran Imperial
-locale=jv ; action=add ; new_path=17c0bc7bcb60719d ; new_value=Sistem Pangukuran AS
-locale=jv ; action=add ; new_path=43c1c695e6e452a5 ; new_value=Digit Hindu-Arab
-locale=jv ; action=add ; new_path=4ac1389bf9792a2c ; new_value=Digit Hindu-Arab Diambakake
-locale=jv ; action=add ; new_path=47b00da787dbdf80 ; new_value=Angka Armenia
-locale=jv ; action=add ; new_path=280eb1e9b07706a1 ; new_value=Angka Huruf Cilik Armenia
-locale=jv ; action=add ; new_path=4f6a02a0989ace0b ; new_value=Digit Bengali
-locale=jv ; action=add ; new_path=3e6b07b8289a2048 ; new_value=Digit Devanagari
-locale=jv ; action=add ; new_path=1a3270837a81178e ; new_value=Angka Etiopia
-locale=jv ; action=add ; new_path=3443b49f42622249 ; new_value=Digit Amba Kebak
-locale=jv ; action=add ; new_path=17b875cf16139ef ; new_value=Angka Georgian
-locale=jv ; action=add ; new_path=68f29dc56ccc38af ; new_value=Angka Yunani
-locale=jv ; action=add ; new_path=408b72dafe025b4a ; new_value=Angka Huruf Cilik Yunani
-locale=jv ; action=add ; new_path=bff6a809efea474 ; new_value=Digit Gujarat
-locale=jv ; action=add ; new_path=46d478a395698105 ; new_value=Digit Gurmukhi
-locale=jv ; action=add ; new_path=2c98abe6e340c4b0 ; new_value=Angka Desimal Mandarin
-locale=jv ; action=add ; new_path=5d45c8f610f2fd4c ; new_value=Angka Mandarin Prasaja
-locale=jv ; action=add ; new_path=30741b226af7fd4a ; new_value=Angka Finansial Mandarin Prasaja
-locale=jv ; action=add ; new_path=6a05545ed03b3e3c ; new_value=Angka Mandarin Tradisional
-locale=jv ; action=add ; new_path=350a8026408f8256 ; new_value=Angka Finansial Mandarin Tradisional
-locale=jv ; action=add ; new_path=4ca74a50874df025 ; new_value=Angka Ibrani
-locale=jv ; action=add ; new_path=1eb187260a2a407f ; new_value=Angka Jepang
-locale=jv ; action=add ; new_path=5ca442cf5c197337 ; new_value=Angka Finansial Jepang
-locale=jv ; action=add ; new_path=163e5281ba51bbcf ; new_value=Digit Khmer
-locale=jv ; action=add ; new_path=3bb237c888ea6723 ; new_value=Digit Kannada
-locale=jv ; action=add ; new_path=5916e1d78c463903 ; new_value=Digit Lao
-locale=jv ; action=add ; new_path=22be9631ea3306b ; new_value=Digit Malayalam
-locale=jv ; action=add ; new_path=6817dac3893d6ff2 ; new_value=Digit Myanmar
-locale=jv ; action=add ; new_path=1e57808893a8807b ; new_value=Digit Odia
-locale=jv ; action=add ; new_path=7de5442b30568eaa ; new_value=Angka Romawi
-locale=jv ; action=add ; new_path=10e05bf8a3571f2b ; new_value=Angka Huruf Cilik Romawi
-locale=jv ; action=add ; new_path=7a4e75437b7aaf03 ; new_value=Angka Tamil Tradisional
-locale=jv ; action=add ; new_path=17e27789634b519f ; new_value=Digit Tamil
-locale=jv ; action=add ; new_path=2ae04c1bfc900859 ; new_value=Digit Telugu
-locale=jv ; action=add ; new_path=70c9734407864805 ; new_value=Digit Thailand
-locale=jv ; action=add ; new_path=709c149814cf9e45 ; new_value=Digit Tibet
-locale=jv ; action=add ; new_path=50b7a93678076f4d ; new_value=ing {0} taun
-locale=jv ; action=add ; new_path=6155fb8e0bff25d8 ; new_value={0} taun kepungkur
-locale=jv ; action=add ; new_path=5367aa2910477491 ; new_value=ing {0} tn
-locale=jv ; action=add ; new_path=697ba4281637e4e ; new_value={0} tn kepungkur
-locale=jv ; action=add ; new_path=59f2c964eb69bd03 ; new_value=kwartal wingi
-locale=jv ; action=add ; new_path=2e944097c6246d5b ; new_value=kwartal iki
-locale=jv ; action=add ; new_path=63d7f9d6d21a2a3b ; new_value=kwartal ngarep
-locale=jv ; action=add ; new_path=33fc8304604ba7b7 ; new_value=ing {0} kwartal
-locale=jv ; action=add ; new_path=781afbaaa72c2d73 ; new_value={0} kwartal kepungkur
-locale=jv ; action=add ; new_path=3882422e33174351 ; new_value=ing {0} kwrt.
-locale=jv ; action=add ; new_path=1f39ed6ed4738eb0 ; new_value={0} kwrt. kepungkur
-locale=jv ; action=add ; new_path=71165a5560b448a5 ; new_value=ing {0} sasi
-locale=jv ; action=add ; new_path=52fe5b97232d8147 ; new_value={0} sasi kepungkur
-locale=jv ; action=add ; new_path=56e78e92bf345cf0 ; new_value=ing {0} s.
-locale=jv ; action=add ; new_path=1b0439806b37a2b8 ; new_value={0} s. kepungkur
-locale=jv ; action=add ; new_path=51d289888f0427e8 ; new_value=ing {0} minggu
-locale=jv ; action=add ; new_path=67f8aae12bf2f9ea ; new_value={0} minggu kepungkur
-locale=jv ; action=add ; new_path=75cde164bb47502d ; new_value=ing {0} mgg.
-locale=jv ; action=add ; new_path=5c15ca5c6f77d2b8 ; new_value={0} mgg. kepungkur
-locale=jv ; action=add ; new_path=56e6de1e9e59b32a ; new_value=minggu jroning sesasi
-locale=jv ; action=add ; new_path=ee50c0cace7b9c2 ; new_value=mgu ing sasi
-locale=jv ; action=add ; new_path=2bdde8328fa4c698 ; new_value=mgu ing sasi
-locale=jv ; action=add ; new_path=11110c79d6a08e97 ; new_value=ing {0} dina
-locale=jv ; action=add ; new_path=3452a65a06e410e1 ; new_value={0} dina kepungkur
-locale=jv ; action=add ; new_path=ac0f1286846ac8f ; new_value=dina jroning setaun
-locale=jv ; action=add ; new_path=6f7d7106fa233a96 ; new_value=dina ing taun
-locale=jv ; action=add ; new_path=40fde6000c1bb615 ; new_value=dn ing taun
-locale=jv ; action=add ; new_path=399a844857512313 ; new_value=dina jroning sasi
-locale=jv ; action=add ; new_path=6417ed2a203caac7 ; new_value=dn jroning sasi
-locale=jv ; action=add ; new_path=758135ca5c6baa99 ; new_value=Ahad wingi
-locale=jv ; action=add ; new_path=34da11643c7613cf ; new_value=Ahad iki
-locale=jv ; action=add ; new_path=7df0c2ca06251dea ; new_value=Ahad ngarep
-locale=jv ; action=add ; new_path=776e1e1e423f9f60 ; new_value=ing {0} Ahad
-locale=jv ; action=add ; new_path=52822360fb80abf3 ; new_value={0} Ahad kepungkur
-locale=jv ; action=add ; new_path=22fa28e51e485c13 ; new_value=Ahad wingi
-locale=jv ; action=add ; new_path=50a4d81e63ee2afc ; new_value=Ahad iki
-locale=jv ; action=add ; new_path=68175c8d0973742b ; new_value=Ahad ngarep
-locale=jv ; action=add ; new_path=70f511d57c872f09 ; new_value=ing {0} Ahad
-locale=jv ; action=add ; new_path=7d0afe90a59d7dcc ; new_value={0} Ahad kepungkur
-locale=jv ; action=add ; new_path=4e1cdb259b8a680b ; new_value=Ah wingi
-locale=jv ; action=add ; new_path=458fbc00f4959a61 ; new_value=Ah iki
-locale=jv ; action=add ; new_path=e3c6a947ed26bec ; new_value=Ah ngarep
-locale=jv ; action=add ; new_path=2e088213728c297a ; new_value=ing {0} Ah
-locale=jv ; action=add ; new_path=6b5dff3648b8f062 ; new_value={0} Ah kepungkur
-locale=jv ; action=add ; new_path=569d924f57fa1a1b ; new_value=Senèn wingi
-locale=jv ; action=add ; new_path=63e1b9a0642c05a ; new_value=Senèn iki
-locale=jv ; action=add ; new_path=76b1b91293c888d2 ; new_value=Senèn ngarep
-locale=jv ; action=add ; new_path=7ec4b3073848a7af ; new_value=ing {0} Senèn
-locale=jv ; action=add ; new_path=6482eace6d9a918c ; new_value={0} Senèn kepungkur
-locale=jv ; action=add ; new_path=3663bc1e50862fa9 ; new_value=Sen. wingi
-locale=jv ; action=add ; new_path=de1feffa3b1bf22 ; new_value=Sen iki
-locale=jv ; action=add ; new_path=6656ca8324d66e93 ; new_value=Sen. ngarep
-locale=jv ; action=add ; new_path=6ea989c49743c9a1 ; new_value=ing {0} Sen.
-locale=jv ; action=add ; new_path=1de923f7018fba60 ; new_value={0} Sen. kepungkur
-locale=jv ; action=add ; new_path=2cef87a3a7f03bd2 ; new_value=Sn wingi
-locale=jv ; action=add ; new_path=6ea474ad98264183 ; new_value=Sn iki
-locale=jv ; action=add ; new_path=72480db8926b2603 ; new_value=Sn ngarep
-locale=jv ; action=add ; new_path=7ed7c028a3342dc2 ; new_value=ing {0} Sn
-locale=jv ; action=add ; new_path=50e3b239953b915e ; new_value={0} Sn kepungkur
-locale=jv ; action=add ; new_path=60aeee5107830c7f ; new_value=Selasa wingi
-locale=jv ; action=add ; new_path=4e396557ac5cf6af ; new_value=Selasa iki
-locale=jv ; action=add ; new_path=11d5a244a70d1edd ; new_value=Selasa ngarep
-locale=jv ; action=add ; new_path=230af4992050486f ; new_value=ing {0} Selasa
-locale=jv ; action=add ; new_path=1720ebee94888221 ; new_value={0} Selasa kepungkur
-locale=jv ; action=add ; new_path=214090f38a27d252 ; new_value=Sel. wingi
-locale=jv ; action=add ; new_path=125d9e946f83c74e ; new_value=Sel. iki
-locale=jv ; action=add ; new_path=428b0493296bb24 ; new_value=Sel. ngarep
-locale=jv ; action=add ; new_path=4597830050ff7680 ; new_value=ing {0} Sel.
-locale=jv ; action=add ; new_path=74be4555184293a7 ; new_value={0} Sel. kepungkur
-locale=jv ; action=add ; new_path=761e6facd5677d39 ; new_value=Sl wingi
-locale=jv ; action=add ; new_path=6305396b09ac0fb9 ; new_value=Sl iki
-locale=jv ; action=add ; new_path=566feed3e1116853 ; new_value=Sl ngarep
-locale=jv ; action=add ; new_path=6f06a048b99f9c3c ; new_value=ing {0} Sl
-locale=jv ; action=add ; new_path=5e43f52aa0551bd0 ; new_value={0} Sl kepungkur
-locale=jv ; action=add ; new_path=e06f69ad6a117ac ; new_value=Rebo wingi
-locale=jv ; action=add ; new_path=54e05622a5d1e1db ; new_value=Rebo iki
-locale=jv ; action=add ; new_path=763ab4967d162931 ; new_value=Rebo ngarep
-locale=jv ; action=add ; new_path=6734dc6ed5f21607 ; new_value=ing {0} Rebo
-locale=jv ; action=add ; new_path=fc09b2b553c0ca5 ; new_value={0} Rebo kepungkur
-locale=jv ; action=add ; new_path=473f641801a932a9 ; new_value=Reb. wingi
-locale=jv ; action=add ; new_path=4eae1facd0844394 ; new_value=Reb. iki
-locale=jv ; action=add ; new_path=43aae79868cde87c ; new_value=Reb. ngarep
-locale=jv ; action=add ; new_path=31e96f4f0d9e5d6e ; new_value=ing {0} Reb.
-locale=jv ; action=add ; new_path=54b342a5e1faa386 ; new_value={0} Reb. kepungkur
-locale=jv ; action=add ; new_path=7f45971ca5d0ae59 ; new_value=R wingi
-locale=jv ; action=add ; new_path=1f571e9948ebcc34 ; new_value=R iki
-locale=jv ; action=add ; new_path=6bd037713bd84804 ; new_value=R ngarep
-locale=jv ; action=add ; new_path=5a40dbb0a1402a32 ; new_value=ing {0} R
-locale=jv ; action=add ; new_path=3d212a587620af0c ; new_value={0} R kepungkur
-locale=jv ; action=add ; new_path=2d0670828330e6e4 ; new_value=Kemis wingi
-locale=jv ; action=add ; new_path=676542195acdcf45 ; new_value=Kemis iki
-locale=jv ; action=add ; new_path=7b16501a46dbcaa8 ; new_value=Kemis ngarep
-locale=jv ; action=add ; new_path=61fb0d982b88b7fb ; new_value=ing {0} Kemis
-locale=jv ; action=add ; new_path=28722e9a1fdf9aa0 ; new_value={0} Kemis kepungkur
-locale=jv ; action=add ; new_path=30463d55b55ea448 ; new_value=Kms. wingi
-locale=jv ; action=add ; new_path=16028bff1a89067d ; new_value=Kms. iki
-locale=jv ; action=add ; new_path=280fbebfee24240a ; new_value=Kms. ngarep
-locale=jv ; action=add ; new_path=387908ff10d0681d ; new_value=ing {0} Kms.
-locale=jv ; action=add ; new_path=ab03aaf38906ac5 ; new_value={0} Kms. kepungkur
-locale=jv ; action=add ; new_path=28690f4a7e08d6e2 ; new_value=K wingi
-locale=jv ; action=add ; new_path=3fe9bf2b5b8d6931 ; new_value=K iki
-locale=jv ; action=add ; new_path=7549b70e6b778ed1 ; new_value=K ngarep
-locale=jv ; action=add ; new_path=6cfb111ec4bbb8f4 ; new_value=ing {0} K
-locale=jv ; action=add ; new_path=300f1ae13786cb9e ; new_value={0} K kepungkur
-locale=jv ; action=add ; new_path=38a12156ac4e42f2 ; new_value=Jemuwah wingi
-locale=jv ; action=add ; new_path=5d27c87466375dbc ; new_value=Jemuwah iki
-locale=jv ; action=add ; new_path=1061ea35f7e3da25 ; new_value=Jemuwah ngarep
-locale=jv ; action=add ; new_path=10d9c63d60cc68ff ; new_value=ing {0} Jemuwah
-locale=jv ; action=add ; new_path=6cc08bab5f4b642c ; new_value={0} Jemuwah kepungkur
-locale=jv ; action=add ; new_path=557b4b71b1c45bf4 ; new_value=Jem. wingi
-locale=jv ; action=add ; new_path=1dd9fd094433bc88 ; new_value=Jem. iki
-locale=jv ; action=add ; new_path=31dd6ca213771bf6 ; new_value=Jem. ngarep
-locale=jv ; action=add ; new_path=532b49eb79b1cb1b ; new_value=ing {0} Jem.
-locale=jv ; action=add ; new_path=6e6f2f883f3c3a65 ; new_value={0} Jem. kepungkur
-locale=jv ; action=add ; new_path=71874460cea8414c ; new_value=J wingi
-locale=jv ; action=add ; new_path=366959d17bc8979 ; new_value=J iki
-locale=jv ; action=add ; new_path=42a5217d6e5a2664 ; new_value=J ngarep
-locale=jv ; action=add ; new_path=67753edd27e4be7c ; new_value=ing {0} J
-locale=jv ; action=add ; new_path=648f94e63fc77099 ; new_value={0} J kepungkur
-locale=jv ; action=add ; new_path=e3a093be61cf606 ; new_value=Setu wingi
-locale=jv ; action=add ; new_path=35beb9237d7ff567 ; new_value=Setu iki
-locale=jv ; action=add ; new_path=1abae871d9f4ce5e ; new_value=Setu ngarep
-locale=jv ; action=add ; new_path=470039db3b879b3f ; new_value=ing {0} Setu
-locale=jv ; action=add ; new_path=1517cf69b04c547 ; new_value={0} Setu kepungkur
-locale=jv ; action=add ; new_path=1a2e0de2e59094e1 ; new_value=Set. wingi
-locale=jv ; action=add ; new_path=4067b278fcf1190c ; new_value=Set. iki
-locale=jv ; action=add ; new_path=165dcc1cc710ea94 ; new_value=Set. ngarep
-locale=jv ; action=add ; new_path=57fb0deb17870cb9 ; new_value=ing {0} Set.
-locale=jv ; action=add ; new_path=66e05815aff47b7a ; new_value={0} Set. kepungkur
-locale=jv ; action=add ; new_path=1c262b136ab8e0 ; new_value=St wingi
-locale=jv ; action=add ; new_path=5bb2be0cdb56109e ; new_value=St iki
-locale=jv ; action=add ; new_path=aff6ff697cb4019 ; new_value=St ngarep
-locale=jv ; action=add ; new_path=3121cf29d2d31719 ; new_value=ing {0} St
-locale=jv ; action=add ; new_path=5783df023f4be4cf ; new_value=jam iki
-locale=jv ; action=add ; new_path=1a8e79f0091c21c3 ; new_value=ing {0} jam
-locale=jv ; action=add ; new_path=a7230011bdda744 ; new_value={0} jam kepungkur
-locale=jv ; action=add ; new_path=3c228b2609f26c6c ; new_value=menit iki
-locale=jv ; action=add ; new_path=12bf090ba5edf291 ; new_value=ing {0} mnt
-locale=jv ; action=add ; new_path=2e0aa8dd28cb2f49 ; new_value={0} men. kepungkur
-locale=jv ; action=add ; new_path=202c447875d2b8d9 ; new_value=saiki
-locale=jv ; action=add ; new_path=23958a3f8c3e03aa ; new_value=ing {0} detik
-locale=jv ; action=add ; new_path=ba74f39411b0849 ; new_value={0} detik kepungkur
-locale=jv ; action=add ; new_path=7f4d416516b26148 ; new_value=ing {0} dtk
-locale=jv ; action=add ; new_path=132532947952bd23 ; new_value={0} det. kepungkur
-locale=jv ; action=add ; new_path=176a686474f0909f ; new_value=0 èwu
-locale=jv ; action=add ; new_path=634bfabc69ed87ee ; new_value=00 èwu
-locale=jv ; action=add ; new_path=1de66f98cd29bd46 ; new_value=000 èwu
-locale=jv ; action=add ; new_path=717a9789bc2938ae ; new_value=0 yuta
-locale=jv ; action=add ; new_path=605b5fce24603223 ; new_value=00 yuta
-locale=jv ; action=add ; new_path=6af88e7de75a2ce7 ; new_value=000 yuta
-locale=jv ; action=add ; new_path=31455b644b0057fc ; new_value=0 milyar
-locale=jv ; action=add ; new_path=6069e0a4d848172a ; new_value=00 milyar
-locale=jv ; action=add ; new_path=698bc0c11ec18cd2 ; new_value=000 milyar
-locale=jv ; action=add ; new_path=3537afefc0db3ca ; new_value=0 trilyun
-locale=jv ; action=add ; new_path=23200975b8c31576 ; new_value=00 trilyun
-locale=jv ; action=add ; new_path=6386c95f642c9b21 ; new_value=000 trilyun
-locale=jv ; action=add ; new_path=17c96a7acb3b084d ; new_value=0È
-locale=jv ; action=add ; new_path=2f1b5ababb5061e3 ; new_value=00È
-locale=jv ; action=add ; new_path=36a63267a5487d31 ; new_value=000È
-locale=jv ; action=add ; new_path=76d709105676a7e5 ; new_value=0Y
-locale=jv ; action=add ; new_path=7d3ef9fc22fe375 ; new_value=00Y
-locale=jv ; action=add ; new_path=189a19d74a52d4e6 ; new_value=000Y
-locale=jv ; action=add ; new_path=3d5be6804e52d7fd ; new_value=0M
-locale=jv ; action=add ; new_path=30923d62e8f435f9 ; new_value=00M
-locale=jv ; action=add ; new_path=5fdf3896b86e69e5 ; new_value=000M
-locale=jv ; action=add ; new_path=6774ef1ba7bdb909 ; new_value=¤0K
-locale=jv ; action=add ; new_path=73e1e28ed9840b5c ; new_value=¤00K
-locale=jv ; action=add ; new_path=ff7ca46dee120b1 ; new_value=¤000K
-locale=jv ; action=add ; new_path=122a473b23a455b1 ; new_value=¤0M
-locale=jv ; action=add ; new_path=3eca6fbaaf9bdcff ; new_value=¤00M
-locale=jv ; action=add ; new_path=2a99069044b85546 ; new_value=¤000M
-locale=jv ; action=add ; new_path=15f38a11195dc9e9 ; new_value=¤0B
-locale=jv ; action=add ; new_path=385126d612ea816 ; new_value=¤00B
-locale=jv ; action=add ; new_path=5bb8abced60e67c4 ; new_value=¤000B
-locale=jv ; action=add ; new_path=3b33b4f9cc2f204e ; new_value=¤0T
-locale=jv ; action=add ; new_path=325aeb7040c6be89 ; new_value=¤00T
-locale=jv ; action=add ; new_path=6c2d85b0334854ed ; new_value=¤000T
-locale=jv ; action=add ; new_path=6bf16317ecfbf8dc ; new_value=permiriad
-locale=jv ; action=add ; new_path=1049513abc4c1830 ; new_value=elektronvolt
-locale=jv ; action=add ; new_path=57cf90af893bfa22 ; new_value=takeran panas Britania
-locale=jv ; action=add ; new_path=1f031e347cee2b43 ; new_value=pon gaya
-locale=jv ; action=add ; new_path=52488c63874aff18 ; new_value=newton
-locale=jv ; action=add ; new_path=7e48afe8d8984d0a ; new_value=solar radii
-locale=jv ; action=add ; new_path=40f0ef38d9f51f7c ; new_value=luminositas srengéngé
-locale=jv ; action=add ; new_path=3cb8d349f9927d6c ; new_value=dalton
-locale=jv ; action=add ; new_path=5871d2408471acf4 ; new_value=massa Bumi
-locale=jv ; action=add ; new_path=7cbd36996f0419ad ; new_value=massa matahari
-locale=jv ; action=add ; new_path=2797271e39b8c1f ; new_value=barel
-locale=jv ; action=add ; new_path=3319fc7aa377886b ; new_value=permiriad
-locale=jv ; action=add ; new_path=70bc9221f51a58c3 ; new_value=elektronvolt
-locale=jv ; action=add ; new_path=12c3052068ea4b66 ; new_value=BTU
-locale=jv ; action=add ; new_path=563c06c3ef775e76 ; new_value=pon gaya
-locale=jv ; action=add ; new_path=707ba037cc9f0aa0 ; new_value=newton
-locale=jv ; action=add ; new_path=813a1f7a6ea9768 ; new_value=solar radii
-locale=jv ; action=add ; new_path=5dbc5b71e4e83d1c ; new_value=luminositas srengéngé
-locale=jv ; action=add ; new_path=383c6825aa72baac ; new_value=dalton
-locale=jv ; action=add ; new_path=6e66585f50d1aa07 ; new_value=massa Bumi
-locale=jv ; action=add ; new_path=3130653ad871d2bf ; new_value=massa matahari
-locale=jv ; action=add ; new_path=7154ad490f44a817 ; new_value=barel
-locale=jv ; action=add ; new_path=299a4454c9d32b5d ; new_value={0} — kabeh
-locale=jv ; action=add ; new_path=14112d23690bfe50 ; new_value={0} — kompatibilitas
-locale=jv ; action=add ; new_path=7bb61e9db9f627c ; new_value={0} — ketutup
-locale=jv ; action=add ; new_path=7371b1ca686a5ef2 ; new_value={0} — didawakake
-locale=jv ; action=add ; new_path=77e8fa4912e58b28 ; new_value={0} — historis
-locale=jv ; action=add ; new_path=f4add945dd34ae7 ; new_value={0} — maneka warna
-locale=jv ; action=add ; new_path=53b01ae1ad3bbc42 ; new_value={0} — liyane
-locale=jv ; action=add ; new_path=2f2e3bfded8a3253 ; new_value=skrip — {0}
-locale=jv ; action=add ; new_path=1269fc9e109d1077 ; new_value={0} tunyuk
-locale=jv ; action=add ; new_path=17f98683ae857f90 ; new_value=aktivitas
-locale=jv ; action=add ; new_path=2c1ecc751d980015 ; new_value=skrip Afrika
-locale=jv ; action=add ; new_path=1b94d20595451937 ; new_value=skrip Amerika
-locale=jv ; action=add ; new_path=325cdab3c026ba2f ; new_value=kewan
-locale=jv ; action=add ; new_path=43b8d71aec66b71a ; new_value=kewan utawa alam
-locale=jv ; action=add ; new_path=5af92de030a1a4f3 ; new_value=panah
-locale=jv ; action=add ; new_path=54fd2e34f09142a2 ; new_value=awak
-locale=jv ; action=add ; new_path=1f54eaa557611ddb ; new_value=gambar kothak
-locale=jv ; action=add ; new_path=34641f9eba993b71 ; new_value=braile
-locale=jv ; action=add ; new_path=15f4f2c308493abe ; new_value=wewangunan
-locale=jv ; action=add ; new_path=75852fd9bdf5f948 ; new_value=pelor utawa lintang
-locale=jv ; action=add ; new_path=18c2d2cc86911951 ; new_value=jamo konsonan
-locale=jv ; action=add ; new_path=b36e5757c95c7c7 ; new_value=simbol mata uang
-locale=jv ; action=add ; new_path=39873c6602bf16dc ; new_value=sengkang utawa panyambung
-locale=jv ; action=add ; new_path=491dd4a47eabf33f ; new_value=simbol divinasi
-locale=jv ; action=add ; new_path=1da1d58ac1995791 ; new_value=panah mudhun
-locale=jv ; action=add ; new_path=3f3110aebbcbb8d0 ; new_value=panah munggah
-locale=jv ; action=add ; new_path=317c5e0674f494ff ; new_value=skrip Asia Wetan
-locale=jv ; action=add ; new_path=209d0e95f28b1082 ; new_value=skrip Eropa
-locale=jv ; action=add ; new_path=1b0eee2ec7d1576e ; new_value=wadon
-locale=jv ; action=add ; new_path=301ddb19ec3bce21 ; new_value=gendera
-locale=jv ; action=add ; new_path=3e0c440472a96971 ; new_value=gendera
-locale=jv ; action=add ; new_path=51cdfaf121ae1b41 ; new_value=dhaharan & unjukan
-locale=jv ; action=add ; new_path=7955bd88bac037ed ; new_value=format & spasi putih
-locale=jv ; action=add ; new_path=618de4106f139d5f ; new_value=varian amba-kebak
-locale=jv ; action=add ; new_path=113d47866c150ee6 ; new_value=wangunan geometris
-locale=jv ; action=add ; new_path=39f55ad6629cc902 ; new_value=varian amba setengah kebak
-locale=jv ; action=add ; new_path=13a5853f453232d8 ; new_value=karakter Han
-locale=jv ; action=add ; new_path=401b1c9481b99919 ; new_value=radikal Han
-locale=jv ; action=add ; new_path=7c6fa9da4767a52c ; new_value=Hanzi (prasaja)
-locale=jv ; action=add ; new_path=e6b16f0659977bd ; new_value=Hanzi (tradisional)
-locale=jv ; action=add ; new_path=f8ebb1735a724db ; new_value=ati
-locale=jv ; action=add ; new_path=2d2c57eaacfdbfe8 ; new_value=skrip tradisional
-locale=jv ; action=add ; new_path=7433704a77aa72bf ; new_value=karakter desk. ideografis
-locale=jv ; action=add ; new_path=690e3ddc3bea0bbc ; new_value=kana Jepang
-locale=jv ; action=add ; new_path=230aee8144893127 ; new_value=panah ngiwa
-locale=jv ; action=add ; new_path=799c677ba082d1ed ; new_value=panah ngiwa nengen
-locale=jv ; action=add ; new_path=715cb1833ecc5d48 ; new_value=simbol kaya huruf
-locale=jv ; action=add ; new_path=3dbbaf66fdc2367e ; new_value=panggunaan diwatesi
-locale=jv ; action=add ; new_path=30f8c1777fd94338 ; new_value=lanang
-locale=jv ; action=add ; new_path=32122442d14d4c89 ; new_value=simbol matematika
-locale=jv ; action=add ; new_path=4ed5d451c4b1a0c2 ; new_value=skrip Timur Tengah
-locale=jv ; action=add ; new_path=3f08ab23239046 ; new_value=maneka warna
-locale=jv ; action=add ; new_path=41bb79c8558a8517 ; new_value=skrip modern
-locale=jv ; action=add ; new_path=598a022214b6fa9d ; new_value=pamodhifikasi
-locale=jv ; action=add ; new_path=333e52a0bdc66027 ; new_value=simbol musik
-locale=jv ; action=add ; new_path=1352f753099c71b6 ; new_value=alam
-locale=jv ; action=add ; new_path=4e84c80229e2de1c ; new_value=nonspasi
-locale=jv ; action=add ; new_path=3db3b778ebc6455f ; new_value=angka
-locale=jv ; action=add ; new_path=10bf122bdd52ba4f ; new_value=objek
-locale=jv ; action=add ; new_path=6cfd49eb2a7196a8 ; new_value=liyane
-locale=jv ; action=add ; new_path=4655675c2e65614d ; new_value=digathukake
-locale=jv ; action=add ; new_path=42f6be8f896b77e8 ; new_value=wong
-locale=jv ; action=add ; new_path=313abe82e3fdf510 ; new_value=alfabet fonetik
-locale=jv ; action=add ; new_path=71804f21e04aa5ef ; new_value=piktograf
-locale=jv ; action=add ; new_path=208fcf976457ffac ; new_value=panggonan
-locale=jv ; action=add ; new_path=3cee6c8553de3961 ; new_value=tanduran
-locale=jv ; action=add ; new_path=174805d9795a7599 ; new_value=tandha maca
-locale=jv ; action=add ; new_path=e9b87f48b668cdf ; new_value=panah nengen
-locale=jv ; action=add ; new_path=2949ed77ab2845a7 ; new_value=tandha utawa simbol
-locale=jv ; action=add ; new_path=55565d2576960292 ; new_value=varian cilik
-locale=jv ; action=add ; new_path=3b2d53624177ad7a ; new_value=smiley utawa wong
-locale=jv ; action=add ; new_path=1e23acc4dc503ac6 ; new_value=skrip Asia Kidul
-locale=jv ; action=add ; new_path=e16891d11001ca0 ; new_value=skrip Asia Kidul Wetan
-locale=jv ; action=add ; new_path=1e6688ec99b1b905 ; new_value=spasi
-locale=jv ; action=add ; new_path=19624f4413eaac8b ; new_value=olahraga
-locale=jv ; action=add ; new_path=3888aa74b97f5b4f ; new_value=simbol
-locale=jv ; action=add ; new_path=14cccc2a881de4ab ; new_value=simbol teknis
-locale=jv ; action=add ; new_path=26a2d5e3cfef2281 ; new_value=tandha nada
-locale=jv ; action=add ; new_path=3cbfe8ae1a909c80 ; new_value=lelungan
-locale=jv ; action=add ; new_path=93b491465567c24 ; new_value=lelungan utawa panggonan
-locale=jv ; action=add ; new_path=b4ab6d41925d220 ; new_value=panah munggah
-locale=jv ; action=add ; new_path=52d279c57f1482c3 ; new_value=varian
-locale=jv ; action=add ; new_path=7dc828ce5cfbd4bd ; new_value=jamo vokal
-locale=jv ; action=add ; new_path=683406f347de63f2 ; new_value=cuaca
-locale=jv ; action=add ; new_path=42ddfa753196a4bf ; new_value=skrip Asia Kulon
-locale=jv ; action=add ; new_path=5096a4278f331fef ; new_value=spasi putih
-locale=jv ; action=add ; new_path=6cf5fde398a066ba ; new_value=miring
-locale=jv ; action=add ; new_path=12216767b0c903e3 ; new_value=bleger
-locale=jv ; action=add ; new_path=6332e62ca3139ca7 ; new_value=dhoyong
-locale=jv ; action=add ; new_path=7a470bf8fb4b3c3a ; new_value=ambane
-locale=jv ; action=add ; new_path=2e032808cbc54115 ; new_value=kandele
-locale=jv ; action=add ; new_path=5a4fc04504372371 ; new_value=aksara sinambung
-locale=jv ; action=add ; new_path=7d4eb9fe87e5f045 ; new_value=katrangan
-locale=jv ; action=add ; new_path=61f30b898c475879 ; new_value=tulisan
-locale=jv ; action=add ; new_path=12ea1b5e5a2e4864 ; new_value=panjudhulan
-locale=jv ; action=add ; new_path=7726d7c649c5ccad ; new_value=katone
-locale=jv ; action=add ; new_path=5d87e1caf147d2ce ; new_value=gambar poster
-locale=jv ; action=add ; new_path=43dc1e27be41e68e ; new_value=ndhoyong ngiwa
-locale=jv ; action=add ; new_path=33d314143e88202 ; new_value=jejeg
-locale=jv ; action=add ; new_path=5f2765226833b3d6 ; new_value=ndhoyong
-locale=jv ; action=add ; new_path=6425e4a0b9ca2154 ; new_value=ndhoyong banget
-locale=jv ; action=add ; new_path=3cc465dc71be869c ; new_value=saya dirapetake
-locale=jv ; action=add ; new_path=3db159c79a243622 ; new_value=saya dipadhetake
-locale=jv ; action=add ; new_path=386ed4849ef0d1e5 ; new_value=saya ciyut
-locale=jv ; action=add ; new_path=3126afaa8a8823af ; new_value=dirapetake banget
-locale=jv ; action=add ; new_path=774988899252a434 ; new_value=dipadhetake banget
-locale=jv ; action=add ; new_path=1b71c17bcdd11970 ; new_value=ciyut banget
-locale=jv ; action=add ; new_path=88c97688d3a611a ; new_value=dirapetake
-locale=jv ; action=add ; new_path=15ca747595d48f8c ; new_value=dipadhetake
-locale=jv ; action=add ; new_path=770e576ee25a0957 ; new_value=dipadhetake
-locale=jv ; action=add ; new_path=5f1b100e372c5f87 ; new_value=rada dirapetake
-locale=jv ; action=add ; new_path=68ec34f4df8196df ; new_value=rada dipadhetake
-locale=jv ; action=add ; new_path=3acec5402ca5ecf9 ; new_value=rada ciyut
-locale=jv ; action=add ; new_path=4b6c99c366b4c437 ; new_value=rada dijembarake
-locale=jv ; action=add ; new_path=1d5952a9910ac5c5 ; new_value=rada didawakake
-locale=jv ; action=add ; new_path=51d7e3d9834da604 ; new_value=rada amba
-locale=jv ; action=add ; new_path=575944ee5b5631ec ; new_value=dijembarake
-locale=jv ; action=add ; new_path=807039d26496ba5 ; new_value=didawakake
-locale=jv ; action=add ; new_path=5256fbf285589952 ; new_value=amba
-locale=jv ; action=add ; new_path=7621fcd3fd95875f ; new_value=dijembarake banget
-locale=jv ; action=add ; new_path=3aec4d8a752c9ccf ; new_value=didawakake banget
-locale=jv ; action=add ; new_path=c278d8fa4ef1c0f ; new_value=amba banget
-locale=jv ; action=add ; new_path=750e9e7758321719 ; new_value=saya dijembarake
-locale=jv ; action=add ; new_path=649275406f87b51b ; new_value=saya didawakake
-locale=jv ; action=add ; new_path=2061251f052c2ee1 ; new_value=saya amba
-locale=jv ; action=add ; new_path=2026de9cde6be3a7 ; new_value=kuru
-locale=jv ; action=add ; new_path=c5107eef54d4e39 ; new_value=tipis banget
-locale=jv ; action=add ; new_path=1365616efe617b30 ; new_value=saya tipis
-locale=jv ; action=add ; new_path=6622ddd3c655131 ; new_value=tipis
-locale=jv ; action=add ; new_path=73937e90cdd3354 ; new_value=rada tipis
-locale=jv ; action=add ; new_path=24abd9c0a9272cfb ; new_value=buku
-locale=jv ; action=add ; new_path=147d124e18ef76e9 ; new_value=biyasa
-locale=jv ; action=add ; new_path=7945afffd61fa3d4 ; new_value=tengahan
-locale=jv ; action=add ; new_path=2b1b7907ea65d595 ; new_value=rada kandel
-locale=jv ; action=add ; new_path=66a54bc8d821a574 ; new_value=kandel sithik
-locale=jv ; action=add ; new_path=1c4488e1a02a0602 ; new_value=kandel
-locale=jv ; action=add ; new_path=37c2a383f45461ac ; new_value=kandel banget
-locale=jv ; action=add ; new_path=435b966dbd7681ab ; new_value=ireng
-locale=jv ; action=add ; new_path=292fe4e98aa53cfe ; new_value=kenthel
-locale=jv ; action=add ; new_path=65fc607bf6590c50 ; new_value=ireng banget
-locale=jv ; action=add ; new_path=7f5edfe7ca835ee3 ; new_value=saya ireng
-locale=jv ; action=add ; new_path=6bf477ec94a13625 ; new_value=saya kenthel
-locale=jv ; action=add ; new_path=7d81d47a12c1e3f8 ; new_value=para vertikal
-locale=jv ; action=add ; new_path=6dec66ddc5173aa ; new_value=spasi aksara gedhe
-locale=jv ; action=add ; new_path=72deb48cfc329fbf ; new_value=pangiket pilihan
-locale=jv ; action=add ; new_path=24a88d6364084848 ; new_value=para dhiagonal
-locale=jv ; action=add ; new_path=6472f5e2ca7cae21 ; new_value=angka panemtu dhuwuring aksara
-locale=jv ; action=add ; new_path=1c4cb8bdf3ed00ca ; new_value=angka old-style
-locale=jv ; action=add ; new_path=18420d0c58e0da7d ; new_value=angka urut
-locale=jv ; action=add ; new_path=10fad27042d6056f ; new_value=angka proporsional
-locale=jv ; action=add ; new_path=2237ba485c13fc02 ; new_value=huruf gedhe sing cilik
-locale=jv ; action=add ; new_path=6e523ba95d3feff0 ; new_value=angka tabuler
-locale=jv ; action=add ; new_path=684bdb37639f7ea8 ; new_value=nul corek
-locale=jv ; action=add ; new_path=3317b1f428d9a7de ; new_value=Prasaja
-locale=jv ; action=add ; new_path=3e09bd64b9258f95 ; new_value=Han Prasaja
-locale=jv ; action=add ; new_path=119e60bb01e278ac ; new_value=Afrika Sisih Tengah
-locale=jv ; action=add ; new_path=3a408fc6b1e6fa2b ; new_value=Kapuloan Cocos (Keeling)
-locale=jv ; action=add ; new_path=42c05adfd60541e3 ; new_value=Greenland
-locale=jv ; action=add ; new_path=158fcbededef4487 ; new_value=Guinea
-locale=jv ; action=add ; new_path=49143be52813e42f ; new_value=Guinea-Bissau
-locale=jv ; action=add ; new_path=136260adbfeb06fe ; new_value=Kapuloan Heard lan McDonald
-locale=jv ; action=add ; new_path=4e302f46c0477a7 ; new_value=Rusia
-locale=jv ; action=add ; new_path=787d095cfbdb003f ; new_value=Kapuloan AS Paling Njaba
-locale=jv ; action=add ; new_path=4847a745bffb3ed3 ; new_value=Kutha Vatikan
-locale=jv ; action=add ; new_path=4d0d24d3d8b0eb56 ; new_value=Kapuloan Virgin Britania
-locale=jv ; action=add ; new_path=602dd39f06ddeb32 ; new_value=java
\ No newline at end of file
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AKUAPEM"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ARANES"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ASANTE"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AUVERN"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BASICENG"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BAUDDHA"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BISCAYAN"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CISAUP"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CORNU"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CREISS"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONKIRSH"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONNAPA"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONXSAMP"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GASCON"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRCLASS"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRITAL"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRMISTR"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="HOGNORSK"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="HSISTEMO"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ITIHASA"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="IVANCHOV"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="JAUER"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="JYUTPING"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="KOCIEWIE"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LAUKIKA"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LEMOSIN"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LENGADOC"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LUNA1918"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NEWFOUND"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NICARD"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH2"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH3"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH4"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PETR1708"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PROVENC"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PUTER"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="RUMGR"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SCOUSE"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SIMPLE"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SPANGLIS"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SURMIRAN"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SURSILV"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SUTSILV"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ULSTER"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="VAIDIKA"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="VALLADER"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="VIVARAUP"]
+locale=ms; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="XSISTEMO"]
+# ms Total 48 found
+# vi ⟪Value⟫ PathHeader Org-Level
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Adlm"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Gong"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Hmnp"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Osge"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Rohg"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Wcho"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Aghb"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Bhks"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Dogr"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Elba"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Elym"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Gonm"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Hatr"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Mahj"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Maka"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Marc"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Medf"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Mult"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Nand"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Pauc"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Sidd"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Sogd"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Sogo"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Soyo"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Zanb"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ABL1943"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AKUAPEM"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AO1990"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ARANES"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ASANTE"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AUVERN"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BALANKA"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BARLA"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BASICENG"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CISAUP"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="COLB1945"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CORNU"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CREISS"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="EKAVSK"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONKIRSH"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONNAPA"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GASCON"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRCLASS"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRITAL"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRMISTR"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="HSISTEMO"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="IJEKAVSK"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="IVANCHOV"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="KOCIEWIE"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LEMOSIN"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LENGADOC"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NEWFOUND"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NICARD"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="OXENDICT"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH2"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH3"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH4"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PROVENC"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SIMPLE"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SOTAV"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SPANGLIS"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="UNIFON"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="VIVARAUP"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="XSISTEMO"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="UYW"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="UYW"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ISJ"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ISJ"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ALK"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ALK"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ILR"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="ILR"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="CNX"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="CNX"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="MVP"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="MVP"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="XSU"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="XSU"]/displayName[@count="other"]
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="XUA"]/displayName
+locale=vi; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="XUA"]/displayName[@count="other"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Gong"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Hmnp"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Rohg"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Wcho"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Chrs"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Diak"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Dogr"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Elym"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Kits"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Maka"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Medf"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Nand"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Sogd"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Sogo"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/scripts/script[@type="Yezi"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AKUAPEM"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ARANES"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="ASANTE"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="AUVERN"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BASICENG"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="BORNHOLM"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CISAUP"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CORNU"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="CREISS"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONKIRSH"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="FONNAPA"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GASCON"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRCLASS"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRITAL"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="GRMISTR"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="HSISTEMO"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="IVANCHOV"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="KOCIEWIE"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LEMOSIN"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="LENGADOC"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NEWFOUND"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="NICARD"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH2"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH3"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PAHAWH4"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="PROVENC"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SIMPLE"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="SPANGLIS"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="UNIFON"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="VIVARAUP"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/variants/variant[@type="XSISTEMO"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/types/type[@key="numbers"][@type="diak"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/types/type[@key="numbers"][@type="gong"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/types/type[@key="numbers"][@type="hmnp"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/types/type[@key="numbers"][@type="rohg"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/localeDisplayNames/types/type[@key="numbers"][@type="wcho"]
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="CNX"]/displayName
+locale=zh_Hant_HK; action=delete; value=↑↑↑; path=//ldml/numbers/currencies/currency[@type="CNX"]/displayName[@count="other"]
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/tool/supplemental.html b/tools/java/org/unicode/cldr/tool/supplemental.html
index 20f1e80..04080b5 100644
--- a/tools/java/org/unicode/cldr/tool/supplemental.html
+++ b/tools/java/org/unicode/cldr/tool/supplemental.html
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
<title>Supplemental Data</title>
<style type="text/css">
diff --git a/tools/java/org/unicode/cldr/tool/verify-index.html b/tools/java/org/unicode/cldr/tool/verify-index.html
index b9de7c5..4b15826 100644
--- a/tools/java/org/unicode/cldr/tool/verify-index.html
+++ b/tools/java/org/unicode/cldr/tool/verify-index.html
@@ -2,7 +2,7 @@
<head>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
<link rel="stylesheet" type="text/css"
- href="http://www.unicode.org/webscripts/standard_styles.css">
+ href="https://www.unicode.org/webscripts/standard_styles.css">
<link rel="stylesheet" type="text/css" href="index.css">
<title>Verification Charts</title>
</head>
diff --git a/tools/java/org/unicode/cldr/util/CLDRFile.java b/tools/java/org/unicode/cldr/util/CLDRFile.java
index 3dd1891..2bdae75 100644
--- a/tools/java/org/unicode/cldr/util/CLDRFile.java
+++ b/tools/java/org/unicode/cldr/util/CLDRFile.java
@@ -123,11 +123,10 @@
public static final String SUPPLEMENTAL_NAME = "supplementalData";
public static final String SUPPLEMENTAL_METADATA = "supplementalMetadata";
public static final String SUPPLEMENTAL_PREFIX = "supplemental";
- public static final String GEN_VERSION = "36.1";
- public static final List<String> SUPPLEMENTAL_NAMES = Arrays.asList("characters", "coverageLevels", "dayPeriods", "genderList", "languageInfo",
+ public static final String GEN_VERSION = "37";
+ public static final List<String> SUPPLEMENTAL_NAMES = Arrays.asList("characters", "coverageLevels", "dayPeriods", "genderList", "grammaticalFeatures", "languageInfo",
"languageGroup", "likelySubtags", "metaZones", "numberingSystems", "ordinals", "plurals", "postalCodeData", "rgScope", "supplementalData",
- "supplementalMetadata",
- "telephoneCodeData", "windowsZones");
+ "supplementalMetadata", "telephoneCodeData", "units", "windowsZones");
private Collection<String> extraPaths = null;
@@ -403,6 +402,8 @@
* @param options
* map of options for writing
* @return true if we write the file, false if we cancel due to skipping all paths
+ *
+ * TODO: shorten this method (over 170 lines) using subroutines.
*/
public boolean write(PrintWriter pw, Map<String, ?> options) {
Set<String> orderedSet = new TreeSet<String>(getComparator());
@@ -479,42 +480,29 @@
XPathParts.Comments tempComments = (XPathParts.Comments) dataSource.getXpathComments().clone();
- XPathParts last = new XPathParts(defaultSuppressionMap);
- XPathParts current = new XPathParts(defaultSuppressionMap);
- XPathParts lastFiltered = new XPathParts(defaultSuppressionMap);
- XPathParts currentFiltered = new XPathParts(defaultSuppressionMap);
+ XPathParts last = null;
boolean isResolved = dataSource.isResolving();
java.util.function.Predicate<String> skipTest = (java.util.function.Predicate<String>) options.get("SKIP_PATH");
+ /*
+ * First loop: call writeDifference for each xpath in identitySet, with empty string "" for value.
+ * There is no difference between "filtered" and "not filtered" in this loop.
+ */
for (Iterator<String> it2 = identitySet.iterator(); it2.hasNext();) {
String xpath = (String) it2.next();
if (isResolved && xpath.contains("/alias")) {
continue;
}
- currentFiltered.setForWritingWithSuppressionMap(xpath);
- current.setForWritingWithSuppressionMap(xpath);
- current.writeDifference(pw, currentFiltered, last, "", tempComments);
- /*
- * Exchange pairs of parts:
- * swap current with last
- * swap currentFiltered with lastFiltered
- * However, current and currentFiltered both get "set" next, so the effect should be the same as
- * last = current
- * lastFiltered = currentFiltered
- * current = getInstance
- * currentFiltered = getInstance
- * ??
- */
- XPathParts temp = current;
- current = last;
- last = temp;
- temp = currentFiltered;
- currentFiltered = lastFiltered;
- lastFiltered = temp;
+ XPathParts current = XPathParts.getInstance(xpath);
+ current.writeDifference(pw, current, last, "", tempComments);
+ last = current;
}
+ /*
+ * Second loop: call writeDifference for each xpath in orderedSet, with v = getStringValue(xpath).
+ */
boolean wroteAtLeastOnePath = false;
for (String xpath : orderedSet) {
if (skipTest != null
@@ -528,20 +516,18 @@
if (suppressInheritanceMarkers && CldrUtility.INHERITANCE_MARKER.equals(v)) {
continue;
}
- currentFiltered.setForWritingWithSuppressionMap(xpath);
+ /*
+ * The difference between "filtered" (currentFiltered) and "not filtered" (current) is that
+ * current uses getFullXPath(xpath), while currentFiltered uses xpath.
+ */
+ XPathParts currentFiltered = XPathParts.getInstance(xpath);
if (currentFiltered.size() >= 2
&& currentFiltered.getElement(1).equals("identity")) {
continue;
}
- current.setForWritingWithSuppressionMap(getFullXPath(xpath));
+ XPathParts current = XPathParts.getInstance(getFullXPath(xpath));
current.writeDifference(pw, currentFiltered, last, v, tempComments);
- // exchange pairs of parts
- XPathParts temp = current;
- current = last;
- last = temp;
- temp = currentFiltered;
- currentFiltered = lastFiltered;
- lastFiltered = temp;
+ last = current;
wroteAtLeastOnePath = true;
}
/*
@@ -557,7 +543,9 @@
if (!wroteAtLeastOnePath && options.containsKey("SKIP_FILE_IF_SKIP_ALL_PATHS")) {
return false;
}
- current.clear().writeDifference(pw, null, last, null, tempComments);
+
+ last.writeLast(pw);
+
String finalComment = dataSource.getXpathComments().getFinalComment();
if (WRITE_COMMENTS_THAT_NO_LONGER_HAVE_BASE) {
@@ -649,24 +637,15 @@
* @parameter pathWhereFound null if constructed.
*/
public String getConstructedBaileyValue(String xpath, Output<String> pathWhereFound, Output<String> localeWhereFound) {
- //ldml/localeDisplayNames/languages/language[@type="zh_Hans"]
- if (xpath.startsWith("//ldml/localeDisplayNames/languages/language[@type=\"") && xpath.contains("_")) {
- XPathParts parts = XPathParts.getFrozenInstance(xpath);
- String type = parts.getAttributeValue(-1, "type");
- if (type.contains("_")) {
- String alt = parts.getAttributeValue(-1, "alt");
- if (localeWhereFound != null) {
- localeWhereFound.value = getLocaleID();
- }
- if (pathWhereFound != null) {
- pathWhereFound.value = null; // TODO make more useful
- }
- if (alt == null) {
- return getName(type, true);
- } else {
- return getName(type, true, new SimpleAltPicker(alt));
- }
+ String constructedValue = getConstructedValue(xpath);
+ if (constructedValue != null) {
+ if (localeWhereFound != null) {
+ localeWhereFound.value = getLocaleID();
}
+ if (pathWhereFound != null) {
+ pathWhereFound.value = null; // TODO make more useful
+ }
+ return constructedValue;
}
return getBaileyValue(xpath, pathWhereFound, localeWhereFound);
}
@@ -692,7 +671,18 @@
}
/**
- * Get the full path from a distinguished path
+ * Get the full path from a distinguished path.
+ *
+ * @param xpath the distinguished path
+ * @return the full path
+ *
+ * Examples:
+ *
+ * xpath = //ldml/localeDisplayNames/scripts/script[@type="Adlm"]
+ * result = //ldml/localeDisplayNames/scripts/script[@type="Adlm"][@draft="unconfirmed"]
+ *
+ * xpath = //ldml/dates/calendars/calendar[@type="hebrew"]/dateFormats/dateFormatLength[@type="full"]/dateFormat[@type="standard"]/pattern[@type="standard"]
+ * result = //ldml/dates/calendars/calendar[@type="hebrew"]/dateFormats/dateFormatLength[@type="full"]/dateFormat[@type="standard"]/pattern[@type="standard"][@numbers="hebr"]
*/
public String getFullXPath(String xpath) {
if (xpath == null) {
@@ -1021,69 +1011,71 @@
boolean logicDuplicate = true;
if (!checked.contains(curXpath)) {
- // we compare logic Group and only removen when all are duplicate
+ // we compare logic Group and only remove when all are duplicate
Set<String> logicGroups = LogicalGrouping.getPaths(this, curXpath);
- Iterator<String> iter = logicGroups.iterator();
- while (iter.hasNext() && logicDuplicate) {
- String xpath = iter.next();
- switch (keepIfMatches.getRetention(xpath)) {
- case RETAIN:
- logicDuplicate = false;
- continue;
- case RETAIN_IF_DIFFERENT:
- String currentValue = dataSource.getValueAtPath(xpath);
- if (currentValue == null) {
+ if (logicGroups != null) {
+ Iterator<String> iter = logicGroups.iterator();
+ while (iter.hasNext() && logicDuplicate) {
+ String xpath = iter.next();
+ switch (keepIfMatches.getRetention(xpath)) {
+ case RETAIN:
logicDuplicate = false;
continue;
- }
- String otherXpath = xpath;
- String otherValue = other.dataSource.getValueAtPath(otherXpath);
- if (!currentValue.equals(otherValue)) {
- if (MINIMIZE_ALT_PROPOSED) {
- otherXpath = CLDRFile.getNondraftNonaltXPath(xpath);
- if (otherXpath.equals(xpath)) {
- logicDuplicate = false;
- continue;
- }
- otherValue = other.dataSource.getValueAtPath(otherXpath);
- if (!currentValue.equals(otherValue)) {
- logicDuplicate = false;
- continue;
- }
- } else {
+ case RETAIN_IF_DIFFERENT:
+ String currentValue = dataSource.getValueAtPath(xpath);
+ if (currentValue == null) {
logicDuplicate = false;
continue;
}
+ String otherXpath = xpath;
+ String otherValue = other.dataSource.getValueAtPath(otherXpath);
+ if (!currentValue.equals(otherValue)) {
+ if (MINIMIZE_ALT_PROPOSED) {
+ otherXpath = CLDRFile.getNondraftNonaltXPath(xpath);
+ if (otherXpath.equals(xpath)) {
+ logicDuplicate = false;
+ continue;
+ }
+ otherValue = other.dataSource.getValueAtPath(otherXpath);
+ if (!currentValue.equals(otherValue)) {
+ logicDuplicate = false;
+ continue;
+ }
+ } else {
+ logicDuplicate = false;
+ continue;
+ }
+ }
+ String keepValue = (String) XMLSource.getPathsAllowingDuplicates().get(xpath);
+ if (keepValue != null && keepValue.equals(currentValue)) {
+ logicDuplicate = false;
+ continue;
+ }
+ // we've now established that the values are the same
+ String currentFullXPath = dataSource.getFullPath(xpath);
+ String otherFullXPath = other.dataSource.getFullPath(otherXpath);
+ if (!equalsIgnoringDraft(currentFullXPath, otherFullXPath)) {
+ logicDuplicate = false;
+ continue;
+ }
+ if (DEBUG) {
+ keepIfMatches.getRetention(xpath);
+ }
+ break;
+ case REMOVE:
+ if (DEBUG) {
+ keepIfMatches.getRetention(xpath);
+ }
+ break;
}
- String keepValue = (String) XMLSource.getPathsAllowingDuplicates().get(xpath);
- if (keepValue != null && keepValue.equals(currentValue)) {
- logicDuplicate = false;
- continue;
- }
- // we've now established that the values are the same
- String currentFullXPath = dataSource.getFullPath(xpath);
- String otherFullXPath = other.dataSource.getFullPath(otherXpath);
- if (!equalsIgnoringDraft(currentFullXPath, otherFullXPath)) {
- logicDuplicate = false;
- continue;
- }
- if (DEBUG) {
- keepIfMatches.getRetention(xpath);
- }
- break;
- case REMOVE:
- if (DEBUG) {
- keepIfMatches.getRetention(xpath);
- }
- break;
+
}
+ if (first) {
+ first = false;
+ if (butComment) appendFinalComment("Duplicates removed:");
+ }
}
- if (first) {
- first = false;
- if (butComment) appendFinalComment("Duplicates removed:");
- }
-
// we can't remove right away, since that disturbs the iterator.
checked.addAll(logicGroups);
if (logicDuplicate) {
@@ -1303,13 +1295,19 @@
return getNondraftNonaltXPath(path1).equals(getNondraftNonaltXPath(path2));
}
- static XPathParts nondraftParts = new XPathParts();
+ /*
+ * TODO: clarify the need for syncObject.
+ * Formerly, an XPathParts object named "nondraftParts" was used for this purpose, but
+ * there was no evident reason for it to be an XPathParts object rather than any other
+ * kind of object.
+ */
+ private static Object syncObject = new Object();
public static String getNondraftNonaltXPath(String xpath) {
if (xpath.indexOf("draft=\"") < 0 && xpath.indexOf("alt=\"") < 0) {
return xpath;
}
- synchronized (nondraftParts) {
+ synchronized (syncObject) {
XPathParts parts = XPathParts.getInstance(xpath); // can't be frozen since we call removeAttributes
String restore;
HashSet<String> toRemove = new HashSet<String>();
@@ -3110,6 +3108,30 @@
}
/**
+ * Shortcut for getting the string value for a path.
+ * If the string value is an INHERITANCE_MARKER (used in survey
+ * tool), then the Bailey value is returned.
+ *
+ * @param path
+ * @return the string value
+ *
+ * TODO: check whether this is called only when appropriate, see https://unicode.org/cldr/trac/ticket/11299
+ * Compare getWinningValueWithBailey wich is identical except getWinningValue versus getStringValue.
+ */
+ public String getStringValueWithBailey(String path, Output<String> pathWhereFound, Output<String> localeWhereFound) {
+ String value = getStringValue(path);
+ if (CldrUtility.INHERITANCE_MARKER.equals(value)) {
+ value = getBaileyValue(path, pathWhereFound, localeWhereFound);
+ } else {
+ Status status = new Status();
+ String localeWhereFound2 = getSourceLocaleID(path, status);
+ if (localeWhereFound != null) localeWhereFound.value = localeWhereFound2;
+ if (pathWhereFound != null) pathWhereFound.value = status.pathWhereFound;
+ }
+ return value;
+ }
+
+ /**
* Return the distinguished paths that have the specified value. The pathPrefix and pathMatcher
* can be used to restrict the returned paths to those matching.
* The pathMatcher can be null (equals .*).
@@ -3600,4 +3622,109 @@
if (locked) throw new UnsupportedOperationException("Attempt to modify locked object");
this.dtdType = dtdType;
}
+
+ /**
+ * Used only for TestExampleGenerator.
+ */
+ public void valueChanged(String xpath) {
+ if (isResolved()) {
+ ResolvingSource resSource = (ResolvingSource) dataSource;
+ resSource.valueChanged(xpath, resSource);
+ }
+ }
+
+ /**
+ * Used only for TestExampleGenerator.
+ */
+ public void disableCaching() {
+ dataSource.disableCaching();
+ }
+
+ /**
+ * Get a constructed value for the given path, if it is a path for which values can be constructed
+ *
+ * @param xpath the given path, such as //ldml/localeDisplayNames/languages/language[@type="zh_Hans"]
+ * @return the constructed value, or null if this path doesn't have constructed values
+ */
+ public String getConstructedValue(String xpath) {
+ if (xpath.startsWith("//ldml/localeDisplayNames/languages/language[@type=\"") && xpath.contains("_")) {
+ XPathParts parts = XPathParts.getFrozenInstance(xpath);
+ String type = parts.getAttributeValue(-1, "type");
+ if (type.contains("_")) {
+ String alt = parts.getAttributeValue(-1, "alt");
+ if (alt == null) {
+ return getName(type, true);
+ } else {
+ return getName(type, true, new SimpleAltPicker(alt));
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get the string value for the winning path
+ *
+ * Do so taking constructed values into account.
+ *
+ * Currently this is only intended for use by VettingViewer.FileInfo.getFileInfo,
+ * to fix an urgent Dashboard bug. In the long run maybe it should replace
+ * getWinningValue, or the two methods should be merged somehow.
+ *
+ * Reference:
+ * CLDR-13457 Dashboard does not show all Error/Missing/New… values
+ *
+ * @param path
+ * @return the winning value
+ */
+ public String getWinningValueForVettingViewer(String path) {
+ final String winningPath = getWinningPath(path);
+ return winningPath == null ? null : getStringValueForVettingViewer(winningPath);
+ }
+
+ /**
+ * Get a string value from an xpath.
+ *
+ * Do so taking constructed values into account.
+ *
+ * Currently called only by getWinningValueForVettingViewer
+ *
+ * References:
+ * CLDR-13263 Merge getConstructedBaileyValue and getBaileyValue
+ * CLDR-13457 Dashboard does not show all Error/Missing/New… values
+ */
+ private String getStringValueForVettingViewer(String xpath) {
+ try {
+ String constructedValue = getConstructedValue(xpath);
+ if (constructedValue != null) {
+ String value = getStringValueUnresolved(xpath);
+ if (value == null || CldrUtility.INHERITANCE_MARKER.equals(value)) {
+ return constructedValue;
+ }
+ }
+ String result = dataSource.getValueAtPath(xpath);
+ if (result == null && dataSource.isResolving()) {
+ final String fallbackPath = getFallbackPath(xpath, false);
+ if (fallbackPath != null) {
+ result = dataSource.getValueAtPath(fallbackPath);
+ }
+ }
+ return result;
+ } catch (Exception e) {
+ throw new UncheckedExecutionException("Bad path: " + xpath, e);
+ }
+ }
+
+ /**
+ * Get the string value for the given path in this locale,
+ * without resolving to any other path or locale.
+ *
+ * @param xpath the given path
+ * @return the string value, unresolved
+ */
+ private String getStringValueUnresolved(String xpath) {
+ CLDRFile sourceFileUnresolved = this.getUnresolved();
+ return sourceFileUnresolved.getStringValue(xpath);
+ }
+
}
diff --git a/tools/java/org/unicode/cldr/util/CLDRLocale.java b/tools/java/org/unicode/cldr/util/CLDRLocale.java
index e5193e1..d4ad987 100644
--- a/tools/java/org/unicode/cldr/util/CLDRLocale.java
+++ b/tools/java/org/unicode/cldr/util/CLDRLocale.java
@@ -2,11 +2,11 @@
package org.unicode.cldr.util;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import com.google.common.cache.Cache;
@@ -112,6 +112,7 @@
return ldn.languageDisplayName(cldrLocale.getLanguage());
}
+ @SuppressWarnings("unused")
@Override
public String getDisplayName(CLDRLocale cldrLocale, boolean onlyConstructCompound, Transform<String, String> altPicker) {
return getDisplayName(cldrLocale);
@@ -152,8 +153,7 @@
public String getDisplayVariant(CLDRLocale cldrLocale) {
if (file != null) return file.getName("variant", cldrLocale.getVariant());
return tryForBetter(super.getDisplayVariant(cldrLocale),
- cldrLocale.getVariant(),
- "variant");
+ cldrLocale.getVariant());
}
@Override
@@ -172,27 +172,24 @@
public String getDisplayScript(CLDRLocale cldrLocale) {
if (file != null) return file.getName("script", cldrLocale.getScript());
return tryForBetter(super.getDisplayScript(cldrLocale),
- cldrLocale.getScript(),
- "language");
+ cldrLocale.getScript());
}
@Override
public String getDisplayLanguage(CLDRLocale cldrLocale) {
if (file != null) return file.getName("language", cldrLocale.getLanguage());
return tryForBetter(super.getDisplayLanguage(cldrLocale),
- cldrLocale.getLanguage(),
- "language");
+ cldrLocale.getLanguage());
}
@Override
public String getDisplayCountry(CLDRLocale cldrLocale) {
if (file != null) return file.getName("territory", cldrLocale.getCountry());
return tryForBetter(super.getDisplayLanguage(cldrLocale),
- cldrLocale.getLanguage(),
- "territory");
+ cldrLocale.getLanguage());
}
- private String tryForBetter(String superString, String code, String type) {
+ private String tryForBetter(String superString, String code) {
if (superString.equals(code)) {
String fromLst = StandardCodes.make().getData("language", code);
if (fromLst != null && !fromLst.equals(code)) {
@@ -215,9 +212,18 @@
};
/**
- * Reference to the parent CLDRLocale
+ * The parent locale id string, or null if no parent
*/
- private CLDRLocale parent = null;
+ private String parentId;
+
+ /**
+ * Reference to the parent CLDRLocale.
+ *
+ * It is volatile, and accessed directly only by getParent,
+ * since it uses the double-check idiom for lazy initialization.
+ */
+ private volatile CLDRLocale parentLocale;
+
/**
* Cached ICU format locale
*/
@@ -236,15 +242,7 @@
private LocaleIDParser parts = null;
/**
- * Construct a CLDRLocale from an ICU ULocale.
- * Internal, called by the factory function.
- */
- private CLDRLocale(ULocale loc) {
- init(loc);
- }
-
- /**
- * Returns the BCP47 langauge tag for all except root. For root, returns "root" = ROOT_NAME.
+ * Returns the BCP47 language tag for all except root. For root, returns "root" = ROOT_NAME.
* @return
*/
private String toDisplayLanguageTag() {
@@ -267,46 +265,22 @@
* Construct a CLDRLocale from a string with the full locale ID.
* Internal, called by the factory function.
*
- * @param str
- */
- private CLDRLocale(String str) {
- init(str);
- }
-
- /**
- * Initialize a CLDRLocale from a ULocale
- *
- * @param loc
- */
- private void init(ULocale loc) {
- ulocale = loc;
- init(loc.getBaseName());
- }
-
- /**
- * Initialize a CLDRLocale from a string.
- *
* @param str the string representing a locale.
*
* If str is empty, it's equal to ULocale.ROOT.getBaseName(), and we are
* initializing a CLDRLocale for root.
*/
- private void init(String str) {
+ private CLDRLocale(String str) {
str = process(str);
if (rootMatches(str)) {
fullname = ROOT_NAME;
- parent = null;
+ parentId = null;
} else {
parts = new LocaleIDParser();
parts.set(str);
fullname = parts.toString();
- String parentId = LocaleIDParser.getParent(str);
+ parentId = LocaleIDParser.getParent(str);
if (DEBUG) System.out.println(str + " par = " + parentId);
- if (parentId != null && parentId.length() > 0) {
- parent = CLDRLocale.getInstance(parentId);
- } else {
- parent = null; // probably, we are root or we are supplemental
- }
}
basename = fullname;
if (ulocale == null) {
@@ -372,26 +346,18 @@
* @return
*/
public static CLDRLocale getInstance(String s) {
- synchronized(CLDRLocale.class) {
- if (s == null) {
- return null;
- }
- /*
- * Normalize variations of ROOT_NAME before checking stringToLoc.
- */
- if (rootMatches(s)) {
- s = ROOT_NAME;
- }
- CLDRLocale loc = stringToLoc.get(s);
- if (loc == null) {
- loc = new CLDRLocale(s);
- loc.register();
- }
- return loc;
+ if (s == null) {
+ return null;
}
+ /*
+ * Normalize variations of ROOT_NAME before checking stringToLoc.
+ */
+ if (rootMatches(s)) {
+ s = ROOT_NAME;
+ }
+ return stringToLoc.computeIfAbsent(s, k -> new CLDRLocale(k));
}
-
/**
* Does the given string match the root locale? Treat empty string as matching,
* for compatibility with ULocale.ROOT (which is NOT the same as CLDRLocale.ROOT).
@@ -417,35 +383,42 @@
* @return the CLDRLocale
*/
public static CLDRLocale getInstance(ULocale u) {
- synchronized(CLDRLocale.class) {
- if (u == null) return null;
- CLDRLocale loc = ulocToLoc.get(u);
- if (loc == null) {
- loc = new CLDRLocale(u);
- loc.register();
- }
- return loc;
+ if (u == null) {
+ return null;
}
+ return getInstance(u.getBaseName());
}
- /**
- * Register the singleton instance.
- */
- private void register() {
- stringToLoc.put(this.toString(), this);
- ulocToLoc.put(this.toULocale(), this);
- }
-
- private static Hashtable<String, CLDRLocale> stringToLoc = new Hashtable<String, CLDRLocale>();
- private static Hashtable<ULocale, CLDRLocale> ulocToLoc = new Hashtable<ULocale, CLDRLocale>();
+ private static ConcurrentHashMap<String, CLDRLocale> stringToLoc = new ConcurrentHashMap<String, CLDRLocale>();
/**
* Return the parent locale of this item. Null if no parent (root has no parent)
*
- * @return
+ * @return the parent locale, or null
+ *
+ * Use lazy initialization for parentLocale, since getInstance calling itself
+ * recursively for the parent could cause ConcurrentHashMap to hang within computeIfAbsent.
+ *
+ * Use the "double-check idiom with a volatile field" for high-performance thread-safe
+ * lazy initialization:
+ * https://www.oracle.com/technical-resources/articles/javase/bloch-effective-08-qa.html
+ *
+ * For further efficiency, return null immediately if parentId is null.
*/
public CLDRLocale getParent() {
- return parent;
+ if (parentId == null) {
+ return null;
+ }
+ CLDRLocale result = parentLocale;
+ if (result == null) {
+ synchronized(this) {
+ result = parentLocale;
+ if (result == null) {
+ parentLocale = result = CLDRLocale.getInstance(parentId);
+ }
+ }
+ }
+ return result;
}
/**
@@ -454,6 +427,7 @@
public boolean childOf(CLDRLocale other) {
if (other == null) return false;
if (other == this) return true;
+ CLDRLocale parent = getParent();
if (parent == null) return false; // end
return parent.childOf(other);
}
@@ -471,12 +445,10 @@
CLDRLocale what = newThis;
public boolean hasNext() {
- // TODO Auto-generated method stub
return what.getParent() != null;
}
public CLDRLocale next() {
- // TODO Auto-generated method stub
CLDRLocale curr = what;
if (what != null) {
what = what.getParent();
@@ -595,7 +567,6 @@
}
});
} catch (ExecutionException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
return null;
}
@@ -667,13 +638,13 @@
CLDRLocale res;
if (this == ROOT) {
res = null;
- ;
- } else if (this.parent == ROOT) {
- res = this;
- } else if (this.parent == null) {
- res = this;
} else {
- res = parent.getHighestNonrootParent();
+ CLDRLocale parent = getParent();
+ if (parent == ROOT || parent == null) {
+ res = this;
+ } else {
+ res = parent.getHighestNonrootParent();
+ }
}
if (DEBUG) System.out.println(this + ".HNRP=" + res);
return res;
diff --git a/tools/java/org/unicode/cldr/util/CLDRPaths.java b/tools/java/org/unicode/cldr/util/CLDRPaths.java
index aedeaf9..7d86111 100644
--- a/tools/java/org/unicode/cldr/util/CLDRPaths.java
+++ b/tools/java/org/unicode/cldr/util/CLDRPaths.java
@@ -34,7 +34,7 @@
/** Maintained in GitHub, base directory for CLDR */
public static final String BASE_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("CLDR_DIR", null));
-
+
public static final String COMMON_DIRECTORY = CldrUtility.getPath(BASE_DIRECTORY, "common/");
public static final String COLLATION_DIRECTORY = CldrUtility.getPath(COMMON_DIRECTORY, COLLATION_SUBDIR);
public static final String CASING_DIRECTORY = CldrUtility.getPath(COMMON_DIRECTORY, CASING_SUBDIR);
@@ -81,9 +81,8 @@
public static final String ARCHIVE_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("ARCHIVE",
CldrUtility.getPath(LOCAL_DIRECTORY, "cldr-archive/")));
- public static final String LAST_DIRECTORY = ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.PREVIOUS_CHART_VERSION + "/";
- public static final String LAST_RELEASE_DIRECTORY = ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.LAST_RELEASE_VERSION + "/";
- public static final String LAST_COMMON_DIRECTORY = CldrUtility.getPath(CLDRPaths.LAST_DIRECTORY, "common/");
+ public static final String LAST_RELEASE_DIRECTORY = ARCHIVE_DIRECTORY + "cldr-" + ToolConstants.LAST_RELEASE_VERSION_WITH0 + "/";
+ public static final String LAST_COMMON_DIRECTORY = CldrUtility.getPath(LAST_RELEASE_DIRECTORY, "common/");
public static final String LAST_TRANSFORMS_DIRECTORY = CldrUtility.getPath(CLDRPaths.LAST_COMMON_DIRECTORY, TRANSFORMS_SUBDIR);
public static final String GEN_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("CLDR_GEN_DIR",
diff --git a/tools/java/org/unicode/cldr/util/CldrUtility.java b/tools/java/org/unicode/cldr/util/CldrUtility.java
index 2aac94b..9edfed8 100644
--- a/tools/java/org/unicode/cldr/util/CldrUtility.java
+++ b/tools/java/org/unicode/cldr/util/CldrUtility.java
@@ -155,11 +155,11 @@
return getPath(path, null);
}
- public static final String ANALYTICS = "<script type=\"text/javascript\">\n"
+ public static final String ANALYTICS = "<script>\n"
+ "var gaJsHost = ((\"https:\" == document.location.protocol) ? \"https://ssl.\" : \"http://www.\");\n"
+ "document.write(unescape(\"%3Cscript src='\" + gaJsHost + \"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E\"));\n"
+ "</script>\n"
- + "<script type=\"text/javascript\">\n"
+ + "<script>\n"
+ "try {\n"
+ "var pageTracker = _gat._getTracker(\"UA-7672775-1\");\n"
+ "pageTracker._trackPageview();\n"
@@ -1364,11 +1364,15 @@
}
public static String getCopyrightString() {
+ return getCopyrightString("");
+ }
+
+ public static String getCopyrightString(String linePrefix) {
// now do the rest
- return "Copyright \u00A9 1991-" + Calendar.getInstance().get(Calendar.YEAR) + " Unicode, Inc." + CldrUtility.LINE_SEPARATOR
- + "For terms of use, see http://www.unicode.org/copyright.html" + CldrUtility.LINE_SEPARATOR
- + "Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries." + CldrUtility.LINE_SEPARATOR
- + "CLDR data files are interpreted according to the LDML specification " + "(http://unicode.org/reports/tr35/)";
+ return linePrefix + "Copyright \u00A9 1991-" + Calendar.getInstance().get(Calendar.YEAR) + " Unicode, Inc." + CldrUtility.LINE_SEPARATOR
+ + linePrefix + "For terms of use, see http://www.unicode.org/copyright.html" + CldrUtility.LINE_SEPARATOR
+ + linePrefix + "Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries." + CldrUtility.LINE_SEPARATOR
+ + linePrefix + "CLDR data files are interpreted according to the LDML specification " + "(http://unicode.org/reports/tr35/)";
}
// TODO Move to collection utilities
diff --git a/tools/java/org/unicode/cldr/util/DtdData.java b/tools/java/org/unicode/cldr/util/DtdData.java
index 956ff94..4cefe32 100644
--- a/tools/java/org/unicode/cldr/util/DtdData.java
+++ b/tools/java/org/unicode/cldr/util/DtdData.java
@@ -99,6 +99,8 @@
CDATA, ID, IDREF, IDREFS, ENTITY, ENTITIES, NMTOKEN, NMTOKENS, ENUMERATED_TYPE
}
+ static final Set<String> DRAFT_ON_NON_LEAF_ALLOWED = ImmutableSet.of("collation", "transform", "unitPreferenceData");
+
public static class Attribute implements Named {
public final String name;
public final Element element;
@@ -119,8 +121,7 @@
element = element2;
name = aName.intern();
if (name.equals("draft") // normally never permitted on elements with children, but special cases...
- && !element.getName().equals("collation")
- && !element.getName().equals("transform")) {
+ && !DRAFT_ON_NON_LEAF_ALLOWED.contains(element.getName())) {
int elementChildrenCount = element.getChildren().size();
if (elementChildrenCount > 1
|| elementChildrenCount == 1 && !element.getChildren().keySet().iterator().next().getName().equals("cp")) {
@@ -294,25 +295,17 @@
}
public ValueStatus getValueStatus(String value) {
- return deprecatedValues.contains(value)
- ? ValueStatus.invalid
- : type == AttributeType.ENUMERATED_TYPE
- ? (values.containsKey(value)
- ? ValueStatus.valid
- : ValueStatus.invalid)
- : matchValue == null
- ? ValueStatus.unknown :
- matchValue.is(value)
- ? ValueStatus.valid
- : ValueStatus.invalid;
+ return deprecatedValues.contains(value) ? ValueStatus.invalid
+ : type == AttributeType.ENUMERATED_TYPE ? (values.containsKey(value) ? ValueStatus.valid : ValueStatus.invalid)
+ : matchValue == null ? ValueStatus.unknown
+ : matchValue.is(value) ? ValueStatus.valid
+ : ValueStatus.invalid;
}
public String getMatchString() {
- return type == AttributeType.ENUMERATED_TYPE
- ? "⟨" + CollectionUtilities.join(values.keySet(), ", ") + "⟩"
- : matchValue != null
- ? "⟪" + matchValue.toString() + "⟫"
- : "";
+ return type == AttributeType.ENUMERATED_TYPE ? "⟨" + CollectionUtilities.join(values.keySet(), ", ") + "⟩"
+ : matchValue != null ? "⟪" + matchValue.toString() + "⟫"
+ : "";
}
public Attribute getMatchingName(Map<Attribute, Integer> attributes) {
@@ -659,7 +652,7 @@
public static DtdData getInstance(DtdType type) {
return getInstance(type, CLDRConfig.getInstance().getCldrBaseDirectory());
}
-
+
/**
* Special form using version, used only by tests, etc.
*/
@@ -684,7 +677,7 @@
DtdData data = CACHE.computeIfAbsent(key, k -> getInstance(type, null, directory));
return data;
}
-
+
private static DtdData getInstance(DtdType type, String version, File directory) {
DtdData simpleHandler = new DtdData(type, version);
XMLFileReader xfr = new XMLFileReader().setHandler(simpleHandler);
@@ -1245,16 +1238,16 @@
"second", "second-short", "second-narrow",
"zone", "zone-short", "zone-narrow").freeze();
static MapComparator<String> unitOrder = new MapComparator<String>().add(
- "acceleration-g-force", "acceleration-meter-per-second-squared",
+ "acceleration-g-force", "acceleration-meter-per-square-second",
"angle-revolution", "angle-radian", "angle-degree", "angle-arc-minute", "angle-arc-second",
"area-square-kilometer", "area-hectare", "area-square-meter", "area-square-centimeter",
"area-square-mile", "area-acre", "area-square-yard", "area-square-foot", "area-square-inch",
"area-dunam",
"concentr-karat",
"concentr-milligram-per-deciliter", "concentr-millimole-per-liter",
- "concentr-part-per-million", "concentr-percent", "concentr-permille", "concentr-permyriad",
+ "concentr-permillion", "concentr-percent", "concentr-permille", "concentr-permyriad",
"concentr-mole",
- "consumption-liter-per-kilometer", "consumption-liter-per-100kilometers",
+ "consumption-liter-per-kilometer", "consumption-liter-per-100-kilometer",
"consumption-mile-per-gallon", "consumption-mile-per-gallon-imperial",
"digital-petabyte", "digital-terabyte", "digital-terabit", "digital-gigabyte", "digital-gigabit",
"digital-megabyte", "digital-megabit", "digital-kilobyte", "digital-kilobit",
@@ -1295,15 +1288,15 @@
"mass-solar-mass",
"power-gigawatt", "power-megawatt", "power-kilowatt", "power-watt", "power-milliwatt",
"power-horsepower",
- "pressure-millimeter-of-mercury",
- "pressure-pound-per-square-inch", "pressure-inch-hg", "pressure-bar", "pressure-millibar", "pressure-atmosphere",
+ "pressure-millimeter-ofhg",
+ "pressure-pound-force-per-square-inch", "pressure-inch-ofhg", "pressure-bar", "pressure-millibar", "pressure-atmosphere",
"pressure-pascal",
"pressure-hectopascal",
"pressure-kilopascal",
"pressure-megapascal",
"speed-kilometer-per-hour", "speed-meter-per-second", "speed-mile-per-hour", "speed-knot",
"temperature-generic", "temperature-celsius", "temperature-fahrenheit", "temperature-kelvin",
- "torque-pound-foot",
+ "torque-pound-force-foot",
"torque-newton-meter",
"volume-cubic-kilometer", "volume-cubic-meter", "volume-cubic-centimeter",
"volume-cubic-mile", "volume-cubic-yard", "volume-cubic-foot", "volume-cubic-inch",
diff --git a/tools/java/org/unicode/cldr/util/DtdType.java b/tools/java/org/unicode/cldr/util/DtdType.java
index 1db0353..d41446c 100644
--- a/tools/java/org/unicode/cldr/util/DtdType.java
+++ b/tools/java/org/unicode/cldr/util/DtdType.java
@@ -59,6 +59,12 @@
return DtdType.valueOf(m.group(1));
}
+ /**
+ * Print a header for an XML file, where the generatedBy is normally MethodHandles.lookup().lookupClass().
+ * The only time it needs to be changed is if it is not being called directly from the generating tool.
+ * @param generatedBy
+ * @return
+ */
public String header(Class<?> generatedBy) {
String gline = "";
if (generatedBy != null) {
diff --git a/tools/java/org/unicode/cldr/util/Emoji.java b/tools/java/org/unicode/cldr/util/Emoji.java
index 1b7e669..e304c82 100644
--- a/tools/java/org/unicode/cldr/util/Emoji.java
+++ b/tools/java/org/unicode/cldr/util/Emoji.java
@@ -3,18 +3,23 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.unicode.cldr.draft.FileUtilities;
import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.ibm.icu.dev.util.UnicodeMap;
import com.ibm.icu.impl.Utility;
import com.ibm.icu.lang.CharSequences;
import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.ICUException;
public class Emoji {
public static final String EMOJI_VARIANT = "\uFE0F";
@@ -39,15 +44,20 @@
static final UnicodeMap<String> emojiToMajorCategory = new UnicodeMap<>();
static final UnicodeMap<String> emojiToMinorCategory = new UnicodeMap<>();
static final UnicodeMap<String> toName = new UnicodeMap<>();
+ static {
+ emojiToMajorCategory.setErrorOnReset(true);
+ emojiToMinorCategory.setErrorOnReset(true);
+ toName.setErrorOnReset(true);
+ }
/**
* A mapping from a majorCategory to a unique ordering number, based on the first time it is encountered.
*/
- static final Map<String, Integer> majorToOrder = new HashMap<>();
+ static final Map<String, Long> majorToOrder = new HashMap<>();
/**
* A mapping from a minorCategory to a unique ordering number, based on the first time it is encountered.
*/
- static final Map<String, Integer> minorToOrder = new HashMap<>();
- static final Map<String, Integer> emojiToOrder = new LinkedHashMap<>();
+ static final Map<String, Long> minorToOrder = new HashMap<>();
+ static final Map<String, Long> emojiToOrder = new LinkedHashMap<>();
static final UnicodeSet nonConstructed = new UnicodeSet();
static final UnicodeSet allRgi = new UnicodeSet();
static final UnicodeSet allRgiNoES = new UnicodeSet();
@@ -61,15 +71,15 @@
Splitter semi = Splitter.on(CharMatcher.anyOf(";#")).trimResults();
String majorCategory = null;
String minorCategory = null;
- int majorOrder = 0;
- int minorOrder = 0;
+ long majorOrder = 0;
+ long minorOrder = 0;
//Multimap<Pair<Integer,Integer>,String> majorPlusMinorToEmoji = TreeMultimap.create();
for (String line : FileUtilities.in(Emoji.class, "data/emoji/emoji-test.txt")) {
if (line.startsWith("#")) {
line = line.substring(1).trim();
if (line.startsWith("group:")) {
majorCategory = line.substring("group:".length()).trim();
- Integer oldMajorOrder = majorToOrder.get(majorCategory);
+ Long oldMajorOrder = majorToOrder.get(majorCategory);
if (oldMajorOrder == null) {
majorToOrder.put(majorCategory, majorOrder = majorToOrder.size());
} else {
@@ -77,7 +87,7 @@
}
} else if (line.startsWith("subgroup:")) {
minorCategory = line.substring("subgroup:".length()).trim();
- Integer oldMinorOrder = minorToOrder.get(minorCategory);
+ Long oldMinorOrder = minorToOrder.get(minorCategory);
if (oldMinorOrder == null) {
minorToOrder.put(minorCategory, minorOrder = minorToOrder.size());
} else {
@@ -92,6 +102,9 @@
}
Iterator<String> it = semi.split(line).iterator();
String emojiHex = it.next();
+ if (emojiHex.contains("1F6FC")) {
+ int debug = 0;
+ }
String original = Utility.fromHex(emojiHex, 4, " ");
String type = it.next();
if (type.startsWith("fully-qualified")) {
@@ -101,7 +114,9 @@
emojiToMajorCategory.put(original, majorCategory);
emojiToMinorCategory.put(original, minorCategory);
String comment = it.next();
+ // The comment is now of the form: # 😁 E0.6 beaming face with smiling eyes
int spacePos = comment.indexOf(' ');
+ spacePos = comment.indexOf(' ', spacePos+1); // get second space
String name = comment.substring(spacePos+1).trim();
toName.put(original, name);
@@ -111,10 +126,10 @@
// Add the order. If it is not minimal, add that also.
if (!emojiToOrder.containsKey(original)) {
- emojiToOrder.put(original, emojiToOrder.size());
+ putUnique(emojiToOrder, original, emojiToOrder.size()*100L);
}
if (!emojiToOrder.containsKey(minimal)) {
- emojiToOrder.put(original, emojiToOrder.size());
+ putUnique(emojiToOrder, minimal, emojiToOrder.size()*100L);
}
//
// majorPlusMinorToEmoji.put(Pair.of(majorOrder, minorOrder), minimal);
@@ -154,6 +169,17 @@
allRgiNoES.freeze();
}
+ private static <K, V> void putUnique(Map<K, V> map, K key, V value) {
+ V oldValue = map.put(key, value);
+ if (oldValue != null) {
+ throw new ICUException("Attempt to change value of " + map
+ + " for " + key
+ + " from " + oldValue
+ + " to " + value
+ );
+ }
+ }
+
public static UnicodeSet getAllRgi() {
return allRgi;
}
@@ -162,11 +188,66 @@
return allRgiNoES;
}
+ public static final UnicodeMap<String> EXTRA_SYMBOL_MINOR_CATEGORIES = new UnicodeMap<>();
+ public static final Map<String,Long> EXTRA_SYMBOL_ORDER;
+ private static final boolean DEBUG = false;
+ static {
+ String[][] data = {
+ {"arrow", "→ ↓ ↑ ← ↔ ↕ ⇆ ⇅"},
+ {"alphanum", "© ® ℗ ™ µ"},
+ {"geometric", "▼ ▶ ▲ ◀ ● ○ ◯ ◊"},
+ {"math", "× ÷ √ ∞ ∆ ∇ ⁻ ¹ ² ³ ≡ ∈ ⊂ ∩ ∪ °"},
+ {"punctuation", "– — » « • · § † ‡"},
+ {"currency", "€ £ ¥ ₹ ₽"},
+ };
+ // get the maximum suborder for each subcategory
+ Map<String, Long> subcategoryToMaxSuborder = new HashMap<>();
+ for (String[] row : data) {
+ final String subcategory = row[0];
+ for (Entry<String, String> entry : emojiToMinorCategory.entrySet()) {
+ if (entry.getValue().equals(subcategory)) {
+ String emoji = entry.getKey();
+ Long order = emojiToOrder.get(emoji);
+ Long currentMax = subcategoryToMaxSuborder.get(subcategory);
+ if (currentMax == null || currentMax < order) {
+ subcategoryToMaxSuborder.put(subcategory, order);
+ }
+ }
+ }
+ }
+ if (DEBUG) System.out.println(subcategoryToMaxSuborder);
+ Splitter spaceSplitter = Splitter.on(' ').omitEmptyStrings();
+ Map<String,Long> _EXTRA_SYMBOL_ORDER = new LinkedHashMap<>();
+ for (String[] row : data) {
+ final String subcategory = row[0];
+ final String spaceDelimitedStringList = row[1];
+
+ List<String> items = spaceSplitter.splitToList(spaceDelimitedStringList);
+ final UnicodeSet uset = new UnicodeSet().addAll(items);
+ if (uset.containsSome(EXTRA_SYMBOL_MINOR_CATEGORIES.keySet())) {
+ throw new IllegalArgumentException("Duplicate values in " + EXTRA_SYMBOL_MINOR_CATEGORIES);
+ }
+ EXTRA_SYMBOL_MINOR_CATEGORIES.putAll(uset, subcategory);
+ long count = subcategoryToMaxSuborder.get(subcategory);
+ for (String s : items) {
+ ++count;
+ _EXTRA_SYMBOL_ORDER.put(s, count);
+ }
+ subcategoryToMaxSuborder.put(subcategory, count);
+ }
+ if (DEBUG) System.out.println(_EXTRA_SYMBOL_ORDER);
+ EXTRA_SYMBOL_MINOR_CATEGORIES.freeze();
+ EXTRA_SYMBOL_ORDER = ImmutableMap.copyOf(_EXTRA_SYMBOL_ORDER);
+ }
+
public static String getMinorCategory(String emoji) {
String minorCat = emojiToMinorCategory.get(emoji);
if (minorCat == null) {
- throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji
- + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"minor\", ...");
+ minorCat = EXTRA_SYMBOL_MINOR_CATEGORIES.get(emoji);
+ if (minorCat == null) {
+ throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji
+ + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"minor\", ...");
+ }
}
return minorCat;
}
@@ -175,27 +256,36 @@
return toName.get(emoji);
}
-
-// public static int getMinorToOrder(String minor) {
-// Integer result = minorToOrder.get(minor);
-// return result == null ? Integer.MAX_VALUE : result;
-// }
-
- public static int getEmojiToOrder(String emoji) {
- Integer result = emojiToOrder.get(emoji);
- return result == null ? Integer.MAX_VALUE : result;
+ public static long getEmojiToOrder(String emoji) {
+ Long result = emojiToOrder.get(emoji);
+ if (result == null) {
+ result = EXTRA_SYMBOL_ORDER.get(emoji);
+ if (result == null) {
+ throw new InternalCldrException("No Order found for " + emoji
+ + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"minor\", ...");
+ }
+ }
+ return result;
}
- public static int getEmojiMinorOrder(String minor) {
- Integer result = minorToOrder.get(minor);
- return result == null ? Integer.MAX_VALUE : result;
+ public static long getEmojiMinorOrder(String minor) {
+ Long result = minorToOrder.get(minor);
+ if (result == null) {
+ throw new InternalCldrException("No minor category (aka subgroup) found for " + minor
+ + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"minor\", ...");
+ }
+ return result;
}
public static String getMajorCategory(String emoji) {
String majorCat = emojiToMajorCategory.get(emoji);
if (majorCat == null) {
- throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji
- + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"major\", ...");
+ if (EXTRA_SYMBOL_MINOR_CATEGORIES.containsKey(emoji)) {
+ majorCat = "Symbols";
+ } else {
+ throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji
+ + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"major\", ...");
+ }
}
return majorCat;
}
@@ -208,6 +298,12 @@
return emojiToMinorCategory.values();
}
+ public static Set<String> getMinorCategoriesWithExtras() {
+ Set<String> result = new LinkedHashSet<>(emojiToMinorCategory.values());
+ result.addAll(EXTRA_SYMBOL_MINOR_CATEGORIES.getAvailableValues());
+ return ImmutableSet.copyOf(result);
+ }
+
public static UnicodeSet getNonConstructed() {
return nonConstructed;
}
diff --git a/tools/java/org/unicode/cldr/util/ICUServiceBuilder.java b/tools/java/org/unicode/cldr/util/ICUServiceBuilder.java
index d880285..df610be 100644
--- a/tools/java/org/unicode/cldr/util/ICUServiceBuilder.java
+++ b/tools/java/org/unicode/cldr/util/ICUServiceBuilder.java
@@ -6,6 +6,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Matcher;
import org.unicode.cldr.util.CLDRFile.Status;
@@ -57,6 +58,8 @@
private Map<String, DateFormatSymbols> cacheDateFormatSymbols = new HashMap<String, DateFormatSymbols>();
private Map<String, NumberFormat> cacheNumberFormats = new HashMap<String, NumberFormat>();
private Map<String, DecimalFormatSymbols> cacheDecimalFormatSymbols = new HashMap<String, DecimalFormatSymbols>();
+ private Map<String, RuleBasedCollator> cacheRuleBasedCollators = new HashMap<String, RuleBasedCollator>();
+
private SupplementalDataInfo supplementalData;
// private Factory cldrFactory;
@@ -99,6 +102,7 @@
cacheNumberFormats.clear();
cacheDateFormatSymbols.clear();
cacheDecimalFormatSymbols.clear();
+ cacheRuleBasedCollators.clear();
return this;
}
@@ -118,6 +122,7 @@
result.cacheNumberFormats.clear();
result.cacheDateFormatSymbols.clear();
result.cacheDecimalFormatSymbols.clear();
+ result.cacheRuleBasedCollators.clear();
ISBMap.put(locale, result);
}
@@ -125,6 +130,15 @@
}
public RuleBasedCollator getRuleBasedCollator(String type) throws Exception {
+ RuleBasedCollator col = (RuleBasedCollator) cacheRuleBasedCollators.get(type);
+ if (col == null) {
+ col = _getRuleBasedCollator(type);
+ cacheRuleBasedCollators.put(type, col);
+ }
+ return (RuleBasedCollator) col.clone();
+ }
+
+ private RuleBasedCollator _getRuleBasedCollator(String type) throws Exception {
String rules = "";
String collationType;
if ("default".equals(type)) {
@@ -334,7 +348,7 @@
DateFormatSymbols.NARROW);
cacheDateFormatSymbols.put(key, formatData);
- return formatData;
+ return (DateFormatSymbols) formatData.clone();
}
/**
@@ -523,7 +537,14 @@
return fractDigits;
}
+ @Override
public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (other == null || !(other instanceof MyCurrency)) {
+ return false;
+ }
MyCurrency that = (MyCurrency) other;
return roundingIncrement == that.roundingIncrement
&& fractDigits == that.fractDigits
@@ -531,11 +552,10 @@
&& displayName.equals(that.displayName);
}
-// public int hashCode(Object other) {
-// MyCurrency that = (MyCurrency) other;
-// return (((int) (roundingIncrement * 37) + fractDigits) * 37 + symbol.hashCode()) * 37
-// + displayName.hashCode();
-// }
+ @Override
+ public int hashCode() {
+ return Objects.hash(roundingIncrement, fractDigits, symbol, displayName);
+ }
}
static int CURRENCY = 0, OTHER_KEY = 1, PATTERN = 2;
@@ -573,11 +593,12 @@
public NumberFormat getGenericNumberFormat(String ns) {
// CLDRFile cldrFile = cldrFactory.make(localeID, true);
NumberFormat result = (NumberFormat) cacheNumberFormats.get(cldrFile.getLocaleID() + "@numbers=" + ns);
- if (result != null) return result;
- ULocale ulocale = new ULocale(cldrFile.getLocaleID() + "@numbers=" + ns);
- result = NumberFormat.getInstance(ulocale);
- cacheNumberFormats.put(cldrFile.getLocaleID() + "@numbers=" + ns, result);
- return result;
+ if (result == null) {
+ ULocale ulocale = new ULocale(cldrFile.getLocaleID() + "@numbers=" + ns);
+ result = NumberFormat.getInstance(ulocale);
+ cacheNumberFormats.put(cldrFile.getLocaleID() + "@numbers=" + ns, result);
+ }
+ return (NumberFormat) result.clone();
}
public DecimalFormat getNumberFormat(String pattern) {
@@ -598,7 +619,7 @@
+ "/" + currencySymbol;
DecimalFormat result = (DecimalFormat) cacheNumberFormats.get(key);
if (result != null) {
- return result;
+ return (DecimalFormat) result.clone();
}
String pattern = kind == PATTERN ? key1 : getPattern(key1, kind);
@@ -687,7 +708,7 @@
result.setParseIntegerOnly(true);
}
cacheNumberFormats.put(key, result);
- return result;
+ return (DecimalFormat) result.clone();
}
private String fixCurrencySpacing(String pattern, String symbol) {
@@ -727,7 +748,9 @@
String key = (numberSystem == null) ? cldrFile.getLocaleID() : cldrFile.getLocaleID() + "@numbers="
+ numberSystem;
DecimalFormatSymbols symbols = (DecimalFormatSymbols) cacheDecimalFormatSymbols.get(key);
- if (symbols != null) return symbols;
+ if (symbols != null) {
+ return (DecimalFormatSymbols) symbols.clone();
+ }
symbols = new DecimalFormatSymbols();
if (numberSystem == null) {
@@ -768,17 +791,17 @@
}
String prefix = "//ldml/numbers/currencyFormats/currencySpacing/beforeCurrency/";
- beforeCurrencyMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "currencyMatch"));
- beforeSurroundingMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "surroundingMatch"));
+ beforeCurrencyMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "currencyMatch")).freeze();
+ beforeSurroundingMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "surroundingMatch")).freeze();
beforeInsertBetween = cldrFile.getWinningValueWithBailey(prefix + "insertBetween");
prefix = "//ldml/numbers/currencyFormats/currencySpacing/afterCurrency/";
- afterCurrencyMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "currencyMatch"));
- afterSurroundingMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "surroundingMatch"));
+ afterCurrencyMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "currencyMatch")).freeze();
+ afterSurroundingMatch = new UnicodeSet(cldrFile.getWinningValueWithBailey(prefix + "surroundingMatch")).freeze();
afterInsertBetween = cldrFile.getWinningValueWithBailey(prefix + "insertBetween");
cacheDecimalFormatSymbols.put(key, symbols);
- return symbols;
+ return (DecimalFormatSymbols) symbols.clone();
}
private char getSymbolCharacter(String key, String numsys) {
diff --git a/tools/java/org/unicode/cldr/util/LogicalGrouping.java b/tools/java/org/unicode/cldr/util/LogicalGrouping.java
index c17ed37..ec1b803 100644
--- a/tools/java/org/unicode/cldr/util/LogicalGrouping.java
+++ b/tools/java/org/unicode/cldr/util/LogicalGrouping.java
@@ -31,7 +31,7 @@
"Greenland_Eastern", "Greenland_Western", "Hawaii_Aleutian", "Hong_Kong", "Hovd",
"Iran", "Irkutsk", "Israel", "Japan", "Kamchatka", "Korea", "Krasnoyarsk",
"Lord_Howe", "Macau", "Magadan", "Mauritius", "Mexico_Northwest", "Mexico_Pacific", "Mongolia", "Moscow", "New_Caledonia",
- "New_Zealand", "Newfoundland", "Noronha", "Novosibirsk", "Omsk", "Pakistan", "Paraguay", "Peru", "Philippines",
+ "New_Zealand", "Newfoundland", "Norfolk", "Noronha", "Novosibirsk", "Omsk", "Pakistan", "Paraguay", "Peru", "Philippines",
"Pierre_Miquelon", "Qyzylorda", "Sakhalin", "Samara", "Samoa",
"Taipei", "Tonga", "Turkmenistan", "Uruguay", "Uzbekistan",
"Vanuatu", "Vladivostok", "Volgograd", "Yakutsk", "Yekaterinburg");
@@ -71,7 +71,7 @@
* Return a sorted set of paths that are in the same logical set as the given path
*
* @param path the distinguishing xpath
- * @return the set of paths
+ * @return the set of paths, or null (to be treated as equivalent to empty set)
*
* For example, given the path
*
@@ -92,7 +92,8 @@
*/
public static Set<String> getPaths(CLDRFile cldrFile, String path) {
if (path == null) {
- return new TreeSet<String>(); // return empty set for null path
+ return null; // return null for null path
+ // return new TreeSet<String>(); // return empty set for null path
}
XPathParts parts = null;
PathType pathType = null;
@@ -113,6 +114,7 @@
if (pathType == PathType.SINGLETON) {
/*
* Skip cache for PathType.SINGLETON and simply return a set of one.
+ * TODO: should we ever return null instead of singleton here?
*/
Set<String> set = new TreeSet<String>();
set.add(path);
@@ -243,7 +245,7 @@
DAY_PERIODS {
@Override
void addPaths(Set<String> set, CLDRFile cldrFile, String path, XPathParts parts) {
- if (path.endsWith("alias")) {
+ if (parts.containsElement("alias")) {
set.add(path);
} else {
String dayPeriodType = parts.findAttributeValue("dayPeriod", "type");
diff --git a/tools/java/org/unicode/cldr/util/MapComparator.java b/tools/java/org/unicode/cldr/util/MapComparator.java
index 7ce1bd0..538a42d 100644
--- a/tools/java/org/unicode/cldr/util/MapComparator.java
+++ b/tools/java/org/unicode/cldr/util/MapComparator.java
@@ -242,4 +242,9 @@
throw new InternalError("should never happen");
}
}
+
+ public int getOrdering(K item) {
+ Integer result = ordering.get(item);
+ return result == null ? -1 : result;
+ }
}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/MatchValue.java b/tools/java/org/unicode/cldr/util/MatchValue.java
index 35c54ac..6a54b68 100644
--- a/tools/java/org/unicode/cldr/util/MatchValue.java
+++ b/tools/java/org/unicode/cldr/util/MatchValue.java
@@ -2,20 +2,26 @@
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeMap;
import java.util.TreeSet;
import java.util.function.IntFunction;
import java.util.regex.Pattern;
import org.unicode.cldr.util.StandardCodes.LstrType;
+import org.unicode.cldr.util.Validity.Status;
+import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.ibm.icu.dev.util.CollectionUtilities;
import com.ibm.icu.impl.Relation;
@@ -31,7 +37,7 @@
@Override
public abstract boolean is(String item);
public abstract String getName();
-
+
@Override
public String toString() {
return getName();
@@ -155,24 +161,101 @@
return false;
}
+ public static class EnumParser<T extends Enum> {
+ private final Class<T> aClass;
+ private final Set<T> all;
+
+ private EnumParser(Class<T> aClass) {
+ this.aClass = aClass;
+ all = ImmutableSet.copyOf(EnumSet.allOf(aClass));
+ }
+
+ public static <T> EnumParser of(Class<T> aClass) {
+ return new EnumParser(aClass);
+ }
+
+ public Set<T> parse(String text) {
+ Set<T> statuses = EnumSet.noneOf(aClass);
+ boolean negative = text.startsWith("!");
+ if (negative) {
+ text = text.substring(1);
+ }
+ for (String item : SPLIT_SPACE_OR_COMMA.split(text)) {
+ statuses.add(getItem(item));
+ }
+ if (negative) {
+ TreeSet<T> temp = new TreeSet<>(all);
+ temp.removeAll(statuses);
+ statuses = temp;
+ }
+ return ImmutableSet.copyOf(statuses);
+ }
+ private T getItem(String text) {
+ try {
+ return (T) aClass.getMethod("valueOf", String.class).invoke(null, text);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public String format(Set<?> set) {
+ if (set.size() > all.size()/2) {
+ TreeSet<T> temp = new TreeSet<>(all);
+ temp.removeAll(set);
+ return "!" + Joiner.on(' ').join(temp);
+ } else {
+ return Joiner.on(' ').join(set);
+ }
+ }
+
+ public boolean isAll(Set<Status> statuses) {
+ return statuses.equals(all);
+ }
+ }
+
static public class ValidityMatchValue extends MatchValue {
private final LstrType type;
+ private final boolean shortId;
+ private final Set<Status> statuses;
+ private static Map<String, Status> shortCodeToStatus;
+ private static final EnumParser<Status> enumParser = EnumParser.of(Status.class);
@Override
public String getName() {
- return "validity/" + type.toString();
+ return "validity/"
+ + (shortId ? "short-" : "") + type.toString()
+ + (enumParser.isAll(statuses) ? "" : "/" + enumParser.format(statuses));
}
private ValidityMatchValue(LstrType type) {
+ this(type, null, false);
+ }
+
+ private ValidityMatchValue(LstrType type, Set<Status> statuses, boolean shortId) {
this.type = type;
+ if (type != LstrType.unit && shortId) {
+ throw new IllegalArgumentException("short- not supported except for units");
+ }
+ this.shortId = shortId;
+ this.statuses = statuses == null ? EnumSet.allOf(Status.class) : ImmutableSet.copyOf(statuses);
}
public static MatchValue of(String typeName) {
if (typeName.equals("locale")) {
return new LocaleMatchValue();
}
+ int slashPos = typeName.indexOf('/');
+ Set<Status> statuses = null;
+ if (slashPos > 0) {
+ statuses = enumParser.parse(typeName.substring(slashPos+1));
+ typeName = typeName.substring(0, slashPos);
+ }
+ boolean shortId = typeName.startsWith("short-");
+ if (shortId) {
+ typeName = typeName.substring(6);
+ }
LstrType type = LstrType.valueOf(typeName);
- return new ValidityMatchValue(type);
+ return new ValidityMatchValue(type, statuses, shortId);
}
@Override
@@ -193,9 +276,30 @@
case language:
item = item.equals("root") ? "und" : item;
break;
+ case unit:
+ if (shortId) {
+ if (shortCodeToStatus == null) { // lazy evaluation to avoid circular dependencies
+ Map<String, Status> _shortCodeToStatus = new TreeMap<>();
+ for (Entry<String, Status> entry : Validity.getInstance().getCodeToStatus(LstrType.unit).entrySet()) {
+ String key = entry.getKey();
+ Status status = entry.getValue();
+ final String shortKey = key.substring(key.indexOf('-')+1);
+ Status old = _shortCodeToStatus.get(shortKey);
+ if (old == null) {
+ _shortCodeToStatus.put(shortKey, status);
+// } else {
+// System.out.println("Skipping duplicate status: " + key + " old: " + old + " new: " + status);
+ }
+ }
+ shortCodeToStatus = ImmutableMap.copyOf(_shortCodeToStatus);
+ }
+ final Status status = shortCodeToStatus.get(item);
+ return status != null && statuses.contains(status);
+ }
default: break;
}
- return Validity.getInstance().getCodeToStatus(type).get(item) != null;
+ final Status status = Validity.getInstance().getCodeToStatus(type).get(item);
+ return status != null && statuses.contains(status);
}
}
@@ -340,6 +444,7 @@
}
static final Splitter LIST = Splitter.on(", ").trimResults();
+ static final Splitter SPLIT_SPACE_OR_COMMA = Splitter.on(Pattern.compile("[, ]")).omitEmptyStrings().trimResults();
static public class LiteralMatchValue extends MatchValue {
private final Set<String> items;
@@ -441,7 +546,7 @@
static public class AnyMatchValue extends MatchValue {
final String key;
-
+
public AnyMatchValue(String key) {
this.key = key;
}
@@ -544,7 +649,7 @@
}
}
}
-
+
static public class UnicodeSpanMatchValue extends MatchValue {
final UnicodeSet uset;
diff --git a/tools/java/org/unicode/cldr/util/Organization.java b/tools/java/org/unicode/cldr/util/Organization.java
index 41539f0..f5fc148 100644
--- a/tools/java/org/unicode/cldr/util/Organization.java
+++ b/tools/java/org/unicode/cldr/util/Organization.java
@@ -32,6 +32,7 @@
iran_hci("Iran HCI"),
kendra("Kendra (Nepal)"),
kotoistus("Kotoistus (Finnish IT Ctr)"),
+ kunsill_malti("Il-Kunsill Nazzjonali tal-Ilsien Malti", "National Council for the Maltese Language", "malta", "malti"),
lakota_lc("Lakota LC"),
lao_dpt("Lao Posts/Telecom??"),
longnow("The Long Now Foundation", "Long Now","PanLex"),
@@ -77,6 +78,10 @@
}
}
+ /**
+ * @param displayName Preferred display name for the organization
+ * @param names Alternate aliases for this organization
+ */
private Organization(String displayName, String... names) {
this.displayName = displayName;
this.names = names;
diff --git a/tools/java/org/unicode/cldr/util/PathHeader.java b/tools/java/org/unicode/cldr/util/PathHeader.java
index 7f01c3f..2568d4c 100644
--- a/tools/java/org/unicode/cldr/util/PathHeader.java
+++ b/tools/java/org/unicode/cldr/util/PathHeader.java
@@ -255,7 +255,7 @@
RegionMapping(SectionId.Supplemental),
WZoneMapping( SectionId.Supplemental),
Transform(SectionId.Supplemental),
- UnitPreferences(SectionId.Supplemental),
+ Units(SectionId.Supplemental),
Likely(SectionId.Supplemental),
LanguageMatch( SectionId.Supplemental),
TerritoryInfo(SectionId.Supplemental),
@@ -263,6 +263,7 @@
LanguageGroup( SectionId.Supplemental),
Fallback(SectionId.Supplemental),
Gender(SectionId.Supplemental),
+ Grammar(SectionId.Supplemental),
Metazone(SectionId.Supplemental),
NumberSystem( SectionId.Supplemental),
Plural(SectionId.Supplemental),
@@ -276,6 +277,7 @@
RBNF( SectionId.Supplemental),
Segmentation(SectionId.Supplemental),
DayPeriod(SectionId.Supplemental),
+
Category(SectionId.Characters),
// [Smileys, People, Animals & Nature, Food & Drink, Travel & Places, Activities, Objects, Symbols, Flags]
@@ -342,7 +344,7 @@
// Used for ordering
private final int headerOrder;
- private final int codeOrder;
+ private final long codeOrder;
private final SubstringOrder codeSuborder;
static final Pattern SEMI = PatternCache.get("\\s*;\\s*");
@@ -408,7 +410,7 @@
* @param status
*/
private PathHeader(SectionId sectionId, PageId pageId, String header,
- int headerOrder, String code, int codeOrder, SubstringOrder suborder, SurveyToolStatus status,
+ int headerOrder, String code, long codeOrder, SubstringOrder suborder, SurveyToolStatus status,
String originalPath) {
this.sectionId = sectionId;
this.pageId = pageId;
@@ -518,8 +520,9 @@
if (0 != (result = alphabeticCompare(header, other.header))) {
return result;
}
- if (0 != (result = codeOrder - other.codeOrder)) {
- return result;
+ long longResult;
+ if (0 != (longResult = codeOrder - other.codeOrder)) {
+ return longResult < 0 ? -1 : longResult > 0 ? 1 : 0;
}
if (codeSuborder != null) { // do all three cases, for transitivity
if (other.codeSuborder != null) {
@@ -559,8 +562,9 @@
public int compareCode(PathHeader other) {
int result;
- if (0 != (result = codeOrder - other.codeOrder)) {
- return result;
+ long longResult;
+ if (0 != (longResult = codeOrder - other.codeOrder)) {
+ return longResult < 0 ? -1 : longResult > 0 ? 1 : 0;
}
if (codeSuborder != null) { // do all three cases, for transitivity
if (other.codeSuborder != null) {
@@ -613,7 +617,7 @@
// synchronized with lookup
static final Map<RawData, String> samples = new HashMap<RawData, String>();
// synchronized with lookup
- static int order;
+ static long order;
static SubstringOrder suborder;
static final Map<String, PathHeader> cache = new HashMap<String, PathHeader>();
@@ -724,7 +728,7 @@
SectionId.forString(fix(data.section, 0)),
PageId.forString(fix(data.page, 0)),
fix(data.header, data.headerOrder),
- order, // only valid after call to fix. TODO, make
+ (int)order, // only valid after call to fix. TODO, make
// this cleaner
fix(data.code + (alt == null ? "" : ("-" + alt)), data.codeOrder),
order, // only valid after call to fix
@@ -1765,7 +1769,7 @@
@Override
public String transform(String source) {
String minorCat = Emoji.getMinorCategory(source);
- order = Emoji.getEmojiMinorOrder(source);
+ order = Emoji.getEmojiMinorOrder(minorCat);
return minorCat;
}
});
diff --git a/tools/java/org/unicode/cldr/util/PatternPlaceholders.java b/tools/java/org/unicode/cldr/util/PatternPlaceholders.java
index 464696d..45fa69d 100644
--- a/tools/java/org/unicode/cldr/util/PatternPlaceholders.java
+++ b/tools/java/org/unicode/cldr/util/PatternPlaceholders.java
@@ -13,8 +13,12 @@
public class PatternPlaceholders {
public enum PlaceholderStatus {
- DISALLOWED("No placeholders allowed."), OPTIONAL("Zero or one placeholder allowed."), MULTIPLE("Zero or more placeholders allowed."), LOCALE_DEPENDENT(
- "Varies by locale."), REQUIRED("Placeholder required");
+ DISALLOWED("No placeholders allowed."), //
+ OPTIONAL("Zero or one placeholder allowed."), //
+ MULTIPLE("Zero or more placeholders allowed."), //
+ LOCALE_DEPENDENT( "Varies by locale."),
+ REQUIRED("Placeholder required");
+
final String message;
private PlaceholderStatus(String message) {
diff --git a/tools/java/org/unicode/cldr/util/PluralSnapshot.java b/tools/java/org/unicode/cldr/util/PluralSnapshot.java
index aff4f86..84d779a 100644
--- a/tools/java/org/unicode/cldr/util/PluralSnapshot.java
+++ b/tools/java/org/unicode/cldr/util/PluralSnapshot.java
@@ -260,7 +260,7 @@
}
public static String getDefaultStyles() {
- return "<style type='text/css'>\n"
+ return "<style>\n"
+
"td.l, td.z, td.o, td.t, td.f, td.m, td.x, th.h, table.pluralComp {border: 1px solid #666; font-size: 8pt}\n"
+
diff --git a/tools/java/org/unicode/cldr/util/Rational.java b/tools/java/org/unicode/cldr/util/Rational.java
new file mode 100644
index 0000000..88004e5
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/Rational.java
@@ -0,0 +1,570 @@
+package org.unicode.cldr.util;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.ibm.icu.number.LocalizedNumberFormatter;
+import com.ibm.icu.number.Notation;
+import com.ibm.icu.number.NumberFormatter;
+import com.ibm.icu.number.Precision;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.ICUException;
+import com.ibm.icu.util.Output;
+
+/**
+ * Very basic class for rational numbers. No attempt to optimize, since it will just
+ * be used for testing within CLDR.
+ *
+ * @author markdavis
+ *
+ */
+public final class Rational implements Comparable<Rational> {
+ private static final Pattern INT_POWER_10 = Pattern.compile("10*");
+ public final BigInteger numerator;
+ public final BigInteger denominator;
+
+ // Constraints:
+ // always stored in normalized form.
+ // no common factor > 1 (reduced)
+ // denominator never negative
+ // if numerator is zero, denominator is 1 or 0
+ // if denominator is zero, numerator is 1, -1, or 0
+
+ public static final Rational ZERO = Rational.of(0);
+ public static final Rational ONE = Rational.of(1);
+ public static final Rational NEGATIVE_ONE = ONE.negate();
+
+ public static final Rational INFINITY = Rational.of(1,0);
+ public static final Rational NEGATIVE_INFINITY = INFINITY.negate();
+ public static final Rational NaN = Rational.of(0,0);
+
+ public static final Rational TEN = Rational.of(10, 1);
+ public static final Rational TENTH = TEN.reciprocal();
+
+ public static final char REPTEND_MARKER = '˙';
+
+ public static class RationalParser implements Freezable<RationalParser>{
+
+ public static RationalParser BASIC = new RationalParser().freeze();
+
+ private static Splitter slashSplitter = Splitter.on('/').trimResults();
+ private static Splitter starSplitter = Splitter.on('*').trimResults();
+
+ private Map<String,Rational> constants = new LinkedHashMap<>();
+ private Map<String,String> constantStatus = new LinkedHashMap<>();
+
+ public RationalParser addConstant(String id, String value, String status) {
+ if (constants.put(id, parse(value)) != null) {
+ throw new IllegalArgumentException("Can't reset constant " + id + " = " + value);
+ }
+ if (status != null) {
+ constantStatus.put(id, status);
+ }
+ return this;
+ }
+
+ /*
+ * input = comp (/ comp)?
+ * comp = comp2 (* comp2)*
+ * comp2 = digits (. digits)? | constant
+ * */
+
+ public Rational parse(String input) {
+ switch (input) {
+ case "NaN" : return NaN;
+ case "INF" : return INFINITY;
+ case "-INF": return NEGATIVE_INFINITY;
+ }
+ List<String> comps = slashSplitter.splitToList(input.replace(",", "")); // allow commas anywhere
+ try {
+ switch (comps.size()) {
+ case 1: return process(comps.get(0));
+ case 2: return process(comps.get(0)).divide(process(comps.get(1)));
+ default: throw new IllegalArgumentException("too many slashes in " + input);
+ }
+ } catch (Exception e) {
+ throw new ICUException("bad input: " + input, e);
+ }
+ }
+
+ private Rational process(String string) {
+ Rational result = null;
+ for (String comp : starSplitter.split(string)) {
+ Rational ratComp = process2(comp);
+ result = result == null ? ratComp : result.multiply(ratComp);
+ }
+ return result;
+ }
+
+ static final UnicodeSet ALLOWED_CHARS = new UnicodeSet("[-A-Za-z0-9_]").add(REPTEND_MARKER).freeze();
+
+ private Rational process2(String input) {
+ final char firstChar = input.charAt(0);
+ if (firstChar == '-' || (firstChar >= '0' && firstChar <= '9')) {
+ int pos = input.indexOf(REPTEND_MARKER);
+ if (pos < 0) {
+ return Rational.of(new BigDecimal(input));
+ }
+ // handle repeating fractions
+ String reptend = input.substring(pos+1);
+ int rlen = reptend.length();
+ input = input.substring(0,pos) + reptend;
+
+ BigDecimal rf = new BigDecimal(input);
+ BigDecimal rfPow = new BigDecimal(input+reptend).scaleByPowerOfTen(rlen);
+ BigDecimal num = rfPow.subtract(rf);
+
+ Rational result = Rational.of(num);
+ Rational den = Rational.of(BigDecimal.ONE.scaleByPowerOfTen(rlen).subtract(BigDecimal.ONE)); // could optimize
+ return result.divide(den);
+ } else {
+ if (!ALLOWED_CHARS.containsAll(input)) {
+ throw new IllegalArgumentException("Bad characters in: " + input);
+ }
+ Rational result = constants.get(input);
+ if (result == null) {
+ throw new IllegalArgumentException("Constant not defined: " + input);
+ }
+ return result;
+ }
+ }
+
+ boolean frozen = false;
+
+ @Override
+ public boolean isFrozen() {
+ return frozen;
+ }
+
+ @Override
+ public RationalParser freeze() {
+ if (!frozen) {
+ frozen = true;
+ constants = ImmutableMap.copyOf(constants);
+ constantStatus = ImmutableMap.copyOf(constantStatus);
+ }
+ return this;
+ }
+
+ @Override
+ public RationalParser cloneAsThawed() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<String, Rational> getConstants() {
+ return constants;
+ }
+ }
+
+ public static Rational of(long numerator, long denominator) {
+ return new Rational(BigInteger.valueOf(numerator), BigInteger.valueOf(denominator));
+ }
+
+ public static Rational of(long numerator) {
+ return new Rational(BigInteger.valueOf(numerator), BigInteger.ONE);
+ }
+
+ public static Rational of(BigInteger numerator, BigInteger denominator) {
+ return new Rational(numerator, denominator);
+ }
+
+ public static Rational of(BigInteger numerator) {
+ return new Rational(numerator, BigInteger.ONE);
+ }
+
+ public static Rational of(String simple) {
+ return RationalParser.BASIC.parse(simple);
+ }
+
+ private Rational(BigInteger numerator, BigInteger denominator) {
+ if (denominator.compareTo(BigInteger.ZERO) < 0) {
+ numerator = numerator.negate();
+ denominator = denominator.negate();
+ }
+ BigInteger gcd = numerator.gcd(denominator);
+ if (gcd.compareTo(BigInteger.ONE) > 0) {
+ numerator = numerator.divide(gcd);
+ denominator = denominator.divide(gcd);
+ }
+ this.numerator = numerator;
+ this.denominator = denominator;
+ }
+
+ public Rational add(Rational other) {
+ BigInteger gcd_den = denominator.gcd(other.denominator);
+ return new Rational(
+ numerator.multiply(other.denominator).divide(gcd_den)
+ .add(other.numerator.multiply(denominator).divide(gcd_den)),
+ denominator.multiply(other.denominator).divide(gcd_den)
+ );
+ }
+
+ public Rational subtract(Rational other) {
+ BigInteger gcd_den = denominator.gcd(other.denominator);
+ return new Rational(
+ numerator.multiply(other.denominator).divide(gcd_den)
+ .subtract(other.numerator.multiply(denominator).divide(gcd_den)),
+ denominator.multiply(other.denominator).divide(gcd_den)
+ );
+ }
+
+ public Rational multiply(Rational other) {
+ BigInteger gcd_num_oden = numerator.gcd(other.denominator);
+ boolean isZero = gcd_num_oden.equals(BigInteger.ZERO);
+ BigInteger smallNum = isZero ? numerator : numerator.divide(gcd_num_oden);
+ BigInteger smallODen = isZero ? other.denominator : other.denominator.divide(gcd_num_oden);
+
+ BigInteger gcd_den_onum = denominator.gcd(other.numerator);
+ isZero = gcd_den_onum.equals(BigInteger.ZERO);
+ BigInteger smallONum = isZero ? other.numerator : other.numerator.divide(gcd_den_onum);
+ BigInteger smallDen = isZero ? denominator : denominator.divide(gcd_den_onum);
+
+ return new Rational(smallNum.multiply(smallONum), smallDen.multiply(smallODen));
+ }
+
+ public Rational pow(int i) {
+ return new Rational(numerator.pow(i), denominator.pow(i));
+ }
+
+ public static Rational pow10(int i) {
+ return i > 0 ? TEN.pow(i) : TENTH.pow(-i);
+ }
+
+ public Rational divide(Rational other) {
+ return multiply(other.reciprocal());
+ }
+
+ public Rational reciprocal() {
+ return new Rational(denominator, numerator);
+ }
+
+ public Rational negate() {
+ return new Rational(numerator.negate(), denominator);
+ }
+
+ public BigDecimal toBigDecimal(MathContext mathContext) {
+ try {
+ return new BigDecimal(numerator).divide(new BigDecimal(denominator), mathContext);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Wrong math context for divide: " + this + ", " + mathContext);
+ }
+ }
+
+ public double doubleValue() {
+ if (denominator.equals(BigInteger.ZERO) && numerator.equals(BigInteger.ZERO)) {
+ return Double.NaN;
+ }
+ return new BigDecimal(numerator).divide(new BigDecimal(denominator), MathContext.DECIMAL64).doubleValue();
+ }
+
+
+ public BigDecimal toBigDecimal() {
+ return toBigDecimal(MathContext.UNLIMITED);
+ }
+
+ public static Rational of(BigDecimal bigDecimal) {
+ // scale()
+ // If zero or positive, the scale is the number of digits to the right of the decimal point.
+ // If negative, the unscaled value of the number is multiplied by ten to the power of the negation of the scale.
+ // For example, a scale of -3 means the unscaled value is multiplied by 1000.
+ final int scale = bigDecimal.scale();
+ final BigInteger unscaled = bigDecimal.unscaledValue();
+ if (scale == 0) {
+ return new Rational(unscaled, BigInteger.ONE);
+ } else if (scale >= 0) {
+ return new Rational(unscaled, BigDecimal.ONE.movePointRight(scale).toBigInteger());
+ } else {
+ return new Rational(unscaled.multiply(BigDecimal.ONE.movePointLeft(scale).toBigInteger()), BigInteger.ONE);
+ }
+ }
+
+ public enum FormatStyle {plain, simple, repeating, html}
+
+ @Override
+ public String toString() {
+ // could also return as "exact" decimal, if only factors of the denominator are 2 and 5
+ return toString(FormatStyle.plain);
+ }
+
+
+ public String toString(FormatStyle style) {
+ switch (style) {
+ case plain:
+ return numerator + (denominator.equals(BigInteger.ONE) ? "" : " / " + denominator);
+ }
+ Output<BigDecimal> newNumerator = new Output<>(new BigDecimal(numerator));
+ final BigInteger newDenominator = minimalDenominator(newNumerator, denominator);
+ final String numStr = format(newNumerator.value);
+ final String denStr = nf.format(newDenominator).toString();
+ final boolean denIsOne = newDenominator.equals(BigInteger.ONE);
+
+ switch (style) {
+ case repeating:
+ String result = toRepeating(30); // limit of 30 on the repeating length, so we don't get crazy
+ if (result != null) {
+ return result;
+ }
+ // otherwise drop through to simple
+ case simple: {
+ return denIsOne ? numStr : numStr + "/" + denStr;
+ }
+ case html: {
+ return denIsOne ? numStr : "<sup>" + numStr + "</sup>" + "/<sub>" + denStr + "<sub>";
+ }
+ default: throw new UnsupportedOperationException();
+ }
+ }
+
+ static final LocalizedNumberFormatter nf = NumberFormatter.with().precision(Precision.unlimited()).locale(Locale.ENGLISH);
+ static final LocalizedNumberFormatter snf = NumberFormatter.with().precision(Precision.unlimited()).notation(Notation.engineering()).locale(Locale.ENGLISH);
+
+ static String format(BigDecimal value) {
+ return nf.format(value).toString();
+ /*
+ * TODO Change 1000000 to 1×10<sup>-6</sup>, etc.
+ * Only for large/small numbers, eg:
+ * ≥ 1,000,000.0, => 1×10<sup>6</sup> — more than 6 trailing 0's
+ * ≤ 0.0000001 — more than 6 leading zeros
+ *
+ * relevant BigDecimal APIs:
+ * 123.4567 scale: 4 bigint: 1234567
+ * 123456700 scale: 0 bigint: 123456700
+ * 1234567 scale: 0 bigint: 1234567
+ * 0.1234567 scale: 7 bigint: 1234567
+ */
+ // return (Math.abs(newNumerator.scale()) > 10 ? snf : nf).format(newNumerator).toString();
+ // Only do this for trailing zeros (above test isn't right)
+ }
+
+ @Override
+ public int compareTo(Rational other) {
+ return numerator.multiply(other.denominator).compareTo(other.numerator.multiply(denominator));
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ return equals((Rational)that); // TODO fix later
+ }
+
+ public boolean equals(Rational that) {
+ return numerator.equals(that.numerator)
+ && denominator.equals(that.denominator);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(numerator, denominator);
+ }
+
+ public Rational abs() {
+ return numerator.signum() >= 0 ? this : this.negate();
+ }
+
+ static final BigInteger BI_TWO = BigInteger.valueOf(2);
+ static final BigInteger BI_FIVE = BigInteger.valueOf(5);
+ static final BigInteger BI_MINUS_ONE = BigInteger.valueOf(-1);
+
+ static final BigDecimal BD_TWO = BigDecimal.valueOf(2);
+ static final BigDecimal BD_FIVE = BigDecimal.valueOf(5);
+
+
+ /**
+ * Goal is to be able to display rationals in a short but exact form, like 1,234,567/3 or 1.234567E21/3.
+ * To do this, find the smallest denominator (excluding powers of 2 and 5), and modify the numerator in the same way.
+ * @param denominator TODO
+ * @param current
+ * @return
+ */
+ public static BigInteger minimalDenominator(Output<BigDecimal> outNumerator, BigInteger denominator) {
+ if (denominator.equals(BigInteger.ONE) || denominator.equals(BigInteger.ZERO)) {
+ return denominator;
+ }
+ BigInteger newDenominator = denominator;
+ while (newDenominator.mod(BI_TWO).equals(BigInteger.ZERO)) {
+ newDenominator = newDenominator.divide(BI_TWO);
+ outNumerator.value = outNumerator.value.divide(BD_TWO);
+ }
+ BigInteger outDenominator = newDenominator;
+ while (newDenominator.mod(BI_FIVE).equals(BigInteger.ZERO)) {
+ newDenominator = newDenominator.divide(BI_FIVE);
+ outNumerator.value = outNumerator.value.divide(BD_FIVE);
+ }
+ return newDenominator;
+ }
+
+
+ public static class MutableLong {
+ public long value;
+ @Override
+ public String toString() {
+ return String.valueOf(value);
+ }
+ }
+
+ public static class ContinuedFraction {
+ public final List<BigInteger> sequence;
+
+ public ContinuedFraction(Rational source) {
+ List<BigInteger> _sequence = new ArrayList<>();
+ while (true) {
+ BigInteger floor = source.floor();
+ if (floor.compareTo(BigInteger.ZERO) < 0) {
+ floor = floor.subtract(BigInteger.ONE);
+ }
+ Rational remainder = source.subtract(Rational.of(floor, BigInteger.ONE));
+ _sequence.add(floor);
+ if (remainder.equals(Rational.ZERO)) {
+ break;
+ }
+ source = remainder.reciprocal();
+ }
+ sequence = ImmutableList.copyOf(_sequence);
+ }
+
+ public ContinuedFraction(long... items) {
+ List<BigInteger> _sequence = new ArrayList<>();
+ int count = 0;
+ for (long item : items) {
+ if (count != 0 && item < 0) {
+ throw new IllegalArgumentException("Only first item can be negative");
+ }
+ _sequence.add(BigInteger.valueOf(item));
+ count++;
+ }
+ sequence = ImmutableList.copyOf(_sequence);
+ }
+
+ public Rational toRational(List<Rational> intermediates) {
+ if (intermediates != null) {
+ intermediates.clear();
+ }
+ BigInteger h0 = BigInteger.ZERO;
+ BigInteger h1 = BigInteger.ONE;
+ BigInteger k0 = BigInteger.ONE;
+ BigInteger k1 = BigInteger.ZERO;
+ for (BigInteger item : sequence) {
+ BigInteger h2 = item.multiply(h1).add(h0);
+ BigInteger k2 = item.multiply(k1).add(k0);
+ if (intermediates != null) {
+ intermediates.add(Rational.of(h2, k2));
+ }
+ h0 = h1;
+ h1 = h2;
+ k0 = k1;
+ k1 = k2;
+ }
+ if (intermediates != null) {
+ Rational last = intermediates.get(intermediates.size()-1);
+ intermediates.remove(intermediates.size()-1);
+ return last;
+ } else {
+ return Rational.of(h1, k1);
+ }
+ }
+ @Override
+ public String toString() {
+ return sequence.toString();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return sequence.equals(((ContinuedFraction)obj).sequence);
+ }
+ @Override
+ public int hashCode() {
+ return sequence.hashCode();
+ }
+ }
+
+ public BigInteger floor() {
+ return numerator.divide(denominator);
+ }
+
+ public Rational symmetricDiff(Rational b) {
+ return this.subtract(b)
+ .divide(this.abs().add(b.abs()))
+ .multiply(Rational.of(2))
+ ;
+ }
+
+ /** Return repeating fraction, as long as the length is reasonable */
+ private String toRepeating(int stringLimit) {
+ BigInteger p = numerator;
+ BigInteger q = denominator;
+ StringBuilder s = new StringBuilder();
+
+ // Edge cases
+ final int pTo0 = p.compareTo(BigInteger.ZERO);
+ if (q.compareTo(BigInteger.ZERO) == 0) {
+ return pTo0 == 0 ? "NaN" : pTo0 > 0 ? "INF" : "-INF";
+ }
+ if (pTo0 == 0) {
+ return "0";
+ } else if (pTo0 < 0) {
+ p = p.negate();
+ s.append('-');
+ }
+ final int pToq = p.compareTo(q);
+ if (pToq == 0) {
+ s.append('1');
+ return s.toString();
+ } else if (pToq > 0) {
+ BigInteger intPart = p.divide(q);
+ s.append(nf.format(intPart));
+ p = p.remainder(q);
+ if (p.compareTo(BigInteger.ZERO) == 0) {
+ return s.toString();
+ }
+ } else {
+ s.append('0');
+ }
+
+ // main loop
+ s.append(".");
+ int pos = -1; // all places are right to the radix point
+ Map<BigInteger, Integer> occurs = new HashMap<>();
+ while (!occurs.containsKey(p)) {
+ occurs.put(p, pos); // the position of the place with remainder p
+ BigInteger p10 = p.multiply(BigInteger.TEN);
+ BigInteger z = p10.divide(q); // index z of digit within: 0 ≤ z ≤ b-1
+ p = p10.subtract(z.multiply(q)); // 0 ≤ p < q
+ s = s.append(((char)('0' + z.intValue()))); // append the character of the digit
+ if (p.equals(BigInteger.ZERO)) {
+ return s.toString();
+ } else if (s.length() > stringLimit) {
+ return null;
+ }
+ pos -= 1;
+ }
+ int L = occurs.get(p)-pos; // the length of the reptend (being < q)
+ s.insert(s.length()-L, REPTEND_MARKER);
+ return s.toString();
+ }
+
+ public boolean isPowerOfTen() {
+ Output<BigDecimal> newNumerator = new Output<>(new BigDecimal(numerator));
+ final BigInteger newDenominator = minimalDenominator(newNumerator, denominator);
+ if (!newDenominator.equals(BigInteger.ONE)) {
+ return false;
+ }
+ // hack, figure out later
+ String str = newNumerator.value.unscaledValue().toString();
+ if (INT_POWER_10.matcher(str).matches()) {
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/SupplementalDataInfo.java b/tools/java/org/unicode/cldr/util/SupplementalDataInfo.java
index 442cf6f..75ed1f9 100644
--- a/tools/java/org/unicode/cldr/util/SupplementalDataInfo.java
+++ b/tools/java/org/unicode/cldr/util/SupplementalDataInfo.java
@@ -37,6 +37,7 @@
import org.unicode.cldr.util.Builder.CBuilder;
import org.unicode.cldr.util.CldrUtility.VariableReplacer;
import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
+import org.unicode.cldr.util.Rational.RationalParser;
import org.unicode.cldr.util.StandardCodes.LstrType;
import org.unicode.cldr.util.SupplementalDataInfo.BasicLanguageData.Type;
import org.unicode.cldr.util.SupplementalDataInfo.NumberingSystemInfo.NumberingSystemType;
@@ -907,6 +908,12 @@
public Map<AttributeValidityInfo, String> attributeValidityInfo = new LinkedHashMap<>();
public Multimap<String, String> languageGroups = TreeMultimap.create();
+
+ public RationalParser rationalParser = new RationalParser();
+ public UnitConverter unitConverter = new UnitConverter(rationalParser);
+
+ public UnitPreferences unitPreferences = new UnitPreferences();
+
public enum MeasurementType {
measurementSystem, paperSize
@@ -1145,6 +1152,15 @@
coverageLevels = Collections.unmodifiableSortedSet(coverageLevels);
measurementData = CldrUtility.protectCollection(measurementData);
+
+ final Map<String, R2<List<String>, String>> unitAliases = typeToTagToReplacement.get("unit");
+ if (unitAliases != null) { // don't load unless the information is there (for old releases);
+ unitConverter.addAliases(unitAliases);
+ }
+ unitConverter.freeze();
+ rationalParser.freeze();
+ unitPreferences.freeze();
+
timeData = CldrUtility.protectCollection(timeData);
validityInfo = CldrUtility.protectCollection(validityInfo);
@@ -1286,6 +1302,22 @@
if (handleMeasurementData(level2, parts)) {
return;
}
+ } else if (level1.equals("unitConstants")) {
+ if (handleUnitConstants(parts)) {
+ return;
+ }
+ } else if (level1.equals("unitQuantities")) {
+ if (handleUnitQuantities(parts)) {
+ return;
+ }
+ } else if (level1.equals("convertUnits")) {
+ if (handleUnitConversion(parts)) {
+ return;
+ }
+ } else if (level1.equals("unitPreferenceData")) {
+ if (handleUnitPreferences(parts, value)) {
+ return;
+ }
} else if (level1.equals("timeData")) {
if (handleTimeData(parts)) {
return;
@@ -1310,6 +1342,28 @@
}
}
+ /*
+ * Handles
+ * <unitPreferences category="area" usage="_default">
+ *<unitPreference regions="001" draft="unconfirmed">square-centimeter</unitPreference>
+ */
+
+ private boolean handleUnitPreferences(XPathParts parts, String value) {
+ String geq = parts.getAttributeValue(-1, "geq");
+ String small = parts.getAttributeValue(-2, "scope");
+ if (small != null) {
+ geq = "0.1234";
+ }
+ unitPreferences.add(
+ parts.getAttributeValue(-2, "category"),
+ parts.getAttributeValue(-2, "usage"),
+ parts.getAttributeValue(-1, "regions"),
+ geq,
+ parts.getAttributeValue(-1, "skeleton"),
+ value);
+ return true;
+ }
+
private boolean handleLanguageGroups(String value, XPathParts parts) {
String parent = parts.getAttributeValue(-1, "parent");
List<String> children = WHITESPACE_SPLTTER.splitToList(value);
@@ -1334,6 +1388,45 @@
}
return true;
}
+
+ private boolean handleUnitConstants(XPathParts parts) {
+ // <unitConstant constant="ft2m" value="0.3048"/>
+
+ final String constant = parts.getAttributeValue(-1, "constant");
+ final String value = parts.getAttributeValue(-1, "value");
+ final String status = parts.getAttributeValue(-1, "status");
+ rationalParser.addConstant(constant, value, status);
+ return true;
+ }
+
+ private boolean handleUnitQuantities(XPathParts parts) {
+ // <unitQuantity quantity='wave-number' baseUnit='reciprocal-meter'/>
+
+ final String baseUnit = parts.getAttributeValue(-1, "baseUnit");
+ final String quantity = parts.getAttributeValue(-1, "quantity");
+ final String status = parts.getAttributeValue(-1, "status");
+ unitConverter.addQuantityInfo(baseUnit, quantity, status);
+ return true;
+ }
+
+ private boolean handleUnitConversion(XPathParts parts) {
+ // <convertUnit source='acre' target='square-meter' factor='ft2m^2 * 43560'/>
+
+ final String source = parts.getAttributeValue(-1, "source");
+ final String target = parts.getAttributeValue(-1, "baseUnit");
+// if (source.contentEquals(target)) {
+// throw new IllegalArgumentException("Cannot convert from something to itself " + parts);
+// }
+ String factor = parts.getAttributeValue(-1, "factor");
+ String offset = parts.getAttributeValue(-1, "offset");
+ String systems = parts.getAttributeValue(-1, "systems");
+ unitConverter.addRaw(
+ source, target,
+ factor, offset,
+ systems);
+ return true;
+ }
+
private boolean handleTimeData(XPathParts parts) {
/**
@@ -4313,4 +4406,16 @@
public Multimap<String, String> getLanguageGroups() {
return languageGroups;
}
+
+ public UnitConverter getUnitConverter() {
+ return unitConverter;
+ }
+
+ public RationalParser getRationalParser() {
+ return rationalParser;
+ }
+
+ public UnitPreferences getUnitPreferences() {
+ return unitPreferences;
+ }
}
diff --git a/tools/java/org/unicode/cldr/util/TempPrintWriter.java b/tools/java/org/unicode/cldr/util/TempPrintWriter.java
new file mode 100644
index 0000000..0a8aee7
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/TempPrintWriter.java
@@ -0,0 +1,207 @@
+package org.unicode.cldr.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Random;
+
+import org.unicode.cldr.draft.FileUtilities;
+
+import com.ibm.icu.util.ICUUncheckedIOException;
+
+/**
+ * Simple utility to create a temporary file, write into it, then close it.
+ * If the file differs from the old file (except for date), then it is deleted.
+ * Otherwise it replaces the target file. Moved from UnicodeTools.
+ * @author markdavis
+ */
+public class TempPrintWriter extends Writer {
+ final PrintWriter tempPrintWriter;
+ final String tempName;
+ final String filename;
+
+
+ public static TempPrintWriter openUTF8Writer(String filename) {
+ return new TempPrintWriter(new File(filename));
+ }
+
+ public static TempPrintWriter openUTF8Writer(String dir, String filename) {
+ return new TempPrintWriter(new File(dir, filename));
+ }
+
+ public TempPrintWriter(String dir, String filename) {
+ this(new File(dir, filename));
+ }
+
+ public TempPrintWriter(File file) {
+ super();
+ final String parentFile = file.getParent();
+ this.filename = file.toString();
+ Random rand = new Random();
+ try {
+ File tempFile;
+ do {
+ tempFile = new File(parentFile, (0xFFFF & rand.nextInt()) + "-" + file.getName());
+ } while (tempFile.exists());
+ tempName = tempFile.toString();
+ tempPrintWriter = FileUtilities.openUTF8Writer(parentFile, tempFile.getName());
+ } catch (IOException e) {
+ throw new ICUUncheckedIOException(e);
+ }
+ }
+
+ @Override
+ public void close() {
+ tempPrintWriter.close();
+ try {
+ replaceDifferentOrDelete(filename, tempName, false);
+ } catch (IOException e) {
+ throw new ICUUncheckedIOException(e);
+ }
+ }
+
+ @Override
+ public void write(char[] cbuf, int off, int len) {
+ tempPrintWriter.write(cbuf, off, len);
+ }
+
+ @Override
+ public void flush() {
+ tempPrintWriter.flush();
+ }
+
+ public void println(Object line) {
+ tempPrintWriter.println(line);
+ }
+
+ public void print(Object line) {
+ tempPrintWriter.print(line);
+ }
+
+ public void println() {
+ tempPrintWriter.println();
+ }
+
+ /**
+ * If contents(newFile) ≠ contents(oldFile), rename newFile to old. Otherwise delete newfile. Return true if replaced. *
+ */
+ private static boolean replaceDifferentOrDelete(String oldFile, String newFile, boolean skipCopyright) throws IOException {
+ final File oldFile2 = new File(oldFile);
+ if (oldFile2.exists()) {
+ final String lines[] = new String[2];
+ final boolean identical = filesAreIdentical(oldFile, newFile, skipCopyright, lines);
+ if (identical) {
+ new File(newFile).delete();
+ return false;
+ }
+ System.out.println("Found difference in : " + oldFile + ", " + newFile);
+ final int diff = compare(lines[0], lines[1]);
+ System.out.println(" File1: '" + lines[0].substring(0,diff) + "', '" + lines[0].substring(diff) + "'");
+ System.out.println(" File2: '" + lines[1].substring(0,diff) + "', '" + lines[1].substring(diff) + "'");
+ }
+ new File(newFile).renameTo(oldFile2);
+ return true;
+ }
+
+ private static boolean filesAreIdentical(String file1, String file2, boolean skipCopyright, String[] lines) throws IOException {
+ if (file1 == null) {
+ lines[0] = null;
+ lines[1] = null;
+ return false;
+ }
+ final BufferedReader br1 = new BufferedReader(new FileReader(file1), 32*1024);
+ final BufferedReader br2 = new BufferedReader(new FileReader(file2), 32*1024);
+ String line1 = "";
+ String line2 = "";
+ try {
+ for (int lineCount = 0; ; ++lineCount) {
+ line1 = getLineWithoutFluff(br1, lineCount == 0, skipCopyright);
+ line2 = getLineWithoutFluff(br2, lineCount == 0, skipCopyright);
+ if (line1 == null) {
+ if (line2 == null) {
+ return true;
+ }
+ break;
+ }
+ if (!line1.equals(line2)) {
+ break;
+ }
+ }
+ lines[0] = line1;
+ lines[1] = line2;
+ if (lines[0] == null) {
+ lines[0] = "<end of file>";
+ }
+ if (lines[1] == null) {
+ lines[1] = "<end of file>";
+ }
+ return false;
+ } finally {
+ br1.close();
+ br2.close();
+ }
+ }
+
+ private static String getLineWithoutFluff(BufferedReader br1, boolean first, boolean skipCopyright) throws IOException {
+ while (true) {
+ String line1 = br1.readLine();
+ if (line1 == null) {
+ return line1;
+ }
+ line1 = line1.trim();
+ if (line1.length() == 0) {
+ continue;
+ }
+ if (line1.equals("#")) {
+ continue;
+ }
+ if (line1.startsWith("# Generated")) {
+ continue;
+ }
+ if (line1.startsWith("# Date")) {
+ continue;
+ }
+ if (skipCopyright && line1.startsWith("# Copyright")) {
+ continue;
+ }
+ if (line1.startsWith("<p><b>Date:</b>")) {
+ continue;
+ }
+ if (line1.startsWith("<td valign=\"top\">20") && line1.endsWith("GMT</td>")) {
+ continue;
+ }
+
+ if (line1.equals("# ================================================")) {
+ continue;
+ }
+ if (first && line1.startsWith("#")) {
+ first = false;
+ continue;
+ }
+ return line1;
+ }
+ }
+
+ /**
+ * Returns -1 if strings are equal; otherwise the first position they are different at.
+ */
+ public static int compare(String a, String b) {
+ int len = a.length();
+ if (len > b.length()) {
+ len = b.length();
+ }
+ for (int i = 0; i < len; ++i) {
+ if (a.charAt(i) != b.charAt(i)) {
+ return i;
+ }
+ }
+ if (a.length() != b.length()) {
+ return len;
+ }
+ return -1;
+ }
+
+}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/TestUtilities.java b/tools/java/org/unicode/cldr/util/TestUtilities.java
index a86b09a..a339068 100644
--- a/tools/java/org/unicode/cldr/util/TestUtilities.java
+++ b/tools/java/org/unicode/cldr/util/TestUtilities.java
@@ -28,7 +28,6 @@
import org.unicode.cldr.draft.FileUtilities;
import org.unicode.cldr.test.ExampleGenerator;
-import org.unicode.cldr.test.ExampleGenerator.ExampleType;
import org.unicode.cldr.tool.GenerateAttributeList;
import com.ibm.icu.dev.util.CollectionUtilities;
@@ -133,7 +132,7 @@
for (String path : english) {
String value = english.getStringValue(path);
result.setLength(0);
- String examples = englishExampleGenerator.getExampleHtml(path, value, ExampleType.NATIVE);
+ String examples = englishExampleGenerator.getExampleHtml(path, value);
if (examples != null) {
result.append(examples).append("<hr>");
}
diff --git a/tools/java/org/unicode/cldr/util/UnitConverter.java b/tools/java/org/unicode/cldr/util/UnitConverter.java
new file mode 100644
index 0000000..7deee14
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/UnitConverter.java
@@ -0,0 +1,952 @@
+package org.unicode.cldr.util;
+
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.unicode.cldr.util.Rational.FormatStyle;
+import org.unicode.cldr.util.Rational.RationalParser;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
+import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.util.Freezable;
+import com.ibm.icu.util.Output;
+
+public class UnitConverter implements Freezable<UnitConverter> {
+
+ static final Splitter BAR_SPLITTER = Splitter.on('-');
+ static final Splitter SPACE_SPLITTER = Splitter.on(' ').trimResults().omitEmptyStrings();
+
+ final RationalParser rationalParser;
+
+ private Map<String,String> baseUnitToQuantity = new LinkedHashMap<>();
+ private Map<String,String> baseUnitToStatus = new LinkedHashMap<>();
+ private Map<String, TargetInfo> sourceToTargetInfo = new LinkedHashMap<>();
+ private Multimap<String, String> quantityToSimpleUnits = LinkedHashMultimap.create();
+ private Multimap<String, String> sourceToSystems = LinkedHashMultimap.create();
+ private Set<String> baseUnits;
+ private Multimap<String, Continuation> continuations = TreeMultimap.create();
+ private MapComparator<String> quantityComparator;
+ private Map<String,String> fixDenormalized;
+
+ private boolean frozen = false;
+
+ public TargetInfoComparator targetInfoComparator;
+
+ /** Warning: ordering is important; determines the normalized output */
+ public static final Set<String> BASE_UNITS = ImmutableSet.of(
+ "candela",
+ "kilogram",
+ "meter",
+ "second",
+ "ampere",
+ "kelvin",
+ // non-SI
+ "year",
+ "bit",
+ "item",
+ "pixel",
+ "em",
+ "revolution",
+ "portion"
+ );
+
+ public void addQuantityInfo(String baseUnit, String quantity, String status) {
+ if (baseUnitToQuantity.containsKey(baseUnit)) {
+ throw new IllegalArgumentException();
+ }
+ baseUnitToQuantity.put(baseUnit, quantity);
+ baseUnitToStatus.put(baseUnit, quantity);
+ quantityToSimpleUnits.put(quantity, baseUnit);
+ }
+
+ @Override
+ public boolean isFrozen() {
+ return frozen;
+ }
+
+ @Override
+ public UnitConverter freeze() {
+ if (!frozen) {
+ frozen = true;
+ rationalParser.freeze();
+ sourceToTargetInfo = ImmutableMap.copyOf(sourceToTargetInfo);
+ quantityToSimpleUnits = ImmutableMultimap.copyOf(quantityToSimpleUnits);
+ sourceToSystems = ImmutableMultimap.copyOf(sourceToSystems);
+ // other fields are frozen earlier in processing
+ Builder<String> builder = ImmutableSet.<String>builder()
+ .addAll(BASE_UNITS);
+ for (TargetInfo s : sourceToTargetInfo.values()) {
+ builder.add(s.target);
+ }
+ baseUnits = builder.build();
+ continuations = ImmutableMultimap.copyOf(continuations);
+ targetInfoComparator = new TargetInfoComparator();
+ }
+ return this;
+ }
+
+ @Override
+ public UnitConverter cloneAsThawed() {
+ throw new UnsupportedOperationException();
+ }
+
+
+ public static final class ConversionInfo implements Comparable<ConversionInfo> {
+ public final Rational factor;
+ public final Rational offset;
+
+ static final ConversionInfo IDENTITY = new ConversionInfo(Rational.ONE, Rational.ZERO);
+
+ public ConversionInfo(Rational factor, Rational offset) {
+ this.factor = factor;
+ this.offset = offset;
+ }
+
+ public Rational convert(Rational source) {
+ return source.multiply(factor).add(offset);
+ }
+
+ public Rational convertBackwards(Rational source) {
+ return source.subtract(offset).divide(factor);
+ }
+
+ public ConversionInfo invert() {
+ Rational factor2 = factor.reciprocal();
+ Rational offset2 = offset.equals(Rational.ZERO) ? Rational.ZERO : offset.divide(factor).negate();
+ return new ConversionInfo(factor2, offset2);
+ // TODO fix reciprocal
+ }
+
+ @Override
+ public String toString() {
+ return toString("x");
+ }
+ public String toString(String unit) {
+ return factor.toString(FormatStyle.simple)
+ + " * " + unit
+ + (offset.equals(Rational.ZERO) ? "" :
+ (offset.compareTo(Rational.ZERO) < 0 ? " - " : " - ")
+ + offset.abs().toString(FormatStyle.simple));
+ }
+
+ public String toDecimal() {
+ return toDecimal("x");
+ }
+ public String toDecimal(String unit) {
+ return factor.toBigDecimal(MathContext.DECIMAL64)
+ + " * " + unit
+ + (offset.equals(Rational.ZERO) ? "" :
+ (offset.compareTo(Rational.ZERO) < 0 ? " - " : " - ")
+ + offset.toBigDecimal(MathContext.DECIMAL64).abs());
+ }
+
+ @Override
+ public int compareTo(ConversionInfo o) {
+ int diff;
+ if (0 != (diff = factor.compareTo(o.factor))) {
+ return diff;
+ }
+ return offset.compareTo(o.offset);
+ }
+ @Override
+ public boolean equals(Object obj) {
+ return 0 == compareTo((ConversionInfo)obj);
+ }
+ @Override
+ public int hashCode() {
+ return Objects.hash(factor, offset);
+ }
+ }
+
+ public static class Continuation implements Comparable<Continuation> {
+ public final List<String> remainder;
+ public final String result;
+
+ public static void addIfNeeded(String source, Multimap<String, Continuation> data) {
+ List<String> sourceParts = BAR_SPLITTER.splitToList(source);
+ if (sourceParts.size() > 1) {
+ Continuation continuation = new Continuation(ImmutableList.copyOf(sourceParts.subList(1, sourceParts.size())), source);
+ data.put(sourceParts.get(0), continuation);
+ }
+ }
+ public Continuation(List<String> remainder, String source) {
+ this.remainder = remainder;
+ this.result = source;
+ }
+ /**
+ * The ordering is designed to have longest continuation first so that matching works.
+ * Otherwise the ordering doesn't matter, so we just use the result.
+ */
+ @Override
+ public int compareTo(Continuation other) {
+ int diff = other.remainder.size() - remainder.size();
+ if (diff != 0) {
+ return diff;
+ }
+ return result.compareTo(other.result);
+ }
+
+ public boolean match(List<String> parts, final int startIndex) {
+ if (remainder.size() > parts.size() - startIndex) {
+ return false;
+ }
+ int i = startIndex;
+ for (String unitPart : remainder) {
+ if (!unitPart.equals(parts.get(i++))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return remainder + " 🢣 " + result;
+ }
+
+ public static Iterable<String> split(String derivedUnit, Multimap<String, Continuation> continuations) {
+ return new UnitIterator(derivedUnit, continuations);
+ }
+
+ public static class UnitIterator implements Iterable<String>, Iterator<String> {
+ final List<String> parts;
+ final Multimap<String, Continuation> continuations;
+ int nextIndex = 0;
+
+ public UnitIterator(String derivedUnit, Multimap<String, Continuation> continuations) {
+ parts = BAR_SPLITTER.splitToList(derivedUnit);
+ this.continuations = continuations;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return nextIndex < parts.size();
+ }
+
+ @Override
+ public String next() {
+ String result = parts.get(nextIndex++);
+ Collection<Continuation> continuationOptions = continuations.get(result);
+ for (Continuation option : continuationOptions) {
+ if (option.match(parts, nextIndex)) {
+ nextIndex += option.remainder.size();
+ return option.result;
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Iterator<String> iterator() {
+ return this;
+ }
+
+ }
+ }
+
+ public UnitConverter(RationalParser rationalParser) {
+ this.rationalParser = rationalParser;
+ }
+
+ public void addRaw(String source, String target, String factor, String offset, String systems) {
+ ConversionInfo info = new ConversionInfo(
+ factor == null ? Rational.ONE : rationalParser.parse(factor),
+ offset == null ? Rational.ZERO : rationalParser.parse(offset));
+ Map<String, String> args = new LinkedHashMap<>();
+ if (factor != null) {
+ args.put("factor", factor);
+ }
+ if (offset != null) {
+ args.put("offset", offset);
+ }
+
+ addToSourceToTarget(source, target, info, args, systems);
+ Continuation.addIfNeeded(source, continuations);
+ }
+
+ public static class TargetInfo{
+ public final String target;
+ public final ConversionInfo unitInfo;
+ public final Map<String, String> inputParameters;
+ public TargetInfo(String target, ConversionInfo unitInfo, Map<String, String> inputParameters) {
+ this.target = target;
+ this.unitInfo = unitInfo;
+ this.inputParameters = ImmutableMap.copyOf(inputParameters);
+ }
+ @Override
+ public String toString() {
+ return unitInfo + " (" + target + ")";
+ }
+ public String formatOriginalSource(String source) {
+ StringBuilder result = new StringBuilder()
+ .append("<convertUnit source='")
+ .append(source)
+ .append("' baseUnit='")
+ .append(target)
+ .append("'")
+ ;
+ for (Entry<String, String> entry : inputParameters.entrySet()) {
+ if (entry.getValue() != null) {
+ result.append(" " + entry.getKey() + "='" + entry.getValue() + "'");
+ }
+ }
+ result.append("/>");
+// if (unitInfo.equals(UnitInfo.IDENTITY)) {
+// result.append("\t<!-- IDENTICAL -->");
+// } else {
+// result.append("\t<!-- ~")
+// .append(unitInfo.toDecimal(target))
+// .append(" -->");
+// }
+ return result.toString();
+ }
+ }
+ public class TargetInfoComparator implements Comparator<TargetInfo> {
+ @Override
+ public int compare(TargetInfo o1, TargetInfo o2) {
+ String quality1 = baseUnitToQuantity.get(o1.target);
+ String quality2 = baseUnitToQuantity.get(o2.target);
+ int diff;
+ if (0 != (diff = quantityComparator.compare(quality1, quality2))) {
+ return diff;
+ }
+ if (0 != (diff = o1.unitInfo.compareTo(o2.unitInfo))) {
+ return diff;
+ }
+ return o1.target.compareTo(o2.target);
+ }
+ }
+
+ private void addToSourceToTarget(String source, String target, ConversionInfo info,
+ Map<String, String> inputParameters, String systems) {
+ if (sourceToTargetInfo.isEmpty()) {
+ baseUnitToQuantity = ImmutableBiMap.copyOf(baseUnitToQuantity);
+ baseUnitToStatus = ImmutableMap.copyOf(baseUnitToStatus);
+ quantityComparator = new MapComparator<>(baseUnitToQuantity.values()).freeze();
+ } else if (sourceToTargetInfo.containsKey(source)) {
+ throw new IllegalArgumentException("Duplicate source: " + source + ", " + target);
+ }
+ sourceToTargetInfo.put(source, new TargetInfo(target, info, inputParameters));
+ String targetQuantity = baseUnitToQuantity.get(target);
+ if (targetQuantity == null) {
+ throw new IllegalArgumentException();
+ }
+ quantityToSimpleUnits.put(targetQuantity, source);
+ if (systems != null) {
+ sourceToSystems.putAll(source, SPACE_SPLITTER.split(systems));
+ }
+ }
+
+ public Set<String> canConvertBetween(String unit) {
+ TargetInfo targetInfo = sourceToTargetInfo.get(unit);
+ if (targetInfo == null) {
+ return Collections.emptySet();
+ }
+ String quantity = baseUnitToQuantity.get(targetInfo.target);
+ return ImmutableSet.copyOf(quantityToSimpleUnits.get(quantity));
+ }
+
+ public Set<String> canConvert() {
+ return sourceToTargetInfo.keySet();
+ }
+
+ public Rational convertDirect(Rational source, String sourceUnit, String targetUnit) {
+ if (sourceUnit.equals(targetUnit)) {
+ return source;
+ }
+ TargetInfo toPivotInfo = sourceToTargetInfo.get(sourceUnit);
+ if (toPivotInfo == null) {
+ return Rational.NaN;
+ }
+ TargetInfo fromPivotInfo = sourceToTargetInfo.get(targetUnit);
+ if (fromPivotInfo == null) {
+ return Rational.NaN;
+ }
+ if (!toPivotInfo.target.equals(fromPivotInfo.target)) {
+ return Rational.NaN;
+ }
+ Rational toPivot = toPivotInfo.unitInfo.convert(source);
+ Rational fromPivot = fromPivotInfo.unitInfo.convertBackwards(toPivot);
+ return fromPivot;
+ }
+
+ // TODO fix to guarantee single mapping
+
+ public ConversionInfo getUnitInfo(String sourceUnit, Output<String> baseUnit) {
+ if (isBaseUnit(sourceUnit)) {
+ baseUnit.value = sourceUnit;
+ return ConversionInfo.IDENTITY;
+ }
+ TargetInfo targetToInfo = sourceToTargetInfo.get(sourceUnit);
+ if (targetToInfo == null) {
+ return null;
+ }
+ baseUnit.value = targetToInfo.target;
+ return targetToInfo.unitInfo;
+ }
+
+ public String getBaseUnit(String simpleUnit) {
+ TargetInfo targetToInfo = sourceToTargetInfo.get(simpleUnit);
+ if (targetToInfo == null) {
+ return null;
+ }
+ return targetToInfo.target;
+ }
+
+ /**
+ * Takes a derived unit id, and produces the equivalent derived base unit id and UnitInfo to convert to it
+ * @author markdavis
+ * @param showYourWork TODO
+ *
+ */
+ public ConversionInfo parseUnitId (String derivedUnit, Output<String> metricUnit, boolean showYourWork) {
+ metricUnit.value = null;
+
+ UnitId outputUnit = new UnitId();
+ Rational numerator = Rational.ONE;
+ Rational denominator = Rational.ONE;
+ boolean inNumerator = true;
+ int power = 1;
+
+ Output<Rational> deprefix = new Output<>();
+ Rational offset = Rational.ZERO;
+ int countUnits = 0;
+ for (Iterator<String> it = Continuation.split(derivedUnit, continuations).iterator(); it.hasNext();) {
+ String unit = it.next();
+ ++countUnits;
+ if (unit.equals("square")) {
+ if (power != 1) {
+ throw new IllegalArgumentException("Can't have power of " + unit);
+ }
+ power = 2;
+ if (showYourWork) System.out.println(showRational("\t " + unit + ": ", Rational.of(power), "power"));
+ } else if (unit.equals("cubic")) {
+ if (power != 1) {
+ throw new IllegalArgumentException("Can't have power of " + unit);
+ }
+ power = 3;
+ if (showYourWork) System.out.println(showRational("\t " + unit + ": ", Rational.of(power), "power"));
+ } else if (unit.startsWith("pow")) {
+ if (power != 1) {
+ throw new IllegalArgumentException("Can't have power of " + unit);
+ }
+ power = Integer.parseInt(unit.substring(3));
+ if (showYourWork) System.out.println(showRational("\t " + unit + ": ", Rational.of(power), "power"));
+ } else if (unit.equals("per")) {
+ if (power != 1) {
+ throw new IllegalArgumentException("Can't have power of per");
+ }
+ if (showYourWork && inNumerator) System.out.println("\tper");
+ inNumerator = false; // ignore multiples
+// } else if ('9' >= unit.charAt(0)) {
+// if (power != 1) {
+// throw new IllegalArgumentException("Can't have power of " + unit);
+// }
+// Rational factor = Rational.of(Integer.parseInt(unit));
+// if (inNumerator) {
+// numerator = numerator.multiply(factor);
+// } else {
+// denominator = denominator.multiply(factor);
+// }
+ } else {
+ // kilo etc.
+ unit = stripPrefix(unit, deprefix);
+ if (showYourWork) {
+ if (!deprefix.value.equals(Rational.ONE)) {
+ System.out.println(showRational("\tprefix: ", deprefix.value, unit));
+ } else {
+ System.out.println("\t" + unit);
+ }
+ }
+
+ Rational value = deprefix.value;
+ if (!isSimpleBaseUnit(unit)) {
+ TargetInfo info = sourceToTargetInfo.get(unit);
+ if (info == null) {
+ if (showYourWork) System.out.println("\t⟹ no conversion for: " + unit);
+ return null; // can't convert
+ }
+ String baseUnit = info.target;
+
+ value = info.unitInfo.factor.multiply(value);
+ //if (showYourWork && !info.unitInfo.factor.equals(Rational.ONE)) System.out.println(showRational("\tfactor: ", info.unitInfo.factor, baseUnit));
+ // Special handling for offsets. We disregard them if there are any other units.
+ if (countUnits == 1 && !it.hasNext()) {
+ offset = info.unitInfo.offset;
+ if (showYourWork && !info.unitInfo.offset.equals(Rational.ZERO)) System.out.println(showRational("\toffset: ", info.unitInfo.offset, baseUnit));
+ }
+ unit = baseUnit;
+ }
+ for (int p = 1; p <= power; ++p) {
+ String title = "";
+ if (value.equals(Rational.ONE)) {
+ if (showYourWork) System.out.println("\t(already base unit)");
+ continue;
+ } else if (inNumerator) {
+ numerator = numerator.multiply(value);
+ title = "\t× ";
+ } else {
+ denominator = denominator.multiply(value);
+ title = "\t÷ ";
+ }
+ if (showYourWork) System.out.println(showRational("\t× ", value, " ⟹ " + unit) + "\t" + numerator.divide(denominator) + "\t" + numerator.divide(denominator).doubleValue());
+ }
+ // create cleaned up target unitid
+ outputUnit.add(continuations, unit, inNumerator, power);
+ power = 1;
+ }
+ }
+ metricUnit.value = outputUnit.toString();
+ return new ConversionInfo(numerator.divide(denominator), offset);
+ }
+
+
+ /** Only for use for simple base unit comparison */
+ private class UnitComparator implements Comparator<String>{
+ // TODO, use order in units.xml
+
+ @Override
+ public int compare(String o1, String o2) {
+ if (o1.equals(o2)) {
+ return 0;
+ }
+ Output<Rational> deprefix1 = new Output<>();
+ o1 = stripPrefix(o1, deprefix1);
+ TargetInfo targetAndInfo1 = sourceToTargetInfo.get(o1);
+ String quantity1 = baseUnitToQuantity.get(targetAndInfo1.target);
+
+ Output<Rational> deprefix2 = new Output<>();
+ o2 = stripPrefix(o2, deprefix2);
+ TargetInfo targetAndInfo2 = sourceToTargetInfo.get(o2);
+ String quantity2 = baseUnitToQuantity.get(targetAndInfo2.target);
+
+ int diff;
+ if (0 != (diff = quantityComparator.compare(quantity1, quantity2))) {
+ return diff;
+ }
+ Rational factor1 = targetAndInfo1.unitInfo.factor.multiply(deprefix1.value);
+ Rational factor2 = targetAndInfo2.unitInfo.factor.multiply(deprefix2.value);
+ if (0 != (diff = factor1.compareTo(factor2))) {
+ return diff;
+ }
+ return o1.compareTo(o2);
+ }
+ };
+
+ Comparator<String> UNIT_COMPARATOR = new UnitComparator();
+
+ public static final Set<String> BASE_UNIT_PARTS = ImmutableSet.<String>builder()
+ .add("per").add("square").add("cubic").addAll(BASE_UNITS)
+ .build();
+
+ /**
+ * Only handles the canonical units; no kilo-, only normalized, etc.
+ * @author markdavis
+ *
+ */
+ public class UnitId implements Freezable<UnitId> {
+ private Map<String, Integer> numUnitsToPowers = new TreeMap<>(UNIT_COMPARATOR);
+ private Map<String, Integer> denUnitsToPowers = new TreeMap<>(UNIT_COMPARATOR);
+ private boolean frozen = false;
+
+ private UnitId() {} //
+
+ private UnitId add(Multimap<String, Continuation> continuations, String compoundUnit, boolean groupInNumerator, int groupPower) {
+ if (frozen) {
+ throw new UnsupportedOperationException("Object is frozen.");
+ }
+ boolean inNumerator = true;
+ int power = 1;
+ // maybe refactor common parts with above code.
+ for (String unitPart : Continuation.split(compoundUnit, continuations)) {
+ switch (unitPart) {
+ case "square": power = 2; break;
+ case "cubic": power = 3; break;
+ case "per": inNumerator = false; break; // sticky, ignore multiples
+ default:
+ if (unitPart.startsWith("pow")) {
+ power = Integer.parseInt(unitPart.substring(3));
+ } else {
+ Map<String, Integer> target = inNumerator == groupInNumerator ? numUnitsToPowers : denUnitsToPowers;
+ Integer oldPower = target.get(unitPart);
+ // we multiply powers, so that weight-square-volume => weight-pow4-length
+ int newPower = groupPower * power + (oldPower == null ? 0 : oldPower);
+ target.put(unitPart, newPower);
+ power = 1;
+ }
+ }
+ }
+ return this;
+ }
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ boolean firstDenominator = true;
+ for (int i = 1; i >= 0; --i) { // two passes, numerator then den.
+ boolean positivePass = i > 0;
+ Map<String, Integer> target = positivePass ? numUnitsToPowers : denUnitsToPowers;
+ for (Entry<String, Integer> entry : target.entrySet()) {
+ String unit = entry.getKey();
+ int power = entry.getValue();
+ // NOTE: zero (eg one-per-one) gets counted twice
+ if (builder.length() != 0) {
+ builder.append('-');
+ }
+ if (!positivePass) {
+ if (firstDenominator) {
+ firstDenominator = false;
+ builder.append("per-");
+ }
+ }
+ switch (power) {
+ case 1:
+ break;
+ case 2:
+ builder.append("square-"); break;
+ case 3:
+ builder.append("cubic-"); break;
+ default:
+ if (power > 3) {
+ builder.append("pow" + power + "-");
+ } else {
+ throw new IllegalArgumentException("Unhandled power: " + power);
+ }
+ break;
+ }
+ builder.append(unit);
+
+ }
+ }
+ return builder.toString();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ UnitId other = (UnitId) obj;
+ return numUnitsToPowers.equals(other.numUnitsToPowers)
+ && denUnitsToPowers.equals(other.denUnitsToPowers);
+ }
+ @Override
+ public int hashCode() {
+ return Objects.hash(numUnitsToPowers, denUnitsToPowers);
+ }
+ @Override
+ public boolean isFrozen() {
+ return frozen;
+ }
+ @Override
+ public UnitId freeze() {
+ frozen = true;
+ numUnitsToPowers = ImmutableMap.copyOf(numUnitsToPowers);
+ denUnitsToPowers = ImmutableMap.copyOf(denUnitsToPowers);
+ return this;
+ }
+ @Override
+ public UnitId cloneAsThawed() {
+ throw new UnsupportedOperationException();
+ }
+
+ public UnitId resolve() {
+ UnitId result = new UnitId();
+ result.numUnitsToPowers.putAll(numUnitsToPowers);
+ result.denUnitsToPowers.putAll(denUnitsToPowers);
+ for (Entry<String, Integer> entry : numUnitsToPowers.entrySet()) {
+ final String key = entry.getKey();
+ Integer denPower = denUnitsToPowers.get(key);
+ if (denPower == null) {
+ continue;
+ }
+ int power = entry.getValue() - denPower;
+ if (power > 0) {
+ result.numUnitsToPowers.put(key, power);
+ result.denUnitsToPowers.remove(key);
+ } else if (power < 0) {
+ result.numUnitsToPowers.remove(key);
+ result.denUnitsToPowers.put(key, -power);
+ } else { // 0, so
+ result.numUnitsToPowers.remove(key);
+ result.denUnitsToPowers.remove(key);
+ }
+ }
+ return result.freeze();
+ }
+ }
+
+ public final UnitId createUnitId(String unit) {
+ return new UnitId().add(continuations, unit, true, 1).freeze();
+ }
+
+ public boolean isBaseUnit(String unit) {
+ return baseUnits.contains(unit);
+ }
+
+ public boolean isSimpleBaseUnit(String unit) {
+ return BASE_UNITS.contains(unit);
+ }
+
+ public Set<String> baseUnits() {
+ return baseUnits;
+ }
+
+ // TODO change to TRIE if the performance isn't good enough, or restructure with regex
+ public static final ImmutableMap<String, Rational> PREFIXES = ImmutableMap.<String, Rational>builder()
+ .put("yocto", Rational.pow10(-24))
+ .put("zepto", Rational.pow10(-21))
+ .put("atto", Rational.pow10(-18))
+ .put("femto", Rational.pow10(-15))
+ .put("pico", Rational.pow10(-12))
+ .put("nano", Rational.pow10(-9))
+ .put("micro", Rational.pow10(-6))
+ .put("milli", Rational.pow10(-3))
+ .put("centi", Rational.pow10(-2))
+ .put("deci", Rational.pow10(-1))
+ .put("deka", Rational.pow10(1))
+ .put("hecto", Rational.pow10(2))
+ .put("kilo", Rational.pow10(3))
+ .put("mega", Rational.pow10(6))
+ .put("giga", Rational.pow10(9))
+ .put("tera", Rational.pow10(12))
+ .put("peta", Rational.pow10(15))
+ .put("exa", Rational.pow10(18))
+ .put("zetta", Rational.pow10(21))
+ .put("yotta", Rational.pow10(24))
+ .build();
+
+ static final Set<String> SKIP_PREFIX = ImmutableSet.of(
+ "millimeter-ofhg",
+ "kilogram"
+ );
+
+ /**
+ * If there is no prefix, return the unit and Rational.ONE.
+ * If there is a prefix return the unit (with prefix stripped) and the prefix factor
+ * */
+ private String stripPrefix(String unit, Output<Rational> deprefix) {
+ deprefix.value = Rational.ONE;
+ if (SKIP_PREFIX.contains(unit)) {
+ return unit;
+ }
+
+ for (Entry<String, Rational> entry : PREFIXES.entrySet()) {
+ String prefix = entry.getKey();
+ if (unit.startsWith(prefix)) {
+ deprefix.value = entry.getValue();
+ return unit.substring(prefix.length());
+ }
+ }
+ return unit;
+ }
+
+ public BiMap<String, String> getBaseUnitToQuantity() {
+ return (BiMap<String, String>) baseUnitToQuantity;
+ }
+
+ public String getQuantityFromUnit(String unit, boolean showYourWork) {
+ Output<String> metricUnit = new Output<>();
+ unit = fixDenormalized(unit);
+ ConversionInfo unitInfo = parseUnitId(unit, metricUnit, showYourWork);
+ return metricUnit == null ? null : getQuantityFromBaseUnit(metricUnit.value);
+ }
+
+ public String getQuantityFromBaseUnit(String baseUnit) {
+ if (baseUnit == null) {
+ throw new NullPointerException("baseUnit");
+ }
+ String result = getQuantityFromBaseUnit2(baseUnit);
+ if (result != null) {
+ return result;
+ }
+ result = getQuantityFromBaseUnit2(reciprocalOf(baseUnit));
+ if (result != null) {
+ result += "-inverse";
+ }
+ return result;
+ }
+
+ private String getQuantityFromBaseUnit2(String baseUnit) {
+ String result = baseUnitToQuantity.get(baseUnit);
+ if (result != null) {
+ return result;
+ }
+ UnitId unitId = createUnitId(baseUnit);
+ UnitId resolved = unitId.resolve();
+ return baseUnitToQuantity.get(resolved.toString());
+ }
+
+ public Set<String> getSimpleUnits() {
+ return sourceToTargetInfo.keySet();
+ }
+
+ public void addAliases(Map<String, R2<List<String>, String>> tagToReplacement) {
+ fixDenormalized = new TreeMap<>();
+ for (Entry<String, R2<List<String>, String>> entry : tagToReplacement.entrySet()) {
+ final String badCode = entry.getKey();
+ final List<String> replacements = entry.getValue().get0();
+ fixDenormalized.put(badCode, replacements.iterator().next());
+ }
+ fixDenormalized = ImmutableMap.copyOf(fixDenormalized);
+ }
+
+ public Map<String, TargetInfo> getInternalConversionData() {
+ return sourceToTargetInfo;
+ }
+
+ public Multimap<String, String> getSourceToSystems() {
+ return sourceToSystems;
+ }
+
+ public Set<String> getSystems(String unit) {
+ Set<String> result = new TreeSet<>();
+ UnitId id = createUnitId(unit);
+ for (String subunit : id.denUnitsToPowers.keySet()) {
+ addSystems(result, subunit);
+ }
+ for (String subunit : id.numUnitsToPowers.keySet()) {
+ addSystems(result, subunit);
+ }
+ return result;
+ }
+
+ public static final Set<String> OTHER_SYSTEM = ImmutableSet.of(
+ "g-force", "dalton", "calorie", "earth-radius",
+ "solar-radius", "solar-radius", "astronomical-unit", "light-year", "parsec", "earth-mass",
+ "solar-mass", "bit", "byte", "karat", "solar-luminosity", "ofhg", "atmosphere",
+ "pixel", "dot", "permillion", "permyriad", "permille", "percent", "karat", "portion",
+ "minute", "hour", "day", "day-person", "week", "week-person",
+ "year", "year-person", "decade", "month", "month-person", "century",
+ "arc-second", "arc-minute", "degree", "radian", "revolution",
+ "electronvolt",
+ // quasi-metric
+ "dunam", "mile-scandinavian", "carat", "cup-metric", "pint-metric"
+ );
+
+ private void addSystems(Set<String> result, String subunit) {
+ Collection<String> systems = sourceToSystems.get(subunit);
+ if (!systems.isEmpty()) {
+ result.addAll(systems);
+ } else if (!OTHER_SYSTEM.contains(subunit)) {
+ result.add("metric");
+ }
+ }
+
+ public String reciprocalOf(String value) {
+ // quick version, input guarantteed to be normalized
+ int index = value.indexOf("-per-");
+ if (index < 0) {
+ return null;
+ }
+ return value.substring(index+5) + "-per-" + value.substring(0, index);
+ }
+
+ public Rational parseRational(String source) {
+ return rationalParser.parse(source);
+ }
+
+ public String showRational(String title, Rational rational, String unit) {
+ String doubleString = showRational2(rational, " = ", " ≅ ");
+ final String endResult = title + rational + doubleString + (unit != null ? " " + unit: "");
+ return endResult;
+ }
+
+ public String showRational(Rational rational, String approximatePrefix) {
+ String doubleString = showRational2(rational, "", approximatePrefix);
+ return doubleString.isEmpty() ? rational.numerator.toString() : doubleString;
+ }
+
+ public String showRational2(Rational rational, String equalPrefix, String approximatePrefix) {
+ String doubleString = "";
+ if (!rational.denominator.equals(BigInteger.ONE)) {
+ String doubleValue = String.valueOf(rational.toBigDecimal(MathContext.DECIMAL32).doubleValue());
+ Rational reverse = parseRational(doubleValue);
+ doubleString = (reverse.equals(rational) ? equalPrefix : approximatePrefix) + doubleValue;
+ }
+ return doubleString;
+ }
+
+ public Rational convert(Rational sourceValue, String sourceUnit, final String targetUnit, boolean showYourWork) {
+ if (showYourWork) {
+ System.out.println(showRational("\nconvert:\t", sourceValue, sourceUnit) + " ⟹ " + targetUnit);
+ }
+ sourceUnit = fixDenormalized(sourceUnit);
+ Output<String> sourceBase = new Output<>();
+ Output<String> targetBase = new Output<>();
+ ConversionInfo sourceConversionInfo = parseUnitId(sourceUnit, sourceBase, showYourWork);
+ if (sourceConversionInfo == null) {
+ if (showYourWork) System.out.println("! unknown unit: " + sourceUnit);
+ return Rational.NaN;
+ }
+ Rational intermediateResult = sourceConversionInfo.convert(sourceValue);
+ if (showYourWork) System.out.println(showRational("intermediate:\t", intermediateResult, sourceBase.value));
+ if (showYourWork) System.out.println("invert:\t" + targetUnit);
+ ConversionInfo targetConversionInfo = parseUnitId(targetUnit, targetBase, showYourWork);
+ if (targetConversionInfo == null) {
+ if (showYourWork) System.out.println("! unknown unit: " + targetUnit);
+ return Rational.NaN;
+ }
+ if (!sourceBase.value.equals(targetBase.value)) {
+ // try resolving
+ String sourceBaseFixed = createUnitId(sourceBase.value).resolve().toString();
+ String targetBaseFixed = createUnitId(targetBase.value).resolve().toString();
+ // try reciprocal
+ if (!sourceBaseFixed.equals(targetBaseFixed)) {
+ String reciprocalUnit = reciprocalOf(sourceBase.value);
+ if (reciprocalUnit == null || !targetBase.value.equals(reciprocalUnit)) {
+ if (showYourWork) System.out.println("! incomparable units: " + sourceUnit + " and " + targetUnit);
+ return Rational.NaN;
+ }
+ intermediateResult = intermediateResult.reciprocal();
+ if (showYourWork) System.out.println(showRational(" ⟹ 1/intermediate:\t", intermediateResult, reciprocalUnit));
+ }
+ }
+ Rational result = targetConversionInfo.convertBackwards(intermediateResult);
+ if (showYourWork) System.out.println(showRational("target:\t", result, targetUnit));
+ return result;
+ }
+
+ public String fixDenormalized(String unit) {
+ String fixed = fixDenormalized.get(unit);
+ return fixed == null ? unit : fixed;
+ }
+
+ public Map<String, Rational> getConstants() {
+ return rationalParser.getConstants();
+ }
+
+ public String getBaseUnitFromQuantity(String unitQuantity) {
+ boolean invert = false;
+ if (unitQuantity.endsWith("-inverse")) {
+ invert = true;
+ unitQuantity = unitQuantity.substring(0,unitQuantity.length()-8);
+ }
+ String bu = ((BiMap<String,String>) baseUnitToQuantity).inverse().get(unitQuantity);
+ if (bu == null) {
+ return null;
+ }
+ return invert ? reciprocalOf(bu) : bu;
+ }
+
+ public Set<String> getQuantities() {
+ return getBaseUnitToQuantity().inverse().keySet();
+ }
+}
diff --git a/tools/java/org/unicode/cldr/util/UnitPreferences.java b/tools/java/org/unicode/cldr/util/UnitPreferences.java
new file mode 100644
index 0000000..91f228a
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/UnitPreferences.java
@@ -0,0 +1,188 @@
+package org.unicode.cldr.util;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.ibm.icu.impl.locale.XCldrStub.ImmutableMap;
+import com.ibm.icu.util.Freezable;
+
+public class UnitPreferences implements Freezable<UnitPreferences> {
+ Map<String, Map<String, Multimap<Set<String>, UnitPreference>>> quantityToUsageToRegionsToInfo = new TreeMap<>();
+ Set<String> usages = new TreeSet<>();
+
+ /**
+ * Special class encapsulating
+ * @author markdavis
+ *
+ */
+ public static final class UnitPreference implements Comparable<UnitPreference>{
+ public final Rational geq;
+ public final String unit;
+ public final String skeleton;
+
+ public UnitPreference(Rational geq, String unit, String skeleton) {
+ this.geq = geq;
+ this.unit = unit;
+ this.skeleton = skeleton == null ? "" : skeleton;
+ }
+
+ @Override
+ public int compareTo(UnitPreference o) {
+ int diff = geq.compareTo(o.geq);
+ if (diff != 0) {
+ return diff;
+ }
+ return unit.compareTo(o.unit);
+ }
+ @Override
+ public boolean equals(Object obj) {
+ return compareTo((UnitPreference)obj) == 0;
+ }
+ @Override
+ public int hashCode() {
+ return Objects.hash(geq, unit);
+ }
+ public String toString(String baseUnit) {
+ return geq + (baseUnit == null ? "": " " + baseUnit) + ", " + unit + (skeleton.isEmpty() ? "" : ", " + skeleton);
+ }
+ public String toString() {
+ return toString(null);
+ }
+ }
+
+ static private final Splitter SPLIT_SPACE = Splitter.on(' ').trimResults().omitEmptyStrings();
+ static public Splitter SPLIT_AND = Splitter.on("-and-");
+
+ public void add(String quantity, String usage, String regions, String geq, String skeleton, String unit) {
+ usages.add(usage);
+ Map<String, Multimap<Set<String>, UnitPreference>> usageToRegionsToInfo = quantityToUsageToRegionsToInfo.get(quantity);
+ if (usageToRegionsToInfo == null) {
+ quantityToUsageToRegionsToInfo.put(quantity, usageToRegionsToInfo = new TreeMap<>());
+ }
+ Multimap<Set<String>, UnitPreference> regionsToInfo = usageToRegionsToInfo.get(usage);
+ if (regionsToInfo == null) {
+ usageToRegionsToInfo.put(usage, regionsToInfo = LinkedHashMultimap.create());
+ }
+ Rational newGeq = geq == null || geq.isEmpty() ? Rational.ONE : Rational.of(geq);
+ final UnitPreference newUnitPref = new UnitPreference(newGeq, unit, skeleton);
+
+ regionsToInfo.put(ImmutableSet.copyOf(new TreeSet<>(SPLIT_SPACE.splitToList(regions))), newUnitPref);
+ }
+
+ boolean frozen;
+
+ @Override
+ public boolean isFrozen() {
+ return frozen;
+ }
+
+ @Override
+ public UnitPreferences freeze() {
+ if (!frozen) {
+ frozen = true;
+ quantityToUsageToRegionsToInfo = CldrUtility.protectCollection(quantityToUsageToRegionsToInfo);
+ usages = ImmutableSet.copyOf(usages);
+ }
+ return this;
+ }
+
+ @Override
+ public UnitPreferences cloneAsThawed() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * quantity => usage => region => geq => [unit, skeleton]
+ * @return
+ */
+ public Map<String, Map<String, Multimap<Set<String>, UnitPreference>>> getData() {
+ return quantityToUsageToRegionsToInfo;
+ }
+
+ static final Joiner JOIN_SPACE = Joiner.on(' ');
+
+ @Override
+ public String toString() {
+ StringBuilder buffer = new StringBuilder();
+ int order = 0;
+ for (Entry<String, Map<String, Multimap<Set<String>, UnitPreference>>> entry1 : quantityToUsageToRegionsToInfo.entrySet()) {
+ String quantity = entry1.getKey();
+ for (Entry<String, Multimap<Set<String>, UnitPreference>> entry2 : entry1.getValue().entrySet()) {
+ String usage = entry2.getKey();
+ for (Entry<Set<String>, Collection<UnitPreference>> entry : entry2.getValue().asMap().entrySet()) {
+ Set<String> regions = entry.getKey();
+ for (UnitPreference up : entry.getValue()) {
+ buffer.append("\n" + up.unit + "\t;\t" + getPath(order++, quantity, usage, regions, up.geq, up.skeleton));
+ }
+ }
+ }
+ }
+ return buffer.toString();
+ }
+
+ public String getPath(int order, String quantity, String usage, Collection<String> regions, Rational geq, String skeleton) {
+ // <unitPreferences category="length" usage="person" scope="small">
+ // <unitPreference regions="001">centimeter</unitPreference>
+ return "//supplementalData/unitPreferenceData/unitPreferences"
+ + "[@category=\"" + quantity + "\"]"
+ + "[@usage=\"" + usage + "\"]"
+ + "/unitPreference"
+ + "[@_q=\"" + order + "\"]"
+ + "[@regions=\"" + JOIN_SPACE.join(regions) + "\"]"
+ + (geq == Rational.ONE ? "" : "[@geq=\"" + geq + "\"]")
+ + (skeleton.isEmpty() ? "" : "[@skeleton=\"" + skeleton + "\"]")
+ ;
+ }
+
+ /**
+ * Returns the data converted to single regions, and using base units
+ * @return
+ */
+ public Map<String, Map<String, Map<String, UnitPreference>>> getFastMap(UnitConverter converter) {
+ Map<String, Map<String, Map<String, UnitPreference>>> result = new LinkedHashMap<>();
+ for (Entry<String, Map<String, Multimap<Set<String>, UnitPreference>>> entry1 : quantityToUsageToRegionsToInfo.entrySet()) {
+ String quantity = entry1.getKey();
+ Map<String, Map<String, UnitPreference>> result2 = new LinkedHashMap<>();
+ result.put(quantity, result2);
+
+ for (Entry<String, Multimap<Set<String>, UnitPreference>> entry2 : entry1.getValue().entrySet()) {
+ String usage = entry2.getKey();
+ Map<String, UnitPreference> result3 = new LinkedHashMap<>();
+ result2.put(usage, result3);
+ for (Entry<Set<String>, Collection<UnitPreference>> entry : entry2.getValue().asMap().entrySet()) {
+ Set<String> regions = entry.getKey();
+ for (UnitPreference up : entry.getValue()) {
+ String unit = SPLIT_AND.split(up.unit).iterator().next(); // first unit
+ quantity = converter.getQuantityFromUnit(unit, false);
+ String baseUnit = converter.getBaseUnitFromQuantity(quantity);
+ Rational geq = converter.parseRational(String.valueOf(up.geq));
+ Rational value = converter.convert(geq, unit, baseUnit, false);
+ if (value.equals(Rational.NaN)) {
+ converter.convert(geq, unit, baseUnit, true); // debug
+ }
+ UnitPreference up2 = new UnitPreference(value, up.unit, up.skeleton);
+ for (String region : regions) {
+ result3.put(region, up2);
+ }
+ }
+ }
+ }
+ }
+ return ImmutableMap.copyOf(result);
+ }
+
+ public Set<String> getUsages() {
+ return usages;
+ }
+}
diff --git a/tools/java/org/unicode/cldr/util/Units.java b/tools/java/org/unicode/cldr/util/Units.java
new file mode 100644
index 0000000..ee6a7d8
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/Units.java
@@ -0,0 +1,43 @@
+package org.unicode.cldr.util;
+
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import org.unicode.cldr.test.ExampleGenerator;
+
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.text.UnicodeSetSpanner;
+
+public class Units {
+
+ private static final UnicodeSet WHITESPACE = new UnicodeSet("[:whitespace:]").freeze();
+ public static Pattern NO_SPACE_PREFIX = Pattern.compile("\\}" + ExampleGenerator.backgroundEndSymbol + "?\\p{L}|\\p{L}" + ExampleGenerator.backgroundStartSymbol + "?\\{");
+
+ public static String combinePattern(String unitFormat, String compoundPattern, boolean lowercaseUnitIfNoSpaceInCompound) {
+ // meterFormat of the form {0} meters or {0} Meter
+ // compoundPattern is of the form Z{0} or Zetta{0}
+
+ // extract the unit
+ String modUnit = (String) SPACE_SPANNER.trim(unitFormat.replace("{0}", ""));
+ String[] parameters = { modUnit };
+
+ String modFormat = unitFormat.replace(modUnit, MessageFormat.format(compoundPattern, parameters));
+ if (modFormat.equals(unitFormat)) {
+ // didn't work, so fall back
+ String[] parameters1 = { unitFormat };
+ modFormat = MessageFormat.format(compoundPattern, parameters1);
+ }
+
+ // hack to fix casing
+ if (lowercaseUnitIfNoSpaceInCompound
+ && NO_SPACE_PREFIX.matcher(compoundPattern).find()) {
+ modFormat = modFormat.replace(modUnit, modUnit.toLowerCase(Locale.ENGLISH));
+ }
+
+ return modFormat;
+ }
+
+ static final UnicodeSetSpanner SPACE_SPANNER = new UnicodeSetSpanner(WHITESPACE);
+
+}
diff --git a/tools/java/org/unicode/cldr/util/VerifyCompactNumbers.java b/tools/java/org/unicode/cldr/util/VerifyCompactNumbers.java
index 91e598e..3383b45 100644
--- a/tools/java/org/unicode/cldr/util/VerifyCompactNumbers.java
+++ b/tools/java/org/unicode/cldr/util/VerifyCompactNumbers.java
@@ -52,7 +52,7 @@
// later, look at DateTimeFormats to set up as an HTML table
- private static final Set<String> USES_GROUPS_OF_4 = new HashSet<String>(Arrays.asList("ko", "ja", "zh", "zh_Hant"));
+ public static final Set<String> USES_GROUPS_OF_4 = new HashSet<String>(Arrays.asList("ko", "ja", "zh", "zh_Hant"));
/**
* Produce a set of static tables from the vxml data. Only a stopgap until the above is integrated into ST.
@@ -163,10 +163,11 @@
;
ULocale locale2 = new ULocale(locale);
- NumberFormat nf = NumberFormat.getInstance(locale2);
+ ICUServiceBuilder builder = new ICUServiceBuilder().setCldrFile(cldrFile);
+ NumberFormat nf = builder.getNumberFormat(1);
+
// nf.setMaximumFractionDigits(0);
SupplementalDataInfo sdi = CLDR_CONFIG.getSupplementalDataInfo();
- PluralInfo pluralInfo = sdi.getPlurals(locale);
String[] debugOriginals = null;
CompactDecimalFormat cdf = BuildIcuCompactDecimalFormat.build(cldrFile, debugCreationErrors,
debugOriginals, CompactStyle.SHORT, locale2, CurrencyStyle.PLAIN, currencyCode);
@@ -186,56 +187,7 @@
// CompactDecimalFormat cdfsCurrISO = BuildIcuCompactDecimalFormat.build(cldrFile, debugCreationErrors,
// debugOriginals, CompactStyle.LONG, locale2, CurrencyStyle.ISO_CURRENCY, "EUR");
- // Collect samples for display
- // one path for group-3, one for group-4
- // TODO, fix for indic.
- int factor = USES_GROUPS_OF_4.contains(locale) ? 10000 : 1000;
-
- // we want to collect a sample of at least one sample for each plural category for each
- // power of ten
- Set<Double> samples = new TreeSet<Double>();
- samples.add(1.1d);
- samples.add(1.5d);
- samples.add(1100d);
- collectItems(pluralInfo, 1, 10, samples);
- collectItems(pluralInfo, 10, 100, samples);
- collectItems(pluralInfo, 100, 1000, samples);
- int sigDigits = 3;
- if (factor > 1000) {
- collectItems(pluralInfo, 1000, 10000, samples);
- sigDigits = 4;
- }
- if (cdf != null) {
- cdf.setMaximumSignificantDigits(sigDigits);
- }
- if (cdfs != null) {
- cdfs.setMaximumSignificantDigits(sigDigits);
- }
- if (cdfCurr != null) {
- cdfCurr.setCurrency(Currency.getInstance(currencyCode));
- cdfCurr.setMaximumSignificantDigits(sigDigits);
- }
-// cdfU.setMaximumSignificantDigits(sigDigits);
-
- // for (Entry<Count, List<Double>> entry : pluralInfo.getCountToExamplesMap().entrySet()) {
- // samples.add(entry.getValue().get(0));
- // }
- //
- // Set<Double> samples2 = new TreeSet<Double>();
- // for (int i = 10; i < factor; i *= 10) {
- // for (Double sample : samples) {
- // samples2.add(sample*i);
- // }
- // }
- // samples.addAll(samples2);
-
- Set<Double> allSamples = new TreeSet<Double>();
- for (long i = 1; i <= 100000000000000L; i *= factor) {
- for (Double sample : samples) {
- double source = i * sample;
- allSamples.add(source);
- }
- }
+ Set<Double> allSamples = collectSamplesAndSetFormats(currencyCode, locale, sdi, cdf, cdfs, cdfCurr);
try {
for (double source : allSamples) {
@@ -246,6 +198,7 @@
String formattedNumber = nf.format(source);
String compactFormattedNumber = cdf == null ? "n/a" : cdf.format(source);
String compactLongFormattedNumber = cdfs == null ? "n/a" : cdfs.format(source);
+ String compactCurrFormattedNumber = !showCurrency || cdfs == null ? "n/a" : cdfCurr.format(source);
// plainText.println(locale
// + "\t__" + source
// + "\t__" + compactFormattedNumber
@@ -257,7 +210,7 @@
.addCell(compactLongFormattedNumber);
if (showCurrency) {
tablePrinter1
- .addCell(cdfCurr == null ? "n/a" : cdfCurr.format(source))
+ .addCell(compactCurrFormattedNumber)
// .addCell(cdfU.format(source))
// .addCell(cdfsCurr.format(source))
// .addCell(cdfsCurrLong.format(source))
@@ -300,6 +253,62 @@
}
}
+ public static Set<Double> collectSamplesAndSetFormats(String currencyCode, String locale, SupplementalDataInfo sdi, CompactDecimalFormat cdf,
+ CompactDecimalFormat cdfs, CompactDecimalFormat cdfCurr) {
+ // Collect samples for display
+ // one path for group-3, one for group-4
+ // TODO, fix for indic.
+ int factor = USES_GROUPS_OF_4.contains(locale) ? 10000 : 1000;
+
+ // we want to collect a sample of at least one sample for each plural category for each
+ // power of ten
+ PluralInfo pluralInfo = sdi.getPlurals(locale);
+ Set<Double> samples = new TreeSet<Double>();
+ samples.add(1.1d);
+ samples.add(1.5d);
+ samples.add(1100d);
+ collectItems(pluralInfo, 1, 10, samples);
+ collectItems(pluralInfo, 10, 100, samples);
+ collectItems(pluralInfo, 100, 1000, samples);
+ int sigDigits = 3;
+ if (factor > 1000) {
+ collectItems(pluralInfo, 1000, 10000, samples);
+ sigDigits = 4;
+ }
+ if (cdf != null) {
+ cdf.setMaximumSignificantDigits(sigDigits);
+ }
+ if (cdfs != null) {
+ cdfs.setMaximumSignificantDigits(sigDigits);
+ }
+ if (cdfCurr != null) {
+ cdfCurr.setCurrency(Currency.getInstance(currencyCode));
+ cdfCurr.setMaximumSignificantDigits(sigDigits);
+ }
+// cdfU.setMaximumSignificantDigits(sigDigits);
+
+ // for (Entry<Count, List<Double>> entry : pluralInfo.getCountToExamplesMap().entrySet()) {
+ // samples.add(entry.getValue().get(0));
+ // }
+ //
+ // Set<Double> samples2 = new TreeSet<Double>();
+ // for (int i = 10; i < factor; i *= 10) {
+ // for (Double sample : samples) {
+ // samples2.add(sample*i);
+ // }
+ // }
+ // samples.addAll(samples2);
+
+ Set<Double> allSamples = new TreeSet<Double>();
+ for (long i = 1; i <= 100000000000000L; i *= factor) {
+ for (Double sample : samples) {
+ double source = i * sample;
+ allSamples.add(source);
+ }
+ }
+ return allSamples;
+ }
+
private static String surveyUrl = CLDR_CONFIG.getProperty("CLDR_SURVEY_URL",
"http://st.unicode.org/cldr-apps/survey");
diff --git a/tools/java/org/unicode/cldr/util/VettingViewer.java b/tools/java/org/unicode/cldr/util/VettingViewer.java
index 064f751..48f316f 100644
--- a/tools/java/org/unicode/cldr/util/VettingViewer.java
+++ b/tools/java/org/unicode/cldr/util/VettingViewer.java
@@ -33,7 +33,6 @@
import org.unicode.cldr.test.SubmissionLocales;
import org.unicode.cldr.tool.Option;
import org.unicode.cldr.tool.Option.Options;
-import org.unicode.cldr.tool.ToolConstants;
import org.unicode.cldr.util.CLDRFile.Status;
import org.unicode.cldr.util.PathHeader.PageId;
import org.unicode.cldr.util.PathHeader.SectionId;
@@ -111,9 +110,9 @@
"The English value has changed in CLDR, but the corresponding value for your language has not. Check if any changes are needed in your language.",
6),
/**
- * The value changed from the last version of CLDR
+ * The value changed from the baseline
*/
- changedOldValue('N', "New", "The winning value was altered from the last-released CLDR value. (Informational)", 7),
+ changedOldValue('C', "Changed", "The winning value was altered from the baseline value. (Informational)", 7),
/**
* Given the users' coverage, some items are missing.
*/
@@ -374,6 +373,10 @@
checkCldr.check(path, fullPath, value, options, result);
for (CheckStatus checkStatus : result) {
final CheckCLDR cause = checkStatus.getCause();
+ /*
+ * CheckCoverage will be shown under Missing, not under Warnings; and
+ * CheckNew will be shown under New, not under Warnings; so skip them here.
+ */
if (cause instanceof CheckCoverage || cause instanceof CheckNew) {
continue;
}
@@ -475,10 +478,9 @@
* @param localeId
* @param user
* @param usersLevel
- * @param nonVettingPhase
*/
public void generateHtmlErrorTables(Appendable output, EnumSet<Choice> choices, String localeID, T user,
- Level usersLevel, boolean nonVettingPhase, boolean quick) {
+ Level usersLevel, boolean quick) {
// Gather the relevant paths
// each one will be marked with the choice that it triggered.
@@ -497,7 +499,7 @@
}
}
- FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user,
+ FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user,
usersLevel, quick);
// now write the results out
@@ -518,14 +520,14 @@
* Called only by writeVettingViewerOutput
*/
public Relation<R2<SectionId, PageId>, WritingInfo> generateFileInfoReview(Appendable output, EnumSet<Choice> choices, String localeID, T user,
- Level usersLevel, boolean nonVettingPhase, boolean quick, CLDRFile sourceFile, CLDRFile baselineFile) {
+ Level usersLevel, boolean quick, CLDRFile sourceFile, CLDRFile baselineFile) {
// Gather the relevant paths
// each one will be marked with the choice that it triggered.
Relation<R2<SectionId, PageId>, WritingInfo> sorted = Relation.of(
new TreeMap<R2<SectionId, PageId>, Set<WritingInfo>>(), TreeSet.class);
- new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user,
+ new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user,
usersLevel, quick);
// now write the results out
@@ -547,19 +549,32 @@
private FileInfo getFileInfo(CLDRFile sourceFile, CLDRFile baselineFile,
Relation<R2<SectionId, PageId>, WritingInfo> sorted,
- EnumSet<Choice> choices, String localeID, boolean nonVettingPhase,
+ EnumSet<Choice> choices, String localeID,
T user, Level usersLevel, boolean quick) {
return this.getFileInfo(sourceFile, baselineFile, sorted,
- choices, localeID, nonVettingPhase,
+ choices, localeID,
user, usersLevel, quick, null);
}
+ /**
+ * Loop through paths for the Dashboard
+ *
+ * @param sourceFile
+ * @param baselineFile
+ * @param sorted
+ * @param choices
+ * @param localeID
+ * @param user
+ * @param usersLevel
+ * @param quick
+ * @param xpath
+ * @return
+ */
private FileInfo getFileInfo(CLDRFile sourceFile, CLDRFile baselineFile,
Relation<R2<SectionId, PageId>, WritingInfo> sorted,
- EnumSet<Choice> choices, String localeID, boolean nonVettingPhase,
+ EnumSet<Choice> choices, String localeID,
T user, Level usersLevel, boolean quick, String xpath) {
- Status status = new Status();
errorChecker.initErrorStatus(sourceFile);
Matcher altProposed = ALT_PROPOSED.matcher("");
problems = EnumSet.noneOf(Choice.class);
@@ -571,10 +586,11 @@
EnumSet<Subtype> subtypes = EnumSet.noneOf(Subtype.class);
Set<String> seenSoFar = new HashSet<String>();
boolean latin = VettingViewer.isLatinScriptLocale(sourceFile);
+ CLDRFile baselineFileUnresolved = (baselineFile == null) ? null : baselineFile.getUnresolved();
for (String path : sourceFile.fullIterable()) {
if (xpath != null && !xpath.equals(path))
continue;
- String value = sourceFile.getWinningValue(path);
+ String value = sourceFile.getWinningValueForVettingViewer(path);
statusMessage.setLength(0);
subtypes.clear();
ErrorChecker.Status errorStatus = errorChecker.getErrorStatus(path, value, statusMessage, subtypes);
@@ -615,10 +631,13 @@
problems.clear();
htmlMessage.setLength(0);
- final String oldValue = baselineFile == null ? null : baselineFile.getWinningValue(path);
+
+ final String oldValue = (baselineFileUnresolved == null) ? null : baselineFileUnresolved.getWinningValue(path);
if (CheckCLDR.LIMITED_SUBMISSION) {
- if (!SubmissionLocales.allowEvenIfLimited(localeID, path, errorStatus == ErrorChecker.Status.error, oldValue == null)) {
+ boolean isError = (errorStatus == ErrorChecker.Status.error);
+ boolean isMissing = (oldValue == null);
+ if (!SubmissionLocales.allowEvenIfLimited(localeID, path, isError, isMissing)) {
continue;
};
}
@@ -634,7 +653,7 @@
MissingStatus missingStatus = null;
if (!onlyRecordErrors) {
- missingStatus = getMissingStatus(sourceFile, path, status, latin);
+ missingStatus = getMissingStatus(sourceFile, path, latin);
if (choices.contains(Choice.missingCoverage) && missingStatus == MissingStatus.ABSENT) {
problems.add(Choice.missingCoverage);
problemCounter.increment(Choice.missingCoverage);
@@ -644,9 +663,6 @@
problemCounter.increment(Choice.englishChanged);
}
if (!CheckCLDR.LIMITED_SUBMISSION && !itemsOkIfVoted && outdatedPaths.isOutdated(localeID, path)) {
- // the outdated paths compares the base value, before
- // data submission,
- // so see if the value changed.
if (Objects.equals(value, oldValue) && choices.contains(Choice.englishChanged)) {
// check to see if we voted
problems.add(Choice.englishChanged);
@@ -856,7 +872,7 @@
if (organization != null) {
level = StandardCodes.make().getLocaleCoverageLevel(organization.toString(), localeID);
}
- FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, null, choices, localeID, true, organization, level, false);
+ FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, null, choices, localeID, organization, level, false);
localeNameToFileInfo.put(name, fileInfo);
totals.addAll(fileInfo);
@@ -1065,11 +1081,10 @@
*
* @param sourceFile the CLDRFile
* @param path the path
- * @param status used for status.pathWhereFound, also passed to getSourceLocaleIdExtended
* @param latin boolean from isLatinScriptLocale, passed to isMissingOk
* @return the MissingStatus
*/
- public static MissingStatus getMissingStatus(CLDRFile sourceFile, String path, Status status, boolean latin) {
+ public static MissingStatus getMissingStatus(CLDRFile sourceFile, String path, boolean latin) {
if (sourceFile == null) {
return MissingStatus.ABSENT;
}
@@ -1082,6 +1097,8 @@
MissingStatus result;
String value = sourceFile.getStringValue(path);
+ Status status = new Status();
+ sourceFile.getSourceLocaleID(path, status);
boolean isAliased = path.equals(status.pathWhereFound);
if (value == null) {
@@ -1200,7 +1217,7 @@
* @return
*/
public static String getHeaderStyles() {
- return "<style type='text/css'>\n"
+ return "<style>\n"
+ ".hide {display:none}\n"
+ ".vve {}\n"
+ ".vvn {}\n"
@@ -1223,8 +1240,6 @@
boolean latin = VettingViewer.isLatinScriptLocale(sourceFile);
- Status status = new Status();
-
output.append("<h2>Summary</h2>\n")
.append("<p><i>It is important that you read " +
"<a target='CLDR-ST-DOCS' href='http://cldr.unicode.org/translation/vetting-view'>" +
@@ -1266,7 +1281,7 @@
.append("</td></tr>\n");
}
output.append("</table>\n</form>\n"
- + "<script type='text/javascript'>\n" +
+ + "<script>\n" +
"<!-- \n" +
"setStyles()\n" +
"-->\n"
@@ -1354,8 +1369,9 @@
addCell(output, englishFile.getWinningValue(path), null, "tv-eng", HTMLType.plain);
}
// baseline value
+ // TODO: should this be baselineFile.getUnresolved()? Compare how getFileInfo calls getMissingStatus
final String oldStringValue = baselineFile == null ? null : baselineFile.getWinningValue(path);
- MissingStatus oldValueMissing = getMissingStatus(baselineFile, path, status, latin);
+ MissingStatus oldValueMissing = getMissingStatus(baselineFile, path, latin);
addCell(output, oldStringValue, null, oldValueMissing != MissingStatus.PRESENT ? "tv-miss"
: "tv-last", HTMLType.plain);
@@ -1422,7 +1438,7 @@
} catch (Exception e) {
}
- EnumSet<Choice> errors = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user, usersLevel,
+ EnumSet<Choice> errors = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user, usersLevel,
false, path).problems;
ArrayList<String> out = new ArrayList<String>();
@@ -1511,7 +1527,6 @@
unconfirmedCounter.clear();
missingCounter.clear();
- Status status = new Status();
boolean latin = VettingViewer.isLatinScriptLocale(file);
CoverageLevel2 coverageLevel2 = CoverageLevel2.getInstance(file.getLocaleID());
@@ -1525,7 +1540,7 @@
Level level = coverageLevel2.getLevel(path);
// String localeFound = file.getSourceLocaleID(path, status);
// String value = file.getSourceLocaleID(path, status);
- MissingStatus missingStatus = VettingViewer.getMissingStatus(file, path, status, latin);
+ MissingStatus missingStatus = VettingViewer.getMissingStatus(file, path, latin);
switch (missingStatus) {
case ABSENT:
@@ -1594,8 +1609,7 @@
for (String s : DIRECTORIES) {
fileDirectories[i++] = new File(s);
}
- final String version = ToolConstants.PREVIOUS_CHART_VERSION;
- final String lastMain = CLDRPaths.ARCHIVE_DIRECTORY + "/cldr-" + version + "/common/main";
+ final String lastMain = CLDRPaths.LAST_RELEASE_DIRECTORY;
//final String lastMain = CLDRPaths.ARCHIVE_DIRECTORY + "/common/main";
do {
@@ -1736,7 +1750,7 @@
switch (newCode) {
case newCode:
- tableView.generateHtmlErrorTables(out, choiceSet, localeStringID, organization, usersLevel, SHOW_ALL, false);
+ tableView.generateHtmlErrorTables(out, choiceSet, localeStringID, organization, usersLevel, false);
break;
// case oldCode:
// tableView.generateHtmlErrorTablesOld(out, choiceSet, localeStringID, userNumericID, usersLevel, SHOW_ALL);
diff --git a/tools/java/org/unicode/cldr/util/VoteResolver.java b/tools/java/org/unicode/cldr/util/VoteResolver.java
index 1e9a95b..1ced88b 100644
--- a/tools/java/org/unicode/cldr/util/VoteResolver.java
+++ b/tools/java/org/unicode/cldr/util/VoteResolver.java
@@ -25,6 +25,7 @@
import org.unicode.cldr.util.VettingViewer.VoteStatus;
import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableSet;
import com.ibm.icu.impl.Relation;
import com.ibm.icu.text.Collator;
import com.ibm.icu.util.ULocale;
@@ -110,9 +111,37 @@
* weight.
*/
public enum Level {
- locked(0, 999), street(1, 10), anonymous(0, 8), vetter(4, 5), expert(8, 3), manager(4, 2), tc(20, 1), admin(100, 0);
- private int votes;
- private int stlevel;
+ locked( 0 /* votes */, 999 /* stlevel */),
+ street( 1 /* votes */, 10 /* stlevel */),
+ anonymous(0 /* votes */, 8 /* stlevel */),
+ vetter( 4 /* votes */, 5 /* stlevel */),
+ expert( 8 /* votes */, 3 /* stlevel */),
+ manager( 4 /* votes */, 2 /* stlevel */),
+ tc( 20 /* votes */, 1 /* stlevel */),
+ admin( 100 /* votes */, 0 /* stlevel */);
+
+ /**
+ * PERMANENT_VOTES is used by TC voters to "lock" locale+path permanently (including future versions, until unlocked),
+ * in the current VOTE_VALUE table. It is public for STFactory.java and PermanentVote.java.
+ */
+ public static final int PERMANENT_VOTES = 1000;
+
+ /**
+ * LOCKING_VOTES is used (nominally by ADMIN voter, but not really by someone logged in as ADMIN, instead
+ * by combination of two PERMANENT_VOTES) to "lock" locale+path permanently in the LOCKED_XPATHS table.
+ * It is public for STFactory.PerLocaleData.loadVoteValues.
+ */
+ public static final int LOCKING_VOTES = 2000;
+
+ /**
+ * The vote count a user of this level normally votes with
+ */
+ private final int votes;
+
+ /**
+ * The level as an integer, where 0 = admin, ..., 999 = locked
+ */
+ private final int stlevel;
private Level(int votes, int stlevel) {
this.votes = votes;
@@ -137,7 +166,7 @@
* Find the Level, given ST Level
*
* @param stlevel
- * @return
+ * @return the Level corresponding to the integer
*/
public static Level fromSTLevel(int stlevel) {
for (Level l : Level.values()) {
@@ -174,18 +203,6 @@
}
/**
- * Can this user vote at a reduced level?
- * @return the vote count this user can vote at, or null if it must vote at its assigned level
- */
- public Integer canVoteAtReducedLevel() {
- if (this.getSTLevel() <= tc.getSTLevel()) {
- return vetter.votes;
- } else {
- return null;
- }
- }
-
- /**
* Policy: can this user create or set a user to the specified level?
*/
public boolean canCreateOrSetLevelTo(Level otherLevel) {
@@ -195,6 +212,49 @@
otherLevel.getSTLevel() >= getSTLevel()); // can't gain higher privs
}
+ /**
+ * Can a user with this level vote with the given vote count?
+ *
+ * @param withVotes the given vote count
+ * @return true if the user can vote with the given vote count, else false
+ */
+ public boolean canVoteWithCount(int withVotes) {
+ /*
+ * ADMIN is allowed to vote with LOCKING_VOTES, but not directly in the GUI, only
+ * by two TC voting together with PERMANENT_VOTES. Therefore LOCKING_VOTES is omitted
+ * from the GUI menu (voteCountMenu), but included in canVoteWithCount.
+ */
+ if (withVotes == LOCKING_VOTES && this == admin) {
+ return true;
+ }
+ Set<Integer> menu = getVoteCountMenu();
+ return menu == null ? withVotes == this.votes : menu.contains(withVotes);
+ }
+
+ /**
+ * If not null, an array of different vote counts from which a user of this
+ * level is allowed to choose.
+ */
+ private ImmutableSet<Integer> voteCountMenu = null;
+
+ /**
+ * Get the ordered immutable set of different vote counts a user of this level can vote with
+ *
+ * @return the set, or null if the user has no choice of vote count
+ */
+ public ImmutableSet<Integer> getVoteCountMenu() {
+ return voteCountMenu;
+ }
+
+ /*
+ * Set voteCountMenu for admin and tc in this static block, which will be run after
+ * all the constructors have run, rather than in the constructor itself. For example,
+ * vetter.votes needs to be defined before we can set admin.voteCountMenu.
+ */
+ static {
+ admin.voteCountMenu = ImmutableSet.of(vetter.votes, admin.votes); /* Not LOCKING_VOTES; see canVoteWithCount */
+ tc.voteCountMenu = ImmutableSet.of(vetter.votes, tc.votes, PERMANENT_VOTES);
+ }
};
/**
@@ -301,7 +361,6 @@
*/
public MaxCounter<T> add(T obj, long countValue, long time) {
long value = getCount(obj);
- long timeValue = getTime(obj);
if ((value <= countValue)) {
super.add(obj, countValue - value, time); // only add the difference!
}
@@ -367,7 +426,7 @@
*
* @param value
* @param voter
- * @param withVotes optionally, vote at a reduced voting level. May not exceed voter's typical level. null = use default level.
+ * @param withVotes optionally, vote at a non-typical voting level. May not exceed voter's maximum allowed level. null = use default level.
* @param date
*/
public void add(T value, int voter, Integer withVotes, Date date) {
@@ -375,26 +434,23 @@
if (info == null) {
throw new UnknownVoterException(voter);
}
- final int maxVotes = info.getLevel().getVotes(); // max votes available for user
- if (withVotes == null) {
- withVotes = maxVotes; // use max (default)
- } else {
- withVotes = Math.min(withVotes, maxVotes); // override to lower vote count
+ Level level = info.getLevel();
+ if (withVotes == null || !level.canVoteWithCount(withVotes)) {
+ withVotes = level.getVotes();
}
- addInternal(value, voter, info, withVotes, date); // do the add
+ addInternal(value, info, withVotes, date); // do the add
}
/**
* Called by add(T,int,Integer) to actually add a value.
*
* @param value
- * @param voter
* @param info
* @param votes
* @param date
* @see #add(Object, int, Integer)
*/
- private void addInternal(T value, int voter, final VoterInfo info, final int votes, Date time) {
+ private void addInternal(T value, final VoterInfo info, final int votes, Date time) {
if (baileySet == false) {
throw new IllegalArgumentException("setBaileyValue must be called before add");
}
@@ -613,6 +669,7 @@
private Status trunkStatus;
private boolean resolved;
+ private boolean valueIsLocked;
private int requiredVotes;
private SupplementalDataInfo supplementalDataInfo = SupplementalDataInfo.getInstance();
@@ -686,16 +743,6 @@
}
/**
- * Is this an established locale? If so, the requiredVotes is higher.
- * @return
- * @deprecated use {@link #getRequiredVotes()}
- */
- @Deprecated
- public boolean isEstablished() {
- return (requiredVotes == 8);
- }
-
- /**
* What are the required votes for this item?
* @return the number of votes (as of this writing: usually 4, 8 for established locales)
*/
@@ -712,7 +759,7 @@
this.trunkStatus = Status.missing;
this.setUsingKeywordAnnotationVoting(false);
organizationToValueAndVote.clear();
- resolved = false;
+ resolved = valueIsLocked = false;
values.clear();
}
@@ -757,6 +804,9 @@
if (resolved) {
throw new IllegalArgumentException("Must be called after clear, and before any getters.");
}
+ if (withVotes != null && withVotes == Level.LOCKING_VOTES) {
+ valueIsLocked = true;
+ }
organizationToValueAndVote.add(value, voter, withVotes, date);
values.add(value);
}
@@ -1864,4 +1914,23 @@
public void setUsingKeywordAnnotationVoting(boolean usingKeywordAnnotationVoting) {
this.usingKeywordAnnotationVoting = usingKeywordAnnotationVoting;
}
+
+ /**
+ * Is the value locked for this locale+path?
+ *
+ * @return true or false
+ */
+ public boolean isValueLocked() {
+ return valueIsLocked;
+ }
+
+ /**
+ * Can a user who makes a losing vote flag the locale+path?
+ * I.e., is the locale+path locked and/or does it require HIGH_BAR votes?
+ *
+ * @return true or false
+ */
+ public boolean canFlagOnLosing() {
+ return valueIsLocked || (requiredVotes == HIGH_BAR);
+ }
}
diff --git a/tools/java/org/unicode/cldr/util/XMLSource.java b/tools/java/org/unicode/cldr/util/XMLSource.java
index ee1e8c1..ac9591b 100644
--- a/tools/java/org/unicode/cldr/util/XMLSource.java
+++ b/tools/java/org/unicode/cldr/util/XMLSource.java
@@ -42,16 +42,25 @@
public static final String ROOT_ID = "root";
public static final boolean USE_PARTS_IN_ALIAS = false;
private static final String TRACE_INDENT = " "; // "\t"
- private transient XPathParts parts = new XPathParts();
private static Map<String, String> allowDuplicates = new HashMap<String, String>();
private String localeID;
private boolean nonInheriting;
- private TreeMap<String, String> aliases;
- private LinkedHashMap<String, List<String>> reverseAliases;
+ private TreeMap<String, String> aliasCache;
+ private LinkedHashMap<String, List<String>> reverseAliasCache;
protected boolean locked;
transient String[] fixedPath = new String[1];
+ /*
+ * For testing, make it possible to disable multiple caches:
+ * getFullPathAtDPathCache, getSourceLocaleIDCache, aliasCache, reverseAliasCache
+ */
+ protected boolean cachingIsEnabled = true;
+
+ public void disableCaching() {
+ cachingIsEnabled = false;
+ }
+
public static class AliasLocation {
public final String pathWhereFound;
public final String localeWhereFound;
@@ -388,28 +397,52 @@
* only locale to have aliases, all other locales will have no mappings.
*/
protected synchronized TreeMap<String, String> getAliases() {
- // The cache assumes that aliases will never change over the lifetime of
- // an XMLSource.
- if (aliases == null) {
- aliases = new TreeMap<String, String>();
- // Look for aliases and create mappings for them.
- // Aliases are only ever found in root.
- for (String path : this) {
- if (!Alias.isAliasPath(path)) continue;
- String fullPath = getFullPathAtDPath(path);
- Alias temp = Alias.make(fullPath);
- if (temp == null) continue;
- aliases.put(temp.getOldPath(), temp.getNewPath());
- }
+ if (!cachingIsEnabled) {
+ /*
+ * Always create and return a new "aliasMap" instead of this.aliasCache
+ * Probably expensive!
+ */
+ return loadAliases();
}
- return aliases;
+
+ /*
+ * The cache assumes that aliases will never change over the lifetime of an XMLSource.
+ */
+ if (aliasCache == null) {
+ aliasCache = loadAliases();
+ }
+ return aliasCache;
+ }
+
+ /**
+ * Look for aliases and create mappings for them.
+ * Aliases are only ever found in root.
+ *
+ * return aliasMap the new map
+ */
+ private TreeMap<String, String> loadAliases() {
+ TreeMap<String, String> aliasMap = new TreeMap<String, String>();
+ for (String path : this) {
+ if (!Alias.isAliasPath(path)) {
+ continue;
+ }
+ String fullPath = getFullPathAtDPath(path);
+ Alias temp = Alias.make(fullPath);
+ if (temp == null) {
+ continue;
+ }
+ aliasMap.put(temp.getOldPath(), temp.getNewPath());
+ }
+ return aliasMap;
}
/**
* @return a reverse mapping of aliases
*/
private LinkedHashMap<String, List<String>> getReverseAliases() {
- if (reverseAliases != null) return reverseAliases;
+ if (cachingIsEnabled && reverseAliasCache != null) {
+ return reverseAliasCache;
+ }
// Aliases are only ever found in root.
Map<String, String> aliases = getAliases();
Map<String, List<String>> reverse = new HashMap<String, List<String>>();
@@ -421,17 +454,33 @@
}
list.add(entry.getKey());
}
-
// Sort map.
- reverseAliases = new LinkedHashMap<String, List<String>>(new TreeMap<String, List<String>>(reverse));
- return reverseAliases;
+ LinkedHashMap<String, List<String>> reverseAliasMap = new LinkedHashMap<String, List<String>>(new TreeMap<String, List<String>>(reverse));
+ if (cachingIsEnabled) {
+ reverseAliasCache = reverseAliasMap;
+ }
+ return reverseAliasMap;
}
/**
- * Clear any internal caches.
+ * Clear "any internal caches" (or only aliasCache?) for this XMLSource.
+ *
+ * Called only by XMLSource.putValueAtPath and XMLSource.removeValueAtPath
*/
private void clearCache() {
- aliases = null;
+ aliasCache = null;
+
+ /*
+ * TODO: what about the other caches: reverseAliasCache, getFullPathAtDPathCache, getSourceLocaleIDCache?
+ * Reference: https://unicode-org.atlassian.net/browse/CLDR-12020
+ */
+ if (false) {
+ reverseAliasCache = null;
+ if (false && isResolving()) {
+ ((XMLSource.ResolvingSource) this).getFullPathAtDPathCache = null;
+ ((XMLSource.ResolvingSource) this).getSourceLocaleIDCache = null;
+ }
+ }
}
/**
@@ -697,6 +746,10 @@
}
result = getSource(fullStatus).getValueAtDPath(fullStatus.pathWhereFound);
}
+// if (result == null && xpath.contains("[@alt=")) {
+// String path2 = XPathParts.getPathWithoutAlt(xpath);
+// return getValueAtDPath(path2); // recurse
+// }
if (TRACE_VALUE) System.out.println("\t*value: " + result);
return result;
}
@@ -776,7 +829,10 @@
}
private String getFullPath(String xpath, AliasLocation fullStatus, String fullPathWhereFound) {
- String result = getFullPathAtDPathCache.get(xpath);
+ String result = null;
+ if (this.cachingIsEnabled) {
+ result = getFullPathAtDPathCache.get(xpath);
+ }
if (result == null) {
// find the differences, and add them into xpath
// we do this by walking through each element, adding the corresponding attribute values.
@@ -800,7 +856,9 @@
}
}
result = xpathParts.toString();
- getFullPathAtDPathCache.put(xpath, result);
+ if (cachingIsEnabled) {
+ getFullPathAtDPathCache.put(xpath, result);
+ }
}
return result;
}
@@ -849,7 +907,7 @@
*
* Reference: https://unicode.org/cldr/trac/ticket/11765
*/
- if (!skipInheritanceMarker) {
+ if (!skipInheritanceMarker || !cachingIsEnabled ) {
return getPathLocation(xpath, false /* skipFirst */, skipInheritanceMarker);
}
synchronized (getSourceLocaleIDCache) {
@@ -965,6 +1023,11 @@
xpath.substring(possibleSubpath.length());
}
}
+
+ // alts are special; they act like there is a root alias to the path without the alt.
+ if (aliasedPath == null && xpath.contains("[@alt=")) {
+ aliasedPath = XPathParts.getPathWithoutAlt(xpath);
+ }
// counts are special; they act like there is a root alias to 'other'
// and in the special case of currencies, other => null
@@ -1064,11 +1127,8 @@
* Takes in a list of xpaths and returns a new set of paths that alias
* directly to those existing xpaths.
*
- * @param paths
- * a sorted list of xpaths
- * @param reverseAliases
- * a map of reverse aliases sorted by key.
- * @return
+ * @param paths a sorted list of xpaths
+ * @return the new set of paths
*/
private Set<String> getDirectAliases(String[] paths) {
HashSet<String> newPaths = new HashSet<String>();
@@ -1154,6 +1214,9 @@
@Override
public void valueChanged(String xpath, XMLSource nonResolvingSource) {
+ if (!cachingIsEnabled) {
+ return;
+ }
synchronized (getSourceLocaleIDCache) {
AliasLocation location = getSourceLocaleIDCache.remove(xpath);
if (location == null) {
@@ -1387,8 +1450,18 @@
// "false");
// }
- String[] extraCodes = { "ar_001", "de_AT", "de_CH", "en_AU", "en_CA", "en_GB", "en_US", "es_419", "es_ES", "es_MX",
- "fr_CA", "fr_CH", "frc", "lou", "nds_NL", "nl_BE", "pt_BR", "pt_PT", "ro_MD", "sw_CD", "zh_Hans", "zh_Hant" };
+ String[] extraCodes = {
+ "ar_001",
+ "de_AT", "de_CH",
+ "en_AU", "en_CA", "en_GB", "en_US", "es_419", "es_ES", "es_MX",
+ "fa_AF", "fr_CA", "fr_CH", "frc",
+ "lou",
+ "nds_NL", "nl_BE",
+ "pt_BR", "pt_PT",
+ "ro_MD",
+ "sw_CD",
+ "zh_Hans", "zh_Hant"
+ };
for (String extraCode : extraCodes) {
addFallbackCode(CLDRFile.LANGUAGE_NAME, extraCode, extraCode);
}
@@ -1416,7 +1489,6 @@
addFallbackCode(CLDRFile.TERRITORY_NAME, "CI", "CI", "variant");
addFallbackCode(CLDRFile.TERRITORY_NAME, "CZ", "CZ", "variant");
addFallbackCode(CLDRFile.TERRITORY_NAME, "FK", "FK", "variant");
- addFallbackCode(CLDRFile.TERRITORY_NAME, "MK", "MK", "variant");
addFallbackCode(CLDRFile.TERRITORY_NAME, "TL", "TL", "variant");
addFallbackCode(CLDRFile.TERRITORY_NAME, "SZ", "SZ", "variant");
diff --git a/tools/java/org/unicode/cldr/util/XPathParts.java b/tools/java/org/unicode/cldr/util/XPathParts.java
index a45095c..db4a2ed 100644
--- a/tools/java/org/unicode/cldr/util/XPathParts.java
+++ b/tools/java/org/unicode/cldr/util/XPathParts.java
@@ -6,6 +6,7 @@
*/
package org.unicode.cldr.util;
+import java.io.File;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
@@ -43,16 +44,17 @@
private DtdData dtdData = null;
- private Map<String, Map<String, String>> suppressionMap;
-
private static final Map<String, XPathParts> cache = new ConcurrentHashMap<String, XPathParts>();
+ /**
+ * Construct a new empty XPathParts object.
+ *
+ * Note: for faster performance, call getFrozenInstance or getInstance instead of this constructor.
+ * This constructor remains public for special cases in which individual elements are added with
+ * addElement rather than using a complete path string.
+ */
public XPathParts() {
- this.suppressionMap = null;
- }
- public XPathParts(Map<String, Map<String, String>> suppressionMap) {
- this.suppressionMap = suppressionMap;
}
/**
@@ -82,20 +84,36 @@
* Write out the difference from this xpath and the last, putting the value in the right place. Closes up the
* elements that were not closed, and opens up the new.
*
- * @param pw
- * @param filteredXPath
- * @param lastFullXPath
- * @param v
- * @param xpath_comments
+ * @param pw the PrintWriter to receive output
+ * @param filteredXPath used for calling filteredXPath.writeComment; may or may not be same as "this";
+ * "filtered" is from xpath, while "this" may be from getFullXPath(xpath)
+ * @param lastFullXPath the last XPathParts (not filtered), or null (to be treated same as empty)
+ * @param v getStringValue(xpath); or empty string
+ * @param xpath_comments the Comments object; or null
* @return this XPathParts
+ *
+ * Note: this method gets THREE XPathParts objects: this, filteredXPath, and lastFullXPath.
+ *
+ * TODO: create a unit test that calls this function directly.
+ *
+ * Called only by XMLModify.main and CLDRFile.write, as follows:
+ *
+ * CLDRFile.write:
+ * current.writeDifference(pw, current, last, "", tempComments);
+ * current.writeDifference(pw, currentFiltered, last, v, tempComments);
+ *
+ * XMLModify.main:
+ * parts.writeDifference(out, parts, lastParts, value, null);
*/
public XPathParts writeDifference(PrintWriter pw, XPathParts filteredXPath, XPathParts lastFullXPath,
- String v, Comments xpath_comments) {
- int limit = findFirstDifference(lastFullXPath);
- // write the end of the last one
- for (int i = lastFullXPath.size() - 2; i >= limit; --i) {
- pw.print(Utility.repeat("\t", i));
- pw.println(lastFullXPath.elements.get(i).toString(XML_CLOSE));
+ String v, Comments xpath_comments) {
+ int limit = (lastFullXPath == null) ? 0 : findFirstDifference(lastFullXPath);
+ if (lastFullXPath != null) {
+ // write the end of the last one
+ for (int i = lastFullXPath.size() - 2; i >= limit; --i) {
+ pw.print(Utility.repeat("\t", i));
+ pw.println(lastFullXPath.elements.get(i).toString(XML_CLOSE));
+ }
}
if (v == null) {
return this; // end
@@ -134,6 +152,20 @@
return this;
}
+ /**
+ * Write the last xpath.
+ *
+ * last.writeLast(pw) is equivalent to current.clear().writeDifference(pw, null, last, null, tempComments).
+ *
+ * @param pw the PrintWriter to receive output
+ */
+ public void writeLast(PrintWriter pw) {
+ for (int i = this.size() - 2; i >= 0; --i) {
+ pw.print(Utility.repeat("\t", i));
+ pw.println(elements.get(i).toString(XML_CLOSE));
+ }
+ }
+
private String untrim(String eValue, int count) {
String result = TransliteratorUtilities.toHTML.transliterate(eValue);
if (!result.contains("\n")) {
@@ -448,7 +480,8 @@
* The first element should match one of the DtdType enum values.
* Use it to set dtdData.
*/
- dtdData = DtdData.getInstance(DtdType.valueOf(element));
+ File dir = CLDRConfig.getInstance().getCldrBaseDirectory();
+ dtdData = DtdData.getInstance(DtdType.valueOf(element), dir);
} catch (Exception e) {
dtdData = null;
}
@@ -498,25 +531,6 @@
}
/**
- * Parse out an xpath, and pull in the elements and attributes.
- *
- * @param xPath
- * @return this XPathParts
- *
- * This is only for use by CLDRFile.write(), which is for generating vxml, etc., using defaultSuppressionMap.
- *
- * All other functions that would have called XPathParts.set() in the past should now use getInstance or getFrozenInstance
- * instead, to take advantage of caching.
- * Reference: https://unicode-org.atlassian.net/browse/CLDR-12007
- */
- public XPathParts setForWritingWithSuppressionMap(String xPath) {
- if (frozen) {
- throw new UnsupportedOperationException("Can't modify frozen Element");
- }
- return addInternal(xPath, true);
- }
-
- /**
* Add the given path to this XPathParts.
*
* @param xPath the path string
@@ -817,21 +831,25 @@
if (getAttributeCount() == 0) {
return this;
}
+ Map<String, Map<String, String>> suppressionMap = null;
+ if (removeLDMLExtras) {
+ suppressionMap = CLDRFile.getDefaultSuppressionMap();
+ }
for (Entry<String, String> attributesAndValues : attributes.entrySet()) {
String attribute = attributesAndValues.getKey();
String value = attributesAndValues.getValue();
if (removeLDMLExtras && suppressionMap != null) {
- if (skipAttribute(element, attribute, value)) {
+ if (skipAttribute(element, attribute, value, suppressionMap)) {
continue;
}
- if (skipAttribute("*", attribute, value)) {
+ if (skipAttribute("*", attribute, value, suppressionMap)) {
continue;
}
}
try {
result.append(prefix).append(attribute).append("=\"")
- .append(removeLDMLExtras ? TransliteratorUtilities.toHTML.transliterate(value) : value)
- .append(postfix);
+ .append(removeLDMLExtras ? TransliteratorUtilities.toHTML.transliterate(value) : value)
+ .append(postfix);
} catch (RuntimeException e) {
throw e; // for debugging
}
@@ -851,7 +869,8 @@
*
* Assume suppressionMap isn't null.
*/
- private boolean skipAttribute(String element, String attribute, String value) {
+ private boolean skipAttribute(String element, String attribute, String value,
+ Map<String, Map<String, String>> suppressionMap) {
Map<String, String> attribute_value = suppressionMap.get(element);
boolean skip = false;
if (attribute_value != null) {
@@ -877,8 +896,8 @@
// == check is ok since we intern elements
return element == that.element
&& (attributes == null ? that.attributes == null
- : that.attributes == null ? attributes == null
- : attributes.equals(that.attributes));
+ : that.attributes == null ? attributes == null
+ : attributes.equals(that.attributes));
} catch (ClassCastException e) {
return false;
}
@@ -1224,7 +1243,6 @@
* Reference: https://unicode.org/cldr/trac/ticket/12007
*/
xppClone.dtdData = this.dtdData;
- xppClone.suppressionMap = this.suppressionMap;
for (Element e : this.elements) {
xppClone.elements.add(e.cloneAsThawed());
}
@@ -1276,4 +1294,17 @@
}
return ueMap;
}
+
+ public static String getPathWithoutAlt(String xpath) {
+ XPathParts xpp = getInstance(xpath);
+ xpp.removeAttribute("alt");
+ return xpp.toString();
+ }
+
+ private XPathParts removeAttribute(String attribute) {
+ for (int i = 0; i < elements.size(); ++i) {
+ elements.get(i).putAttribute(attribute, null);
+ }
+ return this;
+ }
}
diff --git a/tools/java/org/unicode/cldr/util/data/Locales.txt b/tools/java/org/unicode/cldr/util/data/Locales.txt
index 2cc280d..4f82d3a 100644
--- a/tools/java/org/unicode/cldr/util/data/Locales.txt
+++ b/tools/java/org/unicode/cldr/util/data/Locales.txt
@@ -301,6 +301,14 @@
Google ; ceb ; moderate ; Cebuano
Google ; chr ; basic ; Cherokee
+Google ; mni ; basic ; Manipuri (Bengali script)
+Google ; sat ; basic ; Santali (Olck script)
+Google ; kok ; basic ; Konkani
+Google ; su ; basic ; Sundanese (script TBD)
+Google ; gn ; basic ; Guarani (Bengali script)
+Google ; sd_Deva ; basic ; Sindhi (Devanagari script)
+Google ; mai ; basic ; Maithili (Devanagari script)
+
#Google Tier TR
Google ; es_US ; modern ; TR Spanish (United States)
Google ; es_MX ; modern ; TR Spanish (Mexico)
@@ -623,6 +631,17 @@
Cldr ; yo ; moderate ; Yoruba
Cldr ; ceb ; moderate ; Cebuano
+Cldr ; mai ; basic ; Maithili (Devanagari script)
+Cldr ; mni ; basic ; Manipuri (Bengali script)
+Cldr ; sat ; basic ; Santali (Olck script)
+Cldr ; kok ; basic ; Konkani
+Cldr ; su ; basic ; Sundanese (script TBD)
+Cldr ; gn ; basic ; Guarani (Bengali script)
+Cldr ; sd_Deva ; basic ; Sindhi (Devanagari script)
+Cldr ; cad ; basic ; Caddo
+Cldr ; pcm ; basic ; Nigerian Pidgin
+
+
Bangor_Univ ; cy ; modern ; Welsh
Bangor_Univ ; * ; moderate ; All others
@@ -673,6 +692,9 @@
OpenInstitute ; km ; modern ; Khmer
OpenInstitute ; * ; moderate ; All others
+kunsill_malti ; mt ; modern ; Malta
+kunsill_malti ; * ; moderate ; All others
+
Microsoft ; am ; modern
Microsoft ; af ; modern
Microsoft ; ar ; modern
diff --git a/tools/java/org/unicode/cldr/util/data/PathDescription.txt b/tools/java/org/unicode/cldr/util/data/PathDescription.txt
index 0f21869..0e4df8f 100644
--- a/tools/java/org/unicode/cldr/util/data/PathDescription.txt
+++ b/tools/java/org/unicode/cldr/util/data/PathDescription.txt
@@ -3,107 +3,111 @@
# ROOT descriptions (using special placeholders). Must occur first.
-^//ldml/localeDisplayNames/territories/territory\[@type="(CD|DG|CG|003|021|ZA|018|FK|MK|MM|TW|HK|MO)"] ; ROOT territory; Warning - the region {0} requires special attention! Note: before translating, be sure to read http://cldr.org/translation/country-names.
-^//ldml/localeDisplayNames/scripts/script\[@type="(Z[^"]*)"] ; ROOT script; The name of the script (writing system) with Unicode script code = {0}. Note: before translating, be sure to read http://cldr.org/translation/script-names.
+^//ldml/localeDisplayNames/territories/territory\[@type="(CD|DG|CG|003|021|ZA|018|FK|MK|MM|TW|HK|MO)"] ; ROOT territory; Warning - the region {0} requires special attention! Note: before translating, be sure to read http://cldr.org/translation/displaynames/country-names.
+^//ldml/localeDisplayNames/scripts/script\[@type="(Z[^"]*)"] ; ROOT script; The name of the script (writing system) with Unicode script code = {0}. Note: before translating, be sure to read http://cldr.org/translation/displaynames/script-names.
-^//ldml/dates/timeZoneNames/zone\[@type="([^"]*)"]/exemplarCity ; ROOT timezone ; The name of {0}. For more information, see http://cldr.org/translation/cities.
+^//ldml/dates/timeZoneNames/zone\[@type="([^"]*)"]/exemplarCity ; ROOT timezone ; The name of {0}. For more information, see http://cldr.org/translation/timezones#TOC-City-Names.
-^//ldml/localeDisplayNames/languages/language\[@type="([^"]*)"] ; ROOT language; The name of the language with Unicode language code = {0}. For more information, see http://cldr.org/translation/language-names.
-^//ldml/localeDisplayNames/scripts/script\[@type="([^"]*)"] ; ROOT script; The name of the script (writing system) with Unicode script code = {0}. For more information, see http://cldr.org/translation/script-names.
-^//ldml/localeDisplayNames/territories/territory\[@type="([^"]*)"] ; ROOT territory; The name of the country or region with Unicode region code = {0}. For more information, see http://cldr.org/translation/country-names.
-^//ldml/localeDisplayNames/subdivisions/subdivision\[@type="([^"]*)"] ; ROOT territory; The name of the country subdivision with Unicode subdivision code = {0}. For more information, see http://cldr.org/translation/country-names.
-^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol$ ; ROOT currency; The symbol for the currency with the ISO currency code = {0}. For more information, see http://cldr.org/translation/currency-names.
-^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol\[@alt="narrow"] ; ROOT currency; The NARROW form of the symbol used for the currency with the ISO currency code = {0}, when the known context is already enough to distinguish the symbol from other currencies that may use the same symbol. Normally, this does not need to be changed from the inherited value. For more information, see http://cldr.org/translation/currency-names.
-^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol\[@alt="([^"]++)"] ; ROOT currency; An alternative form of the symbol used for the currency with the ISO currency code = {0}. Usually occurs shortly after a new currency symbol is introduced. For more information, see http://cldr.org/translation/currency-names.
-^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/displayName ; ROOT currency; The name of the currency with the ISO currency code = {0}. For more information, see http://cldr.org/translation/currency-names.
+^//ldml/localeDisplayNames/languages/language\[@type="([^"]*)"] ; ROOT language; The name of the language with Unicode language code = {0}. For more information, see http://cldr.org/translation/displaynames/language-names.
+^//ldml/localeDisplayNames/scripts/script\[@type="([^"]*)"] ; ROOT script; The name of the script (writing system) with Unicode script code = {0}. For more information, see http://cldr.org/translation/displaynames/script-names.
+^//ldml/localeDisplayNames/territories/territory\[@type="([^"]*)"] ; ROOT territory; The name of the country or region with Unicode region code = {0}. For more information, see http://cldr.org/translation/displaynames/country-names.
+^//ldml/localeDisplayNames/subdivisions/subdivision\[@type="([^"]*)"] ; ROOT territory; The name of the country subdivision with Unicode subdivision code = {0}. For more information, see http://cldr.org/translation/displaynames/country-names.
+^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol$ ; ROOT currency; The symbol for the currency with the ISO currency code = {0}. For more information, see http://cldr.org/translation/numbers-currency/currency-names.
+^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol\[@alt="narrow"] ; ROOT currency; The NARROW form of the symbol used for the currency with the ISO currency code = {0}, when the known context is already enough to distinguish the symbol from other currencies that may use the same symbol. Normally, this does not need to be changed from the inherited value. For more information, see http://cldr.org/translation/numbers-currency/currency-names.
+^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/symbol\[@alt="([^"]++)"] ; ROOT currency; An alternative form of the symbol used for the currency with the ISO currency code = {0}. Usually occurs shortly after a new currency symbol is introduced. For more information, see http://cldr.org/translation/numbers-currency/currency-names.
+^//ldml/numbers/currencies/currency\[@type="([^"]*)"]/displayName ; ROOT currency; The name of the currency with the ISO currency code = {0}. For more information, see http://cldr.org/translation/numbers-currency/currency-names.
^//ldml/dates/timeZoneNames/metazone\[@type="([^"]*)"](.*)/(.*) ; ROOT metazone; The name of the timezone for “{0}”. Note: before translating, be sure to read http://cldr.org/translation/timezones.
# Note: we change the metazones dynamically in code
# OTHER Descriptions
-^//ldml/localeDisplayNames/types/type\[@key="collation"]\[@type="([^"]*)"] ; The name of “{1} collation” (sorting order). For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/types/type\[@key="numbers"]\[@type="([^"]*)"] ; The name of “{1} number system”. For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="roc"] ; The name of “roc calendar” (common names include “Minguo Calendar”, “Republic of China Calendar”, and “Republican Calendar”). For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="([^"]*)"] ; The name of “{1} calendar”. For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/types/type\[@key="lb"]\[@type="([^"]*)"] ; The name of “{1} line break style”. For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/types/type\[@key="([^"]*)"]\[@type="([^"]*)"] ; The name of the “{2} {1}”. For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/keys/key\[@type="([^"]*)"] ; The name of the system for “{1}”. For more information, please see http://cldr.org/translation/key-names.
-^//ldml/localeDisplayNames/variants/variant[@type="([^"]*)"] ; The name of the language variant with code {1}”. For more information, please see http://cldr.org/translation/language-names.
+^//ldml/localeDisplayNames/types/type\[@key="collation"]\[@type="([^"]*)"] ; The name of “{1} collation” (sorting order). For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/types/type\[@key="numbers"]\[@type="([^"]*)"] ; The name of “{1} number system”. For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="roc"] ; The name of “roc calendar” (common names include “Minguo Calendar”, “Republic of China Calendar”, and “Republican Calendar”). For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/types/type\[@key="calendar"]\[@type="([^"]*)"] ; The name of “{1} calendar”. For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/types/type\[@key="lb"]\[@type="([^"]*)"] ; The name of “{1} line break style”. For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/types/type\[@key="([^"]*)"]\[@type="([^"]*)"] ; The name of the “{2} {1}”. For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/keys/key\[@type="([^"]*)"] ; The name of the system for “{1}”. For more information, please see http://cldr.org/translation/displaynames/key-names.
+^//ldml/localeDisplayNames/variants/variant[@type="([^"]*)"] ; The name of the language variant with code {1}”. For more information, please see http://cldr.org/translation/displaynames/language-names.
-^//ldml/characters/exemplarCharacters$ ; Defines the set of characters used in your language. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/characters#TOC-Exemplar-Characters.
-^//ldml/characters/exemplarCharacters\[@type="([^"]*)"] ; Defines the set of characters used in your language for the “{1}” category. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/characters#TOC-Exemplar-Characters.
+^//ldml/characters/exemplarCharacters$ ; Defines the set of characters used in your language. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/-core-data/exemplars.
+^//ldml/characters/exemplarCharacters\[@type="([^"]*)"] ; Defines the set of characters used in your language for the “{1}” category. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/-core-data/exemplars.
-^//ldml/characters/parseLenients ; Defines sets of characters that are treated as equivalent in parsing. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/characters#TOC-Lenient-Parsing.
+^//ldml/characters/parseLenients ; Defines sets of characters that are treated as equivalent in parsing. You may not edit or vote on this item at this time. Before filing any tickets to request changes, be sure to read http://cldr.org/translation/-core-data/characters#TOC-Parse-Parse-Lenient-.
-^//ldml/characters/ellipsis\[@type="([^"]*)"] ; Supply the ellipsis pattern for when the {1} part of a string is omitted. Note: before translating, be sure to read http://cldr.org/translation/characters.
-^//ldml/characters/moreInformation ; The character or short string used to indicate that more information is available. Note: before translating, be sure to read http://cldr.org/translation/characters.
+^//ldml/characters/ellipsis\[@type="([^"]*)"] ; Supply the ellipsis pattern for when the {1} part of a string is omitted. Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
+^//ldml/characters/moreInformation ; The character or short string used to indicate that more information is available. Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
-^//ldml/delimiters/alternateQuotationEnd ; Supply the (alternate) ending quotation mark (the right mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/characters.
-^//ldml/delimiters/alternateQuotationStart ; Supply the (alternate) starting quotation mark (the left mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/characters.
-^//ldml/delimiters/quotationEnd ; Supply the ending quotation mark (the right mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/characters.
-^//ldml/delimiters/quotationStart ; Supply the starting quotation mark (the left mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/characters.
+^//ldml/delimiters/alternateQuotationEnd ; Supply the (alternate) ending quotation mark (the right mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
+^//ldml/delimiters/alternateQuotationStart ; Supply the (alternate) starting quotation mark (the left mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
+^//ldml/delimiters/quotationEnd ; Supply the ending quotation mark (the right mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
+^//ldml/delimiters/quotationStart ; Supply the starting quotation mark (the left mark except in BIDI languages). Note: before translating, be sure to read http://cldr.org/translation/-core-data/characters.
-^//ldml/localeDisplayNames/localeDisplayPattern/localePattern ; The pattern used to compose locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/localepattern.
-^//ldml/localeDisplayNames/localeDisplayPattern/localeSeparator ; The separator used to compose modifiers in locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/localepattern.
-^//ldml/localeDisplayNames/localeDisplayPattern/localeKeyTypePattern ; The pattern used to compose key-type values in locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/localepattern.
+^//ldml/localeDisplayNames/localeDisplayPattern/localePattern ; The pattern used to compose locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/displaynames/localepattern.
+^//ldml/localeDisplayNames/localeDisplayPattern/localeSeparator ; The separator used to compose modifiers in locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/displaynames/localepattern.
+^//ldml/localeDisplayNames/localeDisplayPattern/localeKeyTypePattern ; The pattern used to compose key-type values in locale (language) names. Note: before translating, be sure to read http://cldr.org/translation/displaynames/localepattern.
-^//ldml/layout/orientation/characterOrder ; Specifies the horizontal direction of text in the language. Valid values are "left-to-right" or "right-to-left". For more information, see http://cldr.org/translation/misc.
-^//ldml/layout/orientation/lineOrder ; Specifies the vertical direction of text in the language. Valid values are "top-to-bottom" or "bottom-to-top". For more information, see http://cldr.org/translation/misc.
+^//ldml/layout/orientation/characterOrder ; Specifies the horizontal direction of text in the language. Valid values are "left-to-right" or "right-to-left". For more information, see http://cldr.org/translation/units-1/misc.
+^//ldml/layout/orientation/lineOrder ; Specifies the vertical direction of text in the language. Valid values are "top-to-bottom" or "bottom-to-top". For more information, see http://cldr.org/translation/units-1/misc.
-^//ldml/numbers/symbols/(\w++) ; The {1} symbol used in the localized form of numbers. Note: before translating, be sure to read http://cldr.org/translation/number-symbols.
-^//ldml/numbers/symbols\[@numberSystem="([a-z]*)"]/(\w++) ; The {2} symbol used in the {1} numbering system. NOTE: especially for the decimal and grouping symbol, before translating, be sure to read http://cldr.org/translation/number-symbols.
-^//ldml/numbers/defaultNumberingSystem ; The default numbering system used in this locale. For more information, please see http://cldr.org/translation/numbering-systems.
-^//ldml/numbers/minimumGroupingDigits ; The default minimum number of digits before a grouping separator used in this locale. For more information, please see http://cldr.org/translation/numbering-systems.
-^//ldml/numbers/otherNumberingSystems/(\w++) ; The {1} numbering system used in this locale. For more information, please see http://cldr.org/translation/numbering-systems.
+^//ldml/numbers/symbols/(\w++) ; The {1} symbol used in the localized form of numbers. Note: before translating, be sure to read http://cldr.org/translation/numbers-currency/number-symbols.
+^//ldml/numbers/symbols\[@numberSystem="([a-z]*)"]/(\w++) ; The {2} symbol used in the {1} numbering system. NOTE: especially for the decimal and grouping symbol, before translating, be sure to read http://cldr.org/translation/numbers-currency/number-symbols.
+^//ldml/numbers/defaultNumberingSystem ; The default numbering system used in this locale. For more information, please see http://cldr.org/translation/-core-data/numbering-systems.
+^//ldml/numbers/minimumGroupingDigits ; The default minimum number of digits before a grouping separator used in this locale. For more information, please see http://cldr.org/translation/-core-data/numbering-systems.
+^//ldml/numbers/otherNumberingSystems/(\w++) ; The {1} numbering system used in this locale. For more information, please see http://cldr.org/translation/-core-data/numbering-systems.
^//ldml/dates/timeZoneNames/regionFormat\[@type="standard"] ; The pattern used to compose standard (winter) fallback time zone names, such as 'Germany Winter Time'. Note: before translating, be sure to read http://cldr.org/translation/timezones.
^//ldml/dates/timeZoneNames/regionFormat\[@type="daylight"] ; The pattern used to compose daylight (summer) fallback time zone names, such as 'Germany Summer Time'. Note: before translating, be sure to read http://cldr.org/translation/timezones.
^//ldml/dates/timeZoneNames/regionFormat ; The pattern used to compose generic fallback time zone names, such as 'Germany Time'. Note: before translating, be sure to read http://cldr.org/translation/timezones.
^//ldml/dates/timeZoneNames/(fallback|fallbackRegion|gmtZero|gmt|hour|region)Format ; The {1} pattern used to compose time zone names. Note: before translating, be sure to read http://cldr.org/translation/timezones.
-^//ldml/units/unitLength\[@type="([^"]*)"]/compoundUnit\[@type="([^"]*)"]/compoundUnitPattern ; Special pattern used to compose forms of two units, such as meters per second. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/coordinateUnit/displayName ; Display name ({1} form) for the type of direction used in latitude and longitude, such as north or east. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/coordinateUnit/coordinateUnitPattern\[@type="([^"]*)"] ; Special pattern used in latitude and longitude, such as 12°N. Note: before translating, be sure to read http://cldr.org/translation/units.
+# Warning: the longer match must come first
+^//ldml/units/unitLength\[@type="([^"]*)"]/compoundUnit\[@type="([^"]*)"]/compoundUnitPattern1 ; Special pattern used to compose powers of a unit, such as meters squared. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/compoundUnit\[@type="([^"]*)"]/compoundUnitPattern ; Special pattern used to compose forms of two units, such as meters per second. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/compoundUnit\[@type="([^"]*)"]/unitPrefixPattern ; Special pattern used to compose a metric prefix with a unit, such as kilo{0} with meters to produce kilometers. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="area-acre"]/displayName ; Display name ({1} form) for “area-acre”, referring specifically to an English acre. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="duration-day"]/displayName ; Display name ({1} form) for “duration-day”, meaning a time duration of 24 hours (not a calendar day). Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-calorie"]/displayName ; Display name ({1} form) for “energy-calorie”, calories as used in chemistry, not the same as food calorie. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-foodcalorie"]/displayName ; Display name ({1} form) for “energy-foodcalorie”, kilocalories for food energy; may have same translation as energy-kilocalorie. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-kilocalorie"]/displayName ; Display name ({1} form) for “energy-kilocalorie”, kilocalories for uses not specific to food energy, such as chemistry. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-em"]/displayName ; Display name ({1} form) for “graphics-em”, referring to typographic length equal to a font’s point size. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel"]/displayName ; Display name ({1} form) for “graphics-pixel”, used for counting the individual elements in bitmap image. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-megapixel"]/displayName ; Display name ({1} form) for “graphics-megapixel”, used for counting the individual elements in bitmap image. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel-per-centimeter"]/displayName ; Display name ({1} form) for “graphics-pixel-per-centimeter”, typically used for display resolution. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel-per-inch"]/displayName ; Display name ({1} form) for “graphics-pixel-per-inch”, typically used for display resolution. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-dot-per-centimeter"]/displayName ; Display name ({1} form) for “graphics-dot-per-centimeter”, typically used for printer resolution. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-dot-per-inch"]/displayName ; Display name ({1} form) for “graphics-dot-per-inch”, typically used for printer resolution. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="length-point"]/displayName ; Display name ({1} form) for “length-point”, referring to a typographic point, 1/72 inch. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="mass-stone"]/displayName ; Display name ({1} form) for “mass-stone”, used in UK/Ireland for body weight, equal to 14 pounds. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="mass-ton"]/displayName ; Display name ({1} form) for “mass-ton”, meaning U.S. short ton, not U.K. long ton or metric ton. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/displayName ; Display name ({1} form) for “{2}”. Note: before translating, be sure to read http://cldr.org/translation/units.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/unitPattern ; [ICU Syntax] Special pattern used to compose plural for {1} forms of “{2}”. Note: before translating, be sure to read http://cldr.org/translation/plurals.
-^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/perUnitPattern ; Special pattern ({1} form) used to compose values per unit, such as “meters per {2}”. Note: before translating, be sure to read http://cldr.org/translation/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/coordinateUnit/displayName ; Display name ({1} form) for the type of direction used in latitude and longitude, such as north or east. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/coordinateUnit/coordinateUnitPattern\[@type="([^"]*)"] ; Special pattern used in latitude and longitude, such as 12°N. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
-^//ldml/units/durationUnit\[@type="(hms|hm|ms)"] ; [ICU Syntax] Special pattern used to compose duration units. Note: before translating, be sure to read http://cldr.org/translation/plurals.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="area-acre"]/displayName ; Display name ({1} form) for “area-acre”, referring specifically to an English acre. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="duration-day"]/displayName ; Display name ({1} form) for “duration-day”, meaning a time duration of 24 hours (not a calendar day). Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-calorie"]/displayName ; Display name ({1} form) for “energy-calorie”, calories as used in chemistry, not the same as food calorie. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-foodcalorie"]/displayName ; Display name ({1} form) for “energy-foodcalorie”, kilocalories for food energy; may have same translation as energy-kilocalorie. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="energy-kilocalorie"]/displayName ; Display name ({1} form) for “energy-kilocalorie”, kilocalories for uses not specific to food energy, such as chemistry. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-em"]/displayName ; Display name ({1} form) for “graphics-em”, referring to typographic length equal to a font’s point size. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel"]/displayName ; Display name ({1} form) for “graphics-pixel”, used for counting the individual elements in bitmap image. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-megapixel"]/displayName ; Display name ({1} form) for “graphics-megapixel”, used for counting the individual elements in bitmap image. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel-per-centimeter"]/displayName ; Display name ({1} form) for “graphics-pixel-per-centimeter”, typically used for display resolution. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-pixel-per-inch"]/displayName ; Display name ({1} form) for “graphics-pixel-per-inch”, typically used for display resolution. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-dot-per-centimeter"]/displayName ; Display name ({1} form) for “graphics-dot-per-centimeter”, typically used for printer resolution. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="graphics-dot-per-inch"]/displayName ; Display name ({1} form) for “graphics-dot-per-inch”, typically used for printer resolution. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="length-point"]/displayName ; Display name ({1} form) for “length-point”, referring to a typographic point, 1/72 inch. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="mass-stone"]/displayName ; Display name ({1} form) for “mass-stone”, used in UK/Ireland for body weight, equal to 14 pounds. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="mass-ton"]/displayName ; Display name ({1} form) for “mass-ton”, meaning U.S. short ton, not U.K. long ton or metric ton. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/displayName ; Display name ({1} form) for “{2}”. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/unitPattern ; [ICU Syntax] Special pattern used to compose plural for {1} forms of “{2}”. Note: before translating, be sure to read http://cldr.org/translation/getting-started/plurals.
+^//ldml/units/unitLength\[@type="([^"]*)"]/unit\[@type="([^"]*)"]/perUnitPattern ; Special pattern ({1} form) used to compose values per unit, such as “meters per {2}”. Note: before translating, be sure to read http://cldr.org/translation/units-1/units.
-^//ldml/numbers/decimalFormats/decimalFormatLength\[@type="([^"]*)"]/decimalFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Special pattern used for a short version of numbers with the same number of digits as {3}. Note: before translating, be sure to read http://cldr.org/translation/number-patterns#TOC-Short-Numbers.
-^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/currencyFormatLength\[@type="short"]/currencyFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special currency pattern used to obtain the abbreviated plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/number-patterns#TOC-Short-Numbers for details.
-^//ldml/numbers/decimalFormats\[@numberSystem="([^"]*)"]/decimalFormatLength\[@type="short"]/decimalFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special decimal pattern used to obtain the abbreviated plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/number-patterns#TOC-Short-Numbers for details.
-^//ldml/numbers/decimalFormats\[@numberSystem="([^"]*)"]/decimalFormatLength\[@type="long"]/decimalFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special decimal pattern used to obtain the long plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/number-patterns#TOC-Plural-Forms-of-Numbers for details.
-^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/unitPattern\[@count="(\w++)"] ; Currency format used for numbers of type {2}. For more information, please see http://cldr.org/translation/number-patterns.
+^//ldml/units/durationUnit\[@type="(hms|hm|ms)"] ; [ICU Syntax] Special pattern used to compose duration units. Note: before translating, be sure to read http://cldr.org/translation/getting-started/plurals.
-^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="range"] ; Format used to indicate a range of numbers. The '{'0'}' and '{'1'}' in the pattern represent the lowest and highest numbers in the range, respectively. For more information, please see http://cldr.org/translation/misc.
-^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="atLeast"] ; Format used to indicate a number is at least a certain value, often combined with other patterns to produce examples such as “≥12kg”. For more information, please see http://cldr.org/translation/misc.
-^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="atMost"] ; Format used to indicate a number is at most a certain value, often combined with other patterns to produce examples such as “≤12kg”. For more information, please see http://cldr.org/translation/misc.
-^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="approximately"] ; Format used to indicate a number is approximately a given value, often combined with other patterns to produce examples such as “~12kg”. For more information, please see http://cldr.org/translation/misc.
+^//ldml/numbers/decimalFormats/decimalFormatLength\[@type="([^"]*)"]/decimalFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Special pattern used for a short version of numbers with the same number of digits as {3}. Note: before translating, be sure to read http://cldr.org/translation/numbers-currency/number-patterns#TOC-Short-Numbers.
+^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/currencyFormatLength\[@type="short"]/currencyFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special currency pattern used to obtain the abbreviated plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/numbers-currency/number-patterns#TOC-Short-Numbers for details.
+^//ldml/numbers/decimalFormats\[@numberSystem="([^"]*)"]/decimalFormatLength\[@type="short"]/decimalFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special decimal pattern used to obtain the abbreviated plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/numbers-currency/number-patterns#TOC-Short-Numbers for details.
+^//ldml/numbers/decimalFormats\[@numberSystem="([^"]*)"]/decimalFormatLength\[@type="long"]/decimalFormat\[@type="standard"]/pattern\[@type="(\d+)"]\[@count="([^"]+)"] ; Special decimal pattern used to obtain the long plural forms of numbers with the same number of digits as {2}. See http://cldr.org/translation/numbers-currency/number-patterns#TOC-Plural-Forms-of-Numbers for details.
+^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/unitPattern\[@count="(\w++)"] ; Currency format used for numbers of type {2}. For more information, please see http://cldr.org/translation/numbers-currency/number-patterns.
-^//ldml/numbers/minimalPairs/ordinalMinimalPairs\[@ordinal="([^"]*)"] ; Minimal pairs for ordinals. For more information, please see http://cldr.org/translation/plurals#TOC-Minimal-Pairs.
-^//ldml/numbers/minimalPairs/pluralMinimalPairs\[@count="([^"]*)"] ; Minimal pairs for plurals (cardinals). For more information, please see http://cldr.org/translation/plurals#TOC-Minimal-Pairs.
+^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="range"] ; Format used to indicate a range of numbers. The '{'0'}' and '{'1'}' in the pattern represent the lowest and highest numbers in the range, respectively. For more information, please see http://cldr.org/translation/units-1/misc.
+^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="atLeast"] ; Format used to indicate a number is at least a certain value, often combined with other patterns to produce examples such as “≥12kg”. For more information, please see http://cldr.org/translation/units-1/misc.
+^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="atMost"] ; Format used to indicate a number is at most a certain value, often combined with other patterns to produce examples such as “≤12kg”. For more information, please see http://cldr.org/translation/units-1/misc.
+^//ldml/numbers/miscPatterns\[@numberSystem="([^"]*)"]/pattern\[@type="approximately"] ; Format used to indicate a number is approximately a given value, often combined with other patterns to produce examples such as “~12kg”. For more information, please see http://cldr.org/translation/units-1/misc.
-^//ldml/numbers/([a-z]*)Formats(\[@numberSystem="([^"]*)"])?/\1FormatLength/\1Format\[@type="standard"]/pattern\[@type="standard"]$ ; Special pattern used to compose {1} numbers. Note: before translating, be sure to read http://cldr.org/translation/number-patterns.
-^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/currencyFormatLength/currencyFormat\[@type="accounting"]/pattern ; Special pattern used to compose currency values for accounting purposes. Note: before translating, be sure to read http://cldr.org/translation/number-patterns.
+^//ldml/numbers/minimalPairs/ordinalMinimalPairs\[@ordinal="([^"]*)"] ; Minimal pairs for ordinals. For more information, please see http://cldr.org/translation/getting-started/plurals#TOC-Minimal-Pairs.
+^//ldml/numbers/minimalPairs/pluralMinimalPairs\[@count="([^"]*)"] ; Minimal pairs for plurals (cardinals). For more information, please see http://cldr.org/translation/getting-started/plurals#TOC-Minimal-Pairs.
-^//ldml/numbers/currencyFormats/currencySpacing/([a-zA-Z]*)/([a-zA-Z]*) ; Special pattern used to compose currency signs ($1/$2) with numbers. Note: before translating, be sure to read http://cldr.org/translation/number-patterns.
+^//ldml/numbers/([a-z]*)Formats(\[@numberSystem="([^"]*)"])?/\1FormatLength/\1Format\[@type="standard"]/pattern\[@type="standard"]$ ; Special pattern used to compose {1} numbers. Note: before translating, be sure to read http://cldr.org/translation/numbers-currency/number-patterns.
+^//ldml/numbers/currencyFormats\[@numberSystem="([^"]*)"]/currencyFormatLength/currencyFormat\[@type="accounting"]/pattern ; Special pattern used to compose currency values for accounting purposes. Note: before translating, be sure to read http://cldr.org/translation/numbers-currency/number-patterns.
+
+^//ldml/numbers/currencyFormats/currencySpacing/([a-zA-Z]*)/([a-zA-Z]*) ; Special pattern used to compose currency signs ($1/$2) with numbers. Note: before translating, be sure to read http://cldr.org/translation/numbers-currency/number-patterns.
^//ldml/listPatterns/listPattern/listPatternPart\[@type="2"] ; Special pattern used to make an “and” list out of two standard elements. Note: before translating, be sure to read http://cldr.org/translation/lists.
^//ldml/listPatterns/listPattern/listPatternPart\[@type="([^"]*)"] ; Special pattern used to make a “and” list out of more than two standard elements. This is used for the {1} portion of the list. Note: before translating, be sure to read http://cldr.org/translation/lists.
@@ -132,61 +136,61 @@
^//ldml/listPatterns/listPattern\[@type="unit-narrow"]/listPatternPart\[@type="2"] ; Special pattern used to make a list out of two narrow unit elements. Note: before translating, be sure to read http://cldr.org/translation/lists.
^//ldml/listPatterns/listPattern\[@type="unit-narrow"]/listPatternPart\[@type="([^"]*)"] ; Special pattern used to make a list out of more than two narrow unit elements. This is used for the {1} portion of the list. Note: before translating, be sure to read http://cldr.org/translation/lists.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dayPeriods/dayPeriodContext\[@type="(format)"]/dayPeriodWidth\[@type="([^"]*)"]/dayPeriod\[@type="([^"]*)"] ; Provide the {3}, {2} version of the name for the day period code “{4}”. This version must have the right inflection/prepositions/etc. for adding after a number, such as “in the morning” for use in “10:00 in the morning”. To see the time spans for these codes, please see http://cldr.org/translation/date-time-names#TOC-Day-Periods-AM-and-PM-.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dayPeriods/dayPeriodContext\[@type="([^"]*)"]/dayPeriodWidth\[@type="([^"]*)"]/dayPeriod\[@type="([^"]*)"] ; Provide the {3}, {2} version of the name for the day period code “{4}”. To see the time spans for these codes, please see http://cldr.org/translation/date-time-names#TOC-Day-Periods-AM-and-PM-.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/days/dayContext\[@type="([^"]*)"]/dayWidth\[@type="([^"]*)"]/day\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for day-of-the-week {4}. For more information, please see http://cldr.org/translation/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraAbbr/era\[@type="([^"]*)"] ; Provide the format-abbreviated version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraNames/era\[@type="([^"]*)"] ; Provide the format-wide version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraNarrow/era\[@type="([^"]*)"] ; Provide the format-narrow version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/months/monthContext\[@type="([^"]*)"]/monthWidth\[@type="([^"]*)"]/month\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for month {4}. For more information, please see http://cldr.org/translation/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/quarters/quarterContext\[@type="([^"]*)"]/quarterWidth\[@type="([^"]*)"]/quarter\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for quarter {4}. For more information, please see http://cldr.org/translation/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dayPeriods/dayPeriodContext\[@type="(format)"]/dayPeriodWidth\[@type="([^"]*)"]/dayPeriod\[@type="([^"]*)"] ; Provide the {3}, {2} version of the name for the day period code “{4}”. This version must have the right inflection/prepositions/etc. for adding after a number, such as “in the morning” for use in “10:00 in the morning”. To see the time spans for these codes, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Day-Periods-AM-PM-etc.-.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dayPeriods/dayPeriodContext\[@type="([^"]*)"]/dayPeriodWidth\[@type="([^"]*)"]/dayPeriod\[@type="([^"]*)"] ; Provide the {3}, {2} version of the name for the day period code “{4}”. To see the time spans for these codes, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Day-Periods-AM-PM-etc.-.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/days/dayContext\[@type="([^"]*)"]/dayWidth\[@type="([^"]*)"]/day\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for day-of-the-week {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraAbbr/era\[@type="([^"]*)"] ; Provide the format-abbreviated version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraNames/era\[@type="([^"]*)"] ; Provide the format-wide version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/eras/eraNarrow/era\[@type="([^"]*)"] ; Provide the format-narrow version of the name for era {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/months/monthContext\[@type="([^"]*)"]/monthWidth\[@type="([^"]*)"]/month\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for month {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/quarters/quarterContext\[@type="([^"]*)"]/quarterWidth\[@type="([^"]*)"]/quarter\[@type="([^"]*)"] ; Provide the {2} and {3} version of the name for quarter {4}. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/displayName ; Provide the name (as it would appear in menus) for the field “{1}”. For more information, please see http://cldr.org/translation/date-time-names#TOC-Date-Field-Names .
+^//ldml/dates/fields/field\[@type="([^"]*)"]/displayName ; Provide the name (as it would appear in menus) for the field “{1}”. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Date-Field-Names .
-^//ldml/dates/fields/field\[@type="day"]/relative\[@type="0"] ; Provide the name for today. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="day"]/relative\[@type="-([^"]*)"] ; Provide a name for the day, {1} before today. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="day"]/relative\[@type="([^"]*)"] ; Provide a name for the day, {1} after today. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="day"]/relative\[@type="0"] ; Provide the name for today. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="day"]/relative\[@type="-([^"]*)"] ; Provide a name for the day, {1} before today. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="day"]/relative\[@type="([^"]*)"] ; Provide a name for the day, {1} after today. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="0"] ; Provide the name for “this {2}”. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="-1"] ; Provide a name for “last {1}”. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="1"] ; Provide a name for “next {1}”. For more information, please see http://cldr.org/translation/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="0"] ; Provide the name for “this {2}”. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="-1"] ; Provide a name for “last {1}”. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relative\[@type="1"] ; Provide a name for “next {1}”. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Relative-Date-Names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relativeTime\[@type="future"]/relativeTimePattern\[@count="([^"]*)"] ; Provide a pattern used to display times in the future. For more information, please see http://cldr.org/translation/date-time-names
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relativeTime\[@type="past"]/relativeTimePattern\[@count="([^"]*)"] ; Provide a pattern used to display times in the past. For more information, please see http://cldr.org/translation/date-time-names
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relativeTime\[@type="future"]/relativeTimePattern\[@count="([^"]*)"] ; Provide a pattern used to display times in the future. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relativeTime\[@type="past"]/relativeTimePattern\[@count="([^"]*)"] ; Provide a pattern used to display times in the past. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
-^//ldml/dates/fields/field\[@type="([^"]*)"]/relativePeriod ; Provide a name for “the {1} of SOME_DATE”. For more information, please see http://cldr.org/translation/date-time-names.
+^//ldml/dates/fields/field\[@type="([^"]*)"]/relativePeriod ; Provide a name for “the {1} of SOME_DATE”. For more information, please see http://cldr.org/translation/date-time-1/date-time-names.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/dateTimeFormatLength\[@type="([^"]*)"]/dateTimeFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the date-time pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateFormats/dateFormatLength\[@type="([^"]*)"]/dateFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the basic date pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/timeFormats/timeFormatLength\[@type="([^"]*)"]/timeFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the basic time pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/availableFormats/dateFormatItem\[@id="([^"]*)"] ; Provide the pattern used in your language for the skeleton “{2}”. Note: before translating, be sure to read http://cldr.org/translation/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/appendItems/appendItem\[@request="([^"]*)"] ; Provide the pattern used in your language to append a “{2}” to another format. Note: before translating, be sure to read http://cldr.org/translation/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/dateTimeFormatLength\[@type="([^"]*)"]/dateTimeFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the date-time pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateFormats/dateFormatLength\[@type="([^"]*)"]/dateFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the basic date pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/timeFormats/timeFormatLength\[@type="([^"]*)"]/timeFormat\[@type="([^"]*)"]/pattern\[@type="([^"]*)"] ; Provide the {2} version of the basic time pattern. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/availableFormats/dateFormatItem\[@id="([^"]*)"] ; Provide the pattern used in your language for the skeleton “{2}”. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/appendItems/appendItem\[@request="([^"]*)"] ; Provide the pattern used in your language to append a “{2}” to another format. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/intervalFormats/intervalFormatFallback ; The pattern used for “fallback” with date/time intervals. Note: before translating, be sure to read http://cldr.org/translation/date-time-intervals.
-^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/intervalFormats/intervalFormatItem\[@id="([^"]*)"]/greatestDifference\[@id="([^"]*)"] ; The pattern used for the date/time interval skeleton “{2}” when the greatest difference is “{3}”. Note: before translating, be sure to read http://cldr.org/translation/date-time-intervals.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/intervalFormats/intervalFormatFallback ; The pattern used for “fallback” with date/time intervals. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
+^//ldml/dates/calendars/calendar\[@type="([^"]*)"]/dateTimeFormats/intervalFormats/intervalFormatItem\[@id="([^"]*)"]/greatestDifference\[@id="([^"]*)"] ; The pattern used for the date/time interval skeleton “{2}” when the greatest difference is “{3}”. Note: before translating, be sure to read http://cldr.org/translation/date-time-1/date-time-patterns.
-^//ldml/dates/calendars/calendar\[@type="[^"]*"]/cyclicNameSets/cyclicNameSet\[@type="([^"]*)"]/cyclicNameContext\[@type="([^"]*)"]/cyclicNameWidth\[@type="([^"]*)"]/cyclicName\[@type="([^"]*)"] ; Provide the {2} and {3} version of type {4} in the {1} name cycle. For more information, please see http://cldr.org/translation/date-time-names#TOC-Cyclic-Name-Sets.
-^//ldml/dates/calendars/calendar\[@type="[^"]*"]/monthPatterns/monthPatternContext\[@type="([^"]*)"]/monthPatternWidth\[@type="([^"]*)"]/monthPattern\[@type="([^"]*)"] ; Provide the {1} and {2} version of the name for {3} month types. For more information, please see http://cldr.org/translation/date-time-names#TOC-Month-Patterns.
+^//ldml/dates/calendars/calendar\[@type="[^"]*"]/cyclicNameSets/cyclicNameSet\[@type="([^"]*)"]/cyclicNameContext\[@type="([^"]*)"]/cyclicNameWidth\[@type="([^"]*)"]/cyclicName\[@type="([^"]*)"] ; Provide the {2} and {3} version of type {4} in the {1} name cycle. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Cyclic-Name-Sets.
+^//ldml/dates/calendars/calendar\[@type="[^"]*"]/monthPatterns/monthPatternContext\[@type="([^"]*)"]/monthPatternWidth\[@type="([^"]*)"]/monthPattern\[@type="([^"]*)"] ; Provide the {1} and {2} version of the name for {3} month types. For more information, please see http://cldr.org/translation/date-time-1/date-time-names#TOC-Month-Patterns.
^//ldml/localeDisplayNames/transformNames/transformName\[@type="([^"]*)"] ; The name of the transform “{1}”. For more information, please see http://cldr.org/translation/transforms.
-^//ldml/localeDisplayNames/codePatterns/codePattern[@type="([^"]*)"] ; The pattern to be used when displaying a name for a character {1}. For more information, please see http://cldr.org/translation/localepattern.
+^//ldml/localeDisplayNames/codePatterns/codePattern[@type="([^"]*)"] ; The pattern to be used when displaying a name for a character {1}. For more information, please see http://cldr.org/translation/displaynames/localepattern.
-^//ldml/localeDisplayNames/measurementSystemNames/measurementSystemName\[@type="([^"]*)"] ; The name of the measurement system “{1}”. For more information, please see http://cldr.org/translation/misc.
-^//ldml/posix/messages/(no|yes)str ; The word for “{1}”, lowercased, plus any abbreviations separated by a colon. For more information, see http://cldr.org/translation/misc.
+^//ldml/localeDisplayNames/measurementSystemNames/measurementSystemName\[@type="([^"]*)"] ; The name of the measurement system “{1}”. For more information, please see http://cldr.org/translation/units-1/misc.
+^//ldml/posix/messages/(no|yes)str ; The word for “{1}”, lowercased, plus any abbreviations separated by a colon. For more information, see http://cldr.org/translation/units-1/misc.
-^//ldml/localeDisplayNames/annotationPatterns/annotationPattern[@type="([^"]*)"] ; The pattern to be used when displaying a {1}. For more information, please see http://cldr.org/translation/localepattern.
+^//ldml/localeDisplayNames/annotationPatterns/annotationPattern[@type="([^"]*)"] ; The pattern to be used when displaying a {1}. For more information, please see http://cldr.org/translation/displaynames/localepattern.
-^//ldml/characters/stopwords/stopwordList\[@type="([^"]*)"] ; The words that should be ignored in sorting in your language. For more information, see http://cldr.org/translation/misc.
+^//ldml/characters/stopwords/stopwordList\[@type="([^"]*)"] ; The words that should be ignored in sorting in your language. For more information, see http://cldr.org/translation/units-1/misc.
^//ldml/dates/timeZoneNames/zone\[@type="([^"]*)"]/([^/]*)/(.*) ; Override for the $3-$2 timezone name for $1. For more information, see http://cldr.org/translation/timezones.
-^//ldml/typographicNames/axisName[@type="([^"]*)"] ; A label for a typographic design axis, such as “Width” or “Weight”. For more information, see http://cldr.org/translation/typographic-names.
-^//ldml/typographicNames/styleName[@type="([^"]*)"][@subtype="([^"]*)"] ; A label for a typographic style, such as “Narrow” or “Semibold”. For more information, see http://cldr.org/translation/typographic-names.
-^//ldml/typographicNames/featureName[@type="([^"]*)"] ; A label for a typographic feature, such as “Small Capitals”. For more information, see http://cldr.org/translation/typographic-names.
+^//ldml/typographicNames/axisName[@type="([^"]*)"] ; A label for a typographic design axis, such as “Width” or “Weight”. For more information, see http://cldr.org/translation/characters-emoji-symbols/typographic-names.
+^//ldml/typographicNames/styleName[@type="([^"]*)"][@subtype="([^"]*)"] ; A label for a typographic style, such as “Narrow” or “Semibold”. For more information, see http://cldr.org/translation/characters-emoji-symbols/typographic-names.
+^//ldml/typographicNames/featureName[@type="([^"]*)"] ; A label for a typographic feature, such as “Small Capitals”. For more information, see http://cldr.org/translation/characters-emoji-symbols/typographic-names.
-^//ldml/characterLabels/characterLabelPattern\[@type="([^"]*)"]\[@count="([^"]*)"]; A label for a set of characters that has a numeric placeholder, such as “1 Stroke”, “2 Strokes”. For more information, see http://cldr.org/translation/character-labels.
-^//ldml/characterLabels/characterLabelPattern\[@type="([^"]*)"]; A modifier composed with a label for a set of characters. For more information, see http://cldr.org/translation/character-labels.
-^//ldml/characterLabels/characterLabel\[@type="([^"]*)"]; A label for a set of characters. For more information, see http://cldr.org/translation/character-labels.
+^//ldml/characterLabels/characterLabelPattern\[@type="([^"]*)"]\[@count="([^"]*)"]; A label for a set of characters that has a numeric placeholder, such as “1 Stroke”, “2 Strokes”. For more information, see http://cldr.org/translation/characters-emoji-symbols/character-labels.
+^//ldml/characterLabels/characterLabelPattern\[@type="([^"]*)"]; A modifier composed with a label for a set of characters. For more information, see http://cldr.org/translation/characters-emoji-symbols/character-labels.
+^//ldml/characterLabels/characterLabel\[@type="([^"]*)"]; A label for a set of characters. For more information, see http://cldr.org/translation/characters-emoji-symbols/character-labels.
-^//ldml/annotations/annotation\[@cp="([^"]*)"]\[@type="tts"]; A name for a character or sequence. For more information, see http://cldr.org/translation/short-names-and-keywords.
-^//ldml/annotations/annotation\[@cp="([^"]*)"]; A set of keywords for a character or sequence. For more information, see http://cldr.org/translation/short-names-and-keywords.
+^//ldml/annotations/annotation\[@cp="([^"]*)"]\[@type="tts"]; A name for a character or sequence. For more information, see http://cldr.org/translation/characters-emoji-symbols/short-names-and-keywords#TOC-Short-Character-Names.
+^//ldml/annotations/annotation\[@cp="([^"]*)"]; A set of keywords for a character or sequence. For more information, see http://cldr.org/translation/characters-emoji-symbols/short-names-and-keywords#TOC-Short-Character-Names.
diff --git a/tools/java/org/unicode/cldr/util/data/PathHeader.txt b/tools/java/org/unicode/cldr/util/data/PathHeader.txt
index 31ecd86..ece6edc 100644
--- a/tools/java/org/unicode/cldr/util/data/PathHeader.txt
+++ b/tools/java/org/unicode/cldr/util/data/PathHeader.txt
@@ -222,7 +222,11 @@
//ldml/units/unitLength[@type="%L"]/unit[@type="%A"]/unitPattern[@count="%A"] ; Units ; Other Units ; &unit($2) ; &unitCount($1-$3)
//ldml/units/unitLength[@type="%L"]/unit[@type="%A"]/perUnitPattern ; Units ; Other Units ; &unit($2) ; &unitCount($1-per)
+# Warning: the longer match must come first
+//ldml/units/unitLength[@type="%L"]/compoundUnit[@type="%A"]/compoundUnitPattern1[@count="%A"] ; Units ; Compound Units ; $2 ; &unitCount($1-$3)
+//ldml/units/unitLength[@type="%L"]/compoundUnit[@type="%A"]/compoundUnitPattern1 ; Units ; Compound Units ; $2 ; $1
//ldml/units/unitLength[@type="%L"]/compoundUnit[@type="%A"]/compoundUnitPattern ; Units ; Compound Units ; $2 ; $1
+//ldml/units/unitLength[@type="%L"]/compoundUnit[@type="%A"]/unitPrefixPattern ; Units ; Compound Units ; $2 ; $1
//ldml/units/durationUnit[@type="(hms|hm|ms)"] ; Units ; Duration ; Duration Patterns ; $1
//ldml/units/unitLength[@type="%L"]/coordinateUnit/displayName ; Units ; Coordinates ; all ; &unitCount($1-displayName)
@@ -358,11 +362,6 @@
//supplementalData/transforms/transform[@source="%A"][@target="%A"][@direction="%A"]/%E ; Supplemental ; Transform ; &transform($3,$1,$2) ; $4 ; HIDE
//supplementalData/transforms/transform[@source="%A"][@target="%A"][@variant="%A"][@direction="%A"]/%E ; Supplemental ; Transform ; &transform($4,$1,$2,$3) ; $5 ; HIDE
-//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference[@regions="%A"] ; Supplemental ; UnitPreferences ; $1/$2 ; $3 ; HIDE
-//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference[@regions="%A"][@alt="%A"] ; Supplemental ; UnitPreferences ; $1/$2 ; $3-$4 ; HIDE
-//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"][@scope="%A"]/unitPreference[@regions="%A"] ; Supplemental ; UnitPreferences ; $1/$2/$3 ; $4 ; HIDE
-//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"][@scope="%A"]/unitPreference[@regions="%A"][@alt="%A"] ; Supplemental ; UnitPreferences ; $1/$2/$3 ; $4-$5 ; HIDE
-
//supplementalData/territoryInfo/territory[@type="%A"]/languagePopulation[@type="%A"]/_%E ; Supplemental ; LanguageInfo ; $1/$2 ; $3 ; HIDE
//supplementalData/territoryInfo/territory[@type="%A"]/_%E ; Supplemental ; TerritoryInfo ; $1 ; $2 ; HIDE
@@ -422,6 +421,32 @@
//supplementalData/dayPeriodRuleSet[@type="%A"]/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"]/_%E ; Supplemental ; DayPeriod ; $1-$2 ; $3-$4 ; HIDE
//supplementalData/dayPeriodRuleSet/dayPeriodRules[@locales="%A"]/dayPeriodRule[@type="%A"]/_%E ; Supplemental ; DayPeriod ; $1 ; $2-$3 ; HIDE
+//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalCase/_values ; Supplemental ; Grammar ; Case ; $1-$2 ; HIDE
+//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalDefiniteness/_values ; Supplemental ; Grammar ; Definiteness ; $1-$2 ; HIDE
+//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalGender/_values ; Supplemental ; Grammar ; Gender ; $1-$2 ; HIDE
+//supplementalData/grammaticalData/grammaticalFeatures[@targets="%A"][@locales="%A"]/grammaticalState/_values ; Supplemental ; Grammar ; State ; $1-$2 ; HIDE
+
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference_[@regions="%A"][@geq="%A"]/_skeleton ; Supplemental ; Units ; $1/$2 ; $3:$4-skeleton ; HIDE
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference_[@regions="%A"]/_skeleton ; Supplemental ; Units ; $1/$2 ; $3-skeleton ; HIDE
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference[@regions="%A"][@geq="%A"] ; Supplemental ; Units ; $1/$2 ; $3:$4 ; HIDE
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference[@regions="%A"] ; Supplemental ; Units ; $1/$2 ; $3 ; HIDE
+
+#OLD
+#//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"]/unitPreference[@regions="%A"][@alt="%A"] ; Supplemental ; Units ; $1/$2 ; $3-alt-$4 ; HIDE
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"][@scope="%A"]/unitPreference[@regions="%A"] ; Supplemental ; Units ; $1/$2/$3 ; $4 ; HIDE
+//supplementalData/unitPreferenceData/unitPreferences[@category="%A"][@usage="%A"][@scope="%A"]/unitPreference[@regions="%A"][@alt="%A"] ; Supplemental ; Units ; $1/$2/$3 ; $4-$5 ; HIDE
+
+
+//supplementalData/unitConstants/unitConstant[@constant="%A"]/_value ; Supplemental ; Units ; Constant ; $1-value ; HIDE
+//supplementalData/unitConstants/unitConstant[@constant="%A"]/_status ; Supplemental ; Units ; Constant ; $1-status ; HIDE
+//supplementalData/unitQuantities/unitQuantity[@baseUnit="%A"]/_quantity ; Supplemental ; Units ; Quantity ; $1-value ; HIDE
+//supplementalData/unitQuantities/unitQuantity[@baseUnit="%A"]/_status ; Supplemental ; Units ; Quantity ; $1-status ; HIDE
+//supplementalData/convertUnits/convertUnit[@source="%A"]/_baseUnit ; Supplemental ; Units ; Convert ; $1-baseUnit ; HIDE
+//supplementalData/convertUnits/convertUnit[@source="%A"]/_factor ; Supplemental ; Units ; Convert ; $1-factor ; HIDE
+//supplementalData/convertUnits/convertUnit[@source="%A"]/_offset ; Supplemental ; Units ; Convert ; $1-offset ; HIDE
+//supplementalData/convertUnits/convertUnit[@source="%A"]/_reciprocal ; Supplemental ; Units ; Convert ; $1-reciprocal ; HIDE
+//supplementalData/convertUnits/convertUnit[@source="%A"]/_systems ; Supplemental ; Units ; Convert ; $1-systems ; HIDE
+
# Ultimate fallback (Error)
//supplementalData/%S/(.*) ; Supplemental ; Unknown ; $1 ; $2 ; DEPRECATED
//supplementalData/(.*) ; Supplemental ; Unknown ; Unknown ; $2 ; DEPRECATED
diff --git a/tools/java/org/unicode/cldr/util/data/Placeholders.txt b/tools/java/org/unicode/cldr/util/data/Placeholders.txt
index a83680f..98bf568 100644
--- a/tools/java/org/unicode/cldr/util/data/Placeholders.txt
+++ b/tools/java/org/unicode/cldr/util/data/Placeholders.txt
@@ -211,7 +211,10 @@
^//ldml/numbers/minimalPairs/ordinalMinimalPairs[@ordinal="%A"] ; multiple ; {0}=COUNT 3
^//ldml/numbers/minimalPairs/pluralMinimalPairs[@count="%A"] ; multiple ; {0}=COUNT 3
-^//ldml/units/unitLength\[@type="%L"]/compoundUnit\[@type="%A"]/compoundUnitPattern ; locale ; {0}=DIVIDEND UNIT meters ; {1}=DIVIDEND UNIT second
+# Warning: the longer match must come first
+^//ldml/units/unitLength\[@type="%L"]/compoundUnit\[@type="%A"]/compoundUnitPattern1 ; {0}=POWER UNIT meters
+^//ldml/units/unitLength\[@type="%L"]/compoundUnit\[@type="%A"]/compoundUnitPattern ; {0}=DIVIDEND UNIT meters ; {1}=DIVISOR UNIT second
+^//ldml/units/unitLength\[@type="%L"]/compoundUnit\[@type="%A"]/unitPrefixPattern ; {0}=METRIC UNIT meter
^//ldml/units/unitLength\[@type="%L"]/coordinateUnit/coordinateUnitPattern\[@type="%A"] ; {0}=DEGREES 12°
^//ldml/units/unitLength\[@type="%L"]/unit\[@type="duration-day%A"]/unitPattern\[@count="\w+"] ; locale ; {0}=NUMBER_OF_DAYS 3
diff --git a/tools/java/org/unicode/cldr/util/data/births/outdated.data b/tools/java/org/unicode/cldr/util/data/births/outdated.data
index 002e455..bb0eee6 100644
--- a/tools/java/org/unicode/cldr/util/data/births/outdated.data
+++ b/tools/java/org/unicode/cldr/util/data/births/outdated.data
Binary files differ
diff --git a/tools/java/org/unicode/cldr/util/data/births/outdatedEnglish.data b/tools/java/org/unicode/cldr/util/data/births/outdatedEnglish.data
index 06c6e88..4482857 100644
--- a/tools/java/org/unicode/cldr/util/data/births/outdatedEnglish.data
+++ b/tools/java/org/unicode/cldr/util/data/births/outdatedEnglish.data
Binary files differ
diff --git a/tools/java/org/unicode/cldr/util/data/chart_messages.html b/tools/java/org/unicode/cldr/util/data/chart_messages.html
index 1a564f2..3e35449 100644
--- a/tools/java/org/unicode/cldr/util/data/chart_messages.html
+++ b/tools/java/org/unicode/cldr/util/data/chart_messages.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css"
- href="http://unicode.org/cldr/apps/surveytool.css">
+ href="https://unicode.org/cldr/apps/surveytool.css">
<title>Help Text file for Supplemental Charts</title>
<style type="text/css">
<!--
@@ -415,10 +415,9 @@
(such as "1-2", used in expressions like "1-2 meters long"). CLDR
uses short, mnemonic tags for these plural categories. For more
information on these categories, see <a
- href="http://cldr.unicode.org/index/cldr-spec/plural-rules">Plural
+ href="http://cldr.unicode.org/index/cldr-spec/plural-rules" target='spec'>Plural
Rules</a>.
</p>
- <p></p>
<ul>
<li><b>Examples:</b> The symbol ~ (as in "1.7~2.1") has a
special meaning: it is a range of numbers that includes the end
@@ -427,11 +426,15 @@
and 2.0, but not 2 or 1.91 or 1.90). The samples are generated mechanically, and
are not comprehensive: “0, 2~19, 101~119, …” could show up as the less-complete
“0, 2~16, 101 …”.</li>
+ <li><strong>Rules:</strong> The plural categories are computed based on machine-readable rules,
+ using the syntax described in <a href="http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules" target='spec'>Language Plural Rules</a>.
+ In particular, they use special variables and relation defined in <a href="http://unicode.org/reports/tr35/tr35-numbers.html#Operands" target='spec'>Plural Rule Operands</a>
+ and following.</li>
<li><b>Reporting Defects:</b> When you find errors or
omissions in this data, please report the information with a <a
target="_blank" href="http://unicode.org/cldr/trac/newticket">bug
report</a>. But first read "Reporting Defects" on <a
- href="http://cldr.unicode.org/index/cldr-spec/plural-rules">Plural
+ href="http://cldr.unicode.org/index/cldr-spec/plural-rules" target='spec'>Plural
Rules</a>.</li>
</ul>
</td>
diff --git a/tools/java/org/unicode/cldr/util/data/country_language_population_raw.txt b/tools/java/org/unicode/cldr/util/data/country_language_population_raw.txt
index d58c95d..13a4893 100644
--- a/tools/java/org/unicode/cldr/util/data/country_language_population_raw.txt
+++ b/tools/java/org/unicode/cldr/util/data/country_language_population_raw.txt
@@ -565,7 +565,8 @@
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Lampung Api ljp "1,810,000"
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Madurese mad 6.3% 40%
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Makasar mak "1,930,000"
-Indonesia ID "262,787,403" 93% "3,250,000,000,000" Malay (Arabic) ms_Arab 4.6%
+Indonesia ID "262,787,403" 93% "3,250,000,000,000" Malay ms 3.4%
+Indonesia ID "262,787,403" 93% "3,250,000,000,000" Malay (Arabic) ms_Arab 1.2%
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Mandar mdr "241,000"
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Mentawai mwv "64,100"
Indonesia ID "262,787,403" 93% "3,250,000,000,000" Minangkabau min "7,840,000" 10%
@@ -1339,6 +1340,7 @@
United Kingdom GB "65,105,246" 99% "2,925,000,000,000" Sylheti syl "329,000"
United Kingdom GB "65,105,246" 99% "2,925,000,000,000" official_regional Welsh cy "501,000"
United Kingdom GB "65,105,246" 99% "2,925,000,000,000" Yiddish yi "32,100" http://en.wikipedia.org/wiki/Yiddish_language#Numbers_of_speakers
+United States US "329,256,465" 99% "19,490,000,000,000" Caddo cad "25"
United States US "329,256,465" 99% "19,490,000,000,000" Cajun French frc "27,800"
United States US "329,256,465" 99% "19,490,000,000,000" Central Yupik esu "20,600"
United States US "329,256,465" 99% "19,490,000,000,000" Cherokee chr "25,300" 5% "For languages not customarily written, the writing population is artificially set to 5% in the absence of better information."
diff --git a/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt b/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
index cabc4c8..9f8d343 100644
--- a/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
+++ b/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
@@ -1,4374 +1,4457 @@
-# Generated lines from Emoji Data v13, using GenerateCldrData.java
+# emoji-test.txt
+# Date: 2020-01-21, 13:40:25 GMT
+# © 2020 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Emoji Keyboard/Display Test Data for UTS #51
+# Version: 13.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr51
+#
+# This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
+# Format: code points; status # emoji name
+# Code points — list of one or more hex code points, separated by spaces
+# Status
+# component — an Emoji_Component,
+# excluding Regional_Indicators, ASCII, and non-Emoji.
+# fully-qualified — a fully-qualified emoji (see ED-18 in UTS #51),
+# excluding Emoji_Component
+# minimally-qualified — a minimally-qualified emoji (see ED-18a in UTS #51)
+# unqualified — a unqualified emoji (See ED-19 in UTS #51)
+# Notes:
+# • This includes the emoji components that need emoji presentation (skin tone and hair)
+# when isolated, but omits the components that need not have an emoji
+# presentation when isolated.
+# • The RGI set is covered by the listed fully-qualified emoji.
+# • The listed minimally-qualified and unqualified cover all cases where an
+# element of the RGI set is missing one or more emoji presentation selectors.
+# • The file is in CLDR order, not codepoint order. This is recommended (but not required!) for keyboard palettes.
+# • The groups and subgroups are illustrative. See the Emoji Order chart for more information.
+
# group: Smileys & Emotion
# subgroup: face-smiling
-1F600 ; fully-qualified # 😀 grinning face
-1F603 ; fully-qualified # 😃 grinning face with big eyes
-1F604 ; fully-qualified # 😄 grinning face with smiling eyes
-1F601 ; fully-qualified # 😁 beaming face with smiling eyes
-1F606 ; fully-qualified # 😆 grinning squinting face
-1F605 ; fully-qualified # 😅 grinning face with sweat
-1F923 ; fully-qualified # 🤣 rolling on the floor laughing
-1F602 ; fully-qualified # 😂 face with tears of joy
-1F642 ; fully-qualified # 🙂 slightly smiling face
-1F643 ; fully-qualified # 🙃 upside-down face
-1F609 ; fully-qualified # 😉 winking face
-1F60A ; fully-qualified # 😊 smiling face with smiling eyes
-1F607 ; fully-qualified # 😇 smiling face with halo
+1F600 ; fully-qualified # 😀 E1.0 grinning face
+1F603 ; fully-qualified # 😃 E0.6 grinning face with big eyes
+1F604 ; fully-qualified # 😄 E0.6 grinning face with smiling eyes
+1F601 ; fully-qualified # 😁 E0.6 beaming face with smiling eyes
+1F606 ; fully-qualified # 😆 E0.6 grinning squinting face
+1F605 ; fully-qualified # 😅 E0.6 grinning face with sweat
+1F923 ; fully-qualified # 🤣 E3.0 rolling on the floor laughing
+1F602 ; fully-qualified # 😂 E0.6 face with tears of joy
+1F642 ; fully-qualified # 🙂 E1.0 slightly smiling face
+1F643 ; fully-qualified # 🙃 E1.0 upside-down face
+1F609 ; fully-qualified # 😉 E0.6 winking face
+1F60A ; fully-qualified # 😊 E0.6 smiling face with smiling eyes
+1F607 ; fully-qualified # 😇 E1.0 smiling face with halo
# subgroup: face-affection
-1F970 ; fully-qualified # 🥰 smiling face with hearts
-1F60D ; fully-qualified # 😍 smiling face with heart-eyes
-1F929 ; fully-qualified # 🤩 star-struck
-1F618 ; fully-qualified # 😘 face blowing a kiss
-1F617 ; fully-qualified # 😗 kissing face
-263A FE0F ; fully-qualified # ☺️ smiling face
-263A ; unqualified # ☺ smiling face
-1F61A ; fully-qualified # 😚 kissing face with closed eyes
-1F619 ; fully-qualified # 😙 kissing face with smiling eyes
-1F972 ; fully-qualified # 🥲 smiling face with tear
+1F970 ; fully-qualified # 🥰 E11.0 smiling face with hearts
+1F60D ; fully-qualified # 😍 E0.6 smiling face with heart-eyes
+1F929 ; fully-qualified # 🤩 E5.0 star-struck
+1F618 ; fully-qualified # 😘 E0.6 face blowing a kiss
+1F617 ; fully-qualified # 😗 E1.0 kissing face
+263A FE0F ; fully-qualified # ☺️ E0.6 smiling face
+263A ; unqualified # ☺ E0.6 smiling face
+1F61A ; fully-qualified # 😚 E0.6 kissing face with closed eyes
+1F619 ; fully-qualified # 😙 E1.0 kissing face with smiling eyes
+1F972 ; fully-qualified # 🥲 E13.0 smiling face with tear
# subgroup: face-tongue
-1F60B ; fully-qualified # 😋 face savoring food
-1F61B ; fully-qualified # 😛 face with tongue
-1F61C ; fully-qualified # 😜 winking face with tongue
-1F92A ; fully-qualified # 🤪 zany face
-1F61D ; fully-qualified # 😝 squinting face with tongue
-1F911 ; fully-qualified # 🤑 money-mouth face
+1F60B ; fully-qualified # 😋 E0.6 face savoring food
+1F61B ; fully-qualified # 😛 E1.0 face with tongue
+1F61C ; fully-qualified # 😜 E0.6 winking face with tongue
+1F92A ; fully-qualified # 🤪 E5.0 zany face
+1F61D ; fully-qualified # 😝 E0.6 squinting face with tongue
+1F911 ; fully-qualified # 🤑 E1.0 money-mouth face
# subgroup: face-hand
-1F917 ; fully-qualified # 🤗 hugging face
-1F92D ; fully-qualified # 🤭 face with hand over mouth
-1F92B ; fully-qualified # 🤫 shushing face
-1F914 ; fully-qualified # 🤔 thinking face
+1F917 ; fully-qualified # 🤗 E1.0 hugging face
+1F92D ; fully-qualified # 🤭 E5.0 face with hand over mouth
+1F92B ; fully-qualified # 🤫 E5.0 shushing face
+1F914 ; fully-qualified # 🤔 E1.0 thinking face
# subgroup: face-neutral-skeptical
-1F910 ; fully-qualified # 🤐 zipper-mouth face
-1F928 ; fully-qualified # 🤨 face with raised eyebrow
-1F610 ; fully-qualified # 😐 neutral face
-1F611 ; fully-qualified # 😑 expressionless face
-1F636 ; fully-qualified # 😶 face without mouth
-1F60F ; fully-qualified # 😏 smirking face
-1F612 ; fully-qualified # 😒 unamused face
-1F644 ; fully-qualified # 🙄 face with rolling eyes
-1F62C ; fully-qualified # 😬 grimacing face
-1F925 ; fully-qualified # 🤥 lying face
+1F910 ; fully-qualified # 🤐 E1.0 zipper-mouth face
+1F928 ; fully-qualified # 🤨 E5.0 face with raised eyebrow
+1F610 ; fully-qualified # 😐 E0.7 neutral face
+1F611 ; fully-qualified # 😑 E1.0 expressionless face
+1F636 ; fully-qualified # 😶 E1.0 face without mouth
+1F60F ; fully-qualified # 😏 E0.6 smirking face
+1F612 ; fully-qualified # 😒 E0.6 unamused face
+1F644 ; fully-qualified # 🙄 E1.0 face with rolling eyes
+1F62C ; fully-qualified # 😬 E1.0 grimacing face
+1F925 ; fully-qualified # 🤥 E3.0 lying face
# subgroup: face-sleepy
-1F60C ; fully-qualified # 😌 relieved face
-1F614 ; fully-qualified # 😔 pensive face
-1F62A ; fully-qualified # 😪 sleepy face
-1F924 ; fully-qualified # 🤤 drooling face
-1F634 ; fully-qualified # 😴 sleeping face
+1F60C ; fully-qualified # 😌 E0.6 relieved face
+1F614 ; fully-qualified # 😔 E0.6 pensive face
+1F62A ; fully-qualified # 😪 E0.6 sleepy face
+1F924 ; fully-qualified # 🤤 E3.0 drooling face
+1F634 ; fully-qualified # 😴 E1.0 sleeping face
# subgroup: face-unwell
-1F637 ; fully-qualified # 😷 face with medical mask
-1F912 ; fully-qualified # 🤒 face with thermometer
-1F915 ; fully-qualified # 🤕 face with head-bandage
-1F922 ; fully-qualified # 🤢 nauseated face
-1F92E ; fully-qualified # 🤮 face vomiting
-1F927 ; fully-qualified # 🤧 sneezing face
-1F975 ; fully-qualified # 🥵 hot face
-1F976 ; fully-qualified # 🥶 cold face
-1F974 ; fully-qualified # 🥴 woozy face
-1F635 ; fully-qualified # 😵 dizzy face
-1F92F ; fully-qualified # 🤯 exploding head
+1F637 ; fully-qualified # 😷 E0.6 face with medical mask
+1F912 ; fully-qualified # 🤒 E1.0 face with thermometer
+1F915 ; fully-qualified # 🤕 E1.0 face with head-bandage
+1F922 ; fully-qualified # 🤢 E3.0 nauseated face
+1F92E ; fully-qualified # 🤮 E5.0 face vomiting
+1F927 ; fully-qualified # 🤧 E3.0 sneezing face
+1F975 ; fully-qualified # 🥵 E11.0 hot face
+1F976 ; fully-qualified # 🥶 E11.0 cold face
+1F974 ; fully-qualified # 🥴 E11.0 woozy face
+1F635 ; fully-qualified # 😵 E0.6 dizzy face
+1F92F ; fully-qualified # 🤯 E5.0 exploding head
# subgroup: face-hat
-1F920 ; fully-qualified # 🤠 cowboy hat face
-1F973 ; fully-qualified # 🥳 partying face
-1F978 ; fully-qualified # 🥸 disguised face
+1F920 ; fully-qualified # 🤠 E3.0 cowboy hat face
+1F973 ; fully-qualified # 🥳 E11.0 partying face
+1F978 ; fully-qualified # 🥸 E13.0 disguised face
# subgroup: face-glasses
-1F60E ; fully-qualified # 😎 smiling face with sunglasses
-1F913 ; fully-qualified # 🤓 nerd face
-1F9D0 ; fully-qualified # 🧐 face with monocle
+1F60E ; fully-qualified # 😎 E1.0 smiling face with sunglasses
+1F913 ; fully-qualified # 🤓 E1.0 nerd face
+1F9D0 ; fully-qualified # 🧐 E5.0 face with monocle
# subgroup: face-concerned
-1F615 ; fully-qualified # 😕 confused face
-1F61F ; fully-qualified # 😟 worried face
-1F641 ; fully-qualified # 🙁 slightly frowning face
-2639 FE0F ; fully-qualified # ☹️ frowning face
-2639 ; unqualified # ☹ frowning face
-1F62E ; fully-qualified # 😮 face with open mouth
-1F62F ; fully-qualified # 😯 hushed face
-1F632 ; fully-qualified # 😲 astonished face
-1F633 ; fully-qualified # 😳 flushed face
-1F97A ; fully-qualified # 🥺 pleading face
-1F626 ; fully-qualified # 😦 frowning face with open mouth
-1F627 ; fully-qualified # 😧 anguished face
-1F628 ; fully-qualified # 😨 fearful face
-1F630 ; fully-qualified # 😰 anxious face with sweat
-1F625 ; fully-qualified # 😥 sad but relieved face
-1F622 ; fully-qualified # 😢 crying face
-1F62D ; fully-qualified # 😭 loudly crying face
-1F631 ; fully-qualified # 😱 face screaming in fear
-1F616 ; fully-qualified # 😖 confounded face
-1F623 ; fully-qualified # 😣 persevering face
-1F61E ; fully-qualified # 😞 disappointed face
-1F613 ; fully-qualified # 😓 downcast face with sweat
-1F629 ; fully-qualified # 😩 weary face
-1F62B ; fully-qualified # 😫 tired face
-1F971 ; fully-qualified # 🥱 yawning face
+1F615 ; fully-qualified # 😕 E1.0 confused face
+1F61F ; fully-qualified # 😟 E1.0 worried face
+1F641 ; fully-qualified # 🙁 E1.0 slightly frowning face
+2639 FE0F ; fully-qualified # ☹️ E0.7 frowning face
+2639 ; unqualified # ☹ E0.7 frowning face
+1F62E ; fully-qualified # 😮 E1.0 face with open mouth
+1F62F ; fully-qualified # 😯 E1.0 hushed face
+1F632 ; fully-qualified # 😲 E0.6 astonished face
+1F633 ; fully-qualified # 😳 E0.6 flushed face
+1F97A ; fully-qualified # 🥺 E11.0 pleading face
+1F626 ; fully-qualified # 😦 E1.0 frowning face with open mouth
+1F627 ; fully-qualified # 😧 E1.0 anguished face
+1F628 ; fully-qualified # 😨 E0.6 fearful face
+1F630 ; fully-qualified # 😰 E0.6 anxious face with sweat
+1F625 ; fully-qualified # 😥 E0.6 sad but relieved face
+1F622 ; fully-qualified # 😢 E0.6 crying face
+1F62D ; fully-qualified # 😭 E0.6 loudly crying face
+1F631 ; fully-qualified # 😱 E0.6 face screaming in fear
+1F616 ; fully-qualified # 😖 E0.6 confounded face
+1F623 ; fully-qualified # 😣 E0.6 persevering face
+1F61E ; fully-qualified # 😞 E0.6 disappointed face
+1F613 ; fully-qualified # 😓 E0.6 downcast face with sweat
+1F629 ; fully-qualified # 😩 E0.6 weary face
+1F62B ; fully-qualified # 😫 E0.6 tired face
+1F971 ; fully-qualified # 🥱 E12.0 yawning face
# subgroup: face-negative
-1F624 ; fully-qualified # 😤 face with steam from nose
-1F621 ; fully-qualified # 😡 pouting face
-1F620 ; fully-qualified # 😠 angry face
-1F92C ; fully-qualified # 🤬 face with symbols on mouth
-1F608 ; fully-qualified # 😈 smiling face with horns
-1F47F ; fully-qualified # 👿 angry face with horns
-1F480 ; fully-qualified # 💀 skull
-2620 FE0F ; fully-qualified # ☠️ skull and crossbones
-2620 ; unqualified # ☠ skull and crossbones
+1F624 ; fully-qualified # 😤 E0.6 face with steam from nose
+1F621 ; fully-qualified # 😡 E0.6 pouting face
+1F620 ; fully-qualified # 😠 E0.6 angry face
+1F92C ; fully-qualified # 🤬 E5.0 face with symbols on mouth
+1F608 ; fully-qualified # 😈 E1.0 smiling face with horns
+1F47F ; fully-qualified # 👿 E0.6 angry face with horns
+1F480 ; fully-qualified # 💀 E0.6 skull
+2620 FE0F ; fully-qualified # ☠️ E1.0 skull and crossbones
+2620 ; unqualified # ☠ E1.0 skull and crossbones
# subgroup: face-costume
-1F4A9 ; fully-qualified # 💩 pile of poo
-1F921 ; fully-qualified # 🤡 clown face
-1F479 ; fully-qualified # 👹 ogre
-1F47A ; fully-qualified # 👺 goblin
-1F47B ; fully-qualified # 👻 ghost
-1F47D ; fully-qualified # 👽 alien
-1F47E ; fully-qualified # 👾 alien monster
-1F916 ; fully-qualified # 🤖 robot
+1F4A9 ; fully-qualified # 💩 E0.6 pile of poo
+1F921 ; fully-qualified # 🤡 E3.0 clown face
+1F479 ; fully-qualified # 👹 E0.6 ogre
+1F47A ; fully-qualified # 👺 E0.6 goblin
+1F47B ; fully-qualified # 👻 E0.6 ghost
+1F47D ; fully-qualified # 👽 E0.6 alien
+1F47E ; fully-qualified # 👾 E0.6 alien monster
+1F916 ; fully-qualified # 🤖 E1.0 robot
# subgroup: cat-face
-1F63A ; fully-qualified # 😺 grinning cat
-1F638 ; fully-qualified # 😸 grinning cat with smiling eyes
-1F639 ; fully-qualified # 😹 cat with tears of joy
-1F63B ; fully-qualified # 😻 smiling cat with heart-eyes
-1F63C ; fully-qualified # 😼 cat with wry smile
-1F63D ; fully-qualified # 😽 kissing cat
-1F640 ; fully-qualified # 🙀 weary cat
-1F63F ; fully-qualified # 😿 crying cat
-1F63E ; fully-qualified # 😾 pouting cat
+1F63A ; fully-qualified # 😺 E0.6 grinning cat
+1F638 ; fully-qualified # 😸 E0.6 grinning cat with smiling eyes
+1F639 ; fully-qualified # 😹 E0.6 cat with tears of joy
+1F63B ; fully-qualified # 😻 E0.6 smiling cat with heart-eyes
+1F63C ; fully-qualified # 😼 E0.6 cat with wry smile
+1F63D ; fully-qualified # 😽 E0.6 kissing cat
+1F640 ; fully-qualified # 🙀 E0.6 weary cat
+1F63F ; fully-qualified # 😿 E0.6 crying cat
+1F63E ; fully-qualified # 😾 E0.6 pouting cat
# subgroup: monkey-face
-1F648 ; fully-qualified # 🙈 see-no-evil monkey
-1F649 ; fully-qualified # 🙉 hear-no-evil monkey
-1F64A ; fully-qualified # 🙊 speak-no-evil monkey
+1F648 ; fully-qualified # 🙈 E0.6 see-no-evil monkey
+1F649 ; fully-qualified # 🙉 E0.6 hear-no-evil monkey
+1F64A ; fully-qualified # 🙊 E0.6 speak-no-evil monkey
# subgroup: emotion
-1F48B ; fully-qualified # 💋 kiss mark
-1F48C ; fully-qualified # 💌 love letter
-1F498 ; fully-qualified # 💘 heart with arrow
-1F49D ; fully-qualified # 💝 heart with ribbon
-1F496 ; fully-qualified # 💖 sparkling heart
-1F497 ; fully-qualified # 💗 growing heart
-1F493 ; fully-qualified # 💓 beating heart
-1F49E ; fully-qualified # 💞 revolving hearts
-1F495 ; fully-qualified # 💕 two hearts
-1F49F ; fully-qualified # 💟 heart decoration
-2763 FE0F ; fully-qualified # ❣️ heart exclamation
-2763 ; unqualified # ❣ heart exclamation
-1F494 ; fully-qualified # 💔 broken heart
-2764 FE0F ; fully-qualified # ❤️ red heart
-2764 ; unqualified # ❤ red heart
-1F9E1 ; fully-qualified # 🧡 orange heart
-1F49B ; fully-qualified # 💛 yellow heart
-1F49A ; fully-qualified # 💚 green heart
-1F499 ; fully-qualified # 💙 blue heart
-1F49C ; fully-qualified # 💜 purple heart
-1F90E ; fully-qualified # 🤎 brown heart
-1F5A4 ; fully-qualified # 🖤 black heart
-1F90D ; fully-qualified # 🤍 white heart
-1F4AF ; fully-qualified # 💯 hundred points
-1F4A2 ; fully-qualified # 💢 anger symbol
-1F4A5 ; fully-qualified # 💥 collision
-1F4AB ; fully-qualified # 💫 dizzy
-1F4A6 ; fully-qualified # 💦 sweat droplets
-1F4A8 ; fully-qualified # 💨 dashing away
-1F573 FE0F ; fully-qualified # 🕳️ hole
-1F573 ; unqualified # 🕳 hole
-1F4A3 ; fully-qualified # 💣 bomb
-1F4AC ; fully-qualified # 💬 speech balloon
-1F441 FE0F 200D 1F5E8 FE0F ; fully-qualified # 👁️🗨️ eye in speech bubble
-1F441 FE0F 200D 1F5E8 ; minimally-qualified # 👁️🗨 eye in speech bubble
-1F441 200D 1F5E8 ; unqualified # 👁🗨 eye in speech bubble
-1F5E8 FE0F ; fully-qualified # 🗨️ left speech bubble
-1F5E8 ; unqualified # 🗨 left speech bubble
-1F5EF FE0F ; fully-qualified # 🗯️ right anger bubble
-1F5EF ; unqualified # 🗯 right anger bubble
-1F4AD ; fully-qualified # 💭 thought balloon
-1F4A4 ; fully-qualified # 💤 zzz
+1F48B ; fully-qualified # 💋 E0.6 kiss mark
+1F48C ; fully-qualified # 💌 E0.6 love letter
+1F498 ; fully-qualified # 💘 E0.6 heart with arrow
+1F49D ; fully-qualified # 💝 E0.6 heart with ribbon
+1F496 ; fully-qualified # 💖 E0.6 sparkling heart
+1F497 ; fully-qualified # 💗 E0.6 growing heart
+1F493 ; fully-qualified # 💓 E0.6 beating heart
+1F49E ; fully-qualified # 💞 E0.6 revolving hearts
+1F495 ; fully-qualified # 💕 E0.6 two hearts
+1F49F ; fully-qualified # 💟 E0.6 heart decoration
+2763 FE0F ; fully-qualified # ❣️ E1.0 heart exclamation
+2763 ; unqualified # ❣ E1.0 heart exclamation
+1F494 ; fully-qualified # 💔 E0.6 broken heart
+2764 FE0F ; fully-qualified # ❤️ E0.6 red heart
+2764 ; unqualified # ❤ E0.6 red heart
+1F9E1 ; fully-qualified # 🧡 E5.0 orange heart
+1F49B ; fully-qualified # 💛 E0.6 yellow heart
+1F49A ; fully-qualified # 💚 E0.6 green heart
+1F499 ; fully-qualified # 💙 E0.6 blue heart
+1F49C ; fully-qualified # 💜 E0.6 purple heart
+1F90E ; fully-qualified # 🤎 E12.0 brown heart
+1F5A4 ; fully-qualified # 🖤 E3.0 black heart
+1F90D ; fully-qualified # 🤍 E12.0 white heart
+1F4AF ; fully-qualified # 💯 E0.6 hundred points
+1F4A2 ; fully-qualified # 💢 E0.6 anger symbol
+1F4A5 ; fully-qualified # 💥 E0.6 collision
+1F4AB ; fully-qualified # 💫 E0.6 dizzy
+1F4A6 ; fully-qualified # 💦 E0.6 sweat droplets
+1F4A8 ; fully-qualified # 💨 E0.6 dashing away
+1F573 FE0F ; fully-qualified # 🕳️ E0.7 hole
+1F573 ; unqualified # 🕳 E0.7 hole
+1F4A3 ; fully-qualified # 💣 E0.6 bomb
+1F4AC ; fully-qualified # 💬 E0.6 speech balloon
+1F441 FE0F 200D 1F5E8 FE0F ; fully-qualified # 👁️🗨️ E2.0 eye in speech bubble
+1F441 200D 1F5E8 FE0F ; unqualified # 👁🗨️ E2.0 eye in speech bubble
+1F441 FE0F 200D 1F5E8 ; unqualified # 👁️🗨 E2.0 eye in speech bubble
+1F441 200D 1F5E8 ; unqualified # 👁🗨 E2.0 eye in speech bubble
+1F5E8 FE0F ; fully-qualified # 🗨️ E2.0 left speech bubble
+1F5E8 ; unqualified # 🗨 E2.0 left speech bubble
+1F5EF FE0F ; fully-qualified # 🗯️ E0.7 right anger bubble
+1F5EF ; unqualified # 🗯 E0.7 right anger bubble
+1F4AD ; fully-qualified # 💭 E1.0 thought balloon
+1F4A4 ; fully-qualified # 💤 E0.6 zzz
+
+# Smileys & Emotion subtotal: 162
+# Smileys & Emotion subtotal: 162 w/o modifiers
# group: People & Body
# subgroup: hand-fingers-open
-1F44B ; fully-qualified # 👋 waving hand
-1F44B 1F3FB ; fully-qualified # 👋🏻 waving hand: light skin tone
-1F44B 1F3FC ; fully-qualified # 👋🏼 waving hand: medium-light skin tone
-1F44B 1F3FD ; fully-qualified # 👋🏽 waving hand: medium skin tone
-1F44B 1F3FE ; fully-qualified # 👋🏾 waving hand: medium-dark skin tone
-1F44B 1F3FF ; fully-qualified # 👋🏿 waving hand: dark skin tone
-1F91A ; fully-qualified # 🤚 raised back of hand
-1F91A 1F3FB ; fully-qualified # 🤚🏻 raised back of hand: light skin tone
-1F91A 1F3FC ; fully-qualified # 🤚🏼 raised back of hand: medium-light skin tone
-1F91A 1F3FD ; fully-qualified # 🤚🏽 raised back of hand: medium skin tone
-1F91A 1F3FE ; fully-qualified # 🤚🏾 raised back of hand: medium-dark skin tone
-1F91A 1F3FF ; fully-qualified # 🤚🏿 raised back of hand: dark skin tone
-1F590 FE0F ; fully-qualified # 🖐️ hand with fingers splayed
-1F590 ; unqualified # 🖐 hand with fingers splayed
-1F590 1F3FB ; fully-qualified # 🖐🏻 hand with fingers splayed: light skin tone
-1F590 1F3FC ; fully-qualified # 🖐🏼 hand with fingers splayed: medium-light skin tone
-1F590 1F3FD ; fully-qualified # 🖐🏽 hand with fingers splayed: medium skin tone
-1F590 1F3FE ; fully-qualified # 🖐🏾 hand with fingers splayed: medium-dark skin tone
-1F590 1F3FF ; fully-qualified # 🖐🏿 hand with fingers splayed: dark skin tone
-270B ; fully-qualified # ✋ raised hand
-270B 1F3FB ; fully-qualified # ✋🏻 raised hand: light skin tone
-270B 1F3FC ; fully-qualified # ✋🏼 raised hand: medium-light skin tone
-270B 1F3FD ; fully-qualified # ✋🏽 raised hand: medium skin tone
-270B 1F3FE ; fully-qualified # ✋🏾 raised hand: medium-dark skin tone
-270B 1F3FF ; fully-qualified # ✋🏿 raised hand: dark skin tone
-1F596 ; fully-qualified # 🖖 vulcan salute
-1F596 1F3FB ; fully-qualified # 🖖🏻 vulcan salute: light skin tone
-1F596 1F3FC ; fully-qualified # 🖖🏼 vulcan salute: medium-light skin tone
-1F596 1F3FD ; fully-qualified # 🖖🏽 vulcan salute: medium skin tone
-1F596 1F3FE ; fully-qualified # 🖖🏾 vulcan salute: medium-dark skin tone
-1F596 1F3FF ; fully-qualified # 🖖🏿 vulcan salute: dark skin tone
+1F44B ; fully-qualified # 👋 E0.6 waving hand
+1F44B 1F3FB ; fully-qualified # 👋🏻 E1.0 waving hand: light skin tone
+1F44B 1F3FC ; fully-qualified # 👋🏼 E1.0 waving hand: medium-light skin tone
+1F44B 1F3FD ; fully-qualified # 👋🏽 E1.0 waving hand: medium skin tone
+1F44B 1F3FE ; fully-qualified # 👋🏾 E1.0 waving hand: medium-dark skin tone
+1F44B 1F3FF ; fully-qualified # 👋🏿 E1.0 waving hand: dark skin tone
+1F91A ; fully-qualified # 🤚 E3.0 raised back of hand
+1F91A 1F3FB ; fully-qualified # 🤚🏻 E3.0 raised back of hand: light skin tone
+1F91A 1F3FC ; fully-qualified # 🤚🏼 E3.0 raised back of hand: medium-light skin tone
+1F91A 1F3FD ; fully-qualified # 🤚🏽 E3.0 raised back of hand: medium skin tone
+1F91A 1F3FE ; fully-qualified # 🤚🏾 E3.0 raised back of hand: medium-dark skin tone
+1F91A 1F3FF ; fully-qualified # 🤚🏿 E3.0 raised back of hand: dark skin tone
+1F590 FE0F ; fully-qualified # 🖐️ E0.7 hand with fingers splayed
+1F590 ; unqualified # 🖐 E0.7 hand with fingers splayed
+1F590 1F3FB ; fully-qualified # 🖐🏻 E1.0 hand with fingers splayed: light skin tone
+1F590 1F3FC ; fully-qualified # 🖐🏼 E1.0 hand with fingers splayed: medium-light skin tone
+1F590 1F3FD ; fully-qualified # 🖐🏽 E1.0 hand with fingers splayed: medium skin tone
+1F590 1F3FE ; fully-qualified # 🖐🏾 E1.0 hand with fingers splayed: medium-dark skin tone
+1F590 1F3FF ; fully-qualified # 🖐🏿 E1.0 hand with fingers splayed: dark skin tone
+270B ; fully-qualified # ✋ E0.6 raised hand
+270B 1F3FB ; fully-qualified # ✋🏻 E1.0 raised hand: light skin tone
+270B 1F3FC ; fully-qualified # ✋🏼 E1.0 raised hand: medium-light skin tone
+270B 1F3FD ; fully-qualified # ✋🏽 E1.0 raised hand: medium skin tone
+270B 1F3FE ; fully-qualified # ✋🏾 E1.0 raised hand: medium-dark skin tone
+270B 1F3FF ; fully-qualified # ✋🏿 E1.0 raised hand: dark skin tone
+1F596 ; fully-qualified # 🖖 E1.0 vulcan salute
+1F596 1F3FB ; fully-qualified # 🖖🏻 E1.0 vulcan salute: light skin tone
+1F596 1F3FC ; fully-qualified # 🖖🏼 E1.0 vulcan salute: medium-light skin tone
+1F596 1F3FD ; fully-qualified # 🖖🏽 E1.0 vulcan salute: medium skin tone
+1F596 1F3FE ; fully-qualified # 🖖🏾 E1.0 vulcan salute: medium-dark skin tone
+1F596 1F3FF ; fully-qualified # 🖖🏿 E1.0 vulcan salute: dark skin tone
# subgroup: hand-fingers-partial
-1F44C ; fully-qualified # 👌 OK hand
-1F90C 1F3FB ; fully-qualified # 🤌🏻 pinched fingers: light skin tone
-1F90C 1F3FC ; fully-qualified # 🤌🏼 pinched fingers: medium-light skin tone
-1F90C 1F3FD ; fully-qualified # 🤌🏽 pinched fingers: medium skin tone
-1F90C 1F3FE ; fully-qualified # 🤌🏾 pinched fingers: medium-dark skin tone
-1F90C 1F3FF ; fully-qualified # 🤌🏿 pinched fingers: dark skin tone
-1F44C 1F3FB ; fully-qualified # 👌🏻 OK hand: light skin tone
-1F44C 1F3FC ; fully-qualified # 👌🏼 OK hand: medium-light skin tone
-1F44C 1F3FD ; fully-qualified # 👌🏽 OK hand: medium skin tone
-1F44C 1F3FE ; fully-qualified # 👌🏾 OK hand: medium-dark skin tone
-1F44C 1F3FF ; fully-qualified # 👌🏿 OK hand: dark skin tone
-1F90C ; fully-qualified # 🤌 pinched fingers
-1F90F ; fully-qualified # 🤏 pinching hand
-1F90F 1F3FB ; fully-qualified # 🤏🏻 pinching hand: light skin tone
-1F90F 1F3FC ; fully-qualified # 🤏🏼 pinching hand: medium-light skin tone
-1F90F 1F3FD ; fully-qualified # 🤏🏽 pinching hand: medium skin tone
-1F90F 1F3FE ; fully-qualified # 🤏🏾 pinching hand: medium-dark skin tone
-1F90F 1F3FF ; fully-qualified # 🤏🏿 pinching hand: dark skin tone
-270C FE0F ; fully-qualified # ✌️ victory hand
-270C ; unqualified # ✌ victory hand
-270C 1F3FB ; fully-qualified # ✌🏻 victory hand: light skin tone
-270C 1F3FC ; fully-qualified # ✌🏼 victory hand: medium-light skin tone
-270C 1F3FD ; fully-qualified # ✌🏽 victory hand: medium skin tone
-270C 1F3FE ; fully-qualified # ✌🏾 victory hand: medium-dark skin tone
-270C 1F3FF ; fully-qualified # ✌🏿 victory hand: dark skin tone
-1F91E ; fully-qualified # 🤞 crossed fingers
-1F91E 1F3FB ; fully-qualified # 🤞🏻 crossed fingers: light skin tone
-1F91E 1F3FC ; fully-qualified # 🤞🏼 crossed fingers: medium-light skin tone
-1F91E 1F3FD ; fully-qualified # 🤞🏽 crossed fingers: medium skin tone
-1F91E 1F3FE ; fully-qualified # 🤞🏾 crossed fingers: medium-dark skin tone
-1F91E 1F3FF ; fully-qualified # 🤞🏿 crossed fingers: dark skin tone
-1F91F ; fully-qualified # 🤟 love-you gesture
-1F91F 1F3FB ; fully-qualified # 🤟🏻 love-you gesture: light skin tone
-1F91F 1F3FC ; fully-qualified # 🤟🏼 love-you gesture: medium-light skin tone
-1F91F 1F3FD ; fully-qualified # 🤟🏽 love-you gesture: medium skin tone
-1F91F 1F3FE ; fully-qualified # 🤟🏾 love-you gesture: medium-dark skin tone
-1F91F 1F3FF ; fully-qualified # 🤟🏿 love-you gesture: dark skin tone
-1F918 ; fully-qualified # 🤘 sign of the horns
-1F918 1F3FB ; fully-qualified # 🤘🏻 sign of the horns: light skin tone
-1F918 1F3FC ; fully-qualified # 🤘🏼 sign of the horns: medium-light skin tone
-1F918 1F3FD ; fully-qualified # 🤘🏽 sign of the horns: medium skin tone
-1F918 1F3FE ; fully-qualified # 🤘🏾 sign of the horns: medium-dark skin tone
-1F918 1F3FF ; fully-qualified # 🤘🏿 sign of the horns: dark skin tone
-1F919 ; fully-qualified # 🤙 call me hand
-1F919 1F3FB ; fully-qualified # 🤙🏻 call me hand: light skin tone
-1F919 1F3FC ; fully-qualified # 🤙🏼 call me hand: medium-light skin tone
-1F919 1F3FD ; fully-qualified # 🤙🏽 call me hand: medium skin tone
-1F919 1F3FE ; fully-qualified # 🤙🏾 call me hand: medium-dark skin tone
-1F919 1F3FF ; fully-qualified # 🤙🏿 call me hand: dark skin tone
+1F44C ; fully-qualified # 👌 E0.6 OK hand
+1F44C 1F3FB ; fully-qualified # 👌🏻 E1.0 OK hand: light skin tone
+1F44C 1F3FC ; fully-qualified # 👌🏼 E1.0 OK hand: medium-light skin tone
+1F44C 1F3FD ; fully-qualified # 👌🏽 E1.0 OK hand: medium skin tone
+1F44C 1F3FE ; fully-qualified # 👌🏾 E1.0 OK hand: medium-dark skin tone
+1F44C 1F3FF ; fully-qualified # 👌🏿 E1.0 OK hand: dark skin tone
+1F90C ; fully-qualified # 🤌 E13.0 pinched fingers
+1F90C 1F3FB ; fully-qualified # 🤌🏻 E13.0 pinched fingers: light skin tone
+1F90C 1F3FC ; fully-qualified # 🤌🏼 E13.0 pinched fingers: medium-light skin tone
+1F90C 1F3FD ; fully-qualified # 🤌🏽 E13.0 pinched fingers: medium skin tone
+1F90C 1F3FE ; fully-qualified # 🤌🏾 E13.0 pinched fingers: medium-dark skin tone
+1F90C 1F3FF ; fully-qualified # 🤌🏿 E13.0 pinched fingers: dark skin tone
+1F90F ; fully-qualified # 🤏 E12.0 pinching hand
+1F90F 1F3FB ; fully-qualified # 🤏🏻 E12.0 pinching hand: light skin tone
+1F90F 1F3FC ; fully-qualified # 🤏🏼 E12.0 pinching hand: medium-light skin tone
+1F90F 1F3FD ; fully-qualified # 🤏🏽 E12.0 pinching hand: medium skin tone
+1F90F 1F3FE ; fully-qualified # 🤏🏾 E12.0 pinching hand: medium-dark skin tone
+1F90F 1F3FF ; fully-qualified # 🤏🏿 E12.0 pinching hand: dark skin tone
+270C FE0F ; fully-qualified # ✌️ E0.6 victory hand
+270C ; unqualified # ✌ E0.6 victory hand
+270C 1F3FB ; fully-qualified # ✌🏻 E1.0 victory hand: light skin tone
+270C 1F3FC ; fully-qualified # ✌🏼 E1.0 victory hand: medium-light skin tone
+270C 1F3FD ; fully-qualified # ✌🏽 E1.0 victory hand: medium skin tone
+270C 1F3FE ; fully-qualified # ✌🏾 E1.0 victory hand: medium-dark skin tone
+270C 1F3FF ; fully-qualified # ✌🏿 E1.0 victory hand: dark skin tone
+1F91E ; fully-qualified # 🤞 E3.0 crossed fingers
+1F91E 1F3FB ; fully-qualified # 🤞🏻 E3.0 crossed fingers: light skin tone
+1F91E 1F3FC ; fully-qualified # 🤞🏼 E3.0 crossed fingers: medium-light skin tone
+1F91E 1F3FD ; fully-qualified # 🤞🏽 E3.0 crossed fingers: medium skin tone
+1F91E 1F3FE ; fully-qualified # 🤞🏾 E3.0 crossed fingers: medium-dark skin tone
+1F91E 1F3FF ; fully-qualified # 🤞🏿 E3.0 crossed fingers: dark skin tone
+1F91F ; fully-qualified # 🤟 E5.0 love-you gesture
+1F91F 1F3FB ; fully-qualified # 🤟🏻 E5.0 love-you gesture: light skin tone
+1F91F 1F3FC ; fully-qualified # 🤟🏼 E5.0 love-you gesture: medium-light skin tone
+1F91F 1F3FD ; fully-qualified # 🤟🏽 E5.0 love-you gesture: medium skin tone
+1F91F 1F3FE ; fully-qualified # 🤟🏾 E5.0 love-you gesture: medium-dark skin tone
+1F91F 1F3FF ; fully-qualified # 🤟🏿 E5.0 love-you gesture: dark skin tone
+1F918 ; fully-qualified # 🤘 E1.0 sign of the horns
+1F918 1F3FB ; fully-qualified # 🤘🏻 E1.0 sign of the horns: light skin tone
+1F918 1F3FC ; fully-qualified # 🤘🏼 E1.0 sign of the horns: medium-light skin tone
+1F918 1F3FD ; fully-qualified # 🤘🏽 E1.0 sign of the horns: medium skin tone
+1F918 1F3FE ; fully-qualified # 🤘🏾 E1.0 sign of the horns: medium-dark skin tone
+1F918 1F3FF ; fully-qualified # 🤘🏿 E1.0 sign of the horns: dark skin tone
+1F919 ; fully-qualified # 🤙 E3.0 call me hand
+1F919 1F3FB ; fully-qualified # 🤙🏻 E3.0 call me hand: light skin tone
+1F919 1F3FC ; fully-qualified # 🤙🏼 E3.0 call me hand: medium-light skin tone
+1F919 1F3FD ; fully-qualified # 🤙🏽 E3.0 call me hand: medium skin tone
+1F919 1F3FE ; fully-qualified # 🤙🏾 E3.0 call me hand: medium-dark skin tone
+1F919 1F3FF ; fully-qualified # 🤙🏿 E3.0 call me hand: dark skin tone
# subgroup: hand-single-finger
-1F448 ; fully-qualified # 👈 backhand index pointing left
-1F448 1F3FB ; fully-qualified # 👈🏻 backhand index pointing left: light skin tone
-1F448 1F3FC ; fully-qualified # 👈🏼 backhand index pointing left: medium-light skin tone
-1F448 1F3FD ; fully-qualified # 👈🏽 backhand index pointing left: medium skin tone
-1F448 1F3FE ; fully-qualified # 👈🏾 backhand index pointing left: medium-dark skin tone
-1F448 1F3FF ; fully-qualified # 👈🏿 backhand index pointing left: dark skin tone
-1F449 ; fully-qualified # 👉 backhand index pointing right
-1F449 1F3FB ; fully-qualified # 👉🏻 backhand index pointing right: light skin tone
-1F449 1F3FC ; fully-qualified # 👉🏼 backhand index pointing right: medium-light skin tone
-1F449 1F3FD ; fully-qualified # 👉🏽 backhand index pointing right: medium skin tone
-1F449 1F3FE ; fully-qualified # 👉🏾 backhand index pointing right: medium-dark skin tone
-1F449 1F3FF ; fully-qualified # 👉🏿 backhand index pointing right: dark skin tone
-1F446 ; fully-qualified # 👆 backhand index pointing up
-1F446 1F3FB ; fully-qualified # 👆🏻 backhand index pointing up: light skin tone
-1F446 1F3FC ; fully-qualified # 👆🏼 backhand index pointing up: medium-light skin tone
-1F446 1F3FD ; fully-qualified # 👆🏽 backhand index pointing up: medium skin tone
-1F446 1F3FE ; fully-qualified # 👆🏾 backhand index pointing up: medium-dark skin tone
-1F446 1F3FF ; fully-qualified # 👆🏿 backhand index pointing up: dark skin tone
-1F595 ; fully-qualified # 🖕 middle finger
-1F595 1F3FB ; fully-qualified # 🖕🏻 middle finger: light skin tone
-1F595 1F3FC ; fully-qualified # 🖕🏼 middle finger: medium-light skin tone
-1F595 1F3FD ; fully-qualified # 🖕🏽 middle finger: medium skin tone
-1F595 1F3FE ; fully-qualified # 🖕🏾 middle finger: medium-dark skin tone
-1F595 1F3FF ; fully-qualified # 🖕🏿 middle finger: dark skin tone
-1F447 ; fully-qualified # 👇 backhand index pointing down
-1F447 1F3FB ; fully-qualified # 👇🏻 backhand index pointing down: light skin tone
-1F447 1F3FC ; fully-qualified # 👇🏼 backhand index pointing down: medium-light skin tone
-1F447 1F3FD ; fully-qualified # 👇🏽 backhand index pointing down: medium skin tone
-1F447 1F3FE ; fully-qualified # 👇🏾 backhand index pointing down: medium-dark skin tone
-1F447 1F3FF ; fully-qualified # 👇🏿 backhand index pointing down: dark skin tone
-261D FE0F ; fully-qualified # ☝️ index pointing up
-261D ; unqualified # ☝ index pointing up
-261D 1F3FB ; fully-qualified # ☝🏻 index pointing up: light skin tone
-261D 1F3FC ; fully-qualified # ☝🏼 index pointing up: medium-light skin tone
-261D 1F3FD ; fully-qualified # ☝🏽 index pointing up: medium skin tone
-261D 1F3FE ; fully-qualified # ☝🏾 index pointing up: medium-dark skin tone
-261D 1F3FF ; fully-qualified # ☝🏿 index pointing up: dark skin tone
+1F448 ; fully-qualified # 👈 E0.6 backhand index pointing left
+1F448 1F3FB ; fully-qualified # 👈🏻 E1.0 backhand index pointing left: light skin tone
+1F448 1F3FC ; fully-qualified # 👈🏼 E1.0 backhand index pointing left: medium-light skin tone
+1F448 1F3FD ; fully-qualified # 👈🏽 E1.0 backhand index pointing left: medium skin tone
+1F448 1F3FE ; fully-qualified # 👈🏾 E1.0 backhand index pointing left: medium-dark skin tone
+1F448 1F3FF ; fully-qualified # 👈🏿 E1.0 backhand index pointing left: dark skin tone
+1F449 ; fully-qualified # 👉 E0.6 backhand index pointing right
+1F449 1F3FB ; fully-qualified # 👉🏻 E1.0 backhand index pointing right: light skin tone
+1F449 1F3FC ; fully-qualified # 👉🏼 E1.0 backhand index pointing right: medium-light skin tone
+1F449 1F3FD ; fully-qualified # 👉🏽 E1.0 backhand index pointing right: medium skin tone
+1F449 1F3FE ; fully-qualified # 👉🏾 E1.0 backhand index pointing right: medium-dark skin tone
+1F449 1F3FF ; fully-qualified # 👉🏿 E1.0 backhand index pointing right: dark skin tone
+1F446 ; fully-qualified # 👆 E0.6 backhand index pointing up
+1F446 1F3FB ; fully-qualified # 👆🏻 E1.0 backhand index pointing up: light skin tone
+1F446 1F3FC ; fully-qualified # 👆🏼 E1.0 backhand index pointing up: medium-light skin tone
+1F446 1F3FD ; fully-qualified # 👆🏽 E1.0 backhand index pointing up: medium skin tone
+1F446 1F3FE ; fully-qualified # 👆🏾 E1.0 backhand index pointing up: medium-dark skin tone
+1F446 1F3FF ; fully-qualified # 👆🏿 E1.0 backhand index pointing up: dark skin tone
+1F595 ; fully-qualified # 🖕 E1.0 middle finger
+1F595 1F3FB ; fully-qualified # 🖕🏻 E1.0 middle finger: light skin tone
+1F595 1F3FC ; fully-qualified # 🖕🏼 E1.0 middle finger: medium-light skin tone
+1F595 1F3FD ; fully-qualified # 🖕🏽 E1.0 middle finger: medium skin tone
+1F595 1F3FE ; fully-qualified # 🖕🏾 E1.0 middle finger: medium-dark skin tone
+1F595 1F3FF ; fully-qualified # 🖕🏿 E1.0 middle finger: dark skin tone
+1F447 ; fully-qualified # 👇 E0.6 backhand index pointing down
+1F447 1F3FB ; fully-qualified # 👇🏻 E1.0 backhand index pointing down: light skin tone
+1F447 1F3FC ; fully-qualified # 👇🏼 E1.0 backhand index pointing down: medium-light skin tone
+1F447 1F3FD ; fully-qualified # 👇🏽 E1.0 backhand index pointing down: medium skin tone
+1F447 1F3FE ; fully-qualified # 👇🏾 E1.0 backhand index pointing down: medium-dark skin tone
+1F447 1F3FF ; fully-qualified # 👇🏿 E1.0 backhand index pointing down: dark skin tone
+261D FE0F ; fully-qualified # ☝️ E0.6 index pointing up
+261D ; unqualified # ☝ E0.6 index pointing up
+261D 1F3FB ; fully-qualified # ☝🏻 E1.0 index pointing up: light skin tone
+261D 1F3FC ; fully-qualified # ☝🏼 E1.0 index pointing up: medium-light skin tone
+261D 1F3FD ; fully-qualified # ☝🏽 E1.0 index pointing up: medium skin tone
+261D 1F3FE ; fully-qualified # ☝🏾 E1.0 index pointing up: medium-dark skin tone
+261D 1F3FF ; fully-qualified # ☝🏿 E1.0 index pointing up: dark skin tone
# subgroup: hand-fingers-closed
-1F44D ; fully-qualified # 👍 thumbs up
-1F44D 1F3FB ; fully-qualified # 👍🏻 thumbs up: light skin tone
-1F44D 1F3FC ; fully-qualified # 👍🏼 thumbs up: medium-light skin tone
-1F44D 1F3FD ; fully-qualified # 👍🏽 thumbs up: medium skin tone
-1F44D 1F3FE ; fully-qualified # 👍🏾 thumbs up: medium-dark skin tone
-1F44D 1F3FF ; fully-qualified # 👍🏿 thumbs up: dark skin tone
-1F44E ; fully-qualified # 👎 thumbs down
-1F44E 1F3FB ; fully-qualified # 👎🏻 thumbs down: light skin tone
-1F44E 1F3FC ; fully-qualified # 👎🏼 thumbs down: medium-light skin tone
-1F44E 1F3FD ; fully-qualified # 👎🏽 thumbs down: medium skin tone
-1F44E 1F3FE ; fully-qualified # 👎🏾 thumbs down: medium-dark skin tone
-1F44E 1F3FF ; fully-qualified # 👎🏿 thumbs down: dark skin tone
-270A ; fully-qualified # ✊ raised fist
-270A 1F3FB ; fully-qualified # ✊🏻 raised fist: light skin tone
-270A 1F3FC ; fully-qualified # ✊🏼 raised fist: medium-light skin tone
-270A 1F3FD ; fully-qualified # ✊🏽 raised fist: medium skin tone
-270A 1F3FE ; fully-qualified # ✊🏾 raised fist: medium-dark skin tone
-270A 1F3FF ; fully-qualified # ✊🏿 raised fist: dark skin tone
-1F44A ; fully-qualified # 👊 oncoming fist
-1F44A 1F3FB ; fully-qualified # 👊🏻 oncoming fist: light skin tone
-1F44A 1F3FC ; fully-qualified # 👊🏼 oncoming fist: medium-light skin tone
-1F44A 1F3FD ; fully-qualified # 👊🏽 oncoming fist: medium skin tone
-1F44A 1F3FE ; fully-qualified # 👊🏾 oncoming fist: medium-dark skin tone
-1F44A 1F3FF ; fully-qualified # 👊🏿 oncoming fist: dark skin tone
-1F91B ; fully-qualified # 🤛 left-facing fist
-1F91B 1F3FB ; fully-qualified # 🤛🏻 left-facing fist: light skin tone
-1F91B 1F3FC ; fully-qualified # 🤛🏼 left-facing fist: medium-light skin tone
-1F91B 1F3FD ; fully-qualified # 🤛🏽 left-facing fist: medium skin tone
-1F91B 1F3FE ; fully-qualified # 🤛🏾 left-facing fist: medium-dark skin tone
-1F91B 1F3FF ; fully-qualified # 🤛🏿 left-facing fist: dark skin tone
-1F91C ; fully-qualified # 🤜 right-facing fist
-1F91C 1F3FB ; fully-qualified # 🤜🏻 right-facing fist: light skin tone
-1F91C 1F3FC ; fully-qualified # 🤜🏼 right-facing fist: medium-light skin tone
-1F91C 1F3FD ; fully-qualified # 🤜🏽 right-facing fist: medium skin tone
-1F91C 1F3FE ; fully-qualified # 🤜🏾 right-facing fist: medium-dark skin tone
-1F91C 1F3FF ; fully-qualified # 🤜🏿 right-facing fist: dark skin tone
+1F44D ; fully-qualified # 👍 E0.6 thumbs up
+1F44D 1F3FB ; fully-qualified # 👍🏻 E1.0 thumbs up: light skin tone
+1F44D 1F3FC ; fully-qualified # 👍🏼 E1.0 thumbs up: medium-light skin tone
+1F44D 1F3FD ; fully-qualified # 👍🏽 E1.0 thumbs up: medium skin tone
+1F44D 1F3FE ; fully-qualified # 👍🏾 E1.0 thumbs up: medium-dark skin tone
+1F44D 1F3FF ; fully-qualified # 👍🏿 E1.0 thumbs up: dark skin tone
+1F44E ; fully-qualified # 👎 E0.6 thumbs down
+1F44E 1F3FB ; fully-qualified # 👎🏻 E1.0 thumbs down: light skin tone
+1F44E 1F3FC ; fully-qualified # 👎🏼 E1.0 thumbs down: medium-light skin tone
+1F44E 1F3FD ; fully-qualified # 👎🏽 E1.0 thumbs down: medium skin tone
+1F44E 1F3FE ; fully-qualified # 👎🏾 E1.0 thumbs down: medium-dark skin tone
+1F44E 1F3FF ; fully-qualified # 👎🏿 E1.0 thumbs down: dark skin tone
+270A ; fully-qualified # ✊ E0.6 raised fist
+270A 1F3FB ; fully-qualified # ✊🏻 E1.0 raised fist: light skin tone
+270A 1F3FC ; fully-qualified # ✊🏼 E1.0 raised fist: medium-light skin tone
+270A 1F3FD ; fully-qualified # ✊🏽 E1.0 raised fist: medium skin tone
+270A 1F3FE ; fully-qualified # ✊🏾 E1.0 raised fist: medium-dark skin tone
+270A 1F3FF ; fully-qualified # ✊🏿 E1.0 raised fist: dark skin tone
+1F44A ; fully-qualified # 👊 E0.6 oncoming fist
+1F44A 1F3FB ; fully-qualified # 👊🏻 E1.0 oncoming fist: light skin tone
+1F44A 1F3FC ; fully-qualified # 👊🏼 E1.0 oncoming fist: medium-light skin tone
+1F44A 1F3FD ; fully-qualified # 👊🏽 E1.0 oncoming fist: medium skin tone
+1F44A 1F3FE ; fully-qualified # 👊🏾 E1.0 oncoming fist: medium-dark skin tone
+1F44A 1F3FF ; fully-qualified # 👊🏿 E1.0 oncoming fist: dark skin tone
+1F91B ; fully-qualified # 🤛 E3.0 left-facing fist
+1F91B 1F3FB ; fully-qualified # 🤛🏻 E3.0 left-facing fist: light skin tone
+1F91B 1F3FC ; fully-qualified # 🤛🏼 E3.0 left-facing fist: medium-light skin tone
+1F91B 1F3FD ; fully-qualified # 🤛🏽 E3.0 left-facing fist: medium skin tone
+1F91B 1F3FE ; fully-qualified # 🤛🏾 E3.0 left-facing fist: medium-dark skin tone
+1F91B 1F3FF ; fully-qualified # 🤛🏿 E3.0 left-facing fist: dark skin tone
+1F91C ; fully-qualified # 🤜 E3.0 right-facing fist
+1F91C 1F3FB ; fully-qualified # 🤜🏻 E3.0 right-facing fist: light skin tone
+1F91C 1F3FC ; fully-qualified # 🤜🏼 E3.0 right-facing fist: medium-light skin tone
+1F91C 1F3FD ; fully-qualified # 🤜🏽 E3.0 right-facing fist: medium skin tone
+1F91C 1F3FE ; fully-qualified # 🤜🏾 E3.0 right-facing fist: medium-dark skin tone
+1F91C 1F3FF ; fully-qualified # 🤜🏿 E3.0 right-facing fist: dark skin tone
# subgroup: hands
-1F44F ; fully-qualified # 👏 clapping hands
-1F44F 1F3FB ; fully-qualified # 👏🏻 clapping hands: light skin tone
-1F44F 1F3FC ; fully-qualified # 👏🏼 clapping hands: medium-light skin tone
-1F44F 1F3FD ; fully-qualified # 👏🏽 clapping hands: medium skin tone
-1F44F 1F3FE ; fully-qualified # 👏🏾 clapping hands: medium-dark skin tone
-1F44F 1F3FF ; fully-qualified # 👏🏿 clapping hands: dark skin tone
-1F64C ; fully-qualified # 🙌 raising hands
-1F64C 1F3FB ; fully-qualified # 🙌🏻 raising hands: light skin tone
-1F64C 1F3FC ; fully-qualified # 🙌🏼 raising hands: medium-light skin tone
-1F64C 1F3FD ; fully-qualified # 🙌🏽 raising hands: medium skin tone
-1F64C 1F3FE ; fully-qualified # 🙌🏾 raising hands: medium-dark skin tone
-1F64C 1F3FF ; fully-qualified # 🙌🏿 raising hands: dark skin tone
-1F450 ; fully-qualified # 👐 open hands
-1F450 1F3FB ; fully-qualified # 👐🏻 open hands: light skin tone
-1F450 1F3FC ; fully-qualified # 👐🏼 open hands: medium-light skin tone
-1F450 1F3FD ; fully-qualified # 👐🏽 open hands: medium skin tone
-1F450 1F3FE ; fully-qualified # 👐🏾 open hands: medium-dark skin tone
-1F450 1F3FF ; fully-qualified # 👐🏿 open hands: dark skin tone
-1F932 ; fully-qualified # 🤲 palms up together
-1F932 1F3FB ; fully-qualified # 🤲🏻 palms up together: light skin tone
-1F932 1F3FC ; fully-qualified # 🤲🏼 palms up together: medium-light skin tone
-1F932 1F3FD ; fully-qualified # 🤲🏽 palms up together: medium skin tone
-1F932 1F3FE ; fully-qualified # 🤲🏾 palms up together: medium-dark skin tone
-1F932 1F3FF ; fully-qualified # 🤲🏿 palms up together: dark skin tone
-1F91D ; fully-qualified # 🤝 handshake
-1F64F ; fully-qualified # 🙏 folded hands
-1F64F 1F3FB ; fully-qualified # 🙏🏻 folded hands: light skin tone
-1F64F 1F3FC ; fully-qualified # 🙏🏼 folded hands: medium-light skin tone
-1F64F 1F3FD ; fully-qualified # 🙏🏽 folded hands: medium skin tone
-1F64F 1F3FE ; fully-qualified # 🙏🏾 folded hands: medium-dark skin tone
-1F64F 1F3FF ; fully-qualified # 🙏🏿 folded hands: dark skin tone
+1F44F ; fully-qualified # 👏 E0.6 clapping hands
+1F44F 1F3FB ; fully-qualified # 👏🏻 E1.0 clapping hands: light skin tone
+1F44F 1F3FC ; fully-qualified # 👏🏼 E1.0 clapping hands: medium-light skin tone
+1F44F 1F3FD ; fully-qualified # 👏🏽 E1.0 clapping hands: medium skin tone
+1F44F 1F3FE ; fully-qualified # 👏🏾 E1.0 clapping hands: medium-dark skin tone
+1F44F 1F3FF ; fully-qualified # 👏🏿 E1.0 clapping hands: dark skin tone
+1F64C ; fully-qualified # 🙌 E0.6 raising hands
+1F64C 1F3FB ; fully-qualified # 🙌🏻 E1.0 raising hands: light skin tone
+1F64C 1F3FC ; fully-qualified # 🙌🏼 E1.0 raising hands: medium-light skin tone
+1F64C 1F3FD ; fully-qualified # 🙌🏽 E1.0 raising hands: medium skin tone
+1F64C 1F3FE ; fully-qualified # 🙌🏾 E1.0 raising hands: medium-dark skin tone
+1F64C 1F3FF ; fully-qualified # 🙌🏿 E1.0 raising hands: dark skin tone
+1F450 ; fully-qualified # 👐 E0.6 open hands
+1F450 1F3FB ; fully-qualified # 👐🏻 E1.0 open hands: light skin tone
+1F450 1F3FC ; fully-qualified # 👐🏼 E1.0 open hands: medium-light skin tone
+1F450 1F3FD ; fully-qualified # 👐🏽 E1.0 open hands: medium skin tone
+1F450 1F3FE ; fully-qualified # 👐🏾 E1.0 open hands: medium-dark skin tone
+1F450 1F3FF ; fully-qualified # 👐🏿 E1.0 open hands: dark skin tone
+1F932 ; fully-qualified # 🤲 E5.0 palms up together
+1F932 1F3FB ; fully-qualified # 🤲🏻 E5.0 palms up together: light skin tone
+1F932 1F3FC ; fully-qualified # 🤲🏼 E5.0 palms up together: medium-light skin tone
+1F932 1F3FD ; fully-qualified # 🤲🏽 E5.0 palms up together: medium skin tone
+1F932 1F3FE ; fully-qualified # 🤲🏾 E5.0 palms up together: medium-dark skin tone
+1F932 1F3FF ; fully-qualified # 🤲🏿 E5.0 palms up together: dark skin tone
+1F91D ; fully-qualified # 🤝 E3.0 handshake
+1F64F ; fully-qualified # 🙏 E0.6 folded hands
+1F64F 1F3FB ; fully-qualified # 🙏🏻 E1.0 folded hands: light skin tone
+1F64F 1F3FC ; fully-qualified # 🙏🏼 E1.0 folded hands: medium-light skin tone
+1F64F 1F3FD ; fully-qualified # 🙏🏽 E1.0 folded hands: medium skin tone
+1F64F 1F3FE ; fully-qualified # 🙏🏾 E1.0 folded hands: medium-dark skin tone
+1F64F 1F3FF ; fully-qualified # 🙏🏿 E1.0 folded hands: dark skin tone
# subgroup: hand-prop
-270D FE0F ; fully-qualified # ✍️ writing hand
-270D ; unqualified # ✍ writing hand
-270D 1F3FB ; fully-qualified # ✍🏻 writing hand: light skin tone
-270D 1F3FC ; fully-qualified # ✍🏼 writing hand: medium-light skin tone
-270D 1F3FD ; fully-qualified # ✍🏽 writing hand: medium skin tone
-270D 1F3FE ; fully-qualified # ✍🏾 writing hand: medium-dark skin tone
-270D 1F3FF ; fully-qualified # ✍🏿 writing hand: dark skin tone
-1F485 ; fully-qualified # 💅 nail polish
-1F485 1F3FB ; fully-qualified # 💅🏻 nail polish: light skin tone
-1F485 1F3FC ; fully-qualified # 💅🏼 nail polish: medium-light skin tone
-1F485 1F3FD ; fully-qualified # 💅🏽 nail polish: medium skin tone
-1F485 1F3FE ; fully-qualified # 💅🏾 nail polish: medium-dark skin tone
-1F485 1F3FF ; fully-qualified # 💅🏿 nail polish: dark skin tone
-1F933 ; fully-qualified # 🤳 selfie
-1F933 1F3FB ; fully-qualified # 🤳🏻 selfie: light skin tone
-1F933 1F3FC ; fully-qualified # 🤳🏼 selfie: medium-light skin tone
-1F933 1F3FD ; fully-qualified # 🤳🏽 selfie: medium skin tone
-1F933 1F3FE ; fully-qualified # 🤳🏾 selfie: medium-dark skin tone
-1F933 1F3FF ; fully-qualified # 🤳🏿 selfie: dark skin tone
+270D FE0F ; fully-qualified # ✍️ E0.7 writing hand
+270D ; unqualified # ✍ E0.7 writing hand
+270D 1F3FB ; fully-qualified # ✍🏻 E1.0 writing hand: light skin tone
+270D 1F3FC ; fully-qualified # ✍🏼 E1.0 writing hand: medium-light skin tone
+270D 1F3FD ; fully-qualified # ✍🏽 E1.0 writing hand: medium skin tone
+270D 1F3FE ; fully-qualified # ✍🏾 E1.0 writing hand: medium-dark skin tone
+270D 1F3FF ; fully-qualified # ✍🏿 E1.0 writing hand: dark skin tone
+1F485 ; fully-qualified # 💅 E0.6 nail polish
+1F485 1F3FB ; fully-qualified # 💅🏻 E1.0 nail polish: light skin tone
+1F485 1F3FC ; fully-qualified # 💅🏼 E1.0 nail polish: medium-light skin tone
+1F485 1F3FD ; fully-qualified # 💅🏽 E1.0 nail polish: medium skin tone
+1F485 1F3FE ; fully-qualified # 💅🏾 E1.0 nail polish: medium-dark skin tone
+1F485 1F3FF ; fully-qualified # 💅🏿 E1.0 nail polish: dark skin tone
+1F933 ; fully-qualified # 🤳 E3.0 selfie
+1F933 1F3FB ; fully-qualified # 🤳🏻 E3.0 selfie: light skin tone
+1F933 1F3FC ; fully-qualified # 🤳🏼 E3.0 selfie: medium-light skin tone
+1F933 1F3FD ; fully-qualified # 🤳🏽 E3.0 selfie: medium skin tone
+1F933 1F3FE ; fully-qualified # 🤳🏾 E3.0 selfie: medium-dark skin tone
+1F933 1F3FF ; fully-qualified # 🤳🏿 E3.0 selfie: dark skin tone
# subgroup: body-parts
-1F4AA ; fully-qualified # 💪 flexed biceps
-1F4AA 1F3FB ; fully-qualified # 💪🏻 flexed biceps: light skin tone
-1F4AA 1F3FC ; fully-qualified # 💪🏼 flexed biceps: medium-light skin tone
-1F4AA 1F3FD ; fully-qualified # 💪🏽 flexed biceps: medium skin tone
-1F4AA 1F3FE ; fully-qualified # 💪🏾 flexed biceps: medium-dark skin tone
-1F4AA 1F3FF ; fully-qualified # 💪🏿 flexed biceps: dark skin tone
-1F9BE ; fully-qualified # 🦾 mechanical arm
-1F9BF ; fully-qualified # 🦿 mechanical leg
-1F9B5 ; fully-qualified # 🦵 leg
-1F9B5 1F3FB ; fully-qualified # 🦵🏻 leg: light skin tone
-1F9B5 1F3FC ; fully-qualified # 🦵🏼 leg: medium-light skin tone
-1F9B5 1F3FD ; fully-qualified # 🦵🏽 leg: medium skin tone
-1F9B5 1F3FE ; fully-qualified # 🦵🏾 leg: medium-dark skin tone
-1F9B5 1F3FF ; fully-qualified # 🦵🏿 leg: dark skin tone
-1F9B6 ; fully-qualified # 🦶 foot
-1F9B6 1F3FB ; fully-qualified # 🦶🏻 foot: light skin tone
-1F9B6 1F3FC ; fully-qualified # 🦶🏼 foot: medium-light skin tone
-1F9B6 1F3FD ; fully-qualified # 🦶🏽 foot: medium skin tone
-1F9B6 1F3FE ; fully-qualified # 🦶🏾 foot: medium-dark skin tone
-1F9B6 1F3FF ; fully-qualified # 🦶🏿 foot: dark skin tone
-1F442 ; fully-qualified # 👂 ear
-1F442 1F3FB ; fully-qualified # 👂🏻 ear: light skin tone
-1F442 1F3FC ; fully-qualified # 👂🏼 ear: medium-light skin tone
-1F442 1F3FD ; fully-qualified # 👂🏽 ear: medium skin tone
-1F442 1F3FE ; fully-qualified # 👂🏾 ear: medium-dark skin tone
-1F442 1F3FF ; fully-qualified # 👂🏿 ear: dark skin tone
-1F9BB ; fully-qualified # 🦻 ear with hearing aid
-1F9BB 1F3FB ; fully-qualified # 🦻🏻 ear with hearing aid: light skin tone
-1F9BB 1F3FC ; fully-qualified # 🦻🏼 ear with hearing aid: medium-light skin tone
-1F9BB 1F3FD ; fully-qualified # 🦻🏽 ear with hearing aid: medium skin tone
-1F9BB 1F3FE ; fully-qualified # 🦻🏾 ear with hearing aid: medium-dark skin tone
-1F9BB 1F3FF ; fully-qualified # 🦻🏿 ear with hearing aid: dark skin tone
-1F443 ; fully-qualified # 👃 nose
-1F443 1F3FB ; fully-qualified # 👃🏻 nose: light skin tone
-1F443 1F3FC ; fully-qualified # 👃🏼 nose: medium-light skin tone
-1F443 1F3FD ; fully-qualified # 👃🏽 nose: medium skin tone
-1F443 1F3FE ; fully-qualified # 👃🏾 nose: medium-dark skin tone
-1F443 1F3FF ; fully-qualified # 👃🏿 nose: dark skin tone
-1F9E0 ; fully-qualified # 🧠 brain
-1FAC0 ; fully-qualified # 🫀 anatomical heart
-1FAC1 ; fully-qualified # 🫁 lungs
-1F9B7 ; fully-qualified # 🦷 tooth
-1F9B4 ; fully-qualified # 🦴 bone
-1F440 ; fully-qualified # 👀 eyes
-1F441 FE0F ; fully-qualified # 👁️ eye
-1F441 ; unqualified # 👁 eye
-1F445 ; fully-qualified # 👅 tongue
-1F444 ; fully-qualified # 👄 mouth
+1F4AA ; fully-qualified # 💪 E0.6 flexed biceps
+1F4AA 1F3FB ; fully-qualified # 💪🏻 E1.0 flexed biceps: light skin tone
+1F4AA 1F3FC ; fully-qualified # 💪🏼 E1.0 flexed biceps: medium-light skin tone
+1F4AA 1F3FD ; fully-qualified # 💪🏽 E1.0 flexed biceps: medium skin tone
+1F4AA 1F3FE ; fully-qualified # 💪🏾 E1.0 flexed biceps: medium-dark skin tone
+1F4AA 1F3FF ; fully-qualified # 💪🏿 E1.0 flexed biceps: dark skin tone
+1F9BE ; fully-qualified # 🦾 E12.0 mechanical arm
+1F9BF ; fully-qualified # 🦿 E12.0 mechanical leg
+1F9B5 ; fully-qualified # 🦵 E11.0 leg
+1F9B5 1F3FB ; fully-qualified # 🦵🏻 E11.0 leg: light skin tone
+1F9B5 1F3FC ; fully-qualified # 🦵🏼 E11.0 leg: medium-light skin tone
+1F9B5 1F3FD ; fully-qualified # 🦵🏽 E11.0 leg: medium skin tone
+1F9B5 1F3FE ; fully-qualified # 🦵🏾 E11.0 leg: medium-dark skin tone
+1F9B5 1F3FF ; fully-qualified # 🦵🏿 E11.0 leg: dark skin tone
+1F9B6 ; fully-qualified # 🦶 E11.0 foot
+1F9B6 1F3FB ; fully-qualified # 🦶🏻 E11.0 foot: light skin tone
+1F9B6 1F3FC ; fully-qualified # 🦶🏼 E11.0 foot: medium-light skin tone
+1F9B6 1F3FD ; fully-qualified # 🦶🏽 E11.0 foot: medium skin tone
+1F9B6 1F3FE ; fully-qualified # 🦶🏾 E11.0 foot: medium-dark skin tone
+1F9B6 1F3FF ; fully-qualified # 🦶🏿 E11.0 foot: dark skin tone
+1F442 ; fully-qualified # 👂 E0.6 ear
+1F442 1F3FB ; fully-qualified # 👂🏻 E1.0 ear: light skin tone
+1F442 1F3FC ; fully-qualified # 👂🏼 E1.0 ear: medium-light skin tone
+1F442 1F3FD ; fully-qualified # 👂🏽 E1.0 ear: medium skin tone
+1F442 1F3FE ; fully-qualified # 👂🏾 E1.0 ear: medium-dark skin tone
+1F442 1F3FF ; fully-qualified # 👂🏿 E1.0 ear: dark skin tone
+1F9BB ; fully-qualified # 🦻 E12.0 ear with hearing aid
+1F9BB 1F3FB ; fully-qualified # 🦻🏻 E12.0 ear with hearing aid: light skin tone
+1F9BB 1F3FC ; fully-qualified # 🦻🏼 E12.0 ear with hearing aid: medium-light skin tone
+1F9BB 1F3FD ; fully-qualified # 🦻🏽 E12.0 ear with hearing aid: medium skin tone
+1F9BB 1F3FE ; fully-qualified # 🦻🏾 E12.0 ear with hearing aid: medium-dark skin tone
+1F9BB 1F3FF ; fully-qualified # 🦻🏿 E12.0 ear with hearing aid: dark skin tone
+1F443 ; fully-qualified # 👃 E0.6 nose
+1F443 1F3FB ; fully-qualified # 👃🏻 E1.0 nose: light skin tone
+1F443 1F3FC ; fully-qualified # 👃🏼 E1.0 nose: medium-light skin tone
+1F443 1F3FD ; fully-qualified # 👃🏽 E1.0 nose: medium skin tone
+1F443 1F3FE ; fully-qualified # 👃🏾 E1.0 nose: medium-dark skin tone
+1F443 1F3FF ; fully-qualified # 👃🏿 E1.0 nose: dark skin tone
+1F9E0 ; fully-qualified # 🧠 E5.0 brain
+1FAC0 ; fully-qualified # 🫀 E13.0 anatomical heart
+1FAC1 ; fully-qualified # 🫁 E13.0 lungs
+1F9B7 ; fully-qualified # 🦷 E11.0 tooth
+1F9B4 ; fully-qualified # 🦴 E11.0 bone
+1F440 ; fully-qualified # 👀 E0.6 eyes
+1F441 FE0F ; fully-qualified # 👁️ E0.7 eye
+1F441 ; unqualified # 👁 E0.7 eye
+1F445 ; fully-qualified # 👅 E0.6 tongue
+1F444 ; fully-qualified # 👄 E0.6 mouth
# subgroup: person
-1F476 ; fully-qualified # 👶 baby
-1F476 1F3FB ; fully-qualified # 👶🏻 baby: light skin tone
-1F476 1F3FC ; fully-qualified # 👶🏼 baby: medium-light skin tone
-1F476 1F3FD ; fully-qualified # 👶🏽 baby: medium skin tone
-1F476 1F3FE ; fully-qualified # 👶🏾 baby: medium-dark skin tone
-1F476 1F3FF ; fully-qualified # 👶🏿 baby: dark skin tone
-1F9D2 ; fully-qualified # 🧒 child
-1F9D2 1F3FB ; fully-qualified # 🧒🏻 child: light skin tone
-1F9D2 1F3FC ; fully-qualified # 🧒🏼 child: medium-light skin tone
-1F9D2 1F3FD ; fully-qualified # 🧒🏽 child: medium skin tone
-1F9D2 1F3FE ; fully-qualified # 🧒🏾 child: medium-dark skin tone
-1F9D2 1F3FF ; fully-qualified # 🧒🏿 child: dark skin tone
-1F466 ; fully-qualified # 👦 boy
-1F466 1F3FB ; fully-qualified # 👦🏻 boy: light skin tone
-1F466 1F3FC ; fully-qualified # 👦🏼 boy: medium-light skin tone
-1F466 1F3FD ; fully-qualified # 👦🏽 boy: medium skin tone
-1F466 1F3FE ; fully-qualified # 👦🏾 boy: medium-dark skin tone
-1F466 1F3FF ; fully-qualified # 👦🏿 boy: dark skin tone
-1F467 ; fully-qualified # 👧 girl
-1F467 1F3FB ; fully-qualified # 👧🏻 girl: light skin tone
-1F467 1F3FC ; fully-qualified # 👧🏼 girl: medium-light skin tone
-1F467 1F3FD ; fully-qualified # 👧🏽 girl: medium skin tone
-1F467 1F3FE ; fully-qualified # 👧🏾 girl: medium-dark skin tone
-1F467 1F3FF ; fully-qualified # 👧🏿 girl: dark skin tone
-1F9D1 ; fully-qualified # 🧑 person
-1F9D1 1F3FB ; fully-qualified # 🧑🏻 person: light skin tone
-1F9D1 1F3FC ; fully-qualified # 🧑🏼 person: medium-light skin tone
-1F9D1 1F3FD ; fully-qualified # 🧑🏽 person: medium skin tone
-1F9D1 1F3FE ; fully-qualified # 🧑🏾 person: medium-dark skin tone
-1F9D1 1F3FF ; fully-qualified # 🧑🏿 person: dark skin tone
-1F471 ; fully-qualified # 👱 person: blond hair
-1F471 1F3FB ; fully-qualified # 👱🏻 person: light skin tone, blond hair
-1F471 1F3FC ; fully-qualified # 👱🏼 person: medium-light skin tone, blond hair
-1F471 1F3FD ; fully-qualified # 👱🏽 person: medium skin tone, blond hair
-1F471 1F3FE ; fully-qualified # 👱🏾 person: medium-dark skin tone, blond hair
-1F471 1F3FF ; fully-qualified # 👱🏿 person: dark skin tone, blond hair
-1F468 ; fully-qualified # 👨 man
-1F468 1F3FB ; fully-qualified # 👨🏻 man: light skin tone
-1F468 1F3FC ; fully-qualified # 👨🏼 man: medium-light skin tone
-1F468 1F3FD ; fully-qualified # 👨🏽 man: medium skin tone
-1F468 1F3FE ; fully-qualified # 👨🏾 man: medium-dark skin tone
-1F468 1F3FF ; fully-qualified # 👨🏿 man: dark skin tone
-1F9D4 ; fully-qualified # 🧔 man: beard
-1F9D4 1F3FB ; fully-qualified # 🧔🏻 man: light skin tone, beard
-1F9D4 1F3FC ; fully-qualified # 🧔🏼 man: medium-light skin tone, beard
-1F9D4 1F3FD ; fully-qualified # 🧔🏽 man: medium skin tone, beard
-1F9D4 1F3FE ; fully-qualified # 🧔🏾 man: medium-dark skin tone, beard
-1F9D4 1F3FF ; fully-qualified # 🧔🏿 man: dark skin tone, beard
-1F468 200D 1F9B0 ; fully-qualified # 👨🦰 man: red hair
-1F468 1F3FB 200D 1F9B0 ; fully-qualified # 👨🏻🦰 man: light skin tone, red hair
-1F468 1F3FC 200D 1F9B0 ; fully-qualified # 👨🏼🦰 man: medium-light skin tone, red hair
-1F468 1F3FD 200D 1F9B0 ; fully-qualified # 👨🏽🦰 man: medium skin tone, red hair
-1F468 1F3FE 200D 1F9B0 ; fully-qualified # 👨🏾🦰 man: medium-dark skin tone, red hair
-1F468 1F3FF 200D 1F9B0 ; fully-qualified # 👨🏿🦰 man: dark skin tone, red hair
-1F468 200D 1F9B1 ; fully-qualified # 👨🦱 man: curly hair
-1F468 1F3FB 200D 1F9B1 ; fully-qualified # 👨🏻🦱 man: light skin tone, curly hair
-1F468 1F3FC 200D 1F9B1 ; fully-qualified # 👨🏼🦱 man: medium-light skin tone, curly hair
-1F468 1F3FD 200D 1F9B1 ; fully-qualified # 👨🏽🦱 man: medium skin tone, curly hair
-1F468 1F3FE 200D 1F9B1 ; fully-qualified # 👨🏾🦱 man: medium-dark skin tone, curly hair
-1F468 1F3FF 200D 1F9B1 ; fully-qualified # 👨🏿🦱 man: dark skin tone, curly hair
-1F468 200D 1F9B3 ; fully-qualified # 👨🦳 man: white hair
-1F468 1F3FB 200D 1F9B3 ; fully-qualified # 👨🏻🦳 man: light skin tone, white hair
-1F468 1F3FC 200D 1F9B3 ; fully-qualified # 👨🏼🦳 man: medium-light skin tone, white hair
-1F468 1F3FD 200D 1F9B3 ; fully-qualified # 👨🏽🦳 man: medium skin tone, white hair
-1F468 1F3FE 200D 1F9B3 ; fully-qualified # 👨🏾🦳 man: medium-dark skin tone, white hair
-1F468 1F3FF 200D 1F9B3 ; fully-qualified # 👨🏿🦳 man: dark skin tone, white hair
-1F468 200D 1F9B2 ; fully-qualified # 👨🦲 man: bald
-1F468 1F3FB 200D 1F9B2 ; fully-qualified # 👨🏻🦲 man: light skin tone, bald
-1F468 1F3FC 200D 1F9B2 ; fully-qualified # 👨🏼🦲 man: medium-light skin tone, bald
-1F468 1F3FD 200D 1F9B2 ; fully-qualified # 👨🏽🦲 man: medium skin tone, bald
-1F468 1F3FE 200D 1F9B2 ; fully-qualified # 👨🏾🦲 man: medium-dark skin tone, bald
-1F468 1F3FF 200D 1F9B2 ; fully-qualified # 👨🏿🦲 man: dark skin tone, bald
-1F469 ; fully-qualified # 👩 woman
-1F469 1F3FB ; fully-qualified # 👩🏻 woman: light skin tone
-1F469 1F3FC ; fully-qualified # 👩🏼 woman: medium-light skin tone
-1F469 1F3FD ; fully-qualified # 👩🏽 woman: medium skin tone
-1F469 1F3FE ; fully-qualified # 👩🏾 woman: medium-dark skin tone
-1F469 1F3FF ; fully-qualified # 👩🏿 woman: dark skin tone
-1F469 200D 1F9B0 ; fully-qualified # 👩🦰 woman: red hair
-1F469 1F3FB 200D 1F9B0 ; fully-qualified # 👩🏻🦰 woman: light skin tone, red hair
-1F469 1F3FC 200D 1F9B0 ; fully-qualified # 👩🏼🦰 woman: medium-light skin tone, red hair
-1F469 1F3FD 200D 1F9B0 ; fully-qualified # 👩🏽🦰 woman: medium skin tone, red hair
-1F469 1F3FE 200D 1F9B0 ; fully-qualified # 👩🏾🦰 woman: medium-dark skin tone, red hair
-1F469 1F3FF 200D 1F9B0 ; fully-qualified # 👩🏿🦰 woman: dark skin tone, red hair
-1F9D1 200D 1F9B0 ; fully-qualified # 🧑🦰 person: red hair
-1F9D1 1F3FB 200D 1F9B0 ; fully-qualified # 🧑🏻🦰 person: light skin tone, red hair
-1F9D1 1F3FC 200D 1F9B0 ; fully-qualified # 🧑🏼🦰 person: medium-light skin tone, red hair
-1F9D1 1F3FD 200D 1F9B0 ; fully-qualified # 🧑🏽🦰 person: medium skin tone, red hair
-1F9D1 1F3FE 200D 1F9B0 ; fully-qualified # 🧑🏾🦰 person: medium-dark skin tone, red hair
-1F9D1 1F3FF 200D 1F9B0 ; fully-qualified # 🧑🏿🦰 person: dark skin tone, red hair
-1F469 200D 1F9B1 ; fully-qualified # 👩🦱 woman: curly hair
-1F469 1F3FB 200D 1F9B1 ; fully-qualified # 👩🏻🦱 woman: light skin tone, curly hair
-1F469 1F3FC 200D 1F9B1 ; fully-qualified # 👩🏼🦱 woman: medium-light skin tone, curly hair
-1F469 1F3FD 200D 1F9B1 ; fully-qualified # 👩🏽🦱 woman: medium skin tone, curly hair
-1F469 1F3FE 200D 1F9B1 ; fully-qualified # 👩🏾🦱 woman: medium-dark skin tone, curly hair
-1F469 1F3FF 200D 1F9B1 ; fully-qualified # 👩🏿🦱 woman: dark skin tone, curly hair
-1F9D1 200D 1F9B1 ; fully-qualified # 🧑🦱 person: curly hair
-1F9D1 1F3FB 200D 1F9B1 ; fully-qualified # 🧑🏻🦱 person: light skin tone, curly hair
-1F9D1 1F3FC 200D 1F9B1 ; fully-qualified # 🧑🏼🦱 person: medium-light skin tone, curly hair
-1F9D1 1F3FD 200D 1F9B1 ; fully-qualified # 🧑🏽🦱 person: medium skin tone, curly hair
-1F9D1 1F3FE 200D 1F9B1 ; fully-qualified # 🧑🏾🦱 person: medium-dark skin tone, curly hair
-1F9D1 1F3FF 200D 1F9B1 ; fully-qualified # 🧑🏿🦱 person: dark skin tone, curly hair
-1F469 200D 1F9B3 ; fully-qualified # 👩🦳 woman: white hair
-1F469 1F3FB 200D 1F9B3 ; fully-qualified # 👩🏻🦳 woman: light skin tone, white hair
-1F469 1F3FC 200D 1F9B3 ; fully-qualified # 👩🏼🦳 woman: medium-light skin tone, white hair
-1F469 1F3FD 200D 1F9B3 ; fully-qualified # 👩🏽🦳 woman: medium skin tone, white hair
-1F469 1F3FE 200D 1F9B3 ; fully-qualified # 👩🏾🦳 woman: medium-dark skin tone, white hair
-1F469 1F3FF 200D 1F9B3 ; fully-qualified # 👩🏿🦳 woman: dark skin tone, white hair
-1F9D1 200D 1F9B3 ; fully-qualified # 🧑🦳 person: white hair
-1F9D1 1F3FB 200D 1F9B3 ; fully-qualified # 🧑🏻🦳 person: light skin tone, white hair
-1F9D1 1F3FC 200D 1F9B3 ; fully-qualified # 🧑🏼🦳 person: medium-light skin tone, white hair
-1F9D1 1F3FD 200D 1F9B3 ; fully-qualified # 🧑🏽🦳 person: medium skin tone, white hair
-1F9D1 1F3FE 200D 1F9B3 ; fully-qualified # 🧑🏾🦳 person: medium-dark skin tone, white hair
-1F9D1 1F3FF 200D 1F9B3 ; fully-qualified # 🧑🏿🦳 person: dark skin tone, white hair
-1F469 200D 1F9B2 ; fully-qualified # 👩🦲 woman: bald
-1F469 1F3FB 200D 1F9B2 ; fully-qualified # 👩🏻🦲 woman: light skin tone, bald
-1F469 1F3FC 200D 1F9B2 ; fully-qualified # 👩🏼🦲 woman: medium-light skin tone, bald
-1F469 1F3FD 200D 1F9B2 ; fully-qualified # 👩🏽🦲 woman: medium skin tone, bald
-1F469 1F3FE 200D 1F9B2 ; fully-qualified # 👩🏾🦲 woman: medium-dark skin tone, bald
-1F469 1F3FF 200D 1F9B2 ; fully-qualified # 👩🏿🦲 woman: dark skin tone, bald
-1F9D1 200D 1F9B2 ; fully-qualified # 🧑🦲 person: bald
-1F9D1 1F3FB 200D 1F9B2 ; fully-qualified # 🧑🏻🦲 person: light skin tone, bald
-1F9D1 1F3FC 200D 1F9B2 ; fully-qualified # 🧑🏼🦲 person: medium-light skin tone, bald
-1F9D1 1F3FD 200D 1F9B2 ; fully-qualified # 🧑🏽🦲 person: medium skin tone, bald
-1F9D1 1F3FE 200D 1F9B2 ; fully-qualified # 🧑🏾🦲 person: medium-dark skin tone, bald
-1F9D1 1F3FF 200D 1F9B2 ; fully-qualified # 🧑🏿🦲 person: dark skin tone, bald
-1F471 200D 2640 FE0F ; fully-qualified # 👱♀️ woman: blond hair
-1F471 200D 2640 ; minimally-qualified # 👱♀ woman: blond hair
-1F471 1F3FB 200D 2640 FE0F ; fully-qualified # 👱🏻♀️ woman: light skin tone, blond hair
-1F471 1F3FB 200D 2640 ; minimally-qualified # 👱🏻♀ woman: light skin tone, blond hair
-1F471 1F3FC 200D 2640 FE0F ; fully-qualified # 👱🏼♀️ woman: medium-light skin tone, blond hair
-1F471 1F3FC 200D 2640 ; minimally-qualified # 👱🏼♀ woman: medium-light skin tone, blond hair
-1F471 1F3FD 200D 2640 FE0F ; fully-qualified # 👱🏽♀️ woman: medium skin tone, blond hair
-1F471 1F3FD 200D 2640 ; minimally-qualified # 👱🏽♀ woman: medium skin tone, blond hair
-1F471 1F3FE 200D 2640 FE0F ; fully-qualified # 👱🏾♀️ woman: medium-dark skin tone, blond hair
-1F471 1F3FE 200D 2640 ; minimally-qualified # 👱🏾♀ woman: medium-dark skin tone, blond hair
-1F471 1F3FF 200D 2640 FE0F ; fully-qualified # 👱🏿♀️ woman: dark skin tone, blond hair
-1F471 1F3FF 200D 2640 ; minimally-qualified # 👱🏿♀ woman: dark skin tone, blond hair
-1F471 200D 2642 FE0F ; fully-qualified # 👱♂️ man: blond hair
-1F471 200D 2642 ; minimally-qualified # 👱♂ man: blond hair
-1F471 1F3FB 200D 2642 FE0F ; fully-qualified # 👱🏻♂️ man: light skin tone, blond hair
-1F471 1F3FB 200D 2642 ; minimally-qualified # 👱🏻♂ man: light skin tone, blond hair
-1F471 1F3FC 200D 2642 FE0F ; fully-qualified # 👱🏼♂️ man: medium-light skin tone, blond hair
-1F471 1F3FC 200D 2642 ; minimally-qualified # 👱🏼♂ man: medium-light skin tone, blond hair
-1F471 1F3FD 200D 2642 FE0F ; fully-qualified # 👱🏽♂️ man: medium skin tone, blond hair
-1F471 1F3FD 200D 2642 ; minimally-qualified # 👱🏽♂ man: medium skin tone, blond hair
-1F471 1F3FE 200D 2642 FE0F ; fully-qualified # 👱🏾♂️ man: medium-dark skin tone, blond hair
-1F471 1F3FE 200D 2642 ; minimally-qualified # 👱🏾♂ man: medium-dark skin tone, blond hair
-1F471 1F3FF 200D 2642 FE0F ; fully-qualified # 👱🏿♂️ man: dark skin tone, blond hair
-1F471 1F3FF 200D 2642 ; minimally-qualified # 👱🏿♂ man: dark skin tone, blond hair
-1F9D3 ; fully-qualified # 🧓 older person
-1F9D3 1F3FB ; fully-qualified # 🧓🏻 older person: light skin tone
-1F9D3 1F3FC ; fully-qualified # 🧓🏼 older person: medium-light skin tone
-1F9D3 1F3FD ; fully-qualified # 🧓🏽 older person: medium skin tone
-1F9D3 1F3FE ; fully-qualified # 🧓🏾 older person: medium-dark skin tone
-1F9D3 1F3FF ; fully-qualified # 🧓🏿 older person: dark skin tone
-1F474 ; fully-qualified # 👴 old man
-1F474 1F3FB ; fully-qualified # 👴🏻 old man: light skin tone
-1F474 1F3FC ; fully-qualified # 👴🏼 old man: medium-light skin tone
-1F474 1F3FD ; fully-qualified # 👴🏽 old man: medium skin tone
-1F474 1F3FE ; fully-qualified # 👴🏾 old man: medium-dark skin tone
-1F474 1F3FF ; fully-qualified # 👴🏿 old man: dark skin tone
-1F475 ; fully-qualified # 👵 old woman
-1F475 1F3FB ; fully-qualified # 👵🏻 old woman: light skin tone
-1F475 1F3FC ; fully-qualified # 👵🏼 old woman: medium-light skin tone
-1F475 1F3FD ; fully-qualified # 👵🏽 old woman: medium skin tone
-1F475 1F3FE ; fully-qualified # 👵🏾 old woman: medium-dark skin tone
-1F475 1F3FF ; fully-qualified # 👵🏿 old woman: dark skin tone
+1F476 ; fully-qualified # 👶 E0.6 baby
+1F476 1F3FB ; fully-qualified # 👶🏻 E1.0 baby: light skin tone
+1F476 1F3FC ; fully-qualified # 👶🏼 E1.0 baby: medium-light skin tone
+1F476 1F3FD ; fully-qualified # 👶🏽 E1.0 baby: medium skin tone
+1F476 1F3FE ; fully-qualified # 👶🏾 E1.0 baby: medium-dark skin tone
+1F476 1F3FF ; fully-qualified # 👶🏿 E1.0 baby: dark skin tone
+1F9D2 ; fully-qualified # 🧒 E5.0 child
+1F9D2 1F3FB ; fully-qualified # 🧒🏻 E5.0 child: light skin tone
+1F9D2 1F3FC ; fully-qualified # 🧒🏼 E5.0 child: medium-light skin tone
+1F9D2 1F3FD ; fully-qualified # 🧒🏽 E5.0 child: medium skin tone
+1F9D2 1F3FE ; fully-qualified # 🧒🏾 E5.0 child: medium-dark skin tone
+1F9D2 1F3FF ; fully-qualified # 🧒🏿 E5.0 child: dark skin tone
+1F466 ; fully-qualified # 👦 E0.6 boy
+1F466 1F3FB ; fully-qualified # 👦🏻 E1.0 boy: light skin tone
+1F466 1F3FC ; fully-qualified # 👦🏼 E1.0 boy: medium-light skin tone
+1F466 1F3FD ; fully-qualified # 👦🏽 E1.0 boy: medium skin tone
+1F466 1F3FE ; fully-qualified # 👦🏾 E1.0 boy: medium-dark skin tone
+1F466 1F3FF ; fully-qualified # 👦🏿 E1.0 boy: dark skin tone
+1F467 ; fully-qualified # 👧 E0.6 girl
+1F467 1F3FB ; fully-qualified # 👧🏻 E1.0 girl: light skin tone
+1F467 1F3FC ; fully-qualified # 👧🏼 E1.0 girl: medium-light skin tone
+1F467 1F3FD ; fully-qualified # 👧🏽 E1.0 girl: medium skin tone
+1F467 1F3FE ; fully-qualified # 👧🏾 E1.0 girl: medium-dark skin tone
+1F467 1F3FF ; fully-qualified # 👧🏿 E1.0 girl: dark skin tone
+1F9D1 ; fully-qualified # 🧑 E5.0 person
+1F9D1 1F3FB ; fully-qualified # 🧑🏻 E5.0 person: light skin tone
+1F9D1 1F3FC ; fully-qualified # 🧑🏼 E5.0 person: medium-light skin tone
+1F9D1 1F3FD ; fully-qualified # 🧑🏽 E5.0 person: medium skin tone
+1F9D1 1F3FE ; fully-qualified # 🧑🏾 E5.0 person: medium-dark skin tone
+1F9D1 1F3FF ; fully-qualified # 🧑🏿 E5.0 person: dark skin tone
+1F471 ; fully-qualified # 👱 E0.6 person: blond hair
+1F471 1F3FB ; fully-qualified # 👱🏻 E1.0 person: light skin tone, blond hair
+1F471 1F3FC ; fully-qualified # 👱🏼 E1.0 person: medium-light skin tone, blond hair
+1F471 1F3FD ; fully-qualified # 👱🏽 E1.0 person: medium skin tone, blond hair
+1F471 1F3FE ; fully-qualified # 👱🏾 E1.0 person: medium-dark skin tone, blond hair
+1F471 1F3FF ; fully-qualified # 👱🏿 E1.0 person: dark skin tone, blond hair
+1F468 ; fully-qualified # 👨 E0.6 man
+1F468 1F3FB ; fully-qualified # 👨🏻 E1.0 man: light skin tone
+1F468 1F3FC ; fully-qualified # 👨🏼 E1.0 man: medium-light skin tone
+1F468 1F3FD ; fully-qualified # 👨🏽 E1.0 man: medium skin tone
+1F468 1F3FE ; fully-qualified # 👨🏾 E1.0 man: medium-dark skin tone
+1F468 1F3FF ; fully-qualified # 👨🏿 E1.0 man: dark skin tone
+1F9D4 ; fully-qualified # 🧔 E5.0 man: beard
+1F9D4 1F3FB ; fully-qualified # 🧔🏻 E5.0 man: light skin tone, beard
+1F9D4 1F3FC ; fully-qualified # 🧔🏼 E5.0 man: medium-light skin tone, beard
+1F9D4 1F3FD ; fully-qualified # 🧔🏽 E5.0 man: medium skin tone, beard
+1F9D4 1F3FE ; fully-qualified # 🧔🏾 E5.0 man: medium-dark skin tone, beard
+1F9D4 1F3FF ; fully-qualified # 🧔🏿 E5.0 man: dark skin tone, beard
+1F468 200D 1F9B0 ; fully-qualified # 👨🦰 E11.0 man: red hair
+1F468 1F3FB 200D 1F9B0 ; fully-qualified # 👨🏻🦰 E11.0 man: light skin tone, red hair
+1F468 1F3FC 200D 1F9B0 ; fully-qualified # 👨🏼🦰 E11.0 man: medium-light skin tone, red hair
+1F468 1F3FD 200D 1F9B0 ; fully-qualified # 👨🏽🦰 E11.0 man: medium skin tone, red hair
+1F468 1F3FE 200D 1F9B0 ; fully-qualified # 👨🏾🦰 E11.0 man: medium-dark skin tone, red hair
+1F468 1F3FF 200D 1F9B0 ; fully-qualified # 👨🏿🦰 E11.0 man: dark skin tone, red hair
+1F468 200D 1F9B1 ; fully-qualified # 👨🦱 E11.0 man: curly hair
+1F468 1F3FB 200D 1F9B1 ; fully-qualified # 👨🏻🦱 E11.0 man: light skin tone, curly hair
+1F468 1F3FC 200D 1F9B1 ; fully-qualified # 👨🏼🦱 E11.0 man: medium-light skin tone, curly hair
+1F468 1F3FD 200D 1F9B1 ; fully-qualified # 👨🏽🦱 E11.0 man: medium skin tone, curly hair
+1F468 1F3FE 200D 1F9B1 ; fully-qualified # 👨🏾🦱 E11.0 man: medium-dark skin tone, curly hair
+1F468 1F3FF 200D 1F9B1 ; fully-qualified # 👨🏿🦱 E11.0 man: dark skin tone, curly hair
+1F468 200D 1F9B3 ; fully-qualified # 👨🦳 E11.0 man: white hair
+1F468 1F3FB 200D 1F9B3 ; fully-qualified # 👨🏻🦳 E11.0 man: light skin tone, white hair
+1F468 1F3FC 200D 1F9B3 ; fully-qualified # 👨🏼🦳 E11.0 man: medium-light skin tone, white hair
+1F468 1F3FD 200D 1F9B3 ; fully-qualified # 👨🏽🦳 E11.0 man: medium skin tone, white hair
+1F468 1F3FE 200D 1F9B3 ; fully-qualified # 👨🏾🦳 E11.0 man: medium-dark skin tone, white hair
+1F468 1F3FF 200D 1F9B3 ; fully-qualified # 👨🏿🦳 E11.0 man: dark skin tone, white hair
+1F468 200D 1F9B2 ; fully-qualified # 👨🦲 E11.0 man: bald
+1F468 1F3FB 200D 1F9B2 ; fully-qualified # 👨🏻🦲 E11.0 man: light skin tone, bald
+1F468 1F3FC 200D 1F9B2 ; fully-qualified # 👨🏼🦲 E11.0 man: medium-light skin tone, bald
+1F468 1F3FD 200D 1F9B2 ; fully-qualified # 👨🏽🦲 E11.0 man: medium skin tone, bald
+1F468 1F3FE 200D 1F9B2 ; fully-qualified # 👨🏾🦲 E11.0 man: medium-dark skin tone, bald
+1F468 1F3FF 200D 1F9B2 ; fully-qualified # 👨🏿🦲 E11.0 man: dark skin tone, bald
+1F469 ; fully-qualified # 👩 E0.6 woman
+1F469 1F3FB ; fully-qualified # 👩🏻 E1.0 woman: light skin tone
+1F469 1F3FC ; fully-qualified # 👩🏼 E1.0 woman: medium-light skin tone
+1F469 1F3FD ; fully-qualified # 👩🏽 E1.0 woman: medium skin tone
+1F469 1F3FE ; fully-qualified # 👩🏾 E1.0 woman: medium-dark skin tone
+1F469 1F3FF ; fully-qualified # 👩🏿 E1.0 woman: dark skin tone
+1F469 200D 1F9B0 ; fully-qualified # 👩🦰 E11.0 woman: red hair
+1F469 1F3FB 200D 1F9B0 ; fully-qualified # 👩🏻🦰 E11.0 woman: light skin tone, red hair
+1F469 1F3FC 200D 1F9B0 ; fully-qualified # 👩🏼🦰 E11.0 woman: medium-light skin tone, red hair
+1F469 1F3FD 200D 1F9B0 ; fully-qualified # 👩🏽🦰 E11.0 woman: medium skin tone, red hair
+1F469 1F3FE 200D 1F9B0 ; fully-qualified # 👩🏾🦰 E11.0 woman: medium-dark skin tone, red hair
+1F469 1F3FF 200D 1F9B0 ; fully-qualified # 👩🏿🦰 E11.0 woman: dark skin tone, red hair
+1F9D1 200D 1F9B0 ; fully-qualified # 🧑🦰 E12.1 person: red hair
+1F9D1 1F3FB 200D 1F9B0 ; fully-qualified # 🧑🏻🦰 E12.1 person: light skin tone, red hair
+1F9D1 1F3FC 200D 1F9B0 ; fully-qualified # 🧑🏼🦰 E12.1 person: medium-light skin tone, red hair
+1F9D1 1F3FD 200D 1F9B0 ; fully-qualified # 🧑🏽🦰 E12.1 person: medium skin tone, red hair
+1F9D1 1F3FE 200D 1F9B0 ; fully-qualified # 🧑🏾🦰 E12.1 person: medium-dark skin tone, red hair
+1F9D1 1F3FF 200D 1F9B0 ; fully-qualified # 🧑🏿🦰 E12.1 person: dark skin tone, red hair
+1F469 200D 1F9B1 ; fully-qualified # 👩🦱 E11.0 woman: curly hair
+1F469 1F3FB 200D 1F9B1 ; fully-qualified # 👩🏻🦱 E11.0 woman: light skin tone, curly hair
+1F469 1F3FC 200D 1F9B1 ; fully-qualified # 👩🏼🦱 E11.0 woman: medium-light skin tone, curly hair
+1F469 1F3FD 200D 1F9B1 ; fully-qualified # 👩🏽🦱 E11.0 woman: medium skin tone, curly hair
+1F469 1F3FE 200D 1F9B1 ; fully-qualified # 👩🏾🦱 E11.0 woman: medium-dark skin tone, curly hair
+1F469 1F3FF 200D 1F9B1 ; fully-qualified # 👩🏿🦱 E11.0 woman: dark skin tone, curly hair
+1F9D1 200D 1F9B1 ; fully-qualified # 🧑🦱 E12.1 person: curly hair
+1F9D1 1F3FB 200D 1F9B1 ; fully-qualified # 🧑🏻🦱 E12.1 person: light skin tone, curly hair
+1F9D1 1F3FC 200D 1F9B1 ; fully-qualified # 🧑🏼🦱 E12.1 person: medium-light skin tone, curly hair
+1F9D1 1F3FD 200D 1F9B1 ; fully-qualified # 🧑🏽🦱 E12.1 person: medium skin tone, curly hair
+1F9D1 1F3FE 200D 1F9B1 ; fully-qualified # 🧑🏾🦱 E12.1 person: medium-dark skin tone, curly hair
+1F9D1 1F3FF 200D 1F9B1 ; fully-qualified # 🧑🏿🦱 E12.1 person: dark skin tone, curly hair
+1F469 200D 1F9B3 ; fully-qualified # 👩🦳 E11.0 woman: white hair
+1F469 1F3FB 200D 1F9B3 ; fully-qualified # 👩🏻🦳 E11.0 woman: light skin tone, white hair
+1F469 1F3FC 200D 1F9B3 ; fully-qualified # 👩🏼🦳 E11.0 woman: medium-light skin tone, white hair
+1F469 1F3FD 200D 1F9B3 ; fully-qualified # 👩🏽🦳 E11.0 woman: medium skin tone, white hair
+1F469 1F3FE 200D 1F9B3 ; fully-qualified # 👩🏾🦳 E11.0 woman: medium-dark skin tone, white hair
+1F469 1F3FF 200D 1F9B3 ; fully-qualified # 👩🏿🦳 E11.0 woman: dark skin tone, white hair
+1F9D1 200D 1F9B3 ; fully-qualified # 🧑🦳 E12.1 person: white hair
+1F9D1 1F3FB 200D 1F9B3 ; fully-qualified # 🧑🏻🦳 E12.1 person: light skin tone, white hair
+1F9D1 1F3FC 200D 1F9B3 ; fully-qualified # 🧑🏼🦳 E12.1 person: medium-light skin tone, white hair
+1F9D1 1F3FD 200D 1F9B3 ; fully-qualified # 🧑🏽🦳 E12.1 person: medium skin tone, white hair
+1F9D1 1F3FE 200D 1F9B3 ; fully-qualified # 🧑🏾🦳 E12.1 person: medium-dark skin tone, white hair
+1F9D1 1F3FF 200D 1F9B3 ; fully-qualified # 🧑🏿🦳 E12.1 person: dark skin tone, white hair
+1F469 200D 1F9B2 ; fully-qualified # 👩🦲 E11.0 woman: bald
+1F469 1F3FB 200D 1F9B2 ; fully-qualified # 👩🏻🦲 E11.0 woman: light skin tone, bald
+1F469 1F3FC 200D 1F9B2 ; fully-qualified # 👩🏼🦲 E11.0 woman: medium-light skin tone, bald
+1F469 1F3FD 200D 1F9B2 ; fully-qualified # 👩🏽🦲 E11.0 woman: medium skin tone, bald
+1F469 1F3FE 200D 1F9B2 ; fully-qualified # 👩🏾🦲 E11.0 woman: medium-dark skin tone, bald
+1F469 1F3FF 200D 1F9B2 ; fully-qualified # 👩🏿🦲 E11.0 woman: dark skin tone, bald
+1F9D1 200D 1F9B2 ; fully-qualified # 🧑🦲 E12.1 person: bald
+1F9D1 1F3FB 200D 1F9B2 ; fully-qualified # 🧑🏻🦲 E12.1 person: light skin tone, bald
+1F9D1 1F3FC 200D 1F9B2 ; fully-qualified # 🧑🏼🦲 E12.1 person: medium-light skin tone, bald
+1F9D1 1F3FD 200D 1F9B2 ; fully-qualified # 🧑🏽🦲 E12.1 person: medium skin tone, bald
+1F9D1 1F3FE 200D 1F9B2 ; fully-qualified # 🧑🏾🦲 E12.1 person: medium-dark skin tone, bald
+1F9D1 1F3FF 200D 1F9B2 ; fully-qualified # 🧑🏿🦲 E12.1 person: dark skin tone, bald
+1F471 200D 2640 FE0F ; fully-qualified # 👱♀️ E4.0 woman: blond hair
+1F471 200D 2640 ; minimally-qualified # 👱♀ E4.0 woman: blond hair
+1F471 1F3FB 200D 2640 FE0F ; fully-qualified # 👱🏻♀️ E4.0 woman: light skin tone, blond hair
+1F471 1F3FB 200D 2640 ; minimally-qualified # 👱🏻♀ E4.0 woman: light skin tone, blond hair
+1F471 1F3FC 200D 2640 FE0F ; fully-qualified # 👱🏼♀️ E4.0 woman: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2640 ; minimally-qualified # 👱🏼♀ E4.0 woman: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2640 FE0F ; fully-qualified # 👱🏽♀️ E4.0 woman: medium skin tone, blond hair
+1F471 1F3FD 200D 2640 ; minimally-qualified # 👱🏽♀ E4.0 woman: medium skin tone, blond hair
+1F471 1F3FE 200D 2640 FE0F ; fully-qualified # 👱🏾♀️ E4.0 woman: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2640 ; minimally-qualified # 👱🏾♀ E4.0 woman: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2640 FE0F ; fully-qualified # 👱🏿♀️ E4.0 woman: dark skin tone, blond hair
+1F471 1F3FF 200D 2640 ; minimally-qualified # 👱🏿♀ E4.0 woman: dark skin tone, blond hair
+1F471 200D 2642 FE0F ; fully-qualified # 👱♂️ E4.0 man: blond hair
+1F471 200D 2642 ; minimally-qualified # 👱♂ E4.0 man: blond hair
+1F471 1F3FB 200D 2642 FE0F ; fully-qualified # 👱🏻♂️ E4.0 man: light skin tone, blond hair
+1F471 1F3FB 200D 2642 ; minimally-qualified # 👱🏻♂ E4.0 man: light skin tone, blond hair
+1F471 1F3FC 200D 2642 FE0F ; fully-qualified # 👱🏼♂️ E4.0 man: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2642 ; minimally-qualified # 👱🏼♂ E4.0 man: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2642 FE0F ; fully-qualified # 👱🏽♂️ E4.0 man: medium skin tone, blond hair
+1F471 1F3FD 200D 2642 ; minimally-qualified # 👱🏽♂ E4.0 man: medium skin tone, blond hair
+1F471 1F3FE 200D 2642 FE0F ; fully-qualified # 👱🏾♂️ E4.0 man: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2642 ; minimally-qualified # 👱🏾♂ E4.0 man: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2642 FE0F ; fully-qualified # 👱🏿♂️ E4.0 man: dark skin tone, blond hair
+1F471 1F3FF 200D 2642 ; minimally-qualified # 👱🏿♂ E4.0 man: dark skin tone, blond hair
+1F9D3 ; fully-qualified # 🧓 E5.0 older person
+1F9D3 1F3FB ; fully-qualified # 🧓🏻 E5.0 older person: light skin tone
+1F9D3 1F3FC ; fully-qualified # 🧓🏼 E5.0 older person: medium-light skin tone
+1F9D3 1F3FD ; fully-qualified # 🧓🏽 E5.0 older person: medium skin tone
+1F9D3 1F3FE ; fully-qualified # 🧓🏾 E5.0 older person: medium-dark skin tone
+1F9D3 1F3FF ; fully-qualified # 🧓🏿 E5.0 older person: dark skin tone
+1F474 ; fully-qualified # 👴 E0.6 old man
+1F474 1F3FB ; fully-qualified # 👴🏻 E1.0 old man: light skin tone
+1F474 1F3FC ; fully-qualified # 👴🏼 E1.0 old man: medium-light skin tone
+1F474 1F3FD ; fully-qualified # 👴🏽 E1.0 old man: medium skin tone
+1F474 1F3FE ; fully-qualified # 👴🏾 E1.0 old man: medium-dark skin tone
+1F474 1F3FF ; fully-qualified # 👴🏿 E1.0 old man: dark skin tone
+1F475 ; fully-qualified # 👵 E0.6 old woman
+1F475 1F3FB ; fully-qualified # 👵🏻 E1.0 old woman: light skin tone
+1F475 1F3FC ; fully-qualified # 👵🏼 E1.0 old woman: medium-light skin tone
+1F475 1F3FD ; fully-qualified # 👵🏽 E1.0 old woman: medium skin tone
+1F475 1F3FE ; fully-qualified # 👵🏾 E1.0 old woman: medium-dark skin tone
+1F475 1F3FF ; fully-qualified # 👵🏿 E1.0 old woman: dark skin tone
# subgroup: person-gesture
-1F64D ; fully-qualified # 🙍 person frowning
-1F64D 1F3FB ; fully-qualified # 🙍🏻 person frowning: light skin tone
-1F64D 1F3FC ; fully-qualified # 🙍🏼 person frowning: medium-light skin tone
-1F64D 1F3FD ; fully-qualified # 🙍🏽 person frowning: medium skin tone
-1F64D 1F3FE ; fully-qualified # 🙍🏾 person frowning: medium-dark skin tone
-1F64D 1F3FF ; fully-qualified # 🙍🏿 person frowning: dark skin tone
-1F64D 200D 2642 FE0F ; fully-qualified # 🙍♂️ man frowning
-1F64D 200D 2642 ; minimally-qualified # 🙍♂ man frowning
-1F64D 1F3FB 200D 2642 FE0F ; fully-qualified # 🙍🏻♂️ man frowning: light skin tone
-1F64D 1F3FB 200D 2642 ; minimally-qualified # 🙍🏻♂ man frowning: light skin tone
-1F64D 1F3FC 200D 2642 FE0F ; fully-qualified # 🙍🏼♂️ man frowning: medium-light skin tone
-1F64D 1F3FC 200D 2642 ; minimally-qualified # 🙍🏼♂ man frowning: medium-light skin tone
-1F64D 1F3FD 200D 2642 FE0F ; fully-qualified # 🙍🏽♂️ man frowning: medium skin tone
-1F64D 1F3FD 200D 2642 ; minimally-qualified # 🙍🏽♂ man frowning: medium skin tone
-1F64D 1F3FE 200D 2642 FE0F ; fully-qualified # 🙍🏾♂️ man frowning: medium-dark skin tone
-1F64D 1F3FE 200D 2642 ; minimally-qualified # 🙍🏾♂ man frowning: medium-dark skin tone
-1F64D 1F3FF 200D 2642 FE0F ; fully-qualified # 🙍🏿♂️ man frowning: dark skin tone
-1F64D 1F3FF 200D 2642 ; minimally-qualified # 🙍🏿♂ man frowning: dark skin tone
-1F64D 200D 2640 FE0F ; fully-qualified # 🙍♀️ woman frowning
-1F64D 200D 2640 ; minimally-qualified # 🙍♀ woman frowning
-1F64D 1F3FB 200D 2640 FE0F ; fully-qualified # 🙍🏻♀️ woman frowning: light skin tone
-1F64D 1F3FB 200D 2640 ; minimally-qualified # 🙍🏻♀ woman frowning: light skin tone
-1F64D 1F3FC 200D 2640 FE0F ; fully-qualified # 🙍🏼♀️ woman frowning: medium-light skin tone
-1F64D 1F3FC 200D 2640 ; minimally-qualified # 🙍🏼♀ woman frowning: medium-light skin tone
-1F64D 1F3FD 200D 2640 FE0F ; fully-qualified # 🙍🏽♀️ woman frowning: medium skin tone
-1F64D 1F3FD 200D 2640 ; minimally-qualified # 🙍🏽♀ woman frowning: medium skin tone
-1F64D 1F3FE 200D 2640 FE0F ; fully-qualified # 🙍🏾♀️ woman frowning: medium-dark skin tone
-1F64D 1F3FE 200D 2640 ; minimally-qualified # 🙍🏾♀ woman frowning: medium-dark skin tone
-1F64D 1F3FF 200D 2640 FE0F ; fully-qualified # 🙍🏿♀️ woman frowning: dark skin tone
-1F64D 1F3FF 200D 2640 ; minimally-qualified # 🙍🏿♀ woman frowning: dark skin tone
-1F64E ; fully-qualified # 🙎 person pouting
-1F64E 1F3FB ; fully-qualified # 🙎🏻 person pouting: light skin tone
-1F64E 1F3FC ; fully-qualified # 🙎🏼 person pouting: medium-light skin tone
-1F64E 1F3FD ; fully-qualified # 🙎🏽 person pouting: medium skin tone
-1F64E 1F3FE ; fully-qualified # 🙎🏾 person pouting: medium-dark skin tone
-1F64E 1F3FF ; fully-qualified # 🙎🏿 person pouting: dark skin tone
-1F64E 200D 2642 FE0F ; fully-qualified # 🙎♂️ man pouting
-1F64E 200D 2642 ; minimally-qualified # 🙎♂ man pouting
-1F64E 1F3FB 200D 2642 FE0F ; fully-qualified # 🙎🏻♂️ man pouting: light skin tone
-1F64E 1F3FB 200D 2642 ; minimally-qualified # 🙎🏻♂ man pouting: light skin tone
-1F64E 1F3FC 200D 2642 FE0F ; fully-qualified # 🙎🏼♂️ man pouting: medium-light skin tone
-1F64E 1F3FC 200D 2642 ; minimally-qualified # 🙎🏼♂ man pouting: medium-light skin tone
-1F64E 1F3FD 200D 2642 FE0F ; fully-qualified # 🙎🏽♂️ man pouting: medium skin tone
-1F64E 1F3FD 200D 2642 ; minimally-qualified # 🙎🏽♂ man pouting: medium skin tone
-1F64E 1F3FE 200D 2642 FE0F ; fully-qualified # 🙎🏾♂️ man pouting: medium-dark skin tone
-1F64E 1F3FE 200D 2642 ; minimally-qualified # 🙎🏾♂ man pouting: medium-dark skin tone
-1F64E 1F3FF 200D 2642 FE0F ; fully-qualified # 🙎🏿♂️ man pouting: dark skin tone
-1F64E 1F3FF 200D 2642 ; minimally-qualified # 🙎🏿♂ man pouting: dark skin tone
-1F64E 200D 2640 FE0F ; fully-qualified # 🙎♀️ woman pouting
-1F64E 200D 2640 ; minimally-qualified # 🙎♀ woman pouting
-1F64E 1F3FB 200D 2640 FE0F ; fully-qualified # 🙎🏻♀️ woman pouting: light skin tone
-1F64E 1F3FB 200D 2640 ; minimally-qualified # 🙎🏻♀ woman pouting: light skin tone
-1F64E 1F3FC 200D 2640 FE0F ; fully-qualified # 🙎🏼♀️ woman pouting: medium-light skin tone
-1F64E 1F3FC 200D 2640 ; minimally-qualified # 🙎🏼♀ woman pouting: medium-light skin tone
-1F64E 1F3FD 200D 2640 FE0F ; fully-qualified # 🙎🏽♀️ woman pouting: medium skin tone
-1F64E 1F3FD 200D 2640 ; minimally-qualified # 🙎🏽♀ woman pouting: medium skin tone
-1F64E 1F3FE 200D 2640 FE0F ; fully-qualified # 🙎🏾♀️ woman pouting: medium-dark skin tone
-1F64E 1F3FE 200D 2640 ; minimally-qualified # 🙎🏾♀ woman pouting: medium-dark skin tone
-1F64E 1F3FF 200D 2640 FE0F ; fully-qualified # 🙎🏿♀️ woman pouting: dark skin tone
-1F64E 1F3FF 200D 2640 ; minimally-qualified # 🙎🏿♀ woman pouting: dark skin tone
-1F645 ; fully-qualified # 🙅 person gesturing NO
-1F645 1F3FB ; fully-qualified # 🙅🏻 person gesturing NO: light skin tone
-1F645 1F3FC ; fully-qualified # 🙅🏼 person gesturing NO: medium-light skin tone
-1F645 1F3FD ; fully-qualified # 🙅🏽 person gesturing NO: medium skin tone
-1F645 1F3FE ; fully-qualified # 🙅🏾 person gesturing NO: medium-dark skin tone
-1F645 1F3FF ; fully-qualified # 🙅🏿 person gesturing NO: dark skin tone
-1F645 200D 2642 FE0F ; fully-qualified # 🙅♂️ man gesturing NO
-1F645 200D 2642 ; minimally-qualified # 🙅♂ man gesturing NO
-1F645 1F3FB 200D 2642 FE0F ; fully-qualified # 🙅🏻♂️ man gesturing NO: light skin tone
-1F645 1F3FB 200D 2642 ; minimally-qualified # 🙅🏻♂ man gesturing NO: light skin tone
-1F645 1F3FC 200D 2642 FE0F ; fully-qualified # 🙅🏼♂️ man gesturing NO: medium-light skin tone
-1F645 1F3FC 200D 2642 ; minimally-qualified # 🙅🏼♂ man gesturing NO: medium-light skin tone
-1F645 1F3FD 200D 2642 FE0F ; fully-qualified # 🙅🏽♂️ man gesturing NO: medium skin tone
-1F645 1F3FD 200D 2642 ; minimally-qualified # 🙅🏽♂ man gesturing NO: medium skin tone
-1F645 1F3FE 200D 2642 FE0F ; fully-qualified # 🙅🏾♂️ man gesturing NO: medium-dark skin tone
-1F645 1F3FE 200D 2642 ; minimally-qualified # 🙅🏾♂ man gesturing NO: medium-dark skin tone
-1F645 1F3FF 200D 2642 FE0F ; fully-qualified # 🙅🏿♂️ man gesturing NO: dark skin tone
-1F645 1F3FF 200D 2642 ; minimally-qualified # 🙅🏿♂ man gesturing NO: dark skin tone
-1F645 200D 2640 FE0F ; fully-qualified # 🙅♀️ woman gesturing NO
-1F645 200D 2640 ; minimally-qualified # 🙅♀ woman gesturing NO
-1F645 1F3FB 200D 2640 FE0F ; fully-qualified # 🙅🏻♀️ woman gesturing NO: light skin tone
-1F645 1F3FB 200D 2640 ; minimally-qualified # 🙅🏻♀ woman gesturing NO: light skin tone
-1F645 1F3FC 200D 2640 FE0F ; fully-qualified # 🙅🏼♀️ woman gesturing NO: medium-light skin tone
-1F645 1F3FC 200D 2640 ; minimally-qualified # 🙅🏼♀ woman gesturing NO: medium-light skin tone
-1F645 1F3FD 200D 2640 FE0F ; fully-qualified # 🙅🏽♀️ woman gesturing NO: medium skin tone
-1F645 1F3FD 200D 2640 ; minimally-qualified # 🙅🏽♀ woman gesturing NO: medium skin tone
-1F645 1F3FE 200D 2640 FE0F ; fully-qualified # 🙅🏾♀️ woman gesturing NO: medium-dark skin tone
-1F645 1F3FE 200D 2640 ; minimally-qualified # 🙅🏾♀ woman gesturing NO: medium-dark skin tone
-1F645 1F3FF 200D 2640 FE0F ; fully-qualified # 🙅🏿♀️ woman gesturing NO: dark skin tone
-1F645 1F3FF 200D 2640 ; minimally-qualified # 🙅🏿♀ woman gesturing NO: dark skin tone
-1F646 ; fully-qualified # 🙆 person gesturing OK
-1F646 1F3FB ; fully-qualified # 🙆🏻 person gesturing OK: light skin tone
-1F646 1F3FC ; fully-qualified # 🙆🏼 person gesturing OK: medium-light skin tone
-1F646 1F3FD ; fully-qualified # 🙆🏽 person gesturing OK: medium skin tone
-1F646 1F3FE ; fully-qualified # 🙆🏾 person gesturing OK: medium-dark skin tone
-1F646 1F3FF ; fully-qualified # 🙆🏿 person gesturing OK: dark skin tone
-1F646 200D 2642 FE0F ; fully-qualified # 🙆♂️ man gesturing OK
-1F646 200D 2642 ; minimally-qualified # 🙆♂ man gesturing OK
-1F646 1F3FB 200D 2642 FE0F ; fully-qualified # 🙆🏻♂️ man gesturing OK: light skin tone
-1F646 1F3FB 200D 2642 ; minimally-qualified # 🙆🏻♂ man gesturing OK: light skin tone
-1F646 1F3FC 200D 2642 FE0F ; fully-qualified # 🙆🏼♂️ man gesturing OK: medium-light skin tone
-1F646 1F3FC 200D 2642 ; minimally-qualified # 🙆🏼♂ man gesturing OK: medium-light skin tone
-1F646 1F3FD 200D 2642 FE0F ; fully-qualified # 🙆🏽♂️ man gesturing OK: medium skin tone
-1F646 1F3FD 200D 2642 ; minimally-qualified # 🙆🏽♂ man gesturing OK: medium skin tone
-1F646 1F3FE 200D 2642 FE0F ; fully-qualified # 🙆🏾♂️ man gesturing OK: medium-dark skin tone
-1F646 1F3FE 200D 2642 ; minimally-qualified # 🙆🏾♂ man gesturing OK: medium-dark skin tone
-1F646 1F3FF 200D 2642 FE0F ; fully-qualified # 🙆🏿♂️ man gesturing OK: dark skin tone
-1F646 1F3FF 200D 2642 ; minimally-qualified # 🙆🏿♂ man gesturing OK: dark skin tone
-1F646 200D 2640 FE0F ; fully-qualified # 🙆♀️ woman gesturing OK
-1F646 200D 2640 ; minimally-qualified # 🙆♀ woman gesturing OK
-1F646 1F3FB 200D 2640 FE0F ; fully-qualified # 🙆🏻♀️ woman gesturing OK: light skin tone
-1F646 1F3FB 200D 2640 ; minimally-qualified # 🙆🏻♀ woman gesturing OK: light skin tone
-1F646 1F3FC 200D 2640 FE0F ; fully-qualified # 🙆🏼♀️ woman gesturing OK: medium-light skin tone
-1F646 1F3FC 200D 2640 ; minimally-qualified # 🙆🏼♀ woman gesturing OK: medium-light skin tone
-1F646 1F3FD 200D 2640 FE0F ; fully-qualified # 🙆🏽♀️ woman gesturing OK: medium skin tone
-1F646 1F3FD 200D 2640 ; minimally-qualified # 🙆🏽♀ woman gesturing OK: medium skin tone
-1F646 1F3FE 200D 2640 FE0F ; fully-qualified # 🙆🏾♀️ woman gesturing OK: medium-dark skin tone
-1F646 1F3FE 200D 2640 ; minimally-qualified # 🙆🏾♀ woman gesturing OK: medium-dark skin tone
-1F646 1F3FF 200D 2640 FE0F ; fully-qualified # 🙆🏿♀️ woman gesturing OK: dark skin tone
-1F646 1F3FF 200D 2640 ; minimally-qualified # 🙆🏿♀ woman gesturing OK: dark skin tone
-1F481 ; fully-qualified # 💁 person tipping hand
-1F481 1F3FB ; fully-qualified # 💁🏻 person tipping hand: light skin tone
-1F481 1F3FC ; fully-qualified # 💁🏼 person tipping hand: medium-light skin tone
-1F481 1F3FD ; fully-qualified # 💁🏽 person tipping hand: medium skin tone
-1F481 1F3FE ; fully-qualified # 💁🏾 person tipping hand: medium-dark skin tone
-1F481 1F3FF ; fully-qualified # 💁🏿 person tipping hand: dark skin tone
-1F481 200D 2642 FE0F ; fully-qualified # 💁♂️ man tipping hand
-1F481 200D 2642 ; minimally-qualified # 💁♂ man tipping hand
-1F481 1F3FB 200D 2642 FE0F ; fully-qualified # 💁🏻♂️ man tipping hand: light skin tone
-1F481 1F3FB 200D 2642 ; minimally-qualified # 💁🏻♂ man tipping hand: light skin tone
-1F481 1F3FC 200D 2642 FE0F ; fully-qualified # 💁🏼♂️ man tipping hand: medium-light skin tone
-1F481 1F3FC 200D 2642 ; minimally-qualified # 💁🏼♂ man tipping hand: medium-light skin tone
-1F481 1F3FD 200D 2642 FE0F ; fully-qualified # 💁🏽♂️ man tipping hand: medium skin tone
-1F481 1F3FD 200D 2642 ; minimally-qualified # 💁🏽♂ man tipping hand: medium skin tone
-1F481 1F3FE 200D 2642 FE0F ; fully-qualified # 💁🏾♂️ man tipping hand: medium-dark skin tone
-1F481 1F3FE 200D 2642 ; minimally-qualified # 💁🏾♂ man tipping hand: medium-dark skin tone
-1F481 1F3FF 200D 2642 FE0F ; fully-qualified # 💁🏿♂️ man tipping hand: dark skin tone
-1F481 1F3FF 200D 2642 ; minimally-qualified # 💁🏿♂ man tipping hand: dark skin tone
-1F481 200D 2640 FE0F ; fully-qualified # 💁♀️ woman tipping hand
-1F481 200D 2640 ; minimally-qualified # 💁♀ woman tipping hand
-1F481 1F3FB 200D 2640 FE0F ; fully-qualified # 💁🏻♀️ woman tipping hand: light skin tone
-1F481 1F3FB 200D 2640 ; minimally-qualified # 💁🏻♀ woman tipping hand: light skin tone
-1F481 1F3FC 200D 2640 FE0F ; fully-qualified # 💁🏼♀️ woman tipping hand: medium-light skin tone
-1F481 1F3FC 200D 2640 ; minimally-qualified # 💁🏼♀ woman tipping hand: medium-light skin tone
-1F481 1F3FD 200D 2640 FE0F ; fully-qualified # 💁🏽♀️ woman tipping hand: medium skin tone
-1F481 1F3FD 200D 2640 ; minimally-qualified # 💁🏽♀ woman tipping hand: medium skin tone
-1F481 1F3FE 200D 2640 FE0F ; fully-qualified # 💁🏾♀️ woman tipping hand: medium-dark skin tone
-1F481 1F3FE 200D 2640 ; minimally-qualified # 💁🏾♀ woman tipping hand: medium-dark skin tone
-1F481 1F3FF 200D 2640 FE0F ; fully-qualified # 💁🏿♀️ woman tipping hand: dark skin tone
-1F481 1F3FF 200D 2640 ; minimally-qualified # 💁🏿♀ woman tipping hand: dark skin tone
-1F64B ; fully-qualified # 🙋 person raising hand
-1F64B 1F3FB ; fully-qualified # 🙋🏻 person raising hand: light skin tone
-1F64B 1F3FC ; fully-qualified # 🙋🏼 person raising hand: medium-light skin tone
-1F64B 1F3FD ; fully-qualified # 🙋🏽 person raising hand: medium skin tone
-1F64B 1F3FE ; fully-qualified # 🙋🏾 person raising hand: medium-dark skin tone
-1F64B 1F3FF ; fully-qualified # 🙋🏿 person raising hand: dark skin tone
-1F64B 200D 2642 FE0F ; fully-qualified # 🙋♂️ man raising hand
-1F64B 200D 2642 ; minimally-qualified # 🙋♂ man raising hand
-1F64B 1F3FB 200D 2642 FE0F ; fully-qualified # 🙋🏻♂️ man raising hand: light skin tone
-1F64B 1F3FB 200D 2642 ; minimally-qualified # 🙋🏻♂ man raising hand: light skin tone
-1F64B 1F3FC 200D 2642 FE0F ; fully-qualified # 🙋🏼♂️ man raising hand: medium-light skin tone
-1F64B 1F3FC 200D 2642 ; minimally-qualified # 🙋🏼♂ man raising hand: medium-light skin tone
-1F64B 1F3FD 200D 2642 FE0F ; fully-qualified # 🙋🏽♂️ man raising hand: medium skin tone
-1F64B 1F3FD 200D 2642 ; minimally-qualified # 🙋🏽♂ man raising hand: medium skin tone
-1F64B 1F3FE 200D 2642 FE0F ; fully-qualified # 🙋🏾♂️ man raising hand: medium-dark skin tone
-1F64B 1F3FE 200D 2642 ; minimally-qualified # 🙋🏾♂ man raising hand: medium-dark skin tone
-1F64B 1F3FF 200D 2642 FE0F ; fully-qualified # 🙋🏿♂️ man raising hand: dark skin tone
-1F64B 1F3FF 200D 2642 ; minimally-qualified # 🙋🏿♂ man raising hand: dark skin tone
-1F64B 200D 2640 FE0F ; fully-qualified # 🙋♀️ woman raising hand
-1F64B 200D 2640 ; minimally-qualified # 🙋♀ woman raising hand
-1F64B 1F3FB 200D 2640 FE0F ; fully-qualified # 🙋🏻♀️ woman raising hand: light skin tone
-1F64B 1F3FB 200D 2640 ; minimally-qualified # 🙋🏻♀ woman raising hand: light skin tone
-1F64B 1F3FC 200D 2640 FE0F ; fully-qualified # 🙋🏼♀️ woman raising hand: medium-light skin tone
-1F64B 1F3FC 200D 2640 ; minimally-qualified # 🙋🏼♀ woman raising hand: medium-light skin tone
-1F64B 1F3FD 200D 2640 FE0F ; fully-qualified # 🙋🏽♀️ woman raising hand: medium skin tone
-1F64B 1F3FD 200D 2640 ; minimally-qualified # 🙋🏽♀ woman raising hand: medium skin tone
-1F64B 1F3FE 200D 2640 FE0F ; fully-qualified # 🙋🏾♀️ woman raising hand: medium-dark skin tone
-1F64B 1F3FE 200D 2640 ; minimally-qualified # 🙋🏾♀ woman raising hand: medium-dark skin tone
-1F64B 1F3FF 200D 2640 FE0F ; fully-qualified # 🙋🏿♀️ woman raising hand: dark skin tone
-1F64B 1F3FF 200D 2640 ; minimally-qualified # 🙋🏿♀ woman raising hand: dark skin tone
-1F9CF ; fully-qualified # 🧏 deaf person
-1F9CF 1F3FB ; fully-qualified # 🧏🏻 deaf person: light skin tone
-1F9CF 1F3FC ; fully-qualified # 🧏🏼 deaf person: medium-light skin tone
-1F9CF 1F3FD ; fully-qualified # 🧏🏽 deaf person: medium skin tone
-1F9CF 1F3FE ; fully-qualified # 🧏🏾 deaf person: medium-dark skin tone
-1F9CF 1F3FF ; fully-qualified # 🧏🏿 deaf person: dark skin tone
-1F9CF 200D 2642 FE0F ; fully-qualified # 🧏♂️ deaf man
-1F9CF 200D 2642 ; minimally-qualified # 🧏♂ deaf man
-1F9CF 1F3FB 200D 2642 FE0F ; fully-qualified # 🧏🏻♂️ deaf man: light skin tone
-1F9CF 1F3FB 200D 2642 ; minimally-qualified # 🧏🏻♂ deaf man: light skin tone
-1F9CF 1F3FC 200D 2642 FE0F ; fully-qualified # 🧏🏼♂️ deaf man: medium-light skin tone
-1F9CF 1F3FC 200D 2642 ; minimally-qualified # 🧏🏼♂ deaf man: medium-light skin tone
-1F9CF 1F3FD 200D 2642 FE0F ; fully-qualified # 🧏🏽♂️ deaf man: medium skin tone
-1F9CF 1F3FD 200D 2642 ; minimally-qualified # 🧏🏽♂ deaf man: medium skin tone
-1F9CF 1F3FE 200D 2642 FE0F ; fully-qualified # 🧏🏾♂️ deaf man: medium-dark skin tone
-1F9CF 1F3FE 200D 2642 ; minimally-qualified # 🧏🏾♂ deaf man: medium-dark skin tone
-1F9CF 1F3FF 200D 2642 FE0F ; fully-qualified # 🧏🏿♂️ deaf man: dark skin tone
-1F9CF 1F3FF 200D 2642 ; minimally-qualified # 🧏🏿♂ deaf man: dark skin tone
-1F9CF 200D 2640 FE0F ; fully-qualified # 🧏♀️ deaf woman
-1F9CF 200D 2640 ; minimally-qualified # 🧏♀ deaf woman
-1F9CF 1F3FB 200D 2640 FE0F ; fully-qualified # 🧏🏻♀️ deaf woman: light skin tone
-1F9CF 1F3FB 200D 2640 ; minimally-qualified # 🧏🏻♀ deaf woman: light skin tone
-1F9CF 1F3FC 200D 2640 FE0F ; fully-qualified # 🧏🏼♀️ deaf woman: medium-light skin tone
-1F9CF 1F3FC 200D 2640 ; minimally-qualified # 🧏🏼♀ deaf woman: medium-light skin tone
-1F9CF 1F3FD 200D 2640 FE0F ; fully-qualified # 🧏🏽♀️ deaf woman: medium skin tone
-1F9CF 1F3FD 200D 2640 ; minimally-qualified # 🧏🏽♀ deaf woman: medium skin tone
-1F9CF 1F3FE 200D 2640 FE0F ; fully-qualified # 🧏🏾♀️ deaf woman: medium-dark skin tone
-1F9CF 1F3FE 200D 2640 ; minimally-qualified # 🧏🏾♀ deaf woman: medium-dark skin tone
-1F9CF 1F3FF 200D 2640 FE0F ; fully-qualified # 🧏🏿♀️ deaf woman: dark skin tone
-1F9CF 1F3FF 200D 2640 ; minimally-qualified # 🧏🏿♀ deaf woman: dark skin tone
-1F647 ; fully-qualified # 🙇 person bowing
-1F647 1F3FB ; fully-qualified # 🙇🏻 person bowing: light skin tone
-1F647 1F3FC ; fully-qualified # 🙇🏼 person bowing: medium-light skin tone
-1F647 1F3FD ; fully-qualified # 🙇🏽 person bowing: medium skin tone
-1F647 1F3FE ; fully-qualified # 🙇🏾 person bowing: medium-dark skin tone
-1F647 1F3FF ; fully-qualified # 🙇🏿 person bowing: dark skin tone
-1F647 200D 2642 FE0F ; fully-qualified # 🙇♂️ man bowing
-1F647 200D 2642 ; minimally-qualified # 🙇♂ man bowing
-1F647 1F3FB 200D 2642 FE0F ; fully-qualified # 🙇🏻♂️ man bowing: light skin tone
-1F647 1F3FB 200D 2642 ; minimally-qualified # 🙇🏻♂ man bowing: light skin tone
-1F647 1F3FC 200D 2642 FE0F ; fully-qualified # 🙇🏼♂️ man bowing: medium-light skin tone
-1F647 1F3FC 200D 2642 ; minimally-qualified # 🙇🏼♂ man bowing: medium-light skin tone
-1F647 1F3FD 200D 2642 FE0F ; fully-qualified # 🙇🏽♂️ man bowing: medium skin tone
-1F647 1F3FD 200D 2642 ; minimally-qualified # 🙇🏽♂ man bowing: medium skin tone
-1F647 1F3FE 200D 2642 FE0F ; fully-qualified # 🙇🏾♂️ man bowing: medium-dark skin tone
-1F647 1F3FE 200D 2642 ; minimally-qualified # 🙇🏾♂ man bowing: medium-dark skin tone
-1F647 1F3FF 200D 2642 FE0F ; fully-qualified # 🙇🏿♂️ man bowing: dark skin tone
-1F647 1F3FF 200D 2642 ; minimally-qualified # 🙇🏿♂ man bowing: dark skin tone
-1F647 200D 2640 FE0F ; fully-qualified # 🙇♀️ woman bowing
-1F647 200D 2640 ; minimally-qualified # 🙇♀ woman bowing
-1F647 1F3FB 200D 2640 FE0F ; fully-qualified # 🙇🏻♀️ woman bowing: light skin tone
-1F647 1F3FB 200D 2640 ; minimally-qualified # 🙇🏻♀ woman bowing: light skin tone
-1F647 1F3FC 200D 2640 FE0F ; fully-qualified # 🙇🏼♀️ woman bowing: medium-light skin tone
-1F647 1F3FC 200D 2640 ; minimally-qualified # 🙇🏼♀ woman bowing: medium-light skin tone
-1F647 1F3FD 200D 2640 FE0F ; fully-qualified # 🙇🏽♀️ woman bowing: medium skin tone
-1F647 1F3FD 200D 2640 ; minimally-qualified # 🙇🏽♀ woman bowing: medium skin tone
-1F647 1F3FE 200D 2640 FE0F ; fully-qualified # 🙇🏾♀️ woman bowing: medium-dark skin tone
-1F647 1F3FE 200D 2640 ; minimally-qualified # 🙇🏾♀ woman bowing: medium-dark skin tone
-1F647 1F3FF 200D 2640 FE0F ; fully-qualified # 🙇🏿♀️ woman bowing: dark skin tone
-1F647 1F3FF 200D 2640 ; minimally-qualified # 🙇🏿♀ woman bowing: dark skin tone
-1F926 ; fully-qualified # 🤦 person facepalming
-1F926 1F3FB ; fully-qualified # 🤦🏻 person facepalming: light skin tone
-1F926 1F3FC ; fully-qualified # 🤦🏼 person facepalming: medium-light skin tone
-1F926 1F3FD ; fully-qualified # 🤦🏽 person facepalming: medium skin tone
-1F926 1F3FE ; fully-qualified # 🤦🏾 person facepalming: medium-dark skin tone
-1F926 1F3FF ; fully-qualified # 🤦🏿 person facepalming: dark skin tone
-1F926 200D 2642 FE0F ; fully-qualified # 🤦♂️ man facepalming
-1F926 200D 2642 ; minimally-qualified # 🤦♂ man facepalming
-1F926 1F3FB 200D 2642 FE0F ; fully-qualified # 🤦🏻♂️ man facepalming: light skin tone
-1F926 1F3FB 200D 2642 ; minimally-qualified # 🤦🏻♂ man facepalming: light skin tone
-1F926 1F3FC 200D 2642 FE0F ; fully-qualified # 🤦🏼♂️ man facepalming: medium-light skin tone
-1F926 1F3FC 200D 2642 ; minimally-qualified # 🤦🏼♂ man facepalming: medium-light skin tone
-1F926 1F3FD 200D 2642 FE0F ; fully-qualified # 🤦🏽♂️ man facepalming: medium skin tone
-1F926 1F3FD 200D 2642 ; minimally-qualified # 🤦🏽♂ man facepalming: medium skin tone
-1F926 1F3FE 200D 2642 FE0F ; fully-qualified # 🤦🏾♂️ man facepalming: medium-dark skin tone
-1F926 1F3FE 200D 2642 ; minimally-qualified # 🤦🏾♂ man facepalming: medium-dark skin tone
-1F926 1F3FF 200D 2642 FE0F ; fully-qualified # 🤦🏿♂️ man facepalming: dark skin tone
-1F926 1F3FF 200D 2642 ; minimally-qualified # 🤦🏿♂ man facepalming: dark skin tone
-1F926 200D 2640 FE0F ; fully-qualified # 🤦♀️ woman facepalming
-1F926 200D 2640 ; minimally-qualified # 🤦♀ woman facepalming
-1F926 1F3FB 200D 2640 FE0F ; fully-qualified # 🤦🏻♀️ woman facepalming: light skin tone
-1F926 1F3FB 200D 2640 ; minimally-qualified # 🤦🏻♀ woman facepalming: light skin tone
-1F926 1F3FC 200D 2640 FE0F ; fully-qualified # 🤦🏼♀️ woman facepalming: medium-light skin tone
-1F926 1F3FC 200D 2640 ; minimally-qualified # 🤦🏼♀ woman facepalming: medium-light skin tone
-1F926 1F3FD 200D 2640 FE0F ; fully-qualified # 🤦🏽♀️ woman facepalming: medium skin tone
-1F926 1F3FD 200D 2640 ; minimally-qualified # 🤦🏽♀ woman facepalming: medium skin tone
-1F926 1F3FE 200D 2640 FE0F ; fully-qualified # 🤦🏾♀️ woman facepalming: medium-dark skin tone
-1F926 1F3FE 200D 2640 ; minimally-qualified # 🤦🏾♀ woman facepalming: medium-dark skin tone
-1F926 1F3FF 200D 2640 FE0F ; fully-qualified # 🤦🏿♀️ woman facepalming: dark skin tone
-1F926 1F3FF 200D 2640 ; minimally-qualified # 🤦🏿♀ woman facepalming: dark skin tone
-1F937 ; fully-qualified # 🤷 person shrugging
-1F937 1F3FB ; fully-qualified # 🤷🏻 person shrugging: light skin tone
-1F937 1F3FC ; fully-qualified # 🤷🏼 person shrugging: medium-light skin tone
-1F937 1F3FD ; fully-qualified # 🤷🏽 person shrugging: medium skin tone
-1F937 1F3FE ; fully-qualified # 🤷🏾 person shrugging: medium-dark skin tone
-1F937 1F3FF ; fully-qualified # 🤷🏿 person shrugging: dark skin tone
-1F937 200D 2642 FE0F ; fully-qualified # 🤷♂️ man shrugging
-1F937 200D 2642 ; minimally-qualified # 🤷♂ man shrugging
-1F937 1F3FB 200D 2642 FE0F ; fully-qualified # 🤷🏻♂️ man shrugging: light skin tone
-1F937 1F3FB 200D 2642 ; minimally-qualified # 🤷🏻♂ man shrugging: light skin tone
-1F937 1F3FC 200D 2642 FE0F ; fully-qualified # 🤷🏼♂️ man shrugging: medium-light skin tone
-1F937 1F3FC 200D 2642 ; minimally-qualified # 🤷🏼♂ man shrugging: medium-light skin tone
-1F937 1F3FD 200D 2642 FE0F ; fully-qualified # 🤷🏽♂️ man shrugging: medium skin tone
-1F937 1F3FD 200D 2642 ; minimally-qualified # 🤷🏽♂ man shrugging: medium skin tone
-1F937 1F3FE 200D 2642 FE0F ; fully-qualified # 🤷🏾♂️ man shrugging: medium-dark skin tone
-1F937 1F3FE 200D 2642 ; minimally-qualified # 🤷🏾♂ man shrugging: medium-dark skin tone
-1F937 1F3FF 200D 2642 FE0F ; fully-qualified # 🤷🏿♂️ man shrugging: dark skin tone
-1F937 1F3FF 200D 2642 ; minimally-qualified # 🤷🏿♂ man shrugging: dark skin tone
-1F937 200D 2640 FE0F ; fully-qualified # 🤷♀️ woman shrugging
-1F937 200D 2640 ; minimally-qualified # 🤷♀ woman shrugging
-1F937 1F3FB 200D 2640 FE0F ; fully-qualified # 🤷🏻♀️ woman shrugging: light skin tone
-1F937 1F3FB 200D 2640 ; minimally-qualified # 🤷🏻♀ woman shrugging: light skin tone
-1F937 1F3FC 200D 2640 FE0F ; fully-qualified # 🤷🏼♀️ woman shrugging: medium-light skin tone
-1F937 1F3FC 200D 2640 ; minimally-qualified # 🤷🏼♀ woman shrugging: medium-light skin tone
-1F937 1F3FD 200D 2640 FE0F ; fully-qualified # 🤷🏽♀️ woman shrugging: medium skin tone
-1F937 1F3FD 200D 2640 ; minimally-qualified # 🤷🏽♀ woman shrugging: medium skin tone
-1F937 1F3FE 200D 2640 FE0F ; fully-qualified # 🤷🏾♀️ woman shrugging: medium-dark skin tone
-1F937 1F3FE 200D 2640 ; minimally-qualified # 🤷🏾♀ woman shrugging: medium-dark skin tone
-1F937 1F3FF 200D 2640 FE0F ; fully-qualified # 🤷🏿♀️ woman shrugging: dark skin tone
-1F937 1F3FF 200D 2640 ; minimally-qualified # 🤷🏿♀ woman shrugging: dark skin tone
+1F64D ; fully-qualified # 🙍 E0.6 person frowning
+1F64D 1F3FB ; fully-qualified # 🙍🏻 E1.0 person frowning: light skin tone
+1F64D 1F3FC ; fully-qualified # 🙍🏼 E1.0 person frowning: medium-light skin tone
+1F64D 1F3FD ; fully-qualified # 🙍🏽 E1.0 person frowning: medium skin tone
+1F64D 1F3FE ; fully-qualified # 🙍🏾 E1.0 person frowning: medium-dark skin tone
+1F64D 1F3FF ; fully-qualified # 🙍🏿 E1.0 person frowning: dark skin tone
+1F64D 200D 2642 FE0F ; fully-qualified # 🙍♂️ E4.0 man frowning
+1F64D 200D 2642 ; minimally-qualified # 🙍♂ E4.0 man frowning
+1F64D 1F3FB 200D 2642 FE0F ; fully-qualified # 🙍🏻♂️ E4.0 man frowning: light skin tone
+1F64D 1F3FB 200D 2642 ; minimally-qualified # 🙍🏻♂ E4.0 man frowning: light skin tone
+1F64D 1F3FC 200D 2642 FE0F ; fully-qualified # 🙍🏼♂️ E4.0 man frowning: medium-light skin tone
+1F64D 1F3FC 200D 2642 ; minimally-qualified # 🙍🏼♂ E4.0 man frowning: medium-light skin tone
+1F64D 1F3FD 200D 2642 FE0F ; fully-qualified # 🙍🏽♂️ E4.0 man frowning: medium skin tone
+1F64D 1F3FD 200D 2642 ; minimally-qualified # 🙍🏽♂ E4.0 man frowning: medium skin tone
+1F64D 1F3FE 200D 2642 FE0F ; fully-qualified # 🙍🏾♂️ E4.0 man frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2642 ; minimally-qualified # 🙍🏾♂ E4.0 man frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2642 FE0F ; fully-qualified # 🙍🏿♂️ E4.0 man frowning: dark skin tone
+1F64D 1F3FF 200D 2642 ; minimally-qualified # 🙍🏿♂ E4.0 man frowning: dark skin tone
+1F64D 200D 2640 FE0F ; fully-qualified # 🙍♀️ E4.0 woman frowning
+1F64D 200D 2640 ; minimally-qualified # 🙍♀ E4.0 woman frowning
+1F64D 1F3FB 200D 2640 FE0F ; fully-qualified # 🙍🏻♀️ E4.0 woman frowning: light skin tone
+1F64D 1F3FB 200D 2640 ; minimally-qualified # 🙍🏻♀ E4.0 woman frowning: light skin tone
+1F64D 1F3FC 200D 2640 FE0F ; fully-qualified # 🙍🏼♀️ E4.0 woman frowning: medium-light skin tone
+1F64D 1F3FC 200D 2640 ; minimally-qualified # 🙍🏼♀ E4.0 woman frowning: medium-light skin tone
+1F64D 1F3FD 200D 2640 FE0F ; fully-qualified # 🙍🏽♀️ E4.0 woman frowning: medium skin tone
+1F64D 1F3FD 200D 2640 ; minimally-qualified # 🙍🏽♀ E4.0 woman frowning: medium skin tone
+1F64D 1F3FE 200D 2640 FE0F ; fully-qualified # 🙍🏾♀️ E4.0 woman frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2640 ; minimally-qualified # 🙍🏾♀ E4.0 woman frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2640 FE0F ; fully-qualified # 🙍🏿♀️ E4.0 woman frowning: dark skin tone
+1F64D 1F3FF 200D 2640 ; minimally-qualified # 🙍🏿♀ E4.0 woman frowning: dark skin tone
+1F64E ; fully-qualified # 🙎 E0.6 person pouting
+1F64E 1F3FB ; fully-qualified # 🙎🏻 E1.0 person pouting: light skin tone
+1F64E 1F3FC ; fully-qualified # 🙎🏼 E1.0 person pouting: medium-light skin tone
+1F64E 1F3FD ; fully-qualified # 🙎🏽 E1.0 person pouting: medium skin tone
+1F64E 1F3FE ; fully-qualified # 🙎🏾 E1.0 person pouting: medium-dark skin tone
+1F64E 1F3FF ; fully-qualified # 🙎🏿 E1.0 person pouting: dark skin tone
+1F64E 200D 2642 FE0F ; fully-qualified # 🙎♂️ E4.0 man pouting
+1F64E 200D 2642 ; minimally-qualified # 🙎♂ E4.0 man pouting
+1F64E 1F3FB 200D 2642 FE0F ; fully-qualified # 🙎🏻♂️ E4.0 man pouting: light skin tone
+1F64E 1F3FB 200D 2642 ; minimally-qualified # 🙎🏻♂ E4.0 man pouting: light skin tone
+1F64E 1F3FC 200D 2642 FE0F ; fully-qualified # 🙎🏼♂️ E4.0 man pouting: medium-light skin tone
+1F64E 1F3FC 200D 2642 ; minimally-qualified # 🙎🏼♂ E4.0 man pouting: medium-light skin tone
+1F64E 1F3FD 200D 2642 FE0F ; fully-qualified # 🙎🏽♂️ E4.0 man pouting: medium skin tone
+1F64E 1F3FD 200D 2642 ; minimally-qualified # 🙎🏽♂ E4.0 man pouting: medium skin tone
+1F64E 1F3FE 200D 2642 FE0F ; fully-qualified # 🙎🏾♂️ E4.0 man pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2642 ; minimally-qualified # 🙎🏾♂ E4.0 man pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2642 FE0F ; fully-qualified # 🙎🏿♂️ E4.0 man pouting: dark skin tone
+1F64E 1F3FF 200D 2642 ; minimally-qualified # 🙎🏿♂ E4.0 man pouting: dark skin tone
+1F64E 200D 2640 FE0F ; fully-qualified # 🙎♀️ E4.0 woman pouting
+1F64E 200D 2640 ; minimally-qualified # 🙎♀ E4.0 woman pouting
+1F64E 1F3FB 200D 2640 FE0F ; fully-qualified # 🙎🏻♀️ E4.0 woman pouting: light skin tone
+1F64E 1F3FB 200D 2640 ; minimally-qualified # 🙎🏻♀ E4.0 woman pouting: light skin tone
+1F64E 1F3FC 200D 2640 FE0F ; fully-qualified # 🙎🏼♀️ E4.0 woman pouting: medium-light skin tone
+1F64E 1F3FC 200D 2640 ; minimally-qualified # 🙎🏼♀ E4.0 woman pouting: medium-light skin tone
+1F64E 1F3FD 200D 2640 FE0F ; fully-qualified # 🙎🏽♀️ E4.0 woman pouting: medium skin tone
+1F64E 1F3FD 200D 2640 ; minimally-qualified # 🙎🏽♀ E4.0 woman pouting: medium skin tone
+1F64E 1F3FE 200D 2640 FE0F ; fully-qualified # 🙎🏾♀️ E4.0 woman pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2640 ; minimally-qualified # 🙎🏾♀ E4.0 woman pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2640 FE0F ; fully-qualified # 🙎🏿♀️ E4.0 woman pouting: dark skin tone
+1F64E 1F3FF 200D 2640 ; minimally-qualified # 🙎🏿♀ E4.0 woman pouting: dark skin tone
+1F645 ; fully-qualified # 🙅 E0.6 person gesturing NO
+1F645 1F3FB ; fully-qualified # 🙅🏻 E1.0 person gesturing NO: light skin tone
+1F645 1F3FC ; fully-qualified # 🙅🏼 E1.0 person gesturing NO: medium-light skin tone
+1F645 1F3FD ; fully-qualified # 🙅🏽 E1.0 person gesturing NO: medium skin tone
+1F645 1F3FE ; fully-qualified # 🙅🏾 E1.0 person gesturing NO: medium-dark skin tone
+1F645 1F3FF ; fully-qualified # 🙅🏿 E1.0 person gesturing NO: dark skin tone
+1F645 200D 2642 FE0F ; fully-qualified # 🙅♂️ E4.0 man gesturing NO
+1F645 200D 2642 ; minimally-qualified # 🙅♂ E4.0 man gesturing NO
+1F645 1F3FB 200D 2642 FE0F ; fully-qualified # 🙅🏻♂️ E4.0 man gesturing NO: light skin tone
+1F645 1F3FB 200D 2642 ; minimally-qualified # 🙅🏻♂ E4.0 man gesturing NO: light skin tone
+1F645 1F3FC 200D 2642 FE0F ; fully-qualified # 🙅🏼♂️ E4.0 man gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2642 ; minimally-qualified # 🙅🏼♂ E4.0 man gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2642 FE0F ; fully-qualified # 🙅🏽♂️ E4.0 man gesturing NO: medium skin tone
+1F645 1F3FD 200D 2642 ; minimally-qualified # 🙅🏽♂ E4.0 man gesturing NO: medium skin tone
+1F645 1F3FE 200D 2642 FE0F ; fully-qualified # 🙅🏾♂️ E4.0 man gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2642 ; minimally-qualified # 🙅🏾♂ E4.0 man gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2642 FE0F ; fully-qualified # 🙅🏿♂️ E4.0 man gesturing NO: dark skin tone
+1F645 1F3FF 200D 2642 ; minimally-qualified # 🙅🏿♂ E4.0 man gesturing NO: dark skin tone
+1F645 200D 2640 FE0F ; fully-qualified # 🙅♀️ E4.0 woman gesturing NO
+1F645 200D 2640 ; minimally-qualified # 🙅♀ E4.0 woman gesturing NO
+1F645 1F3FB 200D 2640 FE0F ; fully-qualified # 🙅🏻♀️ E4.0 woman gesturing NO: light skin tone
+1F645 1F3FB 200D 2640 ; minimally-qualified # 🙅🏻♀ E4.0 woman gesturing NO: light skin tone
+1F645 1F3FC 200D 2640 FE0F ; fully-qualified # 🙅🏼♀️ E4.0 woman gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2640 ; minimally-qualified # 🙅🏼♀ E4.0 woman gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2640 FE0F ; fully-qualified # 🙅🏽♀️ E4.0 woman gesturing NO: medium skin tone
+1F645 1F3FD 200D 2640 ; minimally-qualified # 🙅🏽♀ E4.0 woman gesturing NO: medium skin tone
+1F645 1F3FE 200D 2640 FE0F ; fully-qualified # 🙅🏾♀️ E4.0 woman gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2640 ; minimally-qualified # 🙅🏾♀ E4.0 woman gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2640 FE0F ; fully-qualified # 🙅🏿♀️ E4.0 woman gesturing NO: dark skin tone
+1F645 1F3FF 200D 2640 ; minimally-qualified # 🙅🏿♀ E4.0 woman gesturing NO: dark skin tone
+1F646 ; fully-qualified # 🙆 E0.6 person gesturing OK
+1F646 1F3FB ; fully-qualified # 🙆🏻 E1.0 person gesturing OK: light skin tone
+1F646 1F3FC ; fully-qualified # 🙆🏼 E1.0 person gesturing OK: medium-light skin tone
+1F646 1F3FD ; fully-qualified # 🙆🏽 E1.0 person gesturing OK: medium skin tone
+1F646 1F3FE ; fully-qualified # 🙆🏾 E1.0 person gesturing OK: medium-dark skin tone
+1F646 1F3FF ; fully-qualified # 🙆🏿 E1.0 person gesturing OK: dark skin tone
+1F646 200D 2642 FE0F ; fully-qualified # 🙆♂️ E4.0 man gesturing OK
+1F646 200D 2642 ; minimally-qualified # 🙆♂ E4.0 man gesturing OK
+1F646 1F3FB 200D 2642 FE0F ; fully-qualified # 🙆🏻♂️ E4.0 man gesturing OK: light skin tone
+1F646 1F3FB 200D 2642 ; minimally-qualified # 🙆🏻♂ E4.0 man gesturing OK: light skin tone
+1F646 1F3FC 200D 2642 FE0F ; fully-qualified # 🙆🏼♂️ E4.0 man gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2642 ; minimally-qualified # 🙆🏼♂ E4.0 man gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2642 FE0F ; fully-qualified # 🙆🏽♂️ E4.0 man gesturing OK: medium skin tone
+1F646 1F3FD 200D 2642 ; minimally-qualified # 🙆🏽♂ E4.0 man gesturing OK: medium skin tone
+1F646 1F3FE 200D 2642 FE0F ; fully-qualified # 🙆🏾♂️ E4.0 man gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2642 ; minimally-qualified # 🙆🏾♂ E4.0 man gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2642 FE0F ; fully-qualified # 🙆🏿♂️ E4.0 man gesturing OK: dark skin tone
+1F646 1F3FF 200D 2642 ; minimally-qualified # 🙆🏿♂ E4.0 man gesturing OK: dark skin tone
+1F646 200D 2640 FE0F ; fully-qualified # 🙆♀️ E4.0 woman gesturing OK
+1F646 200D 2640 ; minimally-qualified # 🙆♀ E4.0 woman gesturing OK
+1F646 1F3FB 200D 2640 FE0F ; fully-qualified # 🙆🏻♀️ E4.0 woman gesturing OK: light skin tone
+1F646 1F3FB 200D 2640 ; minimally-qualified # 🙆🏻♀ E4.0 woman gesturing OK: light skin tone
+1F646 1F3FC 200D 2640 FE0F ; fully-qualified # 🙆🏼♀️ E4.0 woman gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2640 ; minimally-qualified # 🙆🏼♀ E4.0 woman gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2640 FE0F ; fully-qualified # 🙆🏽♀️ E4.0 woman gesturing OK: medium skin tone
+1F646 1F3FD 200D 2640 ; minimally-qualified # 🙆🏽♀ E4.0 woman gesturing OK: medium skin tone
+1F646 1F3FE 200D 2640 FE0F ; fully-qualified # 🙆🏾♀️ E4.0 woman gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2640 ; minimally-qualified # 🙆🏾♀ E4.0 woman gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2640 FE0F ; fully-qualified # 🙆🏿♀️ E4.0 woman gesturing OK: dark skin tone
+1F646 1F3FF 200D 2640 ; minimally-qualified # 🙆🏿♀ E4.0 woman gesturing OK: dark skin tone
+1F481 ; fully-qualified # 💁 E0.6 person tipping hand
+1F481 1F3FB ; fully-qualified # 💁🏻 E1.0 person tipping hand: light skin tone
+1F481 1F3FC ; fully-qualified # 💁🏼 E1.0 person tipping hand: medium-light skin tone
+1F481 1F3FD ; fully-qualified # 💁🏽 E1.0 person tipping hand: medium skin tone
+1F481 1F3FE ; fully-qualified # 💁🏾 E1.0 person tipping hand: medium-dark skin tone
+1F481 1F3FF ; fully-qualified # 💁🏿 E1.0 person tipping hand: dark skin tone
+1F481 200D 2642 FE0F ; fully-qualified # 💁♂️ E4.0 man tipping hand
+1F481 200D 2642 ; minimally-qualified # 💁♂ E4.0 man tipping hand
+1F481 1F3FB 200D 2642 FE0F ; fully-qualified # 💁🏻♂️ E4.0 man tipping hand: light skin tone
+1F481 1F3FB 200D 2642 ; minimally-qualified # 💁🏻♂ E4.0 man tipping hand: light skin tone
+1F481 1F3FC 200D 2642 FE0F ; fully-qualified # 💁🏼♂️ E4.0 man tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2642 ; minimally-qualified # 💁🏼♂ E4.0 man tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2642 FE0F ; fully-qualified # 💁🏽♂️ E4.0 man tipping hand: medium skin tone
+1F481 1F3FD 200D 2642 ; minimally-qualified # 💁🏽♂ E4.0 man tipping hand: medium skin tone
+1F481 1F3FE 200D 2642 FE0F ; fully-qualified # 💁🏾♂️ E4.0 man tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2642 ; minimally-qualified # 💁🏾♂ E4.0 man tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2642 FE0F ; fully-qualified # 💁🏿♂️ E4.0 man tipping hand: dark skin tone
+1F481 1F3FF 200D 2642 ; minimally-qualified # 💁🏿♂ E4.0 man tipping hand: dark skin tone
+1F481 200D 2640 FE0F ; fully-qualified # 💁♀️ E4.0 woman tipping hand
+1F481 200D 2640 ; minimally-qualified # 💁♀ E4.0 woman tipping hand
+1F481 1F3FB 200D 2640 FE0F ; fully-qualified # 💁🏻♀️ E4.0 woman tipping hand: light skin tone
+1F481 1F3FB 200D 2640 ; minimally-qualified # 💁🏻♀ E4.0 woman tipping hand: light skin tone
+1F481 1F3FC 200D 2640 FE0F ; fully-qualified # 💁🏼♀️ E4.0 woman tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2640 ; minimally-qualified # 💁🏼♀ E4.0 woman tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2640 FE0F ; fully-qualified # 💁🏽♀️ E4.0 woman tipping hand: medium skin tone
+1F481 1F3FD 200D 2640 ; minimally-qualified # 💁🏽♀ E4.0 woman tipping hand: medium skin tone
+1F481 1F3FE 200D 2640 FE0F ; fully-qualified # 💁🏾♀️ E4.0 woman tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2640 ; minimally-qualified # 💁🏾♀ E4.0 woman tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2640 FE0F ; fully-qualified # 💁🏿♀️ E4.0 woman tipping hand: dark skin tone
+1F481 1F3FF 200D 2640 ; minimally-qualified # 💁🏿♀ E4.0 woman tipping hand: dark skin tone
+1F64B ; fully-qualified # 🙋 E0.6 person raising hand
+1F64B 1F3FB ; fully-qualified # 🙋🏻 E1.0 person raising hand: light skin tone
+1F64B 1F3FC ; fully-qualified # 🙋🏼 E1.0 person raising hand: medium-light skin tone
+1F64B 1F3FD ; fully-qualified # 🙋🏽 E1.0 person raising hand: medium skin tone
+1F64B 1F3FE ; fully-qualified # 🙋🏾 E1.0 person raising hand: medium-dark skin tone
+1F64B 1F3FF ; fully-qualified # 🙋🏿 E1.0 person raising hand: dark skin tone
+1F64B 200D 2642 FE0F ; fully-qualified # 🙋♂️ E4.0 man raising hand
+1F64B 200D 2642 ; minimally-qualified # 🙋♂ E4.0 man raising hand
+1F64B 1F3FB 200D 2642 FE0F ; fully-qualified # 🙋🏻♂️ E4.0 man raising hand: light skin tone
+1F64B 1F3FB 200D 2642 ; minimally-qualified # 🙋🏻♂ E4.0 man raising hand: light skin tone
+1F64B 1F3FC 200D 2642 FE0F ; fully-qualified # 🙋🏼♂️ E4.0 man raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2642 ; minimally-qualified # 🙋🏼♂ E4.0 man raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2642 FE0F ; fully-qualified # 🙋🏽♂️ E4.0 man raising hand: medium skin tone
+1F64B 1F3FD 200D 2642 ; minimally-qualified # 🙋🏽♂ E4.0 man raising hand: medium skin tone
+1F64B 1F3FE 200D 2642 FE0F ; fully-qualified # 🙋🏾♂️ E4.0 man raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2642 ; minimally-qualified # 🙋🏾♂ E4.0 man raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2642 FE0F ; fully-qualified # 🙋🏿♂️ E4.0 man raising hand: dark skin tone
+1F64B 1F3FF 200D 2642 ; minimally-qualified # 🙋🏿♂ E4.0 man raising hand: dark skin tone
+1F64B 200D 2640 FE0F ; fully-qualified # 🙋♀️ E4.0 woman raising hand
+1F64B 200D 2640 ; minimally-qualified # 🙋♀ E4.0 woman raising hand
+1F64B 1F3FB 200D 2640 FE0F ; fully-qualified # 🙋🏻♀️ E4.0 woman raising hand: light skin tone
+1F64B 1F3FB 200D 2640 ; minimally-qualified # 🙋🏻♀ E4.0 woman raising hand: light skin tone
+1F64B 1F3FC 200D 2640 FE0F ; fully-qualified # 🙋🏼♀️ E4.0 woman raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2640 ; minimally-qualified # 🙋🏼♀ E4.0 woman raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2640 FE0F ; fully-qualified # 🙋🏽♀️ E4.0 woman raising hand: medium skin tone
+1F64B 1F3FD 200D 2640 ; minimally-qualified # 🙋🏽♀ E4.0 woman raising hand: medium skin tone
+1F64B 1F3FE 200D 2640 FE0F ; fully-qualified # 🙋🏾♀️ E4.0 woman raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2640 ; minimally-qualified # 🙋🏾♀ E4.0 woman raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2640 FE0F ; fully-qualified # 🙋🏿♀️ E4.0 woman raising hand: dark skin tone
+1F64B 1F3FF 200D 2640 ; minimally-qualified # 🙋🏿♀ E4.0 woman raising hand: dark skin tone
+1F9CF ; fully-qualified # 🧏 E12.0 deaf person
+1F9CF 1F3FB ; fully-qualified # 🧏🏻 E12.0 deaf person: light skin tone
+1F9CF 1F3FC ; fully-qualified # 🧏🏼 E12.0 deaf person: medium-light skin tone
+1F9CF 1F3FD ; fully-qualified # 🧏🏽 E12.0 deaf person: medium skin tone
+1F9CF 1F3FE ; fully-qualified # 🧏🏾 E12.0 deaf person: medium-dark skin tone
+1F9CF 1F3FF ; fully-qualified # 🧏🏿 E12.0 deaf person: dark skin tone
+1F9CF 200D 2642 FE0F ; fully-qualified # 🧏♂️ E12.0 deaf man
+1F9CF 200D 2642 ; minimally-qualified # 🧏♂ E12.0 deaf man
+1F9CF 1F3FB 200D 2642 FE0F ; fully-qualified # 🧏🏻♂️ E12.0 deaf man: light skin tone
+1F9CF 1F3FB 200D 2642 ; minimally-qualified # 🧏🏻♂ E12.0 deaf man: light skin tone
+1F9CF 1F3FC 200D 2642 FE0F ; fully-qualified # 🧏🏼♂️ E12.0 deaf man: medium-light skin tone
+1F9CF 1F3FC 200D 2642 ; minimally-qualified # 🧏🏼♂ E12.0 deaf man: medium-light skin tone
+1F9CF 1F3FD 200D 2642 FE0F ; fully-qualified # 🧏🏽♂️ E12.0 deaf man: medium skin tone
+1F9CF 1F3FD 200D 2642 ; minimally-qualified # 🧏🏽♂ E12.0 deaf man: medium skin tone
+1F9CF 1F3FE 200D 2642 FE0F ; fully-qualified # 🧏🏾♂️ E12.0 deaf man: medium-dark skin tone
+1F9CF 1F3FE 200D 2642 ; minimally-qualified # 🧏🏾♂ E12.0 deaf man: medium-dark skin tone
+1F9CF 1F3FF 200D 2642 FE0F ; fully-qualified # 🧏🏿♂️ E12.0 deaf man: dark skin tone
+1F9CF 1F3FF 200D 2642 ; minimally-qualified # 🧏🏿♂ E12.0 deaf man: dark skin tone
+1F9CF 200D 2640 FE0F ; fully-qualified # 🧏♀️ E12.0 deaf woman
+1F9CF 200D 2640 ; minimally-qualified # 🧏♀ E12.0 deaf woman
+1F9CF 1F3FB 200D 2640 FE0F ; fully-qualified # 🧏🏻♀️ E12.0 deaf woman: light skin tone
+1F9CF 1F3FB 200D 2640 ; minimally-qualified # 🧏🏻♀ E12.0 deaf woman: light skin tone
+1F9CF 1F3FC 200D 2640 FE0F ; fully-qualified # 🧏🏼♀️ E12.0 deaf woman: medium-light skin tone
+1F9CF 1F3FC 200D 2640 ; minimally-qualified # 🧏🏼♀ E12.0 deaf woman: medium-light skin tone
+1F9CF 1F3FD 200D 2640 FE0F ; fully-qualified # 🧏🏽♀️ E12.0 deaf woman: medium skin tone
+1F9CF 1F3FD 200D 2640 ; minimally-qualified # 🧏🏽♀ E12.0 deaf woman: medium skin tone
+1F9CF 1F3FE 200D 2640 FE0F ; fully-qualified # 🧏🏾♀️ E12.0 deaf woman: medium-dark skin tone
+1F9CF 1F3FE 200D 2640 ; minimally-qualified # 🧏🏾♀ E12.0 deaf woman: medium-dark skin tone
+1F9CF 1F3FF 200D 2640 FE0F ; fully-qualified # 🧏🏿♀️ E12.0 deaf woman: dark skin tone
+1F9CF 1F3FF 200D 2640 ; minimally-qualified # 🧏🏿♀ E12.0 deaf woman: dark skin tone
+1F647 ; fully-qualified # 🙇 E0.6 person bowing
+1F647 1F3FB ; fully-qualified # 🙇🏻 E1.0 person bowing: light skin tone
+1F647 1F3FC ; fully-qualified # 🙇🏼 E1.0 person bowing: medium-light skin tone
+1F647 1F3FD ; fully-qualified # 🙇🏽 E1.0 person bowing: medium skin tone
+1F647 1F3FE ; fully-qualified # 🙇🏾 E1.0 person bowing: medium-dark skin tone
+1F647 1F3FF ; fully-qualified # 🙇🏿 E1.0 person bowing: dark skin tone
+1F647 200D 2642 FE0F ; fully-qualified # 🙇♂️ E4.0 man bowing
+1F647 200D 2642 ; minimally-qualified # 🙇♂ E4.0 man bowing
+1F647 1F3FB 200D 2642 FE0F ; fully-qualified # 🙇🏻♂️ E4.0 man bowing: light skin tone
+1F647 1F3FB 200D 2642 ; minimally-qualified # 🙇🏻♂ E4.0 man bowing: light skin tone
+1F647 1F3FC 200D 2642 FE0F ; fully-qualified # 🙇🏼♂️ E4.0 man bowing: medium-light skin tone
+1F647 1F3FC 200D 2642 ; minimally-qualified # 🙇🏼♂ E4.0 man bowing: medium-light skin tone
+1F647 1F3FD 200D 2642 FE0F ; fully-qualified # 🙇🏽♂️ E4.0 man bowing: medium skin tone
+1F647 1F3FD 200D 2642 ; minimally-qualified # 🙇🏽♂ E4.0 man bowing: medium skin tone
+1F647 1F3FE 200D 2642 FE0F ; fully-qualified # 🙇🏾♂️ E4.0 man bowing: medium-dark skin tone
+1F647 1F3FE 200D 2642 ; minimally-qualified # 🙇🏾♂ E4.0 man bowing: medium-dark skin tone
+1F647 1F3FF 200D 2642 FE0F ; fully-qualified # 🙇🏿♂️ E4.0 man bowing: dark skin tone
+1F647 1F3FF 200D 2642 ; minimally-qualified # 🙇🏿♂ E4.0 man bowing: dark skin tone
+1F647 200D 2640 FE0F ; fully-qualified # 🙇♀️ E4.0 woman bowing
+1F647 200D 2640 ; minimally-qualified # 🙇♀ E4.0 woman bowing
+1F647 1F3FB 200D 2640 FE0F ; fully-qualified # 🙇🏻♀️ E4.0 woman bowing: light skin tone
+1F647 1F3FB 200D 2640 ; minimally-qualified # 🙇🏻♀ E4.0 woman bowing: light skin tone
+1F647 1F3FC 200D 2640 FE0F ; fully-qualified # 🙇🏼♀️ E4.0 woman bowing: medium-light skin tone
+1F647 1F3FC 200D 2640 ; minimally-qualified # 🙇🏼♀ E4.0 woman bowing: medium-light skin tone
+1F647 1F3FD 200D 2640 FE0F ; fully-qualified # 🙇🏽♀️ E4.0 woman bowing: medium skin tone
+1F647 1F3FD 200D 2640 ; minimally-qualified # 🙇🏽♀ E4.0 woman bowing: medium skin tone
+1F647 1F3FE 200D 2640 FE0F ; fully-qualified # 🙇🏾♀️ E4.0 woman bowing: medium-dark skin tone
+1F647 1F3FE 200D 2640 ; minimally-qualified # 🙇🏾♀ E4.0 woman bowing: medium-dark skin tone
+1F647 1F3FF 200D 2640 FE0F ; fully-qualified # 🙇🏿♀️ E4.0 woman bowing: dark skin tone
+1F647 1F3FF 200D 2640 ; minimally-qualified # 🙇🏿♀ E4.0 woman bowing: dark skin tone
+1F926 ; fully-qualified # 🤦 E3.0 person facepalming
+1F926 1F3FB ; fully-qualified # 🤦🏻 E3.0 person facepalming: light skin tone
+1F926 1F3FC ; fully-qualified # 🤦🏼 E3.0 person facepalming: medium-light skin tone
+1F926 1F3FD ; fully-qualified # 🤦🏽 E3.0 person facepalming: medium skin tone
+1F926 1F3FE ; fully-qualified # 🤦🏾 E3.0 person facepalming: medium-dark skin tone
+1F926 1F3FF ; fully-qualified # 🤦🏿 E3.0 person facepalming: dark skin tone
+1F926 200D 2642 FE0F ; fully-qualified # 🤦♂️ E4.0 man facepalming
+1F926 200D 2642 ; minimally-qualified # 🤦♂ E4.0 man facepalming
+1F926 1F3FB 200D 2642 FE0F ; fully-qualified # 🤦🏻♂️ E4.0 man facepalming: light skin tone
+1F926 1F3FB 200D 2642 ; minimally-qualified # 🤦🏻♂ E4.0 man facepalming: light skin tone
+1F926 1F3FC 200D 2642 FE0F ; fully-qualified # 🤦🏼♂️ E4.0 man facepalming: medium-light skin tone
+1F926 1F3FC 200D 2642 ; minimally-qualified # 🤦🏼♂ E4.0 man facepalming: medium-light skin tone
+1F926 1F3FD 200D 2642 FE0F ; fully-qualified # 🤦🏽♂️ E4.0 man facepalming: medium skin tone
+1F926 1F3FD 200D 2642 ; minimally-qualified # 🤦🏽♂ E4.0 man facepalming: medium skin tone
+1F926 1F3FE 200D 2642 FE0F ; fully-qualified # 🤦🏾♂️ E4.0 man facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2642 ; minimally-qualified # 🤦🏾♂ E4.0 man facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2642 FE0F ; fully-qualified # 🤦🏿♂️ E4.0 man facepalming: dark skin tone
+1F926 1F3FF 200D 2642 ; minimally-qualified # 🤦🏿♂ E4.0 man facepalming: dark skin tone
+1F926 200D 2640 FE0F ; fully-qualified # 🤦♀️ E4.0 woman facepalming
+1F926 200D 2640 ; minimally-qualified # 🤦♀ E4.0 woman facepalming
+1F926 1F3FB 200D 2640 FE0F ; fully-qualified # 🤦🏻♀️ E4.0 woman facepalming: light skin tone
+1F926 1F3FB 200D 2640 ; minimally-qualified # 🤦🏻♀ E4.0 woman facepalming: light skin tone
+1F926 1F3FC 200D 2640 FE0F ; fully-qualified # 🤦🏼♀️ E4.0 woman facepalming: medium-light skin tone
+1F926 1F3FC 200D 2640 ; minimally-qualified # 🤦🏼♀ E4.0 woman facepalming: medium-light skin tone
+1F926 1F3FD 200D 2640 FE0F ; fully-qualified # 🤦🏽♀️ E4.0 woman facepalming: medium skin tone
+1F926 1F3FD 200D 2640 ; minimally-qualified # 🤦🏽♀ E4.0 woman facepalming: medium skin tone
+1F926 1F3FE 200D 2640 FE0F ; fully-qualified # 🤦🏾♀️ E4.0 woman facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2640 ; minimally-qualified # 🤦🏾♀ E4.0 woman facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2640 FE0F ; fully-qualified # 🤦🏿♀️ E4.0 woman facepalming: dark skin tone
+1F926 1F3FF 200D 2640 ; minimally-qualified # 🤦🏿♀ E4.0 woman facepalming: dark skin tone
+1F937 ; fully-qualified # 🤷 E3.0 person shrugging
+1F937 1F3FB ; fully-qualified # 🤷🏻 E3.0 person shrugging: light skin tone
+1F937 1F3FC ; fully-qualified # 🤷🏼 E3.0 person shrugging: medium-light skin tone
+1F937 1F3FD ; fully-qualified # 🤷🏽 E3.0 person shrugging: medium skin tone
+1F937 1F3FE ; fully-qualified # 🤷🏾 E3.0 person shrugging: medium-dark skin tone
+1F937 1F3FF ; fully-qualified # 🤷🏿 E3.0 person shrugging: dark skin tone
+1F937 200D 2642 FE0F ; fully-qualified # 🤷♂️ E4.0 man shrugging
+1F937 200D 2642 ; minimally-qualified # 🤷♂ E4.0 man shrugging
+1F937 1F3FB 200D 2642 FE0F ; fully-qualified # 🤷🏻♂️ E4.0 man shrugging: light skin tone
+1F937 1F3FB 200D 2642 ; minimally-qualified # 🤷🏻♂ E4.0 man shrugging: light skin tone
+1F937 1F3FC 200D 2642 FE0F ; fully-qualified # 🤷🏼♂️ E4.0 man shrugging: medium-light skin tone
+1F937 1F3FC 200D 2642 ; minimally-qualified # 🤷🏼♂ E4.0 man shrugging: medium-light skin tone
+1F937 1F3FD 200D 2642 FE0F ; fully-qualified # 🤷🏽♂️ E4.0 man shrugging: medium skin tone
+1F937 1F3FD 200D 2642 ; minimally-qualified # 🤷🏽♂ E4.0 man shrugging: medium skin tone
+1F937 1F3FE 200D 2642 FE0F ; fully-qualified # 🤷🏾♂️ E4.0 man shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2642 ; minimally-qualified # 🤷🏾♂ E4.0 man shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2642 FE0F ; fully-qualified # 🤷🏿♂️ E4.0 man shrugging: dark skin tone
+1F937 1F3FF 200D 2642 ; minimally-qualified # 🤷🏿♂ E4.0 man shrugging: dark skin tone
+1F937 200D 2640 FE0F ; fully-qualified # 🤷♀️ E4.0 woman shrugging
+1F937 200D 2640 ; minimally-qualified # 🤷♀ E4.0 woman shrugging
+1F937 1F3FB 200D 2640 FE0F ; fully-qualified # 🤷🏻♀️ E4.0 woman shrugging: light skin tone
+1F937 1F3FB 200D 2640 ; minimally-qualified # 🤷🏻♀ E4.0 woman shrugging: light skin tone
+1F937 1F3FC 200D 2640 FE0F ; fully-qualified # 🤷🏼♀️ E4.0 woman shrugging: medium-light skin tone
+1F937 1F3FC 200D 2640 ; minimally-qualified # 🤷🏼♀ E4.0 woman shrugging: medium-light skin tone
+1F937 1F3FD 200D 2640 FE0F ; fully-qualified # 🤷🏽♀️ E4.0 woman shrugging: medium skin tone
+1F937 1F3FD 200D 2640 ; minimally-qualified # 🤷🏽♀ E4.0 woman shrugging: medium skin tone
+1F937 1F3FE 200D 2640 FE0F ; fully-qualified # 🤷🏾♀️ E4.0 woman shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2640 ; minimally-qualified # 🤷🏾♀ E4.0 woman shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2640 FE0F ; fully-qualified # 🤷🏿♀️ E4.0 woman shrugging: dark skin tone
+1F937 1F3FF 200D 2640 ; minimally-qualified # 🤷🏿♀ E4.0 woman shrugging: dark skin tone
# subgroup: person-role
-1F9D1 200D 2695 FE0F ; fully-qualified # 🧑⚕️ health worker
-1F9D1 200D 2695 ; minimally-qualified # 🧑⚕ health worker
-1F9D1 1F3FB 200D 2695 FE0F ; fully-qualified # 🧑🏻⚕️ health worker: light skin tone
-1F9D1 1F3FB 200D 2695 ; minimally-qualified # 🧑🏻⚕ health worker: light skin tone
-1F9D1 1F3FC 200D 2695 FE0F ; fully-qualified # 🧑🏼⚕️ health worker: medium-light skin tone
-1F9D1 1F3FC 200D 2695 ; minimally-qualified # 🧑🏼⚕ health worker: medium-light skin tone
-1F9D1 1F3FD 200D 2695 FE0F ; fully-qualified # 🧑🏽⚕️ health worker: medium skin tone
-1F9D1 1F3FD 200D 2695 ; minimally-qualified # 🧑🏽⚕ health worker: medium skin tone
-1F9D1 1F3FE 200D 2695 FE0F ; fully-qualified # 🧑🏾⚕️ health worker: medium-dark skin tone
-1F9D1 1F3FE 200D 2695 ; minimally-qualified # 🧑🏾⚕ health worker: medium-dark skin tone
-1F9D1 1F3FF 200D 2695 FE0F ; fully-qualified # 🧑🏿⚕️ health worker: dark skin tone
-1F9D1 1F3FF 200D 2695 ; minimally-qualified # 🧑🏿⚕ health worker: dark skin tone
-1F468 200D 2695 FE0F ; fully-qualified # 👨⚕️ man health worker
-1F468 200D 2695 ; minimally-qualified # 👨⚕ man health worker
-1F468 1F3FB 200D 2695 FE0F ; fully-qualified # 👨🏻⚕️ man health worker: light skin tone
-1F468 1F3FB 200D 2695 ; minimally-qualified # 👨🏻⚕ man health worker: light skin tone
-1F468 1F3FC 200D 2695 FE0F ; fully-qualified # 👨🏼⚕️ man health worker: medium-light skin tone
-1F468 1F3FC 200D 2695 ; minimally-qualified # 👨🏼⚕ man health worker: medium-light skin tone
-1F468 1F3FD 200D 2695 FE0F ; fully-qualified # 👨🏽⚕️ man health worker: medium skin tone
-1F468 1F3FD 200D 2695 ; minimally-qualified # 👨🏽⚕ man health worker: medium skin tone
-1F468 1F3FE 200D 2695 FE0F ; fully-qualified # 👨🏾⚕️ man health worker: medium-dark skin tone
-1F468 1F3FE 200D 2695 ; minimally-qualified # 👨🏾⚕ man health worker: medium-dark skin tone
-1F468 1F3FF 200D 2695 FE0F ; fully-qualified # 👨🏿⚕️ man health worker: dark skin tone
-1F468 1F3FF 200D 2695 ; minimally-qualified # 👨🏿⚕ man health worker: dark skin tone
-1F469 200D 2695 FE0F ; fully-qualified # 👩⚕️ woman health worker
-1F469 200D 2695 ; minimally-qualified # 👩⚕ woman health worker
-1F469 1F3FB 200D 2695 FE0F ; fully-qualified # 👩🏻⚕️ woman health worker: light skin tone
-1F469 1F3FB 200D 2695 ; minimally-qualified # 👩🏻⚕ woman health worker: light skin tone
-1F469 1F3FC 200D 2695 FE0F ; fully-qualified # 👩🏼⚕️ woman health worker: medium-light skin tone
-1F469 1F3FC 200D 2695 ; minimally-qualified # 👩🏼⚕ woman health worker: medium-light skin tone
-1F469 1F3FD 200D 2695 FE0F ; fully-qualified # 👩🏽⚕️ woman health worker: medium skin tone
-1F469 1F3FD 200D 2695 ; minimally-qualified # 👩🏽⚕ woman health worker: medium skin tone
-1F469 1F3FE 200D 2695 FE0F ; fully-qualified # 👩🏾⚕️ woman health worker: medium-dark skin tone
-1F469 1F3FE 200D 2695 ; minimally-qualified # 👩🏾⚕ woman health worker: medium-dark skin tone
-1F469 1F3FF 200D 2695 FE0F ; fully-qualified # 👩🏿⚕️ woman health worker: dark skin tone
-1F469 1F3FF 200D 2695 ; minimally-qualified # 👩🏿⚕ woman health worker: dark skin tone
-1F9D1 200D 1F393 ; fully-qualified # 🧑🎓 student
-1F9D1 1F3FB 200D 1F393 ; fully-qualified # 🧑🏻🎓 student: light skin tone
-1F9D1 1F3FC 200D 1F393 ; fully-qualified # 🧑🏼🎓 student: medium-light skin tone
-1F9D1 1F3FD 200D 1F393 ; fully-qualified # 🧑🏽🎓 student: medium skin tone
-1F9D1 1F3FE 200D 1F393 ; fully-qualified # 🧑🏾🎓 student: medium-dark skin tone
-1F9D1 1F3FF 200D 1F393 ; fully-qualified # 🧑🏿🎓 student: dark skin tone
-1F468 200D 1F393 ; fully-qualified # 👨🎓 man student
-1F468 1F3FB 200D 1F393 ; fully-qualified # 👨🏻🎓 man student: light skin tone
-1F468 1F3FC 200D 1F393 ; fully-qualified # 👨🏼🎓 man student: medium-light skin tone
-1F468 1F3FD 200D 1F393 ; fully-qualified # 👨🏽🎓 man student: medium skin tone
-1F468 1F3FE 200D 1F393 ; fully-qualified # 👨🏾🎓 man student: medium-dark skin tone
-1F468 1F3FF 200D 1F393 ; fully-qualified # 👨🏿🎓 man student: dark skin tone
-1F469 200D 1F393 ; fully-qualified # 👩🎓 woman student
-1F469 1F3FB 200D 1F393 ; fully-qualified # 👩🏻🎓 woman student: light skin tone
-1F469 1F3FC 200D 1F393 ; fully-qualified # 👩🏼🎓 woman student: medium-light skin tone
-1F469 1F3FD 200D 1F393 ; fully-qualified # 👩🏽🎓 woman student: medium skin tone
-1F469 1F3FE 200D 1F393 ; fully-qualified # 👩🏾🎓 woman student: medium-dark skin tone
-1F469 1F3FF 200D 1F393 ; fully-qualified # 👩🏿🎓 woman student: dark skin tone
-1F9D1 200D 1F3EB ; fully-qualified # 🧑🏫 teacher
-1F9D1 1F3FB 200D 1F3EB ; fully-qualified # 🧑🏻🏫 teacher: light skin tone
-1F9D1 1F3FC 200D 1F3EB ; fully-qualified # 🧑🏼🏫 teacher: medium-light skin tone
-1F9D1 1F3FD 200D 1F3EB ; fully-qualified # 🧑🏽🏫 teacher: medium skin tone
-1F9D1 1F3FE 200D 1F3EB ; fully-qualified # 🧑🏾🏫 teacher: medium-dark skin tone
-1F9D1 1F3FF 200D 1F3EB ; fully-qualified # 🧑🏿🏫 teacher: dark skin tone
-1F468 200D 1F3EB ; fully-qualified # 👨🏫 man teacher
-1F468 1F3FB 200D 1F3EB ; fully-qualified # 👨🏻🏫 man teacher: light skin tone
-1F468 1F3FC 200D 1F3EB ; fully-qualified # 👨🏼🏫 man teacher: medium-light skin tone
-1F468 1F3FD 200D 1F3EB ; fully-qualified # 👨🏽🏫 man teacher: medium skin tone
-1F468 1F3FE 200D 1F3EB ; fully-qualified # 👨🏾🏫 man teacher: medium-dark skin tone
-1F468 1F3FF 200D 1F3EB ; fully-qualified # 👨🏿🏫 man teacher: dark skin tone
-1F469 200D 1F3EB ; fully-qualified # 👩🏫 woman teacher
-1F469 1F3FB 200D 1F3EB ; fully-qualified # 👩🏻🏫 woman teacher: light skin tone
-1F469 1F3FC 200D 1F3EB ; fully-qualified # 👩🏼🏫 woman teacher: medium-light skin tone
-1F469 1F3FD 200D 1F3EB ; fully-qualified # 👩🏽🏫 woman teacher: medium skin tone
-1F469 1F3FE 200D 1F3EB ; fully-qualified # 👩🏾🏫 woman teacher: medium-dark skin tone
-1F469 1F3FF 200D 1F3EB ; fully-qualified # 👩🏿🏫 woman teacher: dark skin tone
-1F9D1 200D 2696 FE0F ; fully-qualified # 🧑⚖️ judge
-1F9D1 200D 2696 ; minimally-qualified # 🧑⚖ judge
-1F9D1 1F3FB 200D 2696 FE0F ; fully-qualified # 🧑🏻⚖️ judge: light skin tone
-1F9D1 1F3FB 200D 2696 ; minimally-qualified # 🧑🏻⚖ judge: light skin tone
-1F9D1 1F3FC 200D 2696 FE0F ; fully-qualified # 🧑🏼⚖️ judge: medium-light skin tone
-1F9D1 1F3FC 200D 2696 ; minimally-qualified # 🧑🏼⚖ judge: medium-light skin tone
-1F9D1 1F3FD 200D 2696 FE0F ; fully-qualified # 🧑🏽⚖️ judge: medium skin tone
-1F9D1 1F3FD 200D 2696 ; minimally-qualified # 🧑🏽⚖ judge: medium skin tone
-1F9D1 1F3FE 200D 2696 FE0F ; fully-qualified # 🧑🏾⚖️ judge: medium-dark skin tone
-1F9D1 1F3FE 200D 2696 ; minimally-qualified # 🧑🏾⚖ judge: medium-dark skin tone
-1F9D1 1F3FF 200D 2696 FE0F ; fully-qualified # 🧑🏿⚖️ judge: dark skin tone
-1F9D1 1F3FF 200D 2696 ; minimally-qualified # 🧑🏿⚖ judge: dark skin tone
-1F468 200D 2696 FE0F ; fully-qualified # 👨⚖️ man judge
-1F468 200D 2696 ; minimally-qualified # 👨⚖ man judge
-1F468 1F3FB 200D 2696 FE0F ; fully-qualified # 👨🏻⚖️ man judge: light skin tone
-1F468 1F3FB 200D 2696 ; minimally-qualified # 👨🏻⚖ man judge: light skin tone
-1F468 1F3FC 200D 2696 FE0F ; fully-qualified # 👨🏼⚖️ man judge: medium-light skin tone
-1F468 1F3FC 200D 2696 ; minimally-qualified # 👨🏼⚖ man judge: medium-light skin tone
-1F468 1F3FD 200D 2696 FE0F ; fully-qualified # 👨🏽⚖️ man judge: medium skin tone
-1F468 1F3FD 200D 2696 ; minimally-qualified # 👨🏽⚖ man judge: medium skin tone
-1F468 1F3FE 200D 2696 FE0F ; fully-qualified # 👨🏾⚖️ man judge: medium-dark skin tone
-1F468 1F3FE 200D 2696 ; minimally-qualified # 👨🏾⚖ man judge: medium-dark skin tone
-1F468 1F3FF 200D 2696 FE0F ; fully-qualified # 👨🏿⚖️ man judge: dark skin tone
-1F468 1F3FF 200D 2696 ; minimally-qualified # 👨🏿⚖ man judge: dark skin tone
-1F469 200D 2696 FE0F ; fully-qualified # 👩⚖️ woman judge
-1F469 200D 2696 ; minimally-qualified # 👩⚖ woman judge
-1F469 1F3FB 200D 2696 FE0F ; fully-qualified # 👩🏻⚖️ woman judge: light skin tone
-1F469 1F3FB 200D 2696 ; minimally-qualified # 👩🏻⚖ woman judge: light skin tone
-1F469 1F3FC 200D 2696 FE0F ; fully-qualified # 👩🏼⚖️ woman judge: medium-light skin tone
-1F469 1F3FC 200D 2696 ; minimally-qualified # 👩🏼⚖ woman judge: medium-light skin tone
-1F469 1F3FD 200D 2696 FE0F ; fully-qualified # 👩🏽⚖️ woman judge: medium skin tone
-1F469 1F3FD 200D 2696 ; minimally-qualified # 👩🏽⚖ woman judge: medium skin tone
-1F469 1F3FE 200D 2696 FE0F ; fully-qualified # 👩🏾⚖️ woman judge: medium-dark skin tone
-1F469 1F3FE 200D 2696 ; minimally-qualified # 👩🏾⚖ woman judge: medium-dark skin tone
-1F469 1F3FF 200D 2696 FE0F ; fully-qualified # 👩🏿⚖️ woman judge: dark skin tone
-1F469 1F3FF 200D 2696 ; minimally-qualified # 👩🏿⚖ woman judge: dark skin tone
-1F9D1 200D 1F33E ; fully-qualified # 🧑🌾 farmer
-1F9D1 1F3FB 200D 1F33E ; fully-qualified # 🧑🏻🌾 farmer: light skin tone
-1F9D1 1F3FC 200D 1F33E ; fully-qualified # 🧑🏼🌾 farmer: medium-light skin tone
-1F9D1 1F3FD 200D 1F33E ; fully-qualified # 🧑🏽🌾 farmer: medium skin tone
-1F9D1 1F3FE 200D 1F33E ; fully-qualified # 🧑🏾🌾 farmer: medium-dark skin tone
-1F9D1 1F3FF 200D 1F33E ; fully-qualified # 🧑🏿🌾 farmer: dark skin tone
-1F468 200D 1F33E ; fully-qualified # 👨🌾 man farmer
-1F468 1F3FB 200D 1F33E ; fully-qualified # 👨🏻🌾 man farmer: light skin tone
-1F468 1F3FC 200D 1F33E ; fully-qualified # 👨🏼🌾 man farmer: medium-light skin tone
-1F468 1F3FD 200D 1F33E ; fully-qualified # 👨🏽🌾 man farmer: medium skin tone
-1F468 1F3FE 200D 1F33E ; fully-qualified # 👨🏾🌾 man farmer: medium-dark skin tone
-1F468 1F3FF 200D 1F33E ; fully-qualified # 👨🏿🌾 man farmer: dark skin tone
-1F469 200D 1F33E ; fully-qualified # 👩🌾 woman farmer
-1F469 1F3FB 200D 1F33E ; fully-qualified # 👩🏻🌾 woman farmer: light skin tone
-1F469 1F3FC 200D 1F33E ; fully-qualified # 👩🏼🌾 woman farmer: medium-light skin tone
-1F469 1F3FD 200D 1F33E ; fully-qualified # 👩🏽🌾 woman farmer: medium skin tone
-1F469 1F3FE 200D 1F33E ; fully-qualified # 👩🏾🌾 woman farmer: medium-dark skin tone
-1F469 1F3FF 200D 1F33E ; fully-qualified # 👩🏿🌾 woman farmer: dark skin tone
-1F9D1 200D 1F373 ; fully-qualified # 🧑🍳 cook
-1F9D1 1F3FB 200D 1F373 ; fully-qualified # 🧑🏻🍳 cook: light skin tone
-1F9D1 1F3FC 200D 1F373 ; fully-qualified # 🧑🏼🍳 cook: medium-light skin tone
-1F9D1 1F3FD 200D 1F373 ; fully-qualified # 🧑🏽🍳 cook: medium skin tone
-1F9D1 1F3FE 200D 1F373 ; fully-qualified # 🧑🏾🍳 cook: medium-dark skin tone
-1F9D1 1F3FF 200D 1F373 ; fully-qualified # 🧑🏿🍳 cook: dark skin tone
-1F468 200D 1F373 ; fully-qualified # 👨🍳 man cook
-1F468 1F3FB 200D 1F373 ; fully-qualified # 👨🏻🍳 man cook: light skin tone
-1F468 1F3FC 200D 1F373 ; fully-qualified # 👨🏼🍳 man cook: medium-light skin tone
-1F468 1F3FD 200D 1F373 ; fully-qualified # 👨🏽🍳 man cook: medium skin tone
-1F468 1F3FE 200D 1F373 ; fully-qualified # 👨🏾🍳 man cook: medium-dark skin tone
-1F468 1F3FF 200D 1F373 ; fully-qualified # 👨🏿🍳 man cook: dark skin tone
-1F469 200D 1F373 ; fully-qualified # 👩🍳 woman cook
-1F469 1F3FB 200D 1F373 ; fully-qualified # 👩🏻🍳 woman cook: light skin tone
-1F469 1F3FC 200D 1F373 ; fully-qualified # 👩🏼🍳 woman cook: medium-light skin tone
-1F469 1F3FD 200D 1F373 ; fully-qualified # 👩🏽🍳 woman cook: medium skin tone
-1F469 1F3FE 200D 1F373 ; fully-qualified # 👩🏾🍳 woman cook: medium-dark skin tone
-1F469 1F3FF 200D 1F373 ; fully-qualified # 👩🏿🍳 woman cook: dark skin tone
-1F9D1 200D 1F527 ; fully-qualified # 🧑🔧 mechanic
-1F9D1 1F3FB 200D 1F527 ; fully-qualified # 🧑🏻🔧 mechanic: light skin tone
-1F9D1 1F3FC 200D 1F527 ; fully-qualified # 🧑🏼🔧 mechanic: medium-light skin tone
-1F9D1 1F3FD 200D 1F527 ; fully-qualified # 🧑🏽🔧 mechanic: medium skin tone
-1F9D1 1F3FE 200D 1F527 ; fully-qualified # 🧑🏾🔧 mechanic: medium-dark skin tone
-1F9D1 1F3FF 200D 1F527 ; fully-qualified # 🧑🏿🔧 mechanic: dark skin tone
-1F468 200D 1F527 ; fully-qualified # 👨🔧 man mechanic
-1F468 1F3FB 200D 1F527 ; fully-qualified # 👨🏻🔧 man mechanic: light skin tone
-1F468 1F3FC 200D 1F527 ; fully-qualified # 👨🏼🔧 man mechanic: medium-light skin tone
-1F468 1F3FD 200D 1F527 ; fully-qualified # 👨🏽🔧 man mechanic: medium skin tone
-1F468 1F3FE 200D 1F527 ; fully-qualified # 👨🏾🔧 man mechanic: medium-dark skin tone
-1F468 1F3FF 200D 1F527 ; fully-qualified # 👨🏿🔧 man mechanic: dark skin tone
-1F469 200D 1F527 ; fully-qualified # 👩🔧 woman mechanic
-1F469 1F3FB 200D 1F527 ; fully-qualified # 👩🏻🔧 woman mechanic: light skin tone
-1F469 1F3FC 200D 1F527 ; fully-qualified # 👩🏼🔧 woman mechanic: medium-light skin tone
-1F469 1F3FD 200D 1F527 ; fully-qualified # 👩🏽🔧 woman mechanic: medium skin tone
-1F469 1F3FE 200D 1F527 ; fully-qualified # 👩🏾🔧 woman mechanic: medium-dark skin tone
-1F469 1F3FF 200D 1F527 ; fully-qualified # 👩🏿🔧 woman mechanic: dark skin tone
-1F9D1 200D 1F3ED ; fully-qualified # 🧑🏭 factory worker
-1F9D1 1F3FB 200D 1F3ED ; fully-qualified # 🧑🏻🏭 factory worker: light skin tone
-1F9D1 1F3FC 200D 1F3ED ; fully-qualified # 🧑🏼🏭 factory worker: medium-light skin tone
-1F9D1 1F3FD 200D 1F3ED ; fully-qualified # 🧑🏽🏭 factory worker: medium skin tone
-1F9D1 1F3FE 200D 1F3ED ; fully-qualified # 🧑🏾🏭 factory worker: medium-dark skin tone
-1F9D1 1F3FF 200D 1F3ED ; fully-qualified # 🧑🏿🏭 factory worker: dark skin tone
-1F468 200D 1F3ED ; fully-qualified # 👨🏭 man factory worker
-1F468 1F3FB 200D 1F3ED ; fully-qualified # 👨🏻🏭 man factory worker: light skin tone
-1F468 1F3FC 200D 1F3ED ; fully-qualified # 👨🏼🏭 man factory worker: medium-light skin tone
-1F468 1F3FD 200D 1F3ED ; fully-qualified # 👨🏽🏭 man factory worker: medium skin tone
-1F468 1F3FE 200D 1F3ED ; fully-qualified # 👨🏾🏭 man factory worker: medium-dark skin tone
-1F468 1F3FF 200D 1F3ED ; fully-qualified # 👨🏿🏭 man factory worker: dark skin tone
-1F469 200D 1F3ED ; fully-qualified # 👩🏭 woman factory worker
-1F469 1F3FB 200D 1F3ED ; fully-qualified # 👩🏻🏭 woman factory worker: light skin tone
-1F469 1F3FC 200D 1F3ED ; fully-qualified # 👩🏼🏭 woman factory worker: medium-light skin tone
-1F469 1F3FD 200D 1F3ED ; fully-qualified # 👩🏽🏭 woman factory worker: medium skin tone
-1F469 1F3FE 200D 1F3ED ; fully-qualified # 👩🏾🏭 woman factory worker: medium-dark skin tone
-1F469 1F3FF 200D 1F3ED ; fully-qualified # 👩🏿🏭 woman factory worker: dark skin tone
-1F9D1 200D 1F4BC ; fully-qualified # 🧑💼 office worker
-1F9D1 1F3FB 200D 1F4BC ; fully-qualified # 🧑🏻💼 office worker: light skin tone
-1F9D1 1F3FC 200D 1F4BC ; fully-qualified # 🧑🏼💼 office worker: medium-light skin tone
-1F9D1 1F3FD 200D 1F4BC ; fully-qualified # 🧑🏽💼 office worker: medium skin tone
-1F9D1 1F3FE 200D 1F4BC ; fully-qualified # 🧑🏾💼 office worker: medium-dark skin tone
-1F9D1 1F3FF 200D 1F4BC ; fully-qualified # 🧑🏿💼 office worker: dark skin tone
-1F468 200D 1F4BC ; fully-qualified # 👨💼 man office worker
-1F468 1F3FB 200D 1F4BC ; fully-qualified # 👨🏻💼 man office worker: light skin tone
-1F468 1F3FC 200D 1F4BC ; fully-qualified # 👨🏼💼 man office worker: medium-light skin tone
-1F468 1F3FD 200D 1F4BC ; fully-qualified # 👨🏽💼 man office worker: medium skin tone
-1F468 1F3FE 200D 1F4BC ; fully-qualified # 👨🏾💼 man office worker: medium-dark skin tone
-1F468 1F3FF 200D 1F4BC ; fully-qualified # 👨🏿💼 man office worker: dark skin tone
-1F469 200D 1F4BC ; fully-qualified # 👩💼 woman office worker
-1F469 1F3FB 200D 1F4BC ; fully-qualified # 👩🏻💼 woman office worker: light skin tone
-1F469 1F3FC 200D 1F4BC ; fully-qualified # 👩🏼💼 woman office worker: medium-light skin tone
-1F469 1F3FD 200D 1F4BC ; fully-qualified # 👩🏽💼 woman office worker: medium skin tone
-1F469 1F3FE 200D 1F4BC ; fully-qualified # 👩🏾💼 woman office worker: medium-dark skin tone
-1F469 1F3FF 200D 1F4BC ; fully-qualified # 👩🏿💼 woman office worker: dark skin tone
-1F9D1 200D 1F52C ; fully-qualified # 🧑🔬 scientist
-1F9D1 1F3FB 200D 1F52C ; fully-qualified # 🧑🏻🔬 scientist: light skin tone
-1F9D1 1F3FC 200D 1F52C ; fully-qualified # 🧑🏼🔬 scientist: medium-light skin tone
-1F9D1 1F3FD 200D 1F52C ; fully-qualified # 🧑🏽🔬 scientist: medium skin tone
-1F9D1 1F3FE 200D 1F52C ; fully-qualified # 🧑🏾🔬 scientist: medium-dark skin tone
-1F9D1 1F3FF 200D 1F52C ; fully-qualified # 🧑🏿🔬 scientist: dark skin tone
-1F468 200D 1F52C ; fully-qualified # 👨🔬 man scientist
-1F468 1F3FB 200D 1F52C ; fully-qualified # 👨🏻🔬 man scientist: light skin tone
-1F468 1F3FC 200D 1F52C ; fully-qualified # 👨🏼🔬 man scientist: medium-light skin tone
-1F468 1F3FD 200D 1F52C ; fully-qualified # 👨🏽🔬 man scientist: medium skin tone
-1F468 1F3FE 200D 1F52C ; fully-qualified # 👨🏾🔬 man scientist: medium-dark skin tone
-1F468 1F3FF 200D 1F52C ; fully-qualified # 👨🏿🔬 man scientist: dark skin tone
-1F469 200D 1F52C ; fully-qualified # 👩🔬 woman scientist
-1F469 1F3FB 200D 1F52C ; fully-qualified # 👩🏻🔬 woman scientist: light skin tone
-1F469 1F3FC 200D 1F52C ; fully-qualified # 👩🏼🔬 woman scientist: medium-light skin tone
-1F469 1F3FD 200D 1F52C ; fully-qualified # 👩🏽🔬 woman scientist: medium skin tone
-1F469 1F3FE 200D 1F52C ; fully-qualified # 👩🏾🔬 woman scientist: medium-dark skin tone
-1F469 1F3FF 200D 1F52C ; fully-qualified # 👩🏿🔬 woman scientist: dark skin tone
-1F9D1 200D 1F4BB ; fully-qualified # 🧑💻 technologist
-1F9D1 1F3FB 200D 1F4BB ; fully-qualified # 🧑🏻💻 technologist: light skin tone
-1F9D1 1F3FC 200D 1F4BB ; fully-qualified # 🧑🏼💻 technologist: medium-light skin tone
-1F9D1 1F3FD 200D 1F4BB ; fully-qualified # 🧑🏽💻 technologist: medium skin tone
-1F9D1 1F3FE 200D 1F4BB ; fully-qualified # 🧑🏾💻 technologist: medium-dark skin tone
-1F9D1 1F3FF 200D 1F4BB ; fully-qualified # 🧑🏿💻 technologist: dark skin tone
-1F468 200D 1F4BB ; fully-qualified # 👨💻 man technologist
-1F468 1F3FB 200D 1F4BB ; fully-qualified # 👨🏻💻 man technologist: light skin tone
-1F468 1F3FC 200D 1F4BB ; fully-qualified # 👨🏼💻 man technologist: medium-light skin tone
-1F468 1F3FD 200D 1F4BB ; fully-qualified # 👨🏽💻 man technologist: medium skin tone
-1F468 1F3FE 200D 1F4BB ; fully-qualified # 👨🏾💻 man technologist: medium-dark skin tone
-1F468 1F3FF 200D 1F4BB ; fully-qualified # 👨🏿💻 man technologist: dark skin tone
-1F469 200D 1F4BB ; fully-qualified # 👩💻 woman technologist
-1F469 1F3FB 200D 1F4BB ; fully-qualified # 👩🏻💻 woman technologist: light skin tone
-1F469 1F3FC 200D 1F4BB ; fully-qualified # 👩🏼💻 woman technologist: medium-light skin tone
-1F469 1F3FD 200D 1F4BB ; fully-qualified # 👩🏽💻 woman technologist: medium skin tone
-1F469 1F3FE 200D 1F4BB ; fully-qualified # 👩🏾💻 woman technologist: medium-dark skin tone
-1F469 1F3FF 200D 1F4BB ; fully-qualified # 👩🏿💻 woman technologist: dark skin tone
-1F9D1 200D 1F3A4 ; fully-qualified # 🧑🎤 singer
-1F9D1 1F3FB 200D 1F3A4 ; fully-qualified # 🧑🏻🎤 singer: light skin tone
-1F9D1 1F3FC 200D 1F3A4 ; fully-qualified # 🧑🏼🎤 singer: medium-light skin tone
-1F9D1 1F3FD 200D 1F3A4 ; fully-qualified # 🧑🏽🎤 singer: medium skin tone
-1F9D1 1F3FE 200D 1F3A4 ; fully-qualified # 🧑🏾🎤 singer: medium-dark skin tone
-1F9D1 1F3FF 200D 1F3A4 ; fully-qualified # 🧑🏿🎤 singer: dark skin tone
-1F468 200D 1F3A4 ; fully-qualified # 👨🎤 man singer
-1F468 1F3FB 200D 1F3A4 ; fully-qualified # 👨🏻🎤 man singer: light skin tone
-1F468 1F3FC 200D 1F3A4 ; fully-qualified # 👨🏼🎤 man singer: medium-light skin tone
-1F468 1F3FD 200D 1F3A4 ; fully-qualified # 👨🏽🎤 man singer: medium skin tone
-1F468 1F3FE 200D 1F3A4 ; fully-qualified # 👨🏾🎤 man singer: medium-dark skin tone
-1F468 1F3FF 200D 1F3A4 ; fully-qualified # 👨🏿🎤 man singer: dark skin tone
-1F469 200D 1F3A4 ; fully-qualified # 👩🎤 woman singer
-1F469 1F3FB 200D 1F3A4 ; fully-qualified # 👩🏻🎤 woman singer: light skin tone
-1F469 1F3FC 200D 1F3A4 ; fully-qualified # 👩🏼🎤 woman singer: medium-light skin tone
-1F469 1F3FD 200D 1F3A4 ; fully-qualified # 👩🏽🎤 woman singer: medium skin tone
-1F469 1F3FE 200D 1F3A4 ; fully-qualified # 👩🏾🎤 woman singer: medium-dark skin tone
-1F469 1F3FF 200D 1F3A4 ; fully-qualified # 👩🏿🎤 woman singer: dark skin tone
-1F9D1 200D 1F3A8 ; fully-qualified # 🧑🎨 artist
-1F9D1 1F3FB 200D 1F3A8 ; fully-qualified # 🧑🏻🎨 artist: light skin tone
-1F9D1 1F3FC 200D 1F3A8 ; fully-qualified # 🧑🏼🎨 artist: medium-light skin tone
-1F9D1 1F3FD 200D 1F3A8 ; fully-qualified # 🧑🏽🎨 artist: medium skin tone
-1F9D1 1F3FE 200D 1F3A8 ; fully-qualified # 🧑🏾🎨 artist: medium-dark skin tone
-1F9D1 1F3FF 200D 1F3A8 ; fully-qualified # 🧑🏿🎨 artist: dark skin tone
-1F468 200D 1F3A8 ; fully-qualified # 👨🎨 man artist
-1F468 1F3FB 200D 1F3A8 ; fully-qualified # 👨🏻🎨 man artist: light skin tone
-1F468 1F3FC 200D 1F3A8 ; fully-qualified # 👨🏼🎨 man artist: medium-light skin tone
-1F468 1F3FD 200D 1F3A8 ; fully-qualified # 👨🏽🎨 man artist: medium skin tone
-1F468 1F3FE 200D 1F3A8 ; fully-qualified # 👨🏾🎨 man artist: medium-dark skin tone
-1F468 1F3FF 200D 1F3A8 ; fully-qualified # 👨🏿🎨 man artist: dark skin tone
-1F469 200D 1F3A8 ; fully-qualified # 👩🎨 woman artist
-1F469 1F3FB 200D 1F3A8 ; fully-qualified # 👩🏻🎨 woman artist: light skin tone
-1F469 1F3FC 200D 1F3A8 ; fully-qualified # 👩🏼🎨 woman artist: medium-light skin tone
-1F469 1F3FD 200D 1F3A8 ; fully-qualified # 👩🏽🎨 woman artist: medium skin tone
-1F469 1F3FE 200D 1F3A8 ; fully-qualified # 👩🏾🎨 woman artist: medium-dark skin tone
-1F469 1F3FF 200D 1F3A8 ; fully-qualified # 👩🏿🎨 woman artist: dark skin tone
-1F9D1 200D 2708 FE0F ; fully-qualified # 🧑✈️ pilot
-1F9D1 200D 2708 ; minimally-qualified # 🧑✈ pilot
-1F9D1 1F3FB 200D 2708 FE0F ; fully-qualified # 🧑🏻✈️ pilot: light skin tone
-1F9D1 1F3FB 200D 2708 ; minimally-qualified # 🧑🏻✈ pilot: light skin tone
-1F9D1 1F3FC 200D 2708 FE0F ; fully-qualified # 🧑🏼✈️ pilot: medium-light skin tone
-1F9D1 1F3FC 200D 2708 ; minimally-qualified # 🧑🏼✈ pilot: medium-light skin tone
-1F9D1 1F3FD 200D 2708 FE0F ; fully-qualified # 🧑🏽✈️ pilot: medium skin tone
-1F9D1 1F3FD 200D 2708 ; minimally-qualified # 🧑🏽✈ pilot: medium skin tone
-1F9D1 1F3FE 200D 2708 FE0F ; fully-qualified # 🧑🏾✈️ pilot: medium-dark skin tone
-1F9D1 1F3FE 200D 2708 ; minimally-qualified # 🧑🏾✈ pilot: medium-dark skin tone
-1F9D1 1F3FF 200D 2708 FE0F ; fully-qualified # 🧑🏿✈️ pilot: dark skin tone
-1F9D1 1F3FF 200D 2708 ; minimally-qualified # 🧑🏿✈ pilot: dark skin tone
-1F468 200D 2708 FE0F ; fully-qualified # 👨✈️ man pilot
-1F468 200D 2708 ; minimally-qualified # 👨✈ man pilot
-1F468 1F3FB 200D 2708 FE0F ; fully-qualified # 👨🏻✈️ man pilot: light skin tone
-1F468 1F3FB 200D 2708 ; minimally-qualified # 👨🏻✈ man pilot: light skin tone
-1F468 1F3FC 200D 2708 FE0F ; fully-qualified # 👨🏼✈️ man pilot: medium-light skin tone
-1F468 1F3FC 200D 2708 ; minimally-qualified # 👨🏼✈ man pilot: medium-light skin tone
-1F468 1F3FD 200D 2708 FE0F ; fully-qualified # 👨🏽✈️ man pilot: medium skin tone
-1F468 1F3FD 200D 2708 ; minimally-qualified # 👨🏽✈ man pilot: medium skin tone
-1F468 1F3FE 200D 2708 FE0F ; fully-qualified # 👨🏾✈️ man pilot: medium-dark skin tone
-1F468 1F3FE 200D 2708 ; minimally-qualified # 👨🏾✈ man pilot: medium-dark skin tone
-1F468 1F3FF 200D 2708 FE0F ; fully-qualified # 👨🏿✈️ man pilot: dark skin tone
-1F468 1F3FF 200D 2708 ; minimally-qualified # 👨🏿✈ man pilot: dark skin tone
-1F469 200D 2708 FE0F ; fully-qualified # 👩✈️ woman pilot
-1F469 200D 2708 ; minimally-qualified # 👩✈ woman pilot
-1F469 1F3FB 200D 2708 FE0F ; fully-qualified # 👩🏻✈️ woman pilot: light skin tone
-1F469 1F3FB 200D 2708 ; minimally-qualified # 👩🏻✈ woman pilot: light skin tone
-1F469 1F3FC 200D 2708 FE0F ; fully-qualified # 👩🏼✈️ woman pilot: medium-light skin tone
-1F469 1F3FC 200D 2708 ; minimally-qualified # 👩🏼✈ woman pilot: medium-light skin tone
-1F469 1F3FD 200D 2708 FE0F ; fully-qualified # 👩🏽✈️ woman pilot: medium skin tone
-1F469 1F3FD 200D 2708 ; minimally-qualified # 👩🏽✈ woman pilot: medium skin tone
-1F469 1F3FE 200D 2708 FE0F ; fully-qualified # 👩🏾✈️ woman pilot: medium-dark skin tone
-1F469 1F3FE 200D 2708 ; minimally-qualified # 👩🏾✈ woman pilot: medium-dark skin tone
-1F469 1F3FF 200D 2708 FE0F ; fully-qualified # 👩🏿✈️ woman pilot: dark skin tone
-1F469 1F3FF 200D 2708 ; minimally-qualified # 👩🏿✈ woman pilot: dark skin tone
-1F9D1 200D 1F680 ; fully-qualified # 🧑🚀 astronaut
-1F9D1 1F3FB 200D 1F680 ; fully-qualified # 🧑🏻🚀 astronaut: light skin tone
-1F9D1 1F3FC 200D 1F680 ; fully-qualified # 🧑🏼🚀 astronaut: medium-light skin tone
-1F9D1 1F3FD 200D 1F680 ; fully-qualified # 🧑🏽🚀 astronaut: medium skin tone
-1F9D1 1F3FE 200D 1F680 ; fully-qualified # 🧑🏾🚀 astronaut: medium-dark skin tone
-1F9D1 1F3FF 200D 1F680 ; fully-qualified # 🧑🏿🚀 astronaut: dark skin tone
-1F468 200D 1F680 ; fully-qualified # 👨🚀 man astronaut
-1F468 1F3FB 200D 1F680 ; fully-qualified # 👨🏻🚀 man astronaut: light skin tone
-1F468 1F3FC 200D 1F680 ; fully-qualified # 👨🏼🚀 man astronaut: medium-light skin tone
-1F468 1F3FD 200D 1F680 ; fully-qualified # 👨🏽🚀 man astronaut: medium skin tone
-1F468 1F3FE 200D 1F680 ; fully-qualified # 👨🏾🚀 man astronaut: medium-dark skin tone
-1F468 1F3FF 200D 1F680 ; fully-qualified # 👨🏿🚀 man astronaut: dark skin tone
-1F469 200D 1F680 ; fully-qualified # 👩🚀 woman astronaut
-1F469 1F3FB 200D 1F680 ; fully-qualified # 👩🏻🚀 woman astronaut: light skin tone
-1F469 1F3FC 200D 1F680 ; fully-qualified # 👩🏼🚀 woman astronaut: medium-light skin tone
-1F469 1F3FD 200D 1F680 ; fully-qualified # 👩🏽🚀 woman astronaut: medium skin tone
-1F469 1F3FE 200D 1F680 ; fully-qualified # 👩🏾🚀 woman astronaut: medium-dark skin tone
-1F469 1F3FF 200D 1F680 ; fully-qualified # 👩🏿🚀 woman astronaut: dark skin tone
-1F9D1 200D 1F692 ; fully-qualified # 🧑🚒 firefighter
-1F9D1 1F3FB 200D 1F692 ; fully-qualified # 🧑🏻🚒 firefighter: light skin tone
-1F9D1 1F3FC 200D 1F692 ; fully-qualified # 🧑🏼🚒 firefighter: medium-light skin tone
-1F9D1 1F3FD 200D 1F692 ; fully-qualified # 🧑🏽🚒 firefighter: medium skin tone
-1F9D1 1F3FE 200D 1F692 ; fully-qualified # 🧑🏾🚒 firefighter: medium-dark skin tone
-1F9D1 1F3FF 200D 1F692 ; fully-qualified # 🧑🏿🚒 firefighter: dark skin tone
-1F468 200D 1F692 ; fully-qualified # 👨🚒 man firefighter
-1F468 1F3FB 200D 1F692 ; fully-qualified # 👨🏻🚒 man firefighter: light skin tone
-1F468 1F3FC 200D 1F692 ; fully-qualified # 👨🏼🚒 man firefighter: medium-light skin tone
-1F468 1F3FD 200D 1F692 ; fully-qualified # 👨🏽🚒 man firefighter: medium skin tone
-1F468 1F3FE 200D 1F692 ; fully-qualified # 👨🏾🚒 man firefighter: medium-dark skin tone
-1F468 1F3FF 200D 1F692 ; fully-qualified # 👨🏿🚒 man firefighter: dark skin tone
-1F469 200D 1F692 ; fully-qualified # 👩🚒 woman firefighter
-1F469 1F3FB 200D 1F692 ; fully-qualified # 👩🏻🚒 woman firefighter: light skin tone
-1F469 1F3FC 200D 1F692 ; fully-qualified # 👩🏼🚒 woman firefighter: medium-light skin tone
-1F469 1F3FD 200D 1F692 ; fully-qualified # 👩🏽🚒 woman firefighter: medium skin tone
-1F469 1F3FE 200D 1F692 ; fully-qualified # 👩🏾🚒 woman firefighter: medium-dark skin tone
-1F469 1F3FF 200D 1F692 ; fully-qualified # 👩🏿🚒 woman firefighter: dark skin tone
-1F46E ; fully-qualified # 👮 police officer
-1F46E 1F3FB ; fully-qualified # 👮🏻 police officer: light skin tone
-1F46E 1F3FC ; fully-qualified # 👮🏼 police officer: medium-light skin tone
-1F46E 1F3FD ; fully-qualified # 👮🏽 police officer: medium skin tone
-1F46E 1F3FE ; fully-qualified # 👮🏾 police officer: medium-dark skin tone
-1F46E 1F3FF ; fully-qualified # 👮🏿 police officer: dark skin tone
-1F46E 200D 2642 FE0F ; fully-qualified # 👮♂️ man police officer
-1F46E 200D 2642 ; minimally-qualified # 👮♂ man police officer
-1F46E 1F3FB 200D 2642 FE0F ; fully-qualified # 👮🏻♂️ man police officer: light skin tone
-1F46E 1F3FB 200D 2642 ; minimally-qualified # 👮🏻♂ man police officer: light skin tone
-1F46E 1F3FC 200D 2642 FE0F ; fully-qualified # 👮🏼♂️ man police officer: medium-light skin tone
-1F46E 1F3FC 200D 2642 ; minimally-qualified # 👮🏼♂ man police officer: medium-light skin tone
-1F46E 1F3FD 200D 2642 FE0F ; fully-qualified # 👮🏽♂️ man police officer: medium skin tone
-1F46E 1F3FD 200D 2642 ; minimally-qualified # 👮🏽♂ man police officer: medium skin tone
-1F46E 1F3FE 200D 2642 FE0F ; fully-qualified # 👮🏾♂️ man police officer: medium-dark skin tone
-1F46E 1F3FE 200D 2642 ; minimally-qualified # 👮🏾♂ man police officer: medium-dark skin tone
-1F46E 1F3FF 200D 2642 FE0F ; fully-qualified # 👮🏿♂️ man police officer: dark skin tone
-1F46E 1F3FF 200D 2642 ; minimally-qualified # 👮🏿♂ man police officer: dark skin tone
-1F46E 200D 2640 FE0F ; fully-qualified # 👮♀️ woman police officer
-1F46E 200D 2640 ; minimally-qualified # 👮♀ woman police officer
-1F46E 1F3FB 200D 2640 FE0F ; fully-qualified # 👮🏻♀️ woman police officer: light skin tone
-1F46E 1F3FB 200D 2640 ; minimally-qualified # 👮🏻♀ woman police officer: light skin tone
-1F46E 1F3FC 200D 2640 FE0F ; fully-qualified # 👮🏼♀️ woman police officer: medium-light skin tone
-1F46E 1F3FC 200D 2640 ; minimally-qualified # 👮🏼♀ woman police officer: medium-light skin tone
-1F46E 1F3FD 200D 2640 FE0F ; fully-qualified # 👮🏽♀️ woman police officer: medium skin tone
-1F46E 1F3FD 200D 2640 ; minimally-qualified # 👮🏽♀ woman police officer: medium skin tone
-1F46E 1F3FE 200D 2640 FE0F ; fully-qualified # 👮🏾♀️ woman police officer: medium-dark skin tone
-1F46E 1F3FE 200D 2640 ; minimally-qualified # 👮🏾♀ woman police officer: medium-dark skin tone
-1F46E 1F3FF 200D 2640 FE0F ; fully-qualified # 👮🏿♀️ woman police officer: dark skin tone
-1F46E 1F3FF 200D 2640 ; minimally-qualified # 👮🏿♀ woman police officer: dark skin tone
-1F575 FE0F ; fully-qualified # 🕵️ detective
-1F575 ; unqualified # 🕵 detective
-1F575 1F3FB ; fully-qualified # 🕵🏻 detective: light skin tone
-1F575 1F3FC ; fully-qualified # 🕵🏼 detective: medium-light skin tone
-1F575 1F3FD ; fully-qualified # 🕵🏽 detective: medium skin tone
-1F575 1F3FE ; fully-qualified # 🕵🏾 detective: medium-dark skin tone
-1F575 1F3FF ; fully-qualified # 🕵🏿 detective: dark skin tone
-1F575 FE0F 200D 2642 FE0F ; fully-qualified # 🕵️♂️ man detective
-1F575 FE0F 200D 2642 ; minimally-qualified # 🕵️♂ man detective
-1F575 200D 2642 ; unqualified # 🕵♂ man detective
-1F575 1F3FB 200D 2642 FE0F ; fully-qualified # 🕵🏻♂️ man detective: light skin tone
-1F575 1F3FB 200D 2642 ; minimally-qualified # 🕵🏻♂ man detective: light skin tone
-1F575 1F3FC 200D 2642 FE0F ; fully-qualified # 🕵🏼♂️ man detective: medium-light skin tone
-1F575 1F3FC 200D 2642 ; minimally-qualified # 🕵🏼♂ man detective: medium-light skin tone
-1F575 1F3FD 200D 2642 FE0F ; fully-qualified # 🕵🏽♂️ man detective: medium skin tone
-1F575 1F3FD 200D 2642 ; minimally-qualified # 🕵🏽♂ man detective: medium skin tone
-1F575 1F3FE 200D 2642 FE0F ; fully-qualified # 🕵🏾♂️ man detective: medium-dark skin tone
-1F575 1F3FE 200D 2642 ; minimally-qualified # 🕵🏾♂ man detective: medium-dark skin tone
-1F575 1F3FF 200D 2642 FE0F ; fully-qualified # 🕵🏿♂️ man detective: dark skin tone
-1F575 1F3FF 200D 2642 ; minimally-qualified # 🕵🏿♂ man detective: dark skin tone
-1F575 FE0F 200D 2640 FE0F ; fully-qualified # 🕵️♀️ woman detective
-1F575 FE0F 200D 2640 ; minimally-qualified # 🕵️♀ woman detective
-1F575 200D 2640 ; unqualified # 🕵♀ woman detective
-1F575 1F3FB 200D 2640 FE0F ; fully-qualified # 🕵🏻♀️ woman detective: light skin tone
-1F575 1F3FB 200D 2640 ; minimally-qualified # 🕵🏻♀ woman detective: light skin tone
-1F575 1F3FC 200D 2640 FE0F ; fully-qualified # 🕵🏼♀️ woman detective: medium-light skin tone
-1F575 1F3FC 200D 2640 ; minimally-qualified # 🕵🏼♀ woman detective: medium-light skin tone
-1F575 1F3FD 200D 2640 FE0F ; fully-qualified # 🕵🏽♀️ woman detective: medium skin tone
-1F575 1F3FD 200D 2640 ; minimally-qualified # 🕵🏽♀ woman detective: medium skin tone
-1F575 1F3FE 200D 2640 FE0F ; fully-qualified # 🕵🏾♀️ woman detective: medium-dark skin tone
-1F575 1F3FE 200D 2640 ; minimally-qualified # 🕵🏾♀ woman detective: medium-dark skin tone
-1F575 1F3FF 200D 2640 FE0F ; fully-qualified # 🕵🏿♀️ woman detective: dark skin tone
-1F575 1F3FF 200D 2640 ; minimally-qualified # 🕵🏿♀ woman detective: dark skin tone
-1F482 ; fully-qualified # 💂 guard
-1F482 1F3FB ; fully-qualified # 💂🏻 guard: light skin tone
-1F482 1F3FC ; fully-qualified # 💂🏼 guard: medium-light skin tone
-1F482 1F3FD ; fully-qualified # 💂🏽 guard: medium skin tone
-1F482 1F3FE ; fully-qualified # 💂🏾 guard: medium-dark skin tone
-1F482 1F3FF ; fully-qualified # 💂🏿 guard: dark skin tone
-1F482 200D 2642 FE0F ; fully-qualified # 💂♂️ man guard
-1F482 200D 2642 ; minimally-qualified # 💂♂ man guard
-1F482 1F3FB 200D 2642 FE0F ; fully-qualified # 💂🏻♂️ man guard: light skin tone
-1F482 1F3FB 200D 2642 ; minimally-qualified # 💂🏻♂ man guard: light skin tone
-1F482 1F3FC 200D 2642 FE0F ; fully-qualified # 💂🏼♂️ man guard: medium-light skin tone
-1F482 1F3FC 200D 2642 ; minimally-qualified # 💂🏼♂ man guard: medium-light skin tone
-1F482 1F3FD 200D 2642 FE0F ; fully-qualified # 💂🏽♂️ man guard: medium skin tone
-1F482 1F3FD 200D 2642 ; minimally-qualified # 💂🏽♂ man guard: medium skin tone
-1F482 1F3FE 200D 2642 FE0F ; fully-qualified # 💂🏾♂️ man guard: medium-dark skin tone
-1F482 1F3FE 200D 2642 ; minimally-qualified # 💂🏾♂ man guard: medium-dark skin tone
-1F482 1F3FF 200D 2642 FE0F ; fully-qualified # 💂🏿♂️ man guard: dark skin tone
-1F482 1F3FF 200D 2642 ; minimally-qualified # 💂🏿♂ man guard: dark skin tone
-1F482 200D 2640 FE0F ; fully-qualified # 💂♀️ woman guard
-1F482 200D 2640 ; minimally-qualified # 💂♀ woman guard
-1F482 1F3FB 200D 2640 FE0F ; fully-qualified # 💂🏻♀️ woman guard: light skin tone
-1F482 1F3FB 200D 2640 ; minimally-qualified # 💂🏻♀ woman guard: light skin tone
-1F482 1F3FC 200D 2640 FE0F ; fully-qualified # 💂🏼♀️ woman guard: medium-light skin tone
-1F482 1F3FC 200D 2640 ; minimally-qualified # 💂🏼♀ woman guard: medium-light skin tone
-1F482 1F3FD 200D 2640 FE0F ; fully-qualified # 💂🏽♀️ woman guard: medium skin tone
-1F482 1F3FD 200D 2640 ; minimally-qualified # 💂🏽♀ woman guard: medium skin tone
-1F482 1F3FE 200D 2640 FE0F ; fully-qualified # 💂🏾♀️ woman guard: medium-dark skin tone
-1F482 1F3FE 200D 2640 ; minimally-qualified # 💂🏾♀ woman guard: medium-dark skin tone
-1F482 1F3FF 200D 2640 FE0F ; fully-qualified # 💂🏿♀️ woman guard: dark skin tone
-1F482 1F3FF 200D 2640 ; minimally-qualified # 💂🏿♀ woman guard: dark skin tone
-1F477 ; fully-qualified # 👷 construction worker
-1F477 1F3FB ; fully-qualified # 👷🏻 construction worker: light skin tone
-1F477 1F3FC ; fully-qualified # 👷🏼 construction worker: medium-light skin tone
-1F477 1F3FD ; fully-qualified # 👷🏽 construction worker: medium skin tone
-1F477 1F3FE ; fully-qualified # 👷🏾 construction worker: medium-dark skin tone
-1F477 1F3FF ; fully-qualified # 👷🏿 construction worker: dark skin tone
-1F477 200D 2642 FE0F ; fully-qualified # 👷♂️ man construction worker
-1F477 200D 2642 ; minimally-qualified # 👷♂ man construction worker
-1F477 1F3FB 200D 2642 FE0F ; fully-qualified # 👷🏻♂️ man construction worker: light skin tone
-1F477 1F3FB 200D 2642 ; minimally-qualified # 👷🏻♂ man construction worker: light skin tone
-1F477 1F3FC 200D 2642 FE0F ; fully-qualified # 👷🏼♂️ man construction worker: medium-light skin tone
-1F477 1F3FC 200D 2642 ; minimally-qualified # 👷🏼♂ man construction worker: medium-light skin tone
-1F477 1F3FD 200D 2642 FE0F ; fully-qualified # 👷🏽♂️ man construction worker: medium skin tone
-1F477 1F3FD 200D 2642 ; minimally-qualified # 👷🏽♂ man construction worker: medium skin tone
-1F477 1F3FE 200D 2642 FE0F ; fully-qualified # 👷🏾♂️ man construction worker: medium-dark skin tone
-1F477 1F3FE 200D 2642 ; minimally-qualified # 👷🏾♂ man construction worker: medium-dark skin tone
-1F477 1F3FF 200D 2642 FE0F ; fully-qualified # 👷🏿♂️ man construction worker: dark skin tone
-1F477 1F3FF 200D 2642 ; minimally-qualified # 👷🏿♂ man construction worker: dark skin tone
-1F477 200D 2640 FE0F ; fully-qualified # 👷♀️ woman construction worker
-1F477 200D 2640 ; minimally-qualified # 👷♀ woman construction worker
-1F477 1F3FB 200D 2640 FE0F ; fully-qualified # 👷🏻♀️ woman construction worker: light skin tone
-1F477 1F3FB 200D 2640 ; minimally-qualified # 👷🏻♀ woman construction worker: light skin tone
-1F477 1F3FC 200D 2640 FE0F ; fully-qualified # 👷🏼♀️ woman construction worker: medium-light skin tone
-1F477 1F3FC 200D 2640 ; minimally-qualified # 👷🏼♀ woman construction worker: medium-light skin tone
-1F477 1F3FD 200D 2640 FE0F ; fully-qualified # 👷🏽♀️ woman construction worker: medium skin tone
-1F477 1F3FD 200D 2640 ; minimally-qualified # 👷🏽♀ woman construction worker: medium skin tone
-1F477 1F3FE 200D 2640 FE0F ; fully-qualified # 👷🏾♀️ woman construction worker: medium-dark skin tone
-1F477 1F3FE 200D 2640 ; minimally-qualified # 👷🏾♀ woman construction worker: medium-dark skin tone
-1F477 1F3FF 200D 2640 FE0F ; fully-qualified # 👷🏿♀️ woman construction worker: dark skin tone
-1F477 1F3FF 200D 2640 ; minimally-qualified # 👷🏿♀ woman construction worker: dark skin tone
-1F934 ; fully-qualified # 🤴 prince
-1F934 1F3FB ; fully-qualified # 🤴🏻 prince: light skin tone
-1F934 1F3FC ; fully-qualified # 🤴🏼 prince: medium-light skin tone
-1F934 1F3FD ; fully-qualified # 🤴🏽 prince: medium skin tone
-1F934 1F3FE ; fully-qualified # 🤴🏾 prince: medium-dark skin tone
-1F934 1F3FF ; fully-qualified # 🤴🏿 prince: dark skin tone
-1F478 ; fully-qualified # 👸 princess
-1F478 1F3FB ; fully-qualified # 👸🏻 princess: light skin tone
-1F478 1F3FC ; fully-qualified # 👸🏼 princess: medium-light skin tone
-1F478 1F3FD ; fully-qualified # 👸🏽 princess: medium skin tone
-1F478 1F3FE ; fully-qualified # 👸🏾 princess: medium-dark skin tone
-1F478 1F3FF ; fully-qualified # 👸🏿 princess: dark skin tone
-1F473 ; fully-qualified # 👳 person wearing turban
-1F473 1F3FB ; fully-qualified # 👳🏻 person wearing turban: light skin tone
-1F473 1F3FC ; fully-qualified # 👳🏼 person wearing turban: medium-light skin tone
-1F473 1F3FD ; fully-qualified # 👳🏽 person wearing turban: medium skin tone
-1F473 1F3FE ; fully-qualified # 👳🏾 person wearing turban: medium-dark skin tone
-1F473 1F3FF ; fully-qualified # 👳🏿 person wearing turban: dark skin tone
-1F473 200D 2642 FE0F ; fully-qualified # 👳♂️ man wearing turban
-1F473 200D 2642 ; minimally-qualified # 👳♂ man wearing turban
-1F473 1F3FB 200D 2642 FE0F ; fully-qualified # 👳🏻♂️ man wearing turban: light skin tone
-1F473 1F3FB 200D 2642 ; minimally-qualified # 👳🏻♂ man wearing turban: light skin tone
-1F473 1F3FC 200D 2642 FE0F ; fully-qualified # 👳🏼♂️ man wearing turban: medium-light skin tone
-1F473 1F3FC 200D 2642 ; minimally-qualified # 👳🏼♂ man wearing turban: medium-light skin tone
-1F473 1F3FD 200D 2642 FE0F ; fully-qualified # 👳🏽♂️ man wearing turban: medium skin tone
-1F473 1F3FD 200D 2642 ; minimally-qualified # 👳🏽♂ man wearing turban: medium skin tone
-1F473 1F3FE 200D 2642 FE0F ; fully-qualified # 👳🏾♂️ man wearing turban: medium-dark skin tone
-1F473 1F3FE 200D 2642 ; minimally-qualified # 👳🏾♂ man wearing turban: medium-dark skin tone
-1F473 1F3FF 200D 2642 FE0F ; fully-qualified # 👳🏿♂️ man wearing turban: dark skin tone
-1F473 1F3FF 200D 2642 ; minimally-qualified # 👳🏿♂ man wearing turban: dark skin tone
-1F473 200D 2640 FE0F ; fully-qualified # 👳♀️ woman wearing turban
-1F473 200D 2640 ; minimally-qualified # 👳♀ woman wearing turban
-1F473 1F3FB 200D 2640 FE0F ; fully-qualified # 👳🏻♀️ woman wearing turban: light skin tone
-1F473 1F3FB 200D 2640 ; minimally-qualified # 👳🏻♀ woman wearing turban: light skin tone
-1F473 1F3FC 200D 2640 FE0F ; fully-qualified # 👳🏼♀️ woman wearing turban: medium-light skin tone
-1F473 1F3FC 200D 2640 ; minimally-qualified # 👳🏼♀ woman wearing turban: medium-light skin tone
-1F473 1F3FD 200D 2640 FE0F ; fully-qualified # 👳🏽♀️ woman wearing turban: medium skin tone
-1F473 1F3FD 200D 2640 ; minimally-qualified # 👳🏽♀ woman wearing turban: medium skin tone
-1F473 1F3FE 200D 2640 FE0F ; fully-qualified # 👳🏾♀️ woman wearing turban: medium-dark skin tone
-1F473 1F3FE 200D 2640 ; minimally-qualified # 👳🏾♀ woman wearing turban: medium-dark skin tone
-1F473 1F3FF 200D 2640 FE0F ; fully-qualified # 👳🏿♀️ woman wearing turban: dark skin tone
-1F473 1F3FF 200D 2640 ; minimally-qualified # 👳🏿♀ woman wearing turban: dark skin tone
-1F472 ; fully-qualified # 👲 person with skullcap
-1F472 1F3FB ; fully-qualified # 👲🏻 person with skullcap: light skin tone
-1F472 1F3FC ; fully-qualified # 👲🏼 person with skullcap: medium-light skin tone
-1F472 1F3FD ; fully-qualified # 👲🏽 person with skullcap: medium skin tone
-1F472 1F3FE ; fully-qualified # 👲🏾 person with skullcap: medium-dark skin tone
-1F472 1F3FF ; fully-qualified # 👲🏿 person with skullcap: dark skin tone
-1F9D5 ; fully-qualified # 🧕 woman with headscarf
-1F935 ; fully-qualified # 🤵 person in tuxedo
-1F935 200D 2642 FE0F ; fully-qualified # 🤵♂️ man in tuxedo
-1F935 200D 2642 ; minimally-qualified # 🤵♂ man in tuxedo
-1F935 1F3FB 200D 2642 FE0F ; fully-qualified # 🤵🏻♂️ man in tuxedo: light skin tone
-1F935 1F3FB 200D 2642 ; minimally-qualified # 🤵🏻♂ man in tuxedo: light skin tone
-1F935 1F3FC 200D 2642 FE0F ; fully-qualified # 🤵🏼♂️ man in tuxedo: medium-light skin tone
-1F935 1F3FC 200D 2642 ; minimally-qualified # 🤵🏼♂ man in tuxedo: medium-light skin tone
-1F935 1F3FD 200D 2642 FE0F ; fully-qualified # 🤵🏽♂️ man in tuxedo: medium skin tone
-1F935 1F3FD 200D 2642 ; minimally-qualified # 🤵🏽♂ man in tuxedo: medium skin tone
-1F935 1F3FE 200D 2642 FE0F ; fully-qualified # 🤵🏾♂️ man in tuxedo: medium-dark skin tone
-1F935 1F3FE 200D 2642 ; minimally-qualified # 🤵🏾♂ man in tuxedo: medium-dark skin tone
-1F935 1F3FF 200D 2642 FE0F ; fully-qualified # 🤵🏿♂️ man in tuxedo: dark skin tone
-1F935 1F3FF 200D 2642 ; minimally-qualified # 🤵🏿♂ man in tuxedo: dark skin tone
-1F935 200D 2640 FE0F ; fully-qualified # 🤵♀️ woman in tuxedo
-1F935 200D 2640 ; minimally-qualified # 🤵♀ woman in tuxedo
-1F935 1F3FB 200D 2640 FE0F ; fully-qualified # 🤵🏻♀️ woman in tuxedo: light skin tone
-1F935 1F3FB 200D 2640 ; minimally-qualified # 🤵🏻♀ woman in tuxedo: light skin tone
-1F935 1F3FC 200D 2640 FE0F ; fully-qualified # 🤵🏼♀️ woman in tuxedo: medium-light skin tone
-1F935 1F3FC 200D 2640 ; minimally-qualified # 🤵🏼♀ woman in tuxedo: medium-light skin tone
-1F935 1F3FD 200D 2640 FE0F ; fully-qualified # 🤵🏽♀️ woman in tuxedo: medium skin tone
-1F935 1F3FD 200D 2640 ; minimally-qualified # 🤵🏽♀ woman in tuxedo: medium skin tone
-1F935 1F3FE 200D 2640 FE0F ; fully-qualified # 🤵🏾♀️ woman in tuxedo: medium-dark skin tone
-1F935 1F3FE 200D 2640 ; minimally-qualified # 🤵🏾♀ woman in tuxedo: medium-dark skin tone
-1F935 1F3FF 200D 2640 FE0F ; fully-qualified # 🤵🏿♀️ woman in tuxedo: dark skin tone
-1F935 1F3FF 200D 2640 ; minimally-qualified # 🤵🏿♀ woman in tuxedo: dark skin tone
-1F9D5 1F3FB ; fully-qualified # 🧕🏻 woman with headscarf: light skin tone
-1F9D5 1F3FC ; fully-qualified # 🧕🏼 woman with headscarf: medium-light skin tone
-1F9D5 1F3FD ; fully-qualified # 🧕🏽 woman with headscarf: medium skin tone
-1F9D5 1F3FE ; fully-qualified # 🧕🏾 woman with headscarf: medium-dark skin tone
-1F9D5 1F3FF ; fully-qualified # 🧕🏿 woman with headscarf: dark skin tone
-1F935 1F3FB ; fully-qualified # 🤵🏻 person in tuxedo: light skin tone
-1F935 1F3FC ; fully-qualified # 🤵🏼 person in tuxedo: medium-light skin tone
-1F935 1F3FD ; fully-qualified # 🤵🏽 person in tuxedo: medium skin tone
-1F935 1F3FE ; fully-qualified # 🤵🏾 person in tuxedo: medium-dark skin tone
-1F935 1F3FF ; fully-qualified # 🤵🏿 person in tuxedo: dark skin tone
-1F470 ; fully-qualified # 👰 person with veil
-1F470 200D 2640 FE0F ; fully-qualified # 👰♀️ woman with veil
-1F470 200D 2640 ; minimally-qualified # 👰♀ woman with veil
-1F470 1F3FB 200D 2640 FE0F ; fully-qualified # 👰🏻♀️ woman with veil: light skin tone
-1F470 1F3FB 200D 2640 ; minimally-qualified # 👰🏻♀ woman with veil: light skin tone
-1F470 1F3FC 200D 2640 FE0F ; fully-qualified # 👰🏼♀️ woman with veil: medium-light skin tone
-1F470 1F3FC 200D 2640 ; minimally-qualified # 👰🏼♀ woman with veil: medium-light skin tone
-1F470 1F3FD 200D 2640 FE0F ; fully-qualified # 👰🏽♀️ woman with veil: medium skin tone
-1F470 1F3FD 200D 2640 ; minimally-qualified # 👰🏽♀ woman with veil: medium skin tone
-1F470 1F3FE 200D 2640 FE0F ; fully-qualified # 👰🏾♀️ woman with veil: medium-dark skin tone
-1F470 1F3FE 200D 2640 ; minimally-qualified # 👰🏾♀ woman with veil: medium-dark skin tone
-1F470 1F3FF 200D 2640 FE0F ; fully-qualified # 👰🏿♀️ woman with veil: dark skin tone
-1F470 1F3FF 200D 2640 ; minimally-qualified # 👰🏿♀ woman with veil: dark skin tone
-1F470 200D 2642 FE0F ; fully-qualified # 👰♂️ man with veil
-1F470 200D 2642 ; minimally-qualified # 👰♂ man with veil
-1F470 1F3FB 200D 2642 FE0F ; fully-qualified # 👰🏻♂️ man with veil: light skin tone
-1F470 1F3FB 200D 2642 ; minimally-qualified # 👰🏻♂ man with veil: light skin tone
-1F470 1F3FC 200D 2642 FE0F ; fully-qualified # 👰🏼♂️ man with veil: medium-light skin tone
-1F470 1F3FC 200D 2642 ; minimally-qualified # 👰🏼♂ man with veil: medium-light skin tone
-1F470 1F3FD 200D 2642 FE0F ; fully-qualified # 👰🏽♂️ man with veil: medium skin tone
-1F470 1F3FD 200D 2642 ; minimally-qualified # 👰🏽♂ man with veil: medium skin tone
-1F470 1F3FE 200D 2642 FE0F ; fully-qualified # 👰🏾♂️ man with veil: medium-dark skin tone
-1F470 1F3FE 200D 2642 ; minimally-qualified # 👰🏾♂ man with veil: medium-dark skin tone
-1F470 1F3FF 200D 2642 FE0F ; fully-qualified # 👰🏿♂️ man with veil: dark skin tone
-1F470 1F3FF 200D 2642 ; minimally-qualified # 👰🏿♂ man with veil: dark skin tone
-1F470 1F3FB ; fully-qualified # 👰🏻 person with veil: light skin tone
-1F470 1F3FC ; fully-qualified # 👰🏼 person with veil: medium-light skin tone
-1F470 1F3FD ; fully-qualified # 👰🏽 person with veil: medium skin tone
-1F470 1F3FE ; fully-qualified # 👰🏾 person with veil: medium-dark skin tone
-1F470 1F3FF ; fully-qualified # 👰🏿 person with veil: dark skin tone
-1F930 ; fully-qualified # 🤰 pregnant woman
-1F930 1F3FB ; fully-qualified # 🤰🏻 pregnant woman: light skin tone
-1F930 1F3FC ; fully-qualified # 🤰🏼 pregnant woman: medium-light skin tone
-1F930 1F3FD ; fully-qualified # 🤰🏽 pregnant woman: medium skin tone
-1F930 1F3FE ; fully-qualified # 🤰🏾 pregnant woman: medium-dark skin tone
-1F930 1F3FF ; fully-qualified # 🤰🏿 pregnant woman: dark skin tone
-1F931 ; fully-qualified # 🤱 breast-feeding
-1F931 1F3FB ; fully-qualified # 🤱🏻 breast-feeding: light skin tone
-1F931 1F3FC ; fully-qualified # 🤱🏼 breast-feeding: medium-light skin tone
-1F931 1F3FD ; fully-qualified # 🤱🏽 breast-feeding: medium skin tone
-1F931 1F3FE ; fully-qualified # 🤱🏾 breast-feeding: medium-dark skin tone
-1F931 1F3FF ; fully-qualified # 🤱🏿 breast-feeding: dark skin tone
-1F469 200D 1F37C ; fully-qualified # 👩🍼 woman feeding baby
-1F469 1F3FB 200D 1F37C ; fully-qualified # 👩🏻🍼 woman feeding baby: light skin tone
-1F469 1F3FC 200D 1F37C ; fully-qualified # 👩🏼🍼 woman feeding baby: medium-light skin tone
-1F469 1F3FD 200D 1F37C ; fully-qualified # 👩🏽🍼 woman feeding baby: medium skin tone
-1F469 1F3FE 200D 1F37C ; fully-qualified # 👩🏾🍼 woman feeding baby: medium-dark skin tone
-1F469 1F3FF 200D 1F37C ; fully-qualified # 👩🏿🍼 woman feeding baby: dark skin tone
-1F468 200D 1F37C ; fully-qualified # 👨🍼 man feeding baby
-1F468 1F3FB 200D 1F37C ; fully-qualified # 👨🏻🍼 man feeding baby: light skin tone
-1F468 1F3FC 200D 1F37C ; fully-qualified # 👨🏼🍼 man feeding baby: medium-light skin tone
-1F468 1F3FD 200D 1F37C ; fully-qualified # 👨🏽🍼 man feeding baby: medium skin tone
-1F468 1F3FE 200D 1F37C ; fully-qualified # 👨🏾🍼 man feeding baby: medium-dark skin tone
-1F468 1F3FF 200D 1F37C ; fully-qualified # 👨🏿🍼 man feeding baby: dark skin tone
-1F9D1 200D 1F37C ; fully-qualified # 🧑🍼 person feeding baby
-1F9D1 1F3FB 200D 1F37C ; fully-qualified # 🧑🏻🍼 person feeding baby: light skin tone
-1F9D1 1F3FC 200D 1F37C ; fully-qualified # 🧑🏼🍼 person feeding baby: medium-light skin tone
-1F9D1 1F3FD 200D 1F37C ; fully-qualified # 🧑🏽🍼 person feeding baby: medium skin tone
-1F9D1 1F3FE 200D 1F37C ; fully-qualified # 🧑🏾🍼 person feeding baby: medium-dark skin tone
-1F9D1 1F3FF 200D 1F37C ; fully-qualified # 🧑🏿🍼 person feeding baby: dark skin tone
+1F9D1 200D 2695 FE0F ; fully-qualified # 🧑⚕️ E12.1 health worker
+1F9D1 200D 2695 ; minimally-qualified # 🧑⚕ E12.1 health worker
+1F9D1 1F3FB 200D 2695 FE0F ; fully-qualified # 🧑🏻⚕️ E12.1 health worker: light skin tone
+1F9D1 1F3FB 200D 2695 ; minimally-qualified # 🧑🏻⚕ E12.1 health worker: light skin tone
+1F9D1 1F3FC 200D 2695 FE0F ; fully-qualified # 🧑🏼⚕️ E12.1 health worker: medium-light skin tone
+1F9D1 1F3FC 200D 2695 ; minimally-qualified # 🧑🏼⚕ E12.1 health worker: medium-light skin tone
+1F9D1 1F3FD 200D 2695 FE0F ; fully-qualified # 🧑🏽⚕️ E12.1 health worker: medium skin tone
+1F9D1 1F3FD 200D 2695 ; minimally-qualified # 🧑🏽⚕ E12.1 health worker: medium skin tone
+1F9D1 1F3FE 200D 2695 FE0F ; fully-qualified # 🧑🏾⚕️ E12.1 health worker: medium-dark skin tone
+1F9D1 1F3FE 200D 2695 ; minimally-qualified # 🧑🏾⚕ E12.1 health worker: medium-dark skin tone
+1F9D1 1F3FF 200D 2695 FE0F ; fully-qualified # 🧑🏿⚕️ E12.1 health worker: dark skin tone
+1F9D1 1F3FF 200D 2695 ; minimally-qualified # 🧑🏿⚕ E12.1 health worker: dark skin tone
+1F468 200D 2695 FE0F ; fully-qualified # 👨⚕️ E4.0 man health worker
+1F468 200D 2695 ; minimally-qualified # 👨⚕ E4.0 man health worker
+1F468 1F3FB 200D 2695 FE0F ; fully-qualified # 👨🏻⚕️ E4.0 man health worker: light skin tone
+1F468 1F3FB 200D 2695 ; minimally-qualified # 👨🏻⚕ E4.0 man health worker: light skin tone
+1F468 1F3FC 200D 2695 FE0F ; fully-qualified # 👨🏼⚕️ E4.0 man health worker: medium-light skin tone
+1F468 1F3FC 200D 2695 ; minimally-qualified # 👨🏼⚕ E4.0 man health worker: medium-light skin tone
+1F468 1F3FD 200D 2695 FE0F ; fully-qualified # 👨🏽⚕️ E4.0 man health worker: medium skin tone
+1F468 1F3FD 200D 2695 ; minimally-qualified # 👨🏽⚕ E4.0 man health worker: medium skin tone
+1F468 1F3FE 200D 2695 FE0F ; fully-qualified # 👨🏾⚕️ E4.0 man health worker: medium-dark skin tone
+1F468 1F3FE 200D 2695 ; minimally-qualified # 👨🏾⚕ E4.0 man health worker: medium-dark skin tone
+1F468 1F3FF 200D 2695 FE0F ; fully-qualified # 👨🏿⚕️ E4.0 man health worker: dark skin tone
+1F468 1F3FF 200D 2695 ; minimally-qualified # 👨🏿⚕ E4.0 man health worker: dark skin tone
+1F469 200D 2695 FE0F ; fully-qualified # 👩⚕️ E4.0 woman health worker
+1F469 200D 2695 ; minimally-qualified # 👩⚕ E4.0 woman health worker
+1F469 1F3FB 200D 2695 FE0F ; fully-qualified # 👩🏻⚕️ E4.0 woman health worker: light skin tone
+1F469 1F3FB 200D 2695 ; minimally-qualified # 👩🏻⚕ E4.0 woman health worker: light skin tone
+1F469 1F3FC 200D 2695 FE0F ; fully-qualified # 👩🏼⚕️ E4.0 woman health worker: medium-light skin tone
+1F469 1F3FC 200D 2695 ; minimally-qualified # 👩🏼⚕ E4.0 woman health worker: medium-light skin tone
+1F469 1F3FD 200D 2695 FE0F ; fully-qualified # 👩🏽⚕️ E4.0 woman health worker: medium skin tone
+1F469 1F3FD 200D 2695 ; minimally-qualified # 👩🏽⚕ E4.0 woman health worker: medium skin tone
+1F469 1F3FE 200D 2695 FE0F ; fully-qualified # 👩🏾⚕️ E4.0 woman health worker: medium-dark skin tone
+1F469 1F3FE 200D 2695 ; minimally-qualified # 👩🏾⚕ E4.0 woman health worker: medium-dark skin tone
+1F469 1F3FF 200D 2695 FE0F ; fully-qualified # 👩🏿⚕️ E4.0 woman health worker: dark skin tone
+1F469 1F3FF 200D 2695 ; minimally-qualified # 👩🏿⚕ E4.0 woman health worker: dark skin tone
+1F9D1 200D 1F393 ; fully-qualified # 🧑🎓 E12.1 student
+1F9D1 1F3FB 200D 1F393 ; fully-qualified # 🧑🏻🎓 E12.1 student: light skin tone
+1F9D1 1F3FC 200D 1F393 ; fully-qualified # 🧑🏼🎓 E12.1 student: medium-light skin tone
+1F9D1 1F3FD 200D 1F393 ; fully-qualified # 🧑🏽🎓 E12.1 student: medium skin tone
+1F9D1 1F3FE 200D 1F393 ; fully-qualified # 🧑🏾🎓 E12.1 student: medium-dark skin tone
+1F9D1 1F3FF 200D 1F393 ; fully-qualified # 🧑🏿🎓 E12.1 student: dark skin tone
+1F468 200D 1F393 ; fully-qualified # 👨🎓 E4.0 man student
+1F468 1F3FB 200D 1F393 ; fully-qualified # 👨🏻🎓 E4.0 man student: light skin tone
+1F468 1F3FC 200D 1F393 ; fully-qualified # 👨🏼🎓 E4.0 man student: medium-light skin tone
+1F468 1F3FD 200D 1F393 ; fully-qualified # 👨🏽🎓 E4.0 man student: medium skin tone
+1F468 1F3FE 200D 1F393 ; fully-qualified # 👨🏾🎓 E4.0 man student: medium-dark skin tone
+1F468 1F3FF 200D 1F393 ; fully-qualified # 👨🏿🎓 E4.0 man student: dark skin tone
+1F469 200D 1F393 ; fully-qualified # 👩🎓 E4.0 woman student
+1F469 1F3FB 200D 1F393 ; fully-qualified # 👩🏻🎓 E4.0 woman student: light skin tone
+1F469 1F3FC 200D 1F393 ; fully-qualified # 👩🏼🎓 E4.0 woman student: medium-light skin tone
+1F469 1F3FD 200D 1F393 ; fully-qualified # 👩🏽🎓 E4.0 woman student: medium skin tone
+1F469 1F3FE 200D 1F393 ; fully-qualified # 👩🏾🎓 E4.0 woman student: medium-dark skin tone
+1F469 1F3FF 200D 1F393 ; fully-qualified # 👩🏿🎓 E4.0 woman student: dark skin tone
+1F9D1 200D 1F3EB ; fully-qualified # 🧑🏫 E12.1 teacher
+1F9D1 1F3FB 200D 1F3EB ; fully-qualified # 🧑🏻🏫 E12.1 teacher: light skin tone
+1F9D1 1F3FC 200D 1F3EB ; fully-qualified # 🧑🏼🏫 E12.1 teacher: medium-light skin tone
+1F9D1 1F3FD 200D 1F3EB ; fully-qualified # 🧑🏽🏫 E12.1 teacher: medium skin tone
+1F9D1 1F3FE 200D 1F3EB ; fully-qualified # 🧑🏾🏫 E12.1 teacher: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3EB ; fully-qualified # 🧑🏿🏫 E12.1 teacher: dark skin tone
+1F468 200D 1F3EB ; fully-qualified # 👨🏫 E4.0 man teacher
+1F468 1F3FB 200D 1F3EB ; fully-qualified # 👨🏻🏫 E4.0 man teacher: light skin tone
+1F468 1F3FC 200D 1F3EB ; fully-qualified # 👨🏼🏫 E4.0 man teacher: medium-light skin tone
+1F468 1F3FD 200D 1F3EB ; fully-qualified # 👨🏽🏫 E4.0 man teacher: medium skin tone
+1F468 1F3FE 200D 1F3EB ; fully-qualified # 👨🏾🏫 E4.0 man teacher: medium-dark skin tone
+1F468 1F3FF 200D 1F3EB ; fully-qualified # 👨🏿🏫 E4.0 man teacher: dark skin tone
+1F469 200D 1F3EB ; fully-qualified # 👩🏫 E4.0 woman teacher
+1F469 1F3FB 200D 1F3EB ; fully-qualified # 👩🏻🏫 E4.0 woman teacher: light skin tone
+1F469 1F3FC 200D 1F3EB ; fully-qualified # 👩🏼🏫 E4.0 woman teacher: medium-light skin tone
+1F469 1F3FD 200D 1F3EB ; fully-qualified # 👩🏽🏫 E4.0 woman teacher: medium skin tone
+1F469 1F3FE 200D 1F3EB ; fully-qualified # 👩🏾🏫 E4.0 woman teacher: medium-dark skin tone
+1F469 1F3FF 200D 1F3EB ; fully-qualified # 👩🏿🏫 E4.0 woman teacher: dark skin tone
+1F9D1 200D 2696 FE0F ; fully-qualified # 🧑⚖️ E12.1 judge
+1F9D1 200D 2696 ; minimally-qualified # 🧑⚖ E12.1 judge
+1F9D1 1F3FB 200D 2696 FE0F ; fully-qualified # 🧑🏻⚖️ E12.1 judge: light skin tone
+1F9D1 1F3FB 200D 2696 ; minimally-qualified # 🧑🏻⚖ E12.1 judge: light skin tone
+1F9D1 1F3FC 200D 2696 FE0F ; fully-qualified # 🧑🏼⚖️ E12.1 judge: medium-light skin tone
+1F9D1 1F3FC 200D 2696 ; minimally-qualified # 🧑🏼⚖ E12.1 judge: medium-light skin tone
+1F9D1 1F3FD 200D 2696 FE0F ; fully-qualified # 🧑🏽⚖️ E12.1 judge: medium skin tone
+1F9D1 1F3FD 200D 2696 ; minimally-qualified # 🧑🏽⚖ E12.1 judge: medium skin tone
+1F9D1 1F3FE 200D 2696 FE0F ; fully-qualified # 🧑🏾⚖️ E12.1 judge: medium-dark skin tone
+1F9D1 1F3FE 200D 2696 ; minimally-qualified # 🧑🏾⚖ E12.1 judge: medium-dark skin tone
+1F9D1 1F3FF 200D 2696 FE0F ; fully-qualified # 🧑🏿⚖️ E12.1 judge: dark skin tone
+1F9D1 1F3FF 200D 2696 ; minimally-qualified # 🧑🏿⚖ E12.1 judge: dark skin tone
+1F468 200D 2696 FE0F ; fully-qualified # 👨⚖️ E4.0 man judge
+1F468 200D 2696 ; minimally-qualified # 👨⚖ E4.0 man judge
+1F468 1F3FB 200D 2696 FE0F ; fully-qualified # 👨🏻⚖️ E4.0 man judge: light skin tone
+1F468 1F3FB 200D 2696 ; minimally-qualified # 👨🏻⚖ E4.0 man judge: light skin tone
+1F468 1F3FC 200D 2696 FE0F ; fully-qualified # 👨🏼⚖️ E4.0 man judge: medium-light skin tone
+1F468 1F3FC 200D 2696 ; minimally-qualified # 👨🏼⚖ E4.0 man judge: medium-light skin tone
+1F468 1F3FD 200D 2696 FE0F ; fully-qualified # 👨🏽⚖️ E4.0 man judge: medium skin tone
+1F468 1F3FD 200D 2696 ; minimally-qualified # 👨🏽⚖ E4.0 man judge: medium skin tone
+1F468 1F3FE 200D 2696 FE0F ; fully-qualified # 👨🏾⚖️ E4.0 man judge: medium-dark skin tone
+1F468 1F3FE 200D 2696 ; minimally-qualified # 👨🏾⚖ E4.0 man judge: medium-dark skin tone
+1F468 1F3FF 200D 2696 FE0F ; fully-qualified # 👨🏿⚖️ E4.0 man judge: dark skin tone
+1F468 1F3FF 200D 2696 ; minimally-qualified # 👨🏿⚖ E4.0 man judge: dark skin tone
+1F469 200D 2696 FE0F ; fully-qualified # 👩⚖️ E4.0 woman judge
+1F469 200D 2696 ; minimally-qualified # 👩⚖ E4.0 woman judge
+1F469 1F3FB 200D 2696 FE0F ; fully-qualified # 👩🏻⚖️ E4.0 woman judge: light skin tone
+1F469 1F3FB 200D 2696 ; minimally-qualified # 👩🏻⚖ E4.0 woman judge: light skin tone
+1F469 1F3FC 200D 2696 FE0F ; fully-qualified # 👩🏼⚖️ E4.0 woman judge: medium-light skin tone
+1F469 1F3FC 200D 2696 ; minimally-qualified # 👩🏼⚖ E4.0 woman judge: medium-light skin tone
+1F469 1F3FD 200D 2696 FE0F ; fully-qualified # 👩🏽⚖️ E4.0 woman judge: medium skin tone
+1F469 1F3FD 200D 2696 ; minimally-qualified # 👩🏽⚖ E4.0 woman judge: medium skin tone
+1F469 1F3FE 200D 2696 FE0F ; fully-qualified # 👩🏾⚖️ E4.0 woman judge: medium-dark skin tone
+1F469 1F3FE 200D 2696 ; minimally-qualified # 👩🏾⚖ E4.0 woman judge: medium-dark skin tone
+1F469 1F3FF 200D 2696 FE0F ; fully-qualified # 👩🏿⚖️ E4.0 woman judge: dark skin tone
+1F469 1F3FF 200D 2696 ; minimally-qualified # 👩🏿⚖ E4.0 woman judge: dark skin tone
+1F9D1 200D 1F33E ; fully-qualified # 🧑🌾 E12.1 farmer
+1F9D1 1F3FB 200D 1F33E ; fully-qualified # 🧑🏻🌾 E12.1 farmer: light skin tone
+1F9D1 1F3FC 200D 1F33E ; fully-qualified # 🧑🏼🌾 E12.1 farmer: medium-light skin tone
+1F9D1 1F3FD 200D 1F33E ; fully-qualified # 🧑🏽🌾 E12.1 farmer: medium skin tone
+1F9D1 1F3FE 200D 1F33E ; fully-qualified # 🧑🏾🌾 E12.1 farmer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F33E ; fully-qualified # 🧑🏿🌾 E12.1 farmer: dark skin tone
+1F468 200D 1F33E ; fully-qualified # 👨🌾 E4.0 man farmer
+1F468 1F3FB 200D 1F33E ; fully-qualified # 👨🏻🌾 E4.0 man farmer: light skin tone
+1F468 1F3FC 200D 1F33E ; fully-qualified # 👨🏼🌾 E4.0 man farmer: medium-light skin tone
+1F468 1F3FD 200D 1F33E ; fully-qualified # 👨🏽🌾 E4.0 man farmer: medium skin tone
+1F468 1F3FE 200D 1F33E ; fully-qualified # 👨🏾🌾 E4.0 man farmer: medium-dark skin tone
+1F468 1F3FF 200D 1F33E ; fully-qualified # 👨🏿🌾 E4.0 man farmer: dark skin tone
+1F469 200D 1F33E ; fully-qualified # 👩🌾 E4.0 woman farmer
+1F469 1F3FB 200D 1F33E ; fully-qualified # 👩🏻🌾 E4.0 woman farmer: light skin tone
+1F469 1F3FC 200D 1F33E ; fully-qualified # 👩🏼🌾 E4.0 woman farmer: medium-light skin tone
+1F469 1F3FD 200D 1F33E ; fully-qualified # 👩🏽🌾 E4.0 woman farmer: medium skin tone
+1F469 1F3FE 200D 1F33E ; fully-qualified # 👩🏾🌾 E4.0 woman farmer: medium-dark skin tone
+1F469 1F3FF 200D 1F33E ; fully-qualified # 👩🏿🌾 E4.0 woman farmer: dark skin tone
+1F9D1 200D 1F373 ; fully-qualified # 🧑🍳 E12.1 cook
+1F9D1 1F3FB 200D 1F373 ; fully-qualified # 🧑🏻🍳 E12.1 cook: light skin tone
+1F9D1 1F3FC 200D 1F373 ; fully-qualified # 🧑🏼🍳 E12.1 cook: medium-light skin tone
+1F9D1 1F3FD 200D 1F373 ; fully-qualified # 🧑🏽🍳 E12.1 cook: medium skin tone
+1F9D1 1F3FE 200D 1F373 ; fully-qualified # 🧑🏾🍳 E12.1 cook: medium-dark skin tone
+1F9D1 1F3FF 200D 1F373 ; fully-qualified # 🧑🏿🍳 E12.1 cook: dark skin tone
+1F468 200D 1F373 ; fully-qualified # 👨🍳 E4.0 man cook
+1F468 1F3FB 200D 1F373 ; fully-qualified # 👨🏻🍳 E4.0 man cook: light skin tone
+1F468 1F3FC 200D 1F373 ; fully-qualified # 👨🏼🍳 E4.0 man cook: medium-light skin tone
+1F468 1F3FD 200D 1F373 ; fully-qualified # 👨🏽🍳 E4.0 man cook: medium skin tone
+1F468 1F3FE 200D 1F373 ; fully-qualified # 👨🏾🍳 E4.0 man cook: medium-dark skin tone
+1F468 1F3FF 200D 1F373 ; fully-qualified # 👨🏿🍳 E4.0 man cook: dark skin tone
+1F469 200D 1F373 ; fully-qualified # 👩🍳 E4.0 woman cook
+1F469 1F3FB 200D 1F373 ; fully-qualified # 👩🏻🍳 E4.0 woman cook: light skin tone
+1F469 1F3FC 200D 1F373 ; fully-qualified # 👩🏼🍳 E4.0 woman cook: medium-light skin tone
+1F469 1F3FD 200D 1F373 ; fully-qualified # 👩🏽🍳 E4.0 woman cook: medium skin tone
+1F469 1F3FE 200D 1F373 ; fully-qualified # 👩🏾🍳 E4.0 woman cook: medium-dark skin tone
+1F469 1F3FF 200D 1F373 ; fully-qualified # 👩🏿🍳 E4.0 woman cook: dark skin tone
+1F9D1 200D 1F527 ; fully-qualified # 🧑🔧 E12.1 mechanic
+1F9D1 1F3FB 200D 1F527 ; fully-qualified # 🧑🏻🔧 E12.1 mechanic: light skin tone
+1F9D1 1F3FC 200D 1F527 ; fully-qualified # 🧑🏼🔧 E12.1 mechanic: medium-light skin tone
+1F9D1 1F3FD 200D 1F527 ; fully-qualified # 🧑🏽🔧 E12.1 mechanic: medium skin tone
+1F9D1 1F3FE 200D 1F527 ; fully-qualified # 🧑🏾🔧 E12.1 mechanic: medium-dark skin tone
+1F9D1 1F3FF 200D 1F527 ; fully-qualified # 🧑🏿🔧 E12.1 mechanic: dark skin tone
+1F468 200D 1F527 ; fully-qualified # 👨🔧 E4.0 man mechanic
+1F468 1F3FB 200D 1F527 ; fully-qualified # 👨🏻🔧 E4.0 man mechanic: light skin tone
+1F468 1F3FC 200D 1F527 ; fully-qualified # 👨🏼🔧 E4.0 man mechanic: medium-light skin tone
+1F468 1F3FD 200D 1F527 ; fully-qualified # 👨🏽🔧 E4.0 man mechanic: medium skin tone
+1F468 1F3FE 200D 1F527 ; fully-qualified # 👨🏾🔧 E4.0 man mechanic: medium-dark skin tone
+1F468 1F3FF 200D 1F527 ; fully-qualified # 👨🏿🔧 E4.0 man mechanic: dark skin tone
+1F469 200D 1F527 ; fully-qualified # 👩🔧 E4.0 woman mechanic
+1F469 1F3FB 200D 1F527 ; fully-qualified # 👩🏻🔧 E4.0 woman mechanic: light skin tone
+1F469 1F3FC 200D 1F527 ; fully-qualified # 👩🏼🔧 E4.0 woman mechanic: medium-light skin tone
+1F469 1F3FD 200D 1F527 ; fully-qualified # 👩🏽🔧 E4.0 woman mechanic: medium skin tone
+1F469 1F3FE 200D 1F527 ; fully-qualified # 👩🏾🔧 E4.0 woman mechanic: medium-dark skin tone
+1F469 1F3FF 200D 1F527 ; fully-qualified # 👩🏿🔧 E4.0 woman mechanic: dark skin tone
+1F9D1 200D 1F3ED ; fully-qualified # 🧑🏭 E12.1 factory worker
+1F9D1 1F3FB 200D 1F3ED ; fully-qualified # 🧑🏻🏭 E12.1 factory worker: light skin tone
+1F9D1 1F3FC 200D 1F3ED ; fully-qualified # 🧑🏼🏭 E12.1 factory worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F3ED ; fully-qualified # 🧑🏽🏭 E12.1 factory worker: medium skin tone
+1F9D1 1F3FE 200D 1F3ED ; fully-qualified # 🧑🏾🏭 E12.1 factory worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3ED ; fully-qualified # 🧑🏿🏭 E12.1 factory worker: dark skin tone
+1F468 200D 1F3ED ; fully-qualified # 👨🏭 E4.0 man factory worker
+1F468 1F3FB 200D 1F3ED ; fully-qualified # 👨🏻🏭 E4.0 man factory worker: light skin tone
+1F468 1F3FC 200D 1F3ED ; fully-qualified # 👨🏼🏭 E4.0 man factory worker: medium-light skin tone
+1F468 1F3FD 200D 1F3ED ; fully-qualified # 👨🏽🏭 E4.0 man factory worker: medium skin tone
+1F468 1F3FE 200D 1F3ED ; fully-qualified # 👨🏾🏭 E4.0 man factory worker: medium-dark skin tone
+1F468 1F3FF 200D 1F3ED ; fully-qualified # 👨🏿🏭 E4.0 man factory worker: dark skin tone
+1F469 200D 1F3ED ; fully-qualified # 👩🏭 E4.0 woman factory worker
+1F469 1F3FB 200D 1F3ED ; fully-qualified # 👩🏻🏭 E4.0 woman factory worker: light skin tone
+1F469 1F3FC 200D 1F3ED ; fully-qualified # 👩🏼🏭 E4.0 woman factory worker: medium-light skin tone
+1F469 1F3FD 200D 1F3ED ; fully-qualified # 👩🏽🏭 E4.0 woman factory worker: medium skin tone
+1F469 1F3FE 200D 1F3ED ; fully-qualified # 👩🏾🏭 E4.0 woman factory worker: medium-dark skin tone
+1F469 1F3FF 200D 1F3ED ; fully-qualified # 👩🏿🏭 E4.0 woman factory worker: dark skin tone
+1F9D1 200D 1F4BC ; fully-qualified # 🧑💼 E12.1 office worker
+1F9D1 1F3FB 200D 1F4BC ; fully-qualified # 🧑🏻💼 E12.1 office worker: light skin tone
+1F9D1 1F3FC 200D 1F4BC ; fully-qualified # 🧑🏼💼 E12.1 office worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BC ; fully-qualified # 🧑🏽💼 E12.1 office worker: medium skin tone
+1F9D1 1F3FE 200D 1F4BC ; fully-qualified # 🧑🏾💼 E12.1 office worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BC ; fully-qualified # 🧑🏿💼 E12.1 office worker: dark skin tone
+1F468 200D 1F4BC ; fully-qualified # 👨💼 E4.0 man office worker
+1F468 1F3FB 200D 1F4BC ; fully-qualified # 👨🏻💼 E4.0 man office worker: light skin tone
+1F468 1F3FC 200D 1F4BC ; fully-qualified # 👨🏼💼 E4.0 man office worker: medium-light skin tone
+1F468 1F3FD 200D 1F4BC ; fully-qualified # 👨🏽💼 E4.0 man office worker: medium skin tone
+1F468 1F3FE 200D 1F4BC ; fully-qualified # 👨🏾💼 E4.0 man office worker: medium-dark skin tone
+1F468 1F3FF 200D 1F4BC ; fully-qualified # 👨🏿💼 E4.0 man office worker: dark skin tone
+1F469 200D 1F4BC ; fully-qualified # 👩💼 E4.0 woman office worker
+1F469 1F3FB 200D 1F4BC ; fully-qualified # 👩🏻💼 E4.0 woman office worker: light skin tone
+1F469 1F3FC 200D 1F4BC ; fully-qualified # 👩🏼💼 E4.0 woman office worker: medium-light skin tone
+1F469 1F3FD 200D 1F4BC ; fully-qualified # 👩🏽💼 E4.0 woman office worker: medium skin tone
+1F469 1F3FE 200D 1F4BC ; fully-qualified # 👩🏾💼 E4.0 woman office worker: medium-dark skin tone
+1F469 1F3FF 200D 1F4BC ; fully-qualified # 👩🏿💼 E4.0 woman office worker: dark skin tone
+1F9D1 200D 1F52C ; fully-qualified # 🧑🔬 E12.1 scientist
+1F9D1 1F3FB 200D 1F52C ; fully-qualified # 🧑🏻🔬 E12.1 scientist: light skin tone
+1F9D1 1F3FC 200D 1F52C ; fully-qualified # 🧑🏼🔬 E12.1 scientist: medium-light skin tone
+1F9D1 1F3FD 200D 1F52C ; fully-qualified # 🧑🏽🔬 E12.1 scientist: medium skin tone
+1F9D1 1F3FE 200D 1F52C ; fully-qualified # 🧑🏾🔬 E12.1 scientist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F52C ; fully-qualified # 🧑🏿🔬 E12.1 scientist: dark skin tone
+1F468 200D 1F52C ; fully-qualified # 👨🔬 E4.0 man scientist
+1F468 1F3FB 200D 1F52C ; fully-qualified # 👨🏻🔬 E4.0 man scientist: light skin tone
+1F468 1F3FC 200D 1F52C ; fully-qualified # 👨🏼🔬 E4.0 man scientist: medium-light skin tone
+1F468 1F3FD 200D 1F52C ; fully-qualified # 👨🏽🔬 E4.0 man scientist: medium skin tone
+1F468 1F3FE 200D 1F52C ; fully-qualified # 👨🏾🔬 E4.0 man scientist: medium-dark skin tone
+1F468 1F3FF 200D 1F52C ; fully-qualified # 👨🏿🔬 E4.0 man scientist: dark skin tone
+1F469 200D 1F52C ; fully-qualified # 👩🔬 E4.0 woman scientist
+1F469 1F3FB 200D 1F52C ; fully-qualified # 👩🏻🔬 E4.0 woman scientist: light skin tone
+1F469 1F3FC 200D 1F52C ; fully-qualified # 👩🏼🔬 E4.0 woman scientist: medium-light skin tone
+1F469 1F3FD 200D 1F52C ; fully-qualified # 👩🏽🔬 E4.0 woman scientist: medium skin tone
+1F469 1F3FE 200D 1F52C ; fully-qualified # 👩🏾🔬 E4.0 woman scientist: medium-dark skin tone
+1F469 1F3FF 200D 1F52C ; fully-qualified # 👩🏿🔬 E4.0 woman scientist: dark skin tone
+1F9D1 200D 1F4BB ; fully-qualified # 🧑💻 E12.1 technologist
+1F9D1 1F3FB 200D 1F4BB ; fully-qualified # 🧑🏻💻 E12.1 technologist: light skin tone
+1F9D1 1F3FC 200D 1F4BB ; fully-qualified # 🧑🏼💻 E12.1 technologist: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BB ; fully-qualified # 🧑🏽💻 E12.1 technologist: medium skin tone
+1F9D1 1F3FE 200D 1F4BB ; fully-qualified # 🧑🏾💻 E12.1 technologist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BB ; fully-qualified # 🧑🏿💻 E12.1 technologist: dark skin tone
+1F468 200D 1F4BB ; fully-qualified # 👨💻 E4.0 man technologist
+1F468 1F3FB 200D 1F4BB ; fully-qualified # 👨🏻💻 E4.0 man technologist: light skin tone
+1F468 1F3FC 200D 1F4BB ; fully-qualified # 👨🏼💻 E4.0 man technologist: medium-light skin tone
+1F468 1F3FD 200D 1F4BB ; fully-qualified # 👨🏽💻 E4.0 man technologist: medium skin tone
+1F468 1F3FE 200D 1F4BB ; fully-qualified # 👨🏾💻 E4.0 man technologist: medium-dark skin tone
+1F468 1F3FF 200D 1F4BB ; fully-qualified # 👨🏿💻 E4.0 man technologist: dark skin tone
+1F469 200D 1F4BB ; fully-qualified # 👩💻 E4.0 woman technologist
+1F469 1F3FB 200D 1F4BB ; fully-qualified # 👩🏻💻 E4.0 woman technologist: light skin tone
+1F469 1F3FC 200D 1F4BB ; fully-qualified # 👩🏼💻 E4.0 woman technologist: medium-light skin tone
+1F469 1F3FD 200D 1F4BB ; fully-qualified # 👩🏽💻 E4.0 woman technologist: medium skin tone
+1F469 1F3FE 200D 1F4BB ; fully-qualified # 👩🏾💻 E4.0 woman technologist: medium-dark skin tone
+1F469 1F3FF 200D 1F4BB ; fully-qualified # 👩🏿💻 E4.0 woman technologist: dark skin tone
+1F9D1 200D 1F3A4 ; fully-qualified # 🧑🎤 E12.1 singer
+1F9D1 1F3FB 200D 1F3A4 ; fully-qualified # 🧑🏻🎤 E12.1 singer: light skin tone
+1F9D1 1F3FC 200D 1F3A4 ; fully-qualified # 🧑🏼🎤 E12.1 singer: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A4 ; fully-qualified # 🧑🏽🎤 E12.1 singer: medium skin tone
+1F9D1 1F3FE 200D 1F3A4 ; fully-qualified # 🧑🏾🎤 E12.1 singer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A4 ; fully-qualified # 🧑🏿🎤 E12.1 singer: dark skin tone
+1F468 200D 1F3A4 ; fully-qualified # 👨🎤 E4.0 man singer
+1F468 1F3FB 200D 1F3A4 ; fully-qualified # 👨🏻🎤 E4.0 man singer: light skin tone
+1F468 1F3FC 200D 1F3A4 ; fully-qualified # 👨🏼🎤 E4.0 man singer: medium-light skin tone
+1F468 1F3FD 200D 1F3A4 ; fully-qualified # 👨🏽🎤 E4.0 man singer: medium skin tone
+1F468 1F3FE 200D 1F3A4 ; fully-qualified # 👨🏾🎤 E4.0 man singer: medium-dark skin tone
+1F468 1F3FF 200D 1F3A4 ; fully-qualified # 👨🏿🎤 E4.0 man singer: dark skin tone
+1F469 200D 1F3A4 ; fully-qualified # 👩🎤 E4.0 woman singer
+1F469 1F3FB 200D 1F3A4 ; fully-qualified # 👩🏻🎤 E4.0 woman singer: light skin tone
+1F469 1F3FC 200D 1F3A4 ; fully-qualified # 👩🏼🎤 E4.0 woman singer: medium-light skin tone
+1F469 1F3FD 200D 1F3A4 ; fully-qualified # 👩🏽🎤 E4.0 woman singer: medium skin tone
+1F469 1F3FE 200D 1F3A4 ; fully-qualified # 👩🏾🎤 E4.0 woman singer: medium-dark skin tone
+1F469 1F3FF 200D 1F3A4 ; fully-qualified # 👩🏿🎤 E4.0 woman singer: dark skin tone
+1F9D1 200D 1F3A8 ; fully-qualified # 🧑🎨 E12.1 artist
+1F9D1 1F3FB 200D 1F3A8 ; fully-qualified # 🧑🏻🎨 E12.1 artist: light skin tone
+1F9D1 1F3FC 200D 1F3A8 ; fully-qualified # 🧑🏼🎨 E12.1 artist: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A8 ; fully-qualified # 🧑🏽🎨 E12.1 artist: medium skin tone
+1F9D1 1F3FE 200D 1F3A8 ; fully-qualified # 🧑🏾🎨 E12.1 artist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A8 ; fully-qualified # 🧑🏿🎨 E12.1 artist: dark skin tone
+1F468 200D 1F3A8 ; fully-qualified # 👨🎨 E4.0 man artist
+1F468 1F3FB 200D 1F3A8 ; fully-qualified # 👨🏻🎨 E4.0 man artist: light skin tone
+1F468 1F3FC 200D 1F3A8 ; fully-qualified # 👨🏼🎨 E4.0 man artist: medium-light skin tone
+1F468 1F3FD 200D 1F3A8 ; fully-qualified # 👨🏽🎨 E4.0 man artist: medium skin tone
+1F468 1F3FE 200D 1F3A8 ; fully-qualified # 👨🏾🎨 E4.0 man artist: medium-dark skin tone
+1F468 1F3FF 200D 1F3A8 ; fully-qualified # 👨🏿🎨 E4.0 man artist: dark skin tone
+1F469 200D 1F3A8 ; fully-qualified # 👩🎨 E4.0 woman artist
+1F469 1F3FB 200D 1F3A8 ; fully-qualified # 👩🏻🎨 E4.0 woman artist: light skin tone
+1F469 1F3FC 200D 1F3A8 ; fully-qualified # 👩🏼🎨 E4.0 woman artist: medium-light skin tone
+1F469 1F3FD 200D 1F3A8 ; fully-qualified # 👩🏽🎨 E4.0 woman artist: medium skin tone
+1F469 1F3FE 200D 1F3A8 ; fully-qualified # 👩🏾🎨 E4.0 woman artist: medium-dark skin tone
+1F469 1F3FF 200D 1F3A8 ; fully-qualified # 👩🏿🎨 E4.0 woman artist: dark skin tone
+1F9D1 200D 2708 FE0F ; fully-qualified # 🧑✈️ E12.1 pilot
+1F9D1 200D 2708 ; minimally-qualified # 🧑✈ E12.1 pilot
+1F9D1 1F3FB 200D 2708 FE0F ; fully-qualified # 🧑🏻✈️ E12.1 pilot: light skin tone
+1F9D1 1F3FB 200D 2708 ; minimally-qualified # 🧑🏻✈ E12.1 pilot: light skin tone
+1F9D1 1F3FC 200D 2708 FE0F ; fully-qualified # 🧑🏼✈️ E12.1 pilot: medium-light skin tone
+1F9D1 1F3FC 200D 2708 ; minimally-qualified # 🧑🏼✈ E12.1 pilot: medium-light skin tone
+1F9D1 1F3FD 200D 2708 FE0F ; fully-qualified # 🧑🏽✈️ E12.1 pilot: medium skin tone
+1F9D1 1F3FD 200D 2708 ; minimally-qualified # 🧑🏽✈ E12.1 pilot: medium skin tone
+1F9D1 1F3FE 200D 2708 FE0F ; fully-qualified # 🧑🏾✈️ E12.1 pilot: medium-dark skin tone
+1F9D1 1F3FE 200D 2708 ; minimally-qualified # 🧑🏾✈ E12.1 pilot: medium-dark skin tone
+1F9D1 1F3FF 200D 2708 FE0F ; fully-qualified # 🧑🏿✈️ E12.1 pilot: dark skin tone
+1F9D1 1F3FF 200D 2708 ; minimally-qualified # 🧑🏿✈ E12.1 pilot: dark skin tone
+1F468 200D 2708 FE0F ; fully-qualified # 👨✈️ E4.0 man pilot
+1F468 200D 2708 ; minimally-qualified # 👨✈ E4.0 man pilot
+1F468 1F3FB 200D 2708 FE0F ; fully-qualified # 👨🏻✈️ E4.0 man pilot: light skin tone
+1F468 1F3FB 200D 2708 ; minimally-qualified # 👨🏻✈ E4.0 man pilot: light skin tone
+1F468 1F3FC 200D 2708 FE0F ; fully-qualified # 👨🏼✈️ E4.0 man pilot: medium-light skin tone
+1F468 1F3FC 200D 2708 ; minimally-qualified # 👨🏼✈ E4.0 man pilot: medium-light skin tone
+1F468 1F3FD 200D 2708 FE0F ; fully-qualified # 👨🏽✈️ E4.0 man pilot: medium skin tone
+1F468 1F3FD 200D 2708 ; minimally-qualified # 👨🏽✈ E4.0 man pilot: medium skin tone
+1F468 1F3FE 200D 2708 FE0F ; fully-qualified # 👨🏾✈️ E4.0 man pilot: medium-dark skin tone
+1F468 1F3FE 200D 2708 ; minimally-qualified # 👨🏾✈ E4.0 man pilot: medium-dark skin tone
+1F468 1F3FF 200D 2708 FE0F ; fully-qualified # 👨🏿✈️ E4.0 man pilot: dark skin tone
+1F468 1F3FF 200D 2708 ; minimally-qualified # 👨🏿✈ E4.0 man pilot: dark skin tone
+1F469 200D 2708 FE0F ; fully-qualified # 👩✈️ E4.0 woman pilot
+1F469 200D 2708 ; minimally-qualified # 👩✈ E4.0 woman pilot
+1F469 1F3FB 200D 2708 FE0F ; fully-qualified # 👩🏻✈️ E4.0 woman pilot: light skin tone
+1F469 1F3FB 200D 2708 ; minimally-qualified # 👩🏻✈ E4.0 woman pilot: light skin tone
+1F469 1F3FC 200D 2708 FE0F ; fully-qualified # 👩🏼✈️ E4.0 woman pilot: medium-light skin tone
+1F469 1F3FC 200D 2708 ; minimally-qualified # 👩🏼✈ E4.0 woman pilot: medium-light skin tone
+1F469 1F3FD 200D 2708 FE0F ; fully-qualified # 👩🏽✈️ E4.0 woman pilot: medium skin tone
+1F469 1F3FD 200D 2708 ; minimally-qualified # 👩🏽✈ E4.0 woman pilot: medium skin tone
+1F469 1F3FE 200D 2708 FE0F ; fully-qualified # 👩🏾✈️ E4.0 woman pilot: medium-dark skin tone
+1F469 1F3FE 200D 2708 ; minimally-qualified # 👩🏾✈ E4.0 woman pilot: medium-dark skin tone
+1F469 1F3FF 200D 2708 FE0F ; fully-qualified # 👩🏿✈️ E4.0 woman pilot: dark skin tone
+1F469 1F3FF 200D 2708 ; minimally-qualified # 👩🏿✈ E4.0 woman pilot: dark skin tone
+1F9D1 200D 1F680 ; fully-qualified # 🧑🚀 E12.1 astronaut
+1F9D1 1F3FB 200D 1F680 ; fully-qualified # 🧑🏻🚀 E12.1 astronaut: light skin tone
+1F9D1 1F3FC 200D 1F680 ; fully-qualified # 🧑🏼🚀 E12.1 astronaut: medium-light skin tone
+1F9D1 1F3FD 200D 1F680 ; fully-qualified # 🧑🏽🚀 E12.1 astronaut: medium skin tone
+1F9D1 1F3FE 200D 1F680 ; fully-qualified # 🧑🏾🚀 E12.1 astronaut: medium-dark skin tone
+1F9D1 1F3FF 200D 1F680 ; fully-qualified # 🧑🏿🚀 E12.1 astronaut: dark skin tone
+1F468 200D 1F680 ; fully-qualified # 👨🚀 E4.0 man astronaut
+1F468 1F3FB 200D 1F680 ; fully-qualified # 👨🏻🚀 E4.0 man astronaut: light skin tone
+1F468 1F3FC 200D 1F680 ; fully-qualified # 👨🏼🚀 E4.0 man astronaut: medium-light skin tone
+1F468 1F3FD 200D 1F680 ; fully-qualified # 👨🏽🚀 E4.0 man astronaut: medium skin tone
+1F468 1F3FE 200D 1F680 ; fully-qualified # 👨🏾🚀 E4.0 man astronaut: medium-dark skin tone
+1F468 1F3FF 200D 1F680 ; fully-qualified # 👨🏿🚀 E4.0 man astronaut: dark skin tone
+1F469 200D 1F680 ; fully-qualified # 👩🚀 E4.0 woman astronaut
+1F469 1F3FB 200D 1F680 ; fully-qualified # 👩🏻🚀 E4.0 woman astronaut: light skin tone
+1F469 1F3FC 200D 1F680 ; fully-qualified # 👩🏼🚀 E4.0 woman astronaut: medium-light skin tone
+1F469 1F3FD 200D 1F680 ; fully-qualified # 👩🏽🚀 E4.0 woman astronaut: medium skin tone
+1F469 1F3FE 200D 1F680 ; fully-qualified # 👩🏾🚀 E4.0 woman astronaut: medium-dark skin tone
+1F469 1F3FF 200D 1F680 ; fully-qualified # 👩🏿🚀 E4.0 woman astronaut: dark skin tone
+1F9D1 200D 1F692 ; fully-qualified # 🧑🚒 E12.1 firefighter
+1F9D1 1F3FB 200D 1F692 ; fully-qualified # 🧑🏻🚒 E12.1 firefighter: light skin tone
+1F9D1 1F3FC 200D 1F692 ; fully-qualified # 🧑🏼🚒 E12.1 firefighter: medium-light skin tone
+1F9D1 1F3FD 200D 1F692 ; fully-qualified # 🧑🏽🚒 E12.1 firefighter: medium skin tone
+1F9D1 1F3FE 200D 1F692 ; fully-qualified # 🧑🏾🚒 E12.1 firefighter: medium-dark skin tone
+1F9D1 1F3FF 200D 1F692 ; fully-qualified # 🧑🏿🚒 E12.1 firefighter: dark skin tone
+1F468 200D 1F692 ; fully-qualified # 👨🚒 E4.0 man firefighter
+1F468 1F3FB 200D 1F692 ; fully-qualified # 👨🏻🚒 E4.0 man firefighter: light skin tone
+1F468 1F3FC 200D 1F692 ; fully-qualified # 👨🏼🚒 E4.0 man firefighter: medium-light skin tone
+1F468 1F3FD 200D 1F692 ; fully-qualified # 👨🏽🚒 E4.0 man firefighter: medium skin tone
+1F468 1F3FE 200D 1F692 ; fully-qualified # 👨🏾🚒 E4.0 man firefighter: medium-dark skin tone
+1F468 1F3FF 200D 1F692 ; fully-qualified # 👨🏿🚒 E4.0 man firefighter: dark skin tone
+1F469 200D 1F692 ; fully-qualified # 👩🚒 E4.0 woman firefighter
+1F469 1F3FB 200D 1F692 ; fully-qualified # 👩🏻🚒 E4.0 woman firefighter: light skin tone
+1F469 1F3FC 200D 1F692 ; fully-qualified # 👩🏼🚒 E4.0 woman firefighter: medium-light skin tone
+1F469 1F3FD 200D 1F692 ; fully-qualified # 👩🏽🚒 E4.0 woman firefighter: medium skin tone
+1F469 1F3FE 200D 1F692 ; fully-qualified # 👩🏾🚒 E4.0 woman firefighter: medium-dark skin tone
+1F469 1F3FF 200D 1F692 ; fully-qualified # 👩🏿🚒 E4.0 woman firefighter: dark skin tone
+1F46E ; fully-qualified # 👮 E0.6 police officer
+1F46E 1F3FB ; fully-qualified # 👮🏻 E1.0 police officer: light skin tone
+1F46E 1F3FC ; fully-qualified # 👮🏼 E1.0 police officer: medium-light skin tone
+1F46E 1F3FD ; fully-qualified # 👮🏽 E1.0 police officer: medium skin tone
+1F46E 1F3FE ; fully-qualified # 👮🏾 E1.0 police officer: medium-dark skin tone
+1F46E 1F3FF ; fully-qualified # 👮🏿 E1.0 police officer: dark skin tone
+1F46E 200D 2642 FE0F ; fully-qualified # 👮♂️ E4.0 man police officer
+1F46E 200D 2642 ; minimally-qualified # 👮♂ E4.0 man police officer
+1F46E 1F3FB 200D 2642 FE0F ; fully-qualified # 👮🏻♂️ E4.0 man police officer: light skin tone
+1F46E 1F3FB 200D 2642 ; minimally-qualified # 👮🏻♂ E4.0 man police officer: light skin tone
+1F46E 1F3FC 200D 2642 FE0F ; fully-qualified # 👮🏼♂️ E4.0 man police officer: medium-light skin tone
+1F46E 1F3FC 200D 2642 ; minimally-qualified # 👮🏼♂ E4.0 man police officer: medium-light skin tone
+1F46E 1F3FD 200D 2642 FE0F ; fully-qualified # 👮🏽♂️ E4.0 man police officer: medium skin tone
+1F46E 1F3FD 200D 2642 ; minimally-qualified # 👮🏽♂ E4.0 man police officer: medium skin tone
+1F46E 1F3FE 200D 2642 FE0F ; fully-qualified # 👮🏾♂️ E4.0 man police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2642 ; minimally-qualified # 👮🏾♂ E4.0 man police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2642 FE0F ; fully-qualified # 👮🏿♂️ E4.0 man police officer: dark skin tone
+1F46E 1F3FF 200D 2642 ; minimally-qualified # 👮🏿♂ E4.0 man police officer: dark skin tone
+1F46E 200D 2640 FE0F ; fully-qualified # 👮♀️ E4.0 woman police officer
+1F46E 200D 2640 ; minimally-qualified # 👮♀ E4.0 woman police officer
+1F46E 1F3FB 200D 2640 FE0F ; fully-qualified # 👮🏻♀️ E4.0 woman police officer: light skin tone
+1F46E 1F3FB 200D 2640 ; minimally-qualified # 👮🏻♀ E4.0 woman police officer: light skin tone
+1F46E 1F3FC 200D 2640 FE0F ; fully-qualified # 👮🏼♀️ E4.0 woman police officer: medium-light skin tone
+1F46E 1F3FC 200D 2640 ; minimally-qualified # 👮🏼♀ E4.0 woman police officer: medium-light skin tone
+1F46E 1F3FD 200D 2640 FE0F ; fully-qualified # 👮🏽♀️ E4.0 woman police officer: medium skin tone
+1F46E 1F3FD 200D 2640 ; minimally-qualified # 👮🏽♀ E4.0 woman police officer: medium skin tone
+1F46E 1F3FE 200D 2640 FE0F ; fully-qualified # 👮🏾♀️ E4.0 woman police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2640 ; minimally-qualified # 👮🏾♀ E4.0 woman police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2640 FE0F ; fully-qualified # 👮🏿♀️ E4.0 woman police officer: dark skin tone
+1F46E 1F3FF 200D 2640 ; minimally-qualified # 👮🏿♀ E4.0 woman police officer: dark skin tone
+1F575 FE0F ; fully-qualified # 🕵️ E0.7 detective
+1F575 ; unqualified # 🕵 E0.7 detective
+1F575 1F3FB ; fully-qualified # 🕵🏻 E2.0 detective: light skin tone
+1F575 1F3FC ; fully-qualified # 🕵🏼 E2.0 detective: medium-light skin tone
+1F575 1F3FD ; fully-qualified # 🕵🏽 E2.0 detective: medium skin tone
+1F575 1F3FE ; fully-qualified # 🕵🏾 E2.0 detective: medium-dark skin tone
+1F575 1F3FF ; fully-qualified # 🕵🏿 E2.0 detective: dark skin tone
+1F575 FE0F 200D 2642 FE0F ; fully-qualified # 🕵️♂️ E4.0 man detective
+1F575 200D 2642 FE0F ; unqualified # 🕵♂️ E4.0 man detective
+1F575 FE0F 200D 2642 ; unqualified # 🕵️♂ E4.0 man detective
+1F575 200D 2642 ; unqualified # 🕵♂ E4.0 man detective
+1F575 1F3FB 200D 2642 FE0F ; fully-qualified # 🕵🏻♂️ E4.0 man detective: light skin tone
+1F575 1F3FB 200D 2642 ; minimally-qualified # 🕵🏻♂ E4.0 man detective: light skin tone
+1F575 1F3FC 200D 2642 FE0F ; fully-qualified # 🕵🏼♂️ E4.0 man detective: medium-light skin tone
+1F575 1F3FC 200D 2642 ; minimally-qualified # 🕵🏼♂ E4.0 man detective: medium-light skin tone
+1F575 1F3FD 200D 2642 FE0F ; fully-qualified # 🕵🏽♂️ E4.0 man detective: medium skin tone
+1F575 1F3FD 200D 2642 ; minimally-qualified # 🕵🏽♂ E4.0 man detective: medium skin tone
+1F575 1F3FE 200D 2642 FE0F ; fully-qualified # 🕵🏾♂️ E4.0 man detective: medium-dark skin tone
+1F575 1F3FE 200D 2642 ; minimally-qualified # 🕵🏾♂ E4.0 man detective: medium-dark skin tone
+1F575 1F3FF 200D 2642 FE0F ; fully-qualified # 🕵🏿♂️ E4.0 man detective: dark skin tone
+1F575 1F3FF 200D 2642 ; minimally-qualified # 🕵🏿♂ E4.0 man detective: dark skin tone
+1F575 FE0F 200D 2640 FE0F ; fully-qualified # 🕵️♀️ E4.0 woman detective
+1F575 200D 2640 FE0F ; unqualified # 🕵♀️ E4.0 woman detective
+1F575 FE0F 200D 2640 ; unqualified # 🕵️♀ E4.0 woman detective
+1F575 200D 2640 ; unqualified # 🕵♀ E4.0 woman detective
+1F575 1F3FB 200D 2640 FE0F ; fully-qualified # 🕵🏻♀️ E4.0 woman detective: light skin tone
+1F575 1F3FB 200D 2640 ; minimally-qualified # 🕵🏻♀ E4.0 woman detective: light skin tone
+1F575 1F3FC 200D 2640 FE0F ; fully-qualified # 🕵🏼♀️ E4.0 woman detective: medium-light skin tone
+1F575 1F3FC 200D 2640 ; minimally-qualified # 🕵🏼♀ E4.0 woman detective: medium-light skin tone
+1F575 1F3FD 200D 2640 FE0F ; fully-qualified # 🕵🏽♀️ E4.0 woman detective: medium skin tone
+1F575 1F3FD 200D 2640 ; minimally-qualified # 🕵🏽♀ E4.0 woman detective: medium skin tone
+1F575 1F3FE 200D 2640 FE0F ; fully-qualified # 🕵🏾♀️ E4.0 woman detective: medium-dark skin tone
+1F575 1F3FE 200D 2640 ; minimally-qualified # 🕵🏾♀ E4.0 woman detective: medium-dark skin tone
+1F575 1F3FF 200D 2640 FE0F ; fully-qualified # 🕵🏿♀️ E4.0 woman detective: dark skin tone
+1F575 1F3FF 200D 2640 ; minimally-qualified # 🕵🏿♀ E4.0 woman detective: dark skin tone
+1F482 ; fully-qualified # 💂 E0.6 guard
+1F482 1F3FB ; fully-qualified # 💂🏻 E1.0 guard: light skin tone
+1F482 1F3FC ; fully-qualified # 💂🏼 E1.0 guard: medium-light skin tone
+1F482 1F3FD ; fully-qualified # 💂🏽 E1.0 guard: medium skin tone
+1F482 1F3FE ; fully-qualified # 💂🏾 E1.0 guard: medium-dark skin tone
+1F482 1F3FF ; fully-qualified # 💂🏿 E1.0 guard: dark skin tone
+1F482 200D 2642 FE0F ; fully-qualified # 💂♂️ E4.0 man guard
+1F482 200D 2642 ; minimally-qualified # 💂♂ E4.0 man guard
+1F482 1F3FB 200D 2642 FE0F ; fully-qualified # 💂🏻♂️ E4.0 man guard: light skin tone
+1F482 1F3FB 200D 2642 ; minimally-qualified # 💂🏻♂ E4.0 man guard: light skin tone
+1F482 1F3FC 200D 2642 FE0F ; fully-qualified # 💂🏼♂️ E4.0 man guard: medium-light skin tone
+1F482 1F3FC 200D 2642 ; minimally-qualified # 💂🏼♂ E4.0 man guard: medium-light skin tone
+1F482 1F3FD 200D 2642 FE0F ; fully-qualified # 💂🏽♂️ E4.0 man guard: medium skin tone
+1F482 1F3FD 200D 2642 ; minimally-qualified # 💂🏽♂ E4.0 man guard: medium skin tone
+1F482 1F3FE 200D 2642 FE0F ; fully-qualified # 💂🏾♂️ E4.0 man guard: medium-dark skin tone
+1F482 1F3FE 200D 2642 ; minimally-qualified # 💂🏾♂ E4.0 man guard: medium-dark skin tone
+1F482 1F3FF 200D 2642 FE0F ; fully-qualified # 💂🏿♂️ E4.0 man guard: dark skin tone
+1F482 1F3FF 200D 2642 ; minimally-qualified # 💂🏿♂ E4.0 man guard: dark skin tone
+1F482 200D 2640 FE0F ; fully-qualified # 💂♀️ E4.0 woman guard
+1F482 200D 2640 ; minimally-qualified # 💂♀ E4.0 woman guard
+1F482 1F3FB 200D 2640 FE0F ; fully-qualified # 💂🏻♀️ E4.0 woman guard: light skin tone
+1F482 1F3FB 200D 2640 ; minimally-qualified # 💂🏻♀ E4.0 woman guard: light skin tone
+1F482 1F3FC 200D 2640 FE0F ; fully-qualified # 💂🏼♀️ E4.0 woman guard: medium-light skin tone
+1F482 1F3FC 200D 2640 ; minimally-qualified # 💂🏼♀ E4.0 woman guard: medium-light skin tone
+1F482 1F3FD 200D 2640 FE0F ; fully-qualified # 💂🏽♀️ E4.0 woman guard: medium skin tone
+1F482 1F3FD 200D 2640 ; minimally-qualified # 💂🏽♀ E4.0 woman guard: medium skin tone
+1F482 1F3FE 200D 2640 FE0F ; fully-qualified # 💂🏾♀️ E4.0 woman guard: medium-dark skin tone
+1F482 1F3FE 200D 2640 ; minimally-qualified # 💂🏾♀ E4.0 woman guard: medium-dark skin tone
+1F482 1F3FF 200D 2640 FE0F ; fully-qualified # 💂🏿♀️ E4.0 woman guard: dark skin tone
+1F482 1F3FF 200D 2640 ; minimally-qualified # 💂🏿♀ E4.0 woman guard: dark skin tone
+1F977 ; fully-qualified # 🥷 E13.0 ninja
+1F977 1F3FB ; fully-qualified # 🥷🏻 E13.0 ninja: light skin tone
+1F977 1F3FC ; fully-qualified # 🥷🏼 E13.0 ninja: medium-light skin tone
+1F977 1F3FD ; fully-qualified # 🥷🏽 E13.0 ninja: medium skin tone
+1F977 1F3FE ; fully-qualified # 🥷🏾 E13.0 ninja: medium-dark skin tone
+1F977 1F3FF ; fully-qualified # 🥷🏿 E13.0 ninja: dark skin tone
+1F477 ; fully-qualified # 👷 E0.6 construction worker
+1F477 1F3FB ; fully-qualified # 👷🏻 E1.0 construction worker: light skin tone
+1F477 1F3FC ; fully-qualified # 👷🏼 E1.0 construction worker: medium-light skin tone
+1F477 1F3FD ; fully-qualified # 👷🏽 E1.0 construction worker: medium skin tone
+1F477 1F3FE ; fully-qualified # 👷🏾 E1.0 construction worker: medium-dark skin tone
+1F477 1F3FF ; fully-qualified # 👷🏿 E1.0 construction worker: dark skin tone
+1F477 200D 2642 FE0F ; fully-qualified # 👷♂️ E4.0 man construction worker
+1F477 200D 2642 ; minimally-qualified # 👷♂ E4.0 man construction worker
+1F477 1F3FB 200D 2642 FE0F ; fully-qualified # 👷🏻♂️ E4.0 man construction worker: light skin tone
+1F477 1F3FB 200D 2642 ; minimally-qualified # 👷🏻♂ E4.0 man construction worker: light skin tone
+1F477 1F3FC 200D 2642 FE0F ; fully-qualified # 👷🏼♂️ E4.0 man construction worker: medium-light skin tone
+1F477 1F3FC 200D 2642 ; minimally-qualified # 👷🏼♂ E4.0 man construction worker: medium-light skin tone
+1F477 1F3FD 200D 2642 FE0F ; fully-qualified # 👷🏽♂️ E4.0 man construction worker: medium skin tone
+1F477 1F3FD 200D 2642 ; minimally-qualified # 👷🏽♂ E4.0 man construction worker: medium skin tone
+1F477 1F3FE 200D 2642 FE0F ; fully-qualified # 👷🏾♂️ E4.0 man construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2642 ; minimally-qualified # 👷🏾♂ E4.0 man construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2642 FE0F ; fully-qualified # 👷🏿♂️ E4.0 man construction worker: dark skin tone
+1F477 1F3FF 200D 2642 ; minimally-qualified # 👷🏿♂ E4.0 man construction worker: dark skin tone
+1F477 200D 2640 FE0F ; fully-qualified # 👷♀️ E4.0 woman construction worker
+1F477 200D 2640 ; minimally-qualified # 👷♀ E4.0 woman construction worker
+1F477 1F3FB 200D 2640 FE0F ; fully-qualified # 👷🏻♀️ E4.0 woman construction worker: light skin tone
+1F477 1F3FB 200D 2640 ; minimally-qualified # 👷🏻♀ E4.0 woman construction worker: light skin tone
+1F477 1F3FC 200D 2640 FE0F ; fully-qualified # 👷🏼♀️ E4.0 woman construction worker: medium-light skin tone
+1F477 1F3FC 200D 2640 ; minimally-qualified # 👷🏼♀ E4.0 woman construction worker: medium-light skin tone
+1F477 1F3FD 200D 2640 FE0F ; fully-qualified # 👷🏽♀️ E4.0 woman construction worker: medium skin tone
+1F477 1F3FD 200D 2640 ; minimally-qualified # 👷🏽♀ E4.0 woman construction worker: medium skin tone
+1F477 1F3FE 200D 2640 FE0F ; fully-qualified # 👷🏾♀️ E4.0 woman construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2640 ; minimally-qualified # 👷🏾♀ E4.0 woman construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2640 FE0F ; fully-qualified # 👷🏿♀️ E4.0 woman construction worker: dark skin tone
+1F477 1F3FF 200D 2640 ; minimally-qualified # 👷🏿♀ E4.0 woman construction worker: dark skin tone
+1F934 ; fully-qualified # 🤴 E3.0 prince
+1F934 1F3FB ; fully-qualified # 🤴🏻 E3.0 prince: light skin tone
+1F934 1F3FC ; fully-qualified # 🤴🏼 E3.0 prince: medium-light skin tone
+1F934 1F3FD ; fully-qualified # 🤴🏽 E3.0 prince: medium skin tone
+1F934 1F3FE ; fully-qualified # 🤴🏾 E3.0 prince: medium-dark skin tone
+1F934 1F3FF ; fully-qualified # 🤴🏿 E3.0 prince: dark skin tone
+1F478 ; fully-qualified # 👸 E0.6 princess
+1F478 1F3FB ; fully-qualified # 👸🏻 E1.0 princess: light skin tone
+1F478 1F3FC ; fully-qualified # 👸🏼 E1.0 princess: medium-light skin tone
+1F478 1F3FD ; fully-qualified # 👸🏽 E1.0 princess: medium skin tone
+1F478 1F3FE ; fully-qualified # 👸🏾 E1.0 princess: medium-dark skin tone
+1F478 1F3FF ; fully-qualified # 👸🏿 E1.0 princess: dark skin tone
+1F473 ; fully-qualified # 👳 E0.6 person wearing turban
+1F473 1F3FB ; fully-qualified # 👳🏻 E1.0 person wearing turban: light skin tone
+1F473 1F3FC ; fully-qualified # 👳🏼 E1.0 person wearing turban: medium-light skin tone
+1F473 1F3FD ; fully-qualified # 👳🏽 E1.0 person wearing turban: medium skin tone
+1F473 1F3FE ; fully-qualified # 👳🏾 E1.0 person wearing turban: medium-dark skin tone
+1F473 1F3FF ; fully-qualified # 👳🏿 E1.0 person wearing turban: dark skin tone
+1F473 200D 2642 FE0F ; fully-qualified # 👳♂️ E4.0 man wearing turban
+1F473 200D 2642 ; minimally-qualified # 👳♂ E4.0 man wearing turban
+1F473 1F3FB 200D 2642 FE0F ; fully-qualified # 👳🏻♂️ E4.0 man wearing turban: light skin tone
+1F473 1F3FB 200D 2642 ; minimally-qualified # 👳🏻♂ E4.0 man wearing turban: light skin tone
+1F473 1F3FC 200D 2642 FE0F ; fully-qualified # 👳🏼♂️ E4.0 man wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2642 ; minimally-qualified # 👳🏼♂ E4.0 man wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2642 FE0F ; fully-qualified # 👳🏽♂️ E4.0 man wearing turban: medium skin tone
+1F473 1F3FD 200D 2642 ; minimally-qualified # 👳🏽♂ E4.0 man wearing turban: medium skin tone
+1F473 1F3FE 200D 2642 FE0F ; fully-qualified # 👳🏾♂️ E4.0 man wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2642 ; minimally-qualified # 👳🏾♂ E4.0 man wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2642 FE0F ; fully-qualified # 👳🏿♂️ E4.0 man wearing turban: dark skin tone
+1F473 1F3FF 200D 2642 ; minimally-qualified # 👳🏿♂ E4.0 man wearing turban: dark skin tone
+1F473 200D 2640 FE0F ; fully-qualified # 👳♀️ E4.0 woman wearing turban
+1F473 200D 2640 ; minimally-qualified # 👳♀ E4.0 woman wearing turban
+1F473 1F3FB 200D 2640 FE0F ; fully-qualified # 👳🏻♀️ E4.0 woman wearing turban: light skin tone
+1F473 1F3FB 200D 2640 ; minimally-qualified # 👳🏻♀ E4.0 woman wearing turban: light skin tone
+1F473 1F3FC 200D 2640 FE0F ; fully-qualified # 👳🏼♀️ E4.0 woman wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2640 ; minimally-qualified # 👳🏼♀ E4.0 woman wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2640 FE0F ; fully-qualified # 👳🏽♀️ E4.0 woman wearing turban: medium skin tone
+1F473 1F3FD 200D 2640 ; minimally-qualified # 👳🏽♀ E4.0 woman wearing turban: medium skin tone
+1F473 1F3FE 200D 2640 FE0F ; fully-qualified # 👳🏾♀️ E4.0 woman wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2640 ; minimally-qualified # 👳🏾♀ E4.0 woman wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2640 FE0F ; fully-qualified # 👳🏿♀️ E4.0 woman wearing turban: dark skin tone
+1F473 1F3FF 200D 2640 ; minimally-qualified # 👳🏿♀ E4.0 woman wearing turban: dark skin tone
+1F472 ; fully-qualified # 👲 E0.6 person with skullcap
+1F472 1F3FB ; fully-qualified # 👲🏻 E1.0 person with skullcap: light skin tone
+1F472 1F3FC ; fully-qualified # 👲🏼 E1.0 person with skullcap: medium-light skin tone
+1F472 1F3FD ; fully-qualified # 👲🏽 E1.0 person with skullcap: medium skin tone
+1F472 1F3FE ; fully-qualified # 👲🏾 E1.0 person with skullcap: medium-dark skin tone
+1F472 1F3FF ; fully-qualified # 👲🏿 E1.0 person with skullcap: dark skin tone
+1F9D5 ; fully-qualified # 🧕 E5.0 woman with headscarf
+1F9D5 1F3FB ; fully-qualified # 🧕🏻 E5.0 woman with headscarf: light skin tone
+1F9D5 1F3FC ; fully-qualified # 🧕🏼 E5.0 woman with headscarf: medium-light skin tone
+1F9D5 1F3FD ; fully-qualified # 🧕🏽 E5.0 woman with headscarf: medium skin tone
+1F9D5 1F3FE ; fully-qualified # 🧕🏾 E5.0 woman with headscarf: medium-dark skin tone
+1F9D5 1F3FF ; fully-qualified # 🧕🏿 E5.0 woman with headscarf: dark skin tone
+1F935 ; fully-qualified # 🤵 E3.0 person in tuxedo
+1F935 1F3FB ; fully-qualified # 🤵🏻 E3.0 person in tuxedo: light skin tone
+1F935 1F3FC ; fully-qualified # 🤵🏼 E3.0 person in tuxedo: medium-light skin tone
+1F935 1F3FD ; fully-qualified # 🤵🏽 E3.0 person in tuxedo: medium skin tone
+1F935 1F3FE ; fully-qualified # 🤵🏾 E3.0 person in tuxedo: medium-dark skin tone
+1F935 1F3FF ; fully-qualified # 🤵🏿 E3.0 person in tuxedo: dark skin tone
+1F935 200D 2642 FE0F ; fully-qualified # 🤵♂️ E13.0 man in tuxedo
+1F935 200D 2642 ; minimally-qualified # 🤵♂ E13.0 man in tuxedo
+1F935 1F3FB 200D 2642 FE0F ; fully-qualified # 🤵🏻♂️ E13.0 man in tuxedo: light skin tone
+1F935 1F3FB 200D 2642 ; minimally-qualified # 🤵🏻♂ E13.0 man in tuxedo: light skin tone
+1F935 1F3FC 200D 2642 FE0F ; fully-qualified # 🤵🏼♂️ E13.0 man in tuxedo: medium-light skin tone
+1F935 1F3FC 200D 2642 ; minimally-qualified # 🤵🏼♂ E13.0 man in tuxedo: medium-light skin tone
+1F935 1F3FD 200D 2642 FE0F ; fully-qualified # 🤵🏽♂️ E13.0 man in tuxedo: medium skin tone
+1F935 1F3FD 200D 2642 ; minimally-qualified # 🤵🏽♂ E13.0 man in tuxedo: medium skin tone
+1F935 1F3FE 200D 2642 FE0F ; fully-qualified # 🤵🏾♂️ E13.0 man in tuxedo: medium-dark skin tone
+1F935 1F3FE 200D 2642 ; minimally-qualified # 🤵🏾♂ E13.0 man in tuxedo: medium-dark skin tone
+1F935 1F3FF 200D 2642 FE0F ; fully-qualified # 🤵🏿♂️ E13.0 man in tuxedo: dark skin tone
+1F935 1F3FF 200D 2642 ; minimally-qualified # 🤵🏿♂ E13.0 man in tuxedo: dark skin tone
+1F935 200D 2640 FE0F ; fully-qualified # 🤵♀️ E13.0 woman in tuxedo
+1F935 200D 2640 ; minimally-qualified # 🤵♀ E13.0 woman in tuxedo
+1F935 1F3FB 200D 2640 FE0F ; fully-qualified # 🤵🏻♀️ E13.0 woman in tuxedo: light skin tone
+1F935 1F3FB 200D 2640 ; minimally-qualified # 🤵🏻♀ E13.0 woman in tuxedo: light skin tone
+1F935 1F3FC 200D 2640 FE0F ; fully-qualified # 🤵🏼♀️ E13.0 woman in tuxedo: medium-light skin tone
+1F935 1F3FC 200D 2640 ; minimally-qualified # 🤵🏼♀ E13.0 woman in tuxedo: medium-light skin tone
+1F935 1F3FD 200D 2640 FE0F ; fully-qualified # 🤵🏽♀️ E13.0 woman in tuxedo: medium skin tone
+1F935 1F3FD 200D 2640 ; minimally-qualified # 🤵🏽♀ E13.0 woman in tuxedo: medium skin tone
+1F935 1F3FE 200D 2640 FE0F ; fully-qualified # 🤵🏾♀️ E13.0 woman in tuxedo: medium-dark skin tone
+1F935 1F3FE 200D 2640 ; minimally-qualified # 🤵🏾♀ E13.0 woman in tuxedo: medium-dark skin tone
+1F935 1F3FF 200D 2640 FE0F ; fully-qualified # 🤵🏿♀️ E13.0 woman in tuxedo: dark skin tone
+1F935 1F3FF 200D 2640 ; minimally-qualified # 🤵🏿♀ E13.0 woman in tuxedo: dark skin tone
+1F470 ; fully-qualified # 👰 E0.6 person with veil
+1F470 1F3FB ; fully-qualified # 👰🏻 E1.0 person with veil: light skin tone
+1F470 1F3FC ; fully-qualified # 👰🏼 E1.0 person with veil: medium-light skin tone
+1F470 1F3FD ; fully-qualified # 👰🏽 E1.0 person with veil: medium skin tone
+1F470 1F3FE ; fully-qualified # 👰🏾 E1.0 person with veil: medium-dark skin tone
+1F470 1F3FF ; fully-qualified # 👰🏿 E1.0 person with veil: dark skin tone
+1F470 200D 2642 FE0F ; fully-qualified # 👰♂️ E13.0 man with veil
+1F470 200D 2642 ; minimally-qualified # 👰♂ E13.0 man with veil
+1F470 1F3FB 200D 2642 FE0F ; fully-qualified # 👰🏻♂️ E13.0 man with veil: light skin tone
+1F470 1F3FB 200D 2642 ; minimally-qualified # 👰🏻♂ E13.0 man with veil: light skin tone
+1F470 1F3FC 200D 2642 FE0F ; fully-qualified # 👰🏼♂️ E13.0 man with veil: medium-light skin tone
+1F470 1F3FC 200D 2642 ; minimally-qualified # 👰🏼♂ E13.0 man with veil: medium-light skin tone
+1F470 1F3FD 200D 2642 FE0F ; fully-qualified # 👰🏽♂️ E13.0 man with veil: medium skin tone
+1F470 1F3FD 200D 2642 ; minimally-qualified # 👰🏽♂ E13.0 man with veil: medium skin tone
+1F470 1F3FE 200D 2642 FE0F ; fully-qualified # 👰🏾♂️ E13.0 man with veil: medium-dark skin tone
+1F470 1F3FE 200D 2642 ; minimally-qualified # 👰🏾♂ E13.0 man with veil: medium-dark skin tone
+1F470 1F3FF 200D 2642 FE0F ; fully-qualified # 👰🏿♂️ E13.0 man with veil: dark skin tone
+1F470 1F3FF 200D 2642 ; minimally-qualified # 👰🏿♂ E13.0 man with veil: dark skin tone
+1F470 200D 2640 FE0F ; fully-qualified # 👰♀️ E13.0 woman with veil
+1F470 200D 2640 ; minimally-qualified # 👰♀ E13.0 woman with veil
+1F470 1F3FB 200D 2640 FE0F ; fully-qualified # 👰🏻♀️ E13.0 woman with veil: light skin tone
+1F470 1F3FB 200D 2640 ; minimally-qualified # 👰🏻♀ E13.0 woman with veil: light skin tone
+1F470 1F3FC 200D 2640 FE0F ; fully-qualified # 👰🏼♀️ E13.0 woman with veil: medium-light skin tone
+1F470 1F3FC 200D 2640 ; minimally-qualified # 👰🏼♀ E13.0 woman with veil: medium-light skin tone
+1F470 1F3FD 200D 2640 FE0F ; fully-qualified # 👰🏽♀️ E13.0 woman with veil: medium skin tone
+1F470 1F3FD 200D 2640 ; minimally-qualified # 👰🏽♀ E13.0 woman with veil: medium skin tone
+1F470 1F3FE 200D 2640 FE0F ; fully-qualified # 👰🏾♀️ E13.0 woman with veil: medium-dark skin tone
+1F470 1F3FE 200D 2640 ; minimally-qualified # 👰🏾♀ E13.0 woman with veil: medium-dark skin tone
+1F470 1F3FF 200D 2640 FE0F ; fully-qualified # 👰🏿♀️ E13.0 woman with veil: dark skin tone
+1F470 1F3FF 200D 2640 ; minimally-qualified # 👰🏿♀ E13.0 woman with veil: dark skin tone
+1F930 ; fully-qualified # 🤰 E3.0 pregnant woman
+1F930 1F3FB ; fully-qualified # 🤰🏻 E3.0 pregnant woman: light skin tone
+1F930 1F3FC ; fully-qualified # 🤰🏼 E3.0 pregnant woman: medium-light skin tone
+1F930 1F3FD ; fully-qualified # 🤰🏽 E3.0 pregnant woman: medium skin tone
+1F930 1F3FE ; fully-qualified # 🤰🏾 E3.0 pregnant woman: medium-dark skin tone
+1F930 1F3FF ; fully-qualified # 🤰🏿 E3.0 pregnant woman: dark skin tone
+1F931 ; fully-qualified # 🤱 E5.0 breast-feeding
+1F931 1F3FB ; fully-qualified # 🤱🏻 E5.0 breast-feeding: light skin tone
+1F931 1F3FC ; fully-qualified # 🤱🏼 E5.0 breast-feeding: medium-light skin tone
+1F931 1F3FD ; fully-qualified # 🤱🏽 E5.0 breast-feeding: medium skin tone
+1F931 1F3FE ; fully-qualified # 🤱🏾 E5.0 breast-feeding: medium-dark skin tone
+1F931 1F3FF ; fully-qualified # 🤱🏿 E5.0 breast-feeding: dark skin tone
+1F469 200D 1F37C ; fully-qualified # 👩🍼 E13.0 woman feeding baby
+1F469 1F3FB 200D 1F37C ; fully-qualified # 👩🏻🍼 E13.0 woman feeding baby: light skin tone
+1F469 1F3FC 200D 1F37C ; fully-qualified # 👩🏼🍼 E13.0 woman feeding baby: medium-light skin tone
+1F469 1F3FD 200D 1F37C ; fully-qualified # 👩🏽🍼 E13.0 woman feeding baby: medium skin tone
+1F469 1F3FE 200D 1F37C ; fully-qualified # 👩🏾🍼 E13.0 woman feeding baby: medium-dark skin tone
+1F469 1F3FF 200D 1F37C ; fully-qualified # 👩🏿🍼 E13.0 woman feeding baby: dark skin tone
+1F468 200D 1F37C ; fully-qualified # 👨🍼 E13.0 man feeding baby
+1F468 1F3FB 200D 1F37C ; fully-qualified # 👨🏻🍼 E13.0 man feeding baby: light skin tone
+1F468 1F3FC 200D 1F37C ; fully-qualified # 👨🏼🍼 E13.0 man feeding baby: medium-light skin tone
+1F468 1F3FD 200D 1F37C ; fully-qualified # 👨🏽🍼 E13.0 man feeding baby: medium skin tone
+1F468 1F3FE 200D 1F37C ; fully-qualified # 👨🏾🍼 E13.0 man feeding baby: medium-dark skin tone
+1F468 1F3FF 200D 1F37C ; fully-qualified # 👨🏿🍼 E13.0 man feeding baby: dark skin tone
+1F9D1 200D 1F37C ; fully-qualified # 🧑🍼 E13.0 person feeding baby
+1F9D1 1F3FB 200D 1F37C ; fully-qualified # 🧑🏻🍼 E13.0 person feeding baby: light skin tone
+1F9D1 1F3FC 200D 1F37C ; fully-qualified # 🧑🏼🍼 E13.0 person feeding baby: medium-light skin tone
+1F9D1 1F3FD 200D 1F37C ; fully-qualified # 🧑🏽🍼 E13.0 person feeding baby: medium skin tone
+1F9D1 1F3FE 200D 1F37C ; fully-qualified # 🧑🏾🍼 E13.0 person feeding baby: medium-dark skin tone
+1F9D1 1F3FF 200D 1F37C ; fully-qualified # 🧑🏿🍼 E13.0 person feeding baby: dark skin tone
# subgroup: person-fantasy
-1F47C ; fully-qualified # 👼 baby angel
-1F47C 1F3FB ; fully-qualified # 👼🏻 baby angel: light skin tone
-1F47C 1F3FC ; fully-qualified # 👼🏼 baby angel: medium-light skin tone
-1F47C 1F3FD ; fully-qualified # 👼🏽 baby angel: medium skin tone
-1F47C 1F3FE ; fully-qualified # 👼🏾 baby angel: medium-dark skin tone
-1F47C 1F3FF ; fully-qualified # 👼🏿 baby angel: dark skin tone
-1F385 ; fully-qualified # 🎅 Santa Claus
-1F385 1F3FB ; fully-qualified # 🎅🏻 Santa Claus: light skin tone
-1F385 1F3FC ; fully-qualified # 🎅🏼 Santa Claus: medium-light skin tone
-1F385 1F3FD ; fully-qualified # 🎅🏽 Santa Claus: medium skin tone
-1F385 1F3FE ; fully-qualified # 🎅🏾 Santa Claus: medium-dark skin tone
-1F385 1F3FF ; fully-qualified # 🎅🏿 Santa Claus: dark skin tone
-1F936 ; fully-qualified # 🤶 Mrs. Claus
-1F936 1F3FB ; fully-qualified # 🤶🏻 Mrs. Claus: light skin tone
-1F936 1F3FC ; fully-qualified # 🤶🏼 Mrs. Claus: medium-light skin tone
-1F936 1F3FD ; fully-qualified # 🤶🏽 Mrs. Claus: medium skin tone
-1F936 1F3FE ; fully-qualified # 🤶🏾 Mrs. Claus: medium-dark skin tone
-1F936 1F3FF ; fully-qualified # 🤶🏿 Mrs. Claus: dark skin tone
-1F9D1 200D 1F384 ; fully-qualified # 🧑🎄 mx claus
-1F9D1 1F3FB 200D 1F384 ; fully-qualified # 🧑🏻🎄 mx claus: light skin tone
-1F9D1 1F3FC 200D 1F384 ; fully-qualified # 🧑🏼🎄 mx claus: medium-light skin tone
-1F9D1 1F3FD 200D 1F384 ; fully-qualified # 🧑🏽🎄 mx claus: medium skin tone
-1F9D1 1F3FE 200D 1F384 ; fully-qualified # 🧑🏾🎄 mx claus: medium-dark skin tone
-1F9D1 1F3FF 200D 1F384 ; fully-qualified # 🧑🏿🎄 mx claus: dark skin tone
-1F9B8 ; fully-qualified # 🦸 superhero
-1F9B8 1F3FB ; fully-qualified # 🦸🏻 superhero: light skin tone
-1F9B8 1F3FC ; fully-qualified # 🦸🏼 superhero: medium-light skin tone
-1F9B8 1F3FD ; fully-qualified # 🦸🏽 superhero: medium skin tone
-1F9B8 1F3FE ; fully-qualified # 🦸🏾 superhero: medium-dark skin tone
-1F9B8 1F3FF ; fully-qualified # 🦸🏿 superhero: dark skin tone
-1F9B8 200D 2642 FE0F ; fully-qualified # 🦸♂️ man superhero
-1F9B8 200D 2642 ; minimally-qualified # 🦸♂ man superhero
-1F9B8 1F3FB 200D 2642 FE0F ; fully-qualified # 🦸🏻♂️ man superhero: light skin tone
-1F9B8 1F3FB 200D 2642 ; minimally-qualified # 🦸🏻♂ man superhero: light skin tone
-1F9B8 1F3FC 200D 2642 FE0F ; fully-qualified # 🦸🏼♂️ man superhero: medium-light skin tone
-1F9B8 1F3FC 200D 2642 ; minimally-qualified # 🦸🏼♂ man superhero: medium-light skin tone
-1F9B8 1F3FD 200D 2642 FE0F ; fully-qualified # 🦸🏽♂️ man superhero: medium skin tone
-1F9B8 1F3FD 200D 2642 ; minimally-qualified # 🦸🏽♂ man superhero: medium skin tone
-1F9B8 1F3FE 200D 2642 FE0F ; fully-qualified # 🦸🏾♂️ man superhero: medium-dark skin tone
-1F9B8 1F3FE 200D 2642 ; minimally-qualified # 🦸🏾♂ man superhero: medium-dark skin tone
-1F9B8 1F3FF 200D 2642 FE0F ; fully-qualified # 🦸🏿♂️ man superhero: dark skin tone
-1F9B8 1F3FF 200D 2642 ; minimally-qualified # 🦸🏿♂ man superhero: dark skin tone
-1F9B8 200D 2640 FE0F ; fully-qualified # 🦸♀️ woman superhero
-1F9B8 200D 2640 ; minimally-qualified # 🦸♀ woman superhero
-1F9B8 1F3FB 200D 2640 FE0F ; fully-qualified # 🦸🏻♀️ woman superhero: light skin tone
-1F9B8 1F3FB 200D 2640 ; minimally-qualified # 🦸🏻♀ woman superhero: light skin tone
-1F9B8 1F3FC 200D 2640 FE0F ; fully-qualified # 🦸🏼♀️ woman superhero: medium-light skin tone
-1F9B8 1F3FC 200D 2640 ; minimally-qualified # 🦸🏼♀ woman superhero: medium-light skin tone
-1F9B8 1F3FD 200D 2640 FE0F ; fully-qualified # 🦸🏽♀️ woman superhero: medium skin tone
-1F9B8 1F3FD 200D 2640 ; minimally-qualified # 🦸🏽♀ woman superhero: medium skin tone
-1F9B8 1F3FE 200D 2640 FE0F ; fully-qualified # 🦸🏾♀️ woman superhero: medium-dark skin tone
-1F9B8 1F3FE 200D 2640 ; minimally-qualified # 🦸🏾♀ woman superhero: medium-dark skin tone
-1F9B8 1F3FF 200D 2640 FE0F ; fully-qualified # 🦸🏿♀️ woman superhero: dark skin tone
-1F9B8 1F3FF 200D 2640 ; minimally-qualified # 🦸🏿♀ woman superhero: dark skin tone
-1F9B9 ; fully-qualified # 🦹 supervillain
-1F9B9 1F3FB ; fully-qualified # 🦹🏻 supervillain: light skin tone
-1F9B9 1F3FC ; fully-qualified # 🦹🏼 supervillain: medium-light skin tone
-1F9B9 1F3FD ; fully-qualified # 🦹🏽 supervillain: medium skin tone
-1F9B9 1F3FE ; fully-qualified # 🦹🏾 supervillain: medium-dark skin tone
-1F9B9 1F3FF ; fully-qualified # 🦹🏿 supervillain: dark skin tone
-1F9B9 200D 2642 FE0F ; fully-qualified # 🦹♂️ man supervillain
-1F9B9 200D 2642 ; minimally-qualified # 🦹♂ man supervillain
-1F9B9 1F3FB 200D 2642 FE0F ; fully-qualified # 🦹🏻♂️ man supervillain: light skin tone
-1F9B9 1F3FB 200D 2642 ; minimally-qualified # 🦹🏻♂ man supervillain: light skin tone
-1F9B9 1F3FC 200D 2642 FE0F ; fully-qualified # 🦹🏼♂️ man supervillain: medium-light skin tone
-1F9B9 1F3FC 200D 2642 ; minimally-qualified # 🦹🏼♂ man supervillain: medium-light skin tone
-1F9B9 1F3FD 200D 2642 FE0F ; fully-qualified # 🦹🏽♂️ man supervillain: medium skin tone
-1F9B9 1F3FD 200D 2642 ; minimally-qualified # 🦹🏽♂ man supervillain: medium skin tone
-1F9B9 1F3FE 200D 2642 FE0F ; fully-qualified # 🦹🏾♂️ man supervillain: medium-dark skin tone
-1F9B9 1F3FE 200D 2642 ; minimally-qualified # 🦹🏾♂ man supervillain: medium-dark skin tone
-1F9B9 1F3FF 200D 2642 FE0F ; fully-qualified # 🦹🏿♂️ man supervillain: dark skin tone
-1F9B9 1F3FF 200D 2642 ; minimally-qualified # 🦹🏿♂ man supervillain: dark skin tone
-1F9B9 200D 2640 FE0F ; fully-qualified # 🦹♀️ woman supervillain
-1F9B9 200D 2640 ; minimally-qualified # 🦹♀ woman supervillain
-1F9B9 1F3FB 200D 2640 FE0F ; fully-qualified # 🦹🏻♀️ woman supervillain: light skin tone
-1F9B9 1F3FB 200D 2640 ; minimally-qualified # 🦹🏻♀ woman supervillain: light skin tone
-1F9B9 1F3FC 200D 2640 FE0F ; fully-qualified # 🦹🏼♀️ woman supervillain: medium-light skin tone
-1F9B9 1F3FC 200D 2640 ; minimally-qualified # 🦹🏼♀ woman supervillain: medium-light skin tone
-1F9B9 1F3FD 200D 2640 FE0F ; fully-qualified # 🦹🏽♀️ woman supervillain: medium skin tone
-1F9B9 1F3FD 200D 2640 ; minimally-qualified # 🦹🏽♀ woman supervillain: medium skin tone
-1F9B9 1F3FE 200D 2640 FE0F ; fully-qualified # 🦹🏾♀️ woman supervillain: medium-dark skin tone
-1F9B9 1F3FE 200D 2640 ; minimally-qualified # 🦹🏾♀ woman supervillain: medium-dark skin tone
-1F9B9 1F3FF 200D 2640 FE0F ; fully-qualified # 🦹🏿♀️ woman supervillain: dark skin tone
-1F9B9 1F3FF 200D 2640 ; minimally-qualified # 🦹🏿♀ woman supervillain: dark skin tone
-1F9D9 ; fully-qualified # 🧙 mage
-1F9D9 1F3FB ; fully-qualified # 🧙🏻 mage: light skin tone
-1F9D9 1F3FC ; fully-qualified # 🧙🏼 mage: medium-light skin tone
-1F9D9 1F3FD ; fully-qualified # 🧙🏽 mage: medium skin tone
-1F9D9 1F3FE ; fully-qualified # 🧙🏾 mage: medium-dark skin tone
-1F9D9 1F3FF ; fully-qualified # 🧙🏿 mage: dark skin tone
-1F9D9 200D 2642 FE0F ; fully-qualified # 🧙♂️ man mage
-1F9D9 200D 2642 ; minimally-qualified # 🧙♂ man mage
-1F9D9 1F3FB 200D 2642 FE0F ; fully-qualified # 🧙🏻♂️ man mage: light skin tone
-1F9D9 1F3FB 200D 2642 ; minimally-qualified # 🧙🏻♂ man mage: light skin tone
-1F9D9 1F3FC 200D 2642 FE0F ; fully-qualified # 🧙🏼♂️ man mage: medium-light skin tone
-1F9D9 1F3FC 200D 2642 ; minimally-qualified # 🧙🏼♂ man mage: medium-light skin tone
-1F9D9 1F3FD 200D 2642 FE0F ; fully-qualified # 🧙🏽♂️ man mage: medium skin tone
-1F9D9 1F3FD 200D 2642 ; minimally-qualified # 🧙🏽♂ man mage: medium skin tone
-1F9D9 1F3FE 200D 2642 FE0F ; fully-qualified # 🧙🏾♂️ man mage: medium-dark skin tone
-1F9D9 1F3FE 200D 2642 ; minimally-qualified # 🧙🏾♂ man mage: medium-dark skin tone
-1F9D9 1F3FF 200D 2642 FE0F ; fully-qualified # 🧙🏿♂️ man mage: dark skin tone
-1F9D9 1F3FF 200D 2642 ; minimally-qualified # 🧙🏿♂ man mage: dark skin tone
-1F9D9 200D 2640 FE0F ; fully-qualified # 🧙♀️ woman mage
-1F9D9 200D 2640 ; minimally-qualified # 🧙♀ woman mage
-1F9D9 1F3FB 200D 2640 FE0F ; fully-qualified # 🧙🏻♀️ woman mage: light skin tone
-1F9D9 1F3FB 200D 2640 ; minimally-qualified # 🧙🏻♀ woman mage: light skin tone
-1F9D9 1F3FC 200D 2640 FE0F ; fully-qualified # 🧙🏼♀️ woman mage: medium-light skin tone
-1F9D9 1F3FC 200D 2640 ; minimally-qualified # 🧙🏼♀ woman mage: medium-light skin tone
-1F9D9 1F3FD 200D 2640 FE0F ; fully-qualified # 🧙🏽♀️ woman mage: medium skin tone
-1F9D9 1F3FD 200D 2640 ; minimally-qualified # 🧙🏽♀ woman mage: medium skin tone
-1F9D9 1F3FE 200D 2640 FE0F ; fully-qualified # 🧙🏾♀️ woman mage: medium-dark skin tone
-1F9D9 1F3FE 200D 2640 ; minimally-qualified # 🧙🏾♀ woman mage: medium-dark skin tone
-1F9D9 1F3FF 200D 2640 FE0F ; fully-qualified # 🧙🏿♀️ woman mage: dark skin tone
-1F9D9 1F3FF 200D 2640 ; minimally-qualified # 🧙🏿♀ woman mage: dark skin tone
-1F9DA ; fully-qualified # 🧚 fairy
-1F9DA 1F3FB ; fully-qualified # 🧚🏻 fairy: light skin tone
-1F9DA 1F3FC ; fully-qualified # 🧚🏼 fairy: medium-light skin tone
-1F9DA 1F3FD ; fully-qualified # 🧚🏽 fairy: medium skin tone
-1F9DA 1F3FE ; fully-qualified # 🧚🏾 fairy: medium-dark skin tone
-1F9DA 1F3FF ; fully-qualified # 🧚🏿 fairy: dark skin tone
-1F9DA 200D 2642 FE0F ; fully-qualified # 🧚♂️ man fairy
-1F9DA 200D 2642 ; minimally-qualified # 🧚♂ man fairy
-1F9DA 1F3FB 200D 2642 FE0F ; fully-qualified # 🧚🏻♂️ man fairy: light skin tone
-1F9DA 1F3FB 200D 2642 ; minimally-qualified # 🧚🏻♂ man fairy: light skin tone
-1F9DA 1F3FC 200D 2642 FE0F ; fully-qualified # 🧚🏼♂️ man fairy: medium-light skin tone
-1F9DA 1F3FC 200D 2642 ; minimally-qualified # 🧚🏼♂ man fairy: medium-light skin tone
-1F9DA 1F3FD 200D 2642 FE0F ; fully-qualified # 🧚🏽♂️ man fairy: medium skin tone
-1F9DA 1F3FD 200D 2642 ; minimally-qualified # 🧚🏽♂ man fairy: medium skin tone
-1F9DA 1F3FE 200D 2642 FE0F ; fully-qualified # 🧚🏾♂️ man fairy: medium-dark skin tone
-1F9DA 1F3FE 200D 2642 ; minimally-qualified # 🧚🏾♂ man fairy: medium-dark skin tone
-1F9DA 1F3FF 200D 2642 FE0F ; fully-qualified # 🧚🏿♂️ man fairy: dark skin tone
-1F9DA 1F3FF 200D 2642 ; minimally-qualified # 🧚🏿♂ man fairy: dark skin tone
-1F9DA 200D 2640 FE0F ; fully-qualified # 🧚♀️ woman fairy
-1F9DA 200D 2640 ; minimally-qualified # 🧚♀ woman fairy
-1F9DA 1F3FB 200D 2640 FE0F ; fully-qualified # 🧚🏻♀️ woman fairy: light skin tone
-1F9DA 1F3FB 200D 2640 ; minimally-qualified # 🧚🏻♀ woman fairy: light skin tone
-1F9DA 1F3FC 200D 2640 FE0F ; fully-qualified # 🧚🏼♀️ woman fairy: medium-light skin tone
-1F9DA 1F3FC 200D 2640 ; minimally-qualified # 🧚🏼♀ woman fairy: medium-light skin tone
-1F9DA 1F3FD 200D 2640 FE0F ; fully-qualified # 🧚🏽♀️ woman fairy: medium skin tone
-1F9DA 1F3FD 200D 2640 ; minimally-qualified # 🧚🏽♀ woman fairy: medium skin tone
-1F9DA 1F3FE 200D 2640 FE0F ; fully-qualified # 🧚🏾♀️ woman fairy: medium-dark skin tone
-1F9DA 1F3FE 200D 2640 ; minimally-qualified # 🧚🏾♀ woman fairy: medium-dark skin tone
-1F9DA 1F3FF 200D 2640 FE0F ; fully-qualified # 🧚🏿♀️ woman fairy: dark skin tone
-1F9DA 1F3FF 200D 2640 ; minimally-qualified # 🧚🏿♀ woman fairy: dark skin tone
-1F9DB ; fully-qualified # 🧛 vampire
-1F9DB 1F3FB ; fully-qualified # 🧛🏻 vampire: light skin tone
-1F9DB 1F3FC ; fully-qualified # 🧛🏼 vampire: medium-light skin tone
-1F9DB 1F3FD ; fully-qualified # 🧛🏽 vampire: medium skin tone
-1F9DB 1F3FE ; fully-qualified # 🧛🏾 vampire: medium-dark skin tone
-1F9DB 1F3FF ; fully-qualified # 🧛🏿 vampire: dark skin tone
-1F9DB 200D 2642 FE0F ; fully-qualified # 🧛♂️ man vampire
-1F9DB 200D 2642 ; minimally-qualified # 🧛♂ man vampire
-1F9DB 1F3FB 200D 2642 FE0F ; fully-qualified # 🧛🏻♂️ man vampire: light skin tone
-1F9DB 1F3FB 200D 2642 ; minimally-qualified # 🧛🏻♂ man vampire: light skin tone
-1F9DB 1F3FC 200D 2642 FE0F ; fully-qualified # 🧛🏼♂️ man vampire: medium-light skin tone
-1F9DB 1F3FC 200D 2642 ; minimally-qualified # 🧛🏼♂ man vampire: medium-light skin tone
-1F9DB 1F3FD 200D 2642 FE0F ; fully-qualified # 🧛🏽♂️ man vampire: medium skin tone
-1F9DB 1F3FD 200D 2642 ; minimally-qualified # 🧛🏽♂ man vampire: medium skin tone
-1F9DB 1F3FE 200D 2642 FE0F ; fully-qualified # 🧛🏾♂️ man vampire: medium-dark skin tone
-1F9DB 1F3FE 200D 2642 ; minimally-qualified # 🧛🏾♂ man vampire: medium-dark skin tone
-1F9DB 1F3FF 200D 2642 FE0F ; fully-qualified # 🧛🏿♂️ man vampire: dark skin tone
-1F9DB 1F3FF 200D 2642 ; minimally-qualified # 🧛🏿♂ man vampire: dark skin tone
-1F9DB 200D 2640 FE0F ; fully-qualified # 🧛♀️ woman vampire
-1F9DB 200D 2640 ; minimally-qualified # 🧛♀ woman vampire
-1F9DB 1F3FB 200D 2640 FE0F ; fully-qualified # 🧛🏻♀️ woman vampire: light skin tone
-1F9DB 1F3FB 200D 2640 ; minimally-qualified # 🧛🏻♀ woman vampire: light skin tone
-1F9DB 1F3FC 200D 2640 FE0F ; fully-qualified # 🧛🏼♀️ woman vampire: medium-light skin tone
-1F9DB 1F3FC 200D 2640 ; minimally-qualified # 🧛🏼♀ woman vampire: medium-light skin tone
-1F9DB 1F3FD 200D 2640 FE0F ; fully-qualified # 🧛🏽♀️ woman vampire: medium skin tone
-1F9DB 1F3FD 200D 2640 ; minimally-qualified # 🧛🏽♀ woman vampire: medium skin tone
-1F9DB 1F3FE 200D 2640 FE0F ; fully-qualified # 🧛🏾♀️ woman vampire: medium-dark skin tone
-1F9DB 1F3FE 200D 2640 ; minimally-qualified # 🧛🏾♀ woman vampire: medium-dark skin tone
-1F9DB 1F3FF 200D 2640 FE0F ; fully-qualified # 🧛🏿♀️ woman vampire: dark skin tone
-1F9DB 1F3FF 200D 2640 ; minimally-qualified # 🧛🏿♀ woman vampire: dark skin tone
-1F9DC ; fully-qualified # 🧜 merperson
-1F9DC 1F3FB ; fully-qualified # 🧜🏻 merperson: light skin tone
-1F9DC 1F3FC ; fully-qualified # 🧜🏼 merperson: medium-light skin tone
-1F9DC 1F3FD ; fully-qualified # 🧜🏽 merperson: medium skin tone
-1F9DC 1F3FE ; fully-qualified # 🧜🏾 merperson: medium-dark skin tone
-1F9DC 1F3FF ; fully-qualified # 🧜🏿 merperson: dark skin tone
-1F9DC 200D 2642 FE0F ; fully-qualified # 🧜♂️ merman
-1F9DC 200D 2642 ; minimally-qualified # 🧜♂ merman
-1F9DC 1F3FB 200D 2642 FE0F ; fully-qualified # 🧜🏻♂️ merman: light skin tone
-1F9DC 1F3FB 200D 2642 ; minimally-qualified # 🧜🏻♂ merman: light skin tone
-1F9DC 1F3FC 200D 2642 FE0F ; fully-qualified # 🧜🏼♂️ merman: medium-light skin tone
-1F9DC 1F3FC 200D 2642 ; minimally-qualified # 🧜🏼♂ merman: medium-light skin tone
-1F9DC 1F3FD 200D 2642 FE0F ; fully-qualified # 🧜🏽♂️ merman: medium skin tone
-1F9DC 1F3FD 200D 2642 ; minimally-qualified # 🧜🏽♂ merman: medium skin tone
-1F9DC 1F3FE 200D 2642 FE0F ; fully-qualified # 🧜🏾♂️ merman: medium-dark skin tone
-1F9DC 1F3FE 200D 2642 ; minimally-qualified # 🧜🏾♂ merman: medium-dark skin tone
-1F9DC 1F3FF 200D 2642 FE0F ; fully-qualified # 🧜🏿♂️ merman: dark skin tone
-1F9DC 1F3FF 200D 2642 ; minimally-qualified # 🧜🏿♂ merman: dark skin tone
-1F9DC 200D 2640 FE0F ; fully-qualified # 🧜♀️ mermaid
-1F9DC 200D 2640 ; minimally-qualified # 🧜♀ mermaid
-1F9DC 1F3FB 200D 2640 FE0F ; fully-qualified # 🧜🏻♀️ mermaid: light skin tone
-1F9DC 1F3FB 200D 2640 ; minimally-qualified # 🧜🏻♀ mermaid: light skin tone
-1F9DC 1F3FC 200D 2640 FE0F ; fully-qualified # 🧜🏼♀️ mermaid: medium-light skin tone
-1F9DC 1F3FC 200D 2640 ; minimally-qualified # 🧜🏼♀ mermaid: medium-light skin tone
-1F9DC 1F3FD 200D 2640 FE0F ; fully-qualified # 🧜🏽♀️ mermaid: medium skin tone
-1F9DC 1F3FD 200D 2640 ; minimally-qualified # 🧜🏽♀ mermaid: medium skin tone
-1F9DC 1F3FE 200D 2640 FE0F ; fully-qualified # 🧜🏾♀️ mermaid: medium-dark skin tone
-1F9DC 1F3FE 200D 2640 ; minimally-qualified # 🧜🏾♀ mermaid: medium-dark skin tone
-1F9DC 1F3FF 200D 2640 FE0F ; fully-qualified # 🧜🏿♀️ mermaid: dark skin tone
-1F9DC 1F3FF 200D 2640 ; minimally-qualified # 🧜🏿♀ mermaid: dark skin tone
-1F9DD ; fully-qualified # 🧝 elf
-1F9DD 1F3FB ; fully-qualified # 🧝🏻 elf: light skin tone
-1F9DD 1F3FC ; fully-qualified # 🧝🏼 elf: medium-light skin tone
-1F9DD 1F3FD ; fully-qualified # 🧝🏽 elf: medium skin tone
-1F9DD 1F3FE ; fully-qualified # 🧝🏾 elf: medium-dark skin tone
-1F9DD 1F3FF ; fully-qualified # 🧝🏿 elf: dark skin tone
-1F9DD 200D 2642 FE0F ; fully-qualified # 🧝♂️ man elf
-1F9DD 200D 2642 ; minimally-qualified # 🧝♂ man elf
-1F9DD 1F3FB 200D 2642 FE0F ; fully-qualified # 🧝🏻♂️ man elf: light skin tone
-1F9DD 1F3FB 200D 2642 ; minimally-qualified # 🧝🏻♂ man elf: light skin tone
-1F9DD 1F3FC 200D 2642 FE0F ; fully-qualified # 🧝🏼♂️ man elf: medium-light skin tone
-1F9DD 1F3FC 200D 2642 ; minimally-qualified # 🧝🏼♂ man elf: medium-light skin tone
-1F9DD 1F3FD 200D 2642 FE0F ; fully-qualified # 🧝🏽♂️ man elf: medium skin tone
-1F9DD 1F3FD 200D 2642 ; minimally-qualified # 🧝🏽♂ man elf: medium skin tone
-1F9DD 1F3FE 200D 2642 FE0F ; fully-qualified # 🧝🏾♂️ man elf: medium-dark skin tone
-1F9DD 1F3FE 200D 2642 ; minimally-qualified # 🧝🏾♂ man elf: medium-dark skin tone
-1F9DD 1F3FF 200D 2642 FE0F ; fully-qualified # 🧝🏿♂️ man elf: dark skin tone
-1F9DD 1F3FF 200D 2642 ; minimally-qualified # 🧝🏿♂ man elf: dark skin tone
-1F9DD 200D 2640 FE0F ; fully-qualified # 🧝♀️ woman elf
-1F9DD 200D 2640 ; minimally-qualified # 🧝♀ woman elf
-1F9DD 1F3FB 200D 2640 FE0F ; fully-qualified # 🧝🏻♀️ woman elf: light skin tone
-1F9DD 1F3FB 200D 2640 ; minimally-qualified # 🧝🏻♀ woman elf: light skin tone
-1F9DD 1F3FC 200D 2640 FE0F ; fully-qualified # 🧝🏼♀️ woman elf: medium-light skin tone
-1F9DD 1F3FC 200D 2640 ; minimally-qualified # 🧝🏼♀ woman elf: medium-light skin tone
-1F9DD 1F3FD 200D 2640 FE0F ; fully-qualified # 🧝🏽♀️ woman elf: medium skin tone
-1F9DD 1F3FD 200D 2640 ; minimally-qualified # 🧝🏽♀ woman elf: medium skin tone
-1F9DD 1F3FE 200D 2640 FE0F ; fully-qualified # 🧝🏾♀️ woman elf: medium-dark skin tone
-1F9DD 1F3FE 200D 2640 ; minimally-qualified # 🧝🏾♀ woman elf: medium-dark skin tone
-1F9DD 1F3FF 200D 2640 FE0F ; fully-qualified # 🧝🏿♀️ woman elf: dark skin tone
-1F9DD 1F3FF 200D 2640 ; minimally-qualified # 🧝🏿♀ woman elf: dark skin tone
-1F9DE ; fully-qualified # 🧞 genie
-1F9DE 200D 2642 FE0F ; fully-qualified # 🧞♂️ man genie
-1F9DE 200D 2642 ; minimally-qualified # 🧞♂ man genie
-1F9DE 200D 2640 FE0F ; fully-qualified # 🧞♀️ woman genie
-1F9DE 200D 2640 ; minimally-qualified # 🧞♀ woman genie
-1F9DF ; fully-qualified # 🧟 zombie
-1F9DF 200D 2642 FE0F ; fully-qualified # 🧟♂️ man zombie
-1F9DF 200D 2642 ; minimally-qualified # 🧟♂ man zombie
-1F9DF 200D 2640 FE0F ; fully-qualified # 🧟♀️ woman zombie
-1F9DF 200D 2640 ; minimally-qualified # 🧟♀ woman zombie
+1F47C ; fully-qualified # 👼 E0.6 baby angel
+1F47C 1F3FB ; fully-qualified # 👼🏻 E1.0 baby angel: light skin tone
+1F47C 1F3FC ; fully-qualified # 👼🏼 E1.0 baby angel: medium-light skin tone
+1F47C 1F3FD ; fully-qualified # 👼🏽 E1.0 baby angel: medium skin tone
+1F47C 1F3FE ; fully-qualified # 👼🏾 E1.0 baby angel: medium-dark skin tone
+1F47C 1F3FF ; fully-qualified # 👼🏿 E1.0 baby angel: dark skin tone
+1F385 ; fully-qualified # 🎅 E0.6 Santa Claus
+1F385 1F3FB ; fully-qualified # 🎅🏻 E1.0 Santa Claus: light skin tone
+1F385 1F3FC ; fully-qualified # 🎅🏼 E1.0 Santa Claus: medium-light skin tone
+1F385 1F3FD ; fully-qualified # 🎅🏽 E1.0 Santa Claus: medium skin tone
+1F385 1F3FE ; fully-qualified # 🎅🏾 E1.0 Santa Claus: medium-dark skin tone
+1F385 1F3FF ; fully-qualified # 🎅🏿 E1.0 Santa Claus: dark skin tone
+1F936 ; fully-qualified # 🤶 E3.0 Mrs. Claus
+1F936 1F3FB ; fully-qualified # 🤶🏻 E3.0 Mrs. Claus: light skin tone
+1F936 1F3FC ; fully-qualified # 🤶🏼 E3.0 Mrs. Claus: medium-light skin tone
+1F936 1F3FD ; fully-qualified # 🤶🏽 E3.0 Mrs. Claus: medium skin tone
+1F936 1F3FE ; fully-qualified # 🤶🏾 E3.0 Mrs. Claus: medium-dark skin tone
+1F936 1F3FF ; fully-qualified # 🤶🏿 E3.0 Mrs. Claus: dark skin tone
+1F9D1 200D 1F384 ; fully-qualified # 🧑🎄 E13.0 mx claus
+1F9D1 1F3FB 200D 1F384 ; fully-qualified # 🧑🏻🎄 E13.0 mx claus: light skin tone
+1F9D1 1F3FC 200D 1F384 ; fully-qualified # 🧑🏼🎄 E13.0 mx claus: medium-light skin tone
+1F9D1 1F3FD 200D 1F384 ; fully-qualified # 🧑🏽🎄 E13.0 mx claus: medium skin tone
+1F9D1 1F3FE 200D 1F384 ; fully-qualified # 🧑🏾🎄 E13.0 mx claus: medium-dark skin tone
+1F9D1 1F3FF 200D 1F384 ; fully-qualified # 🧑🏿🎄 E13.0 mx claus: dark skin tone
+1F9B8 ; fully-qualified # 🦸 E11.0 superhero
+1F9B8 1F3FB ; fully-qualified # 🦸🏻 E11.0 superhero: light skin tone
+1F9B8 1F3FC ; fully-qualified # 🦸🏼 E11.0 superhero: medium-light skin tone
+1F9B8 1F3FD ; fully-qualified # 🦸🏽 E11.0 superhero: medium skin tone
+1F9B8 1F3FE ; fully-qualified # 🦸🏾 E11.0 superhero: medium-dark skin tone
+1F9B8 1F3FF ; fully-qualified # 🦸🏿 E11.0 superhero: dark skin tone
+1F9B8 200D 2642 FE0F ; fully-qualified # 🦸♂️ E11.0 man superhero
+1F9B8 200D 2642 ; minimally-qualified # 🦸♂ E11.0 man superhero
+1F9B8 1F3FB 200D 2642 FE0F ; fully-qualified # 🦸🏻♂️ E11.0 man superhero: light skin tone
+1F9B8 1F3FB 200D 2642 ; minimally-qualified # 🦸🏻♂ E11.0 man superhero: light skin tone
+1F9B8 1F3FC 200D 2642 FE0F ; fully-qualified # 🦸🏼♂️ E11.0 man superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2642 ; minimally-qualified # 🦸🏼♂ E11.0 man superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2642 FE0F ; fully-qualified # 🦸🏽♂️ E11.0 man superhero: medium skin tone
+1F9B8 1F3FD 200D 2642 ; minimally-qualified # 🦸🏽♂ E11.0 man superhero: medium skin tone
+1F9B8 1F3FE 200D 2642 FE0F ; fully-qualified # 🦸🏾♂️ E11.0 man superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2642 ; minimally-qualified # 🦸🏾♂ E11.0 man superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2642 FE0F ; fully-qualified # 🦸🏿♂️ E11.0 man superhero: dark skin tone
+1F9B8 1F3FF 200D 2642 ; minimally-qualified # 🦸🏿♂ E11.0 man superhero: dark skin tone
+1F9B8 200D 2640 FE0F ; fully-qualified # 🦸♀️ E11.0 woman superhero
+1F9B8 200D 2640 ; minimally-qualified # 🦸♀ E11.0 woman superhero
+1F9B8 1F3FB 200D 2640 FE0F ; fully-qualified # 🦸🏻♀️ E11.0 woman superhero: light skin tone
+1F9B8 1F3FB 200D 2640 ; minimally-qualified # 🦸🏻♀ E11.0 woman superhero: light skin tone
+1F9B8 1F3FC 200D 2640 FE0F ; fully-qualified # 🦸🏼♀️ E11.0 woman superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2640 ; minimally-qualified # 🦸🏼♀ E11.0 woman superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2640 FE0F ; fully-qualified # 🦸🏽♀️ E11.0 woman superhero: medium skin tone
+1F9B8 1F3FD 200D 2640 ; minimally-qualified # 🦸🏽♀ E11.0 woman superhero: medium skin tone
+1F9B8 1F3FE 200D 2640 FE0F ; fully-qualified # 🦸🏾♀️ E11.0 woman superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2640 ; minimally-qualified # 🦸🏾♀ E11.0 woman superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2640 FE0F ; fully-qualified # 🦸🏿♀️ E11.0 woman superhero: dark skin tone
+1F9B8 1F3FF 200D 2640 ; minimally-qualified # 🦸🏿♀ E11.0 woman superhero: dark skin tone
+1F9B9 ; fully-qualified # 🦹 E11.0 supervillain
+1F9B9 1F3FB ; fully-qualified # 🦹🏻 E11.0 supervillain: light skin tone
+1F9B9 1F3FC ; fully-qualified # 🦹🏼 E11.0 supervillain: medium-light skin tone
+1F9B9 1F3FD ; fully-qualified # 🦹🏽 E11.0 supervillain: medium skin tone
+1F9B9 1F3FE ; fully-qualified # 🦹🏾 E11.0 supervillain: medium-dark skin tone
+1F9B9 1F3FF ; fully-qualified # 🦹🏿 E11.0 supervillain: dark skin tone
+1F9B9 200D 2642 FE0F ; fully-qualified # 🦹♂️ E11.0 man supervillain
+1F9B9 200D 2642 ; minimally-qualified # 🦹♂ E11.0 man supervillain
+1F9B9 1F3FB 200D 2642 FE0F ; fully-qualified # 🦹🏻♂️ E11.0 man supervillain: light skin tone
+1F9B9 1F3FB 200D 2642 ; minimally-qualified # 🦹🏻♂ E11.0 man supervillain: light skin tone
+1F9B9 1F3FC 200D 2642 FE0F ; fully-qualified # 🦹🏼♂️ E11.0 man supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2642 ; minimally-qualified # 🦹🏼♂ E11.0 man supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2642 FE0F ; fully-qualified # 🦹🏽♂️ E11.0 man supervillain: medium skin tone
+1F9B9 1F3FD 200D 2642 ; minimally-qualified # 🦹🏽♂ E11.0 man supervillain: medium skin tone
+1F9B9 1F3FE 200D 2642 FE0F ; fully-qualified # 🦹🏾♂️ E11.0 man supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2642 ; minimally-qualified # 🦹🏾♂ E11.0 man supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2642 FE0F ; fully-qualified # 🦹🏿♂️ E11.0 man supervillain: dark skin tone
+1F9B9 1F3FF 200D 2642 ; minimally-qualified # 🦹🏿♂ E11.0 man supervillain: dark skin tone
+1F9B9 200D 2640 FE0F ; fully-qualified # 🦹♀️ E11.0 woman supervillain
+1F9B9 200D 2640 ; minimally-qualified # 🦹♀ E11.0 woman supervillain
+1F9B9 1F3FB 200D 2640 FE0F ; fully-qualified # 🦹🏻♀️ E11.0 woman supervillain: light skin tone
+1F9B9 1F3FB 200D 2640 ; minimally-qualified # 🦹🏻♀ E11.0 woman supervillain: light skin tone
+1F9B9 1F3FC 200D 2640 FE0F ; fully-qualified # 🦹🏼♀️ E11.0 woman supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2640 ; minimally-qualified # 🦹🏼♀ E11.0 woman supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2640 FE0F ; fully-qualified # 🦹🏽♀️ E11.0 woman supervillain: medium skin tone
+1F9B9 1F3FD 200D 2640 ; minimally-qualified # 🦹🏽♀ E11.0 woman supervillain: medium skin tone
+1F9B9 1F3FE 200D 2640 FE0F ; fully-qualified # 🦹🏾♀️ E11.0 woman supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2640 ; minimally-qualified # 🦹🏾♀ E11.0 woman supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2640 FE0F ; fully-qualified # 🦹🏿♀️ E11.0 woman supervillain: dark skin tone
+1F9B9 1F3FF 200D 2640 ; minimally-qualified # 🦹🏿♀ E11.0 woman supervillain: dark skin tone
+1F9D9 ; fully-qualified # 🧙 E5.0 mage
+1F9D9 1F3FB ; fully-qualified # 🧙🏻 E5.0 mage: light skin tone
+1F9D9 1F3FC ; fully-qualified # 🧙🏼 E5.0 mage: medium-light skin tone
+1F9D9 1F3FD ; fully-qualified # 🧙🏽 E5.0 mage: medium skin tone
+1F9D9 1F3FE ; fully-qualified # 🧙🏾 E5.0 mage: medium-dark skin tone
+1F9D9 1F3FF ; fully-qualified # 🧙🏿 E5.0 mage: dark skin tone
+1F9D9 200D 2642 FE0F ; fully-qualified # 🧙♂️ E5.0 man mage
+1F9D9 200D 2642 ; minimally-qualified # 🧙♂ E5.0 man mage
+1F9D9 1F3FB 200D 2642 FE0F ; fully-qualified # 🧙🏻♂️ E5.0 man mage: light skin tone
+1F9D9 1F3FB 200D 2642 ; minimally-qualified # 🧙🏻♂ E5.0 man mage: light skin tone
+1F9D9 1F3FC 200D 2642 FE0F ; fully-qualified # 🧙🏼♂️ E5.0 man mage: medium-light skin tone
+1F9D9 1F3FC 200D 2642 ; minimally-qualified # 🧙🏼♂ E5.0 man mage: medium-light skin tone
+1F9D9 1F3FD 200D 2642 FE0F ; fully-qualified # 🧙🏽♂️ E5.0 man mage: medium skin tone
+1F9D9 1F3FD 200D 2642 ; minimally-qualified # 🧙🏽♂ E5.0 man mage: medium skin tone
+1F9D9 1F3FE 200D 2642 FE0F ; fully-qualified # 🧙🏾♂️ E5.0 man mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2642 ; minimally-qualified # 🧙🏾♂ E5.0 man mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2642 FE0F ; fully-qualified # 🧙🏿♂️ E5.0 man mage: dark skin tone
+1F9D9 1F3FF 200D 2642 ; minimally-qualified # 🧙🏿♂ E5.0 man mage: dark skin tone
+1F9D9 200D 2640 FE0F ; fully-qualified # 🧙♀️ E5.0 woman mage
+1F9D9 200D 2640 ; minimally-qualified # 🧙♀ E5.0 woman mage
+1F9D9 1F3FB 200D 2640 FE0F ; fully-qualified # 🧙🏻♀️ E5.0 woman mage: light skin tone
+1F9D9 1F3FB 200D 2640 ; minimally-qualified # 🧙🏻♀ E5.0 woman mage: light skin tone
+1F9D9 1F3FC 200D 2640 FE0F ; fully-qualified # 🧙🏼♀️ E5.0 woman mage: medium-light skin tone
+1F9D9 1F3FC 200D 2640 ; minimally-qualified # 🧙🏼♀ E5.0 woman mage: medium-light skin tone
+1F9D9 1F3FD 200D 2640 FE0F ; fully-qualified # 🧙🏽♀️ E5.0 woman mage: medium skin tone
+1F9D9 1F3FD 200D 2640 ; minimally-qualified # 🧙🏽♀ E5.0 woman mage: medium skin tone
+1F9D9 1F3FE 200D 2640 FE0F ; fully-qualified # 🧙🏾♀️ E5.0 woman mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2640 ; minimally-qualified # 🧙🏾♀ E5.0 woman mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2640 FE0F ; fully-qualified # 🧙🏿♀️ E5.0 woman mage: dark skin tone
+1F9D9 1F3FF 200D 2640 ; minimally-qualified # 🧙🏿♀ E5.0 woman mage: dark skin tone
+1F9DA ; fully-qualified # 🧚 E5.0 fairy
+1F9DA 1F3FB ; fully-qualified # 🧚🏻 E5.0 fairy: light skin tone
+1F9DA 1F3FC ; fully-qualified # 🧚🏼 E5.0 fairy: medium-light skin tone
+1F9DA 1F3FD ; fully-qualified # 🧚🏽 E5.0 fairy: medium skin tone
+1F9DA 1F3FE ; fully-qualified # 🧚🏾 E5.0 fairy: medium-dark skin tone
+1F9DA 1F3FF ; fully-qualified # 🧚🏿 E5.0 fairy: dark skin tone
+1F9DA 200D 2642 FE0F ; fully-qualified # 🧚♂️ E5.0 man fairy
+1F9DA 200D 2642 ; minimally-qualified # 🧚♂ E5.0 man fairy
+1F9DA 1F3FB 200D 2642 FE0F ; fully-qualified # 🧚🏻♂️ E5.0 man fairy: light skin tone
+1F9DA 1F3FB 200D 2642 ; minimally-qualified # 🧚🏻♂ E5.0 man fairy: light skin tone
+1F9DA 1F3FC 200D 2642 FE0F ; fully-qualified # 🧚🏼♂️ E5.0 man fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2642 ; minimally-qualified # 🧚🏼♂ E5.0 man fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2642 FE0F ; fully-qualified # 🧚🏽♂️ E5.0 man fairy: medium skin tone
+1F9DA 1F3FD 200D 2642 ; minimally-qualified # 🧚🏽♂ E5.0 man fairy: medium skin tone
+1F9DA 1F3FE 200D 2642 FE0F ; fully-qualified # 🧚🏾♂️ E5.0 man fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2642 ; minimally-qualified # 🧚🏾♂ E5.0 man fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2642 FE0F ; fully-qualified # 🧚🏿♂️ E5.0 man fairy: dark skin tone
+1F9DA 1F3FF 200D 2642 ; minimally-qualified # 🧚🏿♂ E5.0 man fairy: dark skin tone
+1F9DA 200D 2640 FE0F ; fully-qualified # 🧚♀️ E5.0 woman fairy
+1F9DA 200D 2640 ; minimally-qualified # 🧚♀ E5.0 woman fairy
+1F9DA 1F3FB 200D 2640 FE0F ; fully-qualified # 🧚🏻♀️ E5.0 woman fairy: light skin tone
+1F9DA 1F3FB 200D 2640 ; minimally-qualified # 🧚🏻♀ E5.0 woman fairy: light skin tone
+1F9DA 1F3FC 200D 2640 FE0F ; fully-qualified # 🧚🏼♀️ E5.0 woman fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2640 ; minimally-qualified # 🧚🏼♀ E5.0 woman fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2640 FE0F ; fully-qualified # 🧚🏽♀️ E5.0 woman fairy: medium skin tone
+1F9DA 1F3FD 200D 2640 ; minimally-qualified # 🧚🏽♀ E5.0 woman fairy: medium skin tone
+1F9DA 1F3FE 200D 2640 FE0F ; fully-qualified # 🧚🏾♀️ E5.0 woman fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2640 ; minimally-qualified # 🧚🏾♀ E5.0 woman fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2640 FE0F ; fully-qualified # 🧚🏿♀️ E5.0 woman fairy: dark skin tone
+1F9DA 1F3FF 200D 2640 ; minimally-qualified # 🧚🏿♀ E5.0 woman fairy: dark skin tone
+1F9DB ; fully-qualified # 🧛 E5.0 vampire
+1F9DB 1F3FB ; fully-qualified # 🧛🏻 E5.0 vampire: light skin tone
+1F9DB 1F3FC ; fully-qualified # 🧛🏼 E5.0 vampire: medium-light skin tone
+1F9DB 1F3FD ; fully-qualified # 🧛🏽 E5.0 vampire: medium skin tone
+1F9DB 1F3FE ; fully-qualified # 🧛🏾 E5.0 vampire: medium-dark skin tone
+1F9DB 1F3FF ; fully-qualified # 🧛🏿 E5.0 vampire: dark skin tone
+1F9DB 200D 2642 FE0F ; fully-qualified # 🧛♂️ E5.0 man vampire
+1F9DB 200D 2642 ; minimally-qualified # 🧛♂ E5.0 man vampire
+1F9DB 1F3FB 200D 2642 FE0F ; fully-qualified # 🧛🏻♂️ E5.0 man vampire: light skin tone
+1F9DB 1F3FB 200D 2642 ; minimally-qualified # 🧛🏻♂ E5.0 man vampire: light skin tone
+1F9DB 1F3FC 200D 2642 FE0F ; fully-qualified # 🧛🏼♂️ E5.0 man vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2642 ; minimally-qualified # 🧛🏼♂ E5.0 man vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2642 FE0F ; fully-qualified # 🧛🏽♂️ E5.0 man vampire: medium skin tone
+1F9DB 1F3FD 200D 2642 ; minimally-qualified # 🧛🏽♂ E5.0 man vampire: medium skin tone
+1F9DB 1F3FE 200D 2642 FE0F ; fully-qualified # 🧛🏾♂️ E5.0 man vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2642 ; minimally-qualified # 🧛🏾♂ E5.0 man vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2642 FE0F ; fully-qualified # 🧛🏿♂️ E5.0 man vampire: dark skin tone
+1F9DB 1F3FF 200D 2642 ; minimally-qualified # 🧛🏿♂ E5.0 man vampire: dark skin tone
+1F9DB 200D 2640 FE0F ; fully-qualified # 🧛♀️ E5.0 woman vampire
+1F9DB 200D 2640 ; minimally-qualified # 🧛♀ E5.0 woman vampire
+1F9DB 1F3FB 200D 2640 FE0F ; fully-qualified # 🧛🏻♀️ E5.0 woman vampire: light skin tone
+1F9DB 1F3FB 200D 2640 ; minimally-qualified # 🧛🏻♀ E5.0 woman vampire: light skin tone
+1F9DB 1F3FC 200D 2640 FE0F ; fully-qualified # 🧛🏼♀️ E5.0 woman vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2640 ; minimally-qualified # 🧛🏼♀ E5.0 woman vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2640 FE0F ; fully-qualified # 🧛🏽♀️ E5.0 woman vampire: medium skin tone
+1F9DB 1F3FD 200D 2640 ; minimally-qualified # 🧛🏽♀ E5.0 woman vampire: medium skin tone
+1F9DB 1F3FE 200D 2640 FE0F ; fully-qualified # 🧛🏾♀️ E5.0 woman vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2640 ; minimally-qualified # 🧛🏾♀ E5.0 woman vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2640 FE0F ; fully-qualified # 🧛🏿♀️ E5.0 woman vampire: dark skin tone
+1F9DB 1F3FF 200D 2640 ; minimally-qualified # 🧛🏿♀ E5.0 woman vampire: dark skin tone
+1F9DC ; fully-qualified # 🧜 E5.0 merperson
+1F9DC 1F3FB ; fully-qualified # 🧜🏻 E5.0 merperson: light skin tone
+1F9DC 1F3FC ; fully-qualified # 🧜🏼 E5.0 merperson: medium-light skin tone
+1F9DC 1F3FD ; fully-qualified # 🧜🏽 E5.0 merperson: medium skin tone
+1F9DC 1F3FE ; fully-qualified # 🧜🏾 E5.0 merperson: medium-dark skin tone
+1F9DC 1F3FF ; fully-qualified # 🧜🏿 E5.0 merperson: dark skin tone
+1F9DC 200D 2642 FE0F ; fully-qualified # 🧜♂️ E5.0 merman
+1F9DC 200D 2642 ; minimally-qualified # 🧜♂ E5.0 merman
+1F9DC 1F3FB 200D 2642 FE0F ; fully-qualified # 🧜🏻♂️ E5.0 merman: light skin tone
+1F9DC 1F3FB 200D 2642 ; minimally-qualified # 🧜🏻♂ E5.0 merman: light skin tone
+1F9DC 1F3FC 200D 2642 FE0F ; fully-qualified # 🧜🏼♂️ E5.0 merman: medium-light skin tone
+1F9DC 1F3FC 200D 2642 ; minimally-qualified # 🧜🏼♂ E5.0 merman: medium-light skin tone
+1F9DC 1F3FD 200D 2642 FE0F ; fully-qualified # 🧜🏽♂️ E5.0 merman: medium skin tone
+1F9DC 1F3FD 200D 2642 ; minimally-qualified # 🧜🏽♂ E5.0 merman: medium skin tone
+1F9DC 1F3FE 200D 2642 FE0F ; fully-qualified # 🧜🏾♂️ E5.0 merman: medium-dark skin tone
+1F9DC 1F3FE 200D 2642 ; minimally-qualified # 🧜🏾♂ E5.0 merman: medium-dark skin tone
+1F9DC 1F3FF 200D 2642 FE0F ; fully-qualified # 🧜🏿♂️ E5.0 merman: dark skin tone
+1F9DC 1F3FF 200D 2642 ; minimally-qualified # 🧜🏿♂ E5.0 merman: dark skin tone
+1F9DC 200D 2640 FE0F ; fully-qualified # 🧜♀️ E5.0 mermaid
+1F9DC 200D 2640 ; minimally-qualified # 🧜♀ E5.0 mermaid
+1F9DC 1F3FB 200D 2640 FE0F ; fully-qualified # 🧜🏻♀️ E5.0 mermaid: light skin tone
+1F9DC 1F3FB 200D 2640 ; minimally-qualified # 🧜🏻♀ E5.0 mermaid: light skin tone
+1F9DC 1F3FC 200D 2640 FE0F ; fully-qualified # 🧜🏼♀️ E5.0 mermaid: medium-light skin tone
+1F9DC 1F3FC 200D 2640 ; minimally-qualified # 🧜🏼♀ E5.0 mermaid: medium-light skin tone
+1F9DC 1F3FD 200D 2640 FE0F ; fully-qualified # 🧜🏽♀️ E5.0 mermaid: medium skin tone
+1F9DC 1F3FD 200D 2640 ; minimally-qualified # 🧜🏽♀ E5.0 mermaid: medium skin tone
+1F9DC 1F3FE 200D 2640 FE0F ; fully-qualified # 🧜🏾♀️ E5.0 mermaid: medium-dark skin tone
+1F9DC 1F3FE 200D 2640 ; minimally-qualified # 🧜🏾♀ E5.0 mermaid: medium-dark skin tone
+1F9DC 1F3FF 200D 2640 FE0F ; fully-qualified # 🧜🏿♀️ E5.0 mermaid: dark skin tone
+1F9DC 1F3FF 200D 2640 ; minimally-qualified # 🧜🏿♀ E5.0 mermaid: dark skin tone
+1F9DD ; fully-qualified # 🧝 E5.0 elf
+1F9DD 1F3FB ; fully-qualified # 🧝🏻 E5.0 elf: light skin tone
+1F9DD 1F3FC ; fully-qualified # 🧝🏼 E5.0 elf: medium-light skin tone
+1F9DD 1F3FD ; fully-qualified # 🧝🏽 E5.0 elf: medium skin tone
+1F9DD 1F3FE ; fully-qualified # 🧝🏾 E5.0 elf: medium-dark skin tone
+1F9DD 1F3FF ; fully-qualified # 🧝🏿 E5.0 elf: dark skin tone
+1F9DD 200D 2642 FE0F ; fully-qualified # 🧝♂️ E5.0 man elf
+1F9DD 200D 2642 ; minimally-qualified # 🧝♂ E5.0 man elf
+1F9DD 1F3FB 200D 2642 FE0F ; fully-qualified # 🧝🏻♂️ E5.0 man elf: light skin tone
+1F9DD 1F3FB 200D 2642 ; minimally-qualified # 🧝🏻♂ E5.0 man elf: light skin tone
+1F9DD 1F3FC 200D 2642 FE0F ; fully-qualified # 🧝🏼♂️ E5.0 man elf: medium-light skin tone
+1F9DD 1F3FC 200D 2642 ; minimally-qualified # 🧝🏼♂ E5.0 man elf: medium-light skin tone
+1F9DD 1F3FD 200D 2642 FE0F ; fully-qualified # 🧝🏽♂️ E5.0 man elf: medium skin tone
+1F9DD 1F3FD 200D 2642 ; minimally-qualified # 🧝🏽♂ E5.0 man elf: medium skin tone
+1F9DD 1F3FE 200D 2642 FE0F ; fully-qualified # 🧝🏾♂️ E5.0 man elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2642 ; minimally-qualified # 🧝🏾♂ E5.0 man elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2642 FE0F ; fully-qualified # 🧝🏿♂️ E5.0 man elf: dark skin tone
+1F9DD 1F3FF 200D 2642 ; minimally-qualified # 🧝🏿♂ E5.0 man elf: dark skin tone
+1F9DD 200D 2640 FE0F ; fully-qualified # 🧝♀️ E5.0 woman elf
+1F9DD 200D 2640 ; minimally-qualified # 🧝♀ E5.0 woman elf
+1F9DD 1F3FB 200D 2640 FE0F ; fully-qualified # 🧝🏻♀️ E5.0 woman elf: light skin tone
+1F9DD 1F3FB 200D 2640 ; minimally-qualified # 🧝🏻♀ E5.0 woman elf: light skin tone
+1F9DD 1F3FC 200D 2640 FE0F ; fully-qualified # 🧝🏼♀️ E5.0 woman elf: medium-light skin tone
+1F9DD 1F3FC 200D 2640 ; minimally-qualified # 🧝🏼♀ E5.0 woman elf: medium-light skin tone
+1F9DD 1F3FD 200D 2640 FE0F ; fully-qualified # 🧝🏽♀️ E5.0 woman elf: medium skin tone
+1F9DD 1F3FD 200D 2640 ; minimally-qualified # 🧝🏽♀ E5.0 woman elf: medium skin tone
+1F9DD 1F3FE 200D 2640 FE0F ; fully-qualified # 🧝🏾♀️ E5.0 woman elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2640 ; minimally-qualified # 🧝🏾♀ E5.0 woman elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2640 FE0F ; fully-qualified # 🧝🏿♀️ E5.0 woman elf: dark skin tone
+1F9DD 1F3FF 200D 2640 ; minimally-qualified # 🧝🏿♀ E5.0 woman elf: dark skin tone
+1F9DE ; fully-qualified # 🧞 E5.0 genie
+1F9DE 200D 2642 FE0F ; fully-qualified # 🧞♂️ E5.0 man genie
+1F9DE 200D 2642 ; minimally-qualified # 🧞♂ E5.0 man genie
+1F9DE 200D 2640 FE0F ; fully-qualified # 🧞♀️ E5.0 woman genie
+1F9DE 200D 2640 ; minimally-qualified # 🧞♀ E5.0 woman genie
+1F9DF ; fully-qualified # 🧟 E5.0 zombie
+1F9DF 200D 2642 FE0F ; fully-qualified # 🧟♂️ E5.0 man zombie
+1F9DF 200D 2642 ; minimally-qualified # 🧟♂ E5.0 man zombie
+1F9DF 200D 2640 FE0F ; fully-qualified # 🧟♀️ E5.0 woman zombie
+1F9DF 200D 2640 ; minimally-qualified # 🧟♀ E5.0 woman zombie
# subgroup: person-activity
-1F486 ; fully-qualified # 💆 person getting massage
-1F486 1F3FB ; fully-qualified # 💆🏻 person getting massage: light skin tone
-1F486 1F3FC ; fully-qualified # 💆🏼 person getting massage: medium-light skin tone
-1F486 1F3FD ; fully-qualified # 💆🏽 person getting massage: medium skin tone
-1F486 1F3FE ; fully-qualified # 💆🏾 person getting massage: medium-dark skin tone
-1F486 1F3FF ; fully-qualified # 💆🏿 person getting massage: dark skin tone
-1F486 200D 2642 FE0F ; fully-qualified # 💆♂️ man getting massage
-1F486 200D 2642 ; minimally-qualified # 💆♂ man getting massage
-1F486 1F3FB 200D 2642 FE0F ; fully-qualified # 💆🏻♂️ man getting massage: light skin tone
-1F486 1F3FB 200D 2642 ; minimally-qualified # 💆🏻♂ man getting massage: light skin tone
-1F486 1F3FC 200D 2642 FE0F ; fully-qualified # 💆🏼♂️ man getting massage: medium-light skin tone
-1F486 1F3FC 200D 2642 ; minimally-qualified # 💆🏼♂ man getting massage: medium-light skin tone
-1F486 1F3FD 200D 2642 FE0F ; fully-qualified # 💆🏽♂️ man getting massage: medium skin tone
-1F486 1F3FD 200D 2642 ; minimally-qualified # 💆🏽♂ man getting massage: medium skin tone
-1F486 1F3FE 200D 2642 FE0F ; fully-qualified # 💆🏾♂️ man getting massage: medium-dark skin tone
-1F486 1F3FE 200D 2642 ; minimally-qualified # 💆🏾♂ man getting massage: medium-dark skin tone
-1F486 1F3FF 200D 2642 FE0F ; fully-qualified # 💆🏿♂️ man getting massage: dark skin tone
-1F486 1F3FF 200D 2642 ; minimally-qualified # 💆🏿♂ man getting massage: dark skin tone
-1F486 200D 2640 FE0F ; fully-qualified # 💆♀️ woman getting massage
-1F486 200D 2640 ; minimally-qualified # 💆♀ woman getting massage
-1F486 1F3FB 200D 2640 FE0F ; fully-qualified # 💆🏻♀️ woman getting massage: light skin tone
-1F486 1F3FB 200D 2640 ; minimally-qualified # 💆🏻♀ woman getting massage: light skin tone
-1F486 1F3FC 200D 2640 FE0F ; fully-qualified # 💆🏼♀️ woman getting massage: medium-light skin tone
-1F486 1F3FC 200D 2640 ; minimally-qualified # 💆🏼♀ woman getting massage: medium-light skin tone
-1F486 1F3FD 200D 2640 FE0F ; fully-qualified # 💆🏽♀️ woman getting massage: medium skin tone
-1F486 1F3FD 200D 2640 ; minimally-qualified # 💆🏽♀ woman getting massage: medium skin tone
-1F486 1F3FE 200D 2640 FE0F ; fully-qualified # 💆🏾♀️ woman getting massage: medium-dark skin tone
-1F486 1F3FE 200D 2640 ; minimally-qualified # 💆🏾♀ woman getting massage: medium-dark skin tone
-1F486 1F3FF 200D 2640 FE0F ; fully-qualified # 💆🏿♀️ woman getting massage: dark skin tone
-1F486 1F3FF 200D 2640 ; minimally-qualified # 💆🏿♀ woman getting massage: dark skin tone
-1F487 ; fully-qualified # 💇 person getting haircut
-1F487 1F3FB ; fully-qualified # 💇🏻 person getting haircut: light skin tone
-1F487 1F3FC ; fully-qualified # 💇🏼 person getting haircut: medium-light skin tone
-1F487 1F3FD ; fully-qualified # 💇🏽 person getting haircut: medium skin tone
-1F487 1F3FE ; fully-qualified # 💇🏾 person getting haircut: medium-dark skin tone
-1F487 1F3FF ; fully-qualified # 💇🏿 person getting haircut: dark skin tone
-1F487 200D 2642 FE0F ; fully-qualified # 💇♂️ man getting haircut
-1F487 200D 2642 ; minimally-qualified # 💇♂ man getting haircut
-1F487 1F3FB 200D 2642 FE0F ; fully-qualified # 💇🏻♂️ man getting haircut: light skin tone
-1F487 1F3FB 200D 2642 ; minimally-qualified # 💇🏻♂ man getting haircut: light skin tone
-1F487 1F3FC 200D 2642 FE0F ; fully-qualified # 💇🏼♂️ man getting haircut: medium-light skin tone
-1F487 1F3FC 200D 2642 ; minimally-qualified # 💇🏼♂ man getting haircut: medium-light skin tone
-1F487 1F3FD 200D 2642 FE0F ; fully-qualified # 💇🏽♂️ man getting haircut: medium skin tone
-1F487 1F3FD 200D 2642 ; minimally-qualified # 💇🏽♂ man getting haircut: medium skin tone
-1F487 1F3FE 200D 2642 FE0F ; fully-qualified # 💇🏾♂️ man getting haircut: medium-dark skin tone
-1F487 1F3FE 200D 2642 ; minimally-qualified # 💇🏾♂ man getting haircut: medium-dark skin tone
-1F487 1F3FF 200D 2642 FE0F ; fully-qualified # 💇🏿♂️ man getting haircut: dark skin tone
-1F487 1F3FF 200D 2642 ; minimally-qualified # 💇🏿♂ man getting haircut: dark skin tone
-1F487 200D 2640 FE0F ; fully-qualified # 💇♀️ woman getting haircut
-1F487 200D 2640 ; minimally-qualified # 💇♀ woman getting haircut
-1F487 1F3FB 200D 2640 FE0F ; fully-qualified # 💇🏻♀️ woman getting haircut: light skin tone
-1F487 1F3FB 200D 2640 ; minimally-qualified # 💇🏻♀ woman getting haircut: light skin tone
-1F487 1F3FC 200D 2640 FE0F ; fully-qualified # 💇🏼♀️ woman getting haircut: medium-light skin tone
-1F487 1F3FC 200D 2640 ; minimally-qualified # 💇🏼♀ woman getting haircut: medium-light skin tone
-1F487 1F3FD 200D 2640 FE0F ; fully-qualified # 💇🏽♀️ woman getting haircut: medium skin tone
-1F487 1F3FD 200D 2640 ; minimally-qualified # 💇🏽♀ woman getting haircut: medium skin tone
-1F487 1F3FE 200D 2640 FE0F ; fully-qualified # 💇🏾♀️ woman getting haircut: medium-dark skin tone
-1F487 1F3FE 200D 2640 ; minimally-qualified # 💇🏾♀ woman getting haircut: medium-dark skin tone
-1F487 1F3FF 200D 2640 FE0F ; fully-qualified # 💇🏿♀️ woman getting haircut: dark skin tone
-1F487 1F3FF 200D 2640 ; minimally-qualified # 💇🏿♀ woman getting haircut: dark skin tone
-1F6B6 ; fully-qualified # 🚶 person walking
-1F6B6 1F3FB ; fully-qualified # 🚶🏻 person walking: light skin tone
-1F6B6 1F3FC ; fully-qualified # 🚶🏼 person walking: medium-light skin tone
-1F6B6 1F3FD ; fully-qualified # 🚶🏽 person walking: medium skin tone
-1F6B6 1F3FE ; fully-qualified # 🚶🏾 person walking: medium-dark skin tone
-1F6B6 1F3FF ; fully-qualified # 🚶🏿 person walking: dark skin tone
-1F6B6 200D 2642 FE0F ; fully-qualified # 🚶♂️ man walking
-1F6B6 200D 2642 ; minimally-qualified # 🚶♂ man walking
-1F6B6 1F3FB 200D 2642 FE0F ; fully-qualified # 🚶🏻♂️ man walking: light skin tone
-1F6B6 1F3FB 200D 2642 ; minimally-qualified # 🚶🏻♂ man walking: light skin tone
-1F6B6 1F3FC 200D 2642 FE0F ; fully-qualified # 🚶🏼♂️ man walking: medium-light skin tone
-1F6B6 1F3FC 200D 2642 ; minimally-qualified # 🚶🏼♂ man walking: medium-light skin tone
-1F6B6 1F3FD 200D 2642 FE0F ; fully-qualified # 🚶🏽♂️ man walking: medium skin tone
-1F6B6 1F3FD 200D 2642 ; minimally-qualified # 🚶🏽♂ man walking: medium skin tone
-1F6B6 1F3FE 200D 2642 FE0F ; fully-qualified # 🚶🏾♂️ man walking: medium-dark skin tone
-1F6B6 1F3FE 200D 2642 ; minimally-qualified # 🚶🏾♂ man walking: medium-dark skin tone
-1F6B6 1F3FF 200D 2642 FE0F ; fully-qualified # 🚶🏿♂️ man walking: dark skin tone
-1F6B6 1F3FF 200D 2642 ; minimally-qualified # 🚶🏿♂ man walking: dark skin tone
-1F6B6 200D 2640 FE0F ; fully-qualified # 🚶♀️ woman walking
-1F6B6 200D 2640 ; minimally-qualified # 🚶♀ woman walking
-1F6B6 1F3FB 200D 2640 FE0F ; fully-qualified # 🚶🏻♀️ woman walking: light skin tone
-1F6B6 1F3FB 200D 2640 ; minimally-qualified # 🚶🏻♀ woman walking: light skin tone
-1F6B6 1F3FC 200D 2640 FE0F ; fully-qualified # 🚶🏼♀️ woman walking: medium-light skin tone
-1F6B6 1F3FC 200D 2640 ; minimally-qualified # 🚶🏼♀ woman walking: medium-light skin tone
-1F6B6 1F3FD 200D 2640 FE0F ; fully-qualified # 🚶🏽♀️ woman walking: medium skin tone
-1F6B6 1F3FD 200D 2640 ; minimally-qualified # 🚶🏽♀ woman walking: medium skin tone
-1F6B6 1F3FE 200D 2640 FE0F ; fully-qualified # 🚶🏾♀️ woman walking: medium-dark skin tone
-1F6B6 1F3FE 200D 2640 ; minimally-qualified # 🚶🏾♀ woman walking: medium-dark skin tone
-1F6B6 1F3FF 200D 2640 FE0F ; fully-qualified # 🚶🏿♀️ woman walking: dark skin tone
-1F6B6 1F3FF 200D 2640 ; minimally-qualified # 🚶🏿♀ woman walking: dark skin tone
-1F9CD ; fully-qualified # 🧍 person standing
-1F9CD 1F3FB ; fully-qualified # 🧍🏻 person standing: light skin tone
-1F9CD 1F3FC ; fully-qualified # 🧍🏼 person standing: medium-light skin tone
-1F9CD 1F3FD ; fully-qualified # 🧍🏽 person standing: medium skin tone
-1F9CD 1F3FE ; fully-qualified # 🧍🏾 person standing: medium-dark skin tone
-1F9CD 1F3FF ; fully-qualified # 🧍🏿 person standing: dark skin tone
-1F9CD 200D 2642 FE0F ; fully-qualified # 🧍♂️ man standing
-1F9CD 200D 2642 ; minimally-qualified # 🧍♂ man standing
-1F9CD 1F3FB 200D 2642 FE0F ; fully-qualified # 🧍🏻♂️ man standing: light skin tone
-1F9CD 1F3FB 200D 2642 ; minimally-qualified # 🧍🏻♂ man standing: light skin tone
-1F9CD 1F3FC 200D 2642 FE0F ; fully-qualified # 🧍🏼♂️ man standing: medium-light skin tone
-1F9CD 1F3FC 200D 2642 ; minimally-qualified # 🧍🏼♂ man standing: medium-light skin tone
-1F9CD 1F3FD 200D 2642 FE0F ; fully-qualified # 🧍🏽♂️ man standing: medium skin tone
-1F9CD 1F3FD 200D 2642 ; minimally-qualified # 🧍🏽♂ man standing: medium skin tone
-1F9CD 1F3FE 200D 2642 FE0F ; fully-qualified # 🧍🏾♂️ man standing: medium-dark skin tone
-1F9CD 1F3FE 200D 2642 ; minimally-qualified # 🧍🏾♂ man standing: medium-dark skin tone
-1F9CD 1F3FF 200D 2642 FE0F ; fully-qualified # 🧍🏿♂️ man standing: dark skin tone
-1F9CD 1F3FF 200D 2642 ; minimally-qualified # 🧍🏿♂ man standing: dark skin tone
-1F9CD 200D 2640 FE0F ; fully-qualified # 🧍♀️ woman standing
-1F9CD 200D 2640 ; minimally-qualified # 🧍♀ woman standing
-1F9CD 1F3FB 200D 2640 FE0F ; fully-qualified # 🧍🏻♀️ woman standing: light skin tone
-1F9CD 1F3FB 200D 2640 ; minimally-qualified # 🧍🏻♀ woman standing: light skin tone
-1F9CD 1F3FC 200D 2640 FE0F ; fully-qualified # 🧍🏼♀️ woman standing: medium-light skin tone
-1F9CD 1F3FC 200D 2640 ; minimally-qualified # 🧍🏼♀ woman standing: medium-light skin tone
-1F9CD 1F3FD 200D 2640 FE0F ; fully-qualified # 🧍🏽♀️ woman standing: medium skin tone
-1F9CD 1F3FD 200D 2640 ; minimally-qualified # 🧍🏽♀ woman standing: medium skin tone
-1F9CD 1F3FE 200D 2640 FE0F ; fully-qualified # 🧍🏾♀️ woman standing: medium-dark skin tone
-1F9CD 1F3FE 200D 2640 ; minimally-qualified # 🧍🏾♀ woman standing: medium-dark skin tone
-1F9CD 1F3FF 200D 2640 FE0F ; fully-qualified # 🧍🏿♀️ woman standing: dark skin tone
-1F9CD 1F3FF 200D 2640 ; minimally-qualified # 🧍🏿♀ woman standing: dark skin tone
-1F9CE ; fully-qualified # 🧎 person kneeling
-1F9CE 1F3FB ; fully-qualified # 🧎🏻 person kneeling: light skin tone
-1F9CE 1F3FC ; fully-qualified # 🧎🏼 person kneeling: medium-light skin tone
-1F9CE 1F3FD ; fully-qualified # 🧎🏽 person kneeling: medium skin tone
-1F9CE 1F3FE ; fully-qualified # 🧎🏾 person kneeling: medium-dark skin tone
-1F9CE 1F3FF ; fully-qualified # 🧎🏿 person kneeling: dark skin tone
-1F9CE 200D 2642 FE0F ; fully-qualified # 🧎♂️ man kneeling
-1F9CE 200D 2642 ; minimally-qualified # 🧎♂ man kneeling
-1F9CE 1F3FB 200D 2642 FE0F ; fully-qualified # 🧎🏻♂️ man kneeling: light skin tone
-1F9CE 1F3FB 200D 2642 ; minimally-qualified # 🧎🏻♂ man kneeling: light skin tone
-1F9CE 1F3FC 200D 2642 FE0F ; fully-qualified # 🧎🏼♂️ man kneeling: medium-light skin tone
-1F9CE 1F3FC 200D 2642 ; minimally-qualified # 🧎🏼♂ man kneeling: medium-light skin tone
-1F9CE 1F3FD 200D 2642 FE0F ; fully-qualified # 🧎🏽♂️ man kneeling: medium skin tone
-1F9CE 1F3FD 200D 2642 ; minimally-qualified # 🧎🏽♂ man kneeling: medium skin tone
-1F9CE 1F3FE 200D 2642 FE0F ; fully-qualified # 🧎🏾♂️ man kneeling: medium-dark skin tone
-1F9CE 1F3FE 200D 2642 ; minimally-qualified # 🧎🏾♂ man kneeling: medium-dark skin tone
-1F9CE 1F3FF 200D 2642 FE0F ; fully-qualified # 🧎🏿♂️ man kneeling: dark skin tone
-1F9CE 1F3FF 200D 2642 ; minimally-qualified # 🧎🏿♂ man kneeling: dark skin tone
-1F9CE 200D 2640 FE0F ; fully-qualified # 🧎♀️ woman kneeling
-1F9CE 200D 2640 ; minimally-qualified # 🧎♀ woman kneeling
-1F9CE 1F3FB 200D 2640 FE0F ; fully-qualified # 🧎🏻♀️ woman kneeling: light skin tone
-1F9CE 1F3FB 200D 2640 ; minimally-qualified # 🧎🏻♀ woman kneeling: light skin tone
-1F9CE 1F3FC 200D 2640 FE0F ; fully-qualified # 🧎🏼♀️ woman kneeling: medium-light skin tone
-1F9CE 1F3FC 200D 2640 ; minimally-qualified # 🧎🏼♀ woman kneeling: medium-light skin tone
-1F9CE 1F3FD 200D 2640 FE0F ; fully-qualified # 🧎🏽♀️ woman kneeling: medium skin tone
-1F9CE 1F3FD 200D 2640 ; minimally-qualified # 🧎🏽♀ woman kneeling: medium skin tone
-1F9CE 1F3FE 200D 2640 FE0F ; fully-qualified # 🧎🏾♀️ woman kneeling: medium-dark skin tone
-1F9CE 1F3FE 200D 2640 ; minimally-qualified # 🧎🏾♀ woman kneeling: medium-dark skin tone
-1F9CE 1F3FF 200D 2640 FE0F ; fully-qualified # 🧎🏿♀️ woman kneeling: dark skin tone
-1F9CE 1F3FF 200D 2640 ; minimally-qualified # 🧎🏿♀ woman kneeling: dark skin tone
-1F9D1 200D 1F9AF ; fully-qualified # 🧑🦯 person with white cane
-1F9D1 1F3FB 200D 1F9AF ; fully-qualified # 🧑🏻🦯 person with white cane: light skin tone
-1F9D1 1F3FC 200D 1F9AF ; fully-qualified # 🧑🏼🦯 person with white cane: medium-light skin tone
-1F9D1 1F3FD 200D 1F9AF ; fully-qualified # 🧑🏽🦯 person with white cane: medium skin tone
-1F9D1 1F3FE 200D 1F9AF ; fully-qualified # 🧑🏾🦯 person with white cane: medium-dark skin tone
-1F9D1 1F3FF 200D 1F9AF ; fully-qualified # 🧑🏿🦯 person with white cane: dark skin tone
-1F468 200D 1F9AF ; fully-qualified # 👨🦯 man with white cane
-1F468 1F3FB 200D 1F9AF ; fully-qualified # 👨🏻🦯 man with white cane: light skin tone
-1F468 1F3FC 200D 1F9AF ; fully-qualified # 👨🏼🦯 man with white cane: medium-light skin tone
-1F468 1F3FD 200D 1F9AF ; fully-qualified # 👨🏽🦯 man with white cane: medium skin tone
-1F468 1F3FE 200D 1F9AF ; fully-qualified # 👨🏾🦯 man with white cane: medium-dark skin tone
-1F468 1F3FF 200D 1F9AF ; fully-qualified # 👨🏿🦯 man with white cane: dark skin tone
-1F469 200D 1F9AF ; fully-qualified # 👩🦯 woman with white cane
-1F469 1F3FB 200D 1F9AF ; fully-qualified # 👩🏻🦯 woman with white cane: light skin tone
-1F469 1F3FC 200D 1F9AF ; fully-qualified # 👩🏼🦯 woman with white cane: medium-light skin tone
-1F469 1F3FD 200D 1F9AF ; fully-qualified # 👩🏽🦯 woman with white cane: medium skin tone
-1F469 1F3FE 200D 1F9AF ; fully-qualified # 👩🏾🦯 woman with white cane: medium-dark skin tone
-1F469 1F3FF 200D 1F9AF ; fully-qualified # 👩🏿🦯 woman with white cane: dark skin tone
-1F9D1 200D 1F9BC ; fully-qualified # 🧑🦼 person in motorized wheelchair
-1F9D1 1F3FB 200D 1F9BC ; fully-qualified # 🧑🏻🦼 person in motorized wheelchair: light skin tone
-1F9D1 1F3FC 200D 1F9BC ; fully-qualified # 🧑🏼🦼 person in motorized wheelchair: medium-light skin tone
-1F9D1 1F3FD 200D 1F9BC ; fully-qualified # 🧑🏽🦼 person in motorized wheelchair: medium skin tone
-1F9D1 1F3FE 200D 1F9BC ; fully-qualified # 🧑🏾🦼 person in motorized wheelchair: medium-dark skin tone
-1F9D1 1F3FF 200D 1F9BC ; fully-qualified # 🧑🏿🦼 person in motorized wheelchair: dark skin tone
-1F468 200D 1F9BC ; fully-qualified # 👨🦼 man in motorized wheelchair
-1F468 1F3FB 200D 1F9BC ; fully-qualified # 👨🏻🦼 man in motorized wheelchair: light skin tone
-1F468 1F3FC 200D 1F9BC ; fully-qualified # 👨🏼🦼 man in motorized wheelchair: medium-light skin tone
-1F468 1F3FD 200D 1F9BC ; fully-qualified # 👨🏽🦼 man in motorized wheelchair: medium skin tone
-1F468 1F3FE 200D 1F9BC ; fully-qualified # 👨🏾🦼 man in motorized wheelchair: medium-dark skin tone
-1F468 1F3FF 200D 1F9BC ; fully-qualified # 👨🏿🦼 man in motorized wheelchair: dark skin tone
-1F469 200D 1F9BC ; fully-qualified # 👩🦼 woman in motorized wheelchair
-1F469 1F3FB 200D 1F9BC ; fully-qualified # 👩🏻🦼 woman in motorized wheelchair: light skin tone
-1F469 1F3FC 200D 1F9BC ; fully-qualified # 👩🏼🦼 woman in motorized wheelchair: medium-light skin tone
-1F469 1F3FD 200D 1F9BC ; fully-qualified # 👩🏽🦼 woman in motorized wheelchair: medium skin tone
-1F469 1F3FE 200D 1F9BC ; fully-qualified # 👩🏾🦼 woman in motorized wheelchair: medium-dark skin tone
-1F469 1F3FF 200D 1F9BC ; fully-qualified # 👩🏿🦼 woman in motorized wheelchair: dark skin tone
-1F9D1 200D 1F9BD ; fully-qualified # 🧑🦽 person in manual wheelchair
-1F9D1 1F3FB 200D 1F9BD ; fully-qualified # 🧑🏻🦽 person in manual wheelchair: light skin tone
-1F9D1 1F3FC 200D 1F9BD ; fully-qualified # 🧑🏼🦽 person in manual wheelchair: medium-light skin tone
-1F9D1 1F3FD 200D 1F9BD ; fully-qualified # 🧑🏽🦽 person in manual wheelchair: medium skin tone
-1F9D1 1F3FE 200D 1F9BD ; fully-qualified # 🧑🏾🦽 person in manual wheelchair: medium-dark skin tone
-1F9D1 1F3FF 200D 1F9BD ; fully-qualified # 🧑🏿🦽 person in manual wheelchair: dark skin tone
-1F468 200D 1F9BD ; fully-qualified # 👨🦽 man in manual wheelchair
-1F468 1F3FB 200D 1F9BD ; fully-qualified # 👨🏻🦽 man in manual wheelchair: light skin tone
-1F468 1F3FC 200D 1F9BD ; fully-qualified # 👨🏼🦽 man in manual wheelchair: medium-light skin tone
-1F468 1F3FD 200D 1F9BD ; fully-qualified # 👨🏽🦽 man in manual wheelchair: medium skin tone
-1F468 1F3FE 200D 1F9BD ; fully-qualified # 👨🏾🦽 man in manual wheelchair: medium-dark skin tone
-1F468 1F3FF 200D 1F9BD ; fully-qualified # 👨🏿🦽 man in manual wheelchair: dark skin tone
-1F469 200D 1F9BD ; fully-qualified # 👩🦽 woman in manual wheelchair
-1F469 1F3FB 200D 1F9BD ; fully-qualified # 👩🏻🦽 woman in manual wheelchair: light skin tone
-1F469 1F3FC 200D 1F9BD ; fully-qualified # 👩🏼🦽 woman in manual wheelchair: medium-light skin tone
-1F469 1F3FD 200D 1F9BD ; fully-qualified # 👩🏽🦽 woman in manual wheelchair: medium skin tone
-1F469 1F3FE 200D 1F9BD ; fully-qualified # 👩🏾🦽 woman in manual wheelchair: medium-dark skin tone
-1F469 1F3FF 200D 1F9BD ; fully-qualified # 👩🏿🦽 woman in manual wheelchair: dark skin tone
-1F3C3 ; fully-qualified # 🏃 person running
-1F3C3 1F3FB ; fully-qualified # 🏃🏻 person running: light skin tone
-1F3C3 1F3FC ; fully-qualified # 🏃🏼 person running: medium-light skin tone
-1F3C3 1F3FD ; fully-qualified # 🏃🏽 person running: medium skin tone
-1F3C3 1F3FE ; fully-qualified # 🏃🏾 person running: medium-dark skin tone
-1F3C3 1F3FF ; fully-qualified # 🏃🏿 person running: dark skin tone
-1F3C3 200D 2642 FE0F ; fully-qualified # 🏃♂️ man running
-1F3C3 200D 2642 ; minimally-qualified # 🏃♂ man running
-1F3C3 1F3FB 200D 2642 FE0F ; fully-qualified # 🏃🏻♂️ man running: light skin tone
-1F3C3 1F3FB 200D 2642 ; minimally-qualified # 🏃🏻♂ man running: light skin tone
-1F3C3 1F3FC 200D 2642 FE0F ; fully-qualified # 🏃🏼♂️ man running: medium-light skin tone
-1F3C3 1F3FC 200D 2642 ; minimally-qualified # 🏃🏼♂ man running: medium-light skin tone
-1F3C3 1F3FD 200D 2642 FE0F ; fully-qualified # 🏃🏽♂️ man running: medium skin tone
-1F3C3 1F3FD 200D 2642 ; minimally-qualified # 🏃🏽♂ man running: medium skin tone
-1F3C3 1F3FE 200D 2642 FE0F ; fully-qualified # 🏃🏾♂️ man running: medium-dark skin tone
-1F3C3 1F3FE 200D 2642 ; minimally-qualified # 🏃🏾♂ man running: medium-dark skin tone
-1F3C3 1F3FF 200D 2642 FE0F ; fully-qualified # 🏃🏿♂️ man running: dark skin tone
-1F3C3 1F3FF 200D 2642 ; minimally-qualified # 🏃🏿♂ man running: dark skin tone
-1F3C3 200D 2640 FE0F ; fully-qualified # 🏃♀️ woman running
-1F3C3 200D 2640 ; minimally-qualified # 🏃♀ woman running
-1F3C3 1F3FB 200D 2640 FE0F ; fully-qualified # 🏃🏻♀️ woman running: light skin tone
-1F3C3 1F3FB 200D 2640 ; minimally-qualified # 🏃🏻♀ woman running: light skin tone
-1F3C3 1F3FC 200D 2640 FE0F ; fully-qualified # 🏃🏼♀️ woman running: medium-light skin tone
-1F3C3 1F3FC 200D 2640 ; minimally-qualified # 🏃🏼♀ woman running: medium-light skin tone
-1F3C3 1F3FD 200D 2640 FE0F ; fully-qualified # 🏃🏽♀️ woman running: medium skin tone
-1F3C3 1F3FD 200D 2640 ; minimally-qualified # 🏃🏽♀ woman running: medium skin tone
-1F3C3 1F3FE 200D 2640 FE0F ; fully-qualified # 🏃🏾♀️ woman running: medium-dark skin tone
-1F3C3 1F3FE 200D 2640 ; minimally-qualified # 🏃🏾♀ woman running: medium-dark skin tone
-1F3C3 1F3FF 200D 2640 FE0F ; fully-qualified # 🏃🏿♀️ woman running: dark skin tone
-1F3C3 1F3FF 200D 2640 ; minimally-qualified # 🏃🏿♀ woman running: dark skin tone
-1F483 ; fully-qualified # 💃 woman dancing
-1F483 1F3FB ; fully-qualified # 💃🏻 woman dancing: light skin tone
-1F483 1F3FC ; fully-qualified # 💃🏼 woman dancing: medium-light skin tone
-1F483 1F3FD ; fully-qualified # 💃🏽 woman dancing: medium skin tone
-1F483 1F3FE ; fully-qualified # 💃🏾 woman dancing: medium-dark skin tone
-1F483 1F3FF ; fully-qualified # 💃🏿 woman dancing: dark skin tone
-1F57A ; fully-qualified # 🕺 man dancing
-1F57A 1F3FB ; fully-qualified # 🕺🏻 man dancing: light skin tone
-1F57A 1F3FC ; fully-qualified # 🕺🏼 man dancing: medium-light skin tone
-1F57A 1F3FD ; fully-qualified # 🕺🏽 man dancing: medium skin tone
-1F57A 1F3FE ; fully-qualified # 🕺🏾 man dancing: medium-dark skin tone
-1F57A 1F3FF ; fully-qualified # 🕺🏿 man dancing: dark skin tone
-1F574 FE0F ; fully-qualified # 🕴️ person in suit levitating
-1F574 ; unqualified # 🕴 person in suit levitating
-1F574 1F3FB ; fully-qualified # 🕴🏻 person in suit levitating: light skin tone
-1F574 1F3FC ; fully-qualified # 🕴🏼 person in suit levitating: medium-light skin tone
-1F574 1F3FD ; fully-qualified # 🕴🏽 person in suit levitating: medium skin tone
-1F574 1F3FE ; fully-qualified # 🕴🏾 person in suit levitating: medium-dark skin tone
-1F574 1F3FF ; fully-qualified # 🕴🏿 person in suit levitating: dark skin tone
-1F46F ; fully-qualified # 👯 people with bunny ears
-1F46F 200D 2642 FE0F ; fully-qualified # 👯♂️ men with bunny ears
-1F46F 200D 2642 ; minimally-qualified # 👯♂ men with bunny ears
-1F46F 200D 2640 FE0F ; fully-qualified # 👯♀️ women with bunny ears
-1F46F 200D 2640 ; minimally-qualified # 👯♀ women with bunny ears
-1F9D6 ; fully-qualified # 🧖 person in steamy room
-1F9D6 1F3FB ; fully-qualified # 🧖🏻 person in steamy room: light skin tone
-1F9D6 1F3FC ; fully-qualified # 🧖🏼 person in steamy room: medium-light skin tone
-1F9D6 1F3FD ; fully-qualified # 🧖🏽 person in steamy room: medium skin tone
-1F9D6 1F3FE ; fully-qualified # 🧖🏾 person in steamy room: medium-dark skin tone
-1F9D6 1F3FF ; fully-qualified # 🧖🏿 person in steamy room: dark skin tone
-1F9D6 200D 2642 FE0F ; fully-qualified # 🧖♂️ man in steamy room
-1F9D6 200D 2642 ; minimally-qualified # 🧖♂ man in steamy room
-1F9D6 1F3FB 200D 2642 FE0F ; fully-qualified # 🧖🏻♂️ man in steamy room: light skin tone
-1F9D6 1F3FB 200D 2642 ; minimally-qualified # 🧖🏻♂ man in steamy room: light skin tone
-1F9D6 1F3FC 200D 2642 FE0F ; fully-qualified # 🧖🏼♂️ man in steamy room: medium-light skin tone
-1F9D6 1F3FC 200D 2642 ; minimally-qualified # 🧖🏼♂ man in steamy room: medium-light skin tone
-1F9D6 1F3FD 200D 2642 FE0F ; fully-qualified # 🧖🏽♂️ man in steamy room: medium skin tone
-1F9D6 1F3FD 200D 2642 ; minimally-qualified # 🧖🏽♂ man in steamy room: medium skin tone
-1F9D6 1F3FE 200D 2642 FE0F ; fully-qualified # 🧖🏾♂️ man in steamy room: medium-dark skin tone
-1F9D6 1F3FE 200D 2642 ; minimally-qualified # 🧖🏾♂ man in steamy room: medium-dark skin tone
-1F9D6 1F3FF 200D 2642 FE0F ; fully-qualified # 🧖🏿♂️ man in steamy room: dark skin tone
-1F9D6 1F3FF 200D 2642 ; minimally-qualified # 🧖🏿♂ man in steamy room: dark skin tone
-1F9D6 200D 2640 FE0F ; fully-qualified # 🧖♀️ woman in steamy room
-1F9D6 200D 2640 ; minimally-qualified # 🧖♀ woman in steamy room
-1F9D6 1F3FB 200D 2640 FE0F ; fully-qualified # 🧖🏻♀️ woman in steamy room: light skin tone
-1F9D6 1F3FB 200D 2640 ; minimally-qualified # 🧖🏻♀ woman in steamy room: light skin tone
-1F9D6 1F3FC 200D 2640 FE0F ; fully-qualified # 🧖🏼♀️ woman in steamy room: medium-light skin tone
-1F9D6 1F3FC 200D 2640 ; minimally-qualified # 🧖🏼♀ woman in steamy room: medium-light skin tone
-1F9D6 1F3FD 200D 2640 FE0F ; fully-qualified # 🧖🏽♀️ woman in steamy room: medium skin tone
-1F9D6 1F3FD 200D 2640 ; minimally-qualified # 🧖🏽♀ woman in steamy room: medium skin tone
-1F9D6 1F3FE 200D 2640 FE0F ; fully-qualified # 🧖🏾♀️ woman in steamy room: medium-dark skin tone
-1F9D6 1F3FE 200D 2640 ; minimally-qualified # 🧖🏾♀ woman in steamy room: medium-dark skin tone
-1F9D6 1F3FF 200D 2640 FE0F ; fully-qualified # 🧖🏿♀️ woman in steamy room: dark skin tone
-1F9D6 1F3FF 200D 2640 ; minimally-qualified # 🧖🏿♀ woman in steamy room: dark skin tone
-1F9D7 ; fully-qualified # 🧗 person climbing
-1F9D7 1F3FB ; fully-qualified # 🧗🏻 person climbing: light skin tone
-1F9D7 1F3FC ; fully-qualified # 🧗🏼 person climbing: medium-light skin tone
-1F9D7 1F3FD ; fully-qualified # 🧗🏽 person climbing: medium skin tone
-1F9D7 1F3FE ; fully-qualified # 🧗🏾 person climbing: medium-dark skin tone
-1F9D7 1F3FF ; fully-qualified # 🧗🏿 person climbing: dark skin tone
-1F9D7 200D 2642 FE0F ; fully-qualified # 🧗♂️ man climbing
-1F9D7 200D 2642 ; minimally-qualified # 🧗♂ man climbing
-1F9D7 1F3FB 200D 2642 FE0F ; fully-qualified # 🧗🏻♂️ man climbing: light skin tone
-1F9D7 1F3FB 200D 2642 ; minimally-qualified # 🧗🏻♂ man climbing: light skin tone
-1F9D7 1F3FC 200D 2642 FE0F ; fully-qualified # 🧗🏼♂️ man climbing: medium-light skin tone
-1F9D7 1F3FC 200D 2642 ; minimally-qualified # 🧗🏼♂ man climbing: medium-light skin tone
-1F9D7 1F3FD 200D 2642 FE0F ; fully-qualified # 🧗🏽♂️ man climbing: medium skin tone
-1F9D7 1F3FD 200D 2642 ; minimally-qualified # 🧗🏽♂ man climbing: medium skin tone
-1F9D7 1F3FE 200D 2642 FE0F ; fully-qualified # 🧗🏾♂️ man climbing: medium-dark skin tone
-1F9D7 1F3FE 200D 2642 ; minimally-qualified # 🧗🏾♂ man climbing: medium-dark skin tone
-1F9D7 1F3FF 200D 2642 FE0F ; fully-qualified # 🧗🏿♂️ man climbing: dark skin tone
-1F9D7 1F3FF 200D 2642 ; minimally-qualified # 🧗🏿♂ man climbing: dark skin tone
-1F9D7 200D 2640 FE0F ; fully-qualified # 🧗♀️ woman climbing
-1F9D7 200D 2640 ; minimally-qualified # 🧗♀ woman climbing
-1F9D7 1F3FB 200D 2640 FE0F ; fully-qualified # 🧗🏻♀️ woman climbing: light skin tone
-1F9D7 1F3FB 200D 2640 ; minimally-qualified # 🧗🏻♀ woman climbing: light skin tone
-1F9D7 1F3FC 200D 2640 FE0F ; fully-qualified # 🧗🏼♀️ woman climbing: medium-light skin tone
-1F9D7 1F3FC 200D 2640 ; minimally-qualified # 🧗🏼♀ woman climbing: medium-light skin tone
-1F9D7 1F3FD 200D 2640 FE0F ; fully-qualified # 🧗🏽♀️ woman climbing: medium skin tone
-1F9D7 1F3FD 200D 2640 ; minimally-qualified # 🧗🏽♀ woman climbing: medium skin tone
-1F9D7 1F3FE 200D 2640 FE0F ; fully-qualified # 🧗🏾♀️ woman climbing: medium-dark skin tone
-1F9D7 1F3FE 200D 2640 ; minimally-qualified # 🧗🏾♀ woman climbing: medium-dark skin tone
-1F9D7 1F3FF 200D 2640 FE0F ; fully-qualified # 🧗🏿♀️ woman climbing: dark skin tone
-1F9D7 1F3FF 200D 2640 ; minimally-qualified # 🧗🏿♀ woman climbing: dark skin tone
-1F977 ; fully-qualified # 🥷 ninja
+1F486 ; fully-qualified # 💆 E0.6 person getting massage
+1F486 1F3FB ; fully-qualified # 💆🏻 E1.0 person getting massage: light skin tone
+1F486 1F3FC ; fully-qualified # 💆🏼 E1.0 person getting massage: medium-light skin tone
+1F486 1F3FD ; fully-qualified # 💆🏽 E1.0 person getting massage: medium skin tone
+1F486 1F3FE ; fully-qualified # 💆🏾 E1.0 person getting massage: medium-dark skin tone
+1F486 1F3FF ; fully-qualified # 💆🏿 E1.0 person getting massage: dark skin tone
+1F486 200D 2642 FE0F ; fully-qualified # 💆♂️ E4.0 man getting massage
+1F486 200D 2642 ; minimally-qualified # 💆♂ E4.0 man getting massage
+1F486 1F3FB 200D 2642 FE0F ; fully-qualified # 💆🏻♂️ E4.0 man getting massage: light skin tone
+1F486 1F3FB 200D 2642 ; minimally-qualified # 💆🏻♂ E4.0 man getting massage: light skin tone
+1F486 1F3FC 200D 2642 FE0F ; fully-qualified # 💆🏼♂️ E4.0 man getting massage: medium-light skin tone
+1F486 1F3FC 200D 2642 ; minimally-qualified # 💆🏼♂ E4.0 man getting massage: medium-light skin tone
+1F486 1F3FD 200D 2642 FE0F ; fully-qualified # 💆🏽♂️ E4.0 man getting massage: medium skin tone
+1F486 1F3FD 200D 2642 ; minimally-qualified # 💆🏽♂ E4.0 man getting massage: medium skin tone
+1F486 1F3FE 200D 2642 FE0F ; fully-qualified # 💆🏾♂️ E4.0 man getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2642 ; minimally-qualified # 💆🏾♂ E4.0 man getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2642 FE0F ; fully-qualified # 💆🏿♂️ E4.0 man getting massage: dark skin tone
+1F486 1F3FF 200D 2642 ; minimally-qualified # 💆🏿♂ E4.0 man getting massage: dark skin tone
+1F486 200D 2640 FE0F ; fully-qualified # 💆♀️ E4.0 woman getting massage
+1F486 200D 2640 ; minimally-qualified # 💆♀ E4.0 woman getting massage
+1F486 1F3FB 200D 2640 FE0F ; fully-qualified # 💆🏻♀️ E4.0 woman getting massage: light skin tone
+1F486 1F3FB 200D 2640 ; minimally-qualified # 💆🏻♀ E4.0 woman getting massage: light skin tone
+1F486 1F3FC 200D 2640 FE0F ; fully-qualified # 💆🏼♀️ E4.0 woman getting massage: medium-light skin tone
+1F486 1F3FC 200D 2640 ; minimally-qualified # 💆🏼♀ E4.0 woman getting massage: medium-light skin tone
+1F486 1F3FD 200D 2640 FE0F ; fully-qualified # 💆🏽♀️ E4.0 woman getting massage: medium skin tone
+1F486 1F3FD 200D 2640 ; minimally-qualified # 💆🏽♀ E4.0 woman getting massage: medium skin tone
+1F486 1F3FE 200D 2640 FE0F ; fully-qualified # 💆🏾♀️ E4.0 woman getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2640 ; minimally-qualified # 💆🏾♀ E4.0 woman getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2640 FE0F ; fully-qualified # 💆🏿♀️ E4.0 woman getting massage: dark skin tone
+1F486 1F3FF 200D 2640 ; minimally-qualified # 💆🏿♀ E4.0 woman getting massage: dark skin tone
+1F487 ; fully-qualified # 💇 E0.6 person getting haircut
+1F487 1F3FB ; fully-qualified # 💇🏻 E1.0 person getting haircut: light skin tone
+1F487 1F3FC ; fully-qualified # 💇🏼 E1.0 person getting haircut: medium-light skin tone
+1F487 1F3FD ; fully-qualified # 💇🏽 E1.0 person getting haircut: medium skin tone
+1F487 1F3FE ; fully-qualified # 💇🏾 E1.0 person getting haircut: medium-dark skin tone
+1F487 1F3FF ; fully-qualified # 💇🏿 E1.0 person getting haircut: dark skin tone
+1F487 200D 2642 FE0F ; fully-qualified # 💇♂️ E4.0 man getting haircut
+1F487 200D 2642 ; minimally-qualified # 💇♂ E4.0 man getting haircut
+1F487 1F3FB 200D 2642 FE0F ; fully-qualified # 💇🏻♂️ E4.0 man getting haircut: light skin tone
+1F487 1F3FB 200D 2642 ; minimally-qualified # 💇🏻♂ E4.0 man getting haircut: light skin tone
+1F487 1F3FC 200D 2642 FE0F ; fully-qualified # 💇🏼♂️ E4.0 man getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2642 ; minimally-qualified # 💇🏼♂ E4.0 man getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2642 FE0F ; fully-qualified # 💇🏽♂️ E4.0 man getting haircut: medium skin tone
+1F487 1F3FD 200D 2642 ; minimally-qualified # 💇🏽♂ E4.0 man getting haircut: medium skin tone
+1F487 1F3FE 200D 2642 FE0F ; fully-qualified # 💇🏾♂️ E4.0 man getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2642 ; minimally-qualified # 💇🏾♂ E4.0 man getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2642 FE0F ; fully-qualified # 💇🏿♂️ E4.0 man getting haircut: dark skin tone
+1F487 1F3FF 200D 2642 ; minimally-qualified # 💇🏿♂ E4.0 man getting haircut: dark skin tone
+1F487 200D 2640 FE0F ; fully-qualified # 💇♀️ E4.0 woman getting haircut
+1F487 200D 2640 ; minimally-qualified # 💇♀ E4.0 woman getting haircut
+1F487 1F3FB 200D 2640 FE0F ; fully-qualified # 💇🏻♀️ E4.0 woman getting haircut: light skin tone
+1F487 1F3FB 200D 2640 ; minimally-qualified # 💇🏻♀ E4.0 woman getting haircut: light skin tone
+1F487 1F3FC 200D 2640 FE0F ; fully-qualified # 💇🏼♀️ E4.0 woman getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2640 ; minimally-qualified # 💇🏼♀ E4.0 woman getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2640 FE0F ; fully-qualified # 💇🏽♀️ E4.0 woman getting haircut: medium skin tone
+1F487 1F3FD 200D 2640 ; minimally-qualified # 💇🏽♀ E4.0 woman getting haircut: medium skin tone
+1F487 1F3FE 200D 2640 FE0F ; fully-qualified # 💇🏾♀️ E4.0 woman getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2640 ; minimally-qualified # 💇🏾♀ E4.0 woman getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2640 FE0F ; fully-qualified # 💇🏿♀️ E4.0 woman getting haircut: dark skin tone
+1F487 1F3FF 200D 2640 ; minimally-qualified # 💇🏿♀ E4.0 woman getting haircut: dark skin tone
+1F6B6 ; fully-qualified # 🚶 E0.6 person walking
+1F6B6 1F3FB ; fully-qualified # 🚶🏻 E1.0 person walking: light skin tone
+1F6B6 1F3FC ; fully-qualified # 🚶🏼 E1.0 person walking: medium-light skin tone
+1F6B6 1F3FD ; fully-qualified # 🚶🏽 E1.0 person walking: medium skin tone
+1F6B6 1F3FE ; fully-qualified # 🚶🏾 E1.0 person walking: medium-dark skin tone
+1F6B6 1F3FF ; fully-qualified # 🚶🏿 E1.0 person walking: dark skin tone
+1F6B6 200D 2642 FE0F ; fully-qualified # 🚶♂️ E4.0 man walking
+1F6B6 200D 2642 ; minimally-qualified # 🚶♂ E4.0 man walking
+1F6B6 1F3FB 200D 2642 FE0F ; fully-qualified # 🚶🏻♂️ E4.0 man walking: light skin tone
+1F6B6 1F3FB 200D 2642 ; minimally-qualified # 🚶🏻♂ E4.0 man walking: light skin tone
+1F6B6 1F3FC 200D 2642 FE0F ; fully-qualified # 🚶🏼♂️ E4.0 man walking: medium-light skin tone
+1F6B6 1F3FC 200D 2642 ; minimally-qualified # 🚶🏼♂ E4.0 man walking: medium-light skin tone
+1F6B6 1F3FD 200D 2642 FE0F ; fully-qualified # 🚶🏽♂️ E4.0 man walking: medium skin tone
+1F6B6 1F3FD 200D 2642 ; minimally-qualified # 🚶🏽♂ E4.0 man walking: medium skin tone
+1F6B6 1F3FE 200D 2642 FE0F ; fully-qualified # 🚶🏾♂️ E4.0 man walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2642 ; minimally-qualified # 🚶🏾♂ E4.0 man walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F ; fully-qualified # 🚶🏿♂️ E4.0 man walking: dark skin tone
+1F6B6 1F3FF 200D 2642 ; minimally-qualified # 🚶🏿♂ E4.0 man walking: dark skin tone
+1F6B6 200D 2640 FE0F ; fully-qualified # 🚶♀️ E4.0 woman walking
+1F6B6 200D 2640 ; minimally-qualified # 🚶♀ E4.0 woman walking
+1F6B6 1F3FB 200D 2640 FE0F ; fully-qualified # 🚶🏻♀️ E4.0 woman walking: light skin tone
+1F6B6 1F3FB 200D 2640 ; minimally-qualified # 🚶🏻♀ E4.0 woman walking: light skin tone
+1F6B6 1F3FC 200D 2640 FE0F ; fully-qualified # 🚶🏼♀️ E4.0 woman walking: medium-light skin tone
+1F6B6 1F3FC 200D 2640 ; minimally-qualified # 🚶🏼♀ E4.0 woman walking: medium-light skin tone
+1F6B6 1F3FD 200D 2640 FE0F ; fully-qualified # 🚶🏽♀️ E4.0 woman walking: medium skin tone
+1F6B6 1F3FD 200D 2640 ; minimally-qualified # 🚶🏽♀ E4.0 woman walking: medium skin tone
+1F6B6 1F3FE 200D 2640 FE0F ; fully-qualified # 🚶🏾♀️ E4.0 woman walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2640 ; minimally-qualified # 🚶🏾♀ E4.0 woman walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F ; fully-qualified # 🚶🏿♀️ E4.0 woman walking: dark skin tone
+1F6B6 1F3FF 200D 2640 ; minimally-qualified # 🚶🏿♀ E4.0 woman walking: dark skin tone
+1F9CD ; fully-qualified # 🧍 E12.0 person standing
+1F9CD 1F3FB ; fully-qualified # 🧍🏻 E12.0 person standing: light skin tone
+1F9CD 1F3FC ; fully-qualified # 🧍🏼 E12.0 person standing: medium-light skin tone
+1F9CD 1F3FD ; fully-qualified # 🧍🏽 E12.0 person standing: medium skin tone
+1F9CD 1F3FE ; fully-qualified # 🧍🏾 E12.0 person standing: medium-dark skin tone
+1F9CD 1F3FF ; fully-qualified # 🧍🏿 E12.0 person standing: dark skin tone
+1F9CD 200D 2642 FE0F ; fully-qualified # 🧍♂️ E12.0 man standing
+1F9CD 200D 2642 ; minimally-qualified # 🧍♂ E12.0 man standing
+1F9CD 1F3FB 200D 2642 FE0F ; fully-qualified # 🧍🏻♂️ E12.0 man standing: light skin tone
+1F9CD 1F3FB 200D 2642 ; minimally-qualified # 🧍🏻♂ E12.0 man standing: light skin tone
+1F9CD 1F3FC 200D 2642 FE0F ; fully-qualified # 🧍🏼♂️ E12.0 man standing: medium-light skin tone
+1F9CD 1F3FC 200D 2642 ; minimally-qualified # 🧍🏼♂ E12.0 man standing: medium-light skin tone
+1F9CD 1F3FD 200D 2642 FE0F ; fully-qualified # 🧍🏽♂️ E12.0 man standing: medium skin tone
+1F9CD 1F3FD 200D 2642 ; minimally-qualified # 🧍🏽♂ E12.0 man standing: medium skin tone
+1F9CD 1F3FE 200D 2642 FE0F ; fully-qualified # 🧍🏾♂️ E12.0 man standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2642 ; minimally-qualified # 🧍🏾♂ E12.0 man standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2642 FE0F ; fully-qualified # 🧍🏿♂️ E12.0 man standing: dark skin tone
+1F9CD 1F3FF 200D 2642 ; minimally-qualified # 🧍🏿♂ E12.0 man standing: dark skin tone
+1F9CD 200D 2640 FE0F ; fully-qualified # 🧍♀️ E12.0 woman standing
+1F9CD 200D 2640 ; minimally-qualified # 🧍♀ E12.0 woman standing
+1F9CD 1F3FB 200D 2640 FE0F ; fully-qualified # 🧍🏻♀️ E12.0 woman standing: light skin tone
+1F9CD 1F3FB 200D 2640 ; minimally-qualified # 🧍🏻♀ E12.0 woman standing: light skin tone
+1F9CD 1F3FC 200D 2640 FE0F ; fully-qualified # 🧍🏼♀️ E12.0 woman standing: medium-light skin tone
+1F9CD 1F3FC 200D 2640 ; minimally-qualified # 🧍🏼♀ E12.0 woman standing: medium-light skin tone
+1F9CD 1F3FD 200D 2640 FE0F ; fully-qualified # 🧍🏽♀️ E12.0 woman standing: medium skin tone
+1F9CD 1F3FD 200D 2640 ; minimally-qualified # 🧍🏽♀ E12.0 woman standing: medium skin tone
+1F9CD 1F3FE 200D 2640 FE0F ; fully-qualified # 🧍🏾♀️ E12.0 woman standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2640 ; minimally-qualified # 🧍🏾♀ E12.0 woman standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2640 FE0F ; fully-qualified # 🧍🏿♀️ E12.0 woman standing: dark skin tone
+1F9CD 1F3FF 200D 2640 ; minimally-qualified # 🧍🏿♀ E12.0 woman standing: dark skin tone
+1F9CE ; fully-qualified # 🧎 E12.0 person kneeling
+1F9CE 1F3FB ; fully-qualified # 🧎🏻 E12.0 person kneeling: light skin tone
+1F9CE 1F3FC ; fully-qualified # 🧎🏼 E12.0 person kneeling: medium-light skin tone
+1F9CE 1F3FD ; fully-qualified # 🧎🏽 E12.0 person kneeling: medium skin tone
+1F9CE 1F3FE ; fully-qualified # 🧎🏾 E12.0 person kneeling: medium-dark skin tone
+1F9CE 1F3FF ; fully-qualified # 🧎🏿 E12.0 person kneeling: dark skin tone
+1F9CE 200D 2642 FE0F ; fully-qualified # 🧎♂️ E12.0 man kneeling
+1F9CE 200D 2642 ; minimally-qualified # 🧎♂ E12.0 man kneeling
+1F9CE 1F3FB 200D 2642 FE0F ; fully-qualified # 🧎🏻♂️ E12.0 man kneeling: light skin tone
+1F9CE 1F3FB 200D 2642 ; minimally-qualified # 🧎🏻♂ E12.0 man kneeling: light skin tone
+1F9CE 1F3FC 200D 2642 FE0F ; fully-qualified # 🧎🏼♂️ E12.0 man kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2642 ; minimally-qualified # 🧎🏼♂ E12.0 man kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2642 FE0F ; fully-qualified # 🧎🏽♂️ E12.0 man kneeling: medium skin tone
+1F9CE 1F3FD 200D 2642 ; minimally-qualified # 🧎🏽♂ E12.0 man kneeling: medium skin tone
+1F9CE 1F3FE 200D 2642 FE0F ; fully-qualified # 🧎🏾♂️ E12.0 man kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2642 ; minimally-qualified # 🧎🏾♂ E12.0 man kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F ; fully-qualified # 🧎🏿♂️ E12.0 man kneeling: dark skin tone
+1F9CE 1F3FF 200D 2642 ; minimally-qualified # 🧎🏿♂ E12.0 man kneeling: dark skin tone
+1F9CE 200D 2640 FE0F ; fully-qualified # 🧎♀️ E12.0 woman kneeling
+1F9CE 200D 2640 ; minimally-qualified # 🧎♀ E12.0 woman kneeling
+1F9CE 1F3FB 200D 2640 FE0F ; fully-qualified # 🧎🏻♀️ E12.0 woman kneeling: light skin tone
+1F9CE 1F3FB 200D 2640 ; minimally-qualified # 🧎🏻♀ E12.0 woman kneeling: light skin tone
+1F9CE 1F3FC 200D 2640 FE0F ; fully-qualified # 🧎🏼♀️ E12.0 woman kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2640 ; minimally-qualified # 🧎🏼♀ E12.0 woman kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2640 FE0F ; fully-qualified # 🧎🏽♀️ E12.0 woman kneeling: medium skin tone
+1F9CE 1F3FD 200D 2640 ; minimally-qualified # 🧎🏽♀ E12.0 woman kneeling: medium skin tone
+1F9CE 1F3FE 200D 2640 FE0F ; fully-qualified # 🧎🏾♀️ E12.0 woman kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2640 ; minimally-qualified # 🧎🏾♀ E12.0 woman kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F ; fully-qualified # 🧎🏿♀️ E12.0 woman kneeling: dark skin tone
+1F9CE 1F3FF 200D 2640 ; minimally-qualified # 🧎🏿♀ E12.0 woman kneeling: dark skin tone
+1F9D1 200D 1F9AF ; fully-qualified # 🧑🦯 E12.1 person with white cane
+1F9D1 1F3FB 200D 1F9AF ; fully-qualified # 🧑🏻🦯 E12.1 person with white cane: light skin tone
+1F9D1 1F3FC 200D 1F9AF ; fully-qualified # 🧑🏼🦯 E12.1 person with white cane: medium-light skin tone
+1F9D1 1F3FD 200D 1F9AF ; fully-qualified # 🧑🏽🦯 E12.1 person with white cane: medium skin tone
+1F9D1 1F3FE 200D 1F9AF ; fully-qualified # 🧑🏾🦯 E12.1 person with white cane: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9AF ; fully-qualified # 🧑🏿🦯 E12.1 person with white cane: dark skin tone
+1F468 200D 1F9AF ; fully-qualified # 👨🦯 E12.0 man with white cane
+1F468 1F3FB 200D 1F9AF ; fully-qualified # 👨🏻🦯 E12.0 man with white cane: light skin tone
+1F468 1F3FC 200D 1F9AF ; fully-qualified # 👨🏼🦯 E12.0 man with white cane: medium-light skin tone
+1F468 1F3FD 200D 1F9AF ; fully-qualified # 👨🏽🦯 E12.0 man with white cane: medium skin tone
+1F468 1F3FE 200D 1F9AF ; fully-qualified # 👨🏾🦯 E12.0 man with white cane: medium-dark skin tone
+1F468 1F3FF 200D 1F9AF ; fully-qualified # 👨🏿🦯 E12.0 man with white cane: dark skin tone
+1F469 200D 1F9AF ; fully-qualified # 👩🦯 E12.0 woman with white cane
+1F469 1F3FB 200D 1F9AF ; fully-qualified # 👩🏻🦯 E12.0 woman with white cane: light skin tone
+1F469 1F3FC 200D 1F9AF ; fully-qualified # 👩🏼🦯 E12.0 woman with white cane: medium-light skin tone
+1F469 1F3FD 200D 1F9AF ; fully-qualified # 👩🏽🦯 E12.0 woman with white cane: medium skin tone
+1F469 1F3FE 200D 1F9AF ; fully-qualified # 👩🏾🦯 E12.0 woman with white cane: medium-dark skin tone
+1F469 1F3FF 200D 1F9AF ; fully-qualified # 👩🏿🦯 E12.0 woman with white cane: dark skin tone
+1F9D1 200D 1F9BC ; fully-qualified # 🧑🦼 E12.1 person in motorized wheelchair
+1F9D1 1F3FB 200D 1F9BC ; fully-qualified # 🧑🏻🦼 E12.1 person in motorized wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BC ; fully-qualified # 🧑🏼🦼 E12.1 person in motorized wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BC ; fully-qualified # 🧑🏽🦼 E12.1 person in motorized wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BC ; fully-qualified # 🧑🏾🦼 E12.1 person in motorized wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BC ; fully-qualified # 🧑🏿🦼 E12.1 person in motorized wheelchair: dark skin tone
+1F468 200D 1F9BC ; fully-qualified # 👨🦼 E12.0 man in motorized wheelchair
+1F468 1F3FB 200D 1F9BC ; fully-qualified # 👨🏻🦼 E12.0 man in motorized wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BC ; fully-qualified # 👨🏼🦼 E12.0 man in motorized wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BC ; fully-qualified # 👨🏽🦼 E12.0 man in motorized wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BC ; fully-qualified # 👨🏾🦼 E12.0 man in motorized wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BC ; fully-qualified # 👨🏿🦼 E12.0 man in motorized wheelchair: dark skin tone
+1F469 200D 1F9BC ; fully-qualified # 👩🦼 E12.0 woman in motorized wheelchair
+1F469 1F3FB 200D 1F9BC ; fully-qualified # 👩🏻🦼 E12.0 woman in motorized wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BC ; fully-qualified # 👩🏼🦼 E12.0 woman in motorized wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BC ; fully-qualified # 👩🏽🦼 E12.0 woman in motorized wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BC ; fully-qualified # 👩🏾🦼 E12.0 woman in motorized wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BC ; fully-qualified # 👩🏿🦼 E12.0 woman in motorized wheelchair: dark skin tone
+1F9D1 200D 1F9BD ; fully-qualified # 🧑🦽 E12.1 person in manual wheelchair
+1F9D1 1F3FB 200D 1F9BD ; fully-qualified # 🧑🏻🦽 E12.1 person in manual wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BD ; fully-qualified # 🧑🏼🦽 E12.1 person in manual wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BD ; fully-qualified # 🧑🏽🦽 E12.1 person in manual wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BD ; fully-qualified # 🧑🏾🦽 E12.1 person in manual wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BD ; fully-qualified # 🧑🏿🦽 E12.1 person in manual wheelchair: dark skin tone
+1F468 200D 1F9BD ; fully-qualified # 👨🦽 E12.0 man in manual wheelchair
+1F468 1F3FB 200D 1F9BD ; fully-qualified # 👨🏻🦽 E12.0 man in manual wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BD ; fully-qualified # 👨🏼🦽 E12.0 man in manual wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BD ; fully-qualified # 👨🏽🦽 E12.0 man in manual wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BD ; fully-qualified # 👨🏾🦽 E12.0 man in manual wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BD ; fully-qualified # 👨🏿🦽 E12.0 man in manual wheelchair: dark skin tone
+1F469 200D 1F9BD ; fully-qualified # 👩🦽 E12.0 woman in manual wheelchair
+1F469 1F3FB 200D 1F9BD ; fully-qualified # 👩🏻🦽 E12.0 woman in manual wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BD ; fully-qualified # 👩🏼🦽 E12.0 woman in manual wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BD ; fully-qualified # 👩🏽🦽 E12.0 woman in manual wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BD ; fully-qualified # 👩🏾🦽 E12.0 woman in manual wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BD ; fully-qualified # 👩🏿🦽 E12.0 woman in manual wheelchair: dark skin tone
+1F3C3 ; fully-qualified # 🏃 E0.6 person running
+1F3C3 1F3FB ; fully-qualified # 🏃🏻 E1.0 person running: light skin tone
+1F3C3 1F3FC ; fully-qualified # 🏃🏼 E1.0 person running: medium-light skin tone
+1F3C3 1F3FD ; fully-qualified # 🏃🏽 E1.0 person running: medium skin tone
+1F3C3 1F3FE ; fully-qualified # 🏃🏾 E1.0 person running: medium-dark skin tone
+1F3C3 1F3FF ; fully-qualified # 🏃🏿 E1.0 person running: dark skin tone
+1F3C3 200D 2642 FE0F ; fully-qualified # 🏃♂️ E4.0 man running
+1F3C3 200D 2642 ; minimally-qualified # 🏃♂ E4.0 man running
+1F3C3 1F3FB 200D 2642 FE0F ; fully-qualified # 🏃🏻♂️ E4.0 man running: light skin tone
+1F3C3 1F3FB 200D 2642 ; minimally-qualified # 🏃🏻♂ E4.0 man running: light skin tone
+1F3C3 1F3FC 200D 2642 FE0F ; fully-qualified # 🏃🏼♂️ E4.0 man running: medium-light skin tone
+1F3C3 1F3FC 200D 2642 ; minimally-qualified # 🏃🏼♂ E4.0 man running: medium-light skin tone
+1F3C3 1F3FD 200D 2642 FE0F ; fully-qualified # 🏃🏽♂️ E4.0 man running: medium skin tone
+1F3C3 1F3FD 200D 2642 ; minimally-qualified # 🏃🏽♂ E4.0 man running: medium skin tone
+1F3C3 1F3FE 200D 2642 FE0F ; fully-qualified # 🏃🏾♂️ E4.0 man running: medium-dark skin tone
+1F3C3 1F3FE 200D 2642 ; minimally-qualified # 🏃🏾♂ E4.0 man running: medium-dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F ; fully-qualified # 🏃🏿♂️ E4.0 man running: dark skin tone
+1F3C3 1F3FF 200D 2642 ; minimally-qualified # 🏃🏿♂ E4.0 man running: dark skin tone
+1F3C3 200D 2640 FE0F ; fully-qualified # 🏃♀️ E4.0 woman running
+1F3C3 200D 2640 ; minimally-qualified # 🏃♀ E4.0 woman running
+1F3C3 1F3FB 200D 2640 FE0F ; fully-qualified # 🏃🏻♀️ E4.0 woman running: light skin tone
+1F3C3 1F3FB 200D 2640 ; minimally-qualified # 🏃🏻♀ E4.0 woman running: light skin tone
+1F3C3 1F3FC 200D 2640 FE0F ; fully-qualified # 🏃🏼♀️ E4.0 woman running: medium-light skin tone
+1F3C3 1F3FC 200D 2640 ; minimally-qualified # 🏃🏼♀ E4.0 woman running: medium-light skin tone
+1F3C3 1F3FD 200D 2640 FE0F ; fully-qualified # 🏃🏽♀️ E4.0 woman running: medium skin tone
+1F3C3 1F3FD 200D 2640 ; minimally-qualified # 🏃🏽♀ E4.0 woman running: medium skin tone
+1F3C3 1F3FE 200D 2640 FE0F ; fully-qualified # 🏃🏾♀️ E4.0 woman running: medium-dark skin tone
+1F3C3 1F3FE 200D 2640 ; minimally-qualified # 🏃🏾♀ E4.0 woman running: medium-dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F ; fully-qualified # 🏃🏿♀️ E4.0 woman running: dark skin tone
+1F3C3 1F3FF 200D 2640 ; minimally-qualified # 🏃🏿♀ E4.0 woman running: dark skin tone
+1F483 ; fully-qualified # 💃 E0.6 woman dancing
+1F483 1F3FB ; fully-qualified # 💃🏻 E1.0 woman dancing: light skin tone
+1F483 1F3FC ; fully-qualified # 💃🏼 E1.0 woman dancing: medium-light skin tone
+1F483 1F3FD ; fully-qualified # 💃🏽 E1.0 woman dancing: medium skin tone
+1F483 1F3FE ; fully-qualified # 💃🏾 E1.0 woman dancing: medium-dark skin tone
+1F483 1F3FF ; fully-qualified # 💃🏿 E1.0 woman dancing: dark skin tone
+1F57A ; fully-qualified # 🕺 E3.0 man dancing
+1F57A 1F3FB ; fully-qualified # 🕺🏻 E3.0 man dancing: light skin tone
+1F57A 1F3FC ; fully-qualified # 🕺🏼 E3.0 man dancing: medium-light skin tone
+1F57A 1F3FD ; fully-qualified # 🕺🏽 E3.0 man dancing: medium skin tone
+1F57A 1F3FE ; fully-qualified # 🕺🏾 E3.0 man dancing: medium-dark skin tone
+1F57A 1F3FF ; fully-qualified # 🕺🏿 E3.0 man dancing: dark skin tone
+1F574 FE0F ; fully-qualified # 🕴️ E0.7 person in suit levitating
+1F574 ; unqualified # 🕴 E0.7 person in suit levitating
+1F574 1F3FB ; fully-qualified # 🕴🏻 E4.0 person in suit levitating: light skin tone
+1F574 1F3FC ; fully-qualified # 🕴🏼 E4.0 person in suit levitating: medium-light skin tone
+1F574 1F3FD ; fully-qualified # 🕴🏽 E4.0 person in suit levitating: medium skin tone
+1F574 1F3FE ; fully-qualified # 🕴🏾 E4.0 person in suit levitating: medium-dark skin tone
+1F574 1F3FF ; fully-qualified # 🕴🏿 E4.0 person in suit levitating: dark skin tone
+1F46F ; fully-qualified # 👯 E0.6 people with bunny ears
+1F46F 200D 2642 FE0F ; fully-qualified # 👯♂️ E4.0 men with bunny ears
+1F46F 200D 2642 ; minimally-qualified # 👯♂ E4.0 men with bunny ears
+1F46F 200D 2640 FE0F ; fully-qualified # 👯♀️ E4.0 women with bunny ears
+1F46F 200D 2640 ; minimally-qualified # 👯♀ E4.0 women with bunny ears
+1F9D6 ; fully-qualified # 🧖 E5.0 person in steamy room
+1F9D6 1F3FB ; fully-qualified # 🧖🏻 E5.0 person in steamy room: light skin tone
+1F9D6 1F3FC ; fully-qualified # 🧖🏼 E5.0 person in steamy room: medium-light skin tone
+1F9D6 1F3FD ; fully-qualified # 🧖🏽 E5.0 person in steamy room: medium skin tone
+1F9D6 1F3FE ; fully-qualified # 🧖🏾 E5.0 person in steamy room: medium-dark skin tone
+1F9D6 1F3FF ; fully-qualified # 🧖🏿 E5.0 person in steamy room: dark skin tone
+1F9D6 200D 2642 FE0F ; fully-qualified # 🧖♂️ E5.0 man in steamy room
+1F9D6 200D 2642 ; minimally-qualified # 🧖♂ E5.0 man in steamy room
+1F9D6 1F3FB 200D 2642 FE0F ; fully-qualified # 🧖🏻♂️ E5.0 man in steamy room: light skin tone
+1F9D6 1F3FB 200D 2642 ; minimally-qualified # 🧖🏻♂ E5.0 man in steamy room: light skin tone
+1F9D6 1F3FC 200D 2642 FE0F ; fully-qualified # 🧖🏼♂️ E5.0 man in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2642 ; minimally-qualified # 🧖🏼♂ E5.0 man in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2642 FE0F ; fully-qualified # 🧖🏽♂️ E5.0 man in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2642 ; minimally-qualified # 🧖🏽♂ E5.0 man in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2642 FE0F ; fully-qualified # 🧖🏾♂️ E5.0 man in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2642 ; minimally-qualified # 🧖🏾♂ E5.0 man in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2642 FE0F ; fully-qualified # 🧖🏿♂️ E5.0 man in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2642 ; minimally-qualified # 🧖🏿♂ E5.0 man in steamy room: dark skin tone
+1F9D6 200D 2640 FE0F ; fully-qualified # 🧖♀️ E5.0 woman in steamy room
+1F9D6 200D 2640 ; minimally-qualified # 🧖♀ E5.0 woman in steamy room
+1F9D6 1F3FB 200D 2640 FE0F ; fully-qualified # 🧖🏻♀️ E5.0 woman in steamy room: light skin tone
+1F9D6 1F3FB 200D 2640 ; minimally-qualified # 🧖🏻♀ E5.0 woman in steamy room: light skin tone
+1F9D6 1F3FC 200D 2640 FE0F ; fully-qualified # 🧖🏼♀️ E5.0 woman in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2640 ; minimally-qualified # 🧖🏼♀ E5.0 woman in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2640 FE0F ; fully-qualified # 🧖🏽♀️ E5.0 woman in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2640 ; minimally-qualified # 🧖🏽♀ E5.0 woman in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2640 FE0F ; fully-qualified # 🧖🏾♀️ E5.0 woman in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2640 ; minimally-qualified # 🧖🏾♀ E5.0 woman in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2640 FE0F ; fully-qualified # 🧖🏿♀️ E5.0 woman in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2640 ; minimally-qualified # 🧖🏿♀ E5.0 woman in steamy room: dark skin tone
+1F9D7 ; fully-qualified # 🧗 E5.0 person climbing
+1F9D7 1F3FB ; fully-qualified # 🧗🏻 E5.0 person climbing: light skin tone
+1F9D7 1F3FC ; fully-qualified # 🧗🏼 E5.0 person climbing: medium-light skin tone
+1F9D7 1F3FD ; fully-qualified # 🧗🏽 E5.0 person climbing: medium skin tone
+1F9D7 1F3FE ; fully-qualified # 🧗🏾 E5.0 person climbing: medium-dark skin tone
+1F9D7 1F3FF ; fully-qualified # 🧗🏿 E5.0 person climbing: dark skin tone
+1F9D7 200D 2642 FE0F ; fully-qualified # 🧗♂️ E5.0 man climbing
+1F9D7 200D 2642 ; minimally-qualified # 🧗♂ E5.0 man climbing
+1F9D7 1F3FB 200D 2642 FE0F ; fully-qualified # 🧗🏻♂️ E5.0 man climbing: light skin tone
+1F9D7 1F3FB 200D 2642 ; minimally-qualified # 🧗🏻♂ E5.0 man climbing: light skin tone
+1F9D7 1F3FC 200D 2642 FE0F ; fully-qualified # 🧗🏼♂️ E5.0 man climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2642 ; minimally-qualified # 🧗🏼♂ E5.0 man climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2642 FE0F ; fully-qualified # 🧗🏽♂️ E5.0 man climbing: medium skin tone
+1F9D7 1F3FD 200D 2642 ; minimally-qualified # 🧗🏽♂ E5.0 man climbing: medium skin tone
+1F9D7 1F3FE 200D 2642 FE0F ; fully-qualified # 🧗🏾♂️ E5.0 man climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2642 ; minimally-qualified # 🧗🏾♂ E5.0 man climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2642 FE0F ; fully-qualified # 🧗🏿♂️ E5.0 man climbing: dark skin tone
+1F9D7 1F3FF 200D 2642 ; minimally-qualified # 🧗🏿♂ E5.0 man climbing: dark skin tone
+1F9D7 200D 2640 FE0F ; fully-qualified # 🧗♀️ E5.0 woman climbing
+1F9D7 200D 2640 ; minimally-qualified # 🧗♀ E5.0 woman climbing
+1F9D7 1F3FB 200D 2640 FE0F ; fully-qualified # 🧗🏻♀️ E5.0 woman climbing: light skin tone
+1F9D7 1F3FB 200D 2640 ; minimally-qualified # 🧗🏻♀ E5.0 woman climbing: light skin tone
+1F9D7 1F3FC 200D 2640 FE0F ; fully-qualified # 🧗🏼♀️ E5.0 woman climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2640 ; minimally-qualified # 🧗🏼♀ E5.0 woman climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2640 FE0F ; fully-qualified # 🧗🏽♀️ E5.0 woman climbing: medium skin tone
+1F9D7 1F3FD 200D 2640 ; minimally-qualified # 🧗🏽♀ E5.0 woman climbing: medium skin tone
+1F9D7 1F3FE 200D 2640 FE0F ; fully-qualified # 🧗🏾♀️ E5.0 woman climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2640 ; minimally-qualified # 🧗🏾♀ E5.0 woman climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2640 FE0F ; fully-qualified # 🧗🏿♀️ E5.0 woman climbing: dark skin tone
+1F9D7 1F3FF 200D 2640 ; minimally-qualified # 🧗🏿♀ E5.0 woman climbing: dark skin tone
# subgroup: person-sport
-1F93A ; fully-qualified # 🤺 person fencing
-1F3C7 ; fully-qualified # 🏇 horse racing
-1F3C7 1F3FB ; fully-qualified # 🏇🏻 horse racing: light skin tone
-1F3C7 1F3FC ; fully-qualified # 🏇🏼 horse racing: medium-light skin tone
-1F3C7 1F3FD ; fully-qualified # 🏇🏽 horse racing: medium skin tone
-1F3C7 1F3FE ; fully-qualified # 🏇🏾 horse racing: medium-dark skin tone
-1F3C7 1F3FF ; fully-qualified # 🏇🏿 horse racing: dark skin tone
-26F7 FE0F ; fully-qualified # ⛷️ skier
-26F7 ; unqualified # ⛷ skier
-1F3C2 ; fully-qualified # 🏂 snowboarder
-1F3C2 1F3FB ; fully-qualified # 🏂🏻 snowboarder: light skin tone
-1F3C2 1F3FC ; fully-qualified # 🏂🏼 snowboarder: medium-light skin tone
-1F3C2 1F3FD ; fully-qualified # 🏂🏽 snowboarder: medium skin tone
-1F3C2 1F3FE ; fully-qualified # 🏂🏾 snowboarder: medium-dark skin tone
-1F3C2 1F3FF ; fully-qualified # 🏂🏿 snowboarder: dark skin tone
-1F3CC FE0F ; fully-qualified # 🏌️ person golfing
-1F3CC ; unqualified # 🏌 person golfing
-1F3CC 1F3FB ; fully-qualified # 🏌🏻 person golfing: light skin tone
-1F3CC 1F3FC ; fully-qualified # 🏌🏼 person golfing: medium-light skin tone
-1F3CC 1F3FD ; fully-qualified # 🏌🏽 person golfing: medium skin tone
-1F3CC 1F3FE ; fully-qualified # 🏌🏾 person golfing: medium-dark skin tone
-1F3CC 1F3FF ; fully-qualified # 🏌🏿 person golfing: dark skin tone
-1F3CC FE0F 200D 2642 FE0F ; fully-qualified # 🏌️♂️ man golfing
-1F3CC FE0F 200D 2642 ; minimally-qualified # 🏌️♂ man golfing
-1F3CC 200D 2642 ; unqualified # 🏌♂ man golfing
-1F3CC 1F3FB 200D 2642 FE0F ; fully-qualified # 🏌🏻♂️ man golfing: light skin tone
-1F3CC 1F3FB 200D 2642 ; minimally-qualified # 🏌🏻♂ man golfing: light skin tone
-1F3CC 1F3FC 200D 2642 FE0F ; fully-qualified # 🏌🏼♂️ man golfing: medium-light skin tone
-1F3CC 1F3FC 200D 2642 ; minimally-qualified # 🏌🏼♂ man golfing: medium-light skin tone
-1F3CC 1F3FD 200D 2642 FE0F ; fully-qualified # 🏌🏽♂️ man golfing: medium skin tone
-1F3CC 1F3FD 200D 2642 ; minimally-qualified # 🏌🏽♂ man golfing: medium skin tone
-1F3CC 1F3FE 200D 2642 FE0F ; fully-qualified # 🏌🏾♂️ man golfing: medium-dark skin tone
-1F3CC 1F3FE 200D 2642 ; minimally-qualified # 🏌🏾♂ man golfing: medium-dark skin tone
-1F3CC 1F3FF 200D 2642 FE0F ; fully-qualified # 🏌🏿♂️ man golfing: dark skin tone
-1F3CC 1F3FF 200D 2642 ; minimally-qualified # 🏌🏿♂ man golfing: dark skin tone
-1F3CC FE0F 200D 2640 FE0F ; fully-qualified # 🏌️♀️ woman golfing
-1F3CC FE0F 200D 2640 ; minimally-qualified # 🏌️♀ woman golfing
-1F3CC 200D 2640 ; unqualified # 🏌♀ woman golfing
-1F3CC 1F3FB 200D 2640 FE0F ; fully-qualified # 🏌🏻♀️ woman golfing: light skin tone
-1F3CC 1F3FB 200D 2640 ; minimally-qualified # 🏌🏻♀ woman golfing: light skin tone
-1F3CC 1F3FC 200D 2640 FE0F ; fully-qualified # 🏌🏼♀️ woman golfing: medium-light skin tone
-1F3CC 1F3FC 200D 2640 ; minimally-qualified # 🏌🏼♀ woman golfing: medium-light skin tone
-1F3CC 1F3FD 200D 2640 FE0F ; fully-qualified # 🏌🏽♀️ woman golfing: medium skin tone
-1F3CC 1F3FD 200D 2640 ; minimally-qualified # 🏌🏽♀ woman golfing: medium skin tone
-1F3CC 1F3FE 200D 2640 FE0F ; fully-qualified # 🏌🏾♀️ woman golfing: medium-dark skin tone
-1F3CC 1F3FE 200D 2640 ; minimally-qualified # 🏌🏾♀ woman golfing: medium-dark skin tone
-1F3CC 1F3FF 200D 2640 FE0F ; fully-qualified # 🏌🏿♀️ woman golfing: dark skin tone
-1F3CC 1F3FF 200D 2640 ; minimally-qualified # 🏌🏿♀ woman golfing: dark skin tone
-1F3C4 ; fully-qualified # 🏄 person surfing
-1F3C4 1F3FB ; fully-qualified # 🏄🏻 person surfing: light skin tone
-1F3C4 1F3FC ; fully-qualified # 🏄🏼 person surfing: medium-light skin tone
-1F3C4 1F3FD ; fully-qualified # 🏄🏽 person surfing: medium skin tone
-1F3C4 1F3FE ; fully-qualified # 🏄🏾 person surfing: medium-dark skin tone
-1F3C4 1F3FF ; fully-qualified # 🏄🏿 person surfing: dark skin tone
-1F3C4 200D 2642 FE0F ; fully-qualified # 🏄♂️ man surfing
-1F3C4 200D 2642 ; minimally-qualified # 🏄♂ man surfing
-1F3C4 1F3FB 200D 2642 FE0F ; fully-qualified # 🏄🏻♂️ man surfing: light skin tone
-1F3C4 1F3FB 200D 2642 ; minimally-qualified # 🏄🏻♂ man surfing: light skin tone
-1F3C4 1F3FC 200D 2642 FE0F ; fully-qualified # 🏄🏼♂️ man surfing: medium-light skin tone
-1F3C4 1F3FC 200D 2642 ; minimally-qualified # 🏄🏼♂ man surfing: medium-light skin tone
-1F3C4 1F3FD 200D 2642 FE0F ; fully-qualified # 🏄🏽♂️ man surfing: medium skin tone
-1F3C4 1F3FD 200D 2642 ; minimally-qualified # 🏄🏽♂ man surfing: medium skin tone
-1F3C4 1F3FE 200D 2642 FE0F ; fully-qualified # 🏄🏾♂️ man surfing: medium-dark skin tone
-1F3C4 1F3FE 200D 2642 ; minimally-qualified # 🏄🏾♂ man surfing: medium-dark skin tone
-1F3C4 1F3FF 200D 2642 FE0F ; fully-qualified # 🏄🏿♂️ man surfing: dark skin tone
-1F3C4 1F3FF 200D 2642 ; minimally-qualified # 🏄🏿♂ man surfing: dark skin tone
-1F3C4 200D 2640 FE0F ; fully-qualified # 🏄♀️ woman surfing
-1F3C4 200D 2640 ; minimally-qualified # 🏄♀ woman surfing
-1F3C4 1F3FB 200D 2640 FE0F ; fully-qualified # 🏄🏻♀️ woman surfing: light skin tone
-1F3C4 1F3FB 200D 2640 ; minimally-qualified # 🏄🏻♀ woman surfing: light skin tone
-1F3C4 1F3FC 200D 2640 FE0F ; fully-qualified # 🏄🏼♀️ woman surfing: medium-light skin tone
-1F3C4 1F3FC 200D 2640 ; minimally-qualified # 🏄🏼♀ woman surfing: medium-light skin tone
-1F3C4 1F3FD 200D 2640 FE0F ; fully-qualified # 🏄🏽♀️ woman surfing: medium skin tone
-1F3C4 1F3FD 200D 2640 ; minimally-qualified # 🏄🏽♀ woman surfing: medium skin tone
-1F3C4 1F3FE 200D 2640 FE0F ; fully-qualified # 🏄🏾♀️ woman surfing: medium-dark skin tone
-1F3C4 1F3FE 200D 2640 ; minimally-qualified # 🏄🏾♀ woman surfing: medium-dark skin tone
-1F3C4 1F3FF 200D 2640 FE0F ; fully-qualified # 🏄🏿♀️ woman surfing: dark skin tone
-1F3C4 1F3FF 200D 2640 ; minimally-qualified # 🏄🏿♀ woman surfing: dark skin tone
-1F6A3 ; fully-qualified # 🚣 person rowing boat
-1F6A3 1F3FB ; fully-qualified # 🚣🏻 person rowing boat: light skin tone
-1F6A3 1F3FC ; fully-qualified # 🚣🏼 person rowing boat: medium-light skin tone
-1F6A3 1F3FD ; fully-qualified # 🚣🏽 person rowing boat: medium skin tone
-1F6A3 1F3FE ; fully-qualified # 🚣🏾 person rowing boat: medium-dark skin tone
-1F6A3 1F3FF ; fully-qualified # 🚣🏿 person rowing boat: dark skin tone
-1F6A3 200D 2642 FE0F ; fully-qualified # 🚣♂️ man rowing boat
-1F6A3 200D 2642 ; minimally-qualified # 🚣♂ man rowing boat
-1F6A3 1F3FB 200D 2642 FE0F ; fully-qualified # 🚣🏻♂️ man rowing boat: light skin tone
-1F6A3 1F3FB 200D 2642 ; minimally-qualified # 🚣🏻♂ man rowing boat: light skin tone
-1F6A3 1F3FC 200D 2642 FE0F ; fully-qualified # 🚣🏼♂️ man rowing boat: medium-light skin tone
-1F6A3 1F3FC 200D 2642 ; minimally-qualified # 🚣🏼♂ man rowing boat: medium-light skin tone
-1F6A3 1F3FD 200D 2642 FE0F ; fully-qualified # 🚣🏽♂️ man rowing boat: medium skin tone
-1F6A3 1F3FD 200D 2642 ; minimally-qualified # 🚣🏽♂ man rowing boat: medium skin tone
-1F6A3 1F3FE 200D 2642 FE0F ; fully-qualified # 🚣🏾♂️ man rowing boat: medium-dark skin tone
-1F6A3 1F3FE 200D 2642 ; minimally-qualified # 🚣🏾♂ man rowing boat: medium-dark skin tone
-1F6A3 1F3FF 200D 2642 FE0F ; fully-qualified # 🚣🏿♂️ man rowing boat: dark skin tone
-1F6A3 1F3FF 200D 2642 ; minimally-qualified # 🚣🏿♂ man rowing boat: dark skin tone
-1F6A3 200D 2640 FE0F ; fully-qualified # 🚣♀️ woman rowing boat
-1F6A3 200D 2640 ; minimally-qualified # 🚣♀ woman rowing boat
-1F6A3 1F3FB 200D 2640 FE0F ; fully-qualified # 🚣🏻♀️ woman rowing boat: light skin tone
-1F6A3 1F3FB 200D 2640 ; minimally-qualified # 🚣🏻♀ woman rowing boat: light skin tone
-1F6A3 1F3FC 200D 2640 FE0F ; fully-qualified # 🚣🏼♀️ woman rowing boat: medium-light skin tone
-1F6A3 1F3FC 200D 2640 ; minimally-qualified # 🚣🏼♀ woman rowing boat: medium-light skin tone
-1F6A3 1F3FD 200D 2640 FE0F ; fully-qualified # 🚣🏽♀️ woman rowing boat: medium skin tone
-1F6A3 1F3FD 200D 2640 ; minimally-qualified # 🚣🏽♀ woman rowing boat: medium skin tone
-1F6A3 1F3FE 200D 2640 FE0F ; fully-qualified # 🚣🏾♀️ woman rowing boat: medium-dark skin tone
-1F6A3 1F3FE 200D 2640 ; minimally-qualified # 🚣🏾♀ woman rowing boat: medium-dark skin tone
-1F6A3 1F3FF 200D 2640 FE0F ; fully-qualified # 🚣🏿♀️ woman rowing boat: dark skin tone
-1F6A3 1F3FF 200D 2640 ; minimally-qualified # 🚣🏿♀ woman rowing boat: dark skin tone
-1F3CA ; fully-qualified # 🏊 person swimming
-1F3CA 1F3FB ; fully-qualified # 🏊🏻 person swimming: light skin tone
-1F3CA 1F3FC ; fully-qualified # 🏊🏼 person swimming: medium-light skin tone
-1F3CA 1F3FD ; fully-qualified # 🏊🏽 person swimming: medium skin tone
-1F3CA 1F3FE ; fully-qualified # 🏊🏾 person swimming: medium-dark skin tone
-1F3CA 1F3FF ; fully-qualified # 🏊🏿 person swimming: dark skin tone
-1F3CA 200D 2642 FE0F ; fully-qualified # 🏊♂️ man swimming
-1F3CA 200D 2642 ; minimally-qualified # 🏊♂ man swimming
-1F3CA 1F3FB 200D 2642 FE0F ; fully-qualified # 🏊🏻♂️ man swimming: light skin tone
-1F3CA 1F3FB 200D 2642 ; minimally-qualified # 🏊🏻♂ man swimming: light skin tone
-1F3CA 1F3FC 200D 2642 FE0F ; fully-qualified # 🏊🏼♂️ man swimming: medium-light skin tone
-1F3CA 1F3FC 200D 2642 ; minimally-qualified # 🏊🏼♂ man swimming: medium-light skin tone
-1F3CA 1F3FD 200D 2642 FE0F ; fully-qualified # 🏊🏽♂️ man swimming: medium skin tone
-1F3CA 1F3FD 200D 2642 ; minimally-qualified # 🏊🏽♂ man swimming: medium skin tone
-1F3CA 1F3FE 200D 2642 FE0F ; fully-qualified # 🏊🏾♂️ man swimming: medium-dark skin tone
-1F3CA 1F3FE 200D 2642 ; minimally-qualified # 🏊🏾♂ man swimming: medium-dark skin tone
-1F3CA 1F3FF 200D 2642 FE0F ; fully-qualified # 🏊🏿♂️ man swimming: dark skin tone
-1F3CA 1F3FF 200D 2642 ; minimally-qualified # 🏊🏿♂ man swimming: dark skin tone
-1F3CA 200D 2640 FE0F ; fully-qualified # 🏊♀️ woman swimming
-1F3CA 200D 2640 ; minimally-qualified # 🏊♀ woman swimming
-1F3CA 1F3FB 200D 2640 FE0F ; fully-qualified # 🏊🏻♀️ woman swimming: light skin tone
-1F3CA 1F3FB 200D 2640 ; minimally-qualified # 🏊🏻♀ woman swimming: light skin tone
-1F3CA 1F3FC 200D 2640 FE0F ; fully-qualified # 🏊🏼♀️ woman swimming: medium-light skin tone
-1F3CA 1F3FC 200D 2640 ; minimally-qualified # 🏊🏼♀ woman swimming: medium-light skin tone
-1F3CA 1F3FD 200D 2640 FE0F ; fully-qualified # 🏊🏽♀️ woman swimming: medium skin tone
-1F3CA 1F3FD 200D 2640 ; minimally-qualified # 🏊🏽♀ woman swimming: medium skin tone
-1F3CA 1F3FE 200D 2640 FE0F ; fully-qualified # 🏊🏾♀️ woman swimming: medium-dark skin tone
-1F3CA 1F3FE 200D 2640 ; minimally-qualified # 🏊🏾♀ woman swimming: medium-dark skin tone
-1F3CA 1F3FF 200D 2640 FE0F ; fully-qualified # 🏊🏿♀️ woman swimming: dark skin tone
-1F3CA 1F3FF 200D 2640 ; minimally-qualified # 🏊🏿♀ woman swimming: dark skin tone
-26F9 FE0F ; fully-qualified # ⛹️ person bouncing ball
-26F9 ; unqualified # ⛹ person bouncing ball
-26F9 1F3FB ; fully-qualified # ⛹🏻 person bouncing ball: light skin tone
-26F9 1F3FC ; fully-qualified # ⛹🏼 person bouncing ball: medium-light skin tone
-26F9 1F3FD ; fully-qualified # ⛹🏽 person bouncing ball: medium skin tone
-26F9 1F3FE ; fully-qualified # ⛹🏾 person bouncing ball: medium-dark skin tone
-26F9 1F3FF ; fully-qualified # ⛹🏿 person bouncing ball: dark skin tone
-26F9 FE0F 200D 2642 FE0F ; fully-qualified # ⛹️♂️ man bouncing ball
-26F9 FE0F 200D 2642 ; minimally-qualified # ⛹️♂ man bouncing ball
-26F9 200D 2642 ; unqualified # ⛹♂ man bouncing ball
-26F9 1F3FB 200D 2642 FE0F ; fully-qualified # ⛹🏻♂️ man bouncing ball: light skin tone
-26F9 1F3FB 200D 2642 ; minimally-qualified # ⛹🏻♂ man bouncing ball: light skin tone
-26F9 1F3FC 200D 2642 FE0F ; fully-qualified # ⛹🏼♂️ man bouncing ball: medium-light skin tone
-26F9 1F3FC 200D 2642 ; minimally-qualified # ⛹🏼♂ man bouncing ball: medium-light skin tone
-26F9 1F3FD 200D 2642 FE0F ; fully-qualified # ⛹🏽♂️ man bouncing ball: medium skin tone
-26F9 1F3FD 200D 2642 ; minimally-qualified # ⛹🏽♂ man bouncing ball: medium skin tone
-26F9 1F3FE 200D 2642 FE0F ; fully-qualified # ⛹🏾♂️ man bouncing ball: medium-dark skin tone
-26F9 1F3FE 200D 2642 ; minimally-qualified # ⛹🏾♂ man bouncing ball: medium-dark skin tone
-26F9 1F3FF 200D 2642 FE0F ; fully-qualified # ⛹🏿♂️ man bouncing ball: dark skin tone
-26F9 1F3FF 200D 2642 ; minimally-qualified # ⛹🏿♂ man bouncing ball: dark skin tone
-26F9 FE0F 200D 2640 FE0F ; fully-qualified # ⛹️♀️ woman bouncing ball
-26F9 FE0F 200D 2640 ; minimally-qualified # ⛹️♀ woman bouncing ball
-26F9 200D 2640 ; unqualified # ⛹♀ woman bouncing ball
-26F9 1F3FB 200D 2640 FE0F ; fully-qualified # ⛹🏻♀️ woman bouncing ball: light skin tone
-26F9 1F3FB 200D 2640 ; minimally-qualified # ⛹🏻♀ woman bouncing ball: light skin tone
-26F9 1F3FC 200D 2640 FE0F ; fully-qualified # ⛹🏼♀️ woman bouncing ball: medium-light skin tone
-26F9 1F3FC 200D 2640 ; minimally-qualified # ⛹🏼♀ woman bouncing ball: medium-light skin tone
-26F9 1F3FD 200D 2640 FE0F ; fully-qualified # ⛹🏽♀️ woman bouncing ball: medium skin tone
-26F9 1F3FD 200D 2640 ; minimally-qualified # ⛹🏽♀ woman bouncing ball: medium skin tone
-26F9 1F3FE 200D 2640 FE0F ; fully-qualified # ⛹🏾♀️ woman bouncing ball: medium-dark skin tone
-26F9 1F3FE 200D 2640 ; minimally-qualified # ⛹🏾♀ woman bouncing ball: medium-dark skin tone
-26F9 1F3FF 200D 2640 FE0F ; fully-qualified # ⛹🏿♀️ woman bouncing ball: dark skin tone
-26F9 1F3FF 200D 2640 ; minimally-qualified # ⛹🏿♀ woman bouncing ball: dark skin tone
-1F3CB FE0F ; fully-qualified # 🏋️ person lifting weights
-1F3CB ; unqualified # 🏋 person lifting weights
-1F3CB 1F3FB ; fully-qualified # 🏋🏻 person lifting weights: light skin tone
-1F3CB 1F3FC ; fully-qualified # 🏋🏼 person lifting weights: medium-light skin tone
-1F3CB 1F3FD ; fully-qualified # 🏋🏽 person lifting weights: medium skin tone
-1F3CB 1F3FE ; fully-qualified # 🏋🏾 person lifting weights: medium-dark skin tone
-1F3CB 1F3FF ; fully-qualified # 🏋🏿 person lifting weights: dark skin tone
-1F3CB FE0F 200D 2642 FE0F ; fully-qualified # 🏋️♂️ man lifting weights
-1F3CB FE0F 200D 2642 ; minimally-qualified # 🏋️♂ man lifting weights
-1F3CB 200D 2642 ; unqualified # 🏋♂ man lifting weights
-1F3CB 1F3FB 200D 2642 FE0F ; fully-qualified # 🏋🏻♂️ man lifting weights: light skin tone
-1F3CB 1F3FB 200D 2642 ; minimally-qualified # 🏋🏻♂ man lifting weights: light skin tone
-1F3CB 1F3FC 200D 2642 FE0F ; fully-qualified # 🏋🏼♂️ man lifting weights: medium-light skin tone
-1F3CB 1F3FC 200D 2642 ; minimally-qualified # 🏋🏼♂ man lifting weights: medium-light skin tone
-1F3CB 1F3FD 200D 2642 FE0F ; fully-qualified # 🏋🏽♂️ man lifting weights: medium skin tone
-1F3CB 1F3FD 200D 2642 ; minimally-qualified # 🏋🏽♂ man lifting weights: medium skin tone
-1F3CB 1F3FE 200D 2642 FE0F ; fully-qualified # 🏋🏾♂️ man lifting weights: medium-dark skin tone
-1F3CB 1F3FE 200D 2642 ; minimally-qualified # 🏋🏾♂ man lifting weights: medium-dark skin tone
-1F3CB 1F3FF 200D 2642 FE0F ; fully-qualified # 🏋🏿♂️ man lifting weights: dark skin tone
-1F3CB 1F3FF 200D 2642 ; minimally-qualified # 🏋🏿♂ man lifting weights: dark skin tone
-1F3CB FE0F 200D 2640 FE0F ; fully-qualified # 🏋️♀️ woman lifting weights
-1F3CB FE0F 200D 2640 ; minimally-qualified # 🏋️♀ woman lifting weights
-1F3CB 200D 2640 ; unqualified # 🏋♀ woman lifting weights
-1F3CB 1F3FB 200D 2640 FE0F ; fully-qualified # 🏋🏻♀️ woman lifting weights: light skin tone
-1F3CB 1F3FB 200D 2640 ; minimally-qualified # 🏋🏻♀ woman lifting weights: light skin tone
-1F3CB 1F3FC 200D 2640 FE0F ; fully-qualified # 🏋🏼♀️ woman lifting weights: medium-light skin tone
-1F3CB 1F3FC 200D 2640 ; minimally-qualified # 🏋🏼♀ woman lifting weights: medium-light skin tone
-1F3CB 1F3FD 200D 2640 FE0F ; fully-qualified # 🏋🏽♀️ woman lifting weights: medium skin tone
-1F3CB 1F3FD 200D 2640 ; minimally-qualified # 🏋🏽♀ woman lifting weights: medium skin tone
-1F3CB 1F3FE 200D 2640 FE0F ; fully-qualified # 🏋🏾♀️ woman lifting weights: medium-dark skin tone
-1F3CB 1F3FE 200D 2640 ; minimally-qualified # 🏋🏾♀ woman lifting weights: medium-dark skin tone
-1F3CB 1F3FF 200D 2640 FE0F ; fully-qualified # 🏋🏿♀️ woman lifting weights: dark skin tone
-1F3CB 1F3FF 200D 2640 ; minimally-qualified # 🏋🏿♀ woman lifting weights: dark skin tone
-1F6B4 ; fully-qualified # 🚴 person biking
-1F6B4 1F3FB ; fully-qualified # 🚴🏻 person biking: light skin tone
-1F6B4 1F3FC ; fully-qualified # 🚴🏼 person biking: medium-light skin tone
-1F6B4 1F3FD ; fully-qualified # 🚴🏽 person biking: medium skin tone
-1F6B4 1F3FE ; fully-qualified # 🚴🏾 person biking: medium-dark skin tone
-1F6B4 1F3FF ; fully-qualified # 🚴🏿 person biking: dark skin tone
-1F6B4 200D 2642 FE0F ; fully-qualified # 🚴♂️ man biking
-1F6B4 200D 2642 ; minimally-qualified # 🚴♂ man biking
-1F6B4 1F3FB 200D 2642 FE0F ; fully-qualified # 🚴🏻♂️ man biking: light skin tone
-1F6B4 1F3FB 200D 2642 ; minimally-qualified # 🚴🏻♂ man biking: light skin tone
-1F6B4 1F3FC 200D 2642 FE0F ; fully-qualified # 🚴🏼♂️ man biking: medium-light skin tone
-1F6B4 1F3FC 200D 2642 ; minimally-qualified # 🚴🏼♂ man biking: medium-light skin tone
-1F6B4 1F3FD 200D 2642 FE0F ; fully-qualified # 🚴🏽♂️ man biking: medium skin tone
-1F6B4 1F3FD 200D 2642 ; minimally-qualified # 🚴🏽♂ man biking: medium skin tone
-1F6B4 1F3FE 200D 2642 FE0F ; fully-qualified # 🚴🏾♂️ man biking: medium-dark skin tone
-1F6B4 1F3FE 200D 2642 ; minimally-qualified # 🚴🏾♂ man biking: medium-dark skin tone
-1F6B4 1F3FF 200D 2642 FE0F ; fully-qualified # 🚴🏿♂️ man biking: dark skin tone
-1F6B4 1F3FF 200D 2642 ; minimally-qualified # 🚴🏿♂ man biking: dark skin tone
-1F6B4 200D 2640 FE0F ; fully-qualified # 🚴♀️ woman biking
-1F6B4 200D 2640 ; minimally-qualified # 🚴♀ woman biking
-1F6B4 1F3FB 200D 2640 FE0F ; fully-qualified # 🚴🏻♀️ woman biking: light skin tone
-1F6B4 1F3FB 200D 2640 ; minimally-qualified # 🚴🏻♀ woman biking: light skin tone
-1F6B4 1F3FC 200D 2640 FE0F ; fully-qualified # 🚴🏼♀️ woman biking: medium-light skin tone
-1F6B4 1F3FC 200D 2640 ; minimally-qualified # 🚴🏼♀ woman biking: medium-light skin tone
-1F6B4 1F3FD 200D 2640 FE0F ; fully-qualified # 🚴🏽♀️ woman biking: medium skin tone
-1F6B4 1F3FD 200D 2640 ; minimally-qualified # 🚴🏽♀ woman biking: medium skin tone
-1F6B4 1F3FE 200D 2640 FE0F ; fully-qualified # 🚴🏾♀️ woman biking: medium-dark skin tone
-1F6B4 1F3FE 200D 2640 ; minimally-qualified # 🚴🏾♀ woman biking: medium-dark skin tone
-1F6B4 1F3FF 200D 2640 FE0F ; fully-qualified # 🚴🏿♀️ woman biking: dark skin tone
-1F6B4 1F3FF 200D 2640 ; minimally-qualified # 🚴🏿♀ woman biking: dark skin tone
-1F6B5 ; fully-qualified # 🚵 person mountain biking
-1F6B5 1F3FB ; fully-qualified # 🚵🏻 person mountain biking: light skin tone
-1F6B5 1F3FC ; fully-qualified # 🚵🏼 person mountain biking: medium-light skin tone
-1F6B5 1F3FD ; fully-qualified # 🚵🏽 person mountain biking: medium skin tone
-1F6B5 1F3FE ; fully-qualified # 🚵🏾 person mountain biking: medium-dark skin tone
-1F6B5 1F3FF ; fully-qualified # 🚵🏿 person mountain biking: dark skin tone
-1F6B5 200D 2642 FE0F ; fully-qualified # 🚵♂️ man mountain biking
-1F6B5 200D 2642 ; minimally-qualified # 🚵♂ man mountain biking
-1F6B5 1F3FB 200D 2642 FE0F ; fully-qualified # 🚵🏻♂️ man mountain biking: light skin tone
-1F6B5 1F3FB 200D 2642 ; minimally-qualified # 🚵🏻♂ man mountain biking: light skin tone
-1F6B5 1F3FC 200D 2642 FE0F ; fully-qualified # 🚵🏼♂️ man mountain biking: medium-light skin tone
-1F6B5 1F3FC 200D 2642 ; minimally-qualified # 🚵🏼♂ man mountain biking: medium-light skin tone
-1F6B5 1F3FD 200D 2642 FE0F ; fully-qualified # 🚵🏽♂️ man mountain biking: medium skin tone
-1F6B5 1F3FD 200D 2642 ; minimally-qualified # 🚵🏽♂ man mountain biking: medium skin tone
-1F6B5 1F3FE 200D 2642 FE0F ; fully-qualified # 🚵🏾♂️ man mountain biking: medium-dark skin tone
-1F6B5 1F3FE 200D 2642 ; minimally-qualified # 🚵🏾♂ man mountain biking: medium-dark skin tone
-1F6B5 1F3FF 200D 2642 FE0F ; fully-qualified # 🚵🏿♂️ man mountain biking: dark skin tone
-1F6B5 1F3FF 200D 2642 ; minimally-qualified # 🚵🏿♂ man mountain biking: dark skin tone
-1F6B5 200D 2640 FE0F ; fully-qualified # 🚵♀️ woman mountain biking
-1F6B5 200D 2640 ; minimally-qualified # 🚵♀ woman mountain biking
-1F6B5 1F3FB 200D 2640 FE0F ; fully-qualified # 🚵🏻♀️ woman mountain biking: light skin tone
-1F6B5 1F3FB 200D 2640 ; minimally-qualified # 🚵🏻♀ woman mountain biking: light skin tone
-1F6B5 1F3FC 200D 2640 FE0F ; fully-qualified # 🚵🏼♀️ woman mountain biking: medium-light skin tone
-1F6B5 1F3FC 200D 2640 ; minimally-qualified # 🚵🏼♀ woman mountain biking: medium-light skin tone
-1F6B5 1F3FD 200D 2640 FE0F ; fully-qualified # 🚵🏽♀️ woman mountain biking: medium skin tone
-1F6B5 1F3FD 200D 2640 ; minimally-qualified # 🚵🏽♀ woman mountain biking: medium skin tone
-1F6B5 1F3FE 200D 2640 FE0F ; fully-qualified # 🚵🏾♀️ woman mountain biking: medium-dark skin tone
-1F6B5 1F3FE 200D 2640 ; minimally-qualified # 🚵🏾♀ woman mountain biking: medium-dark skin tone
-1F6B5 1F3FF 200D 2640 FE0F ; fully-qualified # 🚵🏿♀️ woman mountain biking: dark skin tone
-1F6B5 1F3FF 200D 2640 ; minimally-qualified # 🚵🏿♀ woman mountain biking: dark skin tone
-1F938 ; fully-qualified # 🤸 person cartwheeling
-1F938 1F3FB ; fully-qualified # 🤸🏻 person cartwheeling: light skin tone
-1F938 1F3FC ; fully-qualified # 🤸🏼 person cartwheeling: medium-light skin tone
-1F938 1F3FD ; fully-qualified # 🤸🏽 person cartwheeling: medium skin tone
-1F938 1F3FE ; fully-qualified # 🤸🏾 person cartwheeling: medium-dark skin tone
-1F938 1F3FF ; fully-qualified # 🤸🏿 person cartwheeling: dark skin tone
-1F938 200D 2642 FE0F ; fully-qualified # 🤸♂️ man cartwheeling
-1F938 200D 2642 ; minimally-qualified # 🤸♂ man cartwheeling
-1F938 1F3FB 200D 2642 FE0F ; fully-qualified # 🤸🏻♂️ man cartwheeling: light skin tone
-1F938 1F3FB 200D 2642 ; minimally-qualified # 🤸🏻♂ man cartwheeling: light skin tone
-1F938 1F3FC 200D 2642 FE0F ; fully-qualified # 🤸🏼♂️ man cartwheeling: medium-light skin tone
-1F938 1F3FC 200D 2642 ; minimally-qualified # 🤸🏼♂ man cartwheeling: medium-light skin tone
-1F938 1F3FD 200D 2642 FE0F ; fully-qualified # 🤸🏽♂️ man cartwheeling: medium skin tone
-1F938 1F3FD 200D 2642 ; minimally-qualified # 🤸🏽♂ man cartwheeling: medium skin tone
-1F938 1F3FE 200D 2642 FE0F ; fully-qualified # 🤸🏾♂️ man cartwheeling: medium-dark skin tone
-1F938 1F3FE 200D 2642 ; minimally-qualified # 🤸🏾♂ man cartwheeling: medium-dark skin tone
-1F938 1F3FF 200D 2642 FE0F ; fully-qualified # 🤸🏿♂️ man cartwheeling: dark skin tone
-1F938 1F3FF 200D 2642 ; minimally-qualified # 🤸🏿♂ man cartwheeling: dark skin tone
-1F938 200D 2640 FE0F ; fully-qualified # 🤸♀️ woman cartwheeling
-1F938 200D 2640 ; minimally-qualified # 🤸♀ woman cartwheeling
-1F938 1F3FB 200D 2640 FE0F ; fully-qualified # 🤸🏻♀️ woman cartwheeling: light skin tone
-1F938 1F3FB 200D 2640 ; minimally-qualified # 🤸🏻♀ woman cartwheeling: light skin tone
-1F938 1F3FC 200D 2640 FE0F ; fully-qualified # 🤸🏼♀️ woman cartwheeling: medium-light skin tone
-1F938 1F3FC 200D 2640 ; minimally-qualified # 🤸🏼♀ woman cartwheeling: medium-light skin tone
-1F938 1F3FD 200D 2640 FE0F ; fully-qualified # 🤸🏽♀️ woman cartwheeling: medium skin tone
-1F938 1F3FD 200D 2640 ; minimally-qualified # 🤸🏽♀ woman cartwheeling: medium skin tone
-1F938 1F3FE 200D 2640 FE0F ; fully-qualified # 🤸🏾♀️ woman cartwheeling: medium-dark skin tone
-1F938 1F3FE 200D 2640 ; minimally-qualified # 🤸🏾♀ woman cartwheeling: medium-dark skin tone
-1F938 1F3FF 200D 2640 FE0F ; fully-qualified # 🤸🏿♀️ woman cartwheeling: dark skin tone
-1F938 1F3FF 200D 2640 ; minimally-qualified # 🤸🏿♀ woman cartwheeling: dark skin tone
-1F93C ; fully-qualified # 🤼 people wrestling
-1F93C 200D 2642 FE0F ; fully-qualified # 🤼♂️ men wrestling
-1F93C 200D 2642 ; minimally-qualified # 🤼♂ men wrestling
-1F93C 200D 2640 FE0F ; fully-qualified # 🤼♀️ women wrestling
-1F93C 200D 2640 ; minimally-qualified # 🤼♀ women wrestling
-1F93D ; fully-qualified # 🤽 person playing water polo
-1F93D 1F3FB ; fully-qualified # 🤽🏻 person playing water polo: light skin tone
-1F93D 1F3FC ; fully-qualified # 🤽🏼 person playing water polo: medium-light skin tone
-1F93D 1F3FD ; fully-qualified # 🤽🏽 person playing water polo: medium skin tone
-1F93D 1F3FE ; fully-qualified # 🤽🏾 person playing water polo: medium-dark skin tone
-1F93D 1F3FF ; fully-qualified # 🤽🏿 person playing water polo: dark skin tone
-1F93D 200D 2642 FE0F ; fully-qualified # 🤽♂️ man playing water polo
-1F93D 200D 2642 ; minimally-qualified # 🤽♂ man playing water polo
-1F93D 1F3FB 200D 2642 FE0F ; fully-qualified # 🤽🏻♂️ man playing water polo: light skin tone
-1F93D 1F3FB 200D 2642 ; minimally-qualified # 🤽🏻♂ man playing water polo: light skin tone
-1F93D 1F3FC 200D 2642 FE0F ; fully-qualified # 🤽🏼♂️ man playing water polo: medium-light skin tone
-1F93D 1F3FC 200D 2642 ; minimally-qualified # 🤽🏼♂ man playing water polo: medium-light skin tone
-1F93D 1F3FD 200D 2642 FE0F ; fully-qualified # 🤽🏽♂️ man playing water polo: medium skin tone
-1F93D 1F3FD 200D 2642 ; minimally-qualified # 🤽🏽♂ man playing water polo: medium skin tone
-1F93D 1F3FE 200D 2642 FE0F ; fully-qualified # 🤽🏾♂️ man playing water polo: medium-dark skin tone
-1F93D 1F3FE 200D 2642 ; minimally-qualified # 🤽🏾♂ man playing water polo: medium-dark skin tone
-1F93D 1F3FF 200D 2642 FE0F ; fully-qualified # 🤽🏿♂️ man playing water polo: dark skin tone
-1F93D 1F3FF 200D 2642 ; minimally-qualified # 🤽🏿♂ man playing water polo: dark skin tone
-1F93D 200D 2640 FE0F ; fully-qualified # 🤽♀️ woman playing water polo
-1F93D 200D 2640 ; minimally-qualified # 🤽♀ woman playing water polo
-1F93D 1F3FB 200D 2640 FE0F ; fully-qualified # 🤽🏻♀️ woman playing water polo: light skin tone
-1F93D 1F3FB 200D 2640 ; minimally-qualified # 🤽🏻♀ woman playing water polo: light skin tone
-1F93D 1F3FC 200D 2640 FE0F ; fully-qualified # 🤽🏼♀️ woman playing water polo: medium-light skin tone
-1F93D 1F3FC 200D 2640 ; minimally-qualified # 🤽🏼♀ woman playing water polo: medium-light skin tone
-1F93D 1F3FD 200D 2640 FE0F ; fully-qualified # 🤽🏽♀️ woman playing water polo: medium skin tone
-1F93D 1F3FD 200D 2640 ; minimally-qualified # 🤽🏽♀ woman playing water polo: medium skin tone
-1F93D 1F3FE 200D 2640 FE0F ; fully-qualified # 🤽🏾♀️ woman playing water polo: medium-dark skin tone
-1F93D 1F3FE 200D 2640 ; minimally-qualified # 🤽🏾♀ woman playing water polo: medium-dark skin tone
-1F93D 1F3FF 200D 2640 FE0F ; fully-qualified # 🤽🏿♀️ woman playing water polo: dark skin tone
-1F93D 1F3FF 200D 2640 ; minimally-qualified # 🤽🏿♀ woman playing water polo: dark skin tone
-1F93E ; fully-qualified # 🤾 person playing handball
-1F93E 1F3FB ; fully-qualified # 🤾🏻 person playing handball: light skin tone
-1F93E 1F3FC ; fully-qualified # 🤾🏼 person playing handball: medium-light skin tone
-1F93E 1F3FD ; fully-qualified # 🤾🏽 person playing handball: medium skin tone
-1F93E 1F3FE ; fully-qualified # 🤾🏾 person playing handball: medium-dark skin tone
-1F93E 1F3FF ; fully-qualified # 🤾🏿 person playing handball: dark skin tone
-1F93E 200D 2642 FE0F ; fully-qualified # 🤾♂️ man playing handball
-1F93E 200D 2642 ; minimally-qualified # 🤾♂ man playing handball
-1F93E 1F3FB 200D 2642 FE0F ; fully-qualified # 🤾🏻♂️ man playing handball: light skin tone
-1F93E 1F3FB 200D 2642 ; minimally-qualified # 🤾🏻♂ man playing handball: light skin tone
-1F93E 1F3FC 200D 2642 FE0F ; fully-qualified # 🤾🏼♂️ man playing handball: medium-light skin tone
-1F93E 1F3FC 200D 2642 ; minimally-qualified # 🤾🏼♂ man playing handball: medium-light skin tone
-1F93E 1F3FD 200D 2642 FE0F ; fully-qualified # 🤾🏽♂️ man playing handball: medium skin tone
-1F93E 1F3FD 200D 2642 ; minimally-qualified # 🤾🏽♂ man playing handball: medium skin tone
-1F93E 1F3FE 200D 2642 FE0F ; fully-qualified # 🤾🏾♂️ man playing handball: medium-dark skin tone
-1F93E 1F3FE 200D 2642 ; minimally-qualified # 🤾🏾♂ man playing handball: medium-dark skin tone
-1F93E 1F3FF 200D 2642 FE0F ; fully-qualified # 🤾🏿♂️ man playing handball: dark skin tone
-1F93E 1F3FF 200D 2642 ; minimally-qualified # 🤾🏿♂ man playing handball: dark skin tone
-1F93E 200D 2640 FE0F ; fully-qualified # 🤾♀️ woman playing handball
-1F93E 200D 2640 ; minimally-qualified # 🤾♀ woman playing handball
-1F93E 1F3FB 200D 2640 FE0F ; fully-qualified # 🤾🏻♀️ woman playing handball: light skin tone
-1F93E 1F3FB 200D 2640 ; minimally-qualified # 🤾🏻♀ woman playing handball: light skin tone
-1F93E 1F3FC 200D 2640 FE0F ; fully-qualified # 🤾🏼♀️ woman playing handball: medium-light skin tone
-1F93E 1F3FC 200D 2640 ; minimally-qualified # 🤾🏼♀ woman playing handball: medium-light skin tone
-1F93E 1F3FD 200D 2640 FE0F ; fully-qualified # 🤾🏽♀️ woman playing handball: medium skin tone
-1F93E 1F3FD 200D 2640 ; minimally-qualified # 🤾🏽♀ woman playing handball: medium skin tone
-1F93E 1F3FE 200D 2640 FE0F ; fully-qualified # 🤾🏾♀️ woman playing handball: medium-dark skin tone
-1F93E 1F3FE 200D 2640 ; minimally-qualified # 🤾🏾♀ woman playing handball: medium-dark skin tone
-1F93E 1F3FF 200D 2640 FE0F ; fully-qualified # 🤾🏿♀️ woman playing handball: dark skin tone
-1F93E 1F3FF 200D 2640 ; minimally-qualified # 🤾🏿♀ woman playing handball: dark skin tone
-1F939 ; fully-qualified # 🤹 person juggling
-1F939 1F3FB ; fully-qualified # 🤹🏻 person juggling: light skin tone
-1F939 1F3FC ; fully-qualified # 🤹🏼 person juggling: medium-light skin tone
-1F939 1F3FD ; fully-qualified # 🤹🏽 person juggling: medium skin tone
-1F939 1F3FE ; fully-qualified # 🤹🏾 person juggling: medium-dark skin tone
-1F939 1F3FF ; fully-qualified # 🤹🏿 person juggling: dark skin tone
-1F939 200D 2642 FE0F ; fully-qualified # 🤹♂️ man juggling
-1F939 200D 2642 ; minimally-qualified # 🤹♂ man juggling
-1F939 1F3FB 200D 2642 FE0F ; fully-qualified # 🤹🏻♂️ man juggling: light skin tone
-1F939 1F3FB 200D 2642 ; minimally-qualified # 🤹🏻♂ man juggling: light skin tone
-1F939 1F3FC 200D 2642 FE0F ; fully-qualified # 🤹🏼♂️ man juggling: medium-light skin tone
-1F939 1F3FC 200D 2642 ; minimally-qualified # 🤹🏼♂ man juggling: medium-light skin tone
-1F939 1F3FD 200D 2642 FE0F ; fully-qualified # 🤹🏽♂️ man juggling: medium skin tone
-1F939 1F3FD 200D 2642 ; minimally-qualified # 🤹🏽♂ man juggling: medium skin tone
-1F939 1F3FE 200D 2642 FE0F ; fully-qualified # 🤹🏾♂️ man juggling: medium-dark skin tone
-1F939 1F3FE 200D 2642 ; minimally-qualified # 🤹🏾♂ man juggling: medium-dark skin tone
-1F939 1F3FF 200D 2642 FE0F ; fully-qualified # 🤹🏿♂️ man juggling: dark skin tone
-1F939 1F3FF 200D 2642 ; minimally-qualified # 🤹🏿♂ man juggling: dark skin tone
-1F939 200D 2640 FE0F ; fully-qualified # 🤹♀️ woman juggling
-1F939 200D 2640 ; minimally-qualified # 🤹♀ woman juggling
-1F939 1F3FB 200D 2640 FE0F ; fully-qualified # 🤹🏻♀️ woman juggling: light skin tone
-1F939 1F3FB 200D 2640 ; minimally-qualified # 🤹🏻♀ woman juggling: light skin tone
-1F939 1F3FC 200D 2640 FE0F ; fully-qualified # 🤹🏼♀️ woman juggling: medium-light skin tone
-1F939 1F3FC 200D 2640 ; minimally-qualified # 🤹🏼♀ woman juggling: medium-light skin tone
-1F939 1F3FD 200D 2640 FE0F ; fully-qualified # 🤹🏽♀️ woman juggling: medium skin tone
-1F939 1F3FD 200D 2640 ; minimally-qualified # 🤹🏽♀ woman juggling: medium skin tone
-1F939 1F3FE 200D 2640 FE0F ; fully-qualified # 🤹🏾♀️ woman juggling: medium-dark skin tone
-1F939 1F3FE 200D 2640 ; minimally-qualified # 🤹🏾♀ woman juggling: medium-dark skin tone
-1F939 1F3FF 200D 2640 FE0F ; fully-qualified # 🤹🏿♀️ woman juggling: dark skin tone
-1F939 1F3FF 200D 2640 ; minimally-qualified # 🤹🏿♀ woman juggling: dark skin tone
+1F93A ; fully-qualified # 🤺 E3.0 person fencing
+1F3C7 ; fully-qualified # 🏇 E1.0 horse racing
+1F3C7 1F3FB ; fully-qualified # 🏇🏻 E1.0 horse racing: light skin tone
+1F3C7 1F3FC ; fully-qualified # 🏇🏼 E1.0 horse racing: medium-light skin tone
+1F3C7 1F3FD ; fully-qualified # 🏇🏽 E1.0 horse racing: medium skin tone
+1F3C7 1F3FE ; fully-qualified # 🏇🏾 E1.0 horse racing: medium-dark skin tone
+1F3C7 1F3FF ; fully-qualified # 🏇🏿 E1.0 horse racing: dark skin tone
+26F7 FE0F ; fully-qualified # ⛷️ E0.7 skier
+26F7 ; unqualified # ⛷ E0.7 skier
+1F3C2 ; fully-qualified # 🏂 E0.6 snowboarder
+1F3C2 1F3FB ; fully-qualified # 🏂🏻 E1.0 snowboarder: light skin tone
+1F3C2 1F3FC ; fully-qualified # 🏂🏼 E1.0 snowboarder: medium-light skin tone
+1F3C2 1F3FD ; fully-qualified # 🏂🏽 E1.0 snowboarder: medium skin tone
+1F3C2 1F3FE ; fully-qualified # 🏂🏾 E1.0 snowboarder: medium-dark skin tone
+1F3C2 1F3FF ; fully-qualified # 🏂🏿 E1.0 snowboarder: dark skin tone
+1F3CC FE0F ; fully-qualified # 🏌️ E0.7 person golfing
+1F3CC ; unqualified # 🏌 E0.7 person golfing
+1F3CC 1F3FB ; fully-qualified # 🏌🏻 E4.0 person golfing: light skin tone
+1F3CC 1F3FC ; fully-qualified # 🏌🏼 E4.0 person golfing: medium-light skin tone
+1F3CC 1F3FD ; fully-qualified # 🏌🏽 E4.0 person golfing: medium skin tone
+1F3CC 1F3FE ; fully-qualified # 🏌🏾 E4.0 person golfing: medium-dark skin tone
+1F3CC 1F3FF ; fully-qualified # 🏌🏿 E4.0 person golfing: dark skin tone
+1F3CC FE0F 200D 2642 FE0F ; fully-qualified # 🏌️♂️ E4.0 man golfing
+1F3CC 200D 2642 FE0F ; unqualified # 🏌♂️ E4.0 man golfing
+1F3CC FE0F 200D 2642 ; unqualified # 🏌️♂ E4.0 man golfing
+1F3CC 200D 2642 ; unqualified # 🏌♂ E4.0 man golfing
+1F3CC 1F3FB 200D 2642 FE0F ; fully-qualified # 🏌🏻♂️ E4.0 man golfing: light skin tone
+1F3CC 1F3FB 200D 2642 ; minimally-qualified # 🏌🏻♂ E4.0 man golfing: light skin tone
+1F3CC 1F3FC 200D 2642 FE0F ; fully-qualified # 🏌🏼♂️ E4.0 man golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2642 ; minimally-qualified # 🏌🏼♂ E4.0 man golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2642 FE0F ; fully-qualified # 🏌🏽♂️ E4.0 man golfing: medium skin tone
+1F3CC 1F3FD 200D 2642 ; minimally-qualified # 🏌🏽♂ E4.0 man golfing: medium skin tone
+1F3CC 1F3FE 200D 2642 FE0F ; fully-qualified # 🏌🏾♂️ E4.0 man golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2642 ; minimally-qualified # 🏌🏾♂ E4.0 man golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2642 FE0F ; fully-qualified # 🏌🏿♂️ E4.0 man golfing: dark skin tone
+1F3CC 1F3FF 200D 2642 ; minimally-qualified # 🏌🏿♂ E4.0 man golfing: dark skin tone
+1F3CC FE0F 200D 2640 FE0F ; fully-qualified # 🏌️♀️ E4.0 woman golfing
+1F3CC 200D 2640 FE0F ; unqualified # 🏌♀️ E4.0 woman golfing
+1F3CC FE0F 200D 2640 ; unqualified # 🏌️♀ E4.0 woman golfing
+1F3CC 200D 2640 ; unqualified # 🏌♀ E4.0 woman golfing
+1F3CC 1F3FB 200D 2640 FE0F ; fully-qualified # 🏌🏻♀️ E4.0 woman golfing: light skin tone
+1F3CC 1F3FB 200D 2640 ; minimally-qualified # 🏌🏻♀ E4.0 woman golfing: light skin tone
+1F3CC 1F3FC 200D 2640 FE0F ; fully-qualified # 🏌🏼♀️ E4.0 woman golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2640 ; minimally-qualified # 🏌🏼♀ E4.0 woman golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2640 FE0F ; fully-qualified # 🏌🏽♀️ E4.0 woman golfing: medium skin tone
+1F3CC 1F3FD 200D 2640 ; minimally-qualified # 🏌🏽♀ E4.0 woman golfing: medium skin tone
+1F3CC 1F3FE 200D 2640 FE0F ; fully-qualified # 🏌🏾♀️ E4.0 woman golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2640 ; minimally-qualified # 🏌🏾♀ E4.0 woman golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2640 FE0F ; fully-qualified # 🏌🏿♀️ E4.0 woman golfing: dark skin tone
+1F3CC 1F3FF 200D 2640 ; minimally-qualified # 🏌🏿♀ E4.0 woman golfing: dark skin tone
+1F3C4 ; fully-qualified # 🏄 E0.6 person surfing
+1F3C4 1F3FB ; fully-qualified # 🏄🏻 E1.0 person surfing: light skin tone
+1F3C4 1F3FC ; fully-qualified # 🏄🏼 E1.0 person surfing: medium-light skin tone
+1F3C4 1F3FD ; fully-qualified # 🏄🏽 E1.0 person surfing: medium skin tone
+1F3C4 1F3FE ; fully-qualified # 🏄🏾 E1.0 person surfing: medium-dark skin tone
+1F3C4 1F3FF ; fully-qualified # 🏄🏿 E1.0 person surfing: dark skin tone
+1F3C4 200D 2642 FE0F ; fully-qualified # 🏄♂️ E4.0 man surfing
+1F3C4 200D 2642 ; minimally-qualified # 🏄♂ E4.0 man surfing
+1F3C4 1F3FB 200D 2642 FE0F ; fully-qualified # 🏄🏻♂️ E4.0 man surfing: light skin tone
+1F3C4 1F3FB 200D 2642 ; minimally-qualified # 🏄🏻♂ E4.0 man surfing: light skin tone
+1F3C4 1F3FC 200D 2642 FE0F ; fully-qualified # 🏄🏼♂️ E4.0 man surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2642 ; minimally-qualified # 🏄🏼♂ E4.0 man surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2642 FE0F ; fully-qualified # 🏄🏽♂️ E4.0 man surfing: medium skin tone
+1F3C4 1F3FD 200D 2642 ; minimally-qualified # 🏄🏽♂ E4.0 man surfing: medium skin tone
+1F3C4 1F3FE 200D 2642 FE0F ; fully-qualified # 🏄🏾♂️ E4.0 man surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2642 ; minimally-qualified # 🏄🏾♂ E4.0 man surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2642 FE0F ; fully-qualified # 🏄🏿♂️ E4.0 man surfing: dark skin tone
+1F3C4 1F3FF 200D 2642 ; minimally-qualified # 🏄🏿♂ E4.0 man surfing: dark skin tone
+1F3C4 200D 2640 FE0F ; fully-qualified # 🏄♀️ E4.0 woman surfing
+1F3C4 200D 2640 ; minimally-qualified # 🏄♀ E4.0 woman surfing
+1F3C4 1F3FB 200D 2640 FE0F ; fully-qualified # 🏄🏻♀️ E4.0 woman surfing: light skin tone
+1F3C4 1F3FB 200D 2640 ; minimally-qualified # 🏄🏻♀ E4.0 woman surfing: light skin tone
+1F3C4 1F3FC 200D 2640 FE0F ; fully-qualified # 🏄🏼♀️ E4.0 woman surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2640 ; minimally-qualified # 🏄🏼♀ E4.0 woman surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2640 FE0F ; fully-qualified # 🏄🏽♀️ E4.0 woman surfing: medium skin tone
+1F3C4 1F3FD 200D 2640 ; minimally-qualified # 🏄🏽♀ E4.0 woman surfing: medium skin tone
+1F3C4 1F3FE 200D 2640 FE0F ; fully-qualified # 🏄🏾♀️ E4.0 woman surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2640 ; minimally-qualified # 🏄🏾♀ E4.0 woman surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2640 FE0F ; fully-qualified # 🏄🏿♀️ E4.0 woman surfing: dark skin tone
+1F3C4 1F3FF 200D 2640 ; minimally-qualified # 🏄🏿♀ E4.0 woman surfing: dark skin tone
+1F6A3 ; fully-qualified # 🚣 E1.0 person rowing boat
+1F6A3 1F3FB ; fully-qualified # 🚣🏻 E1.0 person rowing boat: light skin tone
+1F6A3 1F3FC ; fully-qualified # 🚣🏼 E1.0 person rowing boat: medium-light skin tone
+1F6A3 1F3FD ; fully-qualified # 🚣🏽 E1.0 person rowing boat: medium skin tone
+1F6A3 1F3FE ; fully-qualified # 🚣🏾 E1.0 person rowing boat: medium-dark skin tone
+1F6A3 1F3FF ; fully-qualified # 🚣🏿 E1.0 person rowing boat: dark skin tone
+1F6A3 200D 2642 FE0F ; fully-qualified # 🚣♂️ E4.0 man rowing boat
+1F6A3 200D 2642 ; minimally-qualified # 🚣♂ E4.0 man rowing boat
+1F6A3 1F3FB 200D 2642 FE0F ; fully-qualified # 🚣🏻♂️ E4.0 man rowing boat: light skin tone
+1F6A3 1F3FB 200D 2642 ; minimally-qualified # 🚣🏻♂ E4.0 man rowing boat: light skin tone
+1F6A3 1F3FC 200D 2642 FE0F ; fully-qualified # 🚣🏼♂️ E4.0 man rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2642 ; minimally-qualified # 🚣🏼♂ E4.0 man rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2642 FE0F ; fully-qualified # 🚣🏽♂️ E4.0 man rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2642 ; minimally-qualified # 🚣🏽♂ E4.0 man rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2642 FE0F ; fully-qualified # 🚣🏾♂️ E4.0 man rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2642 ; minimally-qualified # 🚣🏾♂ E4.0 man rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2642 FE0F ; fully-qualified # 🚣🏿♂️ E4.0 man rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2642 ; minimally-qualified # 🚣🏿♂ E4.0 man rowing boat: dark skin tone
+1F6A3 200D 2640 FE0F ; fully-qualified # 🚣♀️ E4.0 woman rowing boat
+1F6A3 200D 2640 ; minimally-qualified # 🚣♀ E4.0 woman rowing boat
+1F6A3 1F3FB 200D 2640 FE0F ; fully-qualified # 🚣🏻♀️ E4.0 woman rowing boat: light skin tone
+1F6A3 1F3FB 200D 2640 ; minimally-qualified # 🚣🏻♀ E4.0 woman rowing boat: light skin tone
+1F6A3 1F3FC 200D 2640 FE0F ; fully-qualified # 🚣🏼♀️ E4.0 woman rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2640 ; minimally-qualified # 🚣🏼♀ E4.0 woman rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2640 FE0F ; fully-qualified # 🚣🏽♀️ E4.0 woman rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2640 ; minimally-qualified # 🚣🏽♀ E4.0 woman rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2640 FE0F ; fully-qualified # 🚣🏾♀️ E4.0 woman rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2640 ; minimally-qualified # 🚣🏾♀ E4.0 woman rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2640 FE0F ; fully-qualified # 🚣🏿♀️ E4.0 woman rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2640 ; minimally-qualified # 🚣🏿♀ E4.0 woman rowing boat: dark skin tone
+1F3CA ; fully-qualified # 🏊 E0.6 person swimming
+1F3CA 1F3FB ; fully-qualified # 🏊🏻 E1.0 person swimming: light skin tone
+1F3CA 1F3FC ; fully-qualified # 🏊🏼 E1.0 person swimming: medium-light skin tone
+1F3CA 1F3FD ; fully-qualified # 🏊🏽 E1.0 person swimming: medium skin tone
+1F3CA 1F3FE ; fully-qualified # 🏊🏾 E1.0 person swimming: medium-dark skin tone
+1F3CA 1F3FF ; fully-qualified # 🏊🏿 E1.0 person swimming: dark skin tone
+1F3CA 200D 2642 FE0F ; fully-qualified # 🏊♂️ E4.0 man swimming
+1F3CA 200D 2642 ; minimally-qualified # 🏊♂ E4.0 man swimming
+1F3CA 1F3FB 200D 2642 FE0F ; fully-qualified # 🏊🏻♂️ E4.0 man swimming: light skin tone
+1F3CA 1F3FB 200D 2642 ; minimally-qualified # 🏊🏻♂ E4.0 man swimming: light skin tone
+1F3CA 1F3FC 200D 2642 FE0F ; fully-qualified # 🏊🏼♂️ E4.0 man swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2642 ; minimally-qualified # 🏊🏼♂ E4.0 man swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2642 FE0F ; fully-qualified # 🏊🏽♂️ E4.0 man swimming: medium skin tone
+1F3CA 1F3FD 200D 2642 ; minimally-qualified # 🏊🏽♂ E4.0 man swimming: medium skin tone
+1F3CA 1F3FE 200D 2642 FE0F ; fully-qualified # 🏊🏾♂️ E4.0 man swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2642 ; minimally-qualified # 🏊🏾♂ E4.0 man swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2642 FE0F ; fully-qualified # 🏊🏿♂️ E4.0 man swimming: dark skin tone
+1F3CA 1F3FF 200D 2642 ; minimally-qualified # 🏊🏿♂ E4.0 man swimming: dark skin tone
+1F3CA 200D 2640 FE0F ; fully-qualified # 🏊♀️ E4.0 woman swimming
+1F3CA 200D 2640 ; minimally-qualified # 🏊♀ E4.0 woman swimming
+1F3CA 1F3FB 200D 2640 FE0F ; fully-qualified # 🏊🏻♀️ E4.0 woman swimming: light skin tone
+1F3CA 1F3FB 200D 2640 ; minimally-qualified # 🏊🏻♀ E4.0 woman swimming: light skin tone
+1F3CA 1F3FC 200D 2640 FE0F ; fully-qualified # 🏊🏼♀️ E4.0 woman swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2640 ; minimally-qualified # 🏊🏼♀ E4.0 woman swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2640 FE0F ; fully-qualified # 🏊🏽♀️ E4.0 woman swimming: medium skin tone
+1F3CA 1F3FD 200D 2640 ; minimally-qualified # 🏊🏽♀ E4.0 woman swimming: medium skin tone
+1F3CA 1F3FE 200D 2640 FE0F ; fully-qualified # 🏊🏾♀️ E4.0 woman swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2640 ; minimally-qualified # 🏊🏾♀ E4.0 woman swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2640 FE0F ; fully-qualified # 🏊🏿♀️ E4.0 woman swimming: dark skin tone
+1F3CA 1F3FF 200D 2640 ; minimally-qualified # 🏊🏿♀ E4.0 woman swimming: dark skin tone
+26F9 FE0F ; fully-qualified # ⛹️ E0.7 person bouncing ball
+26F9 ; unqualified # ⛹ E0.7 person bouncing ball
+26F9 1F3FB ; fully-qualified # ⛹🏻 E2.0 person bouncing ball: light skin tone
+26F9 1F3FC ; fully-qualified # ⛹🏼 E2.0 person bouncing ball: medium-light skin tone
+26F9 1F3FD ; fully-qualified # ⛹🏽 E2.0 person bouncing ball: medium skin tone
+26F9 1F3FE ; fully-qualified # ⛹🏾 E2.0 person bouncing ball: medium-dark skin tone
+26F9 1F3FF ; fully-qualified # ⛹🏿 E2.0 person bouncing ball: dark skin tone
+26F9 FE0F 200D 2642 FE0F ; fully-qualified # ⛹️♂️ E4.0 man bouncing ball
+26F9 200D 2642 FE0F ; unqualified # ⛹♂️ E4.0 man bouncing ball
+26F9 FE0F 200D 2642 ; unqualified # ⛹️♂ E4.0 man bouncing ball
+26F9 200D 2642 ; unqualified # ⛹♂ E4.0 man bouncing ball
+26F9 1F3FB 200D 2642 FE0F ; fully-qualified # ⛹🏻♂️ E4.0 man bouncing ball: light skin tone
+26F9 1F3FB 200D 2642 ; minimally-qualified # ⛹🏻♂ E4.0 man bouncing ball: light skin tone
+26F9 1F3FC 200D 2642 FE0F ; fully-qualified # ⛹🏼♂️ E4.0 man bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2642 ; minimally-qualified # ⛹🏼♂ E4.0 man bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2642 FE0F ; fully-qualified # ⛹🏽♂️ E4.0 man bouncing ball: medium skin tone
+26F9 1F3FD 200D 2642 ; minimally-qualified # ⛹🏽♂ E4.0 man bouncing ball: medium skin tone
+26F9 1F3FE 200D 2642 FE0F ; fully-qualified # ⛹🏾♂️ E4.0 man bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2642 ; minimally-qualified # ⛹🏾♂ E4.0 man bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2642 FE0F ; fully-qualified # ⛹🏿♂️ E4.0 man bouncing ball: dark skin tone
+26F9 1F3FF 200D 2642 ; minimally-qualified # ⛹🏿♂ E4.0 man bouncing ball: dark skin tone
+26F9 FE0F 200D 2640 FE0F ; fully-qualified # ⛹️♀️ E4.0 woman bouncing ball
+26F9 200D 2640 FE0F ; unqualified # ⛹♀️ E4.0 woman bouncing ball
+26F9 FE0F 200D 2640 ; unqualified # ⛹️♀ E4.0 woman bouncing ball
+26F9 200D 2640 ; unqualified # ⛹♀ E4.0 woman bouncing ball
+26F9 1F3FB 200D 2640 FE0F ; fully-qualified # ⛹🏻♀️ E4.0 woman bouncing ball: light skin tone
+26F9 1F3FB 200D 2640 ; minimally-qualified # ⛹🏻♀ E4.0 woman bouncing ball: light skin tone
+26F9 1F3FC 200D 2640 FE0F ; fully-qualified # ⛹🏼♀️ E4.0 woman bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2640 ; minimally-qualified # ⛹🏼♀ E4.0 woman bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2640 FE0F ; fully-qualified # ⛹🏽♀️ E4.0 woman bouncing ball: medium skin tone
+26F9 1F3FD 200D 2640 ; minimally-qualified # ⛹🏽♀ E4.0 woman bouncing ball: medium skin tone
+26F9 1F3FE 200D 2640 FE0F ; fully-qualified # ⛹🏾♀️ E4.0 woman bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2640 ; minimally-qualified # ⛹🏾♀ E4.0 woman bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2640 FE0F ; fully-qualified # ⛹🏿♀️ E4.0 woman bouncing ball: dark skin tone
+26F9 1F3FF 200D 2640 ; minimally-qualified # ⛹🏿♀ E4.0 woman bouncing ball: dark skin tone
+1F3CB FE0F ; fully-qualified # 🏋️ E0.7 person lifting weights
+1F3CB ; unqualified # 🏋 E0.7 person lifting weights
+1F3CB 1F3FB ; fully-qualified # 🏋🏻 E2.0 person lifting weights: light skin tone
+1F3CB 1F3FC ; fully-qualified # 🏋🏼 E2.0 person lifting weights: medium-light skin tone
+1F3CB 1F3FD ; fully-qualified # 🏋🏽 E2.0 person lifting weights: medium skin tone
+1F3CB 1F3FE ; fully-qualified # 🏋🏾 E2.0 person lifting weights: medium-dark skin tone
+1F3CB 1F3FF ; fully-qualified # 🏋🏿 E2.0 person lifting weights: dark skin tone
+1F3CB FE0F 200D 2642 FE0F ; fully-qualified # 🏋️♂️ E4.0 man lifting weights
+1F3CB 200D 2642 FE0F ; unqualified # 🏋♂️ E4.0 man lifting weights
+1F3CB FE0F 200D 2642 ; unqualified # 🏋️♂ E4.0 man lifting weights
+1F3CB 200D 2642 ; unqualified # 🏋♂ E4.0 man lifting weights
+1F3CB 1F3FB 200D 2642 FE0F ; fully-qualified # 🏋🏻♂️ E4.0 man lifting weights: light skin tone
+1F3CB 1F3FB 200D 2642 ; minimally-qualified # 🏋🏻♂ E4.0 man lifting weights: light skin tone
+1F3CB 1F3FC 200D 2642 FE0F ; fully-qualified # 🏋🏼♂️ E4.0 man lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2642 ; minimally-qualified # 🏋🏼♂ E4.0 man lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2642 FE0F ; fully-qualified # 🏋🏽♂️ E4.0 man lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2642 ; minimally-qualified # 🏋🏽♂ E4.0 man lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2642 FE0F ; fully-qualified # 🏋🏾♂️ E4.0 man lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2642 ; minimally-qualified # 🏋🏾♂ E4.0 man lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2642 FE0F ; fully-qualified # 🏋🏿♂️ E4.0 man lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2642 ; minimally-qualified # 🏋🏿♂ E4.0 man lifting weights: dark skin tone
+1F3CB FE0F 200D 2640 FE0F ; fully-qualified # 🏋️♀️ E4.0 woman lifting weights
+1F3CB 200D 2640 FE0F ; unqualified # 🏋♀️ E4.0 woman lifting weights
+1F3CB FE0F 200D 2640 ; unqualified # 🏋️♀ E4.0 woman lifting weights
+1F3CB 200D 2640 ; unqualified # 🏋♀ E4.0 woman lifting weights
+1F3CB 1F3FB 200D 2640 FE0F ; fully-qualified # 🏋🏻♀️ E4.0 woman lifting weights: light skin tone
+1F3CB 1F3FB 200D 2640 ; minimally-qualified # 🏋🏻♀ E4.0 woman lifting weights: light skin tone
+1F3CB 1F3FC 200D 2640 FE0F ; fully-qualified # 🏋🏼♀️ E4.0 woman lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2640 ; minimally-qualified # 🏋🏼♀ E4.0 woman lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2640 FE0F ; fully-qualified # 🏋🏽♀️ E4.0 woman lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2640 ; minimally-qualified # 🏋🏽♀ E4.0 woman lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2640 FE0F ; fully-qualified # 🏋🏾♀️ E4.0 woman lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2640 ; minimally-qualified # 🏋🏾♀ E4.0 woman lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2640 FE0F ; fully-qualified # 🏋🏿♀️ E4.0 woman lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2640 ; minimally-qualified # 🏋🏿♀ E4.0 woman lifting weights: dark skin tone
+1F6B4 ; fully-qualified # 🚴 E1.0 person biking
+1F6B4 1F3FB ; fully-qualified # 🚴🏻 E1.0 person biking: light skin tone
+1F6B4 1F3FC ; fully-qualified # 🚴🏼 E1.0 person biking: medium-light skin tone
+1F6B4 1F3FD ; fully-qualified # 🚴🏽 E1.0 person biking: medium skin tone
+1F6B4 1F3FE ; fully-qualified # 🚴🏾 E1.0 person biking: medium-dark skin tone
+1F6B4 1F3FF ; fully-qualified # 🚴🏿 E1.0 person biking: dark skin tone
+1F6B4 200D 2642 FE0F ; fully-qualified # 🚴♂️ E4.0 man biking
+1F6B4 200D 2642 ; minimally-qualified # 🚴♂ E4.0 man biking
+1F6B4 1F3FB 200D 2642 FE0F ; fully-qualified # 🚴🏻♂️ E4.0 man biking: light skin tone
+1F6B4 1F3FB 200D 2642 ; minimally-qualified # 🚴🏻♂ E4.0 man biking: light skin tone
+1F6B4 1F3FC 200D 2642 FE0F ; fully-qualified # 🚴🏼♂️ E4.0 man biking: medium-light skin tone
+1F6B4 1F3FC 200D 2642 ; minimally-qualified # 🚴🏼♂ E4.0 man biking: medium-light skin tone
+1F6B4 1F3FD 200D 2642 FE0F ; fully-qualified # 🚴🏽♂️ E4.0 man biking: medium skin tone
+1F6B4 1F3FD 200D 2642 ; minimally-qualified # 🚴🏽♂ E4.0 man biking: medium skin tone
+1F6B4 1F3FE 200D 2642 FE0F ; fully-qualified # 🚴🏾♂️ E4.0 man biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2642 ; minimally-qualified # 🚴🏾♂ E4.0 man biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2642 FE0F ; fully-qualified # 🚴🏿♂️ E4.0 man biking: dark skin tone
+1F6B4 1F3FF 200D 2642 ; minimally-qualified # 🚴🏿♂ E4.0 man biking: dark skin tone
+1F6B4 200D 2640 FE0F ; fully-qualified # 🚴♀️ E4.0 woman biking
+1F6B4 200D 2640 ; minimally-qualified # 🚴♀ E4.0 woman biking
+1F6B4 1F3FB 200D 2640 FE0F ; fully-qualified # 🚴🏻♀️ E4.0 woman biking: light skin tone
+1F6B4 1F3FB 200D 2640 ; minimally-qualified # 🚴🏻♀ E4.0 woman biking: light skin tone
+1F6B4 1F3FC 200D 2640 FE0F ; fully-qualified # 🚴🏼♀️ E4.0 woman biking: medium-light skin tone
+1F6B4 1F3FC 200D 2640 ; minimally-qualified # 🚴🏼♀ E4.0 woman biking: medium-light skin tone
+1F6B4 1F3FD 200D 2640 FE0F ; fully-qualified # 🚴🏽♀️ E4.0 woman biking: medium skin tone
+1F6B4 1F3FD 200D 2640 ; minimally-qualified # 🚴🏽♀ E4.0 woman biking: medium skin tone
+1F6B4 1F3FE 200D 2640 FE0F ; fully-qualified # 🚴🏾♀️ E4.0 woman biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2640 ; minimally-qualified # 🚴🏾♀ E4.0 woman biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2640 FE0F ; fully-qualified # 🚴🏿♀️ E4.0 woman biking: dark skin tone
+1F6B4 1F3FF 200D 2640 ; minimally-qualified # 🚴🏿♀ E4.0 woman biking: dark skin tone
+1F6B5 ; fully-qualified # 🚵 E1.0 person mountain biking
+1F6B5 1F3FB ; fully-qualified # 🚵🏻 E1.0 person mountain biking: light skin tone
+1F6B5 1F3FC ; fully-qualified # 🚵🏼 E1.0 person mountain biking: medium-light skin tone
+1F6B5 1F3FD ; fully-qualified # 🚵🏽 E1.0 person mountain biking: medium skin tone
+1F6B5 1F3FE ; fully-qualified # 🚵🏾 E1.0 person mountain biking: medium-dark skin tone
+1F6B5 1F3FF ; fully-qualified # 🚵🏿 E1.0 person mountain biking: dark skin tone
+1F6B5 200D 2642 FE0F ; fully-qualified # 🚵♂️ E4.0 man mountain biking
+1F6B5 200D 2642 ; minimally-qualified # 🚵♂ E4.0 man mountain biking
+1F6B5 1F3FB 200D 2642 FE0F ; fully-qualified # 🚵🏻♂️ E4.0 man mountain biking: light skin tone
+1F6B5 1F3FB 200D 2642 ; minimally-qualified # 🚵🏻♂ E4.0 man mountain biking: light skin tone
+1F6B5 1F3FC 200D 2642 FE0F ; fully-qualified # 🚵🏼♂️ E4.0 man mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2642 ; minimally-qualified # 🚵🏼♂ E4.0 man mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2642 FE0F ; fully-qualified # 🚵🏽♂️ E4.0 man mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2642 ; minimally-qualified # 🚵🏽♂ E4.0 man mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2642 FE0F ; fully-qualified # 🚵🏾♂️ E4.0 man mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2642 ; minimally-qualified # 🚵🏾♂ E4.0 man mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2642 FE0F ; fully-qualified # 🚵🏿♂️ E4.0 man mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2642 ; minimally-qualified # 🚵🏿♂ E4.0 man mountain biking: dark skin tone
+1F6B5 200D 2640 FE0F ; fully-qualified # 🚵♀️ E4.0 woman mountain biking
+1F6B5 200D 2640 ; minimally-qualified # 🚵♀ E4.0 woman mountain biking
+1F6B5 1F3FB 200D 2640 FE0F ; fully-qualified # 🚵🏻♀️ E4.0 woman mountain biking: light skin tone
+1F6B5 1F3FB 200D 2640 ; minimally-qualified # 🚵🏻♀ E4.0 woman mountain biking: light skin tone
+1F6B5 1F3FC 200D 2640 FE0F ; fully-qualified # 🚵🏼♀️ E4.0 woman mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2640 ; minimally-qualified # 🚵🏼♀ E4.0 woman mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2640 FE0F ; fully-qualified # 🚵🏽♀️ E4.0 woman mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2640 ; minimally-qualified # 🚵🏽♀ E4.0 woman mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2640 FE0F ; fully-qualified # 🚵🏾♀️ E4.0 woman mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2640 ; minimally-qualified # 🚵🏾♀ E4.0 woman mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2640 FE0F ; fully-qualified # 🚵🏿♀️ E4.0 woman mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2640 ; minimally-qualified # 🚵🏿♀ E4.0 woman mountain biking: dark skin tone
+1F938 ; fully-qualified # 🤸 E3.0 person cartwheeling
+1F938 1F3FB ; fully-qualified # 🤸🏻 E3.0 person cartwheeling: light skin tone
+1F938 1F3FC ; fully-qualified # 🤸🏼 E3.0 person cartwheeling: medium-light skin tone
+1F938 1F3FD ; fully-qualified # 🤸🏽 E3.0 person cartwheeling: medium skin tone
+1F938 1F3FE ; fully-qualified # 🤸🏾 E3.0 person cartwheeling: medium-dark skin tone
+1F938 1F3FF ; fully-qualified # 🤸🏿 E3.0 person cartwheeling: dark skin tone
+1F938 200D 2642 FE0F ; fully-qualified # 🤸♂️ E4.0 man cartwheeling
+1F938 200D 2642 ; minimally-qualified # 🤸♂ E4.0 man cartwheeling
+1F938 1F3FB 200D 2642 FE0F ; fully-qualified # 🤸🏻♂️ E4.0 man cartwheeling: light skin tone
+1F938 1F3FB 200D 2642 ; minimally-qualified # 🤸🏻♂ E4.0 man cartwheeling: light skin tone
+1F938 1F3FC 200D 2642 FE0F ; fully-qualified # 🤸🏼♂️ E4.0 man cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2642 ; minimally-qualified # 🤸🏼♂ E4.0 man cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2642 FE0F ; fully-qualified # 🤸🏽♂️ E4.0 man cartwheeling: medium skin tone
+1F938 1F3FD 200D 2642 ; minimally-qualified # 🤸🏽♂ E4.0 man cartwheeling: medium skin tone
+1F938 1F3FE 200D 2642 FE0F ; fully-qualified # 🤸🏾♂️ E4.0 man cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2642 ; minimally-qualified # 🤸🏾♂ E4.0 man cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2642 FE0F ; fully-qualified # 🤸🏿♂️ E4.0 man cartwheeling: dark skin tone
+1F938 1F3FF 200D 2642 ; minimally-qualified # 🤸🏿♂ E4.0 man cartwheeling: dark skin tone
+1F938 200D 2640 FE0F ; fully-qualified # 🤸♀️ E4.0 woman cartwheeling
+1F938 200D 2640 ; minimally-qualified # 🤸♀ E4.0 woman cartwheeling
+1F938 1F3FB 200D 2640 FE0F ; fully-qualified # 🤸🏻♀️ E4.0 woman cartwheeling: light skin tone
+1F938 1F3FB 200D 2640 ; minimally-qualified # 🤸🏻♀ E4.0 woman cartwheeling: light skin tone
+1F938 1F3FC 200D 2640 FE0F ; fully-qualified # 🤸🏼♀️ E4.0 woman cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2640 ; minimally-qualified # 🤸🏼♀ E4.0 woman cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2640 FE0F ; fully-qualified # 🤸🏽♀️ E4.0 woman cartwheeling: medium skin tone
+1F938 1F3FD 200D 2640 ; minimally-qualified # 🤸🏽♀ E4.0 woman cartwheeling: medium skin tone
+1F938 1F3FE 200D 2640 FE0F ; fully-qualified # 🤸🏾♀️ E4.0 woman cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2640 ; minimally-qualified # 🤸🏾♀ E4.0 woman cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2640 FE0F ; fully-qualified # 🤸🏿♀️ E4.0 woman cartwheeling: dark skin tone
+1F938 1F3FF 200D 2640 ; minimally-qualified # 🤸🏿♀ E4.0 woman cartwheeling: dark skin tone
+1F93C ; fully-qualified # 🤼 E3.0 people wrestling
+1F93C 200D 2642 FE0F ; fully-qualified # 🤼♂️ E4.0 men wrestling
+1F93C 200D 2642 ; minimally-qualified # 🤼♂ E4.0 men wrestling
+1F93C 200D 2640 FE0F ; fully-qualified # 🤼♀️ E4.0 women wrestling
+1F93C 200D 2640 ; minimally-qualified # 🤼♀ E4.0 women wrestling
+1F93D ; fully-qualified # 🤽 E3.0 person playing water polo
+1F93D 1F3FB ; fully-qualified # 🤽🏻 E3.0 person playing water polo: light skin tone
+1F93D 1F3FC ; fully-qualified # 🤽🏼 E3.0 person playing water polo: medium-light skin tone
+1F93D 1F3FD ; fully-qualified # 🤽🏽 E3.0 person playing water polo: medium skin tone
+1F93D 1F3FE ; fully-qualified # 🤽🏾 E3.0 person playing water polo: medium-dark skin tone
+1F93D 1F3FF ; fully-qualified # 🤽🏿 E3.0 person playing water polo: dark skin tone
+1F93D 200D 2642 FE0F ; fully-qualified # 🤽♂️ E4.0 man playing water polo
+1F93D 200D 2642 ; minimally-qualified # 🤽♂ E4.0 man playing water polo
+1F93D 1F3FB 200D 2642 FE0F ; fully-qualified # 🤽🏻♂️ E4.0 man playing water polo: light skin tone
+1F93D 1F3FB 200D 2642 ; minimally-qualified # 🤽🏻♂ E4.0 man playing water polo: light skin tone
+1F93D 1F3FC 200D 2642 FE0F ; fully-qualified # 🤽🏼♂️ E4.0 man playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2642 ; minimally-qualified # 🤽🏼♂ E4.0 man playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2642 FE0F ; fully-qualified # 🤽🏽♂️ E4.0 man playing water polo: medium skin tone
+1F93D 1F3FD 200D 2642 ; minimally-qualified # 🤽🏽♂ E4.0 man playing water polo: medium skin tone
+1F93D 1F3FE 200D 2642 FE0F ; fully-qualified # 🤽🏾♂️ E4.0 man playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2642 ; minimally-qualified # 🤽🏾♂ E4.0 man playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2642 FE0F ; fully-qualified # 🤽🏿♂️ E4.0 man playing water polo: dark skin tone
+1F93D 1F3FF 200D 2642 ; minimally-qualified # 🤽🏿♂ E4.0 man playing water polo: dark skin tone
+1F93D 200D 2640 FE0F ; fully-qualified # 🤽♀️ E4.0 woman playing water polo
+1F93D 200D 2640 ; minimally-qualified # 🤽♀ E4.0 woman playing water polo
+1F93D 1F3FB 200D 2640 FE0F ; fully-qualified # 🤽🏻♀️ E4.0 woman playing water polo: light skin tone
+1F93D 1F3FB 200D 2640 ; minimally-qualified # 🤽🏻♀ E4.0 woman playing water polo: light skin tone
+1F93D 1F3FC 200D 2640 FE0F ; fully-qualified # 🤽🏼♀️ E4.0 woman playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2640 ; minimally-qualified # 🤽🏼♀ E4.0 woman playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2640 FE0F ; fully-qualified # 🤽🏽♀️ E4.0 woman playing water polo: medium skin tone
+1F93D 1F3FD 200D 2640 ; minimally-qualified # 🤽🏽♀ E4.0 woman playing water polo: medium skin tone
+1F93D 1F3FE 200D 2640 FE0F ; fully-qualified # 🤽🏾♀️ E4.0 woman playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2640 ; minimally-qualified # 🤽🏾♀ E4.0 woman playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2640 FE0F ; fully-qualified # 🤽🏿♀️ E4.0 woman playing water polo: dark skin tone
+1F93D 1F3FF 200D 2640 ; minimally-qualified # 🤽🏿♀ E4.0 woman playing water polo: dark skin tone
+1F93E ; fully-qualified # 🤾 E3.0 person playing handball
+1F93E 1F3FB ; fully-qualified # 🤾🏻 E3.0 person playing handball: light skin tone
+1F93E 1F3FC ; fully-qualified # 🤾🏼 E3.0 person playing handball: medium-light skin tone
+1F93E 1F3FD ; fully-qualified # 🤾🏽 E3.0 person playing handball: medium skin tone
+1F93E 1F3FE ; fully-qualified # 🤾🏾 E3.0 person playing handball: medium-dark skin tone
+1F93E 1F3FF ; fully-qualified # 🤾🏿 E3.0 person playing handball: dark skin tone
+1F93E 200D 2642 FE0F ; fully-qualified # 🤾♂️ E4.0 man playing handball
+1F93E 200D 2642 ; minimally-qualified # 🤾♂ E4.0 man playing handball
+1F93E 1F3FB 200D 2642 FE0F ; fully-qualified # 🤾🏻♂️ E4.0 man playing handball: light skin tone
+1F93E 1F3FB 200D 2642 ; minimally-qualified # 🤾🏻♂ E4.0 man playing handball: light skin tone
+1F93E 1F3FC 200D 2642 FE0F ; fully-qualified # 🤾🏼♂️ E4.0 man playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2642 ; minimally-qualified # 🤾🏼♂ E4.0 man playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2642 FE0F ; fully-qualified # 🤾🏽♂️ E4.0 man playing handball: medium skin tone
+1F93E 1F3FD 200D 2642 ; minimally-qualified # 🤾🏽♂ E4.0 man playing handball: medium skin tone
+1F93E 1F3FE 200D 2642 FE0F ; fully-qualified # 🤾🏾♂️ E4.0 man playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2642 ; minimally-qualified # 🤾🏾♂ E4.0 man playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2642 FE0F ; fully-qualified # 🤾🏿♂️ E4.0 man playing handball: dark skin tone
+1F93E 1F3FF 200D 2642 ; minimally-qualified # 🤾🏿♂ E4.0 man playing handball: dark skin tone
+1F93E 200D 2640 FE0F ; fully-qualified # 🤾♀️ E4.0 woman playing handball
+1F93E 200D 2640 ; minimally-qualified # 🤾♀ E4.0 woman playing handball
+1F93E 1F3FB 200D 2640 FE0F ; fully-qualified # 🤾🏻♀️ E4.0 woman playing handball: light skin tone
+1F93E 1F3FB 200D 2640 ; minimally-qualified # 🤾🏻♀ E4.0 woman playing handball: light skin tone
+1F93E 1F3FC 200D 2640 FE0F ; fully-qualified # 🤾🏼♀️ E4.0 woman playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2640 ; minimally-qualified # 🤾🏼♀ E4.0 woman playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2640 FE0F ; fully-qualified # 🤾🏽♀️ E4.0 woman playing handball: medium skin tone
+1F93E 1F3FD 200D 2640 ; minimally-qualified # 🤾🏽♀ E4.0 woman playing handball: medium skin tone
+1F93E 1F3FE 200D 2640 FE0F ; fully-qualified # 🤾🏾♀️ E4.0 woman playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2640 ; minimally-qualified # 🤾🏾♀ E4.0 woman playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2640 FE0F ; fully-qualified # 🤾🏿♀️ E4.0 woman playing handball: dark skin tone
+1F93E 1F3FF 200D 2640 ; minimally-qualified # 🤾🏿♀ E4.0 woman playing handball: dark skin tone
+1F939 ; fully-qualified # 🤹 E3.0 person juggling
+1F939 1F3FB ; fully-qualified # 🤹🏻 E3.0 person juggling: light skin tone
+1F939 1F3FC ; fully-qualified # 🤹🏼 E3.0 person juggling: medium-light skin tone
+1F939 1F3FD ; fully-qualified # 🤹🏽 E3.0 person juggling: medium skin tone
+1F939 1F3FE ; fully-qualified # 🤹🏾 E3.0 person juggling: medium-dark skin tone
+1F939 1F3FF ; fully-qualified # 🤹🏿 E3.0 person juggling: dark skin tone
+1F939 200D 2642 FE0F ; fully-qualified # 🤹♂️ E4.0 man juggling
+1F939 200D 2642 ; minimally-qualified # 🤹♂ E4.0 man juggling
+1F939 1F3FB 200D 2642 FE0F ; fully-qualified # 🤹🏻♂️ E4.0 man juggling: light skin tone
+1F939 1F3FB 200D 2642 ; minimally-qualified # 🤹🏻♂ E4.0 man juggling: light skin tone
+1F939 1F3FC 200D 2642 FE0F ; fully-qualified # 🤹🏼♂️ E4.0 man juggling: medium-light skin tone
+1F939 1F3FC 200D 2642 ; minimally-qualified # 🤹🏼♂ E4.0 man juggling: medium-light skin tone
+1F939 1F3FD 200D 2642 FE0F ; fully-qualified # 🤹🏽♂️ E4.0 man juggling: medium skin tone
+1F939 1F3FD 200D 2642 ; minimally-qualified # 🤹🏽♂ E4.0 man juggling: medium skin tone
+1F939 1F3FE 200D 2642 FE0F ; fully-qualified # 🤹🏾♂️ E4.0 man juggling: medium-dark skin tone
+1F939 1F3FE 200D 2642 ; minimally-qualified # 🤹🏾♂ E4.0 man juggling: medium-dark skin tone
+1F939 1F3FF 200D 2642 FE0F ; fully-qualified # 🤹🏿♂️ E4.0 man juggling: dark skin tone
+1F939 1F3FF 200D 2642 ; minimally-qualified # 🤹🏿♂ E4.0 man juggling: dark skin tone
+1F939 200D 2640 FE0F ; fully-qualified # 🤹♀️ E4.0 woman juggling
+1F939 200D 2640 ; minimally-qualified # 🤹♀ E4.0 woman juggling
+1F939 1F3FB 200D 2640 FE0F ; fully-qualified # 🤹🏻♀️ E4.0 woman juggling: light skin tone
+1F939 1F3FB 200D 2640 ; minimally-qualified # 🤹🏻♀ E4.0 woman juggling: light skin tone
+1F939 1F3FC 200D 2640 FE0F ; fully-qualified # 🤹🏼♀️ E4.0 woman juggling: medium-light skin tone
+1F939 1F3FC 200D 2640 ; minimally-qualified # 🤹🏼♀ E4.0 woman juggling: medium-light skin tone
+1F939 1F3FD 200D 2640 FE0F ; fully-qualified # 🤹🏽♀️ E4.0 woman juggling: medium skin tone
+1F939 1F3FD 200D 2640 ; minimally-qualified # 🤹🏽♀ E4.0 woman juggling: medium skin tone
+1F939 1F3FE 200D 2640 FE0F ; fully-qualified # 🤹🏾♀️ E4.0 woman juggling: medium-dark skin tone
+1F939 1F3FE 200D 2640 ; minimally-qualified # 🤹🏾♀ E4.0 woman juggling: medium-dark skin tone
+1F939 1F3FF 200D 2640 FE0F ; fully-qualified # 🤹🏿♀️ E4.0 woman juggling: dark skin tone
+1F939 1F3FF 200D 2640 ; minimally-qualified # 🤹🏿♀ E4.0 woman juggling: dark skin tone
# subgroup: person-resting
-1F9D8 ; fully-qualified # 🧘 person in lotus position
-1F9D8 1F3FB ; fully-qualified # 🧘🏻 person in lotus position: light skin tone
-1F9D8 1F3FC ; fully-qualified # 🧘🏼 person in lotus position: medium-light skin tone
-1F9D8 1F3FD ; fully-qualified # 🧘🏽 person in lotus position: medium skin tone
-1F9D8 1F3FE ; fully-qualified # 🧘🏾 person in lotus position: medium-dark skin tone
-1F9D8 1F3FF ; fully-qualified # 🧘🏿 person in lotus position: dark skin tone
-1F9D8 200D 2642 FE0F ; fully-qualified # 🧘♂️ man in lotus position
-1F9D8 200D 2642 ; minimally-qualified # 🧘♂ man in lotus position
-1F9D8 1F3FB 200D 2642 FE0F ; fully-qualified # 🧘🏻♂️ man in lotus position: light skin tone
-1F9D8 1F3FB 200D 2642 ; minimally-qualified # 🧘🏻♂ man in lotus position: light skin tone
-1F9D8 1F3FC 200D 2642 FE0F ; fully-qualified # 🧘🏼♂️ man in lotus position: medium-light skin tone
-1F9D8 1F3FC 200D 2642 ; minimally-qualified # 🧘🏼♂ man in lotus position: medium-light skin tone
-1F9D8 1F3FD 200D 2642 FE0F ; fully-qualified # 🧘🏽♂️ man in lotus position: medium skin tone
-1F9D8 1F3FD 200D 2642 ; minimally-qualified # 🧘🏽♂ man in lotus position: medium skin tone
-1F9D8 1F3FE 200D 2642 FE0F ; fully-qualified # 🧘🏾♂️ man in lotus position: medium-dark skin tone
-1F9D8 1F3FE 200D 2642 ; minimally-qualified # 🧘🏾♂ man in lotus position: medium-dark skin tone
-1F9D8 1F3FF 200D 2642 FE0F ; fully-qualified # 🧘🏿♂️ man in lotus position: dark skin tone
-1F9D8 1F3FF 200D 2642 ; minimally-qualified # 🧘🏿♂ man in lotus position: dark skin tone
-1F9D8 200D 2640 FE0F ; fully-qualified # 🧘♀️ woman in lotus position
-1F9D8 200D 2640 ; minimally-qualified # 🧘♀ woman in lotus position
-1F9D8 1F3FB 200D 2640 FE0F ; fully-qualified # 🧘🏻♀️ woman in lotus position: light skin tone
-1F9D8 1F3FB 200D 2640 ; minimally-qualified # 🧘🏻♀ woman in lotus position: light skin tone
-1F9D8 1F3FC 200D 2640 FE0F ; fully-qualified # 🧘🏼♀️ woman in lotus position: medium-light skin tone
-1F9D8 1F3FC 200D 2640 ; minimally-qualified # 🧘🏼♀ woman in lotus position: medium-light skin tone
-1F9D8 1F3FD 200D 2640 FE0F ; fully-qualified # 🧘🏽♀️ woman in lotus position: medium skin tone
-1F9D8 1F3FD 200D 2640 ; minimally-qualified # 🧘🏽♀ woman in lotus position: medium skin tone
-1F9D8 1F3FE 200D 2640 FE0F ; fully-qualified # 🧘🏾♀️ woman in lotus position: medium-dark skin tone
-1F9D8 1F3FE 200D 2640 ; minimally-qualified # 🧘🏾♀ woman in lotus position: medium-dark skin tone
-1F9D8 1F3FF 200D 2640 FE0F ; fully-qualified # 🧘🏿♀️ woman in lotus position: dark skin tone
-1F9D8 1F3FF 200D 2640 ; minimally-qualified # 🧘🏿♀ woman in lotus position: dark skin tone
-1F6C0 ; fully-qualified # 🛀 person taking bath
-1F6C0 1F3FB ; fully-qualified # 🛀🏻 person taking bath: light skin tone
-1F6C0 1F3FC ; fully-qualified # 🛀🏼 person taking bath: medium-light skin tone
-1F6C0 1F3FD ; fully-qualified # 🛀🏽 person taking bath: medium skin tone
-1F6C0 1F3FE ; fully-qualified # 🛀🏾 person taking bath: medium-dark skin tone
-1F6C0 1F3FF ; fully-qualified # 🛀🏿 person taking bath: dark skin tone
-1F6CC ; fully-qualified # 🛌 person in bed
-1F6CC 1F3FB ; fully-qualified # 🛌🏻 person in bed: light skin tone
-1F6CC 1F3FC ; fully-qualified # 🛌🏼 person in bed: medium-light skin tone
-1F6CC 1F3FD ; fully-qualified # 🛌🏽 person in bed: medium skin tone
-1F6CC 1F3FE ; fully-qualified # 🛌🏾 person in bed: medium-dark skin tone
-1F6CC 1F3FF ; fully-qualified # 🛌🏿 person in bed: dark skin tone
+1F9D8 ; fully-qualified # 🧘 E5.0 person in lotus position
+1F9D8 1F3FB ; fully-qualified # 🧘🏻 E5.0 person in lotus position: light skin tone
+1F9D8 1F3FC ; fully-qualified # 🧘🏼 E5.0 person in lotus position: medium-light skin tone
+1F9D8 1F3FD ; fully-qualified # 🧘🏽 E5.0 person in lotus position: medium skin tone
+1F9D8 1F3FE ; fully-qualified # 🧘🏾 E5.0 person in lotus position: medium-dark skin tone
+1F9D8 1F3FF ; fully-qualified # 🧘🏿 E5.0 person in lotus position: dark skin tone
+1F9D8 200D 2642 FE0F ; fully-qualified # 🧘♂️ E5.0 man in lotus position
+1F9D8 200D 2642 ; minimally-qualified # 🧘♂ E5.0 man in lotus position
+1F9D8 1F3FB 200D 2642 FE0F ; fully-qualified # 🧘🏻♂️ E5.0 man in lotus position: light skin tone
+1F9D8 1F3FB 200D 2642 ; minimally-qualified # 🧘🏻♂ E5.0 man in lotus position: light skin tone
+1F9D8 1F3FC 200D 2642 FE0F ; fully-qualified # 🧘🏼♂️ E5.0 man in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2642 ; minimally-qualified # 🧘🏼♂ E5.0 man in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2642 FE0F ; fully-qualified # 🧘🏽♂️ E5.0 man in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2642 ; minimally-qualified # 🧘🏽♂ E5.0 man in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2642 FE0F ; fully-qualified # 🧘🏾♂️ E5.0 man in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2642 ; minimally-qualified # 🧘🏾♂ E5.0 man in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2642 FE0F ; fully-qualified # 🧘🏿♂️ E5.0 man in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2642 ; minimally-qualified # 🧘🏿♂ E5.0 man in lotus position: dark skin tone
+1F9D8 200D 2640 FE0F ; fully-qualified # 🧘♀️ E5.0 woman in lotus position
+1F9D8 200D 2640 ; minimally-qualified # 🧘♀ E5.0 woman in lotus position
+1F9D8 1F3FB 200D 2640 FE0F ; fully-qualified # 🧘🏻♀️ E5.0 woman in lotus position: light skin tone
+1F9D8 1F3FB 200D 2640 ; minimally-qualified # 🧘🏻♀ E5.0 woman in lotus position: light skin tone
+1F9D8 1F3FC 200D 2640 FE0F ; fully-qualified # 🧘🏼♀️ E5.0 woman in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2640 ; minimally-qualified # 🧘🏼♀ E5.0 woman in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2640 FE0F ; fully-qualified # 🧘🏽♀️ E5.0 woman in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2640 ; minimally-qualified # 🧘🏽♀ E5.0 woman in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2640 FE0F ; fully-qualified # 🧘🏾♀️ E5.0 woman in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2640 ; minimally-qualified # 🧘🏾♀ E5.0 woman in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2640 FE0F ; fully-qualified # 🧘🏿♀️ E5.0 woman in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2640 ; minimally-qualified # 🧘🏿♀ E5.0 woman in lotus position: dark skin tone
+1F6C0 ; fully-qualified # 🛀 E0.6 person taking bath
+1F6C0 1F3FB ; fully-qualified # 🛀🏻 E1.0 person taking bath: light skin tone
+1F6C0 1F3FC ; fully-qualified # 🛀🏼 E1.0 person taking bath: medium-light skin tone
+1F6C0 1F3FD ; fully-qualified # 🛀🏽 E1.0 person taking bath: medium skin tone
+1F6C0 1F3FE ; fully-qualified # 🛀🏾 E1.0 person taking bath: medium-dark skin tone
+1F6C0 1F3FF ; fully-qualified # 🛀🏿 E1.0 person taking bath: dark skin tone
+1F6CC ; fully-qualified # 🛌 E1.0 person in bed
+1F6CC 1F3FB ; fully-qualified # 🛌🏻 E4.0 person in bed: light skin tone
+1F6CC 1F3FC ; fully-qualified # 🛌🏼 E4.0 person in bed: medium-light skin tone
+1F6CC 1F3FD ; fully-qualified # 🛌🏽 E4.0 person in bed: medium skin tone
+1F6CC 1F3FE ; fully-qualified # 🛌🏾 E4.0 person in bed: medium-dark skin tone
+1F6CC 1F3FF ; fully-qualified # 🛌🏿 E4.0 person in bed: dark skin tone
# subgroup: family
-1F9D1 200D 1F91D 200D 1F9D1 ; fully-qualified # 🧑🤝🧑 people holding hands
-1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏻🤝🧑🏻 people holding hands: light skin tone
-1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏻🤝🧑🏼 people holding hands: light skin tone, medium-light skin tone
-1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏻🤝🧑🏽 people holding hands: light skin tone, medium skin tone
-1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏻🤝🧑🏾 people holding hands: light skin tone, medium-dark skin tone
-1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏻🤝🧑🏿 people holding hands: light skin tone, dark skin tone
-1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏼🤝🧑🏻 people holding hands: medium-light skin tone, light skin tone
-1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏼🤝🧑🏼 people holding hands: medium-light skin tone
-1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏼🤝🧑🏽 people holding hands: medium-light skin tone, medium skin tone
-1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏼🤝🧑🏾 people holding hands: medium-light skin tone, medium-dark skin tone
-1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏼🤝🧑🏿 people holding hands: medium-light skin tone, dark skin tone
-1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏽🤝🧑🏻 people holding hands: medium skin tone, light skin tone
-1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏽🤝🧑🏼 people holding hands: medium skin tone, medium-light skin tone
-1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏽🤝🧑🏽 people holding hands: medium skin tone
-1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏽🤝🧑🏾 people holding hands: medium skin tone, medium-dark skin tone
-1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏽🤝🧑🏿 people holding hands: medium skin tone, dark skin tone
-1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏾🤝🧑🏻 people holding hands: medium-dark skin tone, light skin tone
-1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏾🤝🧑🏼 people holding hands: medium-dark skin tone, medium-light skin tone
-1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏾🤝🧑🏽 people holding hands: medium-dark skin tone, medium skin tone
-1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏾🤝🧑🏾 people holding hands: medium-dark skin tone
-1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏾🤝🧑🏿 people holding hands: medium-dark skin tone, dark skin tone
-1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏿🤝🧑🏻 people holding hands: dark skin tone, light skin tone
-1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏿🤝🧑🏼 people holding hands: dark skin tone, medium-light skin tone
-1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏿🤝🧑🏽 people holding hands: dark skin tone, medium skin tone
-1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏿🤝🧑🏾 people holding hands: dark skin tone, medium-dark skin tone
-1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏿🤝🧑🏿 people holding hands: dark skin tone
-1F46D ; fully-qualified # 👭 women holding hands
-1F46D 1F3FB ; fully-qualified # 👭🏻 women holding hands: light skin tone
-1F469 1F3FB 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏻🤝👩🏼 women holding hands: light skin tone, medium-light skin tone
-1F469 1F3FB 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏻🤝👩🏽 women holding hands: light skin tone, medium skin tone
-1F469 1F3FB 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏻🤝👩🏾 women holding hands: light skin tone, medium-dark skin tone
-1F469 1F3FB 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏻🤝👩🏿 women holding hands: light skin tone, dark skin tone
-1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏼🤝👩🏻 women holding hands: medium-light skin tone, light skin tone
-1F46D 1F3FC ; fully-qualified # 👭🏼 women holding hands: medium-light skin tone
-1F469 1F3FC 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏼🤝👩🏽 women holding hands: medium-light skin tone, medium skin tone
-1F469 1F3FC 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏼🤝👩🏾 women holding hands: medium-light skin tone, medium-dark skin tone
-1F469 1F3FC 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏼🤝👩🏿 women holding hands: medium-light skin tone, dark skin tone
-1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏽🤝👩🏻 women holding hands: medium skin tone, light skin tone
-1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏽🤝👩🏼 women holding hands: medium skin tone, medium-light skin tone
-1F46D 1F3FD ; fully-qualified # 👭🏽 women holding hands: medium skin tone
-1F469 1F3FD 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏽🤝👩🏾 women holding hands: medium skin tone, medium-dark skin tone
-1F469 1F3FD 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏽🤝👩🏿 women holding hands: medium skin tone, dark skin tone
-1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏾🤝👩🏻 women holding hands: medium-dark skin tone, light skin tone
-1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏾🤝👩🏼 women holding hands: medium-dark skin tone, medium-light skin tone
-1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏾🤝👩🏽 women holding hands: medium-dark skin tone, medium skin tone
-1F46D 1F3FE ; fully-qualified # 👭🏾 women holding hands: medium-dark skin tone
-1F469 1F3FE 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏾🤝👩🏿 women holding hands: medium-dark skin tone, dark skin tone
-1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏿🤝👩🏻 women holding hands: dark skin tone, light skin tone
-1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏿🤝👩🏼 women holding hands: dark skin tone, medium-light skin tone
-1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏿🤝👩🏽 women holding hands: dark skin tone, medium skin tone
-1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏿🤝👩🏾 women holding hands: dark skin tone, medium-dark skin tone
-1F46D 1F3FF ; fully-qualified # 👭🏿 women holding hands: dark skin tone
-1F46B ; fully-qualified # 👫 woman and man holding hands
-1F46B 1F3FB ; fully-qualified # 👫🏻 woman and man holding hands: light skin tone
-1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏻🤝👨🏼 woman and man holding hands: light skin tone, medium-light skin tone
-1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏻🤝👨🏽 woman and man holding hands: light skin tone, medium skin tone
-1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏻🤝👨🏾 woman and man holding hands: light skin tone, medium-dark skin tone
-1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏻🤝👨🏿 woman and man holding hands: light skin tone, dark skin tone
-1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏼🤝👨🏻 woman and man holding hands: medium-light skin tone, light skin tone
-1F46B 1F3FC ; fully-qualified # 👫🏼 woman and man holding hands: medium-light skin tone
-1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏼🤝👨🏽 woman and man holding hands: medium-light skin tone, medium skin tone
-1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏼🤝👨🏾 woman and man holding hands: medium-light skin tone, medium-dark skin tone
-1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏼🤝👨🏿 woman and man holding hands: medium-light skin tone, dark skin tone
-1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏽🤝👨🏻 woman and man holding hands: medium skin tone, light skin tone
-1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏽🤝👨🏼 woman and man holding hands: medium skin tone, medium-light skin tone
-1F46B 1F3FD ; fully-qualified # 👫🏽 woman and man holding hands: medium skin tone
-1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏽🤝👨🏾 woman and man holding hands: medium skin tone, medium-dark skin tone
-1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏽🤝👨🏿 woman and man holding hands: medium skin tone, dark skin tone
-1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏾🤝👨🏻 woman and man holding hands: medium-dark skin tone, light skin tone
-1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏾🤝👨🏼 woman and man holding hands: medium-dark skin tone, medium-light skin tone
-1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏾🤝👨🏽 woman and man holding hands: medium-dark skin tone, medium skin tone
-1F46B 1F3FE ; fully-qualified # 👫🏾 woman and man holding hands: medium-dark skin tone
-1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏾🤝👨🏿 woman and man holding hands: medium-dark skin tone, dark skin tone
-1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏿🤝👨🏻 woman and man holding hands: dark skin tone, light skin tone
-1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏿🤝👨🏼 woman and man holding hands: dark skin tone, medium-light skin tone
-1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏿🤝👨🏽 woman and man holding hands: dark skin tone, medium skin tone
-1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏿🤝👨🏾 woman and man holding hands: dark skin tone, medium-dark skin tone
-1F46B 1F3FF ; fully-qualified # 👫🏿 woman and man holding hands: dark skin tone
-1F46C ; fully-qualified # 👬 men holding hands
-1F46C 1F3FB ; fully-qualified # 👬🏻 men holding hands: light skin tone
-1F468 1F3FB 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏻🤝👨🏼 men holding hands: light skin tone, medium-light skin tone
-1F468 1F3FB 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏻🤝👨🏽 men holding hands: light skin tone, medium skin tone
-1F468 1F3FB 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏻🤝👨🏾 men holding hands: light skin tone, medium-dark skin tone
-1F468 1F3FB 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏻🤝👨🏿 men holding hands: light skin tone, dark skin tone
-1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏼🤝👨🏻 men holding hands: medium-light skin tone, light skin tone
-1F46C 1F3FC ; fully-qualified # 👬🏼 men holding hands: medium-light skin tone
-1F468 1F3FC 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏼🤝👨🏽 men holding hands: medium-light skin tone, medium skin tone
-1F468 1F3FC 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏼🤝👨🏾 men holding hands: medium-light skin tone, medium-dark skin tone
-1F468 1F3FC 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏼🤝👨🏿 men holding hands: medium-light skin tone, dark skin tone
-1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏽🤝👨🏻 men holding hands: medium skin tone, light skin tone
-1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏽🤝👨🏼 men holding hands: medium skin tone, medium-light skin tone
-1F46C 1F3FD ; fully-qualified # 👬🏽 men holding hands: medium skin tone
-1F468 1F3FD 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏽🤝👨🏾 men holding hands: medium skin tone, medium-dark skin tone
-1F468 1F3FD 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏽🤝👨🏿 men holding hands: medium skin tone, dark skin tone
-1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏾🤝👨🏻 men holding hands: medium-dark skin tone, light skin tone
-1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏾🤝👨🏼 men holding hands: medium-dark skin tone, medium-light skin tone
-1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏾🤝👨🏽 men holding hands: medium-dark skin tone, medium skin tone
-1F46C 1F3FE ; fully-qualified # 👬🏾 men holding hands: medium-dark skin tone
-1F468 1F3FE 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏾🤝👨🏿 men holding hands: medium-dark skin tone, dark skin tone
-1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏿🤝👨🏻 men holding hands: dark skin tone, light skin tone
-1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏿🤝👨🏼 men holding hands: dark skin tone, medium-light skin tone
-1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏿🤝👨🏽 men holding hands: dark skin tone, medium skin tone
-1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏿🤝👨🏾 men holding hands: dark skin tone, medium-dark skin tone
-1F46C 1F3FF ; fully-qualified # 👬🏿 men holding hands: dark skin tone
-1F48F ; fully-qualified # 💏 kiss
-1F469 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified # 👩❤️💋👨 kiss: woman, man
-1F469 200D 2764 200D 1F48B 200D 1F468 ; minimally-qualified # 👩❤💋👨 kiss: woman, man
-1F468 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified # 👨❤️💋👨 kiss: man, man
-1F468 200D 2764 200D 1F48B 200D 1F468 ; minimally-qualified # 👨❤💋👨 kiss: man, man
-1F469 200D 2764 FE0F 200D 1F48B 200D 1F469 ; fully-qualified # 👩❤️💋👩 kiss: woman, woman
-1F469 200D 2764 200D 1F48B 200D 1F469 ; minimally-qualified # 👩❤💋👩 kiss: woman, woman
-1F491 ; fully-qualified # 💑 couple with heart
-1F469 200D 2764 FE0F 200D 1F468 ; fully-qualified # 👩❤️👨 couple with heart: woman, man
-1F469 200D 2764 200D 1F468 ; minimally-qualified # 👩❤👨 couple with heart: woman, man
-1F468 200D 2764 FE0F 200D 1F468 ; fully-qualified # 👨❤️👨 couple with heart: man, man
-1F468 200D 2764 200D 1F468 ; minimally-qualified # 👨❤👨 couple with heart: man, man
-1F469 200D 2764 FE0F 200D 1F469 ; fully-qualified # 👩❤️👩 couple with heart: woman, woman
-1F469 200D 2764 200D 1F469 ; minimally-qualified # 👩❤👩 couple with heart: woman, woman
-1F46A ; fully-qualified # 👪 family
-1F468 200D 1F469 200D 1F466 ; fully-qualified # 👨👩👦 family: man, woman, boy
-1F468 200D 1F469 200D 1F467 ; fully-qualified # 👨👩👧 family: man, woman, girl
-1F468 200D 1F469 200D 1F467 200D 1F466 ; fully-qualified # 👨👩👧👦 family: man, woman, girl, boy
-1F468 200D 1F469 200D 1F466 200D 1F466 ; fully-qualified # 👨👩👦👦 family: man, woman, boy, boy
-1F468 200D 1F469 200D 1F467 200D 1F467 ; fully-qualified # 👨👩👧👧 family: man, woman, girl, girl
-1F468 200D 1F468 200D 1F466 ; fully-qualified # 👨👨👦 family: man, man, boy
-1F468 200D 1F468 200D 1F467 ; fully-qualified # 👨👨👧 family: man, man, girl
-1F468 200D 1F468 200D 1F467 200D 1F466 ; fully-qualified # 👨👨👧👦 family: man, man, girl, boy
-1F468 200D 1F468 200D 1F466 200D 1F466 ; fully-qualified # 👨👨👦👦 family: man, man, boy, boy
-1F468 200D 1F468 200D 1F467 200D 1F467 ; fully-qualified # 👨👨👧👧 family: man, man, girl, girl
-1F469 200D 1F469 200D 1F466 ; fully-qualified # 👩👩👦 family: woman, woman, boy
-1F469 200D 1F469 200D 1F467 ; fully-qualified # 👩👩👧 family: woman, woman, girl
-1F469 200D 1F469 200D 1F467 200D 1F466 ; fully-qualified # 👩👩👧👦 family: woman, woman, girl, boy
-1F469 200D 1F469 200D 1F466 200D 1F466 ; fully-qualified # 👩👩👦👦 family: woman, woman, boy, boy
-1F469 200D 1F469 200D 1F467 200D 1F467 ; fully-qualified # 👩👩👧👧 family: woman, woman, girl, girl
-1F468 200D 1F466 ; fully-qualified # 👨👦 family: man, boy
-1F468 200D 1F466 200D 1F466 ; fully-qualified # 👨👦👦 family: man, boy, boy
-1F468 200D 1F467 ; fully-qualified # 👨👧 family: man, girl
-1F468 200D 1F467 200D 1F466 ; fully-qualified # 👨👧👦 family: man, girl, boy
-1F468 200D 1F467 200D 1F467 ; fully-qualified # 👨👧👧 family: man, girl, girl
-1F469 200D 1F466 ; fully-qualified # 👩👦 family: woman, boy
-1F469 200D 1F466 200D 1F466 ; fully-qualified # 👩👦👦 family: woman, boy, boy
-1F469 200D 1F467 ; fully-qualified # 👩👧 family: woman, girl
-1F469 200D 1F467 200D 1F466 ; fully-qualified # 👩👧👦 family: woman, girl, boy
-1F469 200D 1F467 200D 1F467 ; fully-qualified # 👩👧👧 family: woman, girl, girl
+1F9D1 200D 1F91D 200D 1F9D1 ; fully-qualified # 🧑🤝🧑 E12.0 people holding hands
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏻🤝🧑🏻 E12.0 people holding hands: light skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏻🤝🧑🏼 E12.1 people holding hands: light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏻🤝🧑🏽 E12.1 people holding hands: light skin tone, medium skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏻🤝🧑🏾 E12.1 people holding hands: light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏻🤝🧑🏿 E12.1 people holding hands: light skin tone, dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏼🤝🧑🏻 E12.0 people holding hands: medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏼🤝🧑🏼 E12.0 people holding hands: medium-light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏼🤝🧑🏽 E12.1 people holding hands: medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏼🤝🧑🏾 E12.1 people holding hands: medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏼🤝🧑🏿 E12.1 people holding hands: medium-light skin tone, dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏽🤝🧑🏻 E12.0 people holding hands: medium skin tone, light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏽🤝🧑🏼 E12.0 people holding hands: medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏽🤝🧑🏽 E12.0 people holding hands: medium skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏽🤝🧑🏾 E12.1 people holding hands: medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏽🤝🧑🏿 E12.1 people holding hands: medium skin tone, dark skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏾🤝🧑🏻 E12.0 people holding hands: medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏾🤝🧑🏼 E12.0 people holding hands: medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏾🤝🧑🏽 E12.0 people holding hands: medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏾🤝🧑🏾 E12.0 people holding hands: medium-dark skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏾🤝🧑🏿 E12.1 people holding hands: medium-dark skin tone, dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB ; fully-qualified # 🧑🏿🤝🧑🏻 E12.0 people holding hands: dark skin tone, light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC ; fully-qualified # 🧑🏿🤝🧑🏼 E12.0 people holding hands: dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD ; fully-qualified # 🧑🏿🤝🧑🏽 E12.0 people holding hands: dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE ; fully-qualified # 🧑🏿🤝🧑🏾 E12.0 people holding hands: dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF ; fully-qualified # 🧑🏿🤝🧑🏿 E12.0 people holding hands: dark skin tone
+1F46D ; fully-qualified # 👭 E1.0 women holding hands
+1F46D 1F3FB ; fully-qualified # 👭🏻 E12.0 women holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏻🤝👩🏼 E12.1 women holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏻🤝👩🏽 E12.1 women holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏻🤝👩🏾 E12.1 women holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏻🤝👩🏿 E12.1 women holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏼🤝👩🏻 E12.0 women holding hands: medium-light skin tone, light skin tone
+1F46D 1F3FC ; fully-qualified # 👭🏼 E12.0 women holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏼🤝👩🏽 E12.1 women holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏼🤝👩🏾 E12.1 women holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏼🤝👩🏿 E12.1 women holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏽🤝👩🏻 E12.0 women holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏽🤝👩🏼 E12.0 women holding hands: medium skin tone, medium-light skin tone
+1F46D 1F3FD ; fully-qualified # 👭🏽 E12.0 women holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏽🤝👩🏾 E12.1 women holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏽🤝👩🏿 E12.1 women holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏾🤝👩🏻 E12.0 women holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏾🤝👩🏼 E12.0 women holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏾🤝👩🏽 E12.0 women holding hands: medium-dark skin tone, medium skin tone
+1F46D 1F3FE ; fully-qualified # 👭🏾 E12.0 women holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FF ; fully-qualified # 👩🏾🤝👩🏿 E12.1 women holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB ; fully-qualified # 👩🏿🤝👩🏻 E12.0 women holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC ; fully-qualified # 👩🏿🤝👩🏼 E12.0 women holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD ; fully-qualified # 👩🏿🤝👩🏽 E12.0 women holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE ; fully-qualified # 👩🏿🤝👩🏾 E12.0 women holding hands: dark skin tone, medium-dark skin tone
+1F46D 1F3FF ; fully-qualified # 👭🏿 E12.0 women holding hands: dark skin tone
+1F46B ; fully-qualified # 👫 E0.6 woman and man holding hands
+1F46B 1F3FB ; fully-qualified # 👫🏻 E12.0 woman and man holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏻🤝👨🏼 E12.0 woman and man holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏻🤝👨🏽 E12.0 woman and man holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏻🤝👨🏾 E12.0 woman and man holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏻🤝👨🏿 E12.0 woman and man holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏼🤝👨🏻 E12.0 woman and man holding hands: medium-light skin tone, light skin tone
+1F46B 1F3FC ; fully-qualified # 👫🏼 E12.0 woman and man holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏼🤝👨🏽 E12.0 woman and man holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏼🤝👨🏾 E12.0 woman and man holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏼🤝👨🏿 E12.0 woman and man holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏽🤝👨🏻 E12.0 woman and man holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏽🤝👨🏼 E12.0 woman and man holding hands: medium skin tone, medium-light skin tone
+1F46B 1F3FD ; fully-qualified # 👫🏽 E12.0 woman and man holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏽🤝👨🏾 E12.0 woman and man holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏽🤝👨🏿 E12.0 woman and man holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏾🤝👨🏻 E12.0 woman and man holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏾🤝👨🏼 E12.0 woman and man holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏾🤝👨🏽 E12.0 woman and man holding hands: medium-dark skin tone, medium skin tone
+1F46B 1F3FE ; fully-qualified # 👫🏾 E12.0 woman and man holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👩🏾🤝👨🏿 E12.0 woman and man holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👩🏿🤝👨🏻 E12.0 woman and man holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👩🏿🤝👨🏼 E12.0 woman and man holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👩🏿🤝👨🏽 E12.0 woman and man holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👩🏿🤝👨🏾 E12.0 woman and man holding hands: dark skin tone, medium-dark skin tone
+1F46B 1F3FF ; fully-qualified # 👫🏿 E12.0 woman and man holding hands: dark skin tone
+1F46C ; fully-qualified # 👬 E1.0 men holding hands
+1F46C 1F3FB ; fully-qualified # 👬🏻 E12.0 men holding hands: light skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏻🤝👨🏼 E12.1 men holding hands: light skin tone, medium-light skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏻🤝👨🏽 E12.1 men holding hands: light skin tone, medium skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏻🤝👨🏾 E12.1 men holding hands: light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏻🤝👨🏿 E12.1 men holding hands: light skin tone, dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏼🤝👨🏻 E12.0 men holding hands: medium-light skin tone, light skin tone
+1F46C 1F3FC ; fully-qualified # 👬🏼 E12.0 men holding hands: medium-light skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏼🤝👨🏽 E12.1 men holding hands: medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏼🤝👨🏾 E12.1 men holding hands: medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏼🤝👨🏿 E12.1 men holding hands: medium-light skin tone, dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏽🤝👨🏻 E12.0 men holding hands: medium skin tone, light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏽🤝👨🏼 E12.0 men holding hands: medium skin tone, medium-light skin tone
+1F46C 1F3FD ; fully-qualified # 👬🏽 E12.0 men holding hands: medium skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏽🤝👨🏾 E12.1 men holding hands: medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏽🤝👨🏿 E12.1 men holding hands: medium skin tone, dark skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏾🤝👨🏻 E12.0 men holding hands: medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏾🤝👨🏼 E12.0 men holding hands: medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏾🤝👨🏽 E12.0 men holding hands: medium-dark skin tone, medium skin tone
+1F46C 1F3FE ; fully-qualified # 👬🏾 E12.0 men holding hands: medium-dark skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FF ; fully-qualified # 👨🏾🤝👨🏿 E12.1 men holding hands: medium-dark skin tone, dark skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB ; fully-qualified # 👨🏿🤝👨🏻 E12.0 men holding hands: dark skin tone, light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC ; fully-qualified # 👨🏿🤝👨🏼 E12.0 men holding hands: dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD ; fully-qualified # 👨🏿🤝👨🏽 E12.0 men holding hands: dark skin tone, medium skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE ; fully-qualified # 👨🏿🤝👨🏾 E12.0 men holding hands: dark skin tone, medium-dark skin tone
+1F46C 1F3FF ; fully-qualified # 👬🏿 E12.0 men holding hands: dark skin tone
+1F48F ; fully-qualified # 💏 E0.6 kiss
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified # 👩❤️💋👨 E2.0 kiss: woman, man
+1F469 200D 2764 200D 1F48B 200D 1F468 ; minimally-qualified # 👩❤💋👨 E2.0 kiss: woman, man
+1F468 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified # 👨❤️💋👨 E2.0 kiss: man, man
+1F468 200D 2764 200D 1F48B 200D 1F468 ; minimally-qualified # 👨❤💋👨 E2.0 kiss: man, man
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F469 ; fully-qualified # 👩❤️💋👩 E2.0 kiss: woman, woman
+1F469 200D 2764 200D 1F48B 200D 1F469 ; minimally-qualified # 👩❤💋👩 E2.0 kiss: woman, woman
+1F491 ; fully-qualified # 💑 E0.6 couple with heart
+1F469 200D 2764 FE0F 200D 1F468 ; fully-qualified # 👩❤️👨 E2.0 couple with heart: woman, man
+1F469 200D 2764 200D 1F468 ; minimally-qualified # 👩❤👨 E2.0 couple with heart: woman, man
+1F468 200D 2764 FE0F 200D 1F468 ; fully-qualified # 👨❤️👨 E2.0 couple with heart: man, man
+1F468 200D 2764 200D 1F468 ; minimally-qualified # 👨❤👨 E2.0 couple with heart: man, man
+1F469 200D 2764 FE0F 200D 1F469 ; fully-qualified # 👩❤️👩 E2.0 couple with heart: woman, woman
+1F469 200D 2764 200D 1F469 ; minimally-qualified # 👩❤👩 E2.0 couple with heart: woman, woman
+1F46A ; fully-qualified # 👪 E0.6 family
+1F468 200D 1F469 200D 1F466 ; fully-qualified # 👨👩👦 E2.0 family: man, woman, boy
+1F468 200D 1F469 200D 1F467 ; fully-qualified # 👨👩👧 E2.0 family: man, woman, girl
+1F468 200D 1F469 200D 1F467 200D 1F466 ; fully-qualified # 👨👩👧👦 E2.0 family: man, woman, girl, boy
+1F468 200D 1F469 200D 1F466 200D 1F466 ; fully-qualified # 👨👩👦👦 E2.0 family: man, woman, boy, boy
+1F468 200D 1F469 200D 1F467 200D 1F467 ; fully-qualified # 👨👩👧👧 E2.0 family: man, woman, girl, girl
+1F468 200D 1F468 200D 1F466 ; fully-qualified # 👨👨👦 E2.0 family: man, man, boy
+1F468 200D 1F468 200D 1F467 ; fully-qualified # 👨👨👧 E2.0 family: man, man, girl
+1F468 200D 1F468 200D 1F467 200D 1F466 ; fully-qualified # 👨👨👧👦 E2.0 family: man, man, girl, boy
+1F468 200D 1F468 200D 1F466 200D 1F466 ; fully-qualified # 👨👨👦👦 E2.0 family: man, man, boy, boy
+1F468 200D 1F468 200D 1F467 200D 1F467 ; fully-qualified # 👨👨👧👧 E2.0 family: man, man, girl, girl
+1F469 200D 1F469 200D 1F466 ; fully-qualified # 👩👩👦 E2.0 family: woman, woman, boy
+1F469 200D 1F469 200D 1F467 ; fully-qualified # 👩👩👧 E2.0 family: woman, woman, girl
+1F469 200D 1F469 200D 1F467 200D 1F466 ; fully-qualified # 👩👩👧👦 E2.0 family: woman, woman, girl, boy
+1F469 200D 1F469 200D 1F466 200D 1F466 ; fully-qualified # 👩👩👦👦 E2.0 family: woman, woman, boy, boy
+1F469 200D 1F469 200D 1F467 200D 1F467 ; fully-qualified # 👩👩👧👧 E2.0 family: woman, woman, girl, girl
+1F468 200D 1F466 ; fully-qualified # 👨👦 E4.0 family: man, boy
+1F468 200D 1F466 200D 1F466 ; fully-qualified # 👨👦👦 E4.0 family: man, boy, boy
+1F468 200D 1F467 ; fully-qualified # 👨👧 E4.0 family: man, girl
+1F468 200D 1F467 200D 1F466 ; fully-qualified # 👨👧👦 E4.0 family: man, girl, boy
+1F468 200D 1F467 200D 1F467 ; fully-qualified # 👨👧👧 E4.0 family: man, girl, girl
+1F469 200D 1F466 ; fully-qualified # 👩👦 E4.0 family: woman, boy
+1F469 200D 1F466 200D 1F466 ; fully-qualified # 👩👦👦 E4.0 family: woman, boy, boy
+1F469 200D 1F467 ; fully-qualified # 👩👧 E4.0 family: woman, girl
+1F469 200D 1F467 200D 1F466 ; fully-qualified # 👩👧👦 E4.0 family: woman, girl, boy
+1F469 200D 1F467 200D 1F467 ; fully-qualified # 👩👧👧 E4.0 family: woman, girl, girl
# subgroup: person-symbol
-1F5E3 FE0F ; fully-qualified # 🗣️ speaking head
-1F5E3 ; unqualified # 🗣 speaking head
-1F464 ; fully-qualified # 👤 bust in silhouette
-1F465 ; fully-qualified # 👥 busts in silhouette
-1FAC2 ; fully-qualified # 🫂 people hugging
-1F463 ; fully-qualified # 👣 footprints
+1F5E3 FE0F ; fully-qualified # 🗣️ E0.7 speaking head
+1F5E3 ; unqualified # 🗣 E0.7 speaking head
+1F464 ; fully-qualified # 👤 E0.6 bust in silhouette
+1F465 ; fully-qualified # 👥 E1.0 busts in silhouette
+1FAC2 ; fully-qualified # 🫂 E13.0 people hugging
+1F463 ; fully-qualified # 👣 E0.6 footprints
+
+# People & Body subtotal: 2485
+# People & Body subtotal: 490 w/o modifiers
# group: Component
# subgroup: skin-tone
-1F3FB ; fully-qualified # 🏻 light skin tone
-1F3FC ; fully-qualified # 🏼 medium-light skin tone
-1F3FD ; fully-qualified # 🏽 medium skin tone
-1F3FE ; fully-qualified # 🏾 medium-dark skin tone
-1F3FF ; fully-qualified # 🏿 dark skin tone
+1F3FB ; component # 🏻 E1.0 light skin tone
+1F3FC ; component # 🏼 E1.0 medium-light skin tone
+1F3FD ; component # 🏽 E1.0 medium skin tone
+1F3FE ; component # 🏾 E1.0 medium-dark skin tone
+1F3FF ; component # 🏿 E1.0 dark skin tone
# subgroup: hair-style
-1F9B0 ; fully-qualified # 🦰 red hair
-1F9B1 ; fully-qualified # 🦱 curly hair
-1F9B3 ; fully-qualified # 🦳 white hair
-1F9B2 ; fully-qualified # 🦲 bald
+1F9B0 ; component # 🦰 E11.0 red hair
+1F9B1 ; component # 🦱 E11.0 curly hair
+1F9B3 ; component # 🦳 E11.0 white hair
+1F9B2 ; component # 🦲 E11.0 bald
+
+# Component subtotal: 9
+# Component subtotal: 4 w/o modifiers
# group: Animals & Nature
# subgroup: animal-mammal
-1F435 ; fully-qualified # 🐵 monkey face
-1F412 ; fully-qualified # 🐒 monkey
-1F98D ; fully-qualified # 🦍 gorilla
-1F9A7 ; fully-qualified # 🦧 orangutan
-1F436 ; fully-qualified # 🐶 dog face
-1F415 ; fully-qualified # 🐕 dog
-1F9AE ; fully-qualified # 🦮 guide dog
-1F415 200D 1F9BA ; fully-qualified # 🐕🦺 service dog
-1F429 ; fully-qualified # 🐩 poodle
-1F43A ; fully-qualified # 🐺 wolf
-1F98A ; fully-qualified # 🦊 fox
-1F99D ; fully-qualified # 🦝 raccoon
-1F431 ; fully-qualified # 🐱 cat face
-1F408 ; fully-qualified # 🐈 cat
-1F408 200D 2B1B ; fully-qualified # 🐈⬛ black cat
-1F981 ; fully-qualified # 🦁 lion
-1F42F ; fully-qualified # 🐯 tiger face
-1F405 ; fully-qualified # 🐅 tiger
-1F406 ; fully-qualified # 🐆 leopard
-1F434 ; fully-qualified # 🐴 horse face
-1F40E ; fully-qualified # 🐎 horse
-1F984 ; fully-qualified # 🦄 unicorn
-1F993 ; fully-qualified # 🦓 zebra
-1F98C ; fully-qualified # 🦌 deer
-1F9AC ; fully-qualified # 🦬 bison
-1F42E ; fully-qualified # 🐮 cow face
-1F402 ; fully-qualified # 🐂 ox
-1F403 ; fully-qualified # 🐃 water buffalo
-1F404 ; fully-qualified # 🐄 cow
-1F437 ; fully-qualified # 🐷 pig face
-1F416 ; fully-qualified # 🐖 pig
-1F417 ; fully-qualified # 🐗 boar
-1F43D ; fully-qualified # 🐽 pig nose
-1F40F ; fully-qualified # 🐏 ram
-1F411 ; fully-qualified # 🐑 ewe
-1F410 ; fully-qualified # 🐐 goat
-1F42A ; fully-qualified # 🐪 camel
-1F42B ; fully-qualified # 🐫 two-hump camel
-1F999 ; fully-qualified # 🦙 llama
-1F992 ; fully-qualified # 🦒 giraffe
-1F418 ; fully-qualified # 🐘 elephant
-1F9A3 ; fully-qualified # 🦣 mammoth
-1F98F ; fully-qualified # 🦏 rhinoceros
-1F99B ; fully-qualified # 🦛 hippopotamus
-1F42D ; fully-qualified # 🐭 mouse face
-1F401 ; fully-qualified # 🐁 mouse
-1F400 ; fully-qualified # 🐀 rat
-1F439 ; fully-qualified # 🐹 hamster
-1F430 ; fully-qualified # 🐰 rabbit face
-1F407 ; fully-qualified # 🐇 rabbit
-1F43F FE0F ; fully-qualified # 🐿️ chipmunk
-1F43F ; unqualified # 🐿 chipmunk
-1F9AB ; fully-qualified # 🦫 beaver
-1F994 ; fully-qualified # 🦔 hedgehog
-1F987 ; fully-qualified # 🦇 bat
-1F43B ; fully-qualified # 🐻 bear
-1F43B 200D 2744 FE0F ; fully-qualified # 🐻❄️ polar bear
-1F43B 200D 2744 ; minimally-qualified # 🐻❄ polar bear
-1F428 ; fully-qualified # 🐨 koala
-1F43C ; fully-qualified # 🐼 panda
-1F9A5 ; fully-qualified # 🦥 sloth
-1F9A6 ; fully-qualified # 🦦 otter
-1F9A8 ; fully-qualified # 🦨 skunk
-1F998 ; fully-qualified # 🦘 kangaroo
-1F9A1 ; fully-qualified # 🦡 badger
-1F43E ; fully-qualified # 🐾 paw prints
+1F435 ; fully-qualified # 🐵 E0.6 monkey face
+1F412 ; fully-qualified # 🐒 E0.6 monkey
+1F98D ; fully-qualified # 🦍 E3.0 gorilla
+1F9A7 ; fully-qualified # 🦧 E12.0 orangutan
+1F436 ; fully-qualified # 🐶 E0.6 dog face
+1F415 ; fully-qualified # 🐕 E0.7 dog
+1F9AE ; fully-qualified # 🦮 E12.0 guide dog
+1F415 200D 1F9BA ; fully-qualified # 🐕🦺 E12.0 service dog
+1F429 ; fully-qualified # 🐩 E0.6 poodle
+1F43A ; fully-qualified # 🐺 E0.6 wolf
+1F98A ; fully-qualified # 🦊 E3.0 fox
+1F99D ; fully-qualified # 🦝 E11.0 raccoon
+1F431 ; fully-qualified # 🐱 E0.6 cat face
+1F408 ; fully-qualified # 🐈 E0.7 cat
+1F408 200D 2B1B ; fully-qualified # 🐈⬛ E13.0 black cat
+1F981 ; fully-qualified # 🦁 E1.0 lion
+1F42F ; fully-qualified # 🐯 E0.6 tiger face
+1F405 ; fully-qualified # 🐅 E1.0 tiger
+1F406 ; fully-qualified # 🐆 E1.0 leopard
+1F434 ; fully-qualified # 🐴 E0.6 horse face
+1F40E ; fully-qualified # 🐎 E0.6 horse
+1F984 ; fully-qualified # 🦄 E1.0 unicorn
+1F993 ; fully-qualified # 🦓 E5.0 zebra
+1F98C ; fully-qualified # 🦌 E3.0 deer
+1F9AC ; fully-qualified # 🦬 E13.0 bison
+1F42E ; fully-qualified # 🐮 E0.6 cow face
+1F402 ; fully-qualified # 🐂 E1.0 ox
+1F403 ; fully-qualified # 🐃 E1.0 water buffalo
+1F404 ; fully-qualified # 🐄 E1.0 cow
+1F437 ; fully-qualified # 🐷 E0.6 pig face
+1F416 ; fully-qualified # 🐖 E1.0 pig
+1F417 ; fully-qualified # 🐗 E0.6 boar
+1F43D ; fully-qualified # 🐽 E0.6 pig nose
+1F40F ; fully-qualified # 🐏 E1.0 ram
+1F411 ; fully-qualified # 🐑 E0.6 ewe
+1F410 ; fully-qualified # 🐐 E1.0 goat
+1F42A ; fully-qualified # 🐪 E1.0 camel
+1F42B ; fully-qualified # 🐫 E0.6 two-hump camel
+1F999 ; fully-qualified # 🦙 E11.0 llama
+1F992 ; fully-qualified # 🦒 E5.0 giraffe
+1F418 ; fully-qualified # 🐘 E0.6 elephant
+1F9A3 ; fully-qualified # 🦣 E13.0 mammoth
+1F98F ; fully-qualified # 🦏 E3.0 rhinoceros
+1F99B ; fully-qualified # 🦛 E11.0 hippopotamus
+1F42D ; fully-qualified # 🐭 E0.6 mouse face
+1F401 ; fully-qualified # 🐁 E1.0 mouse
+1F400 ; fully-qualified # 🐀 E1.0 rat
+1F439 ; fully-qualified # 🐹 E0.6 hamster
+1F430 ; fully-qualified # 🐰 E0.6 rabbit face
+1F407 ; fully-qualified # 🐇 E1.0 rabbit
+1F43F FE0F ; fully-qualified # 🐿️ E0.7 chipmunk
+1F43F ; unqualified # 🐿 E0.7 chipmunk
+1F9AB ; fully-qualified # 🦫 E13.0 beaver
+1F994 ; fully-qualified # 🦔 E5.0 hedgehog
+1F987 ; fully-qualified # 🦇 E3.0 bat
+1F43B ; fully-qualified # 🐻 E0.6 bear
+1F43B 200D 2744 FE0F ; fully-qualified # 🐻❄️ E13.0 polar bear
+1F43B 200D 2744 ; minimally-qualified # 🐻❄ E13.0 polar bear
+1F428 ; fully-qualified # 🐨 E0.6 koala
+1F43C ; fully-qualified # 🐼 E0.6 panda
+1F9A5 ; fully-qualified # 🦥 E12.0 sloth
+1F9A6 ; fully-qualified # 🦦 E12.0 otter
+1F9A8 ; fully-qualified # 🦨 E12.0 skunk
+1F998 ; fully-qualified # 🦘 E11.0 kangaroo
+1F9A1 ; fully-qualified # 🦡 E11.0 badger
+1F43E ; fully-qualified # 🐾 E0.6 paw prints
# subgroup: animal-bird
-1F983 ; fully-qualified # 🦃 turkey
-1F414 ; fully-qualified # 🐔 chicken
-1F413 ; fully-qualified # 🐓 rooster
-1F423 ; fully-qualified # 🐣 hatching chick
-1F424 ; fully-qualified # 🐤 baby chick
-1F425 ; fully-qualified # 🐥 front-facing baby chick
-1F426 ; fully-qualified # 🐦 bird
-1F427 ; fully-qualified # 🐧 penguin
-1F54A FE0F ; fully-qualified # 🕊️ dove
-1F54A ; unqualified # 🕊 dove
-1F985 ; fully-qualified # 🦅 eagle
-1F986 ; fully-qualified # 🦆 duck
-1F9A2 ; fully-qualified # 🦢 swan
-1F989 ; fully-qualified # 🦉 owl
-1F9A4 ; fully-qualified # 🦤 dodo
-1FAB6 ; fully-qualified # 🪶 feather
-1F9A9 ; fully-qualified # 🦩 flamingo
-1F99A ; fully-qualified # 🦚 peacock
-1F99C ; fully-qualified # 🦜 parrot
+1F983 ; fully-qualified # 🦃 E1.0 turkey
+1F414 ; fully-qualified # 🐔 E0.6 chicken
+1F413 ; fully-qualified # 🐓 E1.0 rooster
+1F423 ; fully-qualified # 🐣 E0.6 hatching chick
+1F424 ; fully-qualified # 🐤 E0.6 baby chick
+1F425 ; fully-qualified # 🐥 E0.6 front-facing baby chick
+1F426 ; fully-qualified # 🐦 E0.6 bird
+1F427 ; fully-qualified # 🐧 E0.6 penguin
+1F54A FE0F ; fully-qualified # 🕊️ E0.7 dove
+1F54A ; unqualified # 🕊 E0.7 dove
+1F985 ; fully-qualified # 🦅 E3.0 eagle
+1F986 ; fully-qualified # 🦆 E3.0 duck
+1F9A2 ; fully-qualified # 🦢 E11.0 swan
+1F989 ; fully-qualified # 🦉 E3.0 owl
+1F9A4 ; fully-qualified # 🦤 E13.0 dodo
+1FAB6 ; fully-qualified # 🪶 E13.0 feather
+1F9A9 ; fully-qualified # 🦩 E12.0 flamingo
+1F99A ; fully-qualified # 🦚 E11.0 peacock
+1F99C ; fully-qualified # 🦜 E11.0 parrot
# subgroup: animal-amphibian
-1F438 ; fully-qualified # 🐸 frog
+1F438 ; fully-qualified # 🐸 E0.6 frog
# subgroup: animal-reptile
-1F40A ; fully-qualified # 🐊 crocodile
-1F422 ; fully-qualified # 🐢 turtle
-1F98E ; fully-qualified # 🦎 lizard
-1F40D ; fully-qualified # 🐍 snake
-1F432 ; fully-qualified # 🐲 dragon face
-1F409 ; fully-qualified # 🐉 dragon
-1F995 ; fully-qualified # 🦕 sauropod
-1F996 ; fully-qualified # 🦖 T-Rex
+1F40A ; fully-qualified # 🐊 E1.0 crocodile
+1F422 ; fully-qualified # 🐢 E0.6 turtle
+1F98E ; fully-qualified # 🦎 E3.0 lizard
+1F40D ; fully-qualified # 🐍 E0.6 snake
+1F432 ; fully-qualified # 🐲 E0.6 dragon face
+1F409 ; fully-qualified # 🐉 E1.0 dragon
+1F995 ; fully-qualified # 🦕 E5.0 sauropod
+1F996 ; fully-qualified # 🦖 E5.0 T-Rex
# subgroup: animal-marine
-1F433 ; fully-qualified # 🐳 spouting whale
-1F40B ; fully-qualified # 🐋 whale
-1F42C ; fully-qualified # 🐬 dolphin
-1F9AD ; fully-qualified # 🦭 seal
-1F41F ; fully-qualified # 🐟 fish
-1F420 ; fully-qualified # 🐠 tropical fish
-1F421 ; fully-qualified # 🐡 blowfish
-1F988 ; fully-qualified # 🦈 shark
-1F419 ; fully-qualified # 🐙 octopus
-1F41A ; fully-qualified # 🐚 spiral shell
+1F433 ; fully-qualified # 🐳 E0.6 spouting whale
+1F40B ; fully-qualified # 🐋 E1.0 whale
+1F42C ; fully-qualified # 🐬 E0.6 dolphin
+1F9AD ; fully-qualified # 🦭 E13.0 seal
+1F41F ; fully-qualified # 🐟 E0.6 fish
+1F420 ; fully-qualified # 🐠 E0.6 tropical fish
+1F421 ; fully-qualified # 🐡 E0.6 blowfish
+1F988 ; fully-qualified # 🦈 E3.0 shark
+1F419 ; fully-qualified # 🐙 E0.6 octopus
+1F41A ; fully-qualified # 🐚 E0.6 spiral shell
# subgroup: animal-bug
-1F40C ; fully-qualified # 🐌 snail
-1F98B ; fully-qualified # 🦋 butterfly
-1F41B ; fully-qualified # 🐛 bug
-1F41C ; fully-qualified # 🐜 ant
-1F41D ; fully-qualified # 🐝 honeybee
-1FAB2 ; fully-qualified # 🪲 beetle
-1F41E ; fully-qualified # 🐞 lady beetle
-1F997 ; fully-qualified # 🦗 cricket
-1FAB3 ; fully-qualified # 🪳 cockroach
-1F577 FE0F ; fully-qualified # 🕷️ spider
-1F577 ; unqualified # 🕷 spider
-1F578 FE0F ; fully-qualified # 🕸️ spider web
-1F578 ; unqualified # 🕸 spider web
-1F982 ; fully-qualified # 🦂 scorpion
-1F99F ; fully-qualified # 🦟 mosquito
-1FAB0 ; fully-qualified # 🪰 fly
-1FAB1 ; fully-qualified # 🪱 worm
-1F9A0 ; fully-qualified # 🦠 microbe
+1F40C ; fully-qualified # 🐌 E0.6 snail
+1F98B ; fully-qualified # 🦋 E3.0 butterfly
+1F41B ; fully-qualified # 🐛 E0.6 bug
+1F41C ; fully-qualified # 🐜 E0.6 ant
+1F41D ; fully-qualified # 🐝 E0.6 honeybee
+1FAB2 ; fully-qualified # 🪲 E13.0 beetle
+1F41E ; fully-qualified # 🐞 E0.6 lady beetle
+1F997 ; fully-qualified # 🦗 E5.0 cricket
+1FAB3 ; fully-qualified # 🪳 E13.0 cockroach
+1F577 FE0F ; fully-qualified # 🕷️ E0.7 spider
+1F577 ; unqualified # 🕷 E0.7 spider
+1F578 FE0F ; fully-qualified # 🕸️ E0.7 spider web
+1F578 ; unqualified # 🕸 E0.7 spider web
+1F982 ; fully-qualified # 🦂 E1.0 scorpion
+1F99F ; fully-qualified # 🦟 E11.0 mosquito
+1FAB0 ; fully-qualified # 🪰 E13.0 fly
+1FAB1 ; fully-qualified # 🪱 E13.0 worm
+1F9A0 ; fully-qualified # 🦠 E11.0 microbe
# subgroup: plant-flower
-1F490 ; fully-qualified # 💐 bouquet
-1F338 ; fully-qualified # 🌸 cherry blossom
-1F4AE ; fully-qualified # 💮 white flower
-1F3F5 FE0F ; fully-qualified # 🏵️ rosette
-1F3F5 ; unqualified # 🏵 rosette
-1F339 ; fully-qualified # 🌹 rose
-1F940 ; fully-qualified # 🥀 wilted flower
-1F33A ; fully-qualified # 🌺 hibiscus
-1F33B ; fully-qualified # 🌻 sunflower
-1F33C ; fully-qualified # 🌼 blossom
-1F337 ; fully-qualified # 🌷 tulip
+1F490 ; fully-qualified # 💐 E0.6 bouquet
+1F338 ; fully-qualified # 🌸 E0.6 cherry blossom
+1F4AE ; fully-qualified # 💮 E0.6 white flower
+1F3F5 FE0F ; fully-qualified # 🏵️ E0.7 rosette
+1F3F5 ; unqualified # 🏵 E0.7 rosette
+1F339 ; fully-qualified # 🌹 E0.6 rose
+1F940 ; fully-qualified # 🥀 E3.0 wilted flower
+1F33A ; fully-qualified # 🌺 E0.6 hibiscus
+1F33B ; fully-qualified # 🌻 E0.6 sunflower
+1F33C ; fully-qualified # 🌼 E0.6 blossom
+1F337 ; fully-qualified # 🌷 E0.6 tulip
# subgroup: plant-other
-1F331 ; fully-qualified # 🌱 seedling
-1FAB4 ; fully-qualified # 🪴 potted plant
-1F332 ; fully-qualified # 🌲 evergreen tree
-1F333 ; fully-qualified # 🌳 deciduous tree
-1F334 ; fully-qualified # 🌴 palm tree
-1F335 ; fully-qualified # 🌵 cactus
-1F33E ; fully-qualified # 🌾 sheaf of rice
-1F33F ; fully-qualified # 🌿 herb
-2618 FE0F ; fully-qualified # ☘️ shamrock
-2618 ; unqualified # ☘ shamrock
-1F340 ; fully-qualified # 🍀 four leaf clover
-1F341 ; fully-qualified # 🍁 maple leaf
-1F342 ; fully-qualified # 🍂 fallen leaf
-1F343 ; fully-qualified # 🍃 leaf fluttering in wind
+1F331 ; fully-qualified # 🌱 E0.6 seedling
+1FAB4 ; fully-qualified # 🪴 E13.0 potted plant
+1F332 ; fully-qualified # 🌲 E1.0 evergreen tree
+1F333 ; fully-qualified # 🌳 E1.0 deciduous tree
+1F334 ; fully-qualified # 🌴 E0.6 palm tree
+1F335 ; fully-qualified # 🌵 E0.6 cactus
+1F33E ; fully-qualified # 🌾 E0.6 sheaf of rice
+1F33F ; fully-qualified # 🌿 E0.6 herb
+2618 FE0F ; fully-qualified # ☘️ E1.0 shamrock
+2618 ; unqualified # ☘ E1.0 shamrock
+1F340 ; fully-qualified # 🍀 E0.6 four leaf clover
+1F341 ; fully-qualified # 🍁 E0.6 maple leaf
+1F342 ; fully-qualified # 🍂 E0.6 fallen leaf
+1F343 ; fully-qualified # 🍃 E0.6 leaf fluttering in wind
+
+# Animals & Nature subtotal: 147
+# Animals & Nature subtotal: 147 w/o modifiers
# group: Food & Drink
# subgroup: food-fruit
-1F347 ; fully-qualified # 🍇 grapes
-1F348 ; fully-qualified # 🍈 melon
-1F349 ; fully-qualified # 🍉 watermelon
-1F34A ; fully-qualified # 🍊 tangerine
-1F34B ; fully-qualified # 🍋 lemon
-1F34C ; fully-qualified # 🍌 banana
-1F34D ; fully-qualified # 🍍 pineapple
-1F96D ; fully-qualified # 🥭 mango
-1F34E ; fully-qualified # 🍎 red apple
-1F34F ; fully-qualified # 🍏 green apple
-1F350 ; fully-qualified # 🍐 pear
-1F351 ; fully-qualified # 🍑 peach
-1F352 ; fully-qualified # 🍒 cherries
-1F353 ; fully-qualified # 🍓 strawberry
-1FAD0 ; fully-qualified # 🫐 blueberries
-1F95D ; fully-qualified # 🥝 kiwi fruit
-1F345 ; fully-qualified # 🍅 tomato
-1FAD2 ; fully-qualified # 🫒 olive
-1F965 ; fully-qualified # 🥥 coconut
+1F347 ; fully-qualified # 🍇 E0.6 grapes
+1F348 ; fully-qualified # 🍈 E0.6 melon
+1F349 ; fully-qualified # 🍉 E0.6 watermelon
+1F34A ; fully-qualified # 🍊 E0.6 tangerine
+1F34B ; fully-qualified # 🍋 E1.0 lemon
+1F34C ; fully-qualified # 🍌 E0.6 banana
+1F34D ; fully-qualified # 🍍 E0.6 pineapple
+1F96D ; fully-qualified # 🥭 E11.0 mango
+1F34E ; fully-qualified # 🍎 E0.6 red apple
+1F34F ; fully-qualified # 🍏 E0.6 green apple
+1F350 ; fully-qualified # 🍐 E1.0 pear
+1F351 ; fully-qualified # 🍑 E0.6 peach
+1F352 ; fully-qualified # 🍒 E0.6 cherries
+1F353 ; fully-qualified # 🍓 E0.6 strawberry
+1FAD0 ; fully-qualified # 🫐 E13.0 blueberries
+1F95D ; fully-qualified # 🥝 E3.0 kiwi fruit
+1F345 ; fully-qualified # 🍅 E0.6 tomato
+1FAD2 ; fully-qualified # 🫒 E13.0 olive
+1F965 ; fully-qualified # 🥥 E5.0 coconut
# subgroup: food-vegetable
-1F951 ; fully-qualified # 🥑 avocado
-1F346 ; fully-qualified # 🍆 eggplant
-1F954 ; fully-qualified # 🥔 potato
-1F955 ; fully-qualified # 🥕 carrot
-1F33D ; fully-qualified # 🌽 ear of corn
-1F336 FE0F ; fully-qualified # 🌶️ hot pepper
-1F336 ; unqualified # 🌶 hot pepper
-1FAD1 ; fully-qualified # 🫑 bell pepper
-1F952 ; fully-qualified # 🥒 cucumber
-1F96C ; fully-qualified # 🥬 leafy green
-1F966 ; fully-qualified # 🥦 broccoli
-1F9C4 ; fully-qualified # 🧄 garlic
-1F9C5 ; fully-qualified # 🧅 onion
-1F344 ; fully-qualified # 🍄 mushroom
-1F95C ; fully-qualified # 🥜 peanuts
-1F330 ; fully-qualified # 🌰 chestnut
+1F951 ; fully-qualified # 🥑 E3.0 avocado
+1F346 ; fully-qualified # 🍆 E0.6 eggplant
+1F954 ; fully-qualified # 🥔 E3.0 potato
+1F955 ; fully-qualified # 🥕 E3.0 carrot
+1F33D ; fully-qualified # 🌽 E0.6 ear of corn
+1F336 FE0F ; fully-qualified # 🌶️ E0.7 hot pepper
+1F336 ; unqualified # 🌶 E0.7 hot pepper
+1FAD1 ; fully-qualified # 🫑 E13.0 bell pepper
+1F952 ; fully-qualified # 🥒 E3.0 cucumber
+1F96C ; fully-qualified # 🥬 E11.0 leafy green
+1F966 ; fully-qualified # 🥦 E5.0 broccoli
+1F9C4 ; fully-qualified # 🧄 E12.0 garlic
+1F9C5 ; fully-qualified # 🧅 E12.0 onion
+1F344 ; fully-qualified # 🍄 E0.6 mushroom
+1F95C ; fully-qualified # 🥜 E3.0 peanuts
+1F330 ; fully-qualified # 🌰 E0.6 chestnut
# subgroup: food-prepared
-1F35E ; fully-qualified # 🍞 bread
-1F950 ; fully-qualified # 🥐 croissant
-1F956 ; fully-qualified # 🥖 baguette bread
-1FAD3 ; fully-qualified # 🫓 flatbread
-1F968 ; fully-qualified # 🥨 pretzel
-1F96F ; fully-qualified # 🥯 bagel
-1F95E ; fully-qualified # 🥞 pancakes
-1F9C7 ; fully-qualified # 🧇 waffle
-1F9C0 ; fully-qualified # 🧀 cheese wedge
-1F356 ; fully-qualified # 🍖 meat on bone
-1F357 ; fully-qualified # 🍗 poultry leg
-1F969 ; fully-qualified # 🥩 cut of meat
-1F953 ; fully-qualified # 🥓 bacon
-1F354 ; fully-qualified # 🍔 hamburger
-1F35F ; fully-qualified # 🍟 french fries
-1F355 ; fully-qualified # 🍕 pizza
-1F32D ; fully-qualified # 🌭 hot dog
-1F96A ; fully-qualified # 🥪 sandwich
-1F32E ; fully-qualified # 🌮 taco
-1F32F ; fully-qualified # 🌯 burrito
-1FAD4 ; fully-qualified # 🫔 tamale
-1F959 ; fully-qualified # 🥙 stuffed flatbread
-1F9C6 ; fully-qualified # 🧆 falafel
-1F95A ; fully-qualified # 🥚 egg
-1F373 ; fully-qualified # 🍳 cooking
-1F958 ; fully-qualified # 🥘 shallow pan of food
-1F372 ; fully-qualified # 🍲 pot of food
-1FAD5 ; fully-qualified # 🫕 fondue
-1F963 ; fully-qualified # 🥣 bowl with spoon
-1F957 ; fully-qualified # 🥗 green salad
-1F37F ; fully-qualified # 🍿 popcorn
-1F9C8 ; fully-qualified # 🧈 butter
-1F9C2 ; fully-qualified # 🧂 salt
-1F96B ; fully-qualified # 🥫 canned food
+1F35E ; fully-qualified # 🍞 E0.6 bread
+1F950 ; fully-qualified # 🥐 E3.0 croissant
+1F956 ; fully-qualified # 🥖 E3.0 baguette bread
+1FAD3 ; fully-qualified # 🫓 E13.0 flatbread
+1F968 ; fully-qualified # 🥨 E5.0 pretzel
+1F96F ; fully-qualified # 🥯 E11.0 bagel
+1F95E ; fully-qualified # 🥞 E3.0 pancakes
+1F9C7 ; fully-qualified # 🧇 E12.0 waffle
+1F9C0 ; fully-qualified # 🧀 E1.0 cheese wedge
+1F356 ; fully-qualified # 🍖 E0.6 meat on bone
+1F357 ; fully-qualified # 🍗 E0.6 poultry leg
+1F969 ; fully-qualified # 🥩 E5.0 cut of meat
+1F953 ; fully-qualified # 🥓 E3.0 bacon
+1F354 ; fully-qualified # 🍔 E0.6 hamburger
+1F35F ; fully-qualified # 🍟 E0.6 french fries
+1F355 ; fully-qualified # 🍕 E0.6 pizza
+1F32D ; fully-qualified # 🌭 E1.0 hot dog
+1F96A ; fully-qualified # 🥪 E5.0 sandwich
+1F32E ; fully-qualified # 🌮 E1.0 taco
+1F32F ; fully-qualified # 🌯 E1.0 burrito
+1FAD4 ; fully-qualified # 🫔 E13.0 tamale
+1F959 ; fully-qualified # 🥙 E3.0 stuffed flatbread
+1F9C6 ; fully-qualified # 🧆 E12.0 falafel
+1F95A ; fully-qualified # 🥚 E3.0 egg
+1F373 ; fully-qualified # 🍳 E0.6 cooking
+1F958 ; fully-qualified # 🥘 E3.0 shallow pan of food
+1F372 ; fully-qualified # 🍲 E0.6 pot of food
+1FAD5 ; fully-qualified # 🫕 E13.0 fondue
+1F963 ; fully-qualified # 🥣 E5.0 bowl with spoon
+1F957 ; fully-qualified # 🥗 E3.0 green salad
+1F37F ; fully-qualified # 🍿 E1.0 popcorn
+1F9C8 ; fully-qualified # 🧈 E12.0 butter
+1F9C2 ; fully-qualified # 🧂 E11.0 salt
+1F96B ; fully-qualified # 🥫 E5.0 canned food
# subgroup: food-asian
-1F371 ; fully-qualified # 🍱 bento box
-1F358 ; fully-qualified # 🍘 rice cracker
-1F359 ; fully-qualified # 🍙 rice ball
-1F35A ; fully-qualified # 🍚 cooked rice
-1F35B ; fully-qualified # 🍛 curry rice
-1F35C ; fully-qualified # 🍜 steaming bowl
-1F35D ; fully-qualified # 🍝 spaghetti
-1F360 ; fully-qualified # 🍠 roasted sweet potato
-1F362 ; fully-qualified # 🍢 oden
-1F363 ; fully-qualified # 🍣 sushi
-1F364 ; fully-qualified # 🍤 fried shrimp
-1F365 ; fully-qualified # 🍥 fish cake with swirl
-1F96E ; fully-qualified # 🥮 moon cake
-1F361 ; fully-qualified # 🍡 dango
-1F95F ; fully-qualified # 🥟 dumpling
-1F960 ; fully-qualified # 🥠 fortune cookie
-1F961 ; fully-qualified # 🥡 takeout box
+1F371 ; fully-qualified # 🍱 E0.6 bento box
+1F358 ; fully-qualified # 🍘 E0.6 rice cracker
+1F359 ; fully-qualified # 🍙 E0.6 rice ball
+1F35A ; fully-qualified # 🍚 E0.6 cooked rice
+1F35B ; fully-qualified # 🍛 E0.6 curry rice
+1F35C ; fully-qualified # 🍜 E0.6 steaming bowl
+1F35D ; fully-qualified # 🍝 E0.6 spaghetti
+1F360 ; fully-qualified # 🍠 E0.6 roasted sweet potato
+1F362 ; fully-qualified # 🍢 E0.6 oden
+1F363 ; fully-qualified # 🍣 E0.6 sushi
+1F364 ; fully-qualified # 🍤 E0.6 fried shrimp
+1F365 ; fully-qualified # 🍥 E0.6 fish cake with swirl
+1F96E ; fully-qualified # 🥮 E11.0 moon cake
+1F361 ; fully-qualified # 🍡 E0.6 dango
+1F95F ; fully-qualified # 🥟 E5.0 dumpling
+1F960 ; fully-qualified # 🥠 E5.0 fortune cookie
+1F961 ; fully-qualified # 🥡 E5.0 takeout box
# subgroup: food-marine
-1F980 ; fully-qualified # 🦀 crab
-1F99E ; fully-qualified # 🦞 lobster
-1F990 ; fully-qualified # 🦐 shrimp
-1F991 ; fully-qualified # 🦑 squid
-1F9AA ; fully-qualified # 🦪 oyster
+1F980 ; fully-qualified # 🦀 E1.0 crab
+1F99E ; fully-qualified # 🦞 E11.0 lobster
+1F990 ; fully-qualified # 🦐 E3.0 shrimp
+1F991 ; fully-qualified # 🦑 E3.0 squid
+1F9AA ; fully-qualified # 🦪 E12.0 oyster
# subgroup: food-sweet
-1F366 ; fully-qualified # 🍦 soft ice cream
-1F367 ; fully-qualified # 🍧 shaved ice
-1F368 ; fully-qualified # 🍨 ice cream
-1F369 ; fully-qualified # 🍩 doughnut
-1F36A ; fully-qualified # 🍪 cookie
-1F382 ; fully-qualified # 🎂 birthday cake
-1F370 ; fully-qualified # 🍰 shortcake
-1F9C1 ; fully-qualified # 🧁 cupcake
-1F967 ; fully-qualified # 🥧 pie
-1F36B ; fully-qualified # 🍫 chocolate bar
-1F36C ; fully-qualified # 🍬 candy
-1F36D ; fully-qualified # 🍭 lollipop
-1F36E ; fully-qualified # 🍮 custard
-1F36F ; fully-qualified # 🍯 honey pot
+1F366 ; fully-qualified # 🍦 E0.6 soft ice cream
+1F367 ; fully-qualified # 🍧 E0.6 shaved ice
+1F368 ; fully-qualified # 🍨 E0.6 ice cream
+1F369 ; fully-qualified # 🍩 E0.6 doughnut
+1F36A ; fully-qualified # 🍪 E0.6 cookie
+1F382 ; fully-qualified # 🎂 E0.6 birthday cake
+1F370 ; fully-qualified # 🍰 E0.6 shortcake
+1F9C1 ; fully-qualified # 🧁 E11.0 cupcake
+1F967 ; fully-qualified # 🥧 E5.0 pie
+1F36B ; fully-qualified # 🍫 E0.6 chocolate bar
+1F36C ; fully-qualified # 🍬 E0.6 candy
+1F36D ; fully-qualified # 🍭 E0.6 lollipop
+1F36E ; fully-qualified # 🍮 E0.6 custard
+1F36F ; fully-qualified # 🍯 E0.6 honey pot
# subgroup: drink
-1F37C ; fully-qualified # 🍼 baby bottle
-1F95B ; fully-qualified # 🥛 glass of milk
-2615 ; fully-qualified # ☕ hot beverage
-1FAD6 ; fully-qualified # 🫖 teapot
-1F375 ; fully-qualified # 🍵 teacup without handle
-1F376 ; fully-qualified # 🍶 sake
-1F37E ; fully-qualified # 🍾 bottle with popping cork
-1F377 ; fully-qualified # 🍷 wine glass
-1F378 ; fully-qualified # 🍸 cocktail glass
-1F379 ; fully-qualified # 🍹 tropical drink
-1F37A ; fully-qualified # 🍺 beer mug
-1F37B ; fully-qualified # 🍻 clinking beer mugs
-1F942 ; fully-qualified # 🥂 clinking glasses
-1F943 ; fully-qualified # 🥃 tumbler glass
-1F964 ; fully-qualified # 🥤 cup with straw
-1F9CB ; fully-qualified # 🧋 bubble tea
-1F9C3 ; fully-qualified # 🧃 beverage box
-1F9C9 ; fully-qualified # 🧉 mate
-1F9CA ; fully-qualified # 🧊 ice
+1F37C ; fully-qualified # 🍼 E1.0 baby bottle
+1F95B ; fully-qualified # 🥛 E3.0 glass of milk
+2615 ; fully-qualified # ☕ E0.6 hot beverage
+1FAD6 ; fully-qualified # 🫖 E13.0 teapot
+1F375 ; fully-qualified # 🍵 E0.6 teacup without handle
+1F376 ; fully-qualified # 🍶 E0.6 sake
+1F37E ; fully-qualified # 🍾 E1.0 bottle with popping cork
+1F377 ; fully-qualified # 🍷 E0.6 wine glass
+1F378 ; fully-qualified # 🍸 E0.6 cocktail glass
+1F379 ; fully-qualified # 🍹 E0.6 tropical drink
+1F37A ; fully-qualified # 🍺 E0.6 beer mug
+1F37B ; fully-qualified # 🍻 E0.6 clinking beer mugs
+1F942 ; fully-qualified # 🥂 E3.0 clinking glasses
+1F943 ; fully-qualified # 🥃 E3.0 tumbler glass
+1F964 ; fully-qualified # 🥤 E5.0 cup with straw
+1F9CB ; fully-qualified # 🧋 E13.0 bubble tea
+1F9C3 ; fully-qualified # 🧃 E12.0 beverage box
+1F9C9 ; fully-qualified # 🧉 E12.0 mate
+1F9CA ; fully-qualified # 🧊 E12.0 ice
# subgroup: dishware
-1F962 ; fully-qualified # 🥢 chopsticks
-1F37D FE0F ; fully-qualified # 🍽️ fork and knife with plate
-1F37D ; unqualified # 🍽 fork and knife with plate
-1F374 ; fully-qualified # 🍴 fork and knife
-1F944 ; fully-qualified # 🥄 spoon
-1F52A ; fully-qualified # 🔪 kitchen knife
-1F3FA ; fully-qualified # 🏺 amphora
+1F962 ; fully-qualified # 🥢 E5.0 chopsticks
+1F37D FE0F ; fully-qualified # 🍽️ E0.7 fork and knife with plate
+1F37D ; unqualified # 🍽 E0.7 fork and knife with plate
+1F374 ; fully-qualified # 🍴 E0.6 fork and knife
+1F944 ; fully-qualified # 🥄 E3.0 spoon
+1F52A ; fully-qualified # 🔪 E0.6 kitchen knife
+1F3FA ; fully-qualified # 🏺 E1.0 amphora
+
+# Food & Drink subtotal: 131
+# Food & Drink subtotal: 131 w/o modifiers
# group: Travel & Places
# subgroup: place-map
-1F30D ; fully-qualified # 🌍 globe showing Europe-Africa
-1F30E ; fully-qualified # 🌎 globe showing Americas
-1F30F ; fully-qualified # 🌏 globe showing Asia-Australia
-1F310 ; fully-qualified # 🌐 globe with meridians
-1F5FA FE0F ; fully-qualified # 🗺️ world map
-1F5FA ; unqualified # 🗺 world map
-1F5FE ; fully-qualified # 🗾 map of Japan
-1F9ED ; fully-qualified # 🧭 compass
+1F30D ; fully-qualified # 🌍 E0.7 globe showing Europe-Africa
+1F30E ; fully-qualified # 🌎 E0.7 globe showing Americas
+1F30F ; fully-qualified # 🌏 E0.6 globe showing Asia-Australia
+1F310 ; fully-qualified # 🌐 E1.0 globe with meridians
+1F5FA FE0F ; fully-qualified # 🗺️ E0.7 world map
+1F5FA ; unqualified # 🗺 E0.7 world map
+1F5FE ; fully-qualified # 🗾 E0.6 map of Japan
+1F9ED ; fully-qualified # 🧭 E11.0 compass
# subgroup: place-geographic
-1F3D4 FE0F ; fully-qualified # 🏔️ snow-capped mountain
-1F3D4 ; unqualified # 🏔 snow-capped mountain
-26F0 FE0F ; fully-qualified # ⛰️ mountain
-26F0 ; unqualified # ⛰ mountain
-1F30B ; fully-qualified # 🌋 volcano
-1F5FB ; fully-qualified # 🗻 mount fuji
-1F3D5 FE0F ; fully-qualified # 🏕️ camping
-1F3D5 ; unqualified # 🏕 camping
-1F3D6 FE0F ; fully-qualified # 🏖️ beach with umbrella
-1F3D6 ; unqualified # 🏖 beach with umbrella
-1F3DC FE0F ; fully-qualified # 🏜️ desert
-1F3DC ; unqualified # 🏜 desert
-1F3DD FE0F ; fully-qualified # 🏝️ desert island
-1F3DD ; unqualified # 🏝 desert island
-1F3DE FE0F ; fully-qualified # 🏞️ national park
-1F3DE ; unqualified # 🏞 national park
+1F3D4 FE0F ; fully-qualified # 🏔️ E0.7 snow-capped mountain
+1F3D4 ; unqualified # 🏔 E0.7 snow-capped mountain
+26F0 FE0F ; fully-qualified # ⛰️ E0.7 mountain
+26F0 ; unqualified # ⛰ E0.7 mountain
+1F30B ; fully-qualified # 🌋 E0.6 volcano
+1F5FB ; fully-qualified # 🗻 E0.6 mount fuji
+1F3D5 FE0F ; fully-qualified # 🏕️ E0.7 camping
+1F3D5 ; unqualified # 🏕 E0.7 camping
+1F3D6 FE0F ; fully-qualified # 🏖️ E0.7 beach with umbrella
+1F3D6 ; unqualified # 🏖 E0.7 beach with umbrella
+1F3DC FE0F ; fully-qualified # 🏜️ E0.7 desert
+1F3DC ; unqualified # 🏜 E0.7 desert
+1F3DD FE0F ; fully-qualified # 🏝️ E0.7 desert island
+1F3DD ; unqualified # 🏝 E0.7 desert island
+1F3DE FE0F ; fully-qualified # 🏞️ E0.7 national park
+1F3DE ; unqualified # 🏞 E0.7 national park
# subgroup: place-building
-1F3DF FE0F ; fully-qualified # 🏟️ stadium
-1F3DF ; unqualified # 🏟 stadium
-1F3DB FE0F ; fully-qualified # 🏛️ classical building
-1F3DB ; unqualified # 🏛 classical building
-1F3D7 FE0F ; fully-qualified # 🏗️ building construction
-1F3D7 ; unqualified # 🏗 building construction
-1F9F1 ; fully-qualified # 🧱 brick
-1FAA8 ; fully-qualified # 🪨 rock
-1FAB5 ; fully-qualified # 🪵 wood
-1F6D6 ; fully-qualified # 🛖 hut
-1F3D8 FE0F ; fully-qualified # 🏘️ houses
-1F3D8 ; unqualified # 🏘 houses
-1F3DA FE0F ; fully-qualified # 🏚️ derelict house
-1F3DA ; unqualified # 🏚 derelict house
-1F3E0 ; fully-qualified # 🏠 house
-1F3E1 ; fully-qualified # 🏡 house with garden
-1F3E2 ; fully-qualified # 🏢 office building
-1F3E3 ; fully-qualified # 🏣 Japanese post office
-1F3E4 ; fully-qualified # 🏤 post office
-1F3E5 ; fully-qualified # 🏥 hospital
-1F3E6 ; fully-qualified # 🏦 bank
-1F3E8 ; fully-qualified # 🏨 hotel
-1F3E9 ; fully-qualified # 🏩 love hotel
-1F3EA ; fully-qualified # 🏪 convenience store
-1F3EB ; fully-qualified # 🏫 school
-1F3EC ; fully-qualified # 🏬 department store
-1F3ED ; fully-qualified # 🏭 factory
-1F3EF ; fully-qualified # 🏯 Japanese castle
-1F3F0 ; fully-qualified # 🏰 castle
-1F492 ; fully-qualified # 💒 wedding
-1F5FC ; fully-qualified # 🗼 Tokyo tower
-1F5FD ; fully-qualified # 🗽 Statue of Liberty
+1F3DF FE0F ; fully-qualified # 🏟️ E0.7 stadium
+1F3DF ; unqualified # 🏟 E0.7 stadium
+1F3DB FE0F ; fully-qualified # 🏛️ E0.7 classical building
+1F3DB ; unqualified # 🏛 E0.7 classical building
+1F3D7 FE0F ; fully-qualified # 🏗️ E0.7 building construction
+1F3D7 ; unqualified # 🏗 E0.7 building construction
+1F9F1 ; fully-qualified # 🧱 E11.0 brick
+1FAA8 ; fully-qualified # 🪨 E13.0 rock
+1FAB5 ; fully-qualified # 🪵 E13.0 wood
+1F6D6 ; fully-qualified # 🛖 E13.0 hut
+1F3D8 FE0F ; fully-qualified # 🏘️ E0.7 houses
+1F3D8 ; unqualified # 🏘 E0.7 houses
+1F3DA FE0F ; fully-qualified # 🏚️ E0.7 derelict house
+1F3DA ; unqualified # 🏚 E0.7 derelict house
+1F3E0 ; fully-qualified # 🏠 E0.6 house
+1F3E1 ; fully-qualified # 🏡 E0.6 house with garden
+1F3E2 ; fully-qualified # 🏢 E0.6 office building
+1F3E3 ; fully-qualified # 🏣 E0.6 Japanese post office
+1F3E4 ; fully-qualified # 🏤 E1.0 post office
+1F3E5 ; fully-qualified # 🏥 E0.6 hospital
+1F3E6 ; fully-qualified # 🏦 E0.6 bank
+1F3E8 ; fully-qualified # 🏨 E0.6 hotel
+1F3E9 ; fully-qualified # 🏩 E0.6 love hotel
+1F3EA ; fully-qualified # 🏪 E0.6 convenience store
+1F3EB ; fully-qualified # 🏫 E0.6 school
+1F3EC ; fully-qualified # 🏬 E0.6 department store
+1F3ED ; fully-qualified # 🏭 E0.6 factory
+1F3EF ; fully-qualified # 🏯 E0.6 Japanese castle
+1F3F0 ; fully-qualified # 🏰 E0.6 castle
+1F492 ; fully-qualified # 💒 E0.6 wedding
+1F5FC ; fully-qualified # 🗼 E0.6 Tokyo tower
+1F5FD ; fully-qualified # 🗽 E0.6 Statue of Liberty
# subgroup: place-religious
-26EA ; fully-qualified # ⛪ church
-1F54C ; fully-qualified # 🕌 mosque
-1F6D5 ; fully-qualified # 🛕 hindu temple
-1F54D ; fully-qualified # 🕍 synagogue
-26E9 FE0F ; fully-qualified # ⛩️ shinto shrine
-26E9 ; unqualified # ⛩ shinto shrine
-1F54B ; fully-qualified # 🕋 kaaba
+26EA ; fully-qualified # ⛪ E0.6 church
+1F54C ; fully-qualified # 🕌 E1.0 mosque
+1F6D5 ; fully-qualified # 🛕 E12.0 hindu temple
+1F54D ; fully-qualified # 🕍 E1.0 synagogue
+26E9 FE0F ; fully-qualified # ⛩️ E0.7 shinto shrine
+26E9 ; unqualified # ⛩ E0.7 shinto shrine
+1F54B ; fully-qualified # 🕋 E1.0 kaaba
# subgroup: place-other
-26F2 ; fully-qualified # ⛲ fountain
-26FA ; fully-qualified # ⛺ tent
-1F301 ; fully-qualified # 🌁 foggy
-1F303 ; fully-qualified # 🌃 night with stars
-1F3D9 FE0F ; fully-qualified # 🏙️ cityscape
-1F3D9 ; unqualified # 🏙 cityscape
-1F304 ; fully-qualified # 🌄 sunrise over mountains
-1F305 ; fully-qualified # 🌅 sunrise
-1F306 ; fully-qualified # 🌆 cityscape at dusk
-1F307 ; fully-qualified # 🌇 sunset
-1F309 ; fully-qualified # 🌉 bridge at night
-2668 FE0F ; fully-qualified # ♨️ hot springs
-2668 ; unqualified # ♨ hot springs
-1F3A0 ; fully-qualified # 🎠 carousel horse
-1F3A1 ; fully-qualified # 🎡 ferris wheel
-1F3A2 ; fully-qualified # 🎢 roller coaster
-1F488 ; fully-qualified # 💈 barber pole
-1F3AA ; fully-qualified # 🎪 circus tent
+26F2 ; fully-qualified # ⛲ E0.6 fountain
+26FA ; fully-qualified # ⛺ E0.6 tent
+1F301 ; fully-qualified # 🌁 E0.6 foggy
+1F303 ; fully-qualified # 🌃 E0.6 night with stars
+1F3D9 FE0F ; fully-qualified # 🏙️ E0.7 cityscape
+1F3D9 ; unqualified # 🏙 E0.7 cityscape
+1F304 ; fully-qualified # 🌄 E0.6 sunrise over mountains
+1F305 ; fully-qualified # 🌅 E0.6 sunrise
+1F306 ; fully-qualified # 🌆 E0.6 cityscape at dusk
+1F307 ; fully-qualified # 🌇 E0.6 sunset
+1F309 ; fully-qualified # 🌉 E0.6 bridge at night
+2668 FE0F ; fully-qualified # ♨️ E0.6 hot springs
+2668 ; unqualified # ♨ E0.6 hot springs
+1F3A0 ; fully-qualified # 🎠 E0.6 carousel horse
+1F3A1 ; fully-qualified # 🎡 E0.6 ferris wheel
+1F3A2 ; fully-qualified # 🎢 E0.6 roller coaster
+1F488 ; fully-qualified # 💈 E0.6 barber pole
+1F3AA ; fully-qualified # 🎪 E0.6 circus tent
# subgroup: transport-ground
-1F682 ; fully-qualified # 🚂 locomotive
-1F683 ; fully-qualified # 🚃 railway car
-1F684 ; fully-qualified # 🚄 high-speed train
-1F685 ; fully-qualified # 🚅 bullet train
-1F686 ; fully-qualified # 🚆 train
-1F687 ; fully-qualified # 🚇 metro
-1F688 ; fully-qualified # 🚈 light rail
-1F689 ; fully-qualified # 🚉 station
-1F68A ; fully-qualified # 🚊 tram
-1F69D ; fully-qualified # 🚝 monorail
-1F69E ; fully-qualified # 🚞 mountain railway
-1F68B ; fully-qualified # 🚋 tram car
-1F68C ; fully-qualified # 🚌 bus
-1F68D ; fully-qualified # 🚍 oncoming bus
-1F68E ; fully-qualified # 🚎 trolleybus
-1F690 ; fully-qualified # 🚐 minibus
-1F691 ; fully-qualified # 🚑 ambulance
-1F692 ; fully-qualified # 🚒 fire engine
-1F693 ; fully-qualified # 🚓 police car
-1F694 ; fully-qualified # 🚔 oncoming police car
-1F695 ; fully-qualified # 🚕 taxi
-1F696 ; fully-qualified # 🚖 oncoming taxi
-1F697 ; fully-qualified # 🚗 automobile
-1F698 ; fully-qualified # 🚘 oncoming automobile
-1F699 ; fully-qualified # 🚙 sport utility vehicle
-1F6FB ; fully-qualified # 🛻 pickup truck
-1F69A ; fully-qualified # 🚚 delivery truck
-1F69B ; fully-qualified # 🚛 articulated lorry
-1F69C ; fully-qualified # 🚜 tractor
-1F3CE FE0F ; fully-qualified # 🏎️ racing car
-1F3CE ; unqualified # 🏎 racing car
-1F3CD FE0F ; fully-qualified # 🏍️ motorcycle
-1F3CD ; unqualified # 🏍 motorcycle
-1F6F5 ; fully-qualified # 🛵 motor scooter
-1F9BD ; fully-qualified # 🦽 manual wheelchair
-1F9BC ; fully-qualified # 🦼 motorized wheelchair
-1F6FA ; fully-qualified # 🛺 auto rickshaw
-1F6B2 ; fully-qualified # 🚲 bicycle
-1F6F4 ; fully-qualified # 🛴 kick scooter
-1F6F9 ; fully-qualified # 🛹 skateboard
-1F6FC ; fully-qualified # 🛼 roller skate
-1F68F ; fully-qualified # 🚏 bus stop
-1F6E3 FE0F ; fully-qualified # 🛣️ motorway
-1F6E3 ; unqualified # 🛣 motorway
-1F6E4 FE0F ; fully-qualified # 🛤️ railway track
-1F6E4 ; unqualified # 🛤 railway track
-1F6E2 FE0F ; fully-qualified # 🛢️ oil drum
-1F6E2 ; unqualified # 🛢 oil drum
-26FD ; fully-qualified # ⛽ fuel pump
-1F6A8 ; fully-qualified # 🚨 police car light
-1F6A5 ; fully-qualified # 🚥 horizontal traffic light
-1F6A6 ; fully-qualified # 🚦 vertical traffic light
-1F6D1 ; fully-qualified # 🛑 stop sign
-1F6A7 ; fully-qualified # 🚧 construction
+1F682 ; fully-qualified # 🚂 E1.0 locomotive
+1F683 ; fully-qualified # 🚃 E0.6 railway car
+1F684 ; fully-qualified # 🚄 E0.6 high-speed train
+1F685 ; fully-qualified # 🚅 E0.6 bullet train
+1F686 ; fully-qualified # 🚆 E1.0 train
+1F687 ; fully-qualified # 🚇 E0.6 metro
+1F688 ; fully-qualified # 🚈 E1.0 light rail
+1F689 ; fully-qualified # 🚉 E0.6 station
+1F68A ; fully-qualified # 🚊 E1.0 tram
+1F69D ; fully-qualified # 🚝 E1.0 monorail
+1F69E ; fully-qualified # 🚞 E1.0 mountain railway
+1F68B ; fully-qualified # 🚋 E1.0 tram car
+1F68C ; fully-qualified # 🚌 E0.6 bus
+1F68D ; fully-qualified # 🚍 E0.7 oncoming bus
+1F68E ; fully-qualified # 🚎 E1.0 trolleybus
+1F690 ; fully-qualified # 🚐 E1.0 minibus
+1F691 ; fully-qualified # 🚑 E0.6 ambulance
+1F692 ; fully-qualified # 🚒 E0.6 fire engine
+1F693 ; fully-qualified # 🚓 E0.6 police car
+1F694 ; fully-qualified # 🚔 E0.7 oncoming police car
+1F695 ; fully-qualified # 🚕 E0.6 taxi
+1F696 ; fully-qualified # 🚖 E1.0 oncoming taxi
+1F697 ; fully-qualified # 🚗 E0.6 automobile
+1F698 ; fully-qualified # 🚘 E0.7 oncoming automobile
+1F699 ; fully-qualified # 🚙 E0.6 sport utility vehicle
+1F6FB ; fully-qualified # 🛻 E13.0 pickup truck
+1F69A ; fully-qualified # 🚚 E0.6 delivery truck
+1F69B ; fully-qualified # 🚛 E1.0 articulated lorry
+1F69C ; fully-qualified # 🚜 E1.0 tractor
+1F3CE FE0F ; fully-qualified # 🏎️ E0.7 racing car
+1F3CE ; unqualified # 🏎 E0.7 racing car
+1F3CD FE0F ; fully-qualified # 🏍️ E0.7 motorcycle
+1F3CD ; unqualified # 🏍 E0.7 motorcycle
+1F6F5 ; fully-qualified # 🛵 E3.0 motor scooter
+1F9BD ; fully-qualified # 🦽 E12.0 manual wheelchair
+1F9BC ; fully-qualified # 🦼 E12.0 motorized wheelchair
+1F6FA ; fully-qualified # 🛺 E12.0 auto rickshaw
+1F6B2 ; fully-qualified # 🚲 E0.6 bicycle
+1F6F4 ; fully-qualified # 🛴 E3.0 kick scooter
+1F6F9 ; fully-qualified # 🛹 E11.0 skateboard
+1F6FC ; fully-qualified # 🛼 E13.0 roller skate
+1F68F ; fully-qualified # 🚏 E0.6 bus stop
+1F6E3 FE0F ; fully-qualified # 🛣️ E0.7 motorway
+1F6E3 ; unqualified # 🛣 E0.7 motorway
+1F6E4 FE0F ; fully-qualified # 🛤️ E0.7 railway track
+1F6E4 ; unqualified # 🛤 E0.7 railway track
+1F6E2 FE0F ; fully-qualified # 🛢️ E0.7 oil drum
+1F6E2 ; unqualified # 🛢 E0.7 oil drum
+26FD ; fully-qualified # ⛽ E0.6 fuel pump
+1F6A8 ; fully-qualified # 🚨 E0.6 police car light
+1F6A5 ; fully-qualified # 🚥 E0.6 horizontal traffic light
+1F6A6 ; fully-qualified # 🚦 E1.0 vertical traffic light
+1F6D1 ; fully-qualified # 🛑 E3.0 stop sign
+1F6A7 ; fully-qualified # 🚧 E0.6 construction
# subgroup: transport-water
-2693 ; fully-qualified # ⚓ anchor
-26F5 ; fully-qualified # ⛵ sailboat
-1F6F6 ; fully-qualified # 🛶 canoe
-1F6A4 ; fully-qualified # 🚤 speedboat
-1F6F3 FE0F ; fully-qualified # 🛳️ passenger ship
-1F6F3 ; unqualified # 🛳 passenger ship
-26F4 FE0F ; fully-qualified # ⛴️ ferry
-26F4 ; unqualified # ⛴ ferry
-1F6E5 FE0F ; fully-qualified # 🛥️ motor boat
-1F6E5 ; unqualified # 🛥 motor boat
-1F6A2 ; fully-qualified # 🚢 ship
+2693 ; fully-qualified # ⚓ E0.6 anchor
+26F5 ; fully-qualified # ⛵ E0.6 sailboat
+1F6F6 ; fully-qualified # 🛶 E3.0 canoe
+1F6A4 ; fully-qualified # 🚤 E0.6 speedboat
+1F6F3 FE0F ; fully-qualified # 🛳️ E0.7 passenger ship
+1F6F3 ; unqualified # 🛳 E0.7 passenger ship
+26F4 FE0F ; fully-qualified # ⛴️ E0.7 ferry
+26F4 ; unqualified # ⛴ E0.7 ferry
+1F6E5 FE0F ; fully-qualified # 🛥️ E0.7 motor boat
+1F6E5 ; unqualified # 🛥 E0.7 motor boat
+1F6A2 ; fully-qualified # 🚢 E0.6 ship
# subgroup: transport-air
-2708 FE0F ; fully-qualified # ✈️ airplane
-2708 ; unqualified # ✈ airplane
-1F6E9 FE0F ; fully-qualified # 🛩️ small airplane
-1F6E9 ; unqualified # 🛩 small airplane
-1F6EB ; fully-qualified # 🛫 airplane departure
-1F6EC ; fully-qualified # 🛬 airplane arrival
-1FA82 ; fully-qualified # 🪂 parachute
-1F4BA ; fully-qualified # 💺 seat
-1F681 ; fully-qualified # 🚁 helicopter
-1F69F ; fully-qualified # 🚟 suspension railway
-1F6A0 ; fully-qualified # 🚠 mountain cableway
-1F6A1 ; fully-qualified # 🚡 aerial tramway
-1F6F0 FE0F ; fully-qualified # 🛰️ satellite
-1F6F0 ; unqualified # 🛰 satellite
-1F680 ; fully-qualified # 🚀 rocket
-1F6F8 ; fully-qualified # 🛸 flying saucer
+2708 FE0F ; fully-qualified # ✈️ E0.6 airplane
+2708 ; unqualified # ✈ E0.6 airplane
+1F6E9 FE0F ; fully-qualified # 🛩️ E0.7 small airplane
+1F6E9 ; unqualified # 🛩 E0.7 small airplane
+1F6EB ; fully-qualified # 🛫 E1.0 airplane departure
+1F6EC ; fully-qualified # 🛬 E1.0 airplane arrival
+1FA82 ; fully-qualified # 🪂 E12.0 parachute
+1F4BA ; fully-qualified # 💺 E0.6 seat
+1F681 ; fully-qualified # 🚁 E1.0 helicopter
+1F69F ; fully-qualified # 🚟 E1.0 suspension railway
+1F6A0 ; fully-qualified # 🚠 E1.0 mountain cableway
+1F6A1 ; fully-qualified # 🚡 E1.0 aerial tramway
+1F6F0 FE0F ; fully-qualified # 🛰️ E0.7 satellite
+1F6F0 ; unqualified # 🛰 E0.7 satellite
+1F680 ; fully-qualified # 🚀 E0.6 rocket
+1F6F8 ; fully-qualified # 🛸 E5.0 flying saucer
# subgroup: hotel
-1F6CE FE0F ; fully-qualified # 🛎️ bellhop bell
-1F6CE ; unqualified # 🛎 bellhop bell
-1F9F3 ; fully-qualified # 🧳 luggage
+1F6CE FE0F ; fully-qualified # 🛎️ E0.7 bellhop bell
+1F6CE ; unqualified # 🛎 E0.7 bellhop bell
+1F9F3 ; fully-qualified # 🧳 E11.0 luggage
# subgroup: time
-231B ; fully-qualified # ⌛ hourglass done
-23F3 ; fully-qualified # ⏳ hourglass not done
-231A ; fully-qualified # ⌚ watch
-23F0 ; fully-qualified # ⏰ alarm clock
-23F1 FE0F ; fully-qualified # ⏱️ stopwatch
-23F1 ; unqualified # ⏱ stopwatch
-23F2 FE0F ; fully-qualified # ⏲️ timer clock
-23F2 ; unqualified # ⏲ timer clock
-1F570 FE0F ; fully-qualified # 🕰️ mantelpiece clock
-1F570 ; unqualified # 🕰 mantelpiece clock
-1F55B ; fully-qualified # 🕛 twelve o’clock
-1F567 ; fully-qualified # 🕧 twelve-thirty
-1F550 ; fully-qualified # 🕐 one o’clock
-1F55C ; fully-qualified # 🕜 one-thirty
-1F551 ; fully-qualified # 🕑 two o’clock
-1F55D ; fully-qualified # 🕝 two-thirty
-1F552 ; fully-qualified # 🕒 three o’clock
-1F55E ; fully-qualified # 🕞 three-thirty
-1F553 ; fully-qualified # 🕓 four o’clock
-1F55F ; fully-qualified # 🕟 four-thirty
-1F554 ; fully-qualified # 🕔 five o’clock
-1F560 ; fully-qualified # 🕠 five-thirty
-1F555 ; fully-qualified # 🕕 six o’clock
-1F561 ; fully-qualified # 🕡 six-thirty
-1F556 ; fully-qualified # 🕖 seven o’clock
-1F562 ; fully-qualified # 🕢 seven-thirty
-1F557 ; fully-qualified # 🕗 eight o’clock
-1F563 ; fully-qualified # 🕣 eight-thirty
-1F558 ; fully-qualified # 🕘 nine o’clock
-1F564 ; fully-qualified # 🕤 nine-thirty
-1F559 ; fully-qualified # 🕙 ten o’clock
-1F565 ; fully-qualified # 🕥 ten-thirty
-1F55A ; fully-qualified # 🕚 eleven o’clock
-1F566 ; fully-qualified # 🕦 eleven-thirty
+231B ; fully-qualified # ⌛ E0.6 hourglass done
+23F3 ; fully-qualified # ⏳ E0.6 hourglass not done
+231A ; fully-qualified # ⌚ E0.6 watch
+23F0 ; fully-qualified # ⏰ E0.6 alarm clock
+23F1 FE0F ; fully-qualified # ⏱️ E1.0 stopwatch
+23F1 ; unqualified # ⏱ E1.0 stopwatch
+23F2 FE0F ; fully-qualified # ⏲️ E1.0 timer clock
+23F2 ; unqualified # ⏲ E1.0 timer clock
+1F570 FE0F ; fully-qualified # 🕰️ E0.7 mantelpiece clock
+1F570 ; unqualified # 🕰 E0.7 mantelpiece clock
+1F55B ; fully-qualified # 🕛 E0.6 twelve o’clock
+1F567 ; fully-qualified # 🕧 E0.7 twelve-thirty
+1F550 ; fully-qualified # 🕐 E0.6 one o’clock
+1F55C ; fully-qualified # 🕜 E0.7 one-thirty
+1F551 ; fully-qualified # 🕑 E0.6 two o’clock
+1F55D ; fully-qualified # 🕝 E0.7 two-thirty
+1F552 ; fully-qualified # 🕒 E0.6 three o’clock
+1F55E ; fully-qualified # 🕞 E0.7 three-thirty
+1F553 ; fully-qualified # 🕓 E0.6 four o’clock
+1F55F ; fully-qualified # 🕟 E0.7 four-thirty
+1F554 ; fully-qualified # 🕔 E0.6 five o’clock
+1F560 ; fully-qualified # 🕠 E0.7 five-thirty
+1F555 ; fully-qualified # 🕕 E0.6 six o’clock
+1F561 ; fully-qualified # 🕡 E0.7 six-thirty
+1F556 ; fully-qualified # 🕖 E0.6 seven o’clock
+1F562 ; fully-qualified # 🕢 E0.7 seven-thirty
+1F557 ; fully-qualified # 🕗 E0.6 eight o’clock
+1F563 ; fully-qualified # 🕣 E0.7 eight-thirty
+1F558 ; fully-qualified # 🕘 E0.6 nine o’clock
+1F564 ; fully-qualified # 🕤 E0.7 nine-thirty
+1F559 ; fully-qualified # 🕙 E0.6 ten o’clock
+1F565 ; fully-qualified # 🕥 E0.7 ten-thirty
+1F55A ; fully-qualified # 🕚 E0.6 eleven o’clock
+1F566 ; fully-qualified # 🕦 E0.7 eleven-thirty
# subgroup: sky & weather
-1F311 ; fully-qualified # 🌑 new moon
-1F312 ; fully-qualified # 🌒 waxing crescent moon
-1F313 ; fully-qualified # 🌓 first quarter moon
-1F314 ; fully-qualified # 🌔 waxing gibbous moon
-1F315 ; fully-qualified # 🌕 full moon
-1F316 ; fully-qualified # 🌖 waning gibbous moon
-1F317 ; fully-qualified # 🌗 last quarter moon
-1F318 ; fully-qualified # 🌘 waning crescent moon
-1F319 ; fully-qualified # 🌙 crescent moon
-1F31A ; fully-qualified # 🌚 new moon face
-1F31B ; fully-qualified # 🌛 first quarter moon face
-1F31C ; fully-qualified # 🌜 last quarter moon face
-1F321 FE0F ; fully-qualified # 🌡️ thermometer
-1F321 ; unqualified # 🌡 thermometer
-2600 FE0F ; fully-qualified # ☀️ sun
-2600 ; unqualified # ☀ sun
-1F31D ; fully-qualified # 🌝 full moon face
-1F31E ; fully-qualified # 🌞 sun with face
-1FA90 ; fully-qualified # 🪐 ringed planet
-2B50 ; fully-qualified # ⭐ star
-1F31F ; fully-qualified # 🌟 glowing star
-1F320 ; fully-qualified # 🌠 shooting star
-1F30C ; fully-qualified # 🌌 milky way
-2601 FE0F ; fully-qualified # ☁️ cloud
-2601 ; unqualified # ☁ cloud
-26C5 ; fully-qualified # ⛅ sun behind cloud
-26C8 FE0F ; fully-qualified # ⛈️ cloud with lightning and rain
-26C8 ; unqualified # ⛈ cloud with lightning and rain
-1F324 FE0F ; fully-qualified # 🌤️ sun behind small cloud
-1F324 ; unqualified # 🌤 sun behind small cloud
-1F325 FE0F ; fully-qualified # 🌥️ sun behind large cloud
-1F325 ; unqualified # 🌥 sun behind large cloud
-1F326 FE0F ; fully-qualified # 🌦️ sun behind rain cloud
-1F326 ; unqualified # 🌦 sun behind rain cloud
-1F327 FE0F ; fully-qualified # 🌧️ cloud with rain
-1F327 ; unqualified # 🌧 cloud with rain
-1F328 FE0F ; fully-qualified # 🌨️ cloud with snow
-1F328 ; unqualified # 🌨 cloud with snow
-1F329 FE0F ; fully-qualified # 🌩️ cloud with lightning
-1F329 ; unqualified # 🌩 cloud with lightning
-1F32A FE0F ; fully-qualified # 🌪️ tornado
-1F32A ; unqualified # 🌪 tornado
-1F32B FE0F ; fully-qualified # 🌫️ fog
-1F32B ; unqualified # 🌫 fog
-1F32C FE0F ; fully-qualified # 🌬️ wind face
-1F32C ; unqualified # 🌬 wind face
-1F300 ; fully-qualified # 🌀 cyclone
-1F308 ; fully-qualified # 🌈 rainbow
-1F302 ; fully-qualified # 🌂 closed umbrella
-2602 FE0F ; fully-qualified # ☂️ umbrella
-2602 ; unqualified # ☂ umbrella
-2614 ; fully-qualified # ☔ umbrella with rain drops
-26F1 FE0F ; fully-qualified # ⛱️ umbrella on ground
-26F1 ; unqualified # ⛱ umbrella on ground
-26A1 ; fully-qualified # ⚡ high voltage
-2744 FE0F ; fully-qualified # ❄️ snowflake
-2744 ; unqualified # ❄ snowflake
-2603 FE0F ; fully-qualified # ☃️ snowman
-2603 ; unqualified # ☃ snowman
-26C4 ; fully-qualified # ⛄ snowman without snow
-2604 FE0F ; fully-qualified # ☄️ comet
-2604 ; unqualified # ☄ comet
-1F525 ; fully-qualified # 🔥 fire
-1F4A7 ; fully-qualified # 💧 droplet
-1F30A ; fully-qualified # 🌊 water wave
+1F311 ; fully-qualified # 🌑 E0.6 new moon
+1F312 ; fully-qualified # 🌒 E1.0 waxing crescent moon
+1F313 ; fully-qualified # 🌓 E0.6 first quarter moon
+1F314 ; fully-qualified # 🌔 E0.6 waxing gibbous moon
+1F315 ; fully-qualified # 🌕 E0.6 full moon
+1F316 ; fully-qualified # 🌖 E1.0 waning gibbous moon
+1F317 ; fully-qualified # 🌗 E1.0 last quarter moon
+1F318 ; fully-qualified # 🌘 E1.0 waning crescent moon
+1F319 ; fully-qualified # 🌙 E0.6 crescent moon
+1F31A ; fully-qualified # 🌚 E1.0 new moon face
+1F31B ; fully-qualified # 🌛 E0.6 first quarter moon face
+1F31C ; fully-qualified # 🌜 E0.7 last quarter moon face
+1F321 FE0F ; fully-qualified # 🌡️ E0.7 thermometer
+1F321 ; unqualified # 🌡 E0.7 thermometer
+2600 FE0F ; fully-qualified # ☀️ E0.6 sun
+2600 ; unqualified # ☀ E0.6 sun
+1F31D ; fully-qualified # 🌝 E1.0 full moon face
+1F31E ; fully-qualified # 🌞 E1.0 sun with face
+1FA90 ; fully-qualified # 🪐 E12.0 ringed planet
+2B50 ; fully-qualified # ⭐ E0.6 star
+1F31F ; fully-qualified # 🌟 E0.6 glowing star
+1F320 ; fully-qualified # 🌠 E0.6 shooting star
+1F30C ; fully-qualified # 🌌 E0.6 milky way
+2601 FE0F ; fully-qualified # ☁️ E0.6 cloud
+2601 ; unqualified # ☁ E0.6 cloud
+26C5 ; fully-qualified # ⛅ E0.6 sun behind cloud
+26C8 FE0F ; fully-qualified # ⛈️ E0.7 cloud with lightning and rain
+26C8 ; unqualified # ⛈ E0.7 cloud with lightning and rain
+1F324 FE0F ; fully-qualified # 🌤️ E0.7 sun behind small cloud
+1F324 ; unqualified # 🌤 E0.7 sun behind small cloud
+1F325 FE0F ; fully-qualified # 🌥️ E0.7 sun behind large cloud
+1F325 ; unqualified # 🌥 E0.7 sun behind large cloud
+1F326 FE0F ; fully-qualified # 🌦️ E0.7 sun behind rain cloud
+1F326 ; unqualified # 🌦 E0.7 sun behind rain cloud
+1F327 FE0F ; fully-qualified # 🌧️ E0.7 cloud with rain
+1F327 ; unqualified # 🌧 E0.7 cloud with rain
+1F328 FE0F ; fully-qualified # 🌨️ E0.7 cloud with snow
+1F328 ; unqualified # 🌨 E0.7 cloud with snow
+1F329 FE0F ; fully-qualified # 🌩️ E0.7 cloud with lightning
+1F329 ; unqualified # 🌩 E0.7 cloud with lightning
+1F32A FE0F ; fully-qualified # 🌪️ E0.7 tornado
+1F32A ; unqualified # 🌪 E0.7 tornado
+1F32B FE0F ; fully-qualified # 🌫️ E0.7 fog
+1F32B ; unqualified # 🌫 E0.7 fog
+1F32C FE0F ; fully-qualified # 🌬️ E0.7 wind face
+1F32C ; unqualified # 🌬 E0.7 wind face
+1F300 ; fully-qualified # 🌀 E0.6 cyclone
+1F308 ; fully-qualified # 🌈 E0.6 rainbow
+1F302 ; fully-qualified # 🌂 E0.6 closed umbrella
+2602 FE0F ; fully-qualified # ☂️ E0.7 umbrella
+2602 ; unqualified # ☂ E0.7 umbrella
+2614 ; fully-qualified # ☔ E0.6 umbrella with rain drops
+26F1 FE0F ; fully-qualified # ⛱️ E0.7 umbrella on ground
+26F1 ; unqualified # ⛱ E0.7 umbrella on ground
+26A1 ; fully-qualified # ⚡ E0.6 high voltage
+2744 FE0F ; fully-qualified # ❄️ E0.6 snowflake
+2744 ; unqualified # ❄ E0.6 snowflake
+2603 FE0F ; fully-qualified # ☃️ E0.7 snowman
+2603 ; unqualified # ☃ E0.7 snowman
+26C4 ; fully-qualified # ⛄ E0.6 snowman without snow
+2604 FE0F ; fully-qualified # ☄️ E1.0 comet
+2604 ; unqualified # ☄ E1.0 comet
+1F525 ; fully-qualified # 🔥 E0.6 fire
+1F4A7 ; fully-qualified # 💧 E0.6 droplet
+1F30A ; fully-qualified # 🌊 E0.6 water wave
+
+# Travel & Places subtotal: 264
+# Travel & Places subtotal: 264 w/o modifiers
# group: Activities
# subgroup: event
-1F383 ; fully-qualified # 🎃 jack-o-lantern
-1F384 ; fully-qualified # 🎄 Christmas tree
-1F386 ; fully-qualified # 🎆 fireworks
-1F387 ; fully-qualified # 🎇 sparkler
-1F9E8 ; fully-qualified # 🧨 firecracker
-2728 ; fully-qualified # ✨ sparkles
-1F388 ; fully-qualified # 🎈 balloon
-1F389 ; fully-qualified # 🎉 party popper
-1F38A ; fully-qualified # 🎊 confetti ball
-1F38B ; fully-qualified # 🎋 tanabata tree
-1F38D ; fully-qualified # 🎍 pine decoration
-1F38E ; fully-qualified # 🎎 Japanese dolls
-1F38F ; fully-qualified # 🎏 carp streamer
-1F390 ; fully-qualified # 🎐 wind chime
-1F391 ; fully-qualified # 🎑 moon viewing ceremony
-1F9E7 ; fully-qualified # 🧧 red envelope
-1F380 ; fully-qualified # 🎀 ribbon
-1F381 ; fully-qualified # 🎁 wrapped gift
-1F397 FE0F ; fully-qualified # 🎗️ reminder ribbon
-1F397 ; unqualified # 🎗 reminder ribbon
-1F39F FE0F ; fully-qualified # 🎟️ admission tickets
-1F39F ; unqualified # 🎟 admission tickets
-1F3AB ; fully-qualified # 🎫 ticket
+1F383 ; fully-qualified # 🎃 E0.6 jack-o-lantern
+1F384 ; fully-qualified # 🎄 E0.6 Christmas tree
+1F386 ; fully-qualified # 🎆 E0.6 fireworks
+1F387 ; fully-qualified # 🎇 E0.6 sparkler
+1F9E8 ; fully-qualified # 🧨 E11.0 firecracker
+2728 ; fully-qualified # ✨ E0.6 sparkles
+1F388 ; fully-qualified # 🎈 E0.6 balloon
+1F389 ; fully-qualified # 🎉 E0.6 party popper
+1F38A ; fully-qualified # 🎊 E0.6 confetti ball
+1F38B ; fully-qualified # 🎋 E0.6 tanabata tree
+1F38D ; fully-qualified # 🎍 E0.6 pine decoration
+1F38E ; fully-qualified # 🎎 E0.6 Japanese dolls
+1F38F ; fully-qualified # 🎏 E0.6 carp streamer
+1F390 ; fully-qualified # 🎐 E0.6 wind chime
+1F391 ; fully-qualified # 🎑 E0.6 moon viewing ceremony
+1F9E7 ; fully-qualified # 🧧 E11.0 red envelope
+1F380 ; fully-qualified # 🎀 E0.6 ribbon
+1F381 ; fully-qualified # 🎁 E0.6 wrapped gift
+1F397 FE0F ; fully-qualified # 🎗️ E0.7 reminder ribbon
+1F397 ; unqualified # 🎗 E0.7 reminder ribbon
+1F39F FE0F ; fully-qualified # 🎟️ E0.7 admission tickets
+1F39F ; unqualified # 🎟 E0.7 admission tickets
+1F3AB ; fully-qualified # 🎫 E0.6 ticket
# subgroup: award-medal
-1F396 FE0F ; fully-qualified # 🎖️ military medal
-1F396 ; unqualified # 🎖 military medal
-1F3C6 ; fully-qualified # 🏆 trophy
-1F3C5 ; fully-qualified # 🏅 sports medal
-1F947 ; fully-qualified # 🥇 1st place medal
-1F948 ; fully-qualified # 🥈 2nd place medal
-1F949 ; fully-qualified # 🥉 3rd place medal
+1F396 FE0F ; fully-qualified # 🎖️ E0.7 military medal
+1F396 ; unqualified # 🎖 E0.7 military medal
+1F3C6 ; fully-qualified # 🏆 E0.6 trophy
+1F3C5 ; fully-qualified # 🏅 E1.0 sports medal
+1F947 ; fully-qualified # 🥇 E3.0 1st place medal
+1F948 ; fully-qualified # 🥈 E3.0 2nd place medal
+1F949 ; fully-qualified # 🥉 E3.0 3rd place medal
# subgroup: sport
-26BD ; fully-qualified # ⚽ soccer ball
-26BE ; fully-qualified # ⚾ baseball
-1F94E ; fully-qualified # 🥎 softball
-1F3C0 ; fully-qualified # 🏀 basketball
-1F3D0 ; fully-qualified # 🏐 volleyball
-1F3C8 ; fully-qualified # 🏈 american football
-1F3C9 ; fully-qualified # 🏉 rugby football
-1F3BE ; fully-qualified # 🎾 tennis
-1F94F ; fully-qualified # 🥏 flying disc
-1F3B3 ; fully-qualified # 🎳 bowling
-1F3CF ; fully-qualified # 🏏 cricket game
-1F3D1 ; fully-qualified # 🏑 field hockey
-1F3D2 ; fully-qualified # 🏒 ice hockey
-1F94D ; fully-qualified # 🥍 lacrosse
-1F3D3 ; fully-qualified # 🏓 ping pong
-1F3F8 ; fully-qualified # 🏸 badminton
-1F94A ; fully-qualified # 🥊 boxing glove
-1F94B ; fully-qualified # 🥋 martial arts uniform
-1F945 ; fully-qualified # 🥅 goal net
-26F3 ; fully-qualified # ⛳ flag in hole
-26F8 FE0F ; fully-qualified # ⛸️ ice skate
-26F8 ; unqualified # ⛸ ice skate
-1F3A3 ; fully-qualified # 🎣 fishing pole
-1F93F ; fully-qualified # 🤿 diving mask
-1F3BD ; fully-qualified # 🎽 running shirt
-1F3BF ; fully-qualified # 🎿 skis
-1F6F7 ; fully-qualified # 🛷 sled
-1F94C ; fully-qualified # 🥌 curling stone
+26BD ; fully-qualified # ⚽ E0.6 soccer ball
+26BE ; fully-qualified # ⚾ E0.6 baseball
+1F94E ; fully-qualified # 🥎 E11.0 softball
+1F3C0 ; fully-qualified # 🏀 E0.6 basketball
+1F3D0 ; fully-qualified # 🏐 E1.0 volleyball
+1F3C8 ; fully-qualified # 🏈 E0.6 american football
+1F3C9 ; fully-qualified # 🏉 E1.0 rugby football
+1F3BE ; fully-qualified # 🎾 E0.6 tennis
+1F94F ; fully-qualified # 🥏 E11.0 flying disc
+1F3B3 ; fully-qualified # 🎳 E0.6 bowling
+1F3CF ; fully-qualified # 🏏 E1.0 cricket game
+1F3D1 ; fully-qualified # 🏑 E1.0 field hockey
+1F3D2 ; fully-qualified # 🏒 E1.0 ice hockey
+1F94D ; fully-qualified # 🥍 E11.0 lacrosse
+1F3D3 ; fully-qualified # 🏓 E1.0 ping pong
+1F3F8 ; fully-qualified # 🏸 E1.0 badminton
+1F94A ; fully-qualified # 🥊 E3.0 boxing glove
+1F94B ; fully-qualified # 🥋 E3.0 martial arts uniform
+1F945 ; fully-qualified # 🥅 E3.0 goal net
+26F3 ; fully-qualified # ⛳ E0.6 flag in hole
+26F8 FE0F ; fully-qualified # ⛸️ E0.7 ice skate
+26F8 ; unqualified # ⛸ E0.7 ice skate
+1F3A3 ; fully-qualified # 🎣 E0.6 fishing pole
+1F93F ; fully-qualified # 🤿 E12.0 diving mask
+1F3BD ; fully-qualified # 🎽 E0.6 running shirt
+1F3BF ; fully-qualified # 🎿 E0.6 skis
+1F6F7 ; fully-qualified # 🛷 E5.0 sled
+1F94C ; fully-qualified # 🥌 E5.0 curling stone
# subgroup: game
-1F3AF ; fully-qualified # 🎯 direct hit
-1FA80 ; fully-qualified # 🪀 yo-yo
-1FA81 ; fully-qualified # 🪁 kite
-1F3B1 ; fully-qualified # 🎱 pool 8 ball
-1F52E ; fully-qualified # 🔮 crystal ball
-1FA84 ; fully-qualified # 🪄 magic wand
-1F9FF ; fully-qualified # 🧿 nazar amulet
-1F3AE ; fully-qualified # 🎮 video game
-1F579 FE0F ; fully-qualified # 🕹️ joystick
-1F579 ; unqualified # 🕹 joystick
-1F3B0 ; fully-qualified # 🎰 slot machine
-1F3B2 ; fully-qualified # 🎲 game die
-1F9E9 ; fully-qualified # 🧩 puzzle piece
-1F9F8 ; fully-qualified # 🧸 teddy bear
-1FA85 ; fully-qualified # 🪅 piñata
-1FA86 ; fully-qualified # 🪆 nesting dolls
-2660 FE0F ; fully-qualified # ♠️ spade suit
-2660 ; unqualified # ♠ spade suit
-2665 FE0F ; fully-qualified # ♥️ heart suit
-2665 ; unqualified # ♥ heart suit
-2666 FE0F ; fully-qualified # ♦️ diamond suit
-2666 ; unqualified # ♦ diamond suit
-2663 FE0F ; fully-qualified # ♣️ club suit
-2663 ; unqualified # ♣ club suit
-265F FE0F ; fully-qualified # ♟️ chess pawn
-265F ; unqualified # ♟ chess pawn
-1F0CF ; fully-qualified # 🃏 joker
-1F004 ; fully-qualified # 🀄 mahjong red dragon
-1F3B4 ; fully-qualified # 🎴 flower playing cards
+1F3AF ; fully-qualified # 🎯 E0.6 direct hit
+1FA80 ; fully-qualified # 🪀 E12.0 yo-yo
+1FA81 ; fully-qualified # 🪁 E12.0 kite
+1F3B1 ; fully-qualified # 🎱 E0.6 pool 8 ball
+1F52E ; fully-qualified # 🔮 E0.6 crystal ball
+1FA84 ; fully-qualified # 🪄 E13.0 magic wand
+1F9FF ; fully-qualified # 🧿 E11.0 nazar amulet
+1F3AE ; fully-qualified # 🎮 E0.6 video game
+1F579 FE0F ; fully-qualified # 🕹️ E0.7 joystick
+1F579 ; unqualified # 🕹 E0.7 joystick
+1F3B0 ; fully-qualified # 🎰 E0.6 slot machine
+1F3B2 ; fully-qualified # 🎲 E0.6 game die
+1F9E9 ; fully-qualified # 🧩 E11.0 puzzle piece
+1F9F8 ; fully-qualified # 🧸 E11.0 teddy bear
+1FA85 ; fully-qualified # 🪅 E13.0 piñata
+1FA86 ; fully-qualified # 🪆 E13.0 nesting dolls
+2660 FE0F ; fully-qualified # ♠️ E0.6 spade suit
+2660 ; unqualified # ♠ E0.6 spade suit
+2665 FE0F ; fully-qualified # ♥️ E0.6 heart suit
+2665 ; unqualified # ♥ E0.6 heart suit
+2666 FE0F ; fully-qualified # ♦️ E0.6 diamond suit
+2666 ; unqualified # ♦ E0.6 diamond suit
+2663 FE0F ; fully-qualified # ♣️ E0.6 club suit
+2663 ; unqualified # ♣ E0.6 club suit
+265F FE0F ; fully-qualified # ♟️ E11.0 chess pawn
+265F ; unqualified # ♟ E11.0 chess pawn
+1F0CF ; fully-qualified # 🃏 E0.6 joker
+1F004 ; fully-qualified # 🀄 E0.6 mahjong red dragon
+1F3B4 ; fully-qualified # 🎴 E0.6 flower playing cards
# subgroup: arts & crafts
-1F3AD ; fully-qualified # 🎭 performing arts
-1F5BC FE0F ; fully-qualified # 🖼️ framed picture
-1F5BC ; unqualified # 🖼 framed picture
-1F3A8 ; fully-qualified # 🎨 artist palette
-1F9F5 ; fully-qualified # 🧵 thread
-1FAA1 ; fully-qualified # 🪡 sewing needle
-1F9F6 ; fully-qualified # 🧶 yarn
-1FAA2 ; fully-qualified # 🪢 knot
+1F3AD ; fully-qualified # 🎭 E0.6 performing arts
+1F5BC FE0F ; fully-qualified # 🖼️ E0.7 framed picture
+1F5BC ; unqualified # 🖼 E0.7 framed picture
+1F3A8 ; fully-qualified # 🎨 E0.6 artist palette
+1F9F5 ; fully-qualified # 🧵 E11.0 thread
+1FAA1 ; fully-qualified # 🪡 E13.0 sewing needle
+1F9F6 ; fully-qualified # 🧶 E11.0 yarn
+1FAA2 ; fully-qualified # 🪢 E13.0 knot
+
+# Activities subtotal: 95
+# Activities subtotal: 95 w/o modifiers
# group: Objects
# subgroup: clothing
-1F453 ; fully-qualified # 👓 glasses
-1F576 FE0F ; fully-qualified # 🕶️ sunglasses
-1F576 ; unqualified # 🕶 sunglasses
-1F97D ; fully-qualified # 🥽 goggles
-1F97C ; fully-qualified # 🥼 lab coat
-1F9BA ; fully-qualified # 🦺 safety vest
-1F454 ; fully-qualified # 👔 necktie
-1F455 ; fully-qualified # 👕 t-shirt
-1F456 ; fully-qualified # 👖 jeans
-1F9E3 ; fully-qualified # 🧣 scarf
-1F9E4 ; fully-qualified # 🧤 gloves
-1F9E5 ; fully-qualified # 🧥 coat
-1F9E6 ; fully-qualified # 🧦 socks
-1F457 ; fully-qualified # 👗 dress
-1F458 ; fully-qualified # 👘 kimono
-1F97B ; fully-qualified # 🥻 sari
-1FA71 ; fully-qualified # 🩱 one-piece swimsuit
-1FA72 ; fully-qualified # 🩲 briefs
-1FA73 ; fully-qualified # 🩳 shorts
-1F459 ; fully-qualified # 👙 bikini
-1F45A ; fully-qualified # 👚 woman’s clothes
-1F45B ; fully-qualified # 👛 purse
-1F45C ; fully-qualified # 👜 handbag
-1F45D ; fully-qualified # 👝 clutch bag
-1F6CD FE0F ; fully-qualified # 🛍️ shopping bags
-1F6CD ; unqualified # 🛍 shopping bags
-1F392 ; fully-qualified # 🎒 backpack
-1FA74 ; fully-qualified # 🩴 thong sandal
-1F45E ; fully-qualified # 👞 man’s shoe
-1F45F ; fully-qualified # 👟 running shoe
-1F97E ; fully-qualified # 🥾 hiking boot
-1F97F ; fully-qualified # 🥿 flat shoe
-1F460 ; fully-qualified # 👠 high-heeled shoe
-1F461 ; fully-qualified # 👡 woman’s sandal
-1FA70 ; fully-qualified # 🩰 ballet shoes
-1F462 ; fully-qualified # 👢 woman’s boot
-1F451 ; fully-qualified # 👑 crown
-1F452 ; fully-qualified # 👒 woman’s hat
-1F3A9 ; fully-qualified # 🎩 top hat
-1F393 ; fully-qualified # 🎓 graduation cap
-1F9E2 ; fully-qualified # 🧢 billed cap
-1FA96 ; fully-qualified # 🪖 military helmet
-26D1 FE0F ; fully-qualified # ⛑️ rescue worker’s helmet
-26D1 ; unqualified # ⛑ rescue worker’s helmet
-1F4FF ; fully-qualified # 📿 prayer beads
-1F484 ; fully-qualified # 💄 lipstick
-1F48D ; fully-qualified # 💍 ring
-1F48E ; fully-qualified # 💎 gem stone
+1F453 ; fully-qualified # 👓 E0.6 glasses
+1F576 FE0F ; fully-qualified # 🕶️ E0.7 sunglasses
+1F576 ; unqualified # 🕶 E0.7 sunglasses
+1F97D ; fully-qualified # 🥽 E11.0 goggles
+1F97C ; fully-qualified # 🥼 E11.0 lab coat
+1F9BA ; fully-qualified # 🦺 E12.0 safety vest
+1F454 ; fully-qualified # 👔 E0.6 necktie
+1F455 ; fully-qualified # 👕 E0.6 t-shirt
+1F456 ; fully-qualified # 👖 E0.6 jeans
+1F9E3 ; fully-qualified # 🧣 E5.0 scarf
+1F9E4 ; fully-qualified # 🧤 E5.0 gloves
+1F9E5 ; fully-qualified # 🧥 E5.0 coat
+1F9E6 ; fully-qualified # 🧦 E5.0 socks
+1F457 ; fully-qualified # 👗 E0.6 dress
+1F458 ; fully-qualified # 👘 E0.6 kimono
+1F97B ; fully-qualified # 🥻 E12.0 sari
+1FA71 ; fully-qualified # 🩱 E12.0 one-piece swimsuit
+1FA72 ; fully-qualified # 🩲 E12.0 briefs
+1FA73 ; fully-qualified # 🩳 E12.0 shorts
+1F459 ; fully-qualified # 👙 E0.6 bikini
+1F45A ; fully-qualified # 👚 E0.6 woman’s clothes
+1F45B ; fully-qualified # 👛 E0.6 purse
+1F45C ; fully-qualified # 👜 E0.6 handbag
+1F45D ; fully-qualified # 👝 E0.6 clutch bag
+1F6CD FE0F ; fully-qualified # 🛍️ E0.7 shopping bags
+1F6CD ; unqualified # 🛍 E0.7 shopping bags
+1F392 ; fully-qualified # 🎒 E0.6 backpack
+1FA74 ; fully-qualified # 🩴 E13.0 thong sandal
+1F45E ; fully-qualified # 👞 E0.6 man’s shoe
+1F45F ; fully-qualified # 👟 E0.6 running shoe
+1F97E ; fully-qualified # 🥾 E11.0 hiking boot
+1F97F ; fully-qualified # 🥿 E11.0 flat shoe
+1F460 ; fully-qualified # 👠 E0.6 high-heeled shoe
+1F461 ; fully-qualified # 👡 E0.6 woman’s sandal
+1FA70 ; fully-qualified # 🩰 E12.0 ballet shoes
+1F462 ; fully-qualified # 👢 E0.6 woman’s boot
+1F451 ; fully-qualified # 👑 E0.6 crown
+1F452 ; fully-qualified # 👒 E0.6 woman’s hat
+1F3A9 ; fully-qualified # 🎩 E0.6 top hat
+1F393 ; fully-qualified # 🎓 E0.6 graduation cap
+1F9E2 ; fully-qualified # 🧢 E5.0 billed cap
+1FA96 ; fully-qualified # 🪖 E13.0 military helmet
+26D1 FE0F ; fully-qualified # ⛑️ E0.7 rescue worker’s helmet
+26D1 ; unqualified # ⛑ E0.7 rescue worker’s helmet
+1F4FF ; fully-qualified # 📿 E1.0 prayer beads
+1F484 ; fully-qualified # 💄 E0.6 lipstick
+1F48D ; fully-qualified # 💍 E0.6 ring
+1F48E ; fully-qualified # 💎 E0.6 gem stone
# subgroup: sound
-1F507 ; fully-qualified # 🔇 muted speaker
-1F508 ; fully-qualified # 🔈 speaker low volume
-1F509 ; fully-qualified # 🔉 speaker medium volume
-1F50A ; fully-qualified # 🔊 speaker high volume
-1F4E2 ; fully-qualified # 📢 loudspeaker
-1F4E3 ; fully-qualified # 📣 megaphone
-1F4EF ; fully-qualified # 📯 postal horn
-1F514 ; fully-qualified # 🔔 bell
-1F515 ; fully-qualified # 🔕 bell with slash
+1F507 ; fully-qualified # 🔇 E1.0 muted speaker
+1F508 ; fully-qualified # 🔈 E0.7 speaker low volume
+1F509 ; fully-qualified # 🔉 E1.0 speaker medium volume
+1F50A ; fully-qualified # 🔊 E0.6 speaker high volume
+1F4E2 ; fully-qualified # 📢 E0.6 loudspeaker
+1F4E3 ; fully-qualified # 📣 E0.6 megaphone
+1F4EF ; fully-qualified # 📯 E1.0 postal horn
+1F514 ; fully-qualified # 🔔 E0.6 bell
+1F515 ; fully-qualified # 🔕 E1.0 bell with slash
# subgroup: music
-1F3BC ; fully-qualified # 🎼 musical score
-1F3B5 ; fully-qualified # 🎵 musical note
-1F3B6 ; fully-qualified # 🎶 musical notes
-1F399 FE0F ; fully-qualified # 🎙️ studio microphone
-1F399 ; unqualified # 🎙 studio microphone
-1F39A FE0F ; fully-qualified # 🎚️ level slider
-1F39A ; unqualified # 🎚 level slider
-1F39B FE0F ; fully-qualified # 🎛️ control knobs
-1F39B ; unqualified # 🎛 control knobs
-1F3A4 ; fully-qualified # 🎤 microphone
-1F3A7 ; fully-qualified # 🎧 headphone
-1F4FB ; fully-qualified # 📻 radio
+1F3BC ; fully-qualified # 🎼 E0.6 musical score
+1F3B5 ; fully-qualified # 🎵 E0.6 musical note
+1F3B6 ; fully-qualified # 🎶 E0.6 musical notes
+1F399 FE0F ; fully-qualified # 🎙️ E0.7 studio microphone
+1F399 ; unqualified # 🎙 E0.7 studio microphone
+1F39A FE0F ; fully-qualified # 🎚️ E0.7 level slider
+1F39A ; unqualified # 🎚 E0.7 level slider
+1F39B FE0F ; fully-qualified # 🎛️ E0.7 control knobs
+1F39B ; unqualified # 🎛 E0.7 control knobs
+1F3A4 ; fully-qualified # 🎤 E0.6 microphone
+1F3A7 ; fully-qualified # 🎧 E0.6 headphone
+1F4FB ; fully-qualified # 📻 E0.6 radio
# subgroup: musical-instrument
-1F3B7 ; fully-qualified # 🎷 saxophone
-1FA97 ; fully-qualified # 🪗 accordion
-1F3B8 ; fully-qualified # 🎸 guitar
-1F3B9 ; fully-qualified # 🎹 musical keyboard
-1F3BA ; fully-qualified # 🎺 trumpet
-1F3BB ; fully-qualified # 🎻 violin
-1FA95 ; fully-qualified # 🪕 banjo
-1F941 ; fully-qualified # 🥁 drum
-1FA98 ; fully-qualified # 🪘 long drum
+1F3B7 ; fully-qualified # 🎷 E0.6 saxophone
+1FA97 ; fully-qualified # 🪗 E13.0 accordion
+1F3B8 ; fully-qualified # 🎸 E0.6 guitar
+1F3B9 ; fully-qualified # 🎹 E0.6 musical keyboard
+1F3BA ; fully-qualified # 🎺 E0.6 trumpet
+1F3BB ; fully-qualified # 🎻 E0.6 violin
+1FA95 ; fully-qualified # 🪕 E12.0 banjo
+1F941 ; fully-qualified # 🥁 E3.0 drum
+1FA98 ; fully-qualified # 🪘 E13.0 long drum
# subgroup: phone
-1F4F1 ; fully-qualified # 📱 mobile phone
-1F4F2 ; fully-qualified # 📲 mobile phone with arrow
-260E FE0F ; fully-qualified # ☎️ telephone
-260E ; unqualified # ☎ telephone
-1F4DE ; fully-qualified # 📞 telephone receiver
-1F4DF ; fully-qualified # 📟 pager
-1F4E0 ; fully-qualified # 📠 fax machine
+1F4F1 ; fully-qualified # 📱 E0.6 mobile phone
+1F4F2 ; fully-qualified # 📲 E0.6 mobile phone with arrow
+260E FE0F ; fully-qualified # ☎️ E0.6 telephone
+260E ; unqualified # ☎ E0.6 telephone
+1F4DE ; fully-qualified # 📞 E0.6 telephone receiver
+1F4DF ; fully-qualified # 📟 E0.6 pager
+1F4E0 ; fully-qualified # 📠 E0.6 fax machine
# subgroup: computer
-1F50B ; fully-qualified # 🔋 battery
-1F50C ; fully-qualified # 🔌 electric plug
-1F4BB ; fully-qualified # 💻 laptop
-1F5A5 FE0F ; fully-qualified # 🖥️ desktop computer
-1F5A5 ; unqualified # 🖥 desktop computer
-1F5A8 FE0F ; fully-qualified # 🖨️ printer
-1F5A8 ; unqualified # 🖨 printer
-2328 FE0F ; fully-qualified # ⌨️ keyboard
-2328 ; unqualified # ⌨ keyboard
-1F5B1 FE0F ; fully-qualified # 🖱️ computer mouse
-1F5B1 ; unqualified # 🖱 computer mouse
-1F5B2 FE0F ; fully-qualified # 🖲️ trackball
-1F5B2 ; unqualified # 🖲 trackball
-1F4BD ; fully-qualified # 💽 computer disk
-1F4BE ; fully-qualified # 💾 floppy disk
-1F4BF ; fully-qualified # 💿 optical disk
-1F4C0 ; fully-qualified # 📀 dvd
-1F9EE ; fully-qualified # 🧮 abacus
+1F50B ; fully-qualified # 🔋 E0.6 battery
+1F50C ; fully-qualified # 🔌 E0.6 electric plug
+1F4BB ; fully-qualified # 💻 E0.6 laptop
+1F5A5 FE0F ; fully-qualified # 🖥️ E0.7 desktop computer
+1F5A5 ; unqualified # 🖥 E0.7 desktop computer
+1F5A8 FE0F ; fully-qualified # 🖨️ E0.7 printer
+1F5A8 ; unqualified # 🖨 E0.7 printer
+2328 FE0F ; fully-qualified # ⌨️ E1.0 keyboard
+2328 ; unqualified # ⌨ E1.0 keyboard
+1F5B1 FE0F ; fully-qualified # 🖱️ E0.7 computer mouse
+1F5B1 ; unqualified # 🖱 E0.7 computer mouse
+1F5B2 FE0F ; fully-qualified # 🖲️ E0.7 trackball
+1F5B2 ; unqualified # 🖲 E0.7 trackball
+1F4BD ; fully-qualified # 💽 E0.6 computer disk
+1F4BE ; fully-qualified # 💾 E0.6 floppy disk
+1F4BF ; fully-qualified # 💿 E0.6 optical disk
+1F4C0 ; fully-qualified # 📀 E0.6 dvd
+1F9EE ; fully-qualified # 🧮 E11.0 abacus
# subgroup: light & video
-1F3A5 ; fully-qualified # 🎥 movie camera
-1F39E FE0F ; fully-qualified # 🎞️ film frames
-1F39E ; unqualified # 🎞 film frames
-1F4FD FE0F ; fully-qualified # 📽️ film projector
-1F4FD ; unqualified # 📽 film projector
-1F3AC ; fully-qualified # 🎬 clapper board
-1F4FA ; fully-qualified # 📺 television
-1F4F7 ; fully-qualified # 📷 camera
-1F4F8 ; fully-qualified # 📸 camera with flash
-1F4F9 ; fully-qualified # 📹 video camera
-1F4FC ; fully-qualified # 📼 videocassette
-1F50D ; fully-qualified # 🔍 magnifying glass tilted left
-1F50E ; fully-qualified # 🔎 magnifying glass tilted right
-1F56F FE0F ; fully-qualified # 🕯️ candle
-1F56F ; unqualified # 🕯 candle
-1F4A1 ; fully-qualified # 💡 light bulb
-1F526 ; fully-qualified # 🔦 flashlight
-1F3EE ; fully-qualified # 🏮 red paper lantern
-1FA94 ; fully-qualified # 🪔 diya lamp
+1F3A5 ; fully-qualified # 🎥 E0.6 movie camera
+1F39E FE0F ; fully-qualified # 🎞️ E0.7 film frames
+1F39E ; unqualified # 🎞 E0.7 film frames
+1F4FD FE0F ; fully-qualified # 📽️ E0.7 film projector
+1F4FD ; unqualified # 📽 E0.7 film projector
+1F3AC ; fully-qualified # 🎬 E0.6 clapper board
+1F4FA ; fully-qualified # 📺 E0.6 television
+1F4F7 ; fully-qualified # 📷 E0.6 camera
+1F4F8 ; fully-qualified # 📸 E1.0 camera with flash
+1F4F9 ; fully-qualified # 📹 E0.6 video camera
+1F4FC ; fully-qualified # 📼 E0.6 videocassette
+1F50D ; fully-qualified # 🔍 E0.6 magnifying glass tilted left
+1F50E ; fully-qualified # 🔎 E0.6 magnifying glass tilted right
+1F56F FE0F ; fully-qualified # 🕯️ E0.7 candle
+1F56F ; unqualified # 🕯 E0.7 candle
+1F4A1 ; fully-qualified # 💡 E0.6 light bulb
+1F526 ; fully-qualified # 🔦 E0.6 flashlight
+1F3EE ; fully-qualified # 🏮 E0.6 red paper lantern
+1FA94 ; fully-qualified # 🪔 E12.0 diya lamp
# subgroup: book-paper
-1F4D4 ; fully-qualified # 📔 notebook with decorative cover
-1F4D5 ; fully-qualified # 📕 closed book
-1F4D6 ; fully-qualified # 📖 open book
-1F4D7 ; fully-qualified # 📗 green book
-1F4D8 ; fully-qualified # 📘 blue book
-1F4D9 ; fully-qualified # 📙 orange book
-1F4DA ; fully-qualified # 📚 books
-1F4D3 ; fully-qualified # 📓 notebook
-1F4D2 ; fully-qualified # 📒 ledger
-1F4C3 ; fully-qualified # 📃 page with curl
-1F4DC ; fully-qualified # 📜 scroll
-1F4C4 ; fully-qualified # 📄 page facing up
-1F4F0 ; fully-qualified # 📰 newspaper
-1F5DE FE0F ; fully-qualified # 🗞️ rolled-up newspaper
-1F5DE ; unqualified # 🗞 rolled-up newspaper
-1F4D1 ; fully-qualified # 📑 bookmark tabs
-1F516 ; fully-qualified # 🔖 bookmark
-1F3F7 FE0F ; fully-qualified # 🏷️ label
-1F3F7 ; unqualified # 🏷 label
+1F4D4 ; fully-qualified # 📔 E0.6 notebook with decorative cover
+1F4D5 ; fully-qualified # 📕 E0.6 closed book
+1F4D6 ; fully-qualified # 📖 E0.6 open book
+1F4D7 ; fully-qualified # 📗 E0.6 green book
+1F4D8 ; fully-qualified # 📘 E0.6 blue book
+1F4D9 ; fully-qualified # 📙 E0.6 orange book
+1F4DA ; fully-qualified # 📚 E0.6 books
+1F4D3 ; fully-qualified # 📓 E0.6 notebook
+1F4D2 ; fully-qualified # 📒 E0.6 ledger
+1F4C3 ; fully-qualified # 📃 E0.6 page with curl
+1F4DC ; fully-qualified # 📜 E0.6 scroll
+1F4C4 ; fully-qualified # 📄 E0.6 page facing up
+1F4F0 ; fully-qualified # 📰 E0.6 newspaper
+1F5DE FE0F ; fully-qualified # 🗞️ E0.7 rolled-up newspaper
+1F5DE ; unqualified # 🗞 E0.7 rolled-up newspaper
+1F4D1 ; fully-qualified # 📑 E0.6 bookmark tabs
+1F516 ; fully-qualified # 🔖 E0.6 bookmark
+1F3F7 FE0F ; fully-qualified # 🏷️ E0.7 label
+1F3F7 ; unqualified # 🏷 E0.7 label
# subgroup: money
-1F4B0 ; fully-qualified # 💰 money bag
-1FA99 ; fully-qualified # 🪙 coin
-1F4B4 ; fully-qualified # 💴 yen banknote
-1F4B5 ; fully-qualified # 💵 dollar banknote
-1F4B6 ; fully-qualified # 💶 euro banknote
-1F4B7 ; fully-qualified # 💷 pound banknote
-1F4B8 ; fully-qualified # 💸 money with wings
-1F4B3 ; fully-qualified # 💳 credit card
-1F9FE ; fully-qualified # 🧾 receipt
-1F4B9 ; fully-qualified # 💹 chart increasing with yen
+1F4B0 ; fully-qualified # 💰 E0.6 money bag
+1FA99 ; fully-qualified # 🪙 E13.0 coin
+1F4B4 ; fully-qualified # 💴 E0.6 yen banknote
+1F4B5 ; fully-qualified # 💵 E0.6 dollar banknote
+1F4B6 ; fully-qualified # 💶 E1.0 euro banknote
+1F4B7 ; fully-qualified # 💷 E1.0 pound banknote
+1F4B8 ; fully-qualified # 💸 E0.6 money with wings
+1F4B3 ; fully-qualified # 💳 E0.6 credit card
+1F9FE ; fully-qualified # 🧾 E11.0 receipt
+1F4B9 ; fully-qualified # 💹 E0.6 chart increasing with yen
# subgroup: mail
-2709 FE0F ; fully-qualified # ✉️ envelope
-2709 ; unqualified # ✉ envelope
-1F4E7 ; fully-qualified # 📧 e-mail
-1F4E8 ; fully-qualified # 📨 incoming envelope
-1F4E9 ; fully-qualified # 📩 envelope with arrow
-1F4E4 ; fully-qualified # 📤 outbox tray
-1F4E5 ; fully-qualified # 📥 inbox tray
-1F4E6 ; fully-qualified # 📦 package
-1F4EB ; fully-qualified # 📫 closed mailbox with raised flag
-1F4EA ; fully-qualified # 📪 closed mailbox with lowered flag
-1F4EC ; fully-qualified # 📬 open mailbox with raised flag
-1F4ED ; fully-qualified # 📭 open mailbox with lowered flag
-1F4EE ; fully-qualified # 📮 postbox
-1F5F3 FE0F ; fully-qualified # 🗳️ ballot box with ballot
-1F5F3 ; unqualified # 🗳 ballot box with ballot
+2709 FE0F ; fully-qualified # ✉️ E0.6 envelope
+2709 ; unqualified # ✉ E0.6 envelope
+1F4E7 ; fully-qualified # 📧 E0.6 e-mail
+1F4E8 ; fully-qualified # 📨 E0.6 incoming envelope
+1F4E9 ; fully-qualified # 📩 E0.6 envelope with arrow
+1F4E4 ; fully-qualified # 📤 E0.6 outbox tray
+1F4E5 ; fully-qualified # 📥 E0.6 inbox tray
+1F4E6 ; fully-qualified # 📦 E0.6 package
+1F4EB ; fully-qualified # 📫 E0.6 closed mailbox with raised flag
+1F4EA ; fully-qualified # 📪 E0.6 closed mailbox with lowered flag
+1F4EC ; fully-qualified # 📬 E0.7 open mailbox with raised flag
+1F4ED ; fully-qualified # 📭 E0.7 open mailbox with lowered flag
+1F4EE ; fully-qualified # 📮 E0.6 postbox
+1F5F3 FE0F ; fully-qualified # 🗳️ E0.7 ballot box with ballot
+1F5F3 ; unqualified # 🗳 E0.7 ballot box with ballot
# subgroup: writing
-270F FE0F ; fully-qualified # ✏️ pencil
-270F ; unqualified # ✏ pencil
-2712 FE0F ; fully-qualified # ✒️ black nib
-2712 ; unqualified # ✒ black nib
-1F58B FE0F ; fully-qualified # 🖋️ fountain pen
-1F58B ; unqualified # 🖋 fountain pen
-1F58A FE0F ; fully-qualified # 🖊️ pen
-1F58A ; unqualified # 🖊 pen
-1F58C FE0F ; fully-qualified # 🖌️ paintbrush
-1F58C ; unqualified # 🖌 paintbrush
-1F58D FE0F ; fully-qualified # 🖍️ crayon
-1F58D ; unqualified # 🖍 crayon
-1F4DD ; fully-qualified # 📝 memo
+270F FE0F ; fully-qualified # ✏️ E0.6 pencil
+270F ; unqualified # ✏ E0.6 pencil
+2712 FE0F ; fully-qualified # ✒️ E0.6 black nib
+2712 ; unqualified # ✒ E0.6 black nib
+1F58B FE0F ; fully-qualified # 🖋️ E0.7 fountain pen
+1F58B ; unqualified # 🖋 E0.7 fountain pen
+1F58A FE0F ; fully-qualified # 🖊️ E0.7 pen
+1F58A ; unqualified # 🖊 E0.7 pen
+1F58C FE0F ; fully-qualified # 🖌️ E0.7 paintbrush
+1F58C ; unqualified # 🖌 E0.7 paintbrush
+1F58D FE0F ; fully-qualified # 🖍️ E0.7 crayon
+1F58D ; unqualified # 🖍 E0.7 crayon
+1F4DD ; fully-qualified # 📝 E0.6 memo
# subgroup: office
-1F4BC ; fully-qualified # 💼 briefcase
-1F4C1 ; fully-qualified # 📁 file folder
-1F4C2 ; fully-qualified # 📂 open file folder
-1F5C2 FE0F ; fully-qualified # 🗂️ card index dividers
-1F5C2 ; unqualified # 🗂 card index dividers
-1F4C5 ; fully-qualified # 📅 calendar
-1F4C6 ; fully-qualified # 📆 tear-off calendar
-1F5D2 FE0F ; fully-qualified # 🗒️ spiral notepad
-1F5D2 ; unqualified # 🗒 spiral notepad
-1F5D3 FE0F ; fully-qualified # 🗓️ spiral calendar
-1F5D3 ; unqualified # 🗓 spiral calendar
-1F4C7 ; fully-qualified # 📇 card index
-1F4C8 ; fully-qualified # 📈 chart increasing
-1F4C9 ; fully-qualified # 📉 chart decreasing
-1F4CA ; fully-qualified # 📊 bar chart
-1F4CB ; fully-qualified # 📋 clipboard
-1F4CC ; fully-qualified # 📌 pushpin
-1F4CD ; fully-qualified # 📍 round pushpin
-1F4CE ; fully-qualified # 📎 paperclip
-1F587 FE0F ; fully-qualified # 🖇️ linked paperclips
-1F587 ; unqualified # 🖇 linked paperclips
-1F4CF ; fully-qualified # 📏 straight ruler
-1F4D0 ; fully-qualified # 📐 triangular ruler
-2702 FE0F ; fully-qualified # ✂️ scissors
-2702 ; unqualified # ✂ scissors
-1F5C3 FE0F ; fully-qualified # 🗃️ card file box
-1F5C3 ; unqualified # 🗃 card file box
-1F5C4 FE0F ; fully-qualified # 🗄️ file cabinet
-1F5C4 ; unqualified # 🗄 file cabinet
-1F5D1 FE0F ; fully-qualified # 🗑️ wastebasket
-1F5D1 ; unqualified # 🗑 wastebasket
+1F4BC ; fully-qualified # 💼 E0.6 briefcase
+1F4C1 ; fully-qualified # 📁 E0.6 file folder
+1F4C2 ; fully-qualified # 📂 E0.6 open file folder
+1F5C2 FE0F ; fully-qualified # 🗂️ E0.7 card index dividers
+1F5C2 ; unqualified # 🗂 E0.7 card index dividers
+1F4C5 ; fully-qualified # 📅 E0.6 calendar
+1F4C6 ; fully-qualified # 📆 E0.6 tear-off calendar
+1F5D2 FE0F ; fully-qualified # 🗒️ E0.7 spiral notepad
+1F5D2 ; unqualified # 🗒 E0.7 spiral notepad
+1F5D3 FE0F ; fully-qualified # 🗓️ E0.7 spiral calendar
+1F5D3 ; unqualified # 🗓 E0.7 spiral calendar
+1F4C7 ; fully-qualified # 📇 E0.6 card index
+1F4C8 ; fully-qualified # 📈 E0.6 chart increasing
+1F4C9 ; fully-qualified # 📉 E0.6 chart decreasing
+1F4CA ; fully-qualified # 📊 E0.6 bar chart
+1F4CB ; fully-qualified # 📋 E0.6 clipboard
+1F4CC ; fully-qualified # 📌 E0.6 pushpin
+1F4CD ; fully-qualified # 📍 E0.6 round pushpin
+1F4CE ; fully-qualified # 📎 E0.6 paperclip
+1F587 FE0F ; fully-qualified # 🖇️ E0.7 linked paperclips
+1F587 ; unqualified # 🖇 E0.7 linked paperclips
+1F4CF ; fully-qualified # 📏 E0.6 straight ruler
+1F4D0 ; fully-qualified # 📐 E0.6 triangular ruler
+2702 FE0F ; fully-qualified # ✂️ E0.6 scissors
+2702 ; unqualified # ✂ E0.6 scissors
+1F5C3 FE0F ; fully-qualified # 🗃️ E0.7 card file box
+1F5C3 ; unqualified # 🗃 E0.7 card file box
+1F5C4 FE0F ; fully-qualified # 🗄️ E0.7 file cabinet
+1F5C4 ; unqualified # 🗄 E0.7 file cabinet
+1F5D1 FE0F ; fully-qualified # 🗑️ E0.7 wastebasket
+1F5D1 ; unqualified # 🗑 E0.7 wastebasket
# subgroup: lock
-1F512 ; fully-qualified # 🔒 locked
-1F513 ; fully-qualified # 🔓 unlocked
-1F50F ; fully-qualified # 🔏 locked with pen
-1F510 ; fully-qualified # 🔐 locked with key
-1F511 ; fully-qualified # 🔑 key
-1F5DD FE0F ; fully-qualified # 🗝️ old key
-1F5DD ; unqualified # 🗝 old key
+1F512 ; fully-qualified # 🔒 E0.6 locked
+1F513 ; fully-qualified # 🔓 E0.6 unlocked
+1F50F ; fully-qualified # 🔏 E0.6 locked with pen
+1F510 ; fully-qualified # 🔐 E0.6 locked with key
+1F511 ; fully-qualified # 🔑 E0.6 key
+1F5DD FE0F ; fully-qualified # 🗝️ E0.7 old key
+1F5DD ; unqualified # 🗝 E0.7 old key
# subgroup: tool
-1F528 ; fully-qualified # 🔨 hammer
-1FA93 ; fully-qualified # 🪓 axe
-26CF FE0F ; fully-qualified # ⛏️ pick
-26CF ; unqualified # ⛏ pick
-2692 FE0F ; fully-qualified # ⚒️ hammer and pick
-2692 ; unqualified # ⚒ hammer and pick
-1F6E0 FE0F ; fully-qualified # 🛠️ hammer and wrench
-1F6E0 ; unqualified # 🛠 hammer and wrench
-1F5E1 FE0F ; fully-qualified # 🗡️ dagger
-1F5E1 ; unqualified # 🗡 dagger
-2694 FE0F ; fully-qualified # ⚔️ crossed swords
-2694 ; unqualified # ⚔ crossed swords
-1F52B ; fully-qualified # 🔫 pistol
-1FA83 ; fully-qualified # 🪃 boomerang
-1F3F9 ; fully-qualified # 🏹 bow and arrow
-1F6E1 FE0F ; fully-qualified # 🛡️ shield
-1F6E1 ; unqualified # 🛡 shield
-1FA9A ; fully-qualified # 🪚 carpentry saw
-1F527 ; fully-qualified # 🔧 wrench
-1FA9B ; fully-qualified # 🪛 screwdriver
-1F529 ; fully-qualified # 🔩 nut and bolt
-2699 FE0F ; fully-qualified # ⚙️ gear
-2699 ; unqualified # ⚙ gear
-1F5DC FE0F ; fully-qualified # 🗜️ clamp
-1F5DC ; unqualified # 🗜 clamp
-2696 FE0F ; fully-qualified # ⚖️ balance scale
-2696 ; unqualified # ⚖ balance scale
-1F9AF ; fully-qualified # 🦯 white cane
-1F517 ; fully-qualified # 🔗 link
-26D3 FE0F ; fully-qualified # ⛓️ chains
-26D3 ; unqualified # ⛓ chains
-1FA9D ; fully-qualified # 🪝 hook
-1F9F0 ; fully-qualified # 🧰 toolbox
-1F9F2 ; fully-qualified # 🧲 magnet
-1FA9C ; fully-qualified # 🪜 ladder
+1F528 ; fully-qualified # 🔨 E0.6 hammer
+1FA93 ; fully-qualified # 🪓 E12.0 axe
+26CF FE0F ; fully-qualified # ⛏️ E0.7 pick
+26CF ; unqualified # ⛏ E0.7 pick
+2692 FE0F ; fully-qualified # ⚒️ E1.0 hammer and pick
+2692 ; unqualified # ⚒ E1.0 hammer and pick
+1F6E0 FE0F ; fully-qualified # 🛠️ E0.7 hammer and wrench
+1F6E0 ; unqualified # 🛠 E0.7 hammer and wrench
+1F5E1 FE0F ; fully-qualified # 🗡️ E0.7 dagger
+1F5E1 ; unqualified # 🗡 E0.7 dagger
+2694 FE0F ; fully-qualified # ⚔️ E1.0 crossed swords
+2694 ; unqualified # ⚔ E1.0 crossed swords
+1F52B ; fully-qualified # 🔫 E0.6 pistol
+1FA83 ; fully-qualified # 🪃 E13.0 boomerang
+1F3F9 ; fully-qualified # 🏹 E1.0 bow and arrow
+1F6E1 FE0F ; fully-qualified # 🛡️ E0.7 shield
+1F6E1 ; unqualified # 🛡 E0.7 shield
+1FA9A ; fully-qualified # 🪚 E13.0 carpentry saw
+1F527 ; fully-qualified # 🔧 E0.6 wrench
+1FA9B ; fully-qualified # 🪛 E13.0 screwdriver
+1F529 ; fully-qualified # 🔩 E0.6 nut and bolt
+2699 FE0F ; fully-qualified # ⚙️ E1.0 gear
+2699 ; unqualified # ⚙ E1.0 gear
+1F5DC FE0F ; fully-qualified # 🗜️ E0.7 clamp
+1F5DC ; unqualified # 🗜 E0.7 clamp
+2696 FE0F ; fully-qualified # ⚖️ E1.0 balance scale
+2696 ; unqualified # ⚖ E1.0 balance scale
+1F9AF ; fully-qualified # 🦯 E12.0 white cane
+1F517 ; fully-qualified # 🔗 E0.6 link
+26D3 FE0F ; fully-qualified # ⛓️ E0.7 chains
+26D3 ; unqualified # ⛓ E0.7 chains
+1FA9D ; fully-qualified # 🪝 E13.0 hook
+1F9F0 ; fully-qualified # 🧰 E11.0 toolbox
+1F9F2 ; fully-qualified # 🧲 E11.0 magnet
+1FA9C ; fully-qualified # 🪜 E13.0 ladder
# subgroup: science
-2697 FE0F ; fully-qualified # ⚗️ alembic
-2697 ; unqualified # ⚗ alembic
-1F9EA ; fully-qualified # 🧪 test tube
-1F9EB ; fully-qualified # 🧫 petri dish
-1F9EC ; fully-qualified # 🧬 dna
-1F52C ; fully-qualified # 🔬 microscope
-1F52D ; fully-qualified # 🔭 telescope
-1F4E1 ; fully-qualified # 📡 satellite antenna
+2697 FE0F ; fully-qualified # ⚗️ E1.0 alembic
+2697 ; unqualified # ⚗ E1.0 alembic
+1F9EA ; fully-qualified # 🧪 E11.0 test tube
+1F9EB ; fully-qualified # 🧫 E11.0 petri dish
+1F9EC ; fully-qualified # 🧬 E11.0 dna
+1F52C ; fully-qualified # 🔬 E1.0 microscope
+1F52D ; fully-qualified # 🔭 E1.0 telescope
+1F4E1 ; fully-qualified # 📡 E0.6 satellite antenna
# subgroup: medical
-1F489 ; fully-qualified # 💉 syringe
-1FA78 ; fully-qualified # 🩸 drop of blood
-1F48A ; fully-qualified # 💊 pill
-1FA79 ; fully-qualified # 🩹 adhesive bandage
-1FA7A ; fully-qualified # 🩺 stethoscope
+1F489 ; fully-qualified # 💉 E0.6 syringe
+1FA78 ; fully-qualified # 🩸 E12.0 drop of blood
+1F48A ; fully-qualified # 💊 E0.6 pill
+1FA79 ; fully-qualified # 🩹 E12.0 adhesive bandage
+1FA7A ; fully-qualified # 🩺 E12.0 stethoscope
# subgroup: household
-1F6AA ; fully-qualified # 🚪 door
-1F6D7 ; fully-qualified # 🛗 elevator
-1FA9E ; fully-qualified # 🪞 mirror
-1FA9F ; fully-qualified # 🪟 window
-1F6CF FE0F ; fully-qualified # 🛏️ bed
-1F6CF ; unqualified # 🛏 bed
-1F6CB FE0F ; fully-qualified # 🛋️ couch and lamp
-1F6CB ; unqualified # 🛋 couch and lamp
-1FA91 ; fully-qualified # 🪑 chair
-1F6BD ; fully-qualified # 🚽 toilet
-1FAA0 ; fully-qualified # 🪠 plunger
-1F6BF ; fully-qualified # 🚿 shower
-1F6C1 ; fully-qualified # 🛁 bathtub
-1FAA4 ; fully-qualified # 🪤 mouse trap
-1FA92 ; fully-qualified # 🪒 razor
-1F9F4 ; fully-qualified # 🧴 lotion bottle
-1F9F7 ; fully-qualified # 🧷 safety pin
-1F9F9 ; fully-qualified # 🧹 broom
-1F9FA ; fully-qualified # 🧺 basket
-1F9FB ; fully-qualified # 🧻 roll of paper
-1FAA3 ; fully-qualified # 🪣 bucket
-1F9FC ; fully-qualified # 🧼 soap
-1FAA5 ; fully-qualified # 🪥 toothbrush
-1F9FD ; fully-qualified # 🧽 sponge
-1F9EF ; fully-qualified # 🧯 fire extinguisher
-1F6D2 ; fully-qualified # 🛒 shopping cart
+1F6AA ; fully-qualified # 🚪 E0.6 door
+1F6D7 ; fully-qualified # 🛗 E13.0 elevator
+1FA9E ; fully-qualified # 🪞 E13.0 mirror
+1FA9F ; fully-qualified # 🪟 E13.0 window
+1F6CF FE0F ; fully-qualified # 🛏️ E0.7 bed
+1F6CF ; unqualified # 🛏 E0.7 bed
+1F6CB FE0F ; fully-qualified # 🛋️ E0.7 couch and lamp
+1F6CB ; unqualified # 🛋 E0.7 couch and lamp
+1FA91 ; fully-qualified # 🪑 E12.0 chair
+1F6BD ; fully-qualified # 🚽 E0.6 toilet
+1FAA0 ; fully-qualified # 🪠 E13.0 plunger
+1F6BF ; fully-qualified # 🚿 E1.0 shower
+1F6C1 ; fully-qualified # 🛁 E1.0 bathtub
+1FAA4 ; fully-qualified # 🪤 E13.0 mouse trap
+1FA92 ; fully-qualified # 🪒 E12.0 razor
+1F9F4 ; fully-qualified # 🧴 E11.0 lotion bottle
+1F9F7 ; fully-qualified # 🧷 E11.0 safety pin
+1F9F9 ; fully-qualified # 🧹 E11.0 broom
+1F9FA ; fully-qualified # 🧺 E11.0 basket
+1F9FB ; fully-qualified # 🧻 E11.0 roll of paper
+1FAA3 ; fully-qualified # 🪣 E13.0 bucket
+1F9FC ; fully-qualified # 🧼 E11.0 soap
+1FAA5 ; fully-qualified # 🪥 E13.0 toothbrush
+1F9FD ; fully-qualified # 🧽 E11.0 sponge
+1F9EF ; fully-qualified # 🧯 E11.0 fire extinguisher
+1F6D2 ; fully-qualified # 🛒 E3.0 shopping cart
# subgroup: other-object
-1F6AC ; fully-qualified # 🚬 cigarette
-26B0 FE0F ; fully-qualified # ⚰️ coffin
-26B0 ; unqualified # ⚰ coffin
-1FAA6 ; fully-qualified # 🪦 headstone
-26B1 FE0F ; fully-qualified # ⚱️ funeral urn
-26B1 ; unqualified # ⚱ funeral urn
-1F5FF ; fully-qualified # 🗿 moai
-1FAA7 ; fully-qualified # 🪧 placard
+1F6AC ; fully-qualified # 🚬 E0.6 cigarette
+26B0 FE0F ; fully-qualified # ⚰️ E1.0 coffin
+26B0 ; unqualified # ⚰ E1.0 coffin
+1FAA6 ; fully-qualified # 🪦 E13.0 headstone
+26B1 FE0F ; fully-qualified # ⚱️ E1.0 funeral urn
+26B1 ; unqualified # ⚱ E1.0 funeral urn
+1F5FF ; fully-qualified # 🗿 E0.6 moai
+1FAA7 ; fully-qualified # 🪧 E13.0 placard
+
+# Objects subtotal: 299
+# Objects subtotal: 299 w/o modifiers
# group: Symbols
# subgroup: transport-sign
-1F3E7 ; fully-qualified # 🏧 ATM sign
-1F6AE ; fully-qualified # 🚮 litter in bin sign
-1F6B0 ; fully-qualified # 🚰 potable water
-267F ; fully-qualified # ♿ wheelchair symbol
-1F6B9 ; fully-qualified # 🚹 men’s room
-1F6BA ; fully-qualified # 🚺 women’s room
-1F6BB ; fully-qualified # 🚻 restroom
-1F6BC ; fully-qualified # 🚼 baby symbol
-1F6BE ; fully-qualified # 🚾 water closet
-1F6C2 ; fully-qualified # 🛂 passport control
-1F6C3 ; fully-qualified # 🛃 customs
-1F6C4 ; fully-qualified # 🛄 baggage claim
-1F6C5 ; fully-qualified # 🛅 left luggage
+1F3E7 ; fully-qualified # 🏧 E0.6 ATM sign
+1F6AE ; fully-qualified # 🚮 E1.0 litter in bin sign
+1F6B0 ; fully-qualified # 🚰 E1.0 potable water
+267F ; fully-qualified # ♿ E0.6 wheelchair symbol
+1F6B9 ; fully-qualified # 🚹 E0.6 men’s room
+1F6BA ; fully-qualified # 🚺 E0.6 women’s room
+1F6BB ; fully-qualified # 🚻 E0.6 restroom
+1F6BC ; fully-qualified # 🚼 E0.6 baby symbol
+1F6BE ; fully-qualified # 🚾 E0.6 water closet
+1F6C2 ; fully-qualified # 🛂 E1.0 passport control
+1F6C3 ; fully-qualified # 🛃 E1.0 customs
+1F6C4 ; fully-qualified # 🛄 E1.0 baggage claim
+1F6C5 ; fully-qualified # 🛅 E1.0 left luggage
# subgroup: warning
-26A0 FE0F ; fully-qualified # ⚠️ warning
-26A0 ; unqualified # ⚠ warning
-1F6B8 ; fully-qualified # 🚸 children crossing
-26D4 ; fully-qualified # ⛔ no entry
-1F6AB ; fully-qualified # 🚫 prohibited
-1F6B3 ; fully-qualified # 🚳 no bicycles
-1F6AD ; fully-qualified # 🚭 no smoking
-1F6AF ; fully-qualified # 🚯 no littering
-1F6B1 ; fully-qualified # 🚱 non-potable water
-1F6B7 ; fully-qualified # 🚷 no pedestrians
-1F4F5 ; fully-qualified # 📵 no mobile phones
-1F51E ; fully-qualified # 🔞 no one under eighteen
-2622 FE0F ; fully-qualified # ☢️ radioactive
-2622 ; unqualified # ☢ radioactive
-2623 FE0F ; fully-qualified # ☣️ biohazard
-2623 ; unqualified # ☣ biohazard
+26A0 FE0F ; fully-qualified # ⚠️ E0.6 warning
+26A0 ; unqualified # ⚠ E0.6 warning
+1F6B8 ; fully-qualified # 🚸 E1.0 children crossing
+26D4 ; fully-qualified # ⛔ E0.6 no entry
+1F6AB ; fully-qualified # 🚫 E0.6 prohibited
+1F6B3 ; fully-qualified # 🚳 E1.0 no bicycles
+1F6AD ; fully-qualified # 🚭 E0.6 no smoking
+1F6AF ; fully-qualified # 🚯 E1.0 no littering
+1F6B1 ; fully-qualified # 🚱 E1.0 non-potable water
+1F6B7 ; fully-qualified # 🚷 E1.0 no pedestrians
+1F4F5 ; fully-qualified # 📵 E1.0 no mobile phones
+1F51E ; fully-qualified # 🔞 E0.6 no one under eighteen
+2622 FE0F ; fully-qualified # ☢️ E1.0 radioactive
+2622 ; unqualified # ☢ E1.0 radioactive
+2623 FE0F ; fully-qualified # ☣️ E1.0 biohazard
+2623 ; unqualified # ☣ E1.0 biohazard
# subgroup: arrow
-2B06 FE0F ; fully-qualified # ⬆️ up arrow
-2B06 ; unqualified # ⬆ up arrow
-2197 FE0F ; fully-qualified # ↗️ up-right arrow
-2197 ; unqualified # ↗ up-right arrow
-27A1 FE0F ; fully-qualified # ➡️ right arrow
-27A1 ; unqualified # ➡ right arrow
-2198 FE0F ; fully-qualified # ↘️ down-right arrow
-2198 ; unqualified # ↘ down-right arrow
-2B07 FE0F ; fully-qualified # ⬇️ down arrow
-2B07 ; unqualified # ⬇ down arrow
-2199 FE0F ; fully-qualified # ↙️ down-left arrow
-2199 ; unqualified # ↙ down-left arrow
-2B05 FE0F ; fully-qualified # ⬅️ left arrow
-2B05 ; unqualified # ⬅ left arrow
-2196 FE0F ; fully-qualified # ↖️ up-left arrow
-2196 ; unqualified # ↖ up-left arrow
-2195 FE0F ; fully-qualified # ↕️ up-down arrow
-2195 ; unqualified # ↕ up-down arrow
-2194 FE0F ; fully-qualified # ↔️ left-right arrow
-2194 ; unqualified # ↔ left-right arrow
-21A9 FE0F ; fully-qualified # ↩️ right arrow curving left
-21A9 ; unqualified # ↩ right arrow curving left
-21AA FE0F ; fully-qualified # ↪️ left arrow curving right
-21AA ; unqualified # ↪ left arrow curving right
-2934 FE0F ; fully-qualified # ⤴️ right arrow curving up
-2934 ; unqualified # ⤴ right arrow curving up
-2935 FE0F ; fully-qualified # ⤵️ right arrow curving down
-2935 ; unqualified # ⤵ right arrow curving down
-1F503 ; fully-qualified # 🔃 clockwise vertical arrows
-1F504 ; fully-qualified # 🔄 counterclockwise arrows button
-1F519 ; fully-qualified # 🔙 BACK arrow
-1F51A ; fully-qualified # 🔚 END arrow
-1F51B ; fully-qualified # 🔛 ON! arrow
-1F51C ; fully-qualified # 🔜 SOON arrow
-1F51D ; fully-qualified # 🔝 TOP arrow
+2B06 FE0F ; fully-qualified # ⬆️ E0.6 up arrow
+2B06 ; unqualified # ⬆ E0.6 up arrow
+2197 FE0F ; fully-qualified # ↗️ E0.6 up-right arrow
+2197 ; unqualified # ↗ E0.6 up-right arrow
+27A1 FE0F ; fully-qualified # ➡️ E0.6 right arrow
+27A1 ; unqualified # ➡ E0.6 right arrow
+2198 FE0F ; fully-qualified # ↘️ E0.6 down-right arrow
+2198 ; unqualified # ↘ E0.6 down-right arrow
+2B07 FE0F ; fully-qualified # ⬇️ E0.6 down arrow
+2B07 ; unqualified # ⬇ E0.6 down arrow
+2199 FE0F ; fully-qualified # ↙️ E0.6 down-left arrow
+2199 ; unqualified # ↙ E0.6 down-left arrow
+2B05 FE0F ; fully-qualified # ⬅️ E0.6 left arrow
+2B05 ; unqualified # ⬅ E0.6 left arrow
+2196 FE0F ; fully-qualified # ↖️ E0.6 up-left arrow
+2196 ; unqualified # ↖ E0.6 up-left arrow
+2195 FE0F ; fully-qualified # ↕️ E0.6 up-down arrow
+2195 ; unqualified # ↕ E0.6 up-down arrow
+2194 FE0F ; fully-qualified # ↔️ E0.6 left-right arrow
+2194 ; unqualified # ↔ E0.6 left-right arrow
+21A9 FE0F ; fully-qualified # ↩️ E0.6 right arrow curving left
+21A9 ; unqualified # ↩ E0.6 right arrow curving left
+21AA FE0F ; fully-qualified # ↪️ E0.6 left arrow curving right
+21AA ; unqualified # ↪ E0.6 left arrow curving right
+2934 FE0F ; fully-qualified # ⤴️ E0.6 right arrow curving up
+2934 ; unqualified # ⤴ E0.6 right arrow curving up
+2935 FE0F ; fully-qualified # ⤵️ E0.6 right arrow curving down
+2935 ; unqualified # ⤵ E0.6 right arrow curving down
+1F503 ; fully-qualified # 🔃 E0.6 clockwise vertical arrows
+1F504 ; fully-qualified # 🔄 E1.0 counterclockwise arrows button
+1F519 ; fully-qualified # 🔙 E0.6 BACK arrow
+1F51A ; fully-qualified # 🔚 E0.6 END arrow
+1F51B ; fully-qualified # 🔛 E0.6 ON! arrow
+1F51C ; fully-qualified # 🔜 E0.6 SOON arrow
+1F51D ; fully-qualified # 🔝 E0.6 TOP arrow
# subgroup: religion
-1F6D0 ; fully-qualified # 🛐 place of worship
-269B FE0F ; fully-qualified # ⚛️ atom symbol
-269B ; unqualified # ⚛ atom symbol
-1F549 FE0F ; fully-qualified # 🕉️ om
-1F549 ; unqualified # 🕉 om
-2721 FE0F ; fully-qualified # ✡️ star of David
-2721 ; unqualified # ✡ star of David
-2638 FE0F ; fully-qualified # ☸️ wheel of dharma
-2638 ; unqualified # ☸ wheel of dharma
-262F FE0F ; fully-qualified # ☯️ yin yang
-262F ; unqualified # ☯ yin yang
-271D FE0F ; fully-qualified # ✝️ latin cross
-271D ; unqualified # ✝ latin cross
-2626 FE0F ; fully-qualified # ☦️ orthodox cross
-2626 ; unqualified # ☦ orthodox cross
-262A FE0F ; fully-qualified # ☪️ star and crescent
-262A ; unqualified # ☪ star and crescent
-262E FE0F ; fully-qualified # ☮️ peace symbol
-262E ; unqualified # ☮ peace symbol
-1F54E ; fully-qualified # 🕎 menorah
-1F52F ; fully-qualified # 🔯 dotted six-pointed star
+1F6D0 ; fully-qualified # 🛐 E1.0 place of worship
+269B FE0F ; fully-qualified # ⚛️ E1.0 atom symbol
+269B ; unqualified # ⚛ E1.0 atom symbol
+1F549 FE0F ; fully-qualified # 🕉️ E0.7 om
+1F549 ; unqualified # 🕉 E0.7 om
+2721 FE0F ; fully-qualified # ✡️ E0.7 star of David
+2721 ; unqualified # ✡ E0.7 star of David
+2638 FE0F ; fully-qualified # ☸️ E0.7 wheel of dharma
+2638 ; unqualified # ☸ E0.7 wheel of dharma
+262F FE0F ; fully-qualified # ☯️ E0.7 yin yang
+262F ; unqualified # ☯ E0.7 yin yang
+271D FE0F ; fully-qualified # ✝️ E0.7 latin cross
+271D ; unqualified # ✝ E0.7 latin cross
+2626 FE0F ; fully-qualified # ☦️ E1.0 orthodox cross
+2626 ; unqualified # ☦ E1.0 orthodox cross
+262A FE0F ; fully-qualified # ☪️ E0.7 star and crescent
+262A ; unqualified # ☪ E0.7 star and crescent
+262E FE0F ; fully-qualified # ☮️ E1.0 peace symbol
+262E ; unqualified # ☮ E1.0 peace symbol
+1F54E ; fully-qualified # 🕎 E1.0 menorah
+1F52F ; fully-qualified # 🔯 E0.6 dotted six-pointed star
# subgroup: zodiac
-2648 ; fully-qualified # ♈ Aries
-2649 ; fully-qualified # ♉ Taurus
-264A ; fully-qualified # ♊ Gemini
-264B ; fully-qualified # ♋ Cancer
-264C ; fully-qualified # ♌ Leo
-264D ; fully-qualified # ♍ Virgo
-264E ; fully-qualified # ♎ Libra
-264F ; fully-qualified # ♏ Scorpio
-2650 ; fully-qualified # ♐ Sagittarius
-2651 ; fully-qualified # ♑ Capricorn
-2652 ; fully-qualified # ♒ Aquarius
-2653 ; fully-qualified # ♓ Pisces
-26CE ; fully-qualified # ⛎ Ophiuchus
+2648 ; fully-qualified # ♈ E0.6 Aries
+2649 ; fully-qualified # ♉ E0.6 Taurus
+264A ; fully-qualified # ♊ E0.6 Gemini
+264B ; fully-qualified # ♋ E0.6 Cancer
+264C ; fully-qualified # ♌ E0.6 Leo
+264D ; fully-qualified # ♍ E0.6 Virgo
+264E ; fully-qualified # ♎ E0.6 Libra
+264F ; fully-qualified # ♏ E0.6 Scorpio
+2650 ; fully-qualified # ♐ E0.6 Sagittarius
+2651 ; fully-qualified # ♑ E0.6 Capricorn
+2652 ; fully-qualified # ♒ E0.6 Aquarius
+2653 ; fully-qualified # ♓ E0.6 Pisces
+26CE ; fully-qualified # ⛎ E0.6 Ophiuchus
# subgroup: av-symbol
-1F500 ; fully-qualified # 🔀 shuffle tracks button
-1F501 ; fully-qualified # 🔁 repeat button
-1F502 ; fully-qualified # 🔂 repeat single button
-25B6 FE0F ; fully-qualified # ▶️ play button
-25B6 ; unqualified # ▶ play button
-23E9 ; fully-qualified # ⏩ fast-forward button
-23ED FE0F ; fully-qualified # ⏭️ next track button
-23ED ; unqualified # ⏭ next track button
-23EF FE0F ; fully-qualified # ⏯️ play or pause button
-23EF ; unqualified # ⏯ play or pause button
-25C0 FE0F ; fully-qualified # ◀️ reverse button
-25C0 ; unqualified # ◀ reverse button
-23EA ; fully-qualified # ⏪ fast reverse button
-23EE FE0F ; fully-qualified # ⏮️ last track button
-23EE ; unqualified # ⏮ last track button
-1F53C ; fully-qualified # 🔼 upwards button
-23EB ; fully-qualified # ⏫ fast up button
-1F53D ; fully-qualified # 🔽 downwards button
-23EC ; fully-qualified # ⏬ fast down button
-23F8 FE0F ; fully-qualified # ⏸️ pause button
-23F8 ; unqualified # ⏸ pause button
-23F9 FE0F ; fully-qualified # ⏹️ stop button
-23F9 ; unqualified # ⏹ stop button
-23FA FE0F ; fully-qualified # ⏺️ record button
-23FA ; unqualified # ⏺ record button
-23CF FE0F ; fully-qualified # ⏏️ eject button
-23CF ; unqualified # ⏏ eject button
-1F3A6 ; fully-qualified # 🎦 cinema
-1F505 ; fully-qualified # 🔅 dim button
-1F506 ; fully-qualified # 🔆 bright button
-1F4F6 ; fully-qualified # 📶 antenna bars
-1F4F3 ; fully-qualified # 📳 vibration mode
-1F4F4 ; fully-qualified # 📴 mobile phone off
+1F500 ; fully-qualified # 🔀 E1.0 shuffle tracks button
+1F501 ; fully-qualified # 🔁 E1.0 repeat button
+1F502 ; fully-qualified # 🔂 E1.0 repeat single button
+25B6 FE0F ; fully-qualified # ▶️ E0.6 play button
+25B6 ; unqualified # ▶ E0.6 play button
+23E9 ; fully-qualified # ⏩ E0.6 fast-forward button
+23ED FE0F ; fully-qualified # ⏭️ E0.7 next track button
+23ED ; unqualified # ⏭ E0.7 next track button
+23EF FE0F ; fully-qualified # ⏯️ E1.0 play or pause button
+23EF ; unqualified # ⏯ E1.0 play or pause button
+25C0 FE0F ; fully-qualified # ◀️ E0.6 reverse button
+25C0 ; unqualified # ◀ E0.6 reverse button
+23EA ; fully-qualified # ⏪ E0.6 fast reverse button
+23EE FE0F ; fully-qualified # ⏮️ E0.7 last track button
+23EE ; unqualified # ⏮ E0.7 last track button
+1F53C ; fully-qualified # 🔼 E0.6 upwards button
+23EB ; fully-qualified # ⏫ E0.6 fast up button
+1F53D ; fully-qualified # 🔽 E0.6 downwards button
+23EC ; fully-qualified # ⏬ E0.6 fast down button
+23F8 FE0F ; fully-qualified # ⏸️ E0.7 pause button
+23F8 ; unqualified # ⏸ E0.7 pause button
+23F9 FE0F ; fully-qualified # ⏹️ E0.7 stop button
+23F9 ; unqualified # ⏹ E0.7 stop button
+23FA FE0F ; fully-qualified # ⏺️ E0.7 record button
+23FA ; unqualified # ⏺ E0.7 record button
+23CF FE0F ; fully-qualified # ⏏️ E1.0 eject button
+23CF ; unqualified # ⏏ E1.0 eject button
+1F3A6 ; fully-qualified # 🎦 E0.6 cinema
+1F505 ; fully-qualified # 🔅 E1.0 dim button
+1F506 ; fully-qualified # 🔆 E1.0 bright button
+1F4F6 ; fully-qualified # 📶 E0.6 antenna bars
+1F4F3 ; fully-qualified # 📳 E0.6 vibration mode
+1F4F4 ; fully-qualified # 📴 E0.6 mobile phone off
# subgroup: gender
-2640 FE0F ; fully-qualified # ♀️ female sign
-2640 ; unqualified # ♀ female sign
-2642 FE0F ; fully-qualified # ♂️ male sign
-2642 ; unqualified # ♂ male sign
-26A7 FE0F ; fully-qualified # ⚧️ transgender symbol
-26A7 ; unqualified # ⚧ transgender symbol
+2640 FE0F ; fully-qualified # ♀️ E4.0 female sign
+2640 ; unqualified # ♀ E4.0 female sign
+2642 FE0F ; fully-qualified # ♂️ E4.0 male sign
+2642 ; unqualified # ♂ E4.0 male sign
+26A7 FE0F ; fully-qualified # ⚧️ E13.0 transgender symbol
+26A7 ; unqualified # ⚧ E13.0 transgender symbol
# subgroup: math
-2716 FE0F ; fully-qualified # ✖️ multiply
-2716 ; unqualified # ✖ multiply
-2795 ; fully-qualified # ➕ plus
-2796 ; fully-qualified # ➖ minus
-2797 ; fully-qualified # ➗ divide
-267E FE0F ; fully-qualified # ♾️ infinity
-267E ; unqualified # ♾ infinity
+2716 FE0F ; fully-qualified # ✖️ E0.6 multiply
+2716 ; unqualified # ✖ E0.6 multiply
+2795 ; fully-qualified # ➕ E0.6 plus
+2796 ; fully-qualified # ➖ E0.6 minus
+2797 ; fully-qualified # ➗ E0.6 divide
+267E FE0F ; fully-qualified # ♾️ E11.0 infinity
+267E ; unqualified # ♾ E11.0 infinity
# subgroup: punctuation
-203C FE0F ; fully-qualified # ‼️ double exclamation mark
-203C ; unqualified # ‼ double exclamation mark
-2049 FE0F ; fully-qualified # ⁉️ exclamation question mark
-2049 ; unqualified # ⁉ exclamation question mark
-2753 ; fully-qualified # ❓ question mark
-2754 ; fully-qualified # ❔ white question mark
-2755 ; fully-qualified # ❕ white exclamation mark
-2757 ; fully-qualified # ❗ exclamation mark
-3030 FE0F ; fully-qualified # 〰️ wavy dash
-3030 ; unqualified # 〰 wavy dash
+203C FE0F ; fully-qualified # ‼️ E0.6 double exclamation mark
+203C ; unqualified # ‼ E0.6 double exclamation mark
+2049 FE0F ; fully-qualified # ⁉️ E0.6 exclamation question mark
+2049 ; unqualified # ⁉ E0.6 exclamation question mark
+2753 ; fully-qualified # ❓ E0.6 question mark
+2754 ; fully-qualified # ❔ E0.6 white question mark
+2755 ; fully-qualified # ❕ E0.6 white exclamation mark
+2757 ; fully-qualified # ❗ E0.6 exclamation mark
+3030 FE0F ; fully-qualified # 〰️ E0.6 wavy dash
+3030 ; unqualified # 〰 E0.6 wavy dash
# subgroup: currency
-1F4B1 ; fully-qualified # 💱 currency exchange
-1F4B2 ; fully-qualified # 💲 heavy dollar sign
+1F4B1 ; fully-qualified # 💱 E0.6 currency exchange
+1F4B2 ; fully-qualified # 💲 E0.6 heavy dollar sign
# subgroup: other-symbol
-2695 FE0F ; fully-qualified # ⚕️ medical symbol
-2695 ; unqualified # ⚕ medical symbol
-267B FE0F ; fully-qualified # ♻️ recycling symbol
-267B ; unqualified # ♻ recycling symbol
-269C FE0F ; fully-qualified # ⚜️ fleur-de-lis
-269C ; unqualified # ⚜ fleur-de-lis
-1F531 ; fully-qualified # 🔱 trident emblem
-1F4DB ; fully-qualified # 📛 name badge
-1F530 ; fully-qualified # 🔰 Japanese symbol for beginner
-2B55 ; fully-qualified # ⭕ hollow red circle
-2705 ; fully-qualified # ✅ check mark button
-2611 FE0F ; fully-qualified # ☑️ check box with check
-2611 ; unqualified # ☑ check box with check
-2714 FE0F ; fully-qualified # ✔️ check mark
-2714 ; unqualified # ✔ check mark
-274C ; fully-qualified # ❌ cross mark
-274E ; fully-qualified # ❎ cross mark button
-27B0 ; fully-qualified # ➰ curly loop
-27BF ; fully-qualified # ➿ double curly loop
-303D FE0F ; fully-qualified # 〽️ part alternation mark
-303D ; unqualified # 〽 part alternation mark
-2733 FE0F ; fully-qualified # ✳️ eight-spoked asterisk
-2733 ; unqualified # ✳ eight-spoked asterisk
-2734 FE0F ; fully-qualified # ✴️ eight-pointed star
-2734 ; unqualified # ✴ eight-pointed star
-2747 FE0F ; fully-qualified # ❇️ sparkle
-2747 ; unqualified # ❇ sparkle
-00A9 FE0F ; fully-qualified # ©️ copyright
-00A9 ; unqualified # © copyright
-00AE FE0F ; fully-qualified # ®️ registered
-00AE ; unqualified # ® registered
-2122 FE0F ; fully-qualified # ™️ trade mark
-2122 ; unqualified # ™ trade mark
+2695 FE0F ; fully-qualified # ⚕️ E4.0 medical symbol
+2695 ; unqualified # ⚕ E4.0 medical symbol
+267B FE0F ; fully-qualified # ♻️ E0.6 recycling symbol
+267B ; unqualified # ♻ E0.6 recycling symbol
+269C FE0F ; fully-qualified # ⚜️ E1.0 fleur-de-lis
+269C ; unqualified # ⚜ E1.0 fleur-de-lis
+1F531 ; fully-qualified # 🔱 E0.6 trident emblem
+1F4DB ; fully-qualified # 📛 E0.6 name badge
+1F530 ; fully-qualified # 🔰 E0.6 Japanese symbol for beginner
+2B55 ; fully-qualified # ⭕ E0.6 hollow red circle
+2705 ; fully-qualified # ✅ E0.6 check mark button
+2611 FE0F ; fully-qualified # ☑️ E0.6 check box with check
+2611 ; unqualified # ☑ E0.6 check box with check
+2714 FE0F ; fully-qualified # ✔️ E0.6 check mark
+2714 ; unqualified # ✔ E0.6 check mark
+274C ; fully-qualified # ❌ E0.6 cross mark
+274E ; fully-qualified # ❎ E0.6 cross mark button
+27B0 ; fully-qualified # ➰ E0.6 curly loop
+27BF ; fully-qualified # ➿ E1.0 double curly loop
+303D FE0F ; fully-qualified # 〽️ E0.6 part alternation mark
+303D ; unqualified # 〽 E0.6 part alternation mark
+2733 FE0F ; fully-qualified # ✳️ E0.6 eight-spoked asterisk
+2733 ; unqualified # ✳ E0.6 eight-spoked asterisk
+2734 FE0F ; fully-qualified # ✴️ E0.6 eight-pointed star
+2734 ; unqualified # ✴ E0.6 eight-pointed star
+2747 FE0F ; fully-qualified # ❇️ E0.6 sparkle
+2747 ; unqualified # ❇ E0.6 sparkle
+00A9 FE0F ; fully-qualified # ©️ E0.6 copyright
+00A9 ; unqualified # © E0.6 copyright
+00AE FE0F ; fully-qualified # ®️ E0.6 registered
+00AE ; unqualified # ® E0.6 registered
+2122 FE0F ; fully-qualified # ™️ E0.6 trade mark
+2122 ; unqualified # ™ E0.6 trade mark
# subgroup: keycap
-0023 FE0F 20E3 ; fully-qualified # #️⃣ keycap: #
-0023 20E3 ; unqualified # #⃣ keycap: #
-002A FE0F 20E3 ; fully-qualified # *️⃣ keycap: *
-002A 20E3 ; unqualified # *⃣ keycap: *
-0030 FE0F 20E3 ; fully-qualified # 0️⃣ keycap: 0
-0030 20E3 ; unqualified # 0⃣ keycap: 0
-0031 FE0F 20E3 ; fully-qualified # 1️⃣ keycap: 1
-0031 20E3 ; unqualified # 1⃣ keycap: 1
-0032 FE0F 20E3 ; fully-qualified # 2️⃣ keycap: 2
-0032 20E3 ; unqualified # 2⃣ keycap: 2
-0033 FE0F 20E3 ; fully-qualified # 3️⃣ keycap: 3
-0033 20E3 ; unqualified # 3⃣ keycap: 3
-0034 FE0F 20E3 ; fully-qualified # 4️⃣ keycap: 4
-0034 20E3 ; unqualified # 4⃣ keycap: 4
-0035 FE0F 20E3 ; fully-qualified # 5️⃣ keycap: 5
-0035 20E3 ; unqualified # 5⃣ keycap: 5
-0036 FE0F 20E3 ; fully-qualified # 6️⃣ keycap: 6
-0036 20E3 ; unqualified # 6⃣ keycap: 6
-0037 FE0F 20E3 ; fully-qualified # 7️⃣ keycap: 7
-0037 20E3 ; unqualified # 7⃣ keycap: 7
-0038 FE0F 20E3 ; fully-qualified # 8️⃣ keycap: 8
-0038 20E3 ; unqualified # 8⃣ keycap: 8
-0039 FE0F 20E3 ; fully-qualified # 9️⃣ keycap: 9
-0039 20E3 ; unqualified # 9⃣ keycap: 9
-1F51F ; fully-qualified # 🔟 keycap: 10
+0023 FE0F 20E3 ; fully-qualified # #️⃣ E0.6 keycap: #
+0023 20E3 ; unqualified # #⃣ E0.6 keycap: #
+002A FE0F 20E3 ; fully-qualified # *️⃣ E2.0 keycap: *
+002A 20E3 ; unqualified # *⃣ E2.0 keycap: *
+0030 FE0F 20E3 ; fully-qualified # 0️⃣ E0.6 keycap: 0
+0030 20E3 ; unqualified # 0⃣ E0.6 keycap: 0
+0031 FE0F 20E3 ; fully-qualified # 1️⃣ E0.6 keycap: 1
+0031 20E3 ; unqualified # 1⃣ E0.6 keycap: 1
+0032 FE0F 20E3 ; fully-qualified # 2️⃣ E0.6 keycap: 2
+0032 20E3 ; unqualified # 2⃣ E0.6 keycap: 2
+0033 FE0F 20E3 ; fully-qualified # 3️⃣ E0.6 keycap: 3
+0033 20E3 ; unqualified # 3⃣ E0.6 keycap: 3
+0034 FE0F 20E3 ; fully-qualified # 4️⃣ E0.6 keycap: 4
+0034 20E3 ; unqualified # 4⃣ E0.6 keycap: 4
+0035 FE0F 20E3 ; fully-qualified # 5️⃣ E0.6 keycap: 5
+0035 20E3 ; unqualified # 5⃣ E0.6 keycap: 5
+0036 FE0F 20E3 ; fully-qualified # 6️⃣ E0.6 keycap: 6
+0036 20E3 ; unqualified # 6⃣ E0.6 keycap: 6
+0037 FE0F 20E3 ; fully-qualified # 7️⃣ E0.6 keycap: 7
+0037 20E3 ; unqualified # 7⃣ E0.6 keycap: 7
+0038 FE0F 20E3 ; fully-qualified # 8️⃣ E0.6 keycap: 8
+0038 20E3 ; unqualified # 8⃣ E0.6 keycap: 8
+0039 FE0F 20E3 ; fully-qualified # 9️⃣ E0.6 keycap: 9
+0039 20E3 ; unqualified # 9⃣ E0.6 keycap: 9
+1F51F ; fully-qualified # 🔟 E0.6 keycap: 10
# subgroup: alphanum
-1F520 ; fully-qualified # 🔠 input latin uppercase
-1F521 ; fully-qualified # 🔡 input latin lowercase
-1F522 ; fully-qualified # 🔢 input numbers
-1F523 ; fully-qualified # 🔣 input symbols
-1F524 ; fully-qualified # 🔤 input latin letters
-1F170 FE0F ; fully-qualified # 🅰️ A button (blood type)
-1F170 ; unqualified # 🅰 A button (blood type)
-1F18E ; fully-qualified # 🆎 AB button (blood type)
-1F171 FE0F ; fully-qualified # 🅱️ B button (blood type)
-1F171 ; unqualified # 🅱 B button (blood type)
-1F191 ; fully-qualified # 🆑 CL button
-1F192 ; fully-qualified # 🆒 COOL button
-1F193 ; fully-qualified # 🆓 FREE button
-2139 FE0F ; fully-qualified # ℹ️ information
-2139 ; unqualified # ℹ information
-1F194 ; fully-qualified # 🆔 ID button
-24C2 FE0F ; fully-qualified # Ⓜ️ circled M
-24C2 ; unqualified # Ⓜ circled M
-1F195 ; fully-qualified # 🆕 NEW button
-1F196 ; fully-qualified # 🆖 NG button
-1F17E FE0F ; fully-qualified # 🅾️ O button (blood type)
-1F17E ; unqualified # 🅾 O button (blood type)
-1F197 ; fully-qualified # 🆗 OK button
-1F17F FE0F ; fully-qualified # 🅿️ P button
-1F17F ; unqualified # 🅿 P button
-1F198 ; fully-qualified # 🆘 SOS button
-1F199 ; fully-qualified # 🆙 UP! button
-1F19A ; fully-qualified # 🆚 VS button
-1F201 ; fully-qualified # 🈁 Japanese “here” button
-1F202 FE0F ; fully-qualified # 🈂️ Japanese “service charge” button
-1F202 ; unqualified # 🈂 Japanese “service charge” button
-1F237 FE0F ; fully-qualified # 🈷️ Japanese “monthly amount” button
-1F237 ; unqualified # 🈷 Japanese “monthly amount” button
-1F236 ; fully-qualified # 🈶 Japanese “not free of charge” button
-1F22F ; fully-qualified # 🈯 Japanese “reserved” button
-1F250 ; fully-qualified # 🉐 Japanese “bargain” button
-1F239 ; fully-qualified # 🈹 Japanese “discount” button
-1F21A ; fully-qualified # 🈚 Japanese “free of charge” button
-1F232 ; fully-qualified # 🈲 Japanese “prohibited” button
-1F251 ; fully-qualified # 🉑 Japanese “acceptable” button
-1F238 ; fully-qualified # 🈸 Japanese “application” button
-1F234 ; fully-qualified # 🈴 Japanese “passing grade” button
-1F233 ; fully-qualified # 🈳 Japanese “vacancy” button
-3297 FE0F ; fully-qualified # ㊗️ Japanese “congratulations” button
-3297 ; unqualified # ㊗ Japanese “congratulations” button
-3299 FE0F ; fully-qualified # ㊙️ Japanese “secret” button
-3299 ; unqualified # ㊙ Japanese “secret” button
-1F23A ; fully-qualified # 🈺 Japanese “open for business” button
-1F235 ; fully-qualified # 🈵 Japanese “no vacancy” button
+1F520 ; fully-qualified # 🔠 E0.6 input latin uppercase
+1F521 ; fully-qualified # 🔡 E0.6 input latin lowercase
+1F522 ; fully-qualified # 🔢 E0.6 input numbers
+1F523 ; fully-qualified # 🔣 E0.6 input symbols
+1F524 ; fully-qualified # 🔤 E0.6 input latin letters
+1F170 FE0F ; fully-qualified # 🅰️ E0.6 A button (blood type)
+1F170 ; unqualified # 🅰 E0.6 A button (blood type)
+1F18E ; fully-qualified # 🆎 E0.6 AB button (blood type)
+1F171 FE0F ; fully-qualified # 🅱️ E0.6 B button (blood type)
+1F171 ; unqualified # 🅱 E0.6 B button (blood type)
+1F191 ; fully-qualified # 🆑 E0.6 CL button
+1F192 ; fully-qualified # 🆒 E0.6 COOL button
+1F193 ; fully-qualified # 🆓 E0.6 FREE button
+2139 FE0F ; fully-qualified # ℹ️ E0.6 information
+2139 ; unqualified # ℹ E0.6 information
+1F194 ; fully-qualified # 🆔 E0.6 ID button
+24C2 FE0F ; fully-qualified # Ⓜ️ E0.6 circled M
+24C2 ; unqualified # Ⓜ E0.6 circled M
+1F195 ; fully-qualified # 🆕 E0.6 NEW button
+1F196 ; fully-qualified # 🆖 E0.6 NG button
+1F17E FE0F ; fully-qualified # 🅾️ E0.6 O button (blood type)
+1F17E ; unqualified # 🅾 E0.6 O button (blood type)
+1F197 ; fully-qualified # 🆗 E0.6 OK button
+1F17F FE0F ; fully-qualified # 🅿️ E0.6 P button
+1F17F ; unqualified # 🅿 E0.6 P button
+1F198 ; fully-qualified # 🆘 E0.6 SOS button
+1F199 ; fully-qualified # 🆙 E0.6 UP! button
+1F19A ; fully-qualified # 🆚 E0.6 VS button
+1F201 ; fully-qualified # 🈁 E0.6 Japanese “here” button
+1F202 FE0F ; fully-qualified # 🈂️ E0.6 Japanese “service charge” button
+1F202 ; unqualified # 🈂 E0.6 Japanese “service charge” button
+1F237 FE0F ; fully-qualified # 🈷️ E0.6 Japanese “monthly amount” button
+1F237 ; unqualified # 🈷 E0.6 Japanese “monthly amount” button
+1F236 ; fully-qualified # 🈶 E0.6 Japanese “not free of charge” button
+1F22F ; fully-qualified # 🈯 E0.6 Japanese “reserved” button
+1F250 ; fully-qualified # 🉐 E0.6 Japanese “bargain” button
+1F239 ; fully-qualified # 🈹 E0.6 Japanese “discount” button
+1F21A ; fully-qualified # 🈚 E0.6 Japanese “free of charge” button
+1F232 ; fully-qualified # 🈲 E0.6 Japanese “prohibited” button
+1F251 ; fully-qualified # 🉑 E0.6 Japanese “acceptable” button
+1F238 ; fully-qualified # 🈸 E0.6 Japanese “application” button
+1F234 ; fully-qualified # 🈴 E0.6 Japanese “passing grade” button
+1F233 ; fully-qualified # 🈳 E0.6 Japanese “vacancy” button
+3297 FE0F ; fully-qualified # ㊗️ E0.6 Japanese “congratulations” button
+3297 ; unqualified # ㊗ E0.6 Japanese “congratulations” button
+3299 FE0F ; fully-qualified # ㊙️ E0.6 Japanese “secret” button
+3299 ; unqualified # ㊙ E0.6 Japanese “secret” button
+1F23A ; fully-qualified # 🈺 E0.6 Japanese “open for business” button
+1F235 ; fully-qualified # 🈵 E0.6 Japanese “no vacancy” button
# subgroup: geometric
-1F534 ; fully-qualified # 🔴 red circle
-1F7E0 ; fully-qualified # 🟠 orange circle
-1F7E1 ; fully-qualified # 🟡 yellow circle
-1F7E2 ; fully-qualified # 🟢 green circle
-1F535 ; fully-qualified # 🔵 blue circle
-1F7E3 ; fully-qualified # 🟣 purple circle
-1F7E4 ; fully-qualified # 🟤 brown circle
-26AB ; fully-qualified # ⚫ black circle
-26AA ; fully-qualified # ⚪ white circle
-1F7E5 ; fully-qualified # 🟥 red square
-1F7E7 ; fully-qualified # 🟧 orange square
-1F7E8 ; fully-qualified # 🟨 yellow square
-1F7E9 ; fully-qualified # 🟩 green square
-1F7E6 ; fully-qualified # 🟦 blue square
-1F7EA ; fully-qualified # 🟪 purple square
-1F7EB ; fully-qualified # 🟫 brown square
-2B1B ; fully-qualified # ⬛ black large square
-2B1C ; fully-qualified # ⬜ white large square
-25FC FE0F ; fully-qualified # ◼️ black medium square
-25FC ; unqualified # ◼ black medium square
-25FB FE0F ; fully-qualified # ◻️ white medium square
-25FB ; unqualified # ◻ white medium square
-25FE ; fully-qualified # ◾ black medium-small square
-25FD ; fully-qualified # ◽ white medium-small square
-25AA FE0F ; fully-qualified # ▪️ black small square
-25AA ; unqualified # ▪ black small square
-25AB FE0F ; fully-qualified # ▫️ white small square
-25AB ; unqualified # ▫ white small square
-1F536 ; fully-qualified # 🔶 large orange diamond
-1F537 ; fully-qualified # 🔷 large blue diamond
-1F538 ; fully-qualified # 🔸 small orange diamond
-1F539 ; fully-qualified # 🔹 small blue diamond
-1F53A ; fully-qualified # 🔺 red triangle pointed up
-1F53B ; fully-qualified # 🔻 red triangle pointed down
-1F4A0 ; fully-qualified # 💠 diamond with a dot
-1F518 ; fully-qualified # 🔘 radio button
-1F533 ; fully-qualified # 🔳 white square button
-1F532 ; fully-qualified # 🔲 black square button
+1F534 ; fully-qualified # 🔴 E0.6 red circle
+1F7E0 ; fully-qualified # 🟠 E12.0 orange circle
+1F7E1 ; fully-qualified # 🟡 E12.0 yellow circle
+1F7E2 ; fully-qualified # 🟢 E12.0 green circle
+1F535 ; fully-qualified # 🔵 E0.6 blue circle
+1F7E3 ; fully-qualified # 🟣 E12.0 purple circle
+1F7E4 ; fully-qualified # 🟤 E12.0 brown circle
+26AB ; fully-qualified # ⚫ E0.6 black circle
+26AA ; fully-qualified # ⚪ E0.6 white circle
+1F7E5 ; fully-qualified # 🟥 E12.0 red square
+1F7E7 ; fully-qualified # 🟧 E12.0 orange square
+1F7E8 ; fully-qualified # 🟨 E12.0 yellow square
+1F7E9 ; fully-qualified # 🟩 E12.0 green square
+1F7E6 ; fully-qualified # 🟦 E12.0 blue square
+1F7EA ; fully-qualified # 🟪 E12.0 purple square
+1F7EB ; fully-qualified # 🟫 E12.0 brown square
+2B1B ; fully-qualified # ⬛ E0.6 black large square
+2B1C ; fully-qualified # ⬜ E0.6 white large square
+25FC FE0F ; fully-qualified # ◼️ E0.6 black medium square
+25FC ; unqualified # ◼ E0.6 black medium square
+25FB FE0F ; fully-qualified # ◻️ E0.6 white medium square
+25FB ; unqualified # ◻ E0.6 white medium square
+25FE ; fully-qualified # ◾ E0.6 black medium-small square
+25FD ; fully-qualified # ◽ E0.6 white medium-small square
+25AA FE0F ; fully-qualified # ▪️ E0.6 black small square
+25AA ; unqualified # ▪ E0.6 black small square
+25AB FE0F ; fully-qualified # ▫️ E0.6 white small square
+25AB ; unqualified # ▫ E0.6 white small square
+1F536 ; fully-qualified # 🔶 E0.6 large orange diamond
+1F537 ; fully-qualified # 🔷 E0.6 large blue diamond
+1F538 ; fully-qualified # 🔸 E0.6 small orange diamond
+1F539 ; fully-qualified # 🔹 E0.6 small blue diamond
+1F53A ; fully-qualified # 🔺 E0.6 red triangle pointed up
+1F53B ; fully-qualified # 🔻 E0.6 red triangle pointed down
+1F4A0 ; fully-qualified # 💠 E0.6 diamond with a dot
+1F518 ; fully-qualified # 🔘 E0.6 radio button
+1F533 ; fully-qualified # 🔳 E0.6 white square button
+1F532 ; fully-qualified # 🔲 E0.6 black square button
+
+# Symbols subtotal: 301
+# Symbols subtotal: 301 w/o modifiers
# group: Flags
# subgroup: flag
-1F3C1 ; fully-qualified # 🏁 chequered flag
-1F6A9 ; fully-qualified # 🚩 triangular flag
-1F38C ; fully-qualified # 🎌 crossed flags
-1F3F4 ; fully-qualified # 🏴 black flag
-1F3F3 FE0F ; fully-qualified # 🏳️ white flag
-1F3F3 ; unqualified # 🏳 white flag
-1F3F3 FE0F 200D 1F308 ; fully-qualified # 🏳️🌈 rainbow flag
-1F3F3 200D 1F308 ; unqualified # 🏳🌈 rainbow flag
-1F3F3 FE0F 200D 26A7 FE0F ; fully-qualified # 🏳️⚧️ transgender flag
-1F3F3 FE0F 200D 26A7 ; minimally-qualified # 🏳️⚧ transgender flag
-1F3F3 200D 26A7 ; unqualified # 🏳⚧ transgender flag
-1F3F4 200D 2620 FE0F ; fully-qualified # 🏴☠️ pirate flag
-1F3F4 200D 2620 ; minimally-qualified # 🏴☠ pirate flag
+1F3C1 ; fully-qualified # 🏁 E0.6 chequered flag
+1F6A9 ; fully-qualified # 🚩 E0.6 triangular flag
+1F38C ; fully-qualified # 🎌 E0.6 crossed flags
+1F3F4 ; fully-qualified # 🏴 E1.0 black flag
+1F3F3 FE0F ; fully-qualified # 🏳️ E0.7 white flag
+1F3F3 ; unqualified # 🏳 E0.7 white flag
+1F3F3 FE0F 200D 1F308 ; fully-qualified # 🏳️🌈 E4.0 rainbow flag
+1F3F3 200D 1F308 ; unqualified # 🏳🌈 E4.0 rainbow flag
+1F3F3 FE0F 200D 26A7 FE0F ; fully-qualified # 🏳️⚧️ E13.0 transgender flag
+1F3F3 200D 26A7 FE0F ; unqualified # 🏳⚧️ E13.0 transgender flag
+1F3F3 FE0F 200D 26A7 ; unqualified # 🏳️⚧ E13.0 transgender flag
+1F3F3 200D 26A7 ; unqualified # 🏳⚧ E13.0 transgender flag
+1F3F4 200D 2620 FE0F ; fully-qualified # 🏴☠️ E11.0 pirate flag
+1F3F4 200D 2620 ; minimally-qualified # 🏴☠ E11.0 pirate flag
# subgroup: country-flag
-1F1E6 1F1E8 ; fully-qualified # 🇦🇨 flag: Ascension Island
-1F1E6 1F1E9 ; fully-qualified # 🇦🇩 flag: Andorra
-1F1E6 1F1EA ; fully-qualified # 🇦🇪 flag: United Arab Emirates
-1F1E6 1F1EB ; fully-qualified # 🇦🇫 flag: Afghanistan
-1F1E6 1F1EC ; fully-qualified # 🇦🇬 flag: Antigua & Barbuda
-1F1E6 1F1EE ; fully-qualified # 🇦🇮 flag: Anguilla
-1F1E6 1F1F1 ; fully-qualified # 🇦🇱 flag: Albania
-1F1E6 1F1F2 ; fully-qualified # 🇦🇲 flag: Armenia
-1F1E6 1F1F4 ; fully-qualified # 🇦🇴 flag: Angola
-1F1E6 1F1F6 ; fully-qualified # 🇦🇶 flag: Antarctica
-1F1E6 1F1F7 ; fully-qualified # 🇦🇷 flag: Argentina
-1F1E6 1F1F8 ; fully-qualified # 🇦🇸 flag: American Samoa
-1F1E6 1F1F9 ; fully-qualified # 🇦🇹 flag: Austria
-1F1E6 1F1FA ; fully-qualified # 🇦🇺 flag: Australia
-1F1E6 1F1FC ; fully-qualified # 🇦🇼 flag: Aruba
-1F1E6 1F1FD ; fully-qualified # 🇦🇽 flag: Åland Islands
-1F1E6 1F1FF ; fully-qualified # 🇦🇿 flag: Azerbaijan
-1F1E7 1F1E6 ; fully-qualified # 🇧🇦 flag: Bosnia & Herzegovina
-1F1E7 1F1E7 ; fully-qualified # 🇧🇧 flag: Barbados
-1F1E7 1F1E9 ; fully-qualified # 🇧🇩 flag: Bangladesh
-1F1E7 1F1EA ; fully-qualified # 🇧🇪 flag: Belgium
-1F1E7 1F1EB ; fully-qualified # 🇧🇫 flag: Burkina Faso
-1F1E7 1F1EC ; fully-qualified # 🇧🇬 flag: Bulgaria
-1F1E7 1F1ED ; fully-qualified # 🇧🇭 flag: Bahrain
-1F1E7 1F1EE ; fully-qualified # 🇧🇮 flag: Burundi
-1F1E7 1F1EF ; fully-qualified # 🇧🇯 flag: Benin
-1F1E7 1F1F1 ; fully-qualified # 🇧🇱 flag: St. Barthélemy
-1F1E7 1F1F2 ; fully-qualified # 🇧🇲 flag: Bermuda
-1F1E7 1F1F3 ; fully-qualified # 🇧🇳 flag: Brunei
-1F1E7 1F1F4 ; fully-qualified # 🇧🇴 flag: Bolivia
-1F1E7 1F1F6 ; fully-qualified # 🇧🇶 flag: Caribbean Netherlands
-1F1E7 1F1F7 ; fully-qualified # 🇧🇷 flag: Brazil
-1F1E7 1F1F8 ; fully-qualified # 🇧🇸 flag: Bahamas
-1F1E7 1F1F9 ; fully-qualified # 🇧🇹 flag: Bhutan
-1F1E7 1F1FB ; fully-qualified # 🇧🇻 flag: Bouvet Island
-1F1E7 1F1FC ; fully-qualified # 🇧🇼 flag: Botswana
-1F1E7 1F1FE ; fully-qualified # 🇧🇾 flag: Belarus
-1F1E7 1F1FF ; fully-qualified # 🇧🇿 flag: Belize
-1F1E8 1F1E6 ; fully-qualified # 🇨🇦 flag: Canada
-1F1E8 1F1E8 ; fully-qualified # 🇨🇨 flag: Cocos (Keeling) Islands
-1F1E8 1F1E9 ; fully-qualified # 🇨🇩 flag: Congo - Kinshasa
-1F1E8 1F1EB ; fully-qualified # 🇨🇫 flag: Central African Republic
-1F1E8 1F1EC ; fully-qualified # 🇨🇬 flag: Congo - Brazzaville
-1F1E8 1F1ED ; fully-qualified # 🇨🇭 flag: Switzerland
-1F1E8 1F1EE ; fully-qualified # 🇨🇮 flag: Côte d’Ivoire
-1F1E8 1F1F0 ; fully-qualified # 🇨🇰 flag: Cook Islands
-1F1E8 1F1F1 ; fully-qualified # 🇨🇱 flag: Chile
-1F1E8 1F1F2 ; fully-qualified # 🇨🇲 flag: Cameroon
-1F1E8 1F1F3 ; fully-qualified # 🇨🇳 flag: China
-1F1E8 1F1F4 ; fully-qualified # 🇨🇴 flag: Colombia
-1F1E8 1F1F5 ; fully-qualified # 🇨🇵 flag: Clipperton Island
-1F1E8 1F1F7 ; fully-qualified # 🇨🇷 flag: Costa Rica
-1F1E8 1F1FA ; fully-qualified # 🇨🇺 flag: Cuba
-1F1E8 1F1FB ; fully-qualified # 🇨🇻 flag: Cape Verde
-1F1E8 1F1FC ; fully-qualified # 🇨🇼 flag: Curaçao
-1F1E8 1F1FD ; fully-qualified # 🇨🇽 flag: Christmas Island
-1F1E8 1F1FE ; fully-qualified # 🇨🇾 flag: Cyprus
-1F1E8 1F1FF ; fully-qualified # 🇨🇿 flag: Czechia
-1F1E9 1F1EA ; fully-qualified # 🇩🇪 flag: Germany
-1F1E9 1F1EC ; fully-qualified # 🇩🇬 flag: Diego Garcia
-1F1E9 1F1EF ; fully-qualified # 🇩🇯 flag: Djibouti
-1F1E9 1F1F0 ; fully-qualified # 🇩🇰 flag: Denmark
-1F1E9 1F1F2 ; fully-qualified # 🇩🇲 flag: Dominica
-1F1E9 1F1F4 ; fully-qualified # 🇩🇴 flag: Dominican Republic
-1F1E9 1F1FF ; fully-qualified # 🇩🇿 flag: Algeria
-1F1EA 1F1E6 ; fully-qualified # 🇪🇦 flag: Ceuta & Melilla
-1F1EA 1F1E8 ; fully-qualified # 🇪🇨 flag: Ecuador
-1F1EA 1F1EA ; fully-qualified # 🇪🇪 flag: Estonia
-1F1EA 1F1EC ; fully-qualified # 🇪🇬 flag: Egypt
-1F1EA 1F1ED ; fully-qualified # 🇪🇭 flag: Western Sahara
-1F1EA 1F1F7 ; fully-qualified # 🇪🇷 flag: Eritrea
-1F1EA 1F1F8 ; fully-qualified # 🇪🇸 flag: Spain
-1F1EA 1F1F9 ; fully-qualified # 🇪🇹 flag: Ethiopia
-1F1EA 1F1FA ; fully-qualified # 🇪🇺 flag: European Union
-1F1EB 1F1EE ; fully-qualified # 🇫🇮 flag: Finland
-1F1EB 1F1EF ; fully-qualified # 🇫🇯 flag: Fiji
-1F1EB 1F1F0 ; fully-qualified # 🇫🇰 flag: Falkland Islands
-1F1EB 1F1F2 ; fully-qualified # 🇫🇲 flag: Micronesia
-1F1EB 1F1F4 ; fully-qualified # 🇫🇴 flag: Faroe Islands
-1F1EB 1F1F7 ; fully-qualified # 🇫🇷 flag: France
-1F1EC 1F1E6 ; fully-qualified # 🇬🇦 flag: Gabon
-1F1EC 1F1E7 ; fully-qualified # 🇬🇧 flag: United Kingdom
-1F1EC 1F1E9 ; fully-qualified # 🇬🇩 flag: Grenada
-1F1EC 1F1EA ; fully-qualified # 🇬🇪 flag: Georgia
-1F1EC 1F1EB ; fully-qualified # 🇬🇫 flag: French Guiana
-1F1EC 1F1EC ; fully-qualified # 🇬🇬 flag: Guernsey
-1F1EC 1F1ED ; fully-qualified # 🇬🇭 flag: Ghana
-1F1EC 1F1EE ; fully-qualified # 🇬🇮 flag: Gibraltar
-1F1EC 1F1F1 ; fully-qualified # 🇬🇱 flag: Greenland
-1F1EC 1F1F2 ; fully-qualified # 🇬🇲 flag: Gambia
-1F1EC 1F1F3 ; fully-qualified # 🇬🇳 flag: Guinea
-1F1EC 1F1F5 ; fully-qualified # 🇬🇵 flag: Guadeloupe
-1F1EC 1F1F6 ; fully-qualified # 🇬🇶 flag: Equatorial Guinea
-1F1EC 1F1F7 ; fully-qualified # 🇬🇷 flag: Greece
-1F1EC 1F1F8 ; fully-qualified # 🇬🇸 flag: South Georgia & South Sandwich Islands
-1F1EC 1F1F9 ; fully-qualified # 🇬🇹 flag: Guatemala
-1F1EC 1F1FA ; fully-qualified # 🇬🇺 flag: Guam
-1F1EC 1F1FC ; fully-qualified # 🇬🇼 flag: Guinea-Bissau
-1F1EC 1F1FE ; fully-qualified # 🇬🇾 flag: Guyana
-1F1ED 1F1F0 ; fully-qualified # 🇭🇰 flag: Hong Kong SAR China
-1F1ED 1F1F2 ; fully-qualified # 🇭🇲 flag: Heard & McDonald Islands
-1F1ED 1F1F3 ; fully-qualified # 🇭🇳 flag: Honduras
-1F1ED 1F1F7 ; fully-qualified # 🇭🇷 flag: Croatia
-1F1ED 1F1F9 ; fully-qualified # 🇭🇹 flag: Haiti
-1F1ED 1F1FA ; fully-qualified # 🇭🇺 flag: Hungary
-1F1EE 1F1E8 ; fully-qualified # 🇮🇨 flag: Canary Islands
-1F1EE 1F1E9 ; fully-qualified # 🇮🇩 flag: Indonesia
-1F1EE 1F1EA ; fully-qualified # 🇮🇪 flag: Ireland
-1F1EE 1F1F1 ; fully-qualified # 🇮🇱 flag: Israel
-1F1EE 1F1F2 ; fully-qualified # 🇮🇲 flag: Isle of Man
-1F1EE 1F1F3 ; fully-qualified # 🇮🇳 flag: India
-1F1EE 1F1F4 ; fully-qualified # 🇮🇴 flag: British Indian Ocean Territory
-1F1EE 1F1F6 ; fully-qualified # 🇮🇶 flag: Iraq
-1F1EE 1F1F7 ; fully-qualified # 🇮🇷 flag: Iran
-1F1EE 1F1F8 ; fully-qualified # 🇮🇸 flag: Iceland
-1F1EE 1F1F9 ; fully-qualified # 🇮🇹 flag: Italy
-1F1EF 1F1EA ; fully-qualified # 🇯🇪 flag: Jersey
-1F1EF 1F1F2 ; fully-qualified # 🇯🇲 flag: Jamaica
-1F1EF 1F1F4 ; fully-qualified # 🇯🇴 flag: Jordan
-1F1EF 1F1F5 ; fully-qualified # 🇯🇵 flag: Japan
-1F1F0 1F1EA ; fully-qualified # 🇰🇪 flag: Kenya
-1F1F0 1F1EC ; fully-qualified # 🇰🇬 flag: Kyrgyzstan
-1F1F0 1F1ED ; fully-qualified # 🇰🇭 flag: Cambodia
-1F1F0 1F1EE ; fully-qualified # 🇰🇮 flag: Kiribati
-1F1F0 1F1F2 ; fully-qualified # 🇰🇲 flag: Comoros
-1F1F0 1F1F3 ; fully-qualified # 🇰🇳 flag: St. Kitts & Nevis
-1F1F0 1F1F5 ; fully-qualified # 🇰🇵 flag: North Korea
-1F1F0 1F1F7 ; fully-qualified # 🇰🇷 flag: South Korea
-1F1F0 1F1FC ; fully-qualified # 🇰🇼 flag: Kuwait
-1F1F0 1F1FE ; fully-qualified # 🇰🇾 flag: Cayman Islands
-1F1F0 1F1FF ; fully-qualified # 🇰🇿 flag: Kazakhstan
-1F1F1 1F1E6 ; fully-qualified # 🇱🇦 flag: Laos
-1F1F1 1F1E7 ; fully-qualified # 🇱🇧 flag: Lebanon
-1F1F1 1F1E8 ; fully-qualified # 🇱🇨 flag: St. Lucia
-1F1F1 1F1EE ; fully-qualified # 🇱🇮 flag: Liechtenstein
-1F1F1 1F1F0 ; fully-qualified # 🇱🇰 flag: Sri Lanka
-1F1F1 1F1F7 ; fully-qualified # 🇱🇷 flag: Liberia
-1F1F1 1F1F8 ; fully-qualified # 🇱🇸 flag: Lesotho
-1F1F1 1F1F9 ; fully-qualified # 🇱🇹 flag: Lithuania
-1F1F1 1F1FA ; fully-qualified # 🇱🇺 flag: Luxembourg
-1F1F1 1F1FB ; fully-qualified # 🇱🇻 flag: Latvia
-1F1F1 1F1FE ; fully-qualified # 🇱🇾 flag: Libya
-1F1F2 1F1E6 ; fully-qualified # 🇲🇦 flag: Morocco
-1F1F2 1F1E8 ; fully-qualified # 🇲🇨 flag: Monaco
-1F1F2 1F1E9 ; fully-qualified # 🇲🇩 flag: Moldova
-1F1F2 1F1EA ; fully-qualified # 🇲🇪 flag: Montenegro
-1F1F2 1F1EB ; fully-qualified # 🇲🇫 flag: St. Martin
-1F1F2 1F1EC ; fully-qualified # 🇲🇬 flag: Madagascar
-1F1F2 1F1ED ; fully-qualified # 🇲🇭 flag: Marshall Islands
-1F1F2 1F1F0 ; fully-qualified # 🇲🇰 flag: North Macedonia
-1F1F2 1F1F1 ; fully-qualified # 🇲🇱 flag: Mali
-1F1F2 1F1F2 ; fully-qualified # 🇲🇲 flag: Myanmar (Burma)
-1F1F2 1F1F3 ; fully-qualified # 🇲🇳 flag: Mongolia
-1F1F2 1F1F4 ; fully-qualified # 🇲🇴 flag: Macao SAR China
-1F1F2 1F1F5 ; fully-qualified # 🇲🇵 flag: Northern Mariana Islands
-1F1F2 1F1F6 ; fully-qualified # 🇲🇶 flag: Martinique
-1F1F2 1F1F7 ; fully-qualified # 🇲🇷 flag: Mauritania
-1F1F2 1F1F8 ; fully-qualified # 🇲🇸 flag: Montserrat
-1F1F2 1F1F9 ; fully-qualified # 🇲🇹 flag: Malta
-1F1F2 1F1FA ; fully-qualified # 🇲🇺 flag: Mauritius
-1F1F2 1F1FB ; fully-qualified # 🇲🇻 flag: Maldives
-1F1F2 1F1FC ; fully-qualified # 🇲🇼 flag: Malawi
-1F1F2 1F1FD ; fully-qualified # 🇲🇽 flag: Mexico
-1F1F2 1F1FE ; fully-qualified # 🇲🇾 flag: Malaysia
-1F1F2 1F1FF ; fully-qualified # 🇲🇿 flag: Mozambique
-1F1F3 1F1E6 ; fully-qualified # 🇳🇦 flag: Namibia
-1F1F3 1F1E8 ; fully-qualified # 🇳🇨 flag: New Caledonia
-1F1F3 1F1EA ; fully-qualified # 🇳🇪 flag: Niger
-1F1F3 1F1EB ; fully-qualified # 🇳🇫 flag: Norfolk Island
-1F1F3 1F1EC ; fully-qualified # 🇳🇬 flag: Nigeria
-1F1F3 1F1EE ; fully-qualified # 🇳🇮 flag: Nicaragua
-1F1F3 1F1F1 ; fully-qualified # 🇳🇱 flag: Netherlands
-1F1F3 1F1F4 ; fully-qualified # 🇳🇴 flag: Norway
-1F1F3 1F1F5 ; fully-qualified # 🇳🇵 flag: Nepal
-1F1F3 1F1F7 ; fully-qualified # 🇳🇷 flag: Nauru
-1F1F3 1F1FA ; fully-qualified # 🇳🇺 flag: Niue
-1F1F3 1F1FF ; fully-qualified # 🇳🇿 flag: New Zealand
-1F1F4 1F1F2 ; fully-qualified # 🇴🇲 flag: Oman
-1F1F5 1F1E6 ; fully-qualified # 🇵🇦 flag: Panama
-1F1F5 1F1EA ; fully-qualified # 🇵🇪 flag: Peru
-1F1F5 1F1EB ; fully-qualified # 🇵🇫 flag: French Polynesia
-1F1F5 1F1EC ; fully-qualified # 🇵🇬 flag: Papua New Guinea
-1F1F5 1F1ED ; fully-qualified # 🇵🇭 flag: Philippines
-1F1F5 1F1F0 ; fully-qualified # 🇵🇰 flag: Pakistan
-1F1F5 1F1F1 ; fully-qualified # 🇵🇱 flag: Poland
-1F1F5 1F1F2 ; fully-qualified # 🇵🇲 flag: St. Pierre & Miquelon
-1F1F5 1F1F3 ; fully-qualified # 🇵🇳 flag: Pitcairn Islands
-1F1F5 1F1F7 ; fully-qualified # 🇵🇷 flag: Puerto Rico
-1F1F5 1F1F8 ; fully-qualified # 🇵🇸 flag: Palestinian Territories
-1F1F5 1F1F9 ; fully-qualified # 🇵🇹 flag: Portugal
-1F1F5 1F1FC ; fully-qualified # 🇵🇼 flag: Palau
-1F1F5 1F1FE ; fully-qualified # 🇵🇾 flag: Paraguay
-1F1F6 1F1E6 ; fully-qualified # 🇶🇦 flag: Qatar
-1F1F7 1F1EA ; fully-qualified # 🇷🇪 flag: Réunion
-1F1F7 1F1F4 ; fully-qualified # 🇷🇴 flag: Romania
-1F1F7 1F1F8 ; fully-qualified # 🇷🇸 flag: Serbia
-1F1F7 1F1FA ; fully-qualified # 🇷🇺 flag: Russia
-1F1F7 1F1FC ; fully-qualified # 🇷🇼 flag: Rwanda
-1F1F8 1F1E6 ; fully-qualified # 🇸🇦 flag: Saudi Arabia
-1F1F8 1F1E7 ; fully-qualified # 🇸🇧 flag: Solomon Islands
-1F1F8 1F1E8 ; fully-qualified # 🇸🇨 flag: Seychelles
-1F1F8 1F1E9 ; fully-qualified # 🇸🇩 flag: Sudan
-1F1F8 1F1EA ; fully-qualified # 🇸🇪 flag: Sweden
-1F1F8 1F1EC ; fully-qualified # 🇸🇬 flag: Singapore
-1F1F8 1F1ED ; fully-qualified # 🇸🇭 flag: St. Helena
-1F1F8 1F1EE ; fully-qualified # 🇸🇮 flag: Slovenia
-1F1F8 1F1EF ; fully-qualified # 🇸🇯 flag: Svalbard & Jan Mayen
-1F1F8 1F1F0 ; fully-qualified # 🇸🇰 flag: Slovakia
-1F1F8 1F1F1 ; fully-qualified # 🇸🇱 flag: Sierra Leone
-1F1F8 1F1F2 ; fully-qualified # 🇸🇲 flag: San Marino
-1F1F8 1F1F3 ; fully-qualified # 🇸🇳 flag: Senegal
-1F1F8 1F1F4 ; fully-qualified # 🇸🇴 flag: Somalia
-1F1F8 1F1F7 ; fully-qualified # 🇸🇷 flag: Suriname
-1F1F8 1F1F8 ; fully-qualified # 🇸🇸 flag: South Sudan
-1F1F8 1F1F9 ; fully-qualified # 🇸🇹 flag: São Tomé & Príncipe
-1F1F8 1F1FB ; fully-qualified # 🇸🇻 flag: El Salvador
-1F1F8 1F1FD ; fully-qualified # 🇸🇽 flag: Sint Maarten
-1F1F8 1F1FE ; fully-qualified # 🇸🇾 flag: Syria
-1F1F8 1F1FF ; fully-qualified # 🇸🇿 flag: Eswatini
-1F1F9 1F1E6 ; fully-qualified # 🇹🇦 flag: Tristan da Cunha
-1F1F9 1F1E8 ; fully-qualified # 🇹🇨 flag: Turks & Caicos Islands
-1F1F9 1F1E9 ; fully-qualified # 🇹🇩 flag: Chad
-1F1F9 1F1EB ; fully-qualified # 🇹🇫 flag: French Southern Territories
-1F1F9 1F1EC ; fully-qualified # 🇹🇬 flag: Togo
-1F1F9 1F1ED ; fully-qualified # 🇹🇭 flag: Thailand
-1F1F9 1F1EF ; fully-qualified # 🇹🇯 flag: Tajikistan
-1F1F9 1F1F0 ; fully-qualified # 🇹🇰 flag: Tokelau
-1F1F9 1F1F1 ; fully-qualified # 🇹🇱 flag: Timor-Leste
-1F1F9 1F1F2 ; fully-qualified # 🇹🇲 flag: Turkmenistan
-1F1F9 1F1F3 ; fully-qualified # 🇹🇳 flag: Tunisia
-1F1F9 1F1F4 ; fully-qualified # 🇹🇴 flag: Tonga
-1F1F9 1F1F7 ; fully-qualified # 🇹🇷 flag: Turkey
-1F1F9 1F1F9 ; fully-qualified # 🇹🇹 flag: Trinidad & Tobago
-1F1F9 1F1FB ; fully-qualified # 🇹🇻 flag: Tuvalu
-1F1F9 1F1FC ; fully-qualified # 🇹🇼 flag: Taiwan
-1F1F9 1F1FF ; fully-qualified # 🇹🇿 flag: Tanzania
-1F1FA 1F1E6 ; fully-qualified # 🇺🇦 flag: Ukraine
-1F1FA 1F1EC ; fully-qualified # 🇺🇬 flag: Uganda
-1F1FA 1F1F2 ; fully-qualified # 🇺🇲 flag: U.S. Outlying Islands
-1F1FA 1F1F3 ; fully-qualified # 🇺🇳 flag: United Nations
-1F1FA 1F1F8 ; fully-qualified # 🇺🇸 flag: United States
-1F1FA 1F1FE ; fully-qualified # 🇺🇾 flag: Uruguay
-1F1FA 1F1FF ; fully-qualified # 🇺🇿 flag: Uzbekistan
-1F1FB 1F1E6 ; fully-qualified # 🇻🇦 flag: Vatican City
-1F1FB 1F1E8 ; fully-qualified # 🇻🇨 flag: St. Vincent & Grenadines
-1F1FB 1F1EA ; fully-qualified # 🇻🇪 flag: Venezuela
-1F1FB 1F1EC ; fully-qualified # 🇻🇬 flag: British Virgin Islands
-1F1FB 1F1EE ; fully-qualified # 🇻🇮 flag: U.S. Virgin Islands
-1F1FB 1F1F3 ; fully-qualified # 🇻🇳 flag: Vietnam
-1F1FB 1F1FA ; fully-qualified # 🇻🇺 flag: Vanuatu
-1F1FC 1F1EB ; fully-qualified # 🇼🇫 flag: Wallis & Futuna
-1F1FC 1F1F8 ; fully-qualified # 🇼🇸 flag: Samoa
-1F1FD 1F1F0 ; fully-qualified # 🇽🇰 flag: Kosovo
-1F1FE 1F1EA ; fully-qualified # 🇾🇪 flag: Yemen
-1F1FE 1F1F9 ; fully-qualified # 🇾🇹 flag: Mayotte
-1F1FF 1F1E6 ; fully-qualified # 🇿🇦 flag: South Africa
-1F1FF 1F1F2 ; fully-qualified # 🇿🇲 flag: Zambia
-1F1FF 1F1FC ; fully-qualified # 🇿🇼 flag: Zimbabwe
+1F1E6 1F1E8 ; fully-qualified # 🇦🇨 E2.0 flag: Ascension Island
+1F1E6 1F1E9 ; fully-qualified # 🇦🇩 E2.0 flag: Andorra
+1F1E6 1F1EA ; fully-qualified # 🇦🇪 E2.0 flag: United Arab Emirates
+1F1E6 1F1EB ; fully-qualified # 🇦🇫 E2.0 flag: Afghanistan
+1F1E6 1F1EC ; fully-qualified # 🇦🇬 E2.0 flag: Antigua & Barbuda
+1F1E6 1F1EE ; fully-qualified # 🇦🇮 E2.0 flag: Anguilla
+1F1E6 1F1F1 ; fully-qualified # 🇦🇱 E2.0 flag: Albania
+1F1E6 1F1F2 ; fully-qualified # 🇦🇲 E2.0 flag: Armenia
+1F1E6 1F1F4 ; fully-qualified # 🇦🇴 E2.0 flag: Angola
+1F1E6 1F1F6 ; fully-qualified # 🇦🇶 E2.0 flag: Antarctica
+1F1E6 1F1F7 ; fully-qualified # 🇦🇷 E2.0 flag: Argentina
+1F1E6 1F1F8 ; fully-qualified # 🇦🇸 E2.0 flag: American Samoa
+1F1E6 1F1F9 ; fully-qualified # 🇦🇹 E2.0 flag: Austria
+1F1E6 1F1FA ; fully-qualified # 🇦🇺 E2.0 flag: Australia
+1F1E6 1F1FC ; fully-qualified # 🇦🇼 E2.0 flag: Aruba
+1F1E6 1F1FD ; fully-qualified # 🇦🇽 E2.0 flag: Åland Islands
+1F1E6 1F1FF ; fully-qualified # 🇦🇿 E2.0 flag: Azerbaijan
+1F1E7 1F1E6 ; fully-qualified # 🇧🇦 E2.0 flag: Bosnia & Herzegovina
+1F1E7 1F1E7 ; fully-qualified # 🇧🇧 E2.0 flag: Barbados
+1F1E7 1F1E9 ; fully-qualified # 🇧🇩 E2.0 flag: Bangladesh
+1F1E7 1F1EA ; fully-qualified # 🇧🇪 E2.0 flag: Belgium
+1F1E7 1F1EB ; fully-qualified # 🇧🇫 E2.0 flag: Burkina Faso
+1F1E7 1F1EC ; fully-qualified # 🇧🇬 E2.0 flag: Bulgaria
+1F1E7 1F1ED ; fully-qualified # 🇧🇭 E2.0 flag: Bahrain
+1F1E7 1F1EE ; fully-qualified # 🇧🇮 E2.0 flag: Burundi
+1F1E7 1F1EF ; fully-qualified # 🇧🇯 E2.0 flag: Benin
+1F1E7 1F1F1 ; fully-qualified # 🇧🇱 E2.0 flag: St. Barthélemy
+1F1E7 1F1F2 ; fully-qualified # 🇧🇲 E2.0 flag: Bermuda
+1F1E7 1F1F3 ; fully-qualified # 🇧🇳 E2.0 flag: Brunei
+1F1E7 1F1F4 ; fully-qualified # 🇧🇴 E2.0 flag: Bolivia
+1F1E7 1F1F6 ; fully-qualified # 🇧🇶 E2.0 flag: Caribbean Netherlands
+1F1E7 1F1F7 ; fully-qualified # 🇧🇷 E2.0 flag: Brazil
+1F1E7 1F1F8 ; fully-qualified # 🇧🇸 E2.0 flag: Bahamas
+1F1E7 1F1F9 ; fully-qualified # 🇧🇹 E2.0 flag: Bhutan
+1F1E7 1F1FB ; fully-qualified # 🇧🇻 E2.0 flag: Bouvet Island
+1F1E7 1F1FC ; fully-qualified # 🇧🇼 E2.0 flag: Botswana
+1F1E7 1F1FE ; fully-qualified # 🇧🇾 E2.0 flag: Belarus
+1F1E7 1F1FF ; fully-qualified # 🇧🇿 E2.0 flag: Belize
+1F1E8 1F1E6 ; fully-qualified # 🇨🇦 E2.0 flag: Canada
+1F1E8 1F1E8 ; fully-qualified # 🇨🇨 E2.0 flag: Cocos (Keeling) Islands
+1F1E8 1F1E9 ; fully-qualified # 🇨🇩 E2.0 flag: Congo - Kinshasa
+1F1E8 1F1EB ; fully-qualified # 🇨🇫 E2.0 flag: Central African Republic
+1F1E8 1F1EC ; fully-qualified # 🇨🇬 E2.0 flag: Congo - Brazzaville
+1F1E8 1F1ED ; fully-qualified # 🇨🇭 E2.0 flag: Switzerland
+1F1E8 1F1EE ; fully-qualified # 🇨🇮 E2.0 flag: Côte d’Ivoire
+1F1E8 1F1F0 ; fully-qualified # 🇨🇰 E2.0 flag: Cook Islands
+1F1E8 1F1F1 ; fully-qualified # 🇨🇱 E2.0 flag: Chile
+1F1E8 1F1F2 ; fully-qualified # 🇨🇲 E2.0 flag: Cameroon
+1F1E8 1F1F3 ; fully-qualified # 🇨🇳 E0.6 flag: China
+1F1E8 1F1F4 ; fully-qualified # 🇨🇴 E2.0 flag: Colombia
+1F1E8 1F1F5 ; fully-qualified # 🇨🇵 E2.0 flag: Clipperton Island
+1F1E8 1F1F7 ; fully-qualified # 🇨🇷 E2.0 flag: Costa Rica
+1F1E8 1F1FA ; fully-qualified # 🇨🇺 E2.0 flag: Cuba
+1F1E8 1F1FB ; fully-qualified # 🇨🇻 E2.0 flag: Cape Verde
+1F1E8 1F1FC ; fully-qualified # 🇨🇼 E2.0 flag: Curaçao
+1F1E8 1F1FD ; fully-qualified # 🇨🇽 E2.0 flag: Christmas Island
+1F1E8 1F1FE ; fully-qualified # 🇨🇾 E2.0 flag: Cyprus
+1F1E8 1F1FF ; fully-qualified # 🇨🇿 E2.0 flag: Czechia
+1F1E9 1F1EA ; fully-qualified # 🇩🇪 E0.6 flag: Germany
+1F1E9 1F1EC ; fully-qualified # 🇩🇬 E2.0 flag: Diego Garcia
+1F1E9 1F1EF ; fully-qualified # 🇩🇯 E2.0 flag: Djibouti
+1F1E9 1F1F0 ; fully-qualified # 🇩🇰 E2.0 flag: Denmark
+1F1E9 1F1F2 ; fully-qualified # 🇩🇲 E2.0 flag: Dominica
+1F1E9 1F1F4 ; fully-qualified # 🇩🇴 E2.0 flag: Dominican Republic
+1F1E9 1F1FF ; fully-qualified # 🇩🇿 E2.0 flag: Algeria
+1F1EA 1F1E6 ; fully-qualified # 🇪🇦 E2.0 flag: Ceuta & Melilla
+1F1EA 1F1E8 ; fully-qualified # 🇪🇨 E2.0 flag: Ecuador
+1F1EA 1F1EA ; fully-qualified # 🇪🇪 E2.0 flag: Estonia
+1F1EA 1F1EC ; fully-qualified # 🇪🇬 E2.0 flag: Egypt
+1F1EA 1F1ED ; fully-qualified # 🇪🇭 E2.0 flag: Western Sahara
+1F1EA 1F1F7 ; fully-qualified # 🇪🇷 E2.0 flag: Eritrea
+1F1EA 1F1F8 ; fully-qualified # 🇪🇸 E0.6 flag: Spain
+1F1EA 1F1F9 ; fully-qualified # 🇪🇹 E2.0 flag: Ethiopia
+1F1EA 1F1FA ; fully-qualified # 🇪🇺 E2.0 flag: European Union
+1F1EB 1F1EE ; fully-qualified # 🇫🇮 E2.0 flag: Finland
+1F1EB 1F1EF ; fully-qualified # 🇫🇯 E2.0 flag: Fiji
+1F1EB 1F1F0 ; fully-qualified # 🇫🇰 E2.0 flag: Falkland Islands
+1F1EB 1F1F2 ; fully-qualified # 🇫🇲 E2.0 flag: Micronesia
+1F1EB 1F1F4 ; fully-qualified # 🇫🇴 E2.0 flag: Faroe Islands
+1F1EB 1F1F7 ; fully-qualified # 🇫🇷 E0.6 flag: France
+1F1EC 1F1E6 ; fully-qualified # 🇬🇦 E2.0 flag: Gabon
+1F1EC 1F1E7 ; fully-qualified # 🇬🇧 E0.6 flag: United Kingdom
+1F1EC 1F1E9 ; fully-qualified # 🇬🇩 E2.0 flag: Grenada
+1F1EC 1F1EA ; fully-qualified # 🇬🇪 E2.0 flag: Georgia
+1F1EC 1F1EB ; fully-qualified # 🇬🇫 E2.0 flag: French Guiana
+1F1EC 1F1EC ; fully-qualified # 🇬🇬 E2.0 flag: Guernsey
+1F1EC 1F1ED ; fully-qualified # 🇬🇭 E2.0 flag: Ghana
+1F1EC 1F1EE ; fully-qualified # 🇬🇮 E2.0 flag: Gibraltar
+1F1EC 1F1F1 ; fully-qualified # 🇬🇱 E2.0 flag: Greenland
+1F1EC 1F1F2 ; fully-qualified # 🇬🇲 E2.0 flag: Gambia
+1F1EC 1F1F3 ; fully-qualified # 🇬🇳 E2.0 flag: Guinea
+1F1EC 1F1F5 ; fully-qualified # 🇬🇵 E2.0 flag: Guadeloupe
+1F1EC 1F1F6 ; fully-qualified # 🇬🇶 E2.0 flag: Equatorial Guinea
+1F1EC 1F1F7 ; fully-qualified # 🇬🇷 E2.0 flag: Greece
+1F1EC 1F1F8 ; fully-qualified # 🇬🇸 E2.0 flag: South Georgia & South Sandwich Islands
+1F1EC 1F1F9 ; fully-qualified # 🇬🇹 E2.0 flag: Guatemala
+1F1EC 1F1FA ; fully-qualified # 🇬🇺 E2.0 flag: Guam
+1F1EC 1F1FC ; fully-qualified # 🇬🇼 E2.0 flag: Guinea-Bissau
+1F1EC 1F1FE ; fully-qualified # 🇬🇾 E2.0 flag: Guyana
+1F1ED 1F1F0 ; fully-qualified # 🇭🇰 E2.0 flag: Hong Kong SAR China
+1F1ED 1F1F2 ; fully-qualified # 🇭🇲 E2.0 flag: Heard & McDonald Islands
+1F1ED 1F1F3 ; fully-qualified # 🇭🇳 E2.0 flag: Honduras
+1F1ED 1F1F7 ; fully-qualified # 🇭🇷 E2.0 flag: Croatia
+1F1ED 1F1F9 ; fully-qualified # 🇭🇹 E2.0 flag: Haiti
+1F1ED 1F1FA ; fully-qualified # 🇭🇺 E2.0 flag: Hungary
+1F1EE 1F1E8 ; fully-qualified # 🇮🇨 E2.0 flag: Canary Islands
+1F1EE 1F1E9 ; fully-qualified # 🇮🇩 E2.0 flag: Indonesia
+1F1EE 1F1EA ; fully-qualified # 🇮🇪 E2.0 flag: Ireland
+1F1EE 1F1F1 ; fully-qualified # 🇮🇱 E2.0 flag: Israel
+1F1EE 1F1F2 ; fully-qualified # 🇮🇲 E2.0 flag: Isle of Man
+1F1EE 1F1F3 ; fully-qualified # 🇮🇳 E2.0 flag: India
+1F1EE 1F1F4 ; fully-qualified # 🇮🇴 E2.0 flag: British Indian Ocean Territory
+1F1EE 1F1F6 ; fully-qualified # 🇮🇶 E2.0 flag: Iraq
+1F1EE 1F1F7 ; fully-qualified # 🇮🇷 E2.0 flag: Iran
+1F1EE 1F1F8 ; fully-qualified # 🇮🇸 E2.0 flag: Iceland
+1F1EE 1F1F9 ; fully-qualified # 🇮🇹 E0.6 flag: Italy
+1F1EF 1F1EA ; fully-qualified # 🇯🇪 E2.0 flag: Jersey
+1F1EF 1F1F2 ; fully-qualified # 🇯🇲 E2.0 flag: Jamaica
+1F1EF 1F1F4 ; fully-qualified # 🇯🇴 E2.0 flag: Jordan
+1F1EF 1F1F5 ; fully-qualified # 🇯🇵 E0.6 flag: Japan
+1F1F0 1F1EA ; fully-qualified # 🇰🇪 E2.0 flag: Kenya
+1F1F0 1F1EC ; fully-qualified # 🇰🇬 E2.0 flag: Kyrgyzstan
+1F1F0 1F1ED ; fully-qualified # 🇰🇭 E2.0 flag: Cambodia
+1F1F0 1F1EE ; fully-qualified # 🇰🇮 E2.0 flag: Kiribati
+1F1F0 1F1F2 ; fully-qualified # 🇰🇲 E2.0 flag: Comoros
+1F1F0 1F1F3 ; fully-qualified # 🇰🇳 E2.0 flag: St. Kitts & Nevis
+1F1F0 1F1F5 ; fully-qualified # 🇰🇵 E2.0 flag: North Korea
+1F1F0 1F1F7 ; fully-qualified # 🇰🇷 E0.6 flag: South Korea
+1F1F0 1F1FC ; fully-qualified # 🇰🇼 E2.0 flag: Kuwait
+1F1F0 1F1FE ; fully-qualified # 🇰🇾 E2.0 flag: Cayman Islands
+1F1F0 1F1FF ; fully-qualified # 🇰🇿 E2.0 flag: Kazakhstan
+1F1F1 1F1E6 ; fully-qualified # 🇱🇦 E2.0 flag: Laos
+1F1F1 1F1E7 ; fully-qualified # 🇱🇧 E2.0 flag: Lebanon
+1F1F1 1F1E8 ; fully-qualified # 🇱🇨 E2.0 flag: St. Lucia
+1F1F1 1F1EE ; fully-qualified # 🇱🇮 E2.0 flag: Liechtenstein
+1F1F1 1F1F0 ; fully-qualified # 🇱🇰 E2.0 flag: Sri Lanka
+1F1F1 1F1F7 ; fully-qualified # 🇱🇷 E2.0 flag: Liberia
+1F1F1 1F1F8 ; fully-qualified # 🇱🇸 E2.0 flag: Lesotho
+1F1F1 1F1F9 ; fully-qualified # 🇱🇹 E2.0 flag: Lithuania
+1F1F1 1F1FA ; fully-qualified # 🇱🇺 E2.0 flag: Luxembourg
+1F1F1 1F1FB ; fully-qualified # 🇱🇻 E2.0 flag: Latvia
+1F1F1 1F1FE ; fully-qualified # 🇱🇾 E2.0 flag: Libya
+1F1F2 1F1E6 ; fully-qualified # 🇲🇦 E2.0 flag: Morocco
+1F1F2 1F1E8 ; fully-qualified # 🇲🇨 E2.0 flag: Monaco
+1F1F2 1F1E9 ; fully-qualified # 🇲🇩 E2.0 flag: Moldova
+1F1F2 1F1EA ; fully-qualified # 🇲🇪 E2.0 flag: Montenegro
+1F1F2 1F1EB ; fully-qualified # 🇲🇫 E2.0 flag: St. Martin
+1F1F2 1F1EC ; fully-qualified # 🇲🇬 E2.0 flag: Madagascar
+1F1F2 1F1ED ; fully-qualified # 🇲🇭 E2.0 flag: Marshall Islands
+1F1F2 1F1F0 ; fully-qualified # 🇲🇰 E2.0 flag: North Macedonia
+1F1F2 1F1F1 ; fully-qualified # 🇲🇱 E2.0 flag: Mali
+1F1F2 1F1F2 ; fully-qualified # 🇲🇲 E2.0 flag: Myanmar (Burma)
+1F1F2 1F1F3 ; fully-qualified # 🇲🇳 E2.0 flag: Mongolia
+1F1F2 1F1F4 ; fully-qualified # 🇲🇴 E2.0 flag: Macao SAR China
+1F1F2 1F1F5 ; fully-qualified # 🇲🇵 E2.0 flag: Northern Mariana Islands
+1F1F2 1F1F6 ; fully-qualified # 🇲🇶 E2.0 flag: Martinique
+1F1F2 1F1F7 ; fully-qualified # 🇲🇷 E2.0 flag: Mauritania
+1F1F2 1F1F8 ; fully-qualified # 🇲🇸 E2.0 flag: Montserrat
+1F1F2 1F1F9 ; fully-qualified # 🇲🇹 E2.0 flag: Malta
+1F1F2 1F1FA ; fully-qualified # 🇲🇺 E2.0 flag: Mauritius
+1F1F2 1F1FB ; fully-qualified # 🇲🇻 E2.0 flag: Maldives
+1F1F2 1F1FC ; fully-qualified # 🇲🇼 E2.0 flag: Malawi
+1F1F2 1F1FD ; fully-qualified # 🇲🇽 E2.0 flag: Mexico
+1F1F2 1F1FE ; fully-qualified # 🇲🇾 E2.0 flag: Malaysia
+1F1F2 1F1FF ; fully-qualified # 🇲🇿 E2.0 flag: Mozambique
+1F1F3 1F1E6 ; fully-qualified # 🇳🇦 E2.0 flag: Namibia
+1F1F3 1F1E8 ; fully-qualified # 🇳🇨 E2.0 flag: New Caledonia
+1F1F3 1F1EA ; fully-qualified # 🇳🇪 E2.0 flag: Niger
+1F1F3 1F1EB ; fully-qualified # 🇳🇫 E2.0 flag: Norfolk Island
+1F1F3 1F1EC ; fully-qualified # 🇳🇬 E2.0 flag: Nigeria
+1F1F3 1F1EE ; fully-qualified # 🇳🇮 E2.0 flag: Nicaragua
+1F1F3 1F1F1 ; fully-qualified # 🇳🇱 E2.0 flag: Netherlands
+1F1F3 1F1F4 ; fully-qualified # 🇳🇴 E2.0 flag: Norway
+1F1F3 1F1F5 ; fully-qualified # 🇳🇵 E2.0 flag: Nepal
+1F1F3 1F1F7 ; fully-qualified # 🇳🇷 E2.0 flag: Nauru
+1F1F3 1F1FA ; fully-qualified # 🇳🇺 E2.0 flag: Niue
+1F1F3 1F1FF ; fully-qualified # 🇳🇿 E2.0 flag: New Zealand
+1F1F4 1F1F2 ; fully-qualified # 🇴🇲 E2.0 flag: Oman
+1F1F5 1F1E6 ; fully-qualified # 🇵🇦 E2.0 flag: Panama
+1F1F5 1F1EA ; fully-qualified # 🇵🇪 E2.0 flag: Peru
+1F1F5 1F1EB ; fully-qualified # 🇵🇫 E2.0 flag: French Polynesia
+1F1F5 1F1EC ; fully-qualified # 🇵🇬 E2.0 flag: Papua New Guinea
+1F1F5 1F1ED ; fully-qualified # 🇵🇭 E2.0 flag: Philippines
+1F1F5 1F1F0 ; fully-qualified # 🇵🇰 E2.0 flag: Pakistan
+1F1F5 1F1F1 ; fully-qualified # 🇵🇱 E2.0 flag: Poland
+1F1F5 1F1F2 ; fully-qualified # 🇵🇲 E2.0 flag: St. Pierre & Miquelon
+1F1F5 1F1F3 ; fully-qualified # 🇵🇳 E2.0 flag: Pitcairn Islands
+1F1F5 1F1F7 ; fully-qualified # 🇵🇷 E2.0 flag: Puerto Rico
+1F1F5 1F1F8 ; fully-qualified # 🇵🇸 E2.0 flag: Palestinian Territories
+1F1F5 1F1F9 ; fully-qualified # 🇵🇹 E2.0 flag: Portugal
+1F1F5 1F1FC ; fully-qualified # 🇵🇼 E2.0 flag: Palau
+1F1F5 1F1FE ; fully-qualified # 🇵🇾 E2.0 flag: Paraguay
+1F1F6 1F1E6 ; fully-qualified # 🇶🇦 E2.0 flag: Qatar
+1F1F7 1F1EA ; fully-qualified # 🇷🇪 E2.0 flag: Réunion
+1F1F7 1F1F4 ; fully-qualified # 🇷🇴 E2.0 flag: Romania
+1F1F7 1F1F8 ; fully-qualified # 🇷🇸 E2.0 flag: Serbia
+1F1F7 1F1FA ; fully-qualified # 🇷🇺 E0.6 flag: Russia
+1F1F7 1F1FC ; fully-qualified # 🇷🇼 E2.0 flag: Rwanda
+1F1F8 1F1E6 ; fully-qualified # 🇸🇦 E2.0 flag: Saudi Arabia
+1F1F8 1F1E7 ; fully-qualified # 🇸🇧 E2.0 flag: Solomon Islands
+1F1F8 1F1E8 ; fully-qualified # 🇸🇨 E2.0 flag: Seychelles
+1F1F8 1F1E9 ; fully-qualified # 🇸🇩 E2.0 flag: Sudan
+1F1F8 1F1EA ; fully-qualified # 🇸🇪 E2.0 flag: Sweden
+1F1F8 1F1EC ; fully-qualified # 🇸🇬 E2.0 flag: Singapore
+1F1F8 1F1ED ; fully-qualified # 🇸🇭 E2.0 flag: St. Helena
+1F1F8 1F1EE ; fully-qualified # 🇸🇮 E2.0 flag: Slovenia
+1F1F8 1F1EF ; fully-qualified # 🇸🇯 E2.0 flag: Svalbard & Jan Mayen
+1F1F8 1F1F0 ; fully-qualified # 🇸🇰 E2.0 flag: Slovakia
+1F1F8 1F1F1 ; fully-qualified # 🇸🇱 E2.0 flag: Sierra Leone
+1F1F8 1F1F2 ; fully-qualified # 🇸🇲 E2.0 flag: San Marino
+1F1F8 1F1F3 ; fully-qualified # 🇸🇳 E2.0 flag: Senegal
+1F1F8 1F1F4 ; fully-qualified # 🇸🇴 E2.0 flag: Somalia
+1F1F8 1F1F7 ; fully-qualified # 🇸🇷 E2.0 flag: Suriname
+1F1F8 1F1F8 ; fully-qualified # 🇸🇸 E2.0 flag: South Sudan
+1F1F8 1F1F9 ; fully-qualified # 🇸🇹 E2.0 flag: São Tomé & Príncipe
+1F1F8 1F1FB ; fully-qualified # 🇸🇻 E2.0 flag: El Salvador
+1F1F8 1F1FD ; fully-qualified # 🇸🇽 E2.0 flag: Sint Maarten
+1F1F8 1F1FE ; fully-qualified # 🇸🇾 E2.0 flag: Syria
+1F1F8 1F1FF ; fully-qualified # 🇸🇿 E2.0 flag: Eswatini
+1F1F9 1F1E6 ; fully-qualified # 🇹🇦 E2.0 flag: Tristan da Cunha
+1F1F9 1F1E8 ; fully-qualified # 🇹🇨 E2.0 flag: Turks & Caicos Islands
+1F1F9 1F1E9 ; fully-qualified # 🇹🇩 E2.0 flag: Chad
+1F1F9 1F1EB ; fully-qualified # 🇹🇫 E2.0 flag: French Southern Territories
+1F1F9 1F1EC ; fully-qualified # 🇹🇬 E2.0 flag: Togo
+1F1F9 1F1ED ; fully-qualified # 🇹🇭 E2.0 flag: Thailand
+1F1F9 1F1EF ; fully-qualified # 🇹🇯 E2.0 flag: Tajikistan
+1F1F9 1F1F0 ; fully-qualified # 🇹🇰 E2.0 flag: Tokelau
+1F1F9 1F1F1 ; fully-qualified # 🇹🇱 E2.0 flag: Timor-Leste
+1F1F9 1F1F2 ; fully-qualified # 🇹🇲 E2.0 flag: Turkmenistan
+1F1F9 1F1F3 ; fully-qualified # 🇹🇳 E2.0 flag: Tunisia
+1F1F9 1F1F4 ; fully-qualified # 🇹🇴 E2.0 flag: Tonga
+1F1F9 1F1F7 ; fully-qualified # 🇹🇷 E2.0 flag: Turkey
+1F1F9 1F1F9 ; fully-qualified # 🇹🇹 E2.0 flag: Trinidad & Tobago
+1F1F9 1F1FB ; fully-qualified # 🇹🇻 E2.0 flag: Tuvalu
+1F1F9 1F1FC ; fully-qualified # 🇹🇼 E2.0 flag: Taiwan
+1F1F9 1F1FF ; fully-qualified # 🇹🇿 E2.0 flag: Tanzania
+1F1FA 1F1E6 ; fully-qualified # 🇺🇦 E2.0 flag: Ukraine
+1F1FA 1F1EC ; fully-qualified # 🇺🇬 E2.0 flag: Uganda
+1F1FA 1F1F2 ; fully-qualified # 🇺🇲 E2.0 flag: U.S. Outlying Islands
+1F1FA 1F1F3 ; fully-qualified # 🇺🇳 E4.0 flag: United Nations
+1F1FA 1F1F8 ; fully-qualified # 🇺🇸 E0.6 flag: United States
+1F1FA 1F1FE ; fully-qualified # 🇺🇾 E2.0 flag: Uruguay
+1F1FA 1F1FF ; fully-qualified # 🇺🇿 E2.0 flag: Uzbekistan
+1F1FB 1F1E6 ; fully-qualified # 🇻🇦 E2.0 flag: Vatican City
+1F1FB 1F1E8 ; fully-qualified # 🇻🇨 E2.0 flag: St. Vincent & Grenadines
+1F1FB 1F1EA ; fully-qualified # 🇻🇪 E2.0 flag: Venezuela
+1F1FB 1F1EC ; fully-qualified # 🇻🇬 E2.0 flag: British Virgin Islands
+1F1FB 1F1EE ; fully-qualified # 🇻🇮 E2.0 flag: U.S. Virgin Islands
+1F1FB 1F1F3 ; fully-qualified # 🇻🇳 E2.0 flag: Vietnam
+1F1FB 1F1FA ; fully-qualified # 🇻🇺 E2.0 flag: Vanuatu
+1F1FC 1F1EB ; fully-qualified # 🇼🇫 E2.0 flag: Wallis & Futuna
+1F1FC 1F1F8 ; fully-qualified # 🇼🇸 E2.0 flag: Samoa
+1F1FD 1F1F0 ; fully-qualified # 🇽🇰 E2.0 flag: Kosovo
+1F1FE 1F1EA ; fully-qualified # 🇾🇪 E2.0 flag: Yemen
+1F1FE 1F1F9 ; fully-qualified # 🇾🇹 E2.0 flag: Mayotte
+1F1FF 1F1E6 ; fully-qualified # 🇿🇦 E2.0 flag: South Africa
+1F1FF 1F1F2 ; fully-qualified # 🇿🇲 E2.0 flag: Zambia
+1F1FF 1F1FC ; fully-qualified # 🇿🇼 E2.0 flag: Zimbabwe
# subgroup: subdivision-flag
-1F3F4 E0067 E0062 E0065 E006E E0067 E007F ; fully-qualified # 🏴 flag: England
-1F3F4 E0067 E0062 E0073 E0063 E0074 E007F ; fully-qualified # 🏴 flag: Scotland
-1F3F4 E0067 E0062 E0077 E006C E0073 E007F ; fully-qualified # 🏴 flag: Wales
\ No newline at end of file
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F ; fully-qualified # 🏴 E5.0 flag: England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F ; fully-qualified # 🏴 E5.0 flag: Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F ; fully-qualified # 🏴 E5.0 flag: Wales
+
+# Flags subtotal: 275
+# Flags subtotal: 275 w/o modifiers
+
+# Status Counts
+# fully-qualified : 3295
+# minimally-qualified : 614
+# unqualified : 250
+# component : 9
+
+#EOF
diff --git a/tools/java/org/unicode/cldr/util/data/external/EuCode.txt b/tools/java/org/unicode/cldr/util/data/external/EuCode.txt
new file mode 100644
index 0000000..8978c36
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/data/external/EuCode.txt
@@ -0,0 +1,17 @@
+#File for comparing EU containment.
+#See https://sites.google.com/site/cldr/development/updating-codes/updating-un-codes
+# ========
+Austria Italy
+Belgium Latvia
+Bulgaria Lithuania
+Croatia Luxembourg
+Cyprus Malta
+Czechia Netherlands
+Denmark Poland
+Estonia Portugal
+Finland Romania
+France Slovakia
+Germany Slovenia
+Greece Spain
+Hungary Sweden
+Ireland
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/data/external/Iso639-5.html b/tools/java/org/unicode/cldr/util/data/external/Iso639-5.html
index 196294b..f917f30 100644
--- a/tools/java/org/unicode/cldr/util/data/external/Iso639-5.html
+++ b/tools/java/org/unicode/cldr/util/data/external/Iso639-5.html
@@ -13,8 +13,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="iso639-5.css" rel="stylesheet" type="text/css" />
<!-- #EndEditable -->
-<script type='text/javascript'
- src='http://www.loc.gov/global/foresee/foresee-trigger.js'></script>
+<script src='http://www.loc.gov/global/foresee/foresee-trigger.js'></script>
</head>
<body>
@@ -1131,8 +1130,7 @@
</td>
</tr>
</table>
- <script type='text/javascript'
- src='http://www.loc.gov/global/s_code.js'></script>
+ <script src='http://www.loc.gov/global/s_code.js'></script>
</body>
<!-- #EndTemplate -->
-</html>
\ No newline at end of file
+</html>
diff --git a/tools/java/org/unicode/cldr/util/data/external/nistBaseUnits.txt b/tools/java/org/unicode/cldr/util/data/external/nistBaseUnits.txt
new file mode 100644
index 0000000..7da663f
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/data/external/nistBaseUnits.txt
@@ -0,0 +1,9 @@
+# From https://www.nist.gov/pml/special-publication-811/nist-guide-si-chapter-4-two-classes-si-units-and-si-prefixes
+#Base quantity Name Symbol
+length meter m
+mass kilogram kg
+time second s
+electric current ampere A
+thermodynamic temperature kelvin K
+amount of substance mole mol
+luminous intensity candela cd
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/data/external/nistConversions.txt b/tools/java/org/unicode/cldr/util/data/external/nistConversions.txt
new file mode 100644
index 0000000..2c75cb1
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/data/external/nistConversions.txt
@@ -0,0 +1,637 @@
+#From https://www.nist.gov/pml/special-publication-811/nist-guide-si-appendix-b-conversion-factors/nist-guide-si-appendix-b9
+ACCELERATION
+To convert from to Multiply by
+acceleration of free fall, standard (gn) meter per second squared (m/s2) 9.806 65 E+00
+foot per second squared (ft/s2) meter per second squared (m/s2) 3.048 E-01
+gal (Gal) meter per second squared (m/s2) 1.0 E-02
+inch per second squared (in/s2) meter per second squared (m/s2) 2.54 E-02
+Return to top
+
+ANGLE
+To convert from to Multiply by
+degree (°) radian (rad) 1.745 329 E-02
+gon (also called grade) (gon) radian (rad) 1.570 796 E-02
+gon (also called grade) (gon) degree (°) 9.0 E-01
+mil radian (rad) 9.817 477 E-04
+mil degree (°) 5.625 E-02
+minute (′ ) radian (rad) 2.908 882 E-04
+revolution (r) radian (rad) 6.283 185 E+00
+second (″ ) radian (rad) 4.848 137 E-06
+Return to top
+
+AREA AND SECOND MOMENT OF AREA
+To convert from to Multiply by
+acre (based on U.S. survey foot) square meter (m2) 4.046 873 E+03
+are (a) square meter (m2) 1.0 E+02
+barn (b) square meter (m2) 1.0 E-28
+circular mil square meter (m2) 5.067 075 E-10
+circular mil square millimeter (mm2) 5.067 075 E-04
+foot to the fourth power (ft4) 16 meter to the fourth power (m4) 8.630 975 E-03
+hectare (ha) square meter (m2) 1.0 E+04
+inch to the fourth power (in4) 16 meter to the fourth power (m4) 4.162 314 E-07
+square foot (ft2) square meter (m2) 9.290 304 E-02
+square inch (in2) square meter (m2) 6.4516 E-04
+square inch (in2) square centimeter (cm2) 6.4516 E+00
+square mile (mi2) square meter (m2) 2.589 988 E+06
+square mile (mi2) square kilometer (km2) 2.589 988 E+00
+square mile (based on U.S. survey foot) (mi2) 7 square meter (m2) 2.589 998 E+06
+square mile (based on U.S. survey foot) (mi2) 7 square kilometer (km2) 2.589 998 E+00
+square yard (yd2) square meter (m2) 8.361 274 E-01
+CAPACITY (see VOLUME)
+DENSITY (that is, MASS DENSITY - see MASS DIVIDED BY VOLUME)
+
+Return to top
+
+ELECTRICITY and MAGNETISM
+To convert from to Multiply by
+abampere ampere (A) 1.0 E+01
+abcoulomb coulomb(C) 1.0 E+01
+abfarad farad (F) 1.0 E+09
+abhenry henry (H) 1.0 E-09
+abmho siemens (S) 1.0 E+09
+abohm ohm (Ω) 1.0 E-09
+abvolt volt 1.0 E-08
+ampere hour (A · h) coulomb(C) 3.6 E+03
+biot (Bi) ampere (A) 1.0 E+01
+EMU of capacitance (abfarad) farad (F) 1.0 E+09
+EMU of current (abampere) ampere (A) 1.0 E+01
+EMU of electric potential (abvolt) volt (V) 1.0 E-08
+EMU of inductance (abhenry) henry (H) 1.0 E-09
+EMU of resistance (abohm) ohm (Ω) 1.0 E-09
+ESU of capacitance (statfarad) farad (F) 1.112 650 E-12
+ESU of current (statampere) ampere (A) 3.335 641 E-10
+ESU of electric potential (statvolt) volt (V) 2.997 925 E+02
+ESU of inductance (stathenry) henry (H) 8.987 552 E+11
+ESU of resistance (statohm) ohm (Ω) 8.987 552 E+11
+faraday (based on carbon 12) coulomb(C) 9.648 531 E+04
+franklin (Fr) coulomb(C) 3.335 641 E-10
+gamma (γ) tesla (T) 1.0 E-09
+gauss (Gs, G) tesla (T) 1.0 E-04
+gilbert (Gi) ampere (A) 7.957 747 E-01
+maxwell (Mx) weber (Wb) 1.0 E-08
+mho siemens (S) 1.0 E+00
+oersted (Oe) ampere per meter (A/m) 7.957 747 E+01
+ohm centimeter (Ω · cm) ohm meter (Ω · m) 1.0 E-02
+ohm circular-mil per foot ohm meter (Ω · m) 1.662 426 E-09
+ohm circular-mil per foot ohm square millimeter per meter (Ω · mm2/m) 1.662 426 E-03
+statampere ampere (A) 3.335 641 E-10
+statcoulomb coulomb (C) 3.335 641 E-10
+statfarad farad (F) 1.112 650 E-12
+stathenry henry (H) 8.987 552 E+11
+statmho siemens (S) 1.112 650 E-12
+statohm ohm(Ω) 8.987 552 E+11
+statvolt volt (V) 2.997 925 E+02
+unit pole weber (Wb) 1.256 637 E-07
+Return to top
+
+ENERGY (includes WORK)
+To convert from to Multiply by
+British thermal unitIT (BtuIT) 9 joule (J) 1.055 056 E+03
+British thermal unitth (Btuth) 9 joule (J) 1.054 350 E+03
+British thermal unit (mean) (Btu) joule (J) 1.055 87 E+03
+British thermal unit (39 °F) (Btu) joule (J) 1.059 67 E+03
+British thermal unit (59 °F) (Btu) joule (J) 1.054 80 E+03
+British thermal unit (60 °F) (Btu) joule (J) 1.054 68 E+03
+calorieIT (calIT) 10 joule (J) 4.1868 E+00
+calorieth (calth) 10 joule (J) 4.184 E+00
+calorie (mean) (cal) joule (J) 4.190 02 E+00
+calorie (15 °C) (cal15) joule (J) 4.185 80 E+00
+calorie (20 °C) (cal20) joule (J) 4.181 90 E+00
+calorieIT, kilogram (nutrition) 11 joule (J) 4.1868 E+03
+calorieth, kilogram (nutrition) 11 joule (J) 4.184 E+03
+calorie (mean), kilogram (nutrition) 11 joule (J) 4.190 02 E+03
+electronvolt (eV) joule (J) 1.602 177 E-19
+erg (erg) joule (J) 1.0 E-07
+foot poundal joule (J) 4.214 011 E-02
+foot pound-force (ft · lbf) joule (J) 1.355 818 E+00
+kilocalorieIT (kcalIT) joule (J) 4.1868 E+03
+kilocalorieth (kcalth) joule (J) 4.184 E+03
+kilocalorie (mean) (kcal) joule (J) 4.190 02 E+03
+kilowatt hour (kW · h) joule (J) 3.6 E+06
+kilowatt hour (kW · h) megajoule (MJ) 3.6 E+00
+quad (1015 BtuIT) 9 joule (J) 1.055 056 E+18
+therm (EC) 24 joule (J) 1.055 06 E+08
+therm (U.S.) 24 joule (J) 1.054 804 E+08
+ton of TNT (energy equivalent) 25 joule (J) 4.184 E+09
+watt hour (W · h) joule (J) 3.6 E+03
+watt second (W · s) joule (J) 1.0 E+00
+Return to top
+
+ENERGY DIVIDED BY AREA TIME
+To convert from to Multiply by
+erg per square centimeter second [erg/(cm2 · s)] watt per square meter (W/m2) 1.0 E-03
+watt per square centimeter (W/cm2) watt per square meter (W/m2) 1.0 E+04
+watt per square inch (W/in2) watt per square meter (W/m2) 1.550 003 E+03
+FLOW (see MASS DIVIDED BY TIME or VOLUME DIVIDED BY TIME)
+Return to top
+
+FORCE
+To convert from to Multiply by
+dyne (dyn) newton (N) 1.0 E-05
+kilogram-force (kgf) newton (N) 9.806 65 E+00
+kilopond (kilogram-force) (kp) newton (N) 9.806 65 E+00
+kip (1 kip = 1000 lbf) newton (N) 4.448 222 E+03
+kip (1 kip = 1000 lbf) kilonewton (kN) 4.448 222 E+00
+ounce (avoirdupois)-force (ozf) newton (N) 2.780 139 E-01
+poundal newton (N) 1.382 550 E-01
+pound-force (lbf) 23 newton (N) 4.448 222 E+00
+pound-force per pound (lbf/lb) (thrust to mass ratio) newton per kilogram (N/kg) 9.806 65 E+00
+ton-force (2000 lbf) newton (N) 8.896 443 E+03
+ton-force (2000 lbf) kilonewton (kN) 8.896 443 E+00
+FORCE DIVIDED BY AREA (see PRESSURE)
+Return to top
+
+FORCE DIVIDED BY LENGTH
+To convert from to Multiply by
+pound-force per foot (lbf/ft) newton per meter (N/m) 1.459 390 E+01
+pound-force per inch (lbf/in) newton per meter (N/m) 1.751 268 E+02
+Return to top
+
+HEAT - Available Energy
+To convert from to Multiply by
+British thermal unitIT per cubic foot (BtuIT/ft3) joule per cubic meter (J/m3) 3.725 895 E+04
+British thermal unitth per cubic foot (Btuth/ft3) joule per cubic meter (J/m3) 3.723 403 E+04
+British thermal unitIT per pound (BtuIT/lb) joule per kilogram (J/kg) 2.326 E+03
+British thermal unitth per pound (Btuth/lb) joule per kilogram (J/kg) 2.324 444 E+03
+calorieIT per gram (calIT/g) joule per kilogram (J/kg) 4.1868 E+03
+calorieth per gram (calth/g) joule per kilogram (J/kg) 4.184 E+03
+
+
+Coefficient of Heat Transfer
+To convert from to Multiply by
+British thermal unitIT per hour square foot degree Fahrenheit [BtuIT/(h · ft2 · °F)] watt per square meter kelvin [W/(m2 · K)] 5.678 263 E+00
+British thermal unitth per hour square foot degree Fahrenheit [Btuth/(h · ft2 · °F)] watt per square meter kelvin [W/(m2 · K)] 5.674 466 E+00
+British thermal unitIT per second square foot degree Fahrenheit [BtuIT/(s · ft2 · °F)] watt per square meter kelvin [W/(m2 · K)] 2.044 175 E+04
+British thermal unitth per second square foot degree Fahrenheit [Btuth/(s · ft2 · °F)] watt per square meter kelvin [W/(m2 · K)] 2.042 808 E+04
+
+
+Density of Heat
+To convert from to Multiply by
+British thermal unitIT per square foot (BtuIT/ft2) joule per square meter (J/m2) 1.135 653 E+04
+British thermal unitth per square foot (Btuth/ft2) joule per square meter (J/m2) 1.134 893 E+04
+calorieth per square centimeter (calth/cm2) joule per square meter (J/m2) 4.184 E+04
+langley (calth/cm2) joule per square meter (J/m2) 4.184 E+04
+
+
+Density of Heat Flow Rate
+To convert from to Multiply by
+British thermal unitIT per square foot hour [BtuIT/(ft2 · h)] watt per square meter (W/m2) 3.154 591 E+00
+British thermal unitth per square foot hour [Btuth/(ft2 · h)] watt per square meter (W/m2) 3.152 481 E+00
+British thermal unitth per square foot minute [Btuth/(ft2 · min)] watt per square meter (W/m2) 1.891 489 E+02
+British thermal unitIT per square foot second [BtuIT/(ft2 · s)] watt per square meter (W/m2) 1.135 653 E+04
+British thermal unitth per square foot second [Btuth/(ft2 · s)] watt per square meter (W/m2) 1.134 893 E+04
+British thermal unitth per square inch second [Btuth/(in 2 · s)] watt per square meter (W/m2) 1.634 246 E+06
+calorieth per square centimeter minute [calth/(cm2 · min)] watt per square meter (W/m2) 6.973 333 E+02
+calorieth per square centimeter second [calth/(cm2 · s)] watt per square meter (W/m2)) 4.184 E+04
+
+
+Fuel Consumption
+To convert from to Multiply by
+gallon (U.S.) per horsepower hour [gal/(hp · h)] cubic meter per joule (m3/J) 1.410 089 E-09
+gallon (U.S.) per horsepower hour [gal/(hp · h)] liter per joule (L/J) 1.410 089 E-06
+mile per gallon (U.S.) (mpg) (mi/gal) meter per cubic meter (m/m3) 4.251 437 E+05
+mile per gallon (U.S.) (mpg) (mi/gal) kilometer per liter (km/L) 4.251 437 E-01
+mile per gallon (U.S.) (mpg) (mi/gal) 21 liter per 100 kilometer (L/100 km) divide 235.215 by number of miles per gallon
+pound per horsepower hour [lb/(hp · h)] kilogram per joule (kg/J) 1.689 659 E-07
+
+
+Heat Capacity and Entropy
+To convert from to Multiply by
+British thermal unitIT per degree Fahrenheit (BtuIT/°F) joule per kelvin (J/K) 1.899 101 E+03
+British thermal unitth per degree Fahrenheit (Btuth/°F) joule per kelvin (J/K) 1.897 830 E+03
+British thermal unitIT per degree Rankine (BtuIT/°R) joule per kelvin (J/K) 1.899 101 E+03
+British thermal unitth per degree Rankine (Btuth/°R) joule per kelvin (J/K) 1.897 830 E+03
+
+
+Heat Flow Rate
+To convert from to Multiply by
+British thermal unitIT per hour (BtuIT/h) watt (W) 2.930 711 E-01
+British thermal unitth per hour (Btuth/h) watt (W) 2.928 751 E-01
+British thermal unitth per minute (Btuth/min) watt (W) 1.757 250 E+01
+British thermal unitIT per second (BtuIT/s) watt (W) 1.055 056 E+03
+British thermal unitth per second (Btuth/s) watt (W) 1.054 350 E+03
+calorieth per minute (calth/min) watt (W) 6.973 333 E-02
+calorieth per second (calth/s) watt (W) 4.184 E+00
+kilocalorieth per minute (kcalth/min) watt (W) 6.973 333 E+01
+kilocalorieth per second (kcalth/s) watt (W) 4.184 E+03
+ton of refrigeration (12 000 BtuIT/h) watt (W) 3.516 853 E+03
+
+
+Specific Heat Capacity and Specific Entropy
+To convert from to Multiply by
+British thermal unitIT per pound degree Fahrenheit [BtuIT/(lb · °F)] joule per kilogram kelvin [J/(kg · K)] 4.1868 E+03
+British thermal unitth per pound degree Fahrenheit [Btuth/(lb · °F)] joule per kilogram kelvin [J/(kg · K)] 4.184 E+03
+British thermal unitIT per pound degree Rankine [BtuIT/(lb · °R)] joule per kilogram kelvin [J/(kg · K)] 4.1868 E+03
+British thermal unitth per pound degree Rankine [Btuth/(lb · °R)] joule per kilogram kelvin [J/(kg · K)] 4.184 E+03
+calorieIT per gram degree Celsius [calIT/(g · °C)] joule per kilogram kelvin [J/(kg · K)] 4.1868 E+03
+calorieth per gram degree Celsius [calth/(g · °C)] joule per kilogram kelvin [J/(kg · K)] 4.184 E+03
+calorieIT per gram kelvin [calIT/(g · K)] joule per kilogram kelvin [J/(kg · K)] 4.1868 E+03
+calorieth per gram kelvin [calth/(g · K)] joule per kilogram kelvin [J/(kg · K)] 4.184 E+03
+
+
+Thermal Conductivity
+To convert from to Multiply by
+Britsh thermal unitIT foot per hour square foot degree Fahrenheit [BtuIT · ft/(h · ft2 · °F)] watt per meter kelvin [W/(m · K)] 1.730 735 E+00
+Britsh thermal unitth foot per hour square foot degree Fahrenheit [Btuth · ft/(h · ft2 · °F)] watt per meter kelvin [W/(m · K)] 1.729 577 E+00
+Britsh thermal unitIT inch per hour square foot degree Fahrenheit [BtuIT · in/(h · ft2 · °F)] watt per meter kelvin [W/(m · K)] 1.442 279 E-01
+Britsh thermal unitth inch per hour square foot degree Fahrenheit [Btuth · in/(h · ft2 · °F)] watt per meter kelvin [W/(m · K)] 1.441 314 E-01
+Britsh thermal unitIT inch per second square foot degree Fahrenheit [BtuIT · in/(s · ft2 · °F)] watt per meter kelvin [W/(m · K)] 5.192 204 E+02
+Britsh thermal unitth inch per second square foot degree Fahrenheit [Btuth · in/(s · ft2 · °F)] watt per meter kelvin [W/(m · K)] 5.188 732 E+02
+calorieth per centimeter second degree Celsius [calth/(cm · s · °C)] watt per meter kelvin [W/(m · K)] 4.184 E+02
+
+
+Thermal Diffusivity
+To convert from to Multiply by
+square foot per hour (ft2/h) square meter per second (m2/s) 2.580 64 E-05
+Thermal Insulance
+To convert from to Multiply by
+clo square meter kelvin per watt (m2 · K/W) 1.55 E-01
+degree Fahrenheit hour square foot per British thermal unitIT(°F · h · ft2/BtuIT) square meter kelvin per watt (m2 · K/W) 1.761 102 E-01
+degree Fahrenheit hour square foot per British thermal unitth(°F · h · ft2/Btuth) square meter kelvin per watt (m2 · K/W) 1.762 280 E-01
+
+
+Thermal Resistance
+To convert from to Multiply by
+degree Fahrenheit hour per British thermal unitIT(°F · h/BtuIT) kelvin per watt (K/W) 1.895 634 E+00
+degree Fahrenheit hour per British thermal unitth(°F · h/Btuth) kelvin per watt (K/W) 1.896 903 E+00
+degree Fahrenheit second per British thermal unitIT(°F · s/BtuIT) kelvin per watt (K/W) 5.265 651 E-04
+degree Fahrenheit second per British thermal unitth(°F · s/Btuth) kelvin per watt (K/W) 5.269 175 E-04
+
+
+Thermal Resistivity
+To convert from to Multiply by
+degree Fahrenheit hour square foot per British thermal unitIT inch [°F · h · ft2/(BtuIT · in)] meter kelvin per watt (m · K/W) 6.933 472 E+00
+degree Fahrenheit hour square foot per British thermal unitth inch [°F · h · ft2/(Btuth · in)] meter kelvin per watt (m · K/W) 6.938 112 E+04
+Return to top
+
+LENGTH
+To convert from to Multiply by
+ångström(Å) meter (m) 1.0 E-10
+ångström(Å) nanometer (nm) 1.0 E-01
+astronomical unit (ua) meter (m) 1.495 979 E+11
+chain (based on U.S. survey foot) (ch) 7 meter (m) 2.011 684 E+01
+fathom (based on U.S. survey foot) 7 meter (m) 1.828 804 E+00
+fermi meter (m) 1.0 E-15
+fermi femtometer (fm) 1.0 E+00
+foot (ft) meter (m) 3.048 E-01
+foot (U.S. survey) (ft) 7 meter (m) 3.048 006 E-01
+inch (in) meter (m) 2.54 E-02
+inch (in) centimeter (cm) 2.54 E+00
+kayser(K) reciprocal meter (m-1) 1 E+02
+light year (l. y.) 18 meter (m) 9.460 73 E+15
+microinch meter (m) 2.54 E-08
+microinch micrometer (μm) 2.54 E-02
+micron (μ) meter (m) 1.0 E-06
+micron (μ) micrometer (μm) 1.0 E+00
+mil (0.001 in) meter (m) 2.54 E-05
+mil (0.001 in) millimeter (mm) 2.54 E-02
+mile (mi) meter (m) 1.609 344 E+03
+mile (mi) kilometer (km) 1.609 344 E+00
+mile (based on U.S. survey foot) (mi) 7 meter (m) 1.609 347 E+03
+mile (based on U.S. survey foot) (mi) 7 kilometer (km) 1.609 347 E+00
+mile, nautical 20 meter (m) 1.852 E+03
+parsec (pc) meter (m) 3.085 678 E+16
+pica (computer) (1/6 in) meter (m) 4.233 333 E-03
+pica (computer) (1/6 in) millimeter (mm) 4.233 333 E+00
+pica (printer's) meter (m) 4.217 518 E-03
+pica (printer's) millimeter (mm) 4.217 518 E+00
+point (computer) (1/72 in) meter (m) 3.527 778 E-04
+point (computer) (1/72 in) millimeter (mm) 3.527 778 E-01
+point (printer's) meter (m) 3.514 598 E-04
+point (printer's) millimeter (mm) 3.514 598 E-01
+rod (based on U.S. survey foot) (rd) 7 meter (m) 5.029 210 E+00
+yard (yd) meter (m) 9.144 E-01
+Return to top
+
+LIGHT
+To convert from to Multiply by
+candela per square inch (cd/in2) candela per square meter (cd/m2) 1.550 003 E+03
+footcandle lux (lx) 1.076 391 E+01
+footlambert candela per square meter (cd/m2) 3.426 259 E+00
+lambert 17 candela per square meter (cd/m2) 3.183 099 E+03
+lumen per square foot (lm/ft2) lux (lx) 1.076 391 E+01
+phot (ph) lux (lx) 1.0 E+04
+stilb (sb) candela per square meter (cd/m2) 1.0 E+04
+Return to top
+
+MASS and MOMENT OF INERTIA
+To convert from to Multiply by
+carat, metric kilogram (kg) 2.0 E-04
+carat, metric gram (g) 2.0 E-01
+grain (gr) kilogram (kg) 6.479 891 E-05
+grain (gr) milligram (mg) 6.479 891 E+01
+hundredweight (long, 112 lb) kilogram (kg) 5.080 235 E+01
+hundredweight (short, 100 lb) kilogram (kg) 4.535 924 E+01
+kilogram-force second squared per meter (kgf · s2/m) kilogram (kg) 9.806 65 E+00
+ounce (avoirdupois) (oz) kilogram (kg) 2.834 952 E-02
+ounce (avoirdupois) (oz) gram (g) 2.834 952 E+01
+ounce (troy or apothecary) (oz) kilogram (kg) 3.110 348 E-02
+ounce (troy or apothecary) (oz) gram (g) 3.110 348 E+01
+pennyweight (dwt) kilogram (kg) 1.555 174 E-03
+pennyweight (dwt) gram (g) 1.555 174 E+00
+pound (avoirdupois) (lb) 22 kilogram (kg) 4.535 924 E-01
+pound (troy or apothecary) (lb) kilogram (kg) 3.732 417 E-01
+pound foot squared (lb · ft2) kilogram meter squared (kg · m2) 4.214 011 E-02
+pound inch squared (lb · in2) kilogram meter squared (kg · m2) 2.926 397 E-04
+slug (slug) kilogram (kg) 1.459 390 E+01
+ton, assay (AT) kilogram (kg) 2.916 667 E-02
+ton, assay (AT) gram (g) 2.916 667 E+01
+ton, long (2240 lb) kilogram (kg) 1.016 047 E+03
+ton, metric (t) kilogram (kg) 1.0 E+03
+tonne (called "metric ton" in U.S.) (t) kilogram (kg) 1.0 E+03
+ton, short (2000 lb) kilogram (kg) 9.071 847 E+02
+
+MASS DENSITY (see MASS DIVIDED BY VOLUME)
+Return to top
+
+MASS DIVIDED BY AREA
+To convert from to Multiply by
+ounce (avoirdupois) per square foot (oz/ft2) kilogram per square meter (kg/m2) 3.051 517 E-01
+ounce (avoirdupois) per square inch (oz/in2) kilogram per square meter (kg/m2) 4.394 185 E+01
+ounce (avoirdupois) per square yard (oz/yd2) kilogram per square meter (kg/m2) 3.390 575 E-02
+pound per square foot (lb/ft2) kilogram per square meter (kg/m2) 4.882 428 E+00
+pound per square inch (not pound force) (lb/in2) kilogram per square meter (kg/m2) 7.030 696 E+02
+
+MASS DIVIDED BY CAPACITY (see MASS DIVIDED BY VOLUME)
+Return to top
+
+MASS DIVIDED BY LENGTH
+To convert from to Multiply by
+denier kilogram per meter (kg/m) 1.111 111 E-07
+denier gram per meter (g/m) 1.111 111 E-04
+pound per foot (lb/ft) kilogram per meter (kg/m) 1.488 164 E+00
+pound per inch (lb/in) kilogram per meter (kg/m) 1.785 797 E+01
+pound per yard(lb/yd) kilogram per meter (kg/m) 4.960 546 E-01
+tex kilogram per meter (kg/m) 1.0 E-06
+Return to top
+
+MASS DIVIDED BY TIME (includes FLOW)
+To convert from to Multiply by
+pound per hour (lb/h) kilogram per second (kg/s) 1.259 979 E-04
+pound per minute (lb/min) kilogram per second (kg/s) 7.559 873 E-03
+pound per second (lb/s) kilogram per second (kg/s) 4.535 924 E-01
+ton, short, per hour kilogram per second (kg/s) 2.519 958 E-01
+Return to top
+
+MASS DIVIDED BY VOLUME (includes MASS DENSITY and MASS CONCENTRATION)
+To convert from to Multiply by
+grain per gallon (U.S.) (gr/gal) kilogram per cubic meter (kg/m3) 1.711 806 E-02
+grain per gallon (U.S.) (gr/gal) milligram per liter (mg/L) 1.711 806 E+01
+gram per cubic centimeter (g/cm3) kilogram per cubic meter (kg/m3) 1.0 E+03
+ounce (avoirdupois) per cubic inch (oz/in3) kilogram per cubic meter (kg/m3) 1.729 994 E+03
+ounce (avoirdupois) per gallon [Canadian and U.K. (Imperial)] (oz/gal) kilogram per cubic meter (kg/m3) 6.236 023 E+00
+ounce (avoirdupois) per gallon [Canadian and U.K. (Imperial)] (oz/gal) gram per liter (g/L) 6.236 023 E+00
+ounce (avoirdupois) per gallon (U.S.) (oz/gal) kilogram per cubic meter (kg/m3) 7.489 152 E+00
+ounce (avoirdupois) per gallon (U.S.) (oz/gal) gram per liter (g/L) 7.489 152 E+00
+pound per cubic foot (lb/ft3) kilogram per cubic meter (kg/m3) 1.601 846 E+01
+pound per cubic inch (lb/in3) kilogram per cubic meter (kg/m3) 2.767 990 E+04
+pound per cubic yard (lb/yd3) kilogram per cubic meter (kg/m3) 5.932 764 E-01
+pound per gallon [Canadian and U.K. (Imperial)] (lb/gal) kilogram per cubic meter (kg/m3) 9.977 637 E+01
+pound per gallon [Canadian and U.K. (Imperial)] (lb/gal) kilogram per liter (kg/L) 9.977 637 E-02
+pound per gallon (U.S.) (lb/gal) kilogram per cubic meter (kg/m3) 1.198 264 E+02
+pound per gallon (U.S.) (lb/gal) kilogram per liter (kg/L) 1.198 264 E-01
+slug per cubic foot (slug/ft3) kilogram per cubic meter (kg/m3) 5.153 788 E+02
+ton, long, per cubic yard kilogram per cubic meter (kg/m3) 1.328 939 E+03
+ton, short, per cubic yard kilogram per cubic meter (kg/m3) 1.186 553 E+03
+Return to top
+
+MOMENT OF FORCE or TORQUE
+To convert from to Multiply by
+dyne centimeter (dyn · cm) newton meter (N · m) 1.0 E-07
+kilogram-force meter (kgf · m) newton meter (N · m) 9.806 65 E+00
+ounce (avoirdupois)-force inch (ozf · in) newton meter (N · m) 7.061 552 E-03
+ounce (avoirdupois)-force inch (ozf · in) millinewton meter (mN · m) 7.061 552 E+00
+pound-force foot (lbf · ft) newton meter (N · m) 1.355 818 E+00
+pound-force inch (lbf · in) newton meter (N · m) 1.129 848 E-01
+Return to top
+
+MOMENT OF FORCE or TORQUE, DIVIDED BY LENGTH
+To convert from to Multiply by
+pound-force foot per inch (lbf · ft/in) newton meter per meter (N · m/m) 5.337 866 E+01
+pound-force inch per inch (lbf · in/in) newton meter per meter (N · m/m) 4.448 222 E+00
+Return to top
+
+PERMEABILITY
+To convert from to Multiply by
+darcy 14 meter squared (m2) 9.869 233 E-13
+perm (0 °C) kilogram per pascal second square meter [kg/(Pa · s · m2)] 5.721 35 E-11
+perm (23 °C) kilogram per pascal second square meter [kg/(Pa · s · m2)] 5.745 25 E-11
+perm inch (0 °C) kilogram per pascal second meter [kg/(Pa · s · m)] 1.453 22 E-12
+perm inch (23 °C) kilogram per pascal second meter [kg/(Pa · s · m)] 1.459 29 E-12
+Return to top
+
+POWER
+To convert from to Multiply by
+erg per second (erg/s) watt (W) 1.0 E-07
+foot pound-force per hour (ft · lbf/h) watt (W) 3.766 161 E-04
+foot pound-force per minute (ft · lbf/min) watt (W) 2.259 697 E-02
+foot pound-force per second (ft · lbf/s) watt (W) 1.355 818 E+00
+horsepower (550 ft · lbf/s) watt (W) 7.456 999 E+02
+horsepower (boiler) watt (W) 9.809 50 E+03
+horsepower (electric) watt (W) 7.46 E+02
+horsepower (metric) watt (W) 7.354 988 E+02
+horsepower (U.K.) watt (W) 7.4570 E+02
+horsepower (water) watt (W) 7.460 43 E+02
+Return to top
+
+PRESSURE or STRESS (FORCE DIVIDED BY AREA)
+To convert from to Multiply by
+atmosphere, standard (atm) pascal (Pa) 1.013 25 E+05
+atmosphere, standard (atm) kilopascal (kPa) 1.013 25 E+02
+atmosphere, technical (at) 8 pascal (Pa) 9.806 65 E+04
+atmosphere, technical (at) 8 kilopascal (kPa) 9.806 65 E+01
+bar (bar) pascal (Pa) 1.0 E+05
+bar (bar) kilopascal (kPa) 1.0 E+02
+centimeter of mercury (0 °C) 12 pascal (Pa) 1.333 22 E+03
+centimeter of mercury (0 °C) 12 kilopascal (kPa) 1.333 22 E+00
+centimeter of mercury, conventional (cmHg) 12 pascal (Pa) 1.333 224 E+03
+centimeter of mercury, conventional (cmHg) 12 kilopascal (kPa) 1.333 224 E+00
+centimeter of water (4 °C) 12 pascal (Pa) 9.806 38 E+01
+centimeter of water, conventional (cmH2O) 12 pascal (Pa) 9.806 65 E+01
+dyne per square centimeter (dyn/cm2) pascal (Pa) 1.0 E-01
+foot of mercury, conventional (ftHg) 12 pascal (Pa) 4.063 666 E+04
+foot of mercury, conventional (ftHg) 12 kilopascal (kPa) 4.063 666 E+01
+foot of water (39.2 °F) 12 pascal (Pa) 2.988 98 E+03
+foot of water (39.2 °F) 12 kilopascal (kPa) 2.988 98 E+00
+foot of water, conventional (ftH2O) 12 pascal (Pa) 2.989 067 E+03
+foot of water, conventional (ftH2O) 12 kilopascal (kPa) 2.989 067 E+00
+gram-force per square centimeter (gf/cm2) pascal (Pa) 9.806 65 E+01
+inch of mercury (32 °F) 12 pascal (Pa) 3.386 38 E+03
+inch of mercury (32 °F) 12 kilopascal (kPa) 3.386 38 E+00
+inch of mercury (60 °F) 12 pascal (Pa) 3.376 85 E+03
+inch of mercury (60 °F) 12 kilopascal (kPa) 3.376 85 E+00
+inch of mercury, conventional (inHg) 12 pascal (Pa) 3.386 389 E+03
+inch of mercury, conventional (inHg) 12 kilopascal (kPa) 3.386 389 E+00
+inch of water (39.2 °F) 12 pascal (Pa) 2.490 82 E+02
+inch of water (60 °F) 12 pascal (Pa) 2.4884 E+02
+inch of water, conventional (inH2O) 12 pascal (Pa) 2.490 889 E+02
+kilogram-force per square centimeter (kgf/cm2) pascal (Pa) 9.806 65 E+04
+kilogram-force per square centimeter (kgf/cm2) kilopascal (kPa) 9.806 65 E+01
+kilogram-force per square meter (kgf/m2) pascal (Pa) 9.806 65 E+00
+kilogram-force per square millimeter (kgf/mm2) pascal (Pa) 9.806 65 E+06
+kilogram-force per square millimeter (kgf/mm2) megapascal (MPa) 9.806 65 E+00
+kip per square inch (ksi) (kip/in2) pascal (Pa) 6.894 757 E+06
+kip per square inch (ksi) (kip/in2) kilopascal (kPa) 6.894 757 E+03
+millibar (mbar) pascal (Pa) 1.0 E+02
+millibar (mbar) kilopascal (kPa) 1.0 E-01
+millimeter of mercury, conventional (mmHg) 12 pascal (Pa) 1.333 224 E+02
+millimeter of water, conventional (mmH2O) 12 pascal (Pa) 9.806 65 E+00
+poundal per square foot pascal (Pa) 1.488 164 E+00
+pound-force per square foot (lbf/ft2) pascal (Pa) 4.788 026 E+01
+pound-force per square inch (psi) (lbf/in2) pascal (Pa) 6.894 757 E+03
+pound-force per square inch (psi) (lbf/in2) kilopascal (kPa) 6.894 757 E+00
+psi (pound-force per square inch) (lbf/in2) pascal (Pa) 6.894 757 E+03
+psi (pound-force per square inch) (lbf/in2) kilopascal (kPa) 6.894 757 E+00
+torr (Torr) pascal (Pa) 1.333 224 E+02
+Return to top
+
+RADIOLOGY
+To convert from to Multiply by
+curie (Ci) becquerel (Bq) 3.7 E+10
+rad (absorbed dose) (rad) gray (Gy) 1.0 E-02
+rem (rem) sievert (Sv) 1.0 E-02
+roentgen (R) coulomb per kilogram (C/kg) 2.58 E-04
+
+SPEED (see VELOCITY)
+
+STRESS (see PRESSURE)
+Return to top
+
+TEMPERATURE
+To convert from to Multiply by
+degree Celsius (°C) kelvin (K) T/K = t/°C + 273.15
+degree centigrade 15 degree Celsius (°C) t/°C ≈ t/deg. cent.
+degree Fahrenheit (°F) degree Celsius (°C) t/°C = (t/°F - 32)/1.8
+degree Fahrenheit (°F) kelvin (K) T/K = (t/°F + 459.67)/1.8
+degree Rankine (°R) kelvin (K) T/K = (T/°R)/1.8
+kelvin (K) degree Celsius (°C) t/°C = T/K - 273.15
+Return to top
+
+TEMPERATURE INTERVAL
+To convert from to Multiply by
+degree Celsius (°C) kelvin (K) 1.0 E+00
+degree centigrade 15 degree Celsius (°C) 1.0 E+00
+degree Fahrenheit (°F) degree Celsius (°C) 5.555 556 E-01
+degree Fahrenheit (°F) kelvin (K) 5.555 556 E-01
+degree Rankine (°R) kelvin (K) 5.555 556 E-01
+Return to top
+
+TIME
+To convert from to Multiply by
+day (d) second (s) 8.64 E+04
+day (sidereal) second (s) 8.616 409 E+04
+hour (h) second (s) 3.6 E+03
+hour (sidereal) second (s) 3.590 170 E+03
+minute (min) second (s) 6.0 E+01
+minute (sidereal) second (s) 5.983 617 E+01
+second (sidereal) second (s) 9.972 696 E-01
+shake second (s) 1.0 E-08
+shake nanosecond (ns) 1.0 E+01
+year (365 days) second (s) 3.1536 E+07
+year (sidereal) second (s) 3.155 815 E+07
+year (tropical) second (s) 3.155 693 E+07
+TORQUE (see MOMENT OF FORCE)
+Return to top
+
+VELOCITY (includes SPEED)
+To convert from to Multiply by
+foot per hour (ft/h) meter per second (m/s) 8.466 667 E-05
+foot per minute (ft/min) meter per second (m/s) 5.08 E-03
+foot per second (ft/s) meter per second (m/s) 3.048 E-01
+inch per second (in/s) meter per second (m/s) 2.54 E-02
+kilometer per hour (km/h) meter per second (m/s) 2.777 778 E-01
+knot (nautical mile per hour) meter per second (m/s) 5.144 444 E-01
+mile per hour (mi/h) meter per second (m/s) 4.4704 E-01
+mile per hour (mi/h) kilometer per hour (km/h) 1.609 344 E+00
+mile per minute (mi/min) meter per second (m/s) 2.682 24 E+01
+mile per second (mi/s) meter per second (m/s) 1.609 344 E+03
+revolution per minute (rpm) (r/min) radian per second (rad/s) 1.047 198 E-01
+rpm (revolution per minute) (r/min) radian per second (rad/s) 1.047 198 E-01
+
+Return to top
+
+VISCOSITY, DYNAMIC
+To convert from to Multiply by
+centipoise (cP) pascal second (Pa · s) 1.0 E-03
+poise (P) pascal second (Pa · s) 1.0 E-01
+poundal second per square foot pascal second (Pa · s) 1.488 164 E+00
+pound-force second per square foot (lbf · s/ft2) pascal second (Pa · s) 4.788 026 E+01
+pound-force second per square inch (lbf · s/in2) pascal second (Pa · s) 6.894 757 E+03
+pound per foot hour [lb/(ft · h)] pascal second (Pa · s) 4.133 789 E-04
+pound per foot second [lb/(ft · s)] pascal second (Pa · s) 1.488 164 E+00
+rhe reciprocal pascal second [(Pa · s)-1] 1.0 E+01
+slug per foot second [slug/(ft · s)] pascal second (Pa · s) 4.788 026 E+01
+
+Return to top
+
+VISCOSITY, KINEMATIC
+To convert from to Multiply by
+centistokes (cSt) meter squared per second (m2/s) 1.0 E-06
+square foot per second (ft2/s) meter squared per second (m2/s) 9.290 304 E-02
+stokes (St) meter squared per second (m2/s) 1.0 E-04
+
+Return to top
+
+VOLUME (includes CAPACITY)
+To convert from to Multiply by
+acre-foot (based on U.S. survey foot) 7 cubic meter (m3) 1.233 489 E+03
+barrel [for petroleum, 42 gallons (U.S.)](bbl) cubic meter (m3) 1.589 873 E-01
+barrel [for petroleum, 42 gallons (U.S.)](bbl) liter (L) 1.589 873 E+02
+bushel (U.S.) (bu) cubic meter (m3) 3.523 907 E-02
+bushel (U.S.) (bu) liter (L) 3.523 907 E+01
+cord (128 ft3) cubic meter (m3) 3.624 556 E+00
+cubic foot (ft3) cubic meter (m3) 2.831 685 E-02
+cubic inch (in3) 13 cubic meter (m3) 1.638 706 E-05
+cubic mile (mi3) cubic meter (m3) 4.168 182 E+09
+cubic yard (yd3) cubic meter (m3) 7.645 549 E-01
+cup (U.S.) cubic meter (m3) 2.365 882 E-04
+cup (U.S.) liter (L) 2.365 882 E-01
+cup (U.S.) milliliter (mL) 2.365 882 E+02
+fluid ounce (U.S.) (fl oz) cubic meter (m3) 2.957 353 E-05
+fluid ounce (U.S.) (fl oz) milliliter (mL) 2.957 353 E+01
+gallon [Canadian and U.K. (Imperial)] (gal) cubic meter (m3) 4.546 09 E-03
+gallon [Canadian and U.K. (Imperial)] (gal) liter (L) 4.546 09 E+00
+gallon (U.S.) (gal) cubic meter (m3) 3.785 412 E-03
+gallon (U.S.) (gal) liter (L) 3.785 412 E+00
+gill [Canadian and U.K. (Imperial)] (gi) cubic meter (m3) 1.420 653 E-04
+gill [Canadian and U.K. (Imperial)] (gi) liter (L) 1.420 653 E-01
+gill (U.S.) (gi) cubic meter (m3) 1.182 941 E-04
+gill (U.S.) (gi) liter (L) 1.182 941 E-01
+liter (L) 19 cubic meter (m3) 1.0 E-03
+ounce [Canadian and U.K. fluid (Imperial)] (fl oz) cubic meter (m3) 2.841 306 E-05
+ounce [Canadian and U.K. fluid (Imperial)] (fl oz) milliliter (mL) 2.841 306 E+01
+ounce (U.S. fluid) (fl oz) cubic meter (m3) 2.957 353 E-05
+ounce (U.S. fluid) (fl oz) milliliter (mL) 2.957 353 E+01
+peck (U.S.) (pk) cubic meter (m3) 8.809 768 E-03
+peck (U.S.) (pk) liter (L) 8.809 768 E+00
+pint (U.S. dry) (dry pt) cubic meter (m3) 5.506 105 E-04
+pint (U.S. dry) (dry pt) liter (L) 5.506 105 E-01
+pint (U.S. liquid) (liq pt) cubic meter (m3) 4.731 765 E-04
+pint (U.S. liquid) (liq pt) liter (L) 4.731 765 E-01
+quart (U.S. dry) (dry qt) cubic meter (m3) 1.101 221 E-03
+quart (U.S. dry) (dry qt) liter (L) 1.101 221 E+00
+quart (U.S. liquid) (liq qt) cubic meter (m3) 9.463 529 E-04
+quart (U.S. liquid) (liq qt) liter (L) 9.463 529 E-01
+stere (st) cubic meter (m3) 1.0 E+00
+tablespoon cubic meter (m3) 1.478 676 E-05
+tablespoon milliliter (mL) 1.478 676 E+01
+teaspoon cubic meter (m3) 4.928 922 E-06
+teaspoon milliliter (mL) 4.928 922 E+00
+ton, register cubic meter (m3) 2.831 685 E+00
+Return to top
+
+VOLUME DIVIDED BY TIME (includes FLOW)
+To convert from to Multiply by
+cubic foot per minute (ft3/min) cubic meter per second (m3/s) 4.719 474 E-04
+cubic foot per minute (ft3/min) liter per second (L/s) 4.719 474 E-01
+cubic foot per second (ft3/s) cubic meter per second (m3/s) 2.831 685 E-02
+cubic inch per minute (in3/min) cubic meter per second (m3/s) 2.731 177 E-07
+cubic yard per minute (yd3/min) cubic meter per second (m3/s) 1.274 258 E-02
+gallon (U.S.) per day (gal/d) cubic meter per second (m3/s) 4.381 264 E-08
+gallon (U.S.) per day (gal/d) liter per second (L/s) 4.381 264 E-05
+gallon (U.S.) per minute (gpm) (gal/min) cubic meter per second (m3/s) 6.309 020 E-05
+gallon (U.S.) per minute (gpm) (gal/min) liter per second (L/s) 6.309 020 E-02
+Return to top
+
+WORK (see ENERGY)
+
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/data/external/nistDerivedUnits.txt b/tools/java/org/unicode/cldr/util/data/external/nistDerivedUnits.txt
new file mode 100644
index 0000000..09971e0
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/data/external/nistDerivedUnits.txt
@@ -0,0 +1,24 @@
+# From https://www.nist.gov/pml/special-publication-811/nist-guide-si-chapter-4-two-classes-si-units-and-si-prefixes
+#Quantity Special Name Special symbol Expression in terms of other SI units Expression in terms of SI base units
+plane angle radian(b) rad 1(b) m/m
+solid angle steradian(b) sr(c) 1(b) m2/m2
+frequency hertz(d) Hz s-1
+force newton N m · kg · s-2
+pressure, stress pascal Pa N/m2 m-1 · kg · s-2
+energy, work, amount of heat joule J N · m m2 · kg · s-2
+power, radiant flux watt W J/s m2 · kg · s-3
+electric charge, amount of electricity coulomb C s · A
+electric potential difference(e), electromotive force volt V W/A m2 · kg · s-3 · A-1
+capacitance farad F C/V m-2 · kg-1 · s4 · A2
+electric resistance ohm Ω V/A m2 · kg · s-3 · A-2
+electric conductance siemens S A/V m-2 · kg-1 · s3 · A2
+magnetic flux weber Wb V · s m2 · kg · s-2 · A-1
+magnetic flux density tesla T Wb/m2 kg · s-2 · A-1
+inductance henry H Wb/A m2 · kg· s-2 · A-2
+Celsius temperature degree Celsius (f) °C K
+luminous flux lumen lm cd · sr(c) Cd
+illuminance lux lx lm/m2 m-2· cd
+activity referred to a radionuclide(g) becquerel(d) Bq s-1
+absorbed dose, specific energy (imparted), kerma gray Gy J/kg m2· s-2
+dose equivalent, ambient dose equivalent, directional dose equivalent, personal dose equivalent sievert (h) Sv J/kg m2· s-2
+catalytic activity katal kat s-1· mol
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/data/external/subdivisionData.txt b/tools/java/org/unicode/cldr/util/data/external/subdivisionData.txt
index 2f738d8..b10e2b7 100644
--- a/tools/java/org/unicode/cldr/util/data/external/subdivisionData.txt
+++ b/tools/java/org/unicode/cldr/util/data/external/subdivisionData.txt
@@ -2043,7 +2043,7 @@
IN-MP Madhya Pradesh
IN-MZ Mizoram
IN-NL Nagaland
- IN-OR Orissa
+ IN-OR Odisha
IN-PB Punjab
IN-PY Pondicherry
IN-RJ Rajasthan
@@ -4991,4 +4991,4 @@
ZW-MN Matabeleland North
ZW-MS Matabeleland South
ZW-MV Masvingo
- ZW-MW Mashonaland West
\ No newline at end of file
+ ZW-MW Mashonaland West
diff --git a/tools/java/org/unicode/cldr/util/data/language_script_raw.txt b/tools/java/org/unicode/cldr/util/data/language_script_raw.txt
index 3fd41da..4660a44 100644
--- a/tools/java/org/unicode/cldr/util/data/language_script_raw.txt
+++ b/tools/java/org/unicode/cldr/util/data/language_script_raw.txt
@@ -294,6 +294,7 @@
haz Hazaragi primary Arab Arabic
he Hebrew primary Hebr Hebrew
hi Hindi primary Deva Devanagari
+hi Hindi secondary Latn Latin
hi Hindi secondary Mahj Mahajani
hif Fiji Hindi primary Deva Devanagari
hif Fiji Hindi primary Latn Latin
@@ -673,10 +674,10 @@
sam Samaritan Aramaic secondary Samr Samaritan
saq Samburu primary Latn Latin
sas Sasak primary Latn Latin
-sat Santali primary Latn Latin
+sat Santali primary Olck Ol Chiki
sat Santali secondary Beng Bangla
sat Santali secondary Deva Devanagari
-sat Santali secondary Olck Ol Chiki
+sat Santali secondary Latn Latin
sat Santali secondary Orya Odia
saz Saurashtra primary Saur Saurashtra
sbp Sangu primary Latn Latin
diff --git a/tools/java/org/unicode/cldr/util/data/st_sysmsg.html b/tools/java/org/unicode/cldr/util/data/st_sysmsg.html
index 86eb164..5a82330 100644
--- a/tools/java/org/unicode/cldr/util/data/st_sysmsg.html
+++ b/tools/java/org/unicode/cldr/util/data/st_sysmsg.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css"
- href="http://unicode.org/cldr/apps/surveytool.css">
+ href="https://unicode.org/cldr/apps/surveytool.css">
<title>System Messages for Survey Tool</title>
<style>
diff --git a/tools/java/org/unicode/cldr/util/data/test/widthSpecification.xml b/tools/java/org/unicode/cldr/util/data/test/widthSpecification.xml
index a62b0eb..94d6e14 100644
--- a/tools/java/org/unicode/cldr/util/data/test/widthSpecification.xml
+++ b/tools/java/org/unicode/cldr/util/data/test/widthSpecification.xml
@@ -4,7 +4,7 @@
<variables>
<variable name="%A" value='"[^"]+"' />
<variable name="%ALLOW_LONGER"
- value="(area-acre|area-square-foot|area-square-mile|length-footlength-inch|length-mile|length-light-year|length-yard|mass-ounce|mass-pound|power-horsepower|pressure-inch-hg|speed-mile-per-hour|temperature-fahrenheit|volume-cubic-mile|acceleration-g-force|speed-kilometer-per-hour|speed-meter-per-second)" />
+ value="(area-acre|area-square-foot|area-square-mile|length-footlength-inch|length-mile|length-light-year|length-yard|mass-ounce|mass-pound|power-horsepower|pressure-inch-ofhg|speed-mile-per-hour|temperature-fahrenheit|volume-cubic-mile|acceleration-g-force|speed-kilometer-per-hour|speed-meter-per-second)" />
</variables>
<paths>
<!-- .add("//ldml/delimiters/(quotation|alternateQuotation)", new Limit[]
diff --git a/tools/java/org/unicode/cldr/util/data/test_help_messages.html b/tools/java/org/unicode/cldr/util/data/test_help_messages.html
index 93f5049..ec5c2e5 100644
--- a/tools/java/org/unicode/cldr/util/data/test_help_messages.html
+++ b/tools/java/org/unicode/cldr/util/data/test_help_messages.html
@@ -13,7 +13,7 @@
<link rel="stylesheet" type="text/css"
- href="http://unicode.org/cldr/apps/surveytool.css">
+ href="https://unicode.org/cldr/apps/surveytool.css">
diff --git a/tools/java/org/unicode/cldr/util/data/tlds-alpha-by-domain.txt b/tools/java/org/unicode/cldr/util/data/tlds-alpha-by-domain.txt
index 0b6a7e3..02ac0c4 100644
--- a/tools/java/org/unicode/cldr/util/data/tlds-alpha-by-domain.txt
+++ b/tools/java/org/unicode/cldr/util/data/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2019091600, Last Updated Mon Sep 16 07:07:01 2019 UTC
+# Version 2019120500, Last Updated Thu Dec 5 07:07:01 2019 UTC
AAA
AARP
ABARTH
@@ -210,7 +210,6 @@
CAREER
CAREERS
CARS
-CARTIER
CASA
CASE
CASEIH
@@ -243,7 +242,6 @@
CHINTAI
CHRISTMAS
CHROME
-CHRYSLER
CHURCH
CI
CIPRIANI
@@ -295,6 +293,7 @@
COUPON
COUPONS
COURSES
+CPA
CR
CREDIT
CREDITCARD
@@ -356,7 +355,6 @@
DO
DOCS
DOCTOR
-DODGE
DOG
DOMAINS
DOT
@@ -401,7 +399,6 @@
EUROVISION
EUS
EVENTS
-EVERBANK
EXCHANGE
EXPERT
EXPOSED
@@ -691,12 +688,10 @@
KZ
LA
LACAIXA
-LADBROKES
LAMBORGHINI
LAMER
LANCASTER
LANCIA
-LANCOME
LAND
LANDROVER
LANXESS
@@ -818,7 +813,6 @@
MONASH
MONEY
MONSTER
-MOPAR
MORMON
MORTGAGE
MOSCOW
@@ -946,7 +940,6 @@
PHOTOGRAPHY
PHOTOS
PHYSIO
-PIAGET
PICS
PICTET
PICTURES
@@ -1148,7 +1141,6 @@
SPREADBETTING
SR
SRL
-SRT
SS
ST
STADA
@@ -1261,7 +1253,6 @@
UA
UBANK
UBS
-UCONNECT
UG
UK
UNICOM
@@ -1314,7 +1305,6 @@
WALTER
WANG
WANGGOU
-WARMAN
WATCH
WATCHES
WEATHER
diff --git a/tools/java/org/unicode/cldr/util/vettingViewerHead.txt b/tools/java/org/unicode/cldr/util/vettingViewerHead.txt
index e5372ee..ffb4fa2 100644
--- a/tools/java/org/unicode/cldr/util/vettingViewerHead.txt
+++ b/tools/java/org/unicode/cldr/util/vettingViewerHead.txt
@@ -3,5 +3,5 @@
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>mockup</title>
-<script type="text/javascript" src="vettingView.js"></script>
-<link rel="stylesheet" type="text/css" href="vettingView.css">
\ No newline at end of file
+<script src="vettingView.js"></script>
+<link rel="stylesheet" type="text/css" href="vettingView.css">
